diff options
Diffstat (limited to 'text')
32 files changed, 49 insertions, 49 deletions
diff --git a/text/maps/bills_house.asm b/text/maps/bills_house.asm index 24062b5d..5963d7ea 100644 --- a/text/maps/bills_house.asm +++ b/text/maps/bills_house.asm @@ -56,7 +56,7 @@ _BillThankYouText:: ; 8d3f5 (23:53f5) _SSTicketReceivedText:: ; 8d499 (23:5499) text $52, " received" line "an @" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _SSTicketNoRoomText:: ; 8d4b0 (23:54b0) diff --git a/text/maps/blues_house.asm b/text/maps/blues_house.asm index a6f4264a..147b23fb 100644 --- a/text/maps/blues_house.asm +++ b/text/maps/blues_house.asm @@ -14,7 +14,7 @@ _DaisyOfferMapText:: _GotMapText:: text $52," got a" line "@" - TX_RAM $CF4B + TX_RAM wcf4b text "!@@" _DaisyBagFullText:: diff --git a/text/maps/celadon_city.asm b/text/maps/celadon_city.asm index c7b2cb1c..585ece03 100644 --- a/text/maps/celadon_city.asm +++ b/text/maps/celadon_city.asm @@ -42,7 +42,7 @@ _TM41PreText:: ; a5afd (29:5afd) _ReceivedTM41Text:: ; a5b5a (29:5b5a) text $52, " received" line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _TM41ExplanationText:: ; a5b6e (29:5b6e) diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/celadon_dept_store_3f.asm index 19c74bd4..289ed1d4 100644 --- a/text/maps/celadon_dept_store_3f.asm +++ b/text/maps/celadon_dept_store_3f.asm @@ -10,7 +10,7 @@ _TM18PreReceiveText:: ; 9c814 (27:4814) _ReceivedTM18Text:: ; 9c85a (27:485a) text $52, " received" line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _TM18ExplanationText:: ; 9c86e (27:486e) diff --git a/text/maps/celadon_dept_store_roof.asm b/text/maps/celadon_dept_store_roof.asm index 3d83317f..851afc41 100644 --- a/text/maps/celadon_dept_store_roof.asm +++ b/text/maps/celadon_dept_store_roof.asm @@ -16,13 +16,13 @@ _CeladonMartRoofText_484f3:: ; 9cbcc (27:4bcc) _CeladonMartRoofText_484f9:: ; 9cc06 (27:4c06) text $52, " received" line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _CeladonMartRoofText_484fe:: ; 9cc1a (27:4c1a) db $0 para "@" - TX_RAM $cf4b + TX_RAM wcf4b text " contains" line "ICE BEAM!" @@ -42,13 +42,13 @@ _CeladonMartRoofText_48504:: ; 9cc5a (27:4c5a) _CeladonMartRoofText_4850a:: ; 9cc91 (27:4c91) text $52, " received" line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _CeladonMartRoofText_4850f:: ; 9cca5 (27:4ca5) db $0 para "@" - TX_RAM $cf4b + TX_RAM wcf4b text " contains" line "ROCK SLIDE!" @@ -123,7 +123,7 @@ _VendingMachineText4:: ; 9ce96 (27:4e96) done _VendingMachineText5:: ; 9ceaf (27:4eaf) - TX_RAM $cf4b + TX_RAM wcf4b db $0 line "popped out!" done diff --git a/text/maps/celadon_diner.asm b/text/maps/celadon_diner.asm index ee27fadd..2b4cc321 100644 --- a/text/maps/celadon_diner.asm +++ b/text/maps/celadon_diner.asm @@ -44,7 +44,7 @@ _CeladonDinerText_491a7:: ; 9e003 (27:6003) _ReceivedCoinCaseText:: ; 9e07a (27:607a) text $52, " received" line "a @" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _CoinCaseNoRoomText:: ; 9e090 (27:6090) diff --git a/text/maps/celadon_gym.asm b/text/maps/celadon_gym.asm index e377365e..66452a2c 100644 --- a/text/maps/celadon_gym.asm +++ b/text/maps/celadon_gym.asm @@ -64,7 +64,7 @@ _CeladonGymText9:: ; 9d481 (27:5481) _ReceivedTM21Text:: ; 9d50c (27:550c) text $52, " received" line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _TM21ExplanationText:: ; 9d520 (27:5520) diff --git a/text/maps/champion.asm b/text/maps/champion.asm index 259d530b..19484c23 100644 --- a/text/maps/champion.asm +++ b/text/maps/champion.asm @@ -96,7 +96,7 @@ _GaryText_76120:: ; 863ca (21:63ca) line "much since you" cont "first left with" cont "@" - TX_RAM $cd6d + TX_RAM wcd6d text "!" para $52, ", you have" diff --git a/text/maps/cinnabar_gym.asm b/text/maps/cinnabar_gym.asm index 4d8f796e..c3208a84 100644 --- a/text/maps/cinnabar_gym.asm +++ b/text/maps/cinnabar_gym.asm @@ -44,7 +44,7 @@ _BlaineBadgeText:: ; a0946 (28:4946) _ReceivedTM38Text:: ; a09a8 (28:49a8) text $52, " received" line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _TM38ExplanationText:: ; a09bc (28:49bc) diff --git a/text/maps/cinnabar_lab_fossil_room.asm b/text/maps/cinnabar_lab_fossil_room.asm index 3e544bd6..cdbaca13 100644 --- a/text/maps/cinnabar_lab_fossil_room.asm +++ b/text/maps/cinnabar_lab_fossil_room.asm @@ -30,7 +30,7 @@ _Lab4Text_75dd5:: ; a118d (28:518d) line "back to life!" para "It was @" - TX_RAM $cf4b + TX_RAM wcf4b db $0 line "like I think!" prompt @@ -38,12 +38,12 @@ _Lab4Text_75dd5:: ; a118d (28:518d) _Lab4Text_610ae:: ; a11d6 (28:51d6) text "Oh! That is" line "@" - TX_RAM $cd6d + TX_RAM wcd6d text "!" para "It is fossil of" line "@" - TX_RAM $cf4b + TX_RAM wcf4b text ", a" cont "#MON that is" cont "already extinct!" @@ -60,7 +60,7 @@ _Lab4Text_610b3:: ; a1259 (28:5259) para $52, " handed" line "over @" - TX_RAM $cd6d + TX_RAM wcd6d text "!" prompt diff --git a/text/maps/cinnabar_lab_metronome_room.asm b/text/maps/cinnabar_lab_metronome_room.asm index c52dccec..af5dc150 100644 --- a/text/maps/cinnabar_lab_metronome_room.asm +++ b/text/maps/cinnabar_lab_metronome_room.asm @@ -9,7 +9,7 @@ _TM35PreReceiveText:: ; a0f09 (28:4f09) _ReceivedTM35Text:: ; a0f48 (28:4f48) text $52, " received " line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _TM35ExplanationText:: ; a0f5d (28:4f5d) diff --git a/text/maps/copycats_house_2f.asm b/text/maps/copycats_house_2f.asm index 502f7611..85202aa8 100644 --- a/text/maps/copycats_house_2f.asm +++ b/text/maps/copycats_house_2f.asm @@ -29,7 +29,7 @@ _TM31PreReceiveText:: ; a1636 (28:5636) _ReceivedTM31Text:: ; a1675 (28:5675) text $52, " received" line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _TM31ExplanationText1:: ; a1689 (28:5689) diff --git a/text/maps/daycare_1.asm b/text/maps/daycare_1.asm index 1743cbc3..2c2314b2 100644 --- a/text/maps/daycare_1.asm +++ b/text/maps/daycare_1.asm @@ -13,7 +13,7 @@ _DayCareMText_56414:: ; 8abd4 (22:6bd4) _DayCareMText_56419:: ; 8abf0 (22:6bf0) text "Fine, I'll look" line "after @" - TX_RAM $cd6d + TX_RAM wcd6d db $0 cont "for a while." prompt @@ -25,7 +25,7 @@ _DayCareMText_5641e:: ; 8ac19 (22:6c19) _DayCareMText_56423:: ; 8ac32 (22:6c32) text "Your @" - TX_RAM $cd6d + TX_RAM wcd6d db $0 line "has grown a lot!" @@ -33,7 +33,7 @@ _DayCareMText_56423:: ; 8ac32 (22:6c32) line "grown by @" DayCareMText_8ac67:: ; 8ac67 (22:6c67) - TX_NUM $cd3e,$1,$3 + TX_NUM wTrainerEngageDistance,$1,$3 text "!" para "Aren't I great?" @@ -57,7 +57,7 @@ _DayCareMText_5642d:: ; 8acae (22:6cae) _DayCareMText_56432:: ; 8acc1 (22:6cc1) text "Back already?" line "Your @" - TX_RAM $cd6d + TX_RAM wcd6d db $0 cont "needs some more" cont "time with me." diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm index 7e98b181..b623fa4a 100644 --- a/text/maps/fan_club.asm +++ b/text/maps/fan_club.asm @@ -85,7 +85,7 @@ FanClubChairStoryText:: ReceivedBikeVoucherText:: text $52, " received" line "a @" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" ExplainBikeVoucherText:: diff --git a/text/maps/fuchsia_fishing_house.asm b/text/maps/fuchsia_fishing_house.asm index 5ad09ef0..23d0476b 100644 --- a/text/maps/fuchsia_fishing_house.asm +++ b/text/maps/fuchsia_fishing_house.asm @@ -19,7 +19,7 @@ _FuchsiaHouse3Text_561c2:: ; a06e8 (28:46e8) para $52, " received" line "a @" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _FuchsiaHouse3Text_56212:: ; a0737 (28:4737) diff --git a/text/maps/fuchsia_gym_2.asm b/text/maps/fuchsia_gym_2.asm index a6616dde..e0cb6807 100644 --- a/text/maps/fuchsia_gym_2.asm +++ b/text/maps/fuchsia_gym_2.asm @@ -27,7 +27,7 @@ _UnnamedText_75590:: ; a0069 (28:4069) _ReceivedTM06Text:: ; a00eb (28:40eb) text $52, " received" line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _TM06ExplanationText:: ; a00ff (28:40ff) diff --git a/text/maps/fujis_house.asm b/text/maps/fujis_house.asm index 033777c2..b54c55f2 100644 --- a/text/maps/fujis_house.asm +++ b/text/maps/fujis_house.asm @@ -48,7 +48,7 @@ _LavenderHouse1Text_1d94c:: ; 99f97 (26:5f97) _ReceivedFluteText:: ; 99ffb (26:5ffb) text $52, " received" line "a @" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _FluteExplanationText:: ; 9a011 (26:6011) diff --git a/text/maps/mr_psychics_house.asm b/text/maps/mr_psychics_house.asm index c35779e9..ed181eb6 100644 --- a/text/maps/mr_psychics_house.asm +++ b/text/maps/mr_psychics_house.asm @@ -8,7 +8,7 @@ _TM29PreReceiveText:: ; a24fe (28:64fe) _ReceivedTM29Text:: ; a252a (28:652a) text $52, " received" line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _TM29ExplanationText:: ; a253e (28:653e) diff --git a/text/maps/mt_moon_b2f.asm b/text/maps/mt_moon_b2f.asm index 4088e280..f8357f00 100644 --- a/text/maps/mt_moon_b2f.asm +++ b/text/maps/mt_moon_b2f.asm @@ -11,7 +11,7 @@ _MtMoon3Text_49f64:: ; 80979 (20:4979) _MtMoon3Text_49f6f:: ; 80995 (20:4995) text $52, " got the" line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _MtMoon3Text_49f7f:: ; 809a8 (20:49a8) diff --git a/text/maps/name_rater.asm b/text/maps/name_rater.asm index c2e0b2ea..4a81ecf1 100644 --- a/text/maps/name_rater.asm +++ b/text/maps/name_rater.asm @@ -14,7 +14,7 @@ _NameRaterText_1dab8:: ; 9a361 (26:6361) prompt _NameRaterText_1dabd:: ; 9a37f (26:637f) - TX_RAM $cd6d + TX_RAM wcd6d text ", is it?" line "That is a decent" cont "nickname!" @@ -35,7 +35,7 @@ _NameRaterText_1dac7:: ; 9a404 (26:6404) text "OK! This #MON" line "has been renamed" cont "@" - TX_RAM $cee9 + TX_RAM wHPBarMaxHP text "!" para "That's a better" @@ -48,14 +48,14 @@ _NameRaterText_1dacc:: ; 9a44c (26:644c) done _NameRaterText_1dad1:: ; 9a46b (26:646b) - TX_RAM $cd6d + TX_RAM wcd6d text ", is it?" line "That is a truly" cont "impeccable name!" para "Take good care of" line "@" - TX_RAM $cd6d + TX_RAM wcd6d text "!" done diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm index 3e10758e..8b45742c 100644 --- a/text/maps/oaks_lab.asm +++ b/text/maps/oaks_lab.asm @@ -51,7 +51,7 @@ _OaksLabMonEnergeticText:: ; 94e80 (25:4e80) _OaksLabReceivedMonText:: ; 94ea0 (25:4ea0) text $52, " received" line "a @" - TX_RAM $cd6d + TX_RAM wcd6d text "!@@" _OaksLabLastMonText:: ; 94eb6 (25:4eb6) @@ -240,7 +240,7 @@ _OaksLabRivalPickingMonText:: ; 95444 (25:5444) _OaksLabRivalReceivedMonText:: ; 95461 (25:5461) text $53, " received" line "a @" - TX_RAM $cd6d + TX_RAM wcd6d text "!@@" _OaksLabRivalChallengeText:: ; 95477 (25:5477) diff --git a/text/maps/route_1.asm b/text/maps/route_1.asm index c7db4d1c..99807e3e 100644 --- a/text/maps/route_1.asm +++ b/text/maps/route_1.asm @@ -15,7 +15,7 @@ _Route1ViridianMartSampleText:: ; 8d5bf (23:55bf) _Route1Text_1cae8:: ; 8d643 (23:5643) text $52, " got" line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _Route1Text_1caee:: ; 8d652 (23:5652) diff --git a/text/maps/route_12_house.asm b/text/maps/route_12_house.asm index ed645a01..8ec4552b 100644 --- a/text/maps/route_12_house.asm +++ b/text/maps/route_12_house.asm @@ -18,7 +18,7 @@ _Route12HouseText_564c5:: ; 8ca00 (23:4a00) para $52, " received" line "a @" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _Route12HouseText_564ca:: ; 8ca4f (23:4a4f) diff --git a/text/maps/route_23.asm b/text/maps/route_23.asm index 30b8e003..ab73a363 100644 --- a/text/maps/route_23.asm +++ b/text/maps/route_23.asm @@ -2,12 +2,12 @@ _VictoryRoadGuardText1:: ; 9261e (24:661e) text "You can pass here" line "only if you have" cont "the @" - TX_RAM $cd6d + TX_RAM wcd6d text "!" para "You don't have the" line "@" - TX_RAM $cd6d + TX_RAM wcd6d text " yet!" para "You have to have" @@ -18,12 +18,12 @@ _VictoryRoadGuardText2:: ; 92696 (24:6696) text "You can pass here" line "only if you have" cont "the @" - TX_RAM $cd6d + TX_RAM wcd6d text "!" para "Oh! That is the" line "@" - TX_RAM $cd6d + TX_RAM wcd6d text "!@@" _VictoryRoadGuardText_513a3:: ; 926dd (24:66dd) diff --git a/text/maps/route_24_1.asm b/text/maps/route_24_1.asm index ec32744d..84a6d720 100644 --- a/text/maps/route_24_1.asm +++ b/text/maps/route_24_1.asm @@ -12,7 +12,7 @@ _Route24Text_51515:: ; 92755 (24:6755) _Route24Text_5151a:: ; 92779 (24:6779) text $52, " received" line "a @" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _Route24Text_51521:: ; 9278f (24:678f) diff --git a/text/maps/safari_zone_secret_house.asm b/text/maps/safari_zone_secret_house.asm index b7b391be..67b677be 100644 --- a/text/maps/safari_zone_secret_house.asm +++ b/text/maps/safari_zone_secret_house.asm @@ -17,7 +17,7 @@ _SecretHouseText_4a350:: ; 858a4 (21:58a4) _ReceivedHM03Text:: ; 85943 (21:5943) text $52, " received" line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _HM03ExplanationText:: ; 85957 (21:5957) diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm index fdfcd313..caacd757 100644 --- a/text/maps/silph_co_11f.asm +++ b/text/maps/silph_co_11f.asm @@ -22,7 +22,7 @@ _SilphCoPresidentText:: ; 84e9b (21:4e9b) _ReceivedSilphCoMasterBallText:: ; 84f63 (21:4f63) text $52, " got a" line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _SilphCo10Text_6231c:: ; 84f74 (21:4f74) diff --git a/text/maps/silph_co_2f.asm b/text/maps/silph_co_2f.asm index b8924ef1..8096d806 100644 --- a/text/maps/silph_co_2f.asm +++ b/text/maps/silph_co_2f.asm @@ -12,7 +12,7 @@ _SilphCo2Text_59ded:: ; 82454 (20:6454) _ReceivedTM36Text:: ; 824ba (20:64ba) text $52, " got" line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _TM36ExplanationText:: ; 824c9 (20:64c9) diff --git a/text/maps/ss_anne_7.asm b/text/maps/ss_anne_7.asm index 9e87cdf5..daef3e4a 100644 --- a/text/maps/ss_anne_7.asm +++ b/text/maps/ss_anne_7.asm @@ -33,7 +33,7 @@ _ReceivingHM01Text:: ; 81347 (20:5347) _ReceivedHM01Text:: ; 8140d (20:540d) text $52, " got" line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _SSAnne7Text_61932:: ; 8141c (20:541c) diff --git a/text/maps/vermilion_fishing_house.asm b/text/maps/vermilion_fishing_house.asm index 5ed59033..b1377252 100644 --- a/text/maps/vermilion_fishing_house.asm +++ b/text/maps/vermilion_fishing_house.asm @@ -18,7 +18,7 @@ _VermilionHouse2Text_560b6:: ; 9c554 (27:4554) para $52, " received" line "an @" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _VermilionHouse2Text_560bb:: ; 9c5a4 (27:45a4) diff --git a/text/maps/vermilion_gym_2.asm b/text/maps/vermilion_gym_2.asm index 28304f37..2788d840 100644 --- a/text/maps/vermilion_gym_2.asm +++ b/text/maps/vermilion_gym_2.asm @@ -26,7 +26,7 @@ _VermilionGymText_5cb77:: ; 9c069 (27:4069) _ReceivedTM24Text:: ; 9c0e0 (27:40e0) text $52, " received " line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _TM24ExplanationText:: ; 9c0f5 (27:40f5) diff --git a/text/maps/wardens_house.asm b/text/maps/wardens_house.asm index d5834483..a215da34 100644 --- a/text/maps/wardens_house.asm +++ b/text/maps/wardens_house.asm @@ -44,7 +44,7 @@ _WardenThankYouText:: ; 9e51b (27:651b) _ReceivedHM04Text:: ; 9e5a2 (27:65a2) text $52, " received" line "@" - TX_RAM $cf4b + TX_RAM wcf4b text "!@@" _HM04ExplanationText:: ; 9e5b6 (27:65b6) |