Name the last of unnamed text

This commit is contained in:
U-Daniel-PC\Daniel 2015-06-12 10:26:00 -05:00
parent 39abace569
commit 3cd3efd060
13 changed files with 53 additions and 51 deletions

View file

@ -435,11 +435,13 @@ VermilionGymTrashSuccesText1: ; 5dec8 (17:5ec8)
call WaitForSoundToFinish call WaitForSoundToFinish
jp TextScriptEnd jp TextScriptEnd
; unused
VermilionGymTrashSuccesText2: ; 5dedb (17:5edb) VermilionGymTrashSuccesText2: ; 5dedb (17:5edb)
TX_FAR _VermilionGymTrashSuccesText2 TX_FAR _VermilionGymTrashSuccesText2
db "@" db "@"
UnnamedText_5dee0: ; 5dee0 (17:5ee0) ; unused
VermilionGymTrashSuccesPlaySfx: ; 5dee0 (17:5ee0)
db $08 ; asm db $08 ; asm
call WaitForSoundToFinish call WaitForSoundToFinish
ld a, (SFX_02_49 - SFX_Headers_02) / 3 ld a, (SFX_02_49 - SFX_Headers_02) / 3

View file

@ -119,7 +119,7 @@ AgathaScript2: ; 764ed (1d:64ed)
AgathaTextPointers: ; 76505 (1d:6505) AgathaTextPointers: ; 76505 (1d:6505)
dw AgathaText1 dw AgathaText1
dw AgathaText2 dw AgathaDontRunAwayText
AgathaTrainerHeaders: ; 76509 (1d:6509) AgathaTrainerHeaders: ; 76509 (1d:6509)
AgathaTrainerHeader0: ; 76509 (1d:6509) AgathaTrainerHeader0: ; 76509 (1d:6509)
@ -151,6 +151,6 @@ AgathaAfterBattleText: ; 7652a (1d:652a)
TX_FAR _AgathaAfterBattleText TX_FAR _AgathaAfterBattleText
db "@" db "@"
AgathaText2: ; 7652f (1d:652f) AgathaDontRunAwayText: ; 7652f (1d:652f)
TX_FAR _AgathaText2 TX_FAR _AgathaDontRunAwayText
db "@" db "@"

View file

@ -116,7 +116,7 @@ BrunoScript2: ; 76396 (1d:6396)
BrunoTextPointers: ; 763a8 (1d:63a8) BrunoTextPointers: ; 763a8 (1d:63a8)
dw BrunoText1 dw BrunoText1
dw BrunoText2 dw BrunoDontRunAwayText
BrunoTrainerHeaders: ; 763ac (1d:63ac) BrunoTrainerHeaders: ; 763ac (1d:63ac)
BrunoTrainerHeader0: ; 763ac (1d:63ac) BrunoTrainerHeader0: ; 763ac (1d:63ac)
@ -148,6 +148,6 @@ BrunoAfterBattleText: ; 763cd (1d:63cd)
TX_FAR _BrunoAfterBattleText TX_FAR _BrunoAfterBattleText
db "@" db "@"
BrunoText2: ; 763d2 (1d:63d2) BrunoDontRunAwayText: ; 763d2 (1d:63d2)
TX_FAR _UnnamedText_763d2 TX_FAR _BrunoDontRunAwayText
db "@" db "@"

View file

@ -155,17 +155,17 @@ FuchsiaGymText1: ; 75534 (1d:5534)
call DisableWaitingAfterTextDisplay call DisableWaitingAfterTextDisplay
jr .asm_e84c6 ; 0x75546 jr .asm_e84c6 ; 0x75546
.asm_adc3b ; 0x75548 .asm_adc3b ; 0x75548
ld hl, UnnamedText_7558b ld hl, KogaExplainToxicText
call PrintText call PrintText
jr .asm_e84c6 ; 0x7554e jr .asm_e84c6 ; 0x7554e
.asm_181b6 ; 0x75550 .asm_181b6 ; 0x75550
ld hl, UnnamedText_75581 ld hl, KogaBeforeBattleText
call PrintText call PrintText
ld hl, wd72d ld hl, wd72d
set 6, [hl] set 6, [hl]
set 7, [hl] set 7, [hl]
ld hl, UnnamedText_75586 ld hl, KogaAfterBattleText
ld de, UnnamedText_75586 ld de, KogaAfterBattleText
call SaveEndBattleTextPointers call SaveEndBattleTextPointers
ldh a, [$8c] ldh a, [$8c]
ld [wSpriteIndex], a ld [wSpriteIndex], a
@ -180,20 +180,20 @@ FuchsiaGymText1: ; 75534 (1d:5534)
.asm_e84c6 ; 0x7557e .asm_e84c6 ; 0x7557e
jp TextScriptEnd jp TextScriptEnd
UnnamedText_75581: ; 75581 (1d:5581) KogaBeforeBattleText: ; 75581 (1d:5581)
TX_FAR _UnnamedText_75581 TX_FAR _KogaBeforeBattleText
db "@" db "@"
UnnamedText_75586: ; 75586 (1d:5586) KogaAfterBattleText: ; 75586 (1d:5586)
TX_FAR _UnnamedText_75586 TX_FAR _KogaAfterBattleText
db "@" db "@"
UnnamedText_7558b: ; 7558b (1d:558b) KogaExplainToxicText: ; 7558b (1d:558b)
TX_FAR _UnnamedText_7558b TX_FAR _KogaExplainToxicText
db "@" db "@"
FuchsiaGymText9: ; 75590 (1d:5590) FuchsiaGymText9: ; 75590 (1d:5590)
TX_FAR _UnnamedText_75590 TX_FAR _FuchsiaGymText9
db "@" db "@"
FuchsiaGymText10: ; 75595 (1d:5595) FuchsiaGymText10: ; 75595 (1d:5595)
@ -320,17 +320,17 @@ FuchsiaGymText8: ; 7563a (1d:563a)
db $08 ; asm db $08 ; asm
ld a, [wd792] ld a, [wd792]
bit 1, a bit 1, a
ld hl, UnnamedText_75653 ld hl, FuchsiaGymText_75653
jr nz, .asm_50671 ; 0x75643 jr nz, .asm_50671 ; 0x75643
ld hl, UnnamedText_7564e ld hl, FuchsiaGymText_7564e
.asm_50671 ; 0x75648 .asm_50671 ; 0x75648
call PrintText call PrintText
jp TextScriptEnd jp TextScriptEnd
UnnamedText_7564e: ; 7564e (1d:564e) FuchsiaGymText_7564e: ; 7564e (1d:564e)
TX_FAR _UnnamedText_7564e TX_FAR _FuchsiaGymText_7564e
db "@" db "@"
UnnamedText_75653: ; 75653 (1d:5653) FuchsiaGymText_75653: ; 75653 (1d:5653)
TX_FAR _UnnamedText_75653 TX_FAR _FuchsiaGymText_75653
db "@" db "@"

View file

@ -52,7 +52,7 @@ FuchsiaHouse3Text_561c2: ; 561c2 (15:61c2)
db $0B db $0B
db "@" db "@"
UnnamedText_561c8: ; 561c8 UnusedText_561c8: ; 561c8
para "つり こそ" para "つり こそ"
line "おとこの ロマン だ!" line "おとこの ロマン だ!"

View file

@ -115,7 +115,7 @@ LoreleiScript2: ; 7623f (1d:623f)
LoreleiTextPointers: ; 76251 (1d:6251) LoreleiTextPointers: ; 76251 (1d:6251)
dw LoreleiText1 dw LoreleiText1
dw LoreleiText2 dw LoreleiDontRunAwayText
LoreleiTrainerHeaders: ; 76255 (1d:6255) LoreleiTrainerHeaders: ; 76255 (1d:6255)
LoreleiTrainerHeader0: ; 76255 (1d:6255) LoreleiTrainerHeader0: ; 76255 (1d:6255)
@ -147,6 +147,6 @@ LoreleiAfterBattleText: ; 76276 (1d:6276)
TX_FAR _LoreleiAfterBattleText TX_FAR _LoreleiAfterBattleText
db "@" db "@"
LoreleiText2: ; 7627b (1d:627b) LoreleiDontRunAwayText: ; 7627b (1d:627b)
TX_FAR _LoreleiText2 TX_FAR _LoreleiDontRunAwayText
db "@" db "@"

View file

@ -4,21 +4,21 @@ UndergroundPathEntranceRoute7CopyScript: ; 5d769 (17:5769)
ret ret
UndergroundPathEntranceRoute7CopyTextPointers: ; 5d76f (17:576f) UndergroundPathEntranceRoute7CopyTextPointers: ; 5d76f (17:576f)
dw UnnamedText_5d773 dw UGPathRoute7EntranceUnusedText_5d773
dw UnnamedText_5d77d dw UGPathRoute7EntranceUnusedText_5d77d
UnnamedText_5d773: ; 5d773 (17:5773) UGPathRoute7EntranceUnusedText_5d773: ; 5d773 (17:5773)
TX_FAR _UnnamedText_5d773 TX_FAR _UGPathRoute7EntranceUnusedText_5d773
db "@" db "@"
UnnamedText_5d778: ; 5d778 (17:5778) UGPathRoute7EntranceUnusedText_5d778: ; 5d778 (17:5778)
TX_FAR _UnnamedText_5d778 TX_FAR _UGPathRoute7EntranceUnusedText_5d778
db "@" db "@"
UnnamedText_5d77d: ; 5d77d (17:577d) UGPathRoute7EntranceUnusedText_5d77d: ; 5d77d (17:577d)
TX_FAR _UnnamedText_5d77d TX_FAR _UGPathRoute7EntranceUnusedText_5d77d
db "@" db "@"
UnnamedText_5d782: ; 5d782 (17:5782) UGPathRoute7EntranceUnusedText_5d782: ; 5d782 (17:5782)
TX_FAR _UnnamedText_5d782 TX_FAR _UGPathRoute7EntranceUnusedText_5d782
db "@" db "@"

View file

@ -42,7 +42,7 @@ _AgathaAfterBattleText:: ; 86998 (21:6998)
cont "along now, child!" cont "along now, child!"
done done
_AgathaText2:: ; 869fd (21:69fd) _AgathaDontRunAwayText:: ; 869fd (21:69fd)
text "Someone's voice:" text "Someone's voice:"
line "Don't run away!" line "Don't run away!"
done done

View file

@ -31,7 +31,7 @@ _BrunoAfterBattleText:: ; 8681d (21:681d)
cont "challenge!" cont "challenge!"
done done
_UnnamedText_763d2:: ; 8684b (21:684b) _BrunoDontRunAwayText:: ; 8684b (21:684b)
text "Someone's voice:" text "Someone's voice:"
line "Don't run away!" line "Don't run away!"
done done

View file

@ -1,4 +1,4 @@
_UnnamedText_75581:: ; 9e9b1 (27:69b1) _KogaBeforeBattleText:: ; 9e9b1 (27:69b1)
text "KOGA: Fwahahaha!" text "KOGA: Fwahahaha!"
para "A mere child like" para "A mere child like"
@ -16,7 +16,7 @@ _UnnamedText_75581:: ; 9e9b1 (27:69b1)
cont "techniques!" cont "techniques!"
done done
_UnnamedText_75586:: ; 9ea66 (27:6a66) _KogaAfterBattleText:: ; 9ea66 (27:6a66)
text "Humph!" text "Humph!"
line "You have proven" line "You have proven"
cont "your worth!" cont "your worth!"

View file

@ -1,4 +1,4 @@
_UnnamedText_7558b:: ; a0000 (28:4000) _KogaExplainToxicText:: ; a0000 (28:4000)
text "When afflicted by" text "When afflicted by"
line "TOXIC, #MON" line "TOXIC, #MON"
cont "suffer more and" cont "suffer more and"
@ -9,7 +9,7 @@ _UnnamedText_7558b:: ; a0000 (28:4000)
line "terrorize foes!" line "terrorize foes!"
done done
_UnnamedText_75590:: ; a0069 (28:4069) _FuchsiaGymText9:: ; a0069 (28:4069)
text "Now that you have" text "Now that you have"
line "the SOULBADGE," line "the SOULBADGE,"
cont "the DEFENSE of" cont "the DEFENSE of"
@ -169,7 +169,7 @@ _FuchsiaGymAfterBattleText6:: ; a0483 (28:4483)
cont "choose?" cont "choose?"
done done
_UnnamedText_7564e:: ; a04d2 (28:44d2) _FuchsiaGymText_7564e:: ; a04d2 (28:44d2)
text "Yo! Champ in" text "Yo! Champ in"
line "making!" line "making!"
@ -186,7 +186,7 @@ _UnnamedText_7564e:: ; a04d2 (28:44d2)
cont "to reach him!" cont "to reach him!"
done done
_UnnamedText_75653:: ; a0574 (28:4574) _FuchsiaGymText_75653:: ; a0574 (28:4574)
text "It's amazing how" text "It's amazing how"
line "ninja can terrify" line "ninja can terrify"
cont "even now!" cont "even now!"

View file

@ -36,7 +36,7 @@ _LoreleiAfterBattleText:: ; 866d3 (21:66d3)
cont "LEAGUE power!" cont "LEAGUE power!"
done done
_LoreleiText2:: ; 86729 (21:6729) _LoreleiDontRunAwayText:: ; 86729 (21:6729)
text "Someone's voice:" text "Someone's voice:"
line "Don't run away!" line "Don't run away!"
done done

View file

@ -1,4 +1,4 @@
_UnnamedText_5d773:: ; 8c132 (23:4132) _UGPathRoute7EntranceUnusedText_5d773:: ; 8c132 (23:4132)
text "I want to shop at" text "I want to shop at"
line "the dept. store" line "the dept. store"
cont "in CELADON but..." cont "in CELADON but..."
@ -8,13 +8,13 @@ _UnnamedText_5d773:: ; 8c132 (23:4132)
cont "people there." cont "people there."
done done
_UnnamedText_5d778:: ; 8c195 (23:4195) _UGPathRoute7EntranceUnusedText_5d778:: ; 8c195 (23:4195)
text "TEAM ROCKET had a" text "TEAM ROCKET had a"
line "secret hideout in" line "secret hideout in"
cont "CELADON CITY?" cont "CELADON CITY?"
done done
_UnnamedText_5d77d:: ; 8c1c8 (23:41c8) _UGPathRoute7EntranceUnusedText_5d77d:: ; 8c1c8 (23:41c8)
text "You're here to" text "You're here to"
line "shop in CELADON?" line "shop in CELADON?"
@ -22,7 +22,7 @@ _UnnamedText_5d77d:: ; 8c1c8 (23:41c8)
line "and head west!" line "and head west!"
done done
_UnnamedText_5d782:: ; 8c209 (23:4209) _UGPathRoute7EntranceUnusedText_5d782:: ; 8c209 (23:4209)
text "The UNDERGROUND" text "The UNDERGROUND"
line "PATH goes beneath" line "PATH goes beneath"
cont "SAFFRON and leads" cont "SAFFRON and leads"