diff options
Diffstat (limited to 'text')
| -rw-r--r-- | text/battle.asm | 4 | ||||
| -rw-r--r-- | text/common_2.asm | 52 | ||||
| -rw-r--r-- | text/common_3.asm | 10 | ||||
| -rw-r--r-- | text/common_4.asm | 8 | ||||
| -rwxr-xr-x | text/trainer_class_names.asm | 67 |
5 files changed, 104 insertions, 37 deletions
diff --git a/text/battle.asm b/text/battle.asm index c17765855..4a49cb50c 100644 --- a/text/battle.asm +++ b/text/battle.asm @@ -478,9 +478,9 @@ BecameConfusedText: ; 0x80d97 text "<TARGET>" line "became confused!" prompt -; 0x80dab +; ItemHealedConfusion -BattleText_0x80dab: ; 0x80dab +BattleText_ItemHealedConfusion: ; ItemHealedConfusion text "A @" text_from_ram StringBuffer1 text " rid" diff --git a/text/common_2.asm b/text/common_2.asm index 052ea9ebb..6713fb9bb 100644 --- a/text/common_2.asm +++ b/text/common_2.asm @@ -109,7 +109,7 @@ UnknownText_0x1bc14f: ; 0x1bc14f deciram CurPartyLevel, 1, 3 text "!@" sound_dex_fanfare_50_79 - text_waitbutton + text_waitsfx db "@" ; 0x1bc16d @@ -441,10 +441,10 @@ UnknownText_0x1bc6c7: ; 0x1bc6c7 ; 0x1bc6e9 UnknownText_0x1bc6e9: ; 0x1bc6e9 - text_from_ram wc6d1 + text_from_ram wPlayerTrademonSpeciesName text " was" line "sent to @" - text_from_ram wc719 + text_from_ram wOTTrademonSenderName text "." done ; 0x1bc701 @@ -455,14 +455,14 @@ UnknownText_0x1bc701: ; 0x1bc701 ; 0x1bc703 UnknownText_0x1bc703: ; 0x1bc703 - text_from_ram wc719 + text_from_ram wOTTrademonSenderName text " bids" line "farewell to" done ; 0x1bc719 UnknownText_0x1bc719: ; 0x1bc719 - text_from_ram wc703 + text_from_ram wOTTrademonSpeciesName text "." done ; 0x1bc71f @@ -470,35 +470,35 @@ UnknownText_0x1bc719: ; 0x1bc719 UnknownText_0x1bc71f: ; 0x1bc71f text "Take good care of" line "@" - text_from_ram wc703 + text_from_ram wOTTrademonSpeciesName text "." done ; 0x1bc739 UnknownText_0x1bc739: ; 0x1bc739 text "For @" - text_from_ram wc6e7 + text_from_ram wPlayerTrademonSenderName text "'s" line "@" - text_from_ram wc6d1 + text_from_ram wPlayerTrademonSpeciesName text "," done ; 0x1bc74c UnknownText_0x1bc74c: ; 0x1bc74c - text_from_ram wc719 + text_from_ram wOTTrademonSenderName text " sends" line "@" - text_from_ram wc703 + text_from_ram wOTTrademonSpeciesName text "." done ; 0x1bc75e UnknownText_0x1bc75e: ; 0x1bc75e - text_from_ram wc719 + text_from_ram wOTTrademonSenderName text " will" line "trade @" - text_from_ram wc703 + text_from_ram wOTTrademonSpeciesName db "@" ; 0x1bc773 @@ -508,19 +508,19 @@ UnknownText_0x1bc773: ; 0x1bc773 UnknownText_0x1bc774: ; 0x1bc774 text "for @" - text_from_ram wc6e7 + text_from_ram wPlayerTrademonSenderName text "'s" line "@" - text_from_ram wc6d1 + text_from_ram wPlayerTrademonSpeciesName text "." done ; 0x1bc787 UnknownText_0x1bc787: ; 0x1bc787 - text_from_ram wc6e7 + text_from_ram wPlayerTrademonSenderName text " will" line "trade @" - text_from_ram wc6d1 + text_from_ram wPlayerTrademonSpeciesName db "@" ; 0x1bc79c @@ -530,19 +530,19 @@ UnknownText_0x1bc79c: ; 0x1bc79c UnknownText_0x1bc79d: ; 0x1bc79d text "for @" - text_from_ram wc719 + text_from_ram wOTTrademonSenderName text "'s" line "@" - text_from_ram wc703 + text_from_ram wOTTrademonSpeciesName text "." done ; 0x1bc7b0 UnknownText_0x1bc7b0: ; 0x1bc7b0 - text_from_ram wc6e7 + text_from_ram wPlayerTrademonSenderName text "'s" line "@" - text_from_ram wc6d1 + text_from_ram wPlayerTrademonSpeciesName text " trade…" done ; 0x1bc7c3 @@ -550,16 +550,16 @@ UnknownText_0x1bc7b0: ; 0x1bc7b0 UnknownText_0x1bc7c3: ; 0x1bc7c3 text "Take good care of" line "@" - text_from_ram wc703 + text_from_ram wOTTrademonSpeciesName text "." done ; 0x1bc7dd UnknownText_0x1bc7dd: ; 0x1bc7dd - text_from_ram wc6e7 + text_from_ram wPlayerTrademonSenderName text "'s" line "@" - text_from_ram wc6d1 + text_from_ram wPlayerTrademonSpeciesName text " trade…" done ; 0x1bc7f0 @@ -567,13 +567,13 @@ UnknownText_0x1bc7dd: ; 0x1bc7dd UnknownText_0x1bc7f0: ; 0x1bc7f0 text "Take good care of" line "@" - text_from_ram wc703 + text_from_ram wOTTrademonSpeciesName text "." done ; 0x1bc80a UnknownText_0x1bc80a: ; 0x1bc80a - text_from_ram wc703 + text_from_ram wOTTrademonSpeciesName text " came" line "back!" done @@ -1576,7 +1576,7 @@ UnknownText_0x1bd3be: ; 0x1bd3be text_from_ram StringBuffer1 text "!@" sound_item - text_waitbutton + text_waitsfx db "@" ; 0x1bd3d6 diff --git a/text/common_3.asm b/text/common_3.asm index adc32f6cb..e372752db 100644 --- a/text/common_3.asm +++ b/text/common_3.asm @@ -294,7 +294,7 @@ UnknownText_0x1c04fa: ; 1c04fa text_from_ram StringBuffer1 text "" cont "to @" - text_from_ram wc950 + 3 + text_from_ram wMysteryGiftPlayerName text "'s home." prompt ; 1c051a @@ -362,7 +362,7 @@ UnknownText_0x1c05ec: ; 1c05ec UnknownText_0x1c0609: ; 1c0609 text "A blinding FLASH" line "lights the area!@" - text_waitbutton + text_waitsfx db "@" ; 1c062e @@ -932,7 +932,7 @@ UnknownText_0x1c0dba: ; 1c0dba text " came" line "out of its EGG!@" sound_caught_mon - text_waitbutton + text_waitsfx db "@" ; 1c0dd7 @@ -1223,7 +1223,7 @@ UnknownText_0x1c123a: ; 1c123a text " caught by" line "@" text_from_ram wMagikarpRecordHoldersName - text_waitbutton + text_waitsfx db "@" ; 1c1260 @@ -1786,7 +1786,7 @@ _OakText2: ; 1c1da4 ; 1c1de2 _OakText3: ; 1c1de2 - text_waitbutton + text_waitsfx db "@" ; 1c1de4 diff --git a/text/common_4.asm b/text/common_4.asm index ad4a90d27..a3ed18ac9 100644 --- a/text/common_4.asm +++ b/text/common_4.asm @@ -1051,7 +1051,7 @@ UnknownText_0x1c5660: ; 0x1c5660 text_from_ram StringBuffer2 text "!@" sound_dex_fanfare_50_79 - text_waitbutton + text_waitsfx db "@" ; 0x1c5677 @@ -1376,7 +1376,7 @@ UnknownText_0x1c5b34: ; 0x1c5b34 ; 0x1c5b35 Text_Waitbutton_2: ; 0x1c5b35 - text_waitbutton + text_waitsfx db "@" ; 0x1c5b37 @@ -1397,7 +1397,7 @@ UnknownText_0x1c5b53: ; 0x1c5b53 line "was newly added to" cont "the #DEX.@" sound_slot_machine_start - text_waitbutton + text_waitsfx db "@" ; 0x1c5b7e @@ -1453,7 +1453,7 @@ UnknownText_0x1c5c28: ; 0x1c5c28 UnknownText_0x1c5c44: ; 0x1c5c44 text "<PLAYER> played the" line "# FLUTE.@" - text_waitbutton + text_waitsfx db "@" ; 0x1c5c5d diff --git a/text/trainer_class_names.asm b/text/trainer_class_names.asm new file mode 100755 index 000000000..daa7e08a9 --- /dev/null +++ b/text/trainer_class_names.asm @@ -0,0 +1,67 @@ + db "LEADER@" + db "LEADER@" + db "LEADER@" + db "LEADER@" + db "LEADER@" + db "LEADER@" + db "LEADER@" + db "LEADER@" + db "RIVAL@" + db "#MON PROF.@" + db "ELITE FOUR@" + db "<PKMN> TRAINER@" + db "ELITE FOUR@" + db "ELITE FOUR@" + db "ELITE FOUR@" + db "CHAMPION@" + db "LEADER@" + db "LEADER@" + db "LEADER@" + db "SCIENTIST@" + db "LEADER@" + db "YOUNGSTER@" + db "SCHOOLBOY@" + db "BIRD KEEPER@" + db "LASS@" + db "LEADER@" + db "COOLTRAINER@" + db "COOLTRAINER@" + db "BEAUTY@" + db "#MANIAC@" + db "ROCKET@" + db "GENTLEMAN@" + db "SKIER@" + db "TEACHER@" + db "LEADER@" + db "BUG CATCHER@" + db "FISHER@" + db "SWIMMER♂@" + db "SWIMMER♀@" + db "SAILOR@" + db "SUPER NERD@" + db "RIVAL@" + db "GUITARIST@" + db "HIKER@" + db "BIKER@" + db "LEADER@" + db "BURGLAR@" + db "FIREBREATHER@" + db "JUGGLER@" + db "BLACKBELT@" + db "ROCKET@" + db "PSYCHIC@" + db "PICNICKER@" + db "CAMPER@" + db "ROCKET@" + db "SAGE@" + db "MEDIUM@" + db "BOARDER@" + db "#FAN@" + db "KIMONO GIRL@" + db "TWINS@" + db "#FAN@" + db "<PKMN> TRAINER@" + db "LEADER@" + db "OFFICER@" + db "ROCKET@" + db "MYSTICALMAN@"
\ No newline at end of file |