diff options
| -rw-r--r-- | constants.asm | 2 | ||||
| -rw-r--r-- | text/maps/celadon_dept_store_3f.asm | 2 | ||||
| -rw-r--r-- | text/maps/lance.asm | 2 | ||||
| -rw-r--r-- | text/maps/lorelei.asm | 1 | ||||
| -rw-r--r-- | text/maps/reds_house_1f.asm | 2 | ||||
| -rw-r--r-- | text/maps/route_22.asm | 2 | ||||
| -rw-r--r-- | text/maps/silph_co_11f.asm | 2 | ||||
| -rw-r--r-- | text/maps/underground_path_route_7_entrance_unused.asm | 3 | ||||
| -rw-r--r-- | text/maps/vermilion_dock.asm | 3 |
9 files changed, 12 insertions, 7 deletions
diff --git a/constants.asm b/constants.asm index 554f89ca..cc636558 100644 --- a/constants.asm +++ b/constants.asm @@ -29,5 +29,5 @@ INCLUDE "constants/tilesets.asm" INCLUDE "constants/starter_mons.asm" INCLUDE "constants/event_constants.asm" INCLUDE "constants/event_macros.asm" -INCLUDE "constants/pikachu_emotion_constants.asm" INCLUDE "constants/text_constants.asm" +INCLUDE "constants/pikachu_emotion_constants.asm" diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/celadon_dept_store_3f.asm index 4006a3bb..7de4a826 100644 --- a/text/maps/celadon_dept_store_3f.asm +++ b/text/maps/celadon_dept_store_3f.asm @@ -80,7 +80,7 @@ _TM18PreReceiveText:: prompt _ReceivedTM18Text:: - text $52, " received" + text "<PLAYER> received" line "@" TX_RAM wcf4b text "!@@" diff --git a/text/maps/lance.asm b/text/maps/lance.asm index 9c7bd677..22cc0dcd 100644 --- a/text/maps/lance.asm +++ b/text/maps/lance.asm @@ -1,6 +1,6 @@ _LanceBeforeBattleText:: text "Ah! I heard about" - line "you, ", $52, "!" + line "you, <PLAYER>!" para "I lead the ELITE" line "FOUR! You can" diff --git a/text/maps/lorelei.asm b/text/maps/lorelei.asm index 666aa47f..fdbb55b4 100644 --- a/text/maps/lorelei.asm +++ b/text/maps/lorelei.asm @@ -30,6 +30,7 @@ _LoreleiAfterBattleText:: text "You're better" line "than I thought!" cont "Go on ahead!" + para "You only got a" line "taste of #MON" cont "LEAGUE power!" diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm index e93450da..633075bb 100644 --- a/text/maps/reds_house_1f.asm +++ b/text/maps/reds_house_1f.asm @@ -10,7 +10,7 @@ _MomWakeUpText:: done _MomHealText1:: - text "MOM: ",$52,", if" + text "MOM: <PLAYER>, if" line "you drive your" cont "#MON too hard," cont "they'll dislike" diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm index 52d1a4c7..342d5015 100644 --- a/text/maps/route_22.asm +++ b/text/maps/route_22.asm @@ -78,7 +78,7 @@ _Route22RivalBeforeBattleText2:: cont "That's cool!" para "Then I'll whip" - line "you, ", $52, ", as" + line "you, <PLAYER>, as" cont "a warmup for" cont "#MON LEAGUE!" diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm index 6be83c5d..2fb84f17 100644 --- a/text/maps/silph_co_11f.asm +++ b/text/maps/silph_co_11f.asm @@ -58,7 +58,7 @@ _SilphCo11Text2:: done _SilphCo11Text3:: - text "Ah, ", $52, "!" + text "Ah, <PLAYER>!" line "So we meet again!" para "The PRESIDENT and" diff --git a/text/maps/underground_path_route_7_entrance_unused.asm b/text/maps/underground_path_route_7_entrance_unused.asm index 02c95a5c..4e0dc3ca 100644 --- a/text/maps/underground_path_route_7_entrance_unused.asm +++ b/text/maps/underground_path_route_7_entrance_unused.asm @@ -17,14 +17,17 @@ _UGPathRoute7EntranceUnusedText_5d778:: _UGPathRoute7EntranceUnusedText_5d77d:: text "You're here to" line "shop in CELADON?" + para "Just step outside" line "and head west!" done + _UGPathRoute7EntranceUnusedText_5d782:: text "The UNDERGROUND" line "PATH goes beneath" cont "SAFFRON and leads" cont "to LAVENDER." + para "If you're heading" line "to CERULEAN, go" cont "to the building" diff --git a/text/maps/vermilion_dock.asm b/text/maps/vermilion_dock.asm index 034de399..5d998e82 100644 --- a/text/maps/vermilion_dock.asm +++ b/text/maps/vermilion_dock.asm @@ -1,2 +1,3 @@ _VermilionDockText1:: - db $0, $57 + text "" + done |