From 10af88ddd712415f2a0a2b6124187d51075c95d5 Mon Sep 17 00:00:00 2001 From: "U-Daniel-PC\\Daniel" Date: Mon, 8 Jun 2015 01:52:50 -0500 Subject: text.o Conflicts: main.asm text.asm text/maps/cerulean_trade_house.asm text/maps/copycats_house_1f.asm text/maps/daycare_2.asm text/maps/museum_2f.asm text/maps/oaks_lab.asm text/maps/pewter_gym.asm text/maps/route_9_1.asm text/maps/school.asm text/maps/vermilion_gym_1.asm wram.asm yellow/text.asm --- text/maps/beach_house.asm | 6 +- text/maps/bike_shop.asm | 2 +- text/maps/celadon_city.asm | 32 ++--- text/maps/celadon_dept_store_3f.asm | 54 +++---- text/maps/celadon_game_corner.asm | 187 ------------------------- text/maps/celadon_game_corner_1.asm | 182 ++++++++++++++++++++++++ text/maps/celadon_game_corner_2.asm | 5 + text/maps/celadon_mansion_1f.asm | 57 ++++++-- text/maps/celadon_mansion_3f.asm | 51 +++++++ text/maps/cerulean_badge_house.asm | 106 -------------- text/maps/cerulean_badge_house_1.asm | 77 ++++++++++ text/maps/cerulean_badge_house_2.asm | 29 ++++ text/maps/cerulean_gym.asm | 3 +- text/maps/cerulean_trade_house.asm | 17 +-- text/maps/cinnabar_gym.asm | 43 ++++++ text/maps/copycats_house_1f.asm | 7 +- text/maps/daycare.asm | 99 +++++++++++++ text/maps/daycare_1.asm | 65 --------- text/maps/daycare_2.asm | 38 ----- text/maps/fan_club.asm | 13 +- text/maps/fuchsia_gym.asm | 221 +++++++++++++++++++++++++++++ text/maps/fuchsia_gym_1.asm | 27 ---- text/maps/fuchsia_gym_2.asm | 194 -------------------------- text/maps/mt_moon_b2f.asm | 20 +-- text/maps/mt_moon_pokecenter.asm | 8 +- text/maps/museum_2f.asm | 3 +- text/maps/oaks_lab.asm | 263 +++++++---------------------------- text/maps/pallet_town.asm | 18 ++- text/maps/pewter_gym.asm | 171 +++++++++++++++++++++++ text/maps/pewter_gym_1.asm | 19 --- text/maps/pewter_gym_2.asm | 180 ------------------------ text/maps/pokemon_tower_7f.asm | 53 ------- text/maps/reds_house_1f.asm | 2 +- text/maps/rock_tunnel_b2f.asm | 130 +++++++++++++++++ text/maps/rock_tunnel_b2f_1.asm | 109 --------------- text/maps/rock_tunnel_b2f_2.asm | 21 --- text/maps/rocket_hideout_b4f.asm | 32 ----- text/maps/route_11.asm | 164 ++++++++++++++++++++++ text/maps/route_11_1.asm | 135 ------------------ text/maps/route_11_2.asm | 29 ---- text/maps/route_22.asm | 66 ++++----- text/maps/route_24.asm | 156 +++++++++++++++++++++ text/maps/route_24_1.asm | 65 --------- text/maps/route_24_2.asm | 91 ------------ text/maps/route_9.asm | 175 ----------------------- text/maps/route_9_1.asm | 136 ++++++++++++++++++ text/maps/route_9_2.asm | 21 +++ text/maps/safari_zone_entrance.asm | 42 +++--- text/maps/school.asm | 9 +- text/maps/silph_co_10f.asm | 2 +- text/maps/silph_co_11f.asm | 20 --- text/maps/silph_co_5f.asm | 112 +++++++++++++++ text/maps/silph_co_5f_1.asm | 56 -------- text/maps/silph_co_5f_2.asm | 56 -------- text/maps/ss_anne_9.asm | 52 +++---- text/maps/vermilion_city.asm | 41 ++++++ text/maps/vermilion_gym.asm | 170 ++++++++++++++++++++++ text/maps/vermilion_gym_1.asm | 43 ------ text/maps/vermilion_gym_2.asm | 148 -------------------- text/maps/viridian_city.asm | 84 ++++++----- 60 files changed, 2122 insertions(+), 2295 deletions(-) delete mode 100644 text/maps/celadon_game_corner.asm create mode 100644 text/maps/celadon_game_corner_1.asm create mode 100755 text/maps/celadon_game_corner_2.asm delete mode 100644 text/maps/cerulean_badge_house.asm create mode 100644 text/maps/cerulean_badge_house_1.asm create mode 100755 text/maps/cerulean_badge_house_2.asm create mode 100644 text/maps/daycare.asm delete mode 100644 text/maps/daycare_1.asm delete mode 100644 text/maps/daycare_2.asm create mode 100644 text/maps/fuchsia_gym.asm delete mode 100644 text/maps/fuchsia_gym_1.asm delete mode 100644 text/maps/fuchsia_gym_2.asm create mode 100644 text/maps/pewter_gym.asm delete mode 100644 text/maps/pewter_gym_1.asm delete mode 100644 text/maps/pewter_gym_2.asm create mode 100644 text/maps/rock_tunnel_b2f.asm delete mode 100644 text/maps/rock_tunnel_b2f_1.asm delete mode 100644 text/maps/rock_tunnel_b2f_2.asm create mode 100644 text/maps/route_11.asm delete mode 100644 text/maps/route_11_1.asm delete mode 100644 text/maps/route_11_2.asm create mode 100644 text/maps/route_24.asm delete mode 100644 text/maps/route_24_1.asm delete mode 100644 text/maps/route_24_2.asm delete mode 100644 text/maps/route_9.asm create mode 100644 text/maps/route_9_1.asm create mode 100755 text/maps/route_9_2.asm create mode 100644 text/maps/silph_co_5f.asm delete mode 100644 text/maps/silph_co_5f_1.asm delete mode 100644 text/maps/silph_co_5f_2.asm create mode 100644 text/maps/vermilion_gym.asm delete mode 100644 text/maps/vermilion_gym_1.asm delete mode 100644 text/maps/vermilion_gym_2.asm (limited to 'text/maps') diff --git a/text/maps/beach_house.asm b/text/maps/beach_house.asm index 318b6013..bc50b837 100644 --- a/text/maps/beach_house.asm +++ b/text/maps/beach_house.asm @@ -27,7 +27,7 @@ _SurfinDudeText4:: done _BeachHousePikachuText:: - text "PIKACHU: Pikaa." + text "PIKACHU: Pikaa" done _BeachHouseSign1Text1:: @@ -80,7 +80,7 @@ _BeachHousePrinterText2:: line "PRINTER, it says.@@" _BeachHousePrinterText3:: - text "The Hi.Score is" + text "The Hi-Score is" line "shown." para "PRINT it out?" @@ -90,7 +90,7 @@ _BeachHousePrinterText4:: text "SUMMER BEACH HOUSE" line "PRINTER, it says." - para "The Hi.Score is" + para "The Hi-Score is" line "shown." para "PRINT it out?" diff --git a/text/maps/bike_shop.asm b/text/maps/bike_shop.asm index 5f2c3f45..ddd0be3d 100644 --- a/text/maps/bike_shop.asm +++ b/text/maps/bike_shop.asm @@ -31,7 +31,7 @@ _BikeShopText_1d824:: ; 98eb2 (26:4eb2) _BikeShopText_1d82a:: ; 98ee0 (26:4ee0) text "Come back again" - line "some time!" + line "sometime!" done _BikeShopText_1d82f:: ; 98efc (26:4efc) diff --git a/text/maps/celadon_city.asm b/text/maps/celadon_city.asm index 6a02d125..0a4c5333 100644 --- a/text/maps/celadon_city.asm +++ b/text/maps/celadon_city.asm @@ -92,22 +92,6 @@ _CeladonCityText9:: ; a5c63 (29:5c63) line "ROCKET's way!" done -_CeladonCityText10:: ; a5c82 (29:5c82) - text "TRAINER TIPS" - - para "X ACCURACY boosts" - line "the accuracy of" - cont "techniques!" - - para "DIRE HIT jacks up" - line "the likelihood of" - cont "critical hits!" - - para "Get your items at" - line "CELADON DEPT." - cont "STORE!" - done - _CeladonCityText11:: ; a5d18 (29:5d18) text "CELADON CITY" line "The City of" @@ -167,3 +151,19 @@ ELSE ENDC done +_CeladonCityText10:: ; a5c82 (29:5c82) + text "TRAINER TIPS" + + para "X ACCURACY boosts" + line "the accuracy of" + cont "techniques!" + + para "DIRE HIT jacks up" + line "the likelihood of" + cont "critical hits!" + + para "Get your items at" + line "CELADON DEPT." + cont "STORE!" + done + diff --git a/text/maps/celadon_dept_store_3f.asm b/text/maps/celadon_dept_store_3f.asm index 289ed1d4..45c8f9f3 100644 --- a/text/maps/celadon_dept_store_3f.asm +++ b/text/maps/celadon_dept_store_3f.asm @@ -1,30 +1,3 @@ -_TM18PreReceiveText:: ; 9c814 (27:4814) - text "Oh, hi! I finally" - line "finished #MON!" - - para "Not done yet?" - line "This might be" - cont "useful!" - prompt - -_ReceivedTM18Text:: ; 9c85a (27:485a) - text $52, " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM18ExplanationText:: ; 9c86e (27:486e) - text "TM18 is COUNTER!" - line "Not like the one" - cont "I'm leaning on," - cont "mind you!" - done - -_TM18NoRoomText:: ; 9c8aa (27:48aa) - text "Your pack is full" - line "of items!" - done - _CeladonMart3Text2:: ; 9c8c7 (27:48c7) text "Captured #MON" line "are registered" @@ -97,3 +70,30 @@ _CeladonMart3Text15:: ; 9cab6 (27:4ab6) line "Both are #MON!" done +_TM18PreReceiveText:: ; 9c814 (27:4814) + text "Oh, hi! I finally" + line "finished #MON!" + + para "Not done yet?" + line "This might be" + cont "useful!" + prompt + +_ReceivedTM18Text:: ; 9c85a (27:485a) + text $52, " received" + line "@" + TX_RAM wcf4b + text "!@@" + +_TM18ExplanationText:: ; 9c86e (27:486e) + text "TM18 is COUNTER!" + line "Not like the one" + cont "I'm leaning on," + cont "mind you!" + done + +_TM18NoRoomText:: ; 9c8aa (27:48aa) + text "Your pack is full" + line "of items!" + done + diff --git a/text/maps/celadon_game_corner.asm b/text/maps/celadon_game_corner.asm deleted file mode 100644 index c08a81b1..00000000 --- a/text/maps/celadon_game_corner.asm +++ /dev/null @@ -1,187 +0,0 @@ -_CeladonGameCornerText1:: ; 9d8d5 (27:58d5) - text "Welcome!" - - para "You can exchange" - line "your coins for" - cont "fabulous prizes" - cont "next door." - done - -_CeladonGameCornerText_48d22:: ; 9d91a (27:591a) - text "Welcome to ROCKET" - line "GAME CORNER!" - - para "Do you need some" - line "game coins?" - - para "It's ¥1000 for 50" - line "coins. Would you" - cont "like some?" - done - -_CeladonGameCornerText_48d27:: ; 9d984 (27:5984) - text "Thanks! Here are" - line "your 50 coins!" - done - -_CeladonGameCornerText_48d2c:: ; 9d9a5 (27:59a5) - text "No? Please come" - line "play sometime!" - done - -_CeladonGameCornerText_48d31:: ; 9d9c5 (27:59c5) - text "You can't afford" - line "the coins!" - done - -_CeladonGameCornerText_48d36:: ; 9d9e1 (27:59e1) - text "Oops! Your COIN" - line "CASE is full." - done - -_CeladonGameCornerText_48d3b:: ; 9da00 (27:5a00) - text "You don't have a" - line "COIN CASE!" - done - -_CeladonGameCornerText3:: ; 9da1c (27:5a1c) - text "Keep this quiet." - - para "It's rumored that" - line "this place is run" - cont "by TEAM ROCKET." - done - -_CeladonGameCornerText4:: ; 9da61 (27:5a61) - text "I think these" - line "machines have" - cont "different odds." - done - -_CeladonGameCornerText_48d9c:: ; 9da8e (27:5a8e) - text "Kid, do you want" - line "to play?" - prompt - -_Received10CoinsText:: ; 9daa9 (27:5aa9) - text $52, " received" - line "10 coins!@@" - -_CeladonGameCornerText_48da7:: ; 9dac0 (27:5ac0) - text "You don't need my" - line "coins!" - done - -_CeladonGameCornerText_48dac:: ; 9dad9 (27:5ad9) - text "Wins seem to come" - line "and go." - done - -_CeladonGameCornerText6:: ; 9daf4 (27:5af4) - text "I'm having a" - line "wonderful time!" - done - -_CeladonGameCornerText_48dca:: ; 9db11 (27:5b11) - text "Hey!" - - para "You have better" - line "things to do," - cont "champ in making!" - - para "CELADON GYM's" - line "LEADER is ERIKA!" - cont "She uses grass-" - cont "type #MON!" - - para "She might appear" - line "docile, but don't" - cont "be fooled!" - done - -_CeladonGameCornerText_48dcf:: ; 9dbac (27:5bac) - text "They offer rare" - line "#MON that can" - cont "be exchanged for" - cont "your coins." - - para "But, I just can't" - line "seem to win!" - done - -_CeladonGameCornerText8:: ; 9dc06 (27:5c06) - text "Games are scary!" - line "It's so easy to" - cont "get hooked!" - done - -_CeladonGameCornerText_48e26:: ; 9dc33 (27:5c33) - text "What's up? Want" - line "some coins?" - prompt - -_Received20CoinsText:: ; 9dc4f (27:5c4f) - text $52, " received" - line "20 coins!@@" - -_CeladonGameCornerText_48e31:: ; 9dc66 (27:5c66) - text "You have lots of" - line "coins!" - done - -_CeladonGameCornerText_48e36:: ; 9dc7f (27:5c7f) - text "Darn! I need more" - line "coins for the" - cont "#MON I want!" - done - -_CeladonGameCornerText_48e88:: ; 9dcad (27:5cad) - text "Hey, what? You're" - line "throwing me off!" - cont "Here are some" - cont "coins, shoo!" - prompt - -_CeladonGameCornerText_48e8d:: ; 9dceb (27:5ceb) - text $52, " received" - line "20 coins!@@" - -_CeladonGameCornerText_48e93:: ; 9dd02 (27:5d02) - text "You've got your" - line "own coins!" - done - -_CeladonGameCornerText_48e98:: ; 9dd1d (27:5d1d) - text "The trick is to" - line "watch the reels" - cont "closely!" - done - -_CeladonGameCornerText_48ece:: ; 9dd47 (27:5d47) - text "I'm guarding this" - line "poster!" - cont "Go away, or else!" - done - -_CeladonGameCornerText_48ed3:: ; 9dd73 (27:5d73) - text "Dang!" - prompt - -_CeladonGameCornerText_48ed8:: ; 9dd7a (27:5d7a) - text "Our hideout might" - line "be discovered! I" - cont "better tell BOSS!" - done - -_CeladonGameCornerText_48f09:: ; 9ddb0 (27:5db0) - text "Hey!" - - para "A switch behind" - line "the poster!?" - cont "Let's push it!@@" - -_CeladonGameCornerText_48f19:: ; 9dde2 (27:5de2) - text "Oops! Forgot the" - line "COIN CASE!" - done - diff --git a/text/maps/celadon_game_corner_1.asm b/text/maps/celadon_game_corner_1.asm new file mode 100644 index 00000000..661c9544 --- /dev/null +++ b/text/maps/celadon_game_corner_1.asm @@ -0,0 +1,182 @@ +_CeladonGameCornerText1:: ; 9d8d5 (27:58d5) + text "Welcome!" + + para "You can exchange" + line "your coins for" + cont "fabulous prizes" + cont "next door." + done + +_CeladonGameCornerText_48d22:: ; 9d91a (27:591a) + text "Welcome to ROCKET" + line "GAME CORNER!" + + para "Do you need some" + line "game coins?" + + para "It's ¥1000 for 50" + line "coins. Would you" + cont "like some?" + done + +_CeladonGameCornerText_48d27:: ; 9d984 (27:5984) + text "Thanks! Here are" + line "your 50 coins!" + done + +_CeladonGameCornerText_48d2c:: ; 9d9a5 (27:59a5) + text "No? Please come" + line "play sometime!" + done + +_CeladonGameCornerText_48d31:: ; 9d9c5 (27:59c5) + text "You can't afford" + line "the coins!" + done + +_CeladonGameCornerText_48d36:: ; 9d9e1 (27:59e1) + text "Oops! Your COIN" + line "CASE is full." + done + +_CeladonGameCornerText_48d3b:: ; 9da00 (27:5a00) + text "You don't have a" + line "COIN CASE!" + done + +_CeladonGameCornerText3:: ; 9da1c (27:5a1c) + text "Keep this quiet." + + para "It's rumored that" + line "this place is run" + cont "by TEAM ROCKET." + done + +_CeladonGameCornerText4:: ; 9da61 (27:5a61) + text "I think these" + line "machines have" + cont "different odds." + done + +_CeladonGameCornerText_48d9c:: ; 9da8e (27:5a8e) + text "Kid, do you want" + line "to play?" + prompt + +_Received10CoinsText:: ; 9daa9 (27:5aa9) + text $52, " received" + line "10 coins!@@" + +_CeladonGameCornerText_48da7:: ; 9dac0 (27:5ac0) + text "You don't need my" + line "coins!" + done + +_CeladonGameCornerText_48dac:: ; 9dad9 (27:5ad9) + text "Wins seem to come" + line "and go." + done + +_CeladonGameCornerText6:: ; 9daf4 (27:5af4) + text "I'm having a" + line "wonderful time!" + done + +_CeladonGameCornerText_48dca:: ; 9db11 (27:5b11) + text "Hey!" + + para "You have better" + line "things to do," + cont "champ in making!" + + para "CELADON GYM's" + line "LEADER is ERIKA!" + cont "She uses grass-" + cont "type #MON!" + + para "She might appear" + line "docile, but don't" + cont "be fooled!" + done + +_CeladonGameCornerText_48dcf:: ; 9dbac (27:5bac) + text "They offer rare" + line "#MON that can" + cont "be exchanged for" + cont "your coins." + + para "But, I just can't" + line "seem to win!" + done + +_CeladonGameCornerText8:: ; 9dc06 (27:5c06) + text "Games are scary!" + line "It's so easy to" + cont "get hooked!" + done + +_CeladonGameCornerText_48e26:: ; 9dc33 (27:5c33) + text "What's up? Want" + line "some coins?" + prompt + +_Received20CoinsText:: ; 9dc4f (27:5c4f) + text $52, " received" + line "20 coins!@@" + +_CeladonGameCornerText_48e31:: ; 9dc66 (27:5c66) + text "You have lots of" + line "coins!" + done + +_CeladonGameCornerText_48e36:: ; 9dc7f (27:5c7f) + text "Darn! I need more" + line "coins for the" + cont "#MON I want!" + done + +_CeladonGameCornerText_48e88:: ; 9dcad (27:5cad) + text "Hey, what? You're" + line "throwing me off!" + cont "Here are some" + cont "coins, shoo!" + prompt + +_CeladonGameCornerText_48e8d:: ; 9dceb (27:5ceb) + text $52, " received" + line "20 coins!@@" + +_CeladonGameCornerText_48e93:: ; 9dd02 (27:5d02) + text "You've got your" + line "own coins!" + done + +_CeladonGameCornerText_48e98:: ; 9dd1d (27:5d1d) + text "The trick is to" + line "watch the reels" + cont "closely!" + done + +_CeladonGameCornerText_48ece:: ; 9dd47 (27:5d47) + text "I'm guarding this" + line "poster!" + cont "Go away, or else!" + done + +_CeladonGameCornerText_48ed3:: ; 9dd73 (27:5d73) + text "Dang!" + prompt + +_CeladonGameCornerText_48ed8:: ; 9dd7a (27:5d7a) + text "Our hideout might" + line "be discovered! I" + cont "better tell BOSS!" + done + +_CeladonGameCornerText_48f09:: ; 9ddb0 (27:5db0) + text "Hey!" + + para "A switch behind" + line "the poster!?" + cont "Let's push it!@@" + diff --git a/text/maps/celadon_game_corner_2.asm b/text/maps/celadon_game_corner_2.asm new file mode 100755 index 00000000..c705665b --- /dev/null +++ b/text/maps/celadon_game_corner_2.asm @@ -0,0 +1,5 @@ +_CeladonGameCornerText_48f19:: ; 9dde2 (27:5de2) + text "Oops! Forgot the" + line "COIN CASE!" + done + diff --git a/text/maps/celadon_mansion_1f.asm b/text/maps/celadon_mansion_1f.asm index 7ea36a1a..f5b06c3f 100644 --- a/text/maps/celadon_mansion_1f.asm +++ b/text/maps/celadon_mansion_1f.asm @@ -1,14 +1,6 @@ _CeladonMansion1Text1:: ; 9ceee (27:4eee) text "MEOWTH: Meow!@@" -_CeladonMansion1Text2:: ; 9cefe (27:4efe) - text "My dear #MON" - line "keep me company." - - para "MEOWTH even brings" - line "money home!" - done - _CeladonMansion1Text3:: ; 9cf3c (27:4f3c) text "CLEFAIRY: Pi" line "pippippi!@@" @@ -22,3 +14,52 @@ _CeladonMansion1Text5:: ; 9cf6b (27:4f6b) line "Manager's Suite" done +_CeladonMansion1Text2:: ; 9cefe (27:4efe) + text "My dear #MON" + line "keep me company." + + para "MEOWTH even brings" + line "money home!" + done + +_CeladonMansion1Text6:: + text "Oh, you have an" + line "adorable PIKACHU" + cont "with you.@@" + +_CeladonMansion1Text7:: + text "It seems like it" + line "hasn't been tamed" + cont "at all." + done + +_CeladonMansion1Text8:: + text "Why don't you" + line "take more care" + cont "with PIKACHU?" + done + +_CeladonMansion1Text9:: + text "You must be happy" + line "to have a #MON" + cont "that cute." + done + +_CeladonMansion1Text10:: + text "Your PIKACHU seems" + line "tamed." + done + +_CeladonMansion1Text11:: + text "Your PIKACHU looks" + line "happy with you." + done + +_CeladonMansion1Text12:: + text "You look like a" + line "fantastic duo." + + para "You're making me" + line "jealous!" + done + diff --git a/text/maps/celadon_mansion_3f.asm b/text/maps/celadon_mansion_3f.asm index 06220b23..490000e0 100644 --- a/text/maps/celadon_mansion_3f.asm +++ b/text/maps/celadon_mansion_3f.asm @@ -3,12 +3,48 @@ _ProgrammerText:: ; 9cfa4 (27:4fa4) line "programmer!" done +_ProgrammerText2:: + text "Me? I'm the" + line "programmer!" + + para "What a surprise!" + line "I never expected" + cont "anyone to fill a" + cont "#DEX." + done + _GraphicArtistText:: ; 9cfbc (27:4fbc) text "I'm the graphic" line "artist!" cont "I drew you!" done +_GraphicArtistText2:: + text "I'm the graphic" + line "artist!" + + para "Wow, you finished" + line "your #DEX!" + cont "Want me to PRINT" + cont "out a DIPLOMA" + cont "as proof?" + done + +_GraphicArtistText3:: + text "Just tell me if" + line "you want to PRINT" + cont "out a DIPLOMA." + done + +_GraphicArtistText4:: + text "All done!" + done + +_GraphicArtistText5:: + text "OK, let's not" + line "PRINT." + done + _WriterText:: ; 9cfe0 (27:4fe0) text "I wrote the story!" line "Isn't ERIKA cute?" @@ -20,6 +56,14 @@ _WriterText:: ; 9cfe0 (27:4fe0) line "I like her!" done +_WriteText2:: + text "I wrote the story!" + + para "It's great you" + line "caught all the" + cont "#MON! Thanks!" + done + _GameDesignerText:: ; 9d03a (27:503a) text "Is that right?" @@ -41,6 +85,13 @@ _CompletedDexText:: ; 9d0ad (27:50ad) cont "Congratulations!" cont "...@@" +_CompletedDexText2:: + text "Go show off your" + line "DIPLOMA to" + cont "the development" + cont "crew." + done + _CeladonMansion3Text5:: ; 9d0ed (27:50ed) text "It's the game" line "program! Messing" diff --git a/text/maps/cerulean_badge_house.asm b/text/maps/cerulean_badge_house.asm deleted file mode 100644 index d546066a..00000000 --- a/text/maps/cerulean_badge_house.asm +++ /dev/null @@ -1,106 +0,0 @@ -_CeruleanHouse2Text_74e77:: ; 990c9 (26:50c9) - text "#MON BADGEs" - line "are owned only by" - cont "skilled trainers." - - para "I see you have" - line "at least one." - - para "Those BADGEs have" - line "amazing secrets!" - prompt - -_CeruleanHouse2Text_74e7c:: ; 9913a (26:513a) - text "Now then..." - - para "Which of the 8" - line "BADGEs should I" - cont "describe?" - done - -_CeruleanHouse2Text_74e81:: ; 99170 (26:5170) -IF DEF(_YELLOW) - text "Come visit me any-" -ELSE - text "Come visit me any" -ENDC - line "time you wish." - done - -_CeruleanHouse2Text_74e96:: ; 99192 (26:5192) - text "The ATTACK of all" - line "#MON increases" - cont "a little bit." - - para "It also lets you" -IF DEF(_YELLOW) - line "use FLASH any-" -ELSE - line "use FLASH any" -ENDC - cont "time you desire." - prompt - -_CeruleanHouse2Text_74e9b:: ; 991f2 (26:51f2) - text "#MON up to L30" - line "will obey you." - - para "Any higher, they" - line "become unruly!" - - para "It also lets you" - line "use CUT outside" - cont "of battle." - prompt - -_CeruleanHouse2Text_74ea0:: ; 9925d (26:525d) - text "The SPEED of all" - line "#MON increases" - cont "a little bit." - - para "It also lets you" - line "use FLY outside" - cont "of battle." - prompt - -_CeruleanHouse2Text_74ea5:: ; 992b8 (26:52b8) - text "#MON up to L50" - line "will obey you." - - para "Any higher, they" - line "become unruly!" - - para "It also lets you" - line "use STRENGTH out-" - cont "side of battle." - prompt - -_CeruleanHouse2Text_74eaa:: ; 9932a (26:532a) - text "The DEFENSE of all" - line "#MON increases" - cont "a little bit." - - para "It also lets you" - line "use SURF outside" - cont "of battle." - prompt - -_CeruleanHouse2Text_74eaf:: ; 99388 (26:5388) - text "#MON up to L70" - line "will obey you." - - para "Any higher, they" - line "become unruly!" - prompt - -_CeruleanHouse2Text_74eb4:: ; 993c7 (26:53c7) - text "Your #MON's" - line "SPECIAL abilities" - cont "increase a bit." - prompt - -_CeruleanHouse2Text_74eb9:: ; 993f5 (26:53f5) - text "All #MON will" - line "obey you!" - prompt - diff --git a/text/maps/cerulean_badge_house_1.asm b/text/maps/cerulean_badge_house_1.asm new file mode 100644 index 00000000..ad57f00e --- /dev/null +++ b/text/maps/cerulean_badge_house_1.asm @@ -0,0 +1,77 @@ +_CeruleanHouse2Text_74e77:: ; 990c9 (26:50c9) + text "#MON BADGEs" + line "are owned only by" + cont "skilled trainers." + + para "I see you have" + line "at least one." + + para "Those BADGEs have" + line "amazing secrets!" + prompt + +_CeruleanHouse2Text_74e7c:: ; 9913a (26:513a) + text "Now then..." + + para "Which of the 8" + line "BADGEs should I" + cont "describe?" + done + +_CeruleanHouse2Text_74e81:: ; 99170 (26:5170) +IF DEF(_YELLOW) + text "Come visit me any-" +ELSE + text "Come visit me any" +ENDC + line "time you wish." + done + +_CeruleanHouse2Text_74e96:: ; 99192 (26:5192) + text "The ATTACK of all" + line "#MON increases" + cont "a little bit." + + para "It also lets you" +IF DEF(_YELLOW) + line "use FLASH any-" +ELSE + line "use FLASH any" +ENDC + cont "time you desire." + prompt + +_CeruleanHouse2Text_74e9b:: ; 991f2 (26:51f2) + text "#MON up to L30" + line "will obey you." + + para "Any higher, they" + line "become unruly!" + + para "It also lets you" + line "use CUT outside" + cont "of battle." + prompt + +_CeruleanHouse2Text_74ea0:: ; 9925d (26:525d) + text "The SPEED of all" + line "#MON increases" + cont "a little bit." + + para "It also lets you" + line "use FLY outside" + cont "of battle." + prompt + +_CeruleanHouse2Text_74ea5:: ; 992b8 (26:52b8) + text "#MON up to L50" + line "will obey you." + + para "Any higher, they" + line "become unruly!" + + para "It also lets you" + line "use STRENGTH out-" + cont "side of battle." + prompt + diff --git a/text/maps/cerulean_badge_house_2.asm b/text/maps/cerulean_badge_house_2.asm new file mode 100755 index 00000000..5b43d5f5 --- /dev/null +++ b/text/maps/cerulean_badge_house_2.asm @@ -0,0 +1,29 @@ +_CeruleanHouse2Text_74eaa:: ; 9932a (26:532a) + text "The DEFENSE of all" + line "#MON increases" + cont "a little bit." + + para "It also lets you" + line "use SURF outside" + cont "of battle." + prompt + +_CeruleanHouse2Text_74eaf:: ; 99388 (26:5388) + text "#MON up to L70" + line "will obey you." + + para "Any higher, they" + line "become unruly!" + prompt + +_CeruleanHouse2Text_74eb4:: ; 993c7 (26:53c7) + text "Your #MON's" + line "SPECIAL abilities" + cont "increase a bit." + prompt + +_CeruleanHouse2Text_74eb9:: ; 993f5 (26:53f5) + text "All #MON will" + line "obey you!" + prompt + diff --git a/text/maps/cerulean_gym.asm b/text/maps/cerulean_gym.asm index f4234fc4..359d8d1c 100644 --- a/text/maps/cerulean_gym.asm +++ b/text/maps/cerulean_gym.asm @@ -86,7 +86,8 @@ ENDC para "You can have the" line "CASCADEBADGE to" - cont "show you beat me!@@" + cont "show you beat me!" + prompt _CeruleanGymBattleText1:: ; 98c05 (26:4c05) text "I'm more than good" diff --git a/text/maps/cerulean_trade_house.asm b/text/maps/cerulean_trade_house.asm index c22f24a9..791c11d5 100644 --- a/text/maps/cerulean_trade_house.asm +++ b/text/maps/cerulean_trade_house.asm @@ -1,6 +1,8 @@ -IF DEF(_YELLOW) MelanieText1:: - text "I nursed this" + text "I take care of" + line "injured #MON." + + para "I nursed this" line "BULBASAUR back to" cont "health." @@ -35,14 +37,3 @@ MelanieOddishText:: MelanieSandshrewText:: text "SANDSHREW: Pikii!@@" -ENDC - -_CeruleanHouse1Text1:: ; 9888c (26:488c) - text "My husband likes" - line "trading #MON." - - para "If you are a" - line "collector, would" - cont "you please trade" - cont "with him?" - done diff --git a/text/maps/cinnabar_gym.asm b/text/maps/cinnabar_gym.asm index c3208a84..d60d92bb 100644 --- a/text/maps/cinnabar_gym.asm +++ b/text/maps/cinnabar_gym.asm @@ -208,3 +208,46 @@ _CinnabarGymText_75ac7:: ; a0dd9 (28:4dd9) line "that fire brand!" done +_CinnabarGymText_1:: + text "This GYM is also" + line "known as the QUIZ" + cont "GYM." + + para "You have to take a" + line "quiz if you want" + cont "to see BLAINE." + + para "You don't have to" + line "fight us if you" + cont "get it right." + done + +_CinnabarGymText_2:: + text "Think you can do" + line "it?" + done + +_CinnabarGymText_3:: + text "This one's tricky!" + done + +_CinnabarGymText_4:: + text "#MON enjoy" + line "quizzes too!" + done + +_CinnabarGymText_5:: + text "I like it here at" + line "QUIZ GYM." + done + +_CinnabarGymText_6:: + text "This is the last" + line "question." + done + +_CinnabarGymText_7:: + text "Come on, answer" + line "the question!" + done + diff --git a/text/maps/copycats_house_1f.asm b/text/maps/copycats_house_1f.asm index da99566b..5cef55c6 100644 --- a/text/maps/copycats_house_1f.asm +++ b/text/maps/copycats_house_1f.asm @@ -16,10 +16,5 @@ _CopycatsHouse1FText2:: ; a1535 (28:5535) done _CopycatsHouse1FText3:: ; a1596 (28:5596) -IF DEF(_YELLOW) - text "CHANSEY: Chaan" + text "CHANSEY: Chaaan" line "sey!@@" -ELSE - text "CHANSEY: Chaan!" - line "Sii!@@" -ENDC diff --git a/text/maps/daycare.asm b/text/maps/daycare.asm new file mode 100644 index 00000000..93154595 --- /dev/null +++ b/text/maps/daycare.asm @@ -0,0 +1,99 @@ +_DayCareMText_5640f:: ; 8ab95 (22:6b95) + text "I run a DAYCARE." + line "Would you like me" + cont "to raise one of" + cont "your #MON?" + done + +_DayCareMText_56414:: ; 8abd4 (22:6bd4) + text "Which #MON" + line "should I raise?" + prompt + +_DayCareMText_56419:: ; 8abf0 (22:6bf0) + text "Fine, I'll look" + line "after @" + TX_RAM wcd6d + db $0 + cont "for a while." + prompt + +_DayCareMText_5641e:: ; 8ac19 (22:6c19) + text "Come see me in" + line "a while." + done + +_DayCareMText_56423:: ; 8ac32 (22:6c32) + text "Your @" + TX_RAM wcd6d + db $0 + line "has grown a lot!" + + para "By level, it's" + line "grown by @" + +DayCareMText_8ac67:: ; 8ac67 (22:6c67) + TX_NUM wTrainerEngageDistance,$1,$3 + text "!" + + para "Aren't I great?" + prompt + +_DayCareMText_56428:: ; 8ac7d (22:6c7d) + text "You owe me ¥@" + TX_BCD wcd3f, $c2 + db $0 + line "for the return" + cont "of this #MON." + done + +_DayCareMText_5642d:: ; 8acae (22:6cae) + text $52, " got" + line "@" + TX_RAM W_DAYCAREMONNAME + text " back!" + done + +_DayCareMText_56432:: ; 8acc1 (22:6cc1) + text "Back already?" + line "Your @" + TX_RAM wcd6d + db $0 + cont "needs some more" + cont "time with me." + prompt + +_DayCareMText_56437:: ; 8c000 (23:4000) + text "All right then," + line "@@" + +_DayCareMText_5643b:: ; 8c013 (23:4013) + text "Come again." + done + +_DayCareMText_56440:: ; 8c020 (23:4020) + text "You have no room" + line "for this #MON!" + done + +_DayCareMText_56445:: ; 8c041 (23:4041) + text "You only have one" + line "#MON with you." + done + +_DayCareMText_5644a:: ; 8c063 (23:4063) + text "I can't accept a" + line "#MON that" + cont "knows an HM move." + done + +_DayCareMText_5644f:: ; 8c090 (23:4090) + text "Thank you! Here's" + line "your #MON!" + prompt + +_DayCareMText_56454:: ; 8c0ad (23:40ad) + text "Hey, you don't" + line "have enough ¥!" + done + diff --git a/text/maps/daycare_1.asm b/text/maps/daycare_1.asm deleted file mode 100644 index a4182351..00000000 --- a/text/maps/daycare_1.asm +++ /dev/null @@ -1,65 +0,0 @@ -_DayCareMText_5640f:: ; 8ab95 (22:6b95) - text "I run a DAYCARE." - line "Would you like me" - cont "to raise one of" - cont "your #MON?" - done - -_DayCareMText_56414:: ; 8abd4 (22:6bd4) - text "Which #MON" - line "should I raise?" - prompt - -_DayCareMText_56419:: ; 8abf0 (22:6bf0) - text "Fine, I'll look" - line "after @" - TX_RAM wcd6d - db $0 - cont "for a while." - prompt - -_DayCareMText_5641e:: ; 8ac19 (22:6c19) - text "Come see me in" - line "a while." - done - -_DayCareMText_56423:: ; 8ac32 (22:6c32) - text "Your @" - TX_RAM wcd6d - db $0 - line "has grown a lot!" - - para "By level, it's" - line "grown by @" - -DayCareMText_8ac67:: ; 8ac67 (22:6c67) - TX_NUM wTrainerEngageDistance,$1,$3 - text "!" - - para "Aren't I great?" - prompt - -_DayCareMText_56428:: ; 8ac7d (22:6c7d) - text "You owe me ¥@" - TX_BCD wcd3f, $c2 - db $0 - line "for the return" - cont "of this #MON." - done - -_DayCareMText_5642d:: ; 8acae (22:6cae) - text $52, " got" - line "@" - TX_RAM W_DAYCAREMONNAME - text " back!" - done - -_DayCareMText_56432:: ; 8acc1 (22:6cc1) - text "Back already?" - line "Your @" - TX_RAM wcd6d - db $0 - cont "needs some more" - cont "time with me." - prompt - diff --git a/text/maps/daycare_2.asm b/text/maps/daycare_2.asm deleted file mode 100644 index c6478a76..00000000 --- a/text/maps/daycare_2.asm +++ /dev/null @@ -1,38 +0,0 @@ -_DayCareMText_56437:: ; 8c000 (23:4000) - text "All right then," - line "@@" - -_DayCareMText_5643b:: ; 8c013 (23:4013) -IF DEF(_YELLOW) - text "Come again." -ELSE - text "come again." -ENDC - done - -_DayCareMText_56440:: ; 8c020 (23:4020) - text "You have no room" - line "for this #MON!" - done - -_DayCareMText_56445:: ; 8c041 (23:4041) - text "You only have one" - line "#MON with you." - done - -_DayCareMText_5644a:: ; 8c063 (23:4063) - text "I can't accept a" - line "#MON that" - cont "knows an HM move." - done - -_DayCareMText_5644f:: ; 8c090 (23:4090) - text "Thank you! Here's" - line "your #MON!" - prompt - -_DayCareMText_56454:: ; 8c0ad (23:40ad) - text "Hey, you don't" - line "have enough ¥!" - done - diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm index bb1ca0f0..cb47a8f0 100644 --- a/text/maps/fan_club.asm +++ b/text/maps/fan_club.asm @@ -113,7 +113,7 @@ FanClubChairStoryText:: cont "love it!" para "Hug it...when..." - cont "sleeping...warm" + line "sleeping...warm" cont "and cuddly..." cont "spectacular..." cont "ravishing..." @@ -210,14 +210,3 @@ ENDC cont "#MON." done -_FanClubText7:: ; 9a970 (26:6970) - text "Let's all listen" - line "politely to other" - cont "trainers!" - done - -_FanClubText8:: ; 9a99d (26:699d) - text "If someone brags," - line "brag right back!" - done - diff --git a/text/maps/fuchsia_gym.asm b/text/maps/fuchsia_gym.asm new file mode 100644 index 00000000..e93b85ea --- /dev/null +++ b/text/maps/fuchsia_gym.asm @@ -0,0 +1,221 @@ +_UnnamedText_75581:: ; 9e9b1 (27:69b1) + text "KOGA: Fwahahaha!" + + para "A mere child like" + line "you dares to" + cont "challenge me?" + + para "Very well, I" + line "shall show you" + cont "true terror as a" + cont "ninja master!" + + para "You shall feel" + line "the despair of" + cont "poison and sleep" + cont "techniques!" + done + +_UnnamedText_75586:: ; 9ea66 (27:6a66) + text "Humph!" + line "You have proven" + cont "your worth!" + + para "Here! Take the" + line "SOULBADGE!" + prompt + +_UnnamedText_7558b:: ; a0000 (28:4000) + text "When afflicted by" + line "TOXIC, #MON" + cont "suffer more and" + cont "more as battle" + cont "progresses!" + + para "It will surely" + line "terrorize foes!" + done + +_UnnamedText_75590:: ; a0069 (28:4069) + text "Now that you have" + line "the SOULBADGE," + cont "the DEFENSE of" + cont "your #MON" + cont "increases!" + + para "It also lets you" + line "SURF outside of" + cont "battle!" + + para "Ah! Take this" + line "too!" + done + +_ReceivedTM06Text:: ; a00eb (28:40eb) + text $52, " received" + line "@" + TX_RAM wcf4b + text "!@@" + +_TM06ExplanationText:: ; a00ff (28:40ff) + db $0 + para "TM06 contains" + line "TOXIC!" + + para "It is a secret" + line "technique over" + cont "400 years old!" + done + +_TM06NoRoomText:: ; a0143 (28:4143) + text "Make space for" + line "this, child!" + done + +_FuchsiaGymBattleText1:: ; a0160 (28:4160) + text "Strength isn't" + line "the key for" + cont "#MON!" + + para "It's strategy!" + + para "I'll show you how" + line "strategy can beat" + cont "brute strength!" + done + +_FuchsiaGymEndBattleText1:: ; a01c2 (28:41c2) + text "What?" + line "Extraordinary!" + prompt + +_FuchsiaGymAfterBattleText1:: ; a01d8 (28:41d8) + text "So, you mix brawn" + line "with brains?" + cont "Good strategy!" + done + +_FuchsiaGymBattleText2:: ; a0207 (28:4207) + text "I wanted to become" + line "a ninja, so I" + cont "joined this GYM!" + done + +_FuchsiaGymEndBattleText2:: ; a023a (28:423a) + text "I'm done" + line "for!" + prompt + +_FuchsiaGymAfterBattleText2:: ; a0248 (28:4248) + text "I will keep on" + line "training under" + cont "KOGA, my ninja" + cont "master!" + done + +_FuchsiaGymBattleText3:: ; a027e (28:427e) + text "Let's see you" + line "beat my special" + cont "techniques!" + done + +_FuchsiaGymEndBattleText3:: ; a02a8 (28:42a8) + text "You" + line "had me fooled!" + prompt + +_FuchsiaGymAfterBattleText3:: ; a02bc (28:42bc) + text "I like poison and" + line "sleep techniques," + cont "as they linger" + cont "after battle!" + done + +_FuchsiaGymBattleText4:: ; a02fe (28:42fe) + text "Stop right there!" + + para "Our invisible" + line "walls have you" + cont "frustrated?" + done + +_FuchsiaGymEndBattleText4:: ; a033a (28:433a) + text "Whoa!" + line "He's got it!" + prompt + +_FuchsiaGymAfterBattleText4:: ; a034d (28:434d) + text "You impressed me!" + line "Here's a hint!" + + para "Look very closely" + line "for gaps in the" + cont "invisible walls!" + done + +_FuchsiaGymBattleText5:: ; a03a1 (28:43a1) + text "I also study the" + line "way of the ninja" + cont "with master KOGA!" + + para "Ninja have a long" + line "history of using" + cont "animals!" + done + +_FuchsiaGymEndBattleText5:: ; a0402 (28:4402) + text "Awoo!" + prompt + +_FuchsiaGymAfterBattleText5:: ; a0409 (28:4409) + text "I still have much" + line "to learn!" + done + +_FuchsiaGymBattleText6:: ; a0426 (28:4426) + text "Master KOGA comes" + line "from a long line" + cont "of ninjas!" + + para "What did you" + line "descend from?" + done + +_FuchsiaGymEndBattleText6:: ; a0470 (28:4470) + text "Dropped" + line "my balls!" + prompt + +_FuchsiaGymAfterBattleText6:: ; a0483 (28:4483) + text "Where there is" + line "light, there is" + cont "shadow!" + + para "Light and shadow!" + line "Which do you" + cont "choose?" + done + +_UnnamedText_7564e:: ; a04d2 (28:44d2) + text "Yo! Champ in" + line "making!" + + para "FUCHSIA GYM is" + line "riddled with" + cont "invisible walls!" + + para "KOGA might appear" + line "close, but he's" + cont "blocked off!" + + para "You have to find" + line "gaps in the walls" + cont "to reach him!" + done + +_UnnamedText_75653:: ; a0574 (28:4574) + text "It's amazing how" + line "ninja can terrify" + cont "even now!" + done + diff --git a/text/maps/fuchsia_gym_1.asm b/text/maps/fuchsia_gym_1.asm deleted file mode 100644 index ded9b911..00000000 --- a/text/maps/fuchsia_gym_1.asm +++ /dev/null @@ -1,27 +0,0 @@ -_UnnamedText_75581:: ; 9e9b1 (27:69b1) - text "KOGA: Fwahahaha!" - - para "A mere child like" - line "you dares to" - cont "challenge me?" - - para "Very well, I" - line "shall show you" - cont "true terror as a" - cont "ninja master!" - - para "You shall feel" - line "the despair of" - cont "poison and sleep" - cont "techniques!" - done - -_UnnamedText_75586:: ; 9ea66 (27:6a66) - text "Humph!" - line "You have proven" - cont "your worth!" - - para "Here! Take the" - line "SOULBADGE!" - prompt - diff --git a/text/maps/fuchsia_gym_2.asm b/text/maps/fuchsia_gym_2.asm deleted file mode 100644 index e0cb6807..00000000 --- a/text/maps/fuchsia_gym_2.asm +++ /dev/null @@ -1,194 +0,0 @@ -_UnnamedText_7558b:: ; a0000 (28:4000) - text "When afflicted by" - line "TOXIC, #MON" - cont "suffer more and" - cont "more as battle" - cont "progresses!" - - para "It will surely" - line "terrorize foes!" - done - -_UnnamedText_75590:: ; a0069 (28:4069) - text "Now that you have" - line "the SOULBADGE," - cont "the DEFENSE of" - cont "your #MON" - cont "increases!" - - para "It also lets you" - line "SURF outside of" - cont "battle!" - - para "Ah! Take this" - line "too!" - done - -_ReceivedTM06Text:: ; a00eb (28:40eb) - text $52, " received" - line "@" - TX_RAM wcf4b - text "!@@" - -_TM06ExplanationText:: ; a00ff (28:40ff) - db $0 - para "TM06 contains" - line "TOXIC!" - - para "It is a secret" - line "technique over" - cont "400 years old!" - done - -_TM06NoRoomText:: ; a0143 (28:4143) - text "Make space for" - line "this, child!" - done - -_FuchsiaGymBattleText1:: ; a0160 (28:4160) - text "Strength isn't" - line "the key for" - cont "#MON!" - - para "It's strategy!" - - para "I'll show you how" - line "strategy can beat" - cont "brute strength!" - done - -_FuchsiaGymEndBattleText1:: ; a01c2 (28:41c2) - text "What?" - line "Extraordinary!" - prompt - -_FuchsiaGymAfterBattleText1:: ; a01d8 (28:41d8) - text "So, you mix brawn" - line "with brains?" - cont "Good strategy!" - done - -_FuchsiaGymBattleText2:: ; a0207 (28:4207) - text "I wanted to become" - line "a ninja, so I" - cont "joined this GYM!" - done - -_FuchsiaGymEndBattleText2:: ; a023a (28:423a) - text "I'm done" - line "for!" - prompt - -_FuchsiaGymAfterBattleText2:: ; a0248 (28:4248) - text "I will keep on" - line "training under" - cont "KOGA, my ninja" - cont "master!" - done - -_FuchsiaGymBattleText3:: ; a027e (28:427e) - text "Let's see you" - line "beat my special" - cont "techniques!" - done - -_FuchsiaGymEndBattleText3:: ; a02a8 (28:42a8) - text "You" - line "had me fooled!" - prompt - -_FuchsiaGymAfterBattleText3:: ; a02bc (28:42bc) - text "I like poison and" - line "sleep techniques," - cont "as they linger" - cont "after battle!" - done - -_FuchsiaGymBattleText4:: ; a02fe (28:42fe) - text "Stop right there!" - - para "Our invisible" - line "walls have you" - cont "frustrated?" - done - -_FuchsiaGymEndBattleText4:: ; a033a (28:433a) - text "Whoa!" - line "He's got it!" - prompt - -_FuchsiaGymAfterBattleText4:: ; a034d (28:434d) - text "You impressed me!" - line "Here's a hint!" - - para "Look very closely" - line "for gaps in the" - cont "invisible walls!" - done - -_FuchsiaGymBattleText5:: ; a03a1 (28:43a1) - text "I also study the" - line "way of the ninja" - cont "with master KOGA!" - - para "Ninja have a long" - line "history of using" - cont "animals!" - done - -_FuchsiaGymEndBattleText5:: ; a0402 (28:4402) - text "Awoo!" - prompt - -_FuchsiaGymAfterBattleText5:: ; a0409 (28:4409) - text "I still have much" - line "to learn!" - done - -_FuchsiaGymBattleText6:: ; a0426 (28:4426) - text "Master KOGA comes" - line "from a long line" - cont "of ninjas!" - - para "What did you" - line "descend from?" - done - -_FuchsiaGymEndBattleText6:: ; a0470 (28:4470) - text "Dropped" - line "my balls!" - prompt - -_FuchsiaGymAfterBattleText6:: ; a0483 (28:4483) - text "Where there is" - line "light, there is" - cont "shadow!" - - para "Light and shadow!" - line "Which do you" - cont "choose?" - done - -_UnnamedText_7564e:: ; a04d2 (28:44d2) - text "Yo! Champ in" - line "making!" - - para "FUCHSIA GYM is" - line "riddled with" - cont "invisible walls!" - - para "KOGA might appear" - line "close, but he's" - cont "blocked off!" - - para "You have to find" - line "gaps in the walls" - cont "to reach him!" - done - -_UnnamedText_75653:: ; a0574 (28:4574) - text "It's amazing how" - line "ninja can terrify" - cont "even now!" - done - diff --git a/text/maps/mt_moon_b2f.asm b/text/maps/mt_moon_b2f.asm index 64823871..d661e590 100644 --- a/text/maps/mt_moon_b2f.asm +++ b/text/maps/mt_moon_b2f.asm @@ -6,7 +6,7 @@ _MtMoonJessieJamesText2:: text "That fossil is" line "TEAM ROCKET's!" - para "Surrender now, or" + para "Surrender now, or " line "prepare to fight!" done @@ -75,24 +75,6 @@ _MtMoon3Text_49f99:: ; 80a93 (20:4a93) text "All right. Then" line "this is mine!@@" -_MtMoon3BattleText2:: ; 80ab3 (20:4ab3) - text "TEAM ROCKET will" - line "find the fossils," - cont "revive and sell" - cont "them for cash!" - done - -_MtMoon3EndBattleText2:: ; 80af6 (20:4af6) - text "Urgh!" - line "Now I'm mad!" - prompt - -_MtMoon3AfterBattleText2:: ; 80b09 (20:4b09) - text "You made me mad!" - line "TEAM ROCKET will" - cont "blacklist you!" - done - _MtMoon3BattleText3:: ; 80b3b (20:4b3b) text "We, TEAM ROCKET," line "are #MON" diff --git a/text/maps/mt_moon_pokecenter.asm b/text/maps/mt_moon_pokecenter.asm index 2ae50a13..ca032c91 100644 --- a/text/maps/mt_moon_pokecenter.asm +++ b/text/maps/mt_moon_pokecenter.asm @@ -16,6 +16,10 @@ _MtMoonPokecenterText3:: ; 8a929 (22:6929) cont "news!" done +_MtMoonPokecenterText5:: ; 8aa5a (22:6a5a) + db $0 + done + _MtMoonPokecenterText_4935c:: ; 8a976 (22:6976) text "MAN: Hello, there!" line "Have I got a deal" @@ -43,7 +47,3 @@ _MtMoonPokecenterText_4936b:: ; 8aa39 (22:6a39) line "give refunds!" done -_MtMoonPokecenterText5:: ; 8aa5a (22:6a5a) - db $0 - done - diff --git a/text/maps/museum_2f.asm b/text/maps/museum_2f.asm index 46238725..31a57b58 100644 --- a/text/maps/museum_2f.asm +++ b/text/maps/museum_2f.asm @@ -33,7 +33,6 @@ _Museum2FText5:: ; 96911 (25:6911) line "soon, I promise!" done -IF DEF(_YELLOW) _Museum2FPikachuText1:: text "Your PIKACHU looks" line "untamed." @@ -46,7 +45,7 @@ _Museum2FPikachuText2:: line "that PIKACHU off" cont "you, but it's too" cont "attached to you." -ENDC + done _Museum2FText6:: ; 96933 (25:6933) text "SPACE SHUTTLE" diff --git a/text/maps/oaks_lab.asm b/text/maps/oaks_lab.asm index 58f55b85..b4b77ed1 100644 --- a/text/maps/oaks_lab.asm +++ b/text/maps/oaks_lab.asm @@ -1,128 +1,53 @@ -_OaksLabGaryText1:: ; 94d5b (25:4d5b) +_OaksLabGaryText1:: text $53,": Yo" line $52,"! Gramps" cont "isn't around!" -IF DEF(_YELLOW) para "I ran here 'cos" line "he said he had a" cont "#MON for me." -ENDC done -_OaksLabText40:: ; 94d79 (25:4d79) -IF DEF(_YELLOW) +_OaksLabText40:: text $53,": Humph!" line "I'll get a better" cont "#MON than you!" done -ELSE - text $53,": Heh, I" - line "don't need to be" - cont "greedy like you!" - para "Go ahead and" - line "choose, ", $52, "!" - done -ENDC - -_OaksLabText41:: ; 94dbd (25:4dbd) -IF DEF(_YELLOW) +_OaksLabText41:: text $53,": Heh, my" -ELSE - text $53,": My" -ENDC line "#MON looks a" cont "lot stronger." done -_OaksLabText39:: ; 94ddf (25:4ddf) -IF DEF(_YELLOW) +_OaksLabText39:: text "That's a #" line "BALL. There's a" cont "#MON inside!" done -ELSE - text "Those are #" - line "BALLs. They" - cont "contain #MON!" - done -ENDC -IF DEF(_YELLOW) _OaksLabPikachuText:: text "OAK: Go ahead," line "it's yours!" done -ENDC - -_OaksLabCharmanderText:: ; 94e06 (25:4e06) - text "So! You want the" - line "fire #MON," - cont "CHARMANDER?" - done -_OaksLabSquirtleText:: ; 94e2f (25:4e2f) - text "So! You want the" - line "water #MON," - cont "SQUIRTLE?" - done - -_OaksLabBulbasaurText:: ; 94e57 (25:4e57) - text "So! You want the" - line "plant #MON," - cont "BULBASAUR?" - done - -_OaksLabMonEnergeticText:: ; 94e80 (25:4e80) - text "This #MON is" - line "really energetic!" - prompt - -_OaksLabReceivedMonText:: ; 94ea0 (25:4ea0) - text $52, " received" - line "a @" - TX_RAM wcd6d - text "!@@" - -_OaksLabLastMonText:: ; 94eb6 (25:4eb6) - text "That's PROF.OAK's" - line "last #MON!" - done - -_OaksLabText_1d2f0:: ; 94ed2 (25:4ed2) - text "OAK: Now, ", $52, "," - line "which #MON do" - cont "you want?" - done - -_OaksLabText_1d2f5:: ; 94ef8 (25:4ef8) +_OaksLabText_1d2f5:: text "OAK: If a wild" line "#MON appears," cont "your #MON can" cont "fight against it!" -IF DEF(_YELLOW) para "Afterward, go on" line "to the next town." -ENDC done -_OaksLabText_1d2fa:: ; 94f36 (25:4f36) -IF DEF(_YELLOW) +_OaksLabText_1d2fa:: text "OAK: You should" line "talk to it and" cont "see how it feels." done -ELSE - text "OAK: ", $52, "," - line "raise your young" - cont "#MON by making" - cont "it fight!" - done -ENDC -_OaksLabDeliverParcelText1:: ; 94f69 (25:4f69) +_OaksLabDeliverParcelText1:: text "OAK: Oh, ", $52, "!" para "How is my old" @@ -141,29 +66,25 @@ _OaksLabDeliverParcelText1:: ; 94f69 (25:4f69) para $52, " delivered" line "OAK's PARCEL.@@" -_OaksLabDeliverParcelText2:: ; 9500f (25:500f) +_OaksLabDeliverParcelText2:: db $0 para "Ah! This is the" line "custom # BALL" cont "I ordered!" -IF DEF(_YELLOW) cont "Thanks, ",$52,"!" para "By the way, I must" line "ask you to do" cont "something for me." -ELSE - cont "Thank you!" -ENDC done -_OaksLabAroundWorldText:: ; 95045 (25:5045) +_OaksLabAroundWorldText:: text "#MON around the" line "world wait for" cont "you, ", $52, "!" done -_OaksLabGivePokeballsText1:: ; 9506d (25:506d) +_OaksLabGivePokeballsText1:: text "OAK: You can't get" line "detailed data on" cont "#MON by just" @@ -177,20 +98,16 @@ _OaksLabGivePokeballsText1:: ; 9506d (25:506d) para $52, " got 5" line "# BALLs!@@" -_OaksLabGivePokeballsText2:: ; 950f2 (25:50f2) +_OaksLabGivePokeballsText2:: db $0 para "When a wild" line "#MON appears," cont "it's fair game." -IF DEF(_YELLOW) para "Just like I showed" line "you, throw a #" -ELSE - para "Just throw a #" -ENDC - line "BALL at it and try" - line "to catch it!" + cont "BALL at it and try" + cont "to catch it!" para "This won't always" line "work, though." @@ -200,7 +117,7 @@ ENDC cont "have to be lucky!" done -_OaksLabPleaseVisitText:: ; 9519e (25:519e) +_OaksLabPleaseVisitText:: text "OAK: Come see me" line "sometimes." @@ -209,7 +126,7 @@ _OaksLabPleaseVisitText:: ; 9519e (25:519e) cont "coming along." done -_OaksLabText_1d31d:: ; 951e9 (25:51e9) +_OaksLabText_1d31d:: text "OAK: Good to see " line "you! How is your " cont "#DEX coming? " @@ -217,17 +134,17 @@ _OaksLabText_1d31d:: ; 951e9 (25:51e9) cont "a look!" prompt -_OaksLabText_1d32c:: ; 95236 (25:5236) +_OaksLabText_1d32c:: text "It's encyclopedia-" line "like, but the" cont "pages are blank!" done -_OaksLabText8:: ; 95268 (25:5268) +_OaksLabText8:: text "?" done -_OaksLabText_1d340:: ; 9526b (25:526b) +_OaksLabText_1d340:: text "PROF.OAK is the" line "authority on" cont "#MON!" @@ -237,14 +154,13 @@ _OaksLabText_1d340:: ; 9526b (25:526b) cont "in high regard!" done -_OaksLabRivalWaitingText:: ; 952bb (25:52bb) +_OaksLabRivalWaitingText:: text $53, ": Gramps!" line "I'm fed up with" cont "waiting!" done -_OaksLabChooseMonText:: ; 952df (25:52df) -IF DEF(_YELLOW) +_OaksLabChooseMonText:: text "OAK: Hmm? ",$53,"?" line "Why are you here" cont "already?" @@ -266,55 +182,19 @@ IF DEF(_YELLOW) para "You may have it!" line "Go on, take it!" done -ELSE - text "OAK: ", $53, "?" - line "Let me think..." - para "Oh, that's right," - line "I told you to" - cont "come! Just wait!" - - para "Here, ", $52, "!" - - para "There are 3" - line "#MON here!" - - para "Haha!" - - para "They are inside" - line "the # BALLs." - - para "When I was young," - line "I was a serious" - cont "#MON trainer!" - - para "In my old age, I" - line "have only 3 left," - cont "but you can have" - cont "one! Choose!" - done -ENDC - -_OaksLabRivalInterjectionText:: ; 953dc (25:53dc) +_OaksLabRivalInterjectionText:: text $53, ": Hey!" line "Gramps! What" cont "about me?" done -_OaksLabBePatientText:: ; 953fc (25:53fc) -IF DEF(_YELLOW) +_OaksLabBePatientText:: text "OAK: Be patient," line $53,", I'll give" cont "you one later." done -ELSE - text "OAK: Be patient!" - line $53, ", you can" - cont "have one too!" - done -ENDC -IF DEF(_YELLOW) _OaksLabRivalTakesText1:: text $53,": No way!" line $52,", I want" @@ -362,28 +242,16 @@ _OaksLabOakGivesText:: _OaksLabReceivedText:: text $52," received" - line "a " + line "a @" TX_RAM $CD6D text "!@@" -ENDC -_OaksLabLeavingText:: ; 95427 (25:5427) +_OaksLabLeavingText:: text "OAK: Hey! Don't go" line "away yet!" done -_OaksLabRivalPickingMonText:: ; 95444 (25:5444) - text $53, ": I'll take" - line "this one, then!" - done - -_OaksLabRivalReceivedMonText:: ; 95461 (25:5461) - text $53, " received" - line "a @" - TX_RAM wcd6d - text "!@@" - -_OaksLabRivalChallengeText:: ; 95477 (25:5477) +_OaksLabRivalChallengeText:: text $53, ": Wait" line $52, "!" cont "Let's check out" @@ -393,19 +261,19 @@ _OaksLabRivalChallengeText:: ; 95477 (25:5477) line "you on!" done -_OaksLabText_1d3be:: ; 954b6 (25:54b6) +_OaksLabText_1d3be:: text "WHAT?" line "Unbelievable!" cont "I picked the" cont "wrong #MON!" prompt -_OaksLabText_1d3c3:: ; 954e4 (25:54e4) +_OaksLabText_1d3c3:: text $53, ": Yeah! Am" line "I great or what?" prompt -_OaksLabRivalToughenUpText:: ; 95502 (25:5502) +_OaksLabRivalToughenUpText:: text $53, ": Okay!" line "I'll make my" cont "#MON fight to" @@ -415,7 +283,6 @@ _OaksLabRivalToughenUpText:: ; 95502 (25:5502) line "Smell you later!" done -IF DEF(_YELLOW) _OaksLabPikachuDislikesPokeballsText1:: text "OAK: What?" done @@ -439,27 +306,19 @@ _OaksLabPikachuDislikesPokeballsText2:: line "and see how it" cont "feels about you." done -ENDC -_OaksLabText21:: ; 95551 (25:5551) +_OaksLabText21:: text $53, ": Gramps!" done -_OaksLabText22:: ; 9555d (25:555d) -IF DEF(_YELLOW) +_OaksLabText22:: text $53,": Gramps," line "my #MON has" cont "grown stronger!" cont "Check it out!" done -ELSE - text $53, ": What did" - line "you call me for?" - done -ENDC -_OaksLabText23:: ; 9557b (25:557b) -IF DEF(_YELLOW) +_OaksLabText23:: text "OAK: Ah, ",$53,"," line "good timing!" @@ -467,14 +326,8 @@ IF DEF(_YELLOW) line "both of you to do" cont "something for me." done -ELSE - text "OAK: Oh right! I" - line "have a request" - cont "of you two." - done -ENDC -_OaksLabText24:: ; 955a8 (25:55a8) +_OaksLabText24:: text "On the desk there" line "is my invention," cont "#DEX!" @@ -488,7 +341,7 @@ _OaksLabText24:: ; 955a8 (25:55a8) line "encyclopedia!" done -_OaksLabText25:: ; 9562a (25:562a) +_OaksLabText25:: text "OAK: ", $52, " and" line $53, "! Take" cont "these with you!" @@ -496,7 +349,7 @@ _OaksLabText25:: ; 9562a (25:562a) para $52, " got" line "#DEX from OAK!@@" -_OaksLabText26:: ; 95664 (25:5664) +_OaksLabText26:: text "To make a complete" line "guide on all the" cont "#MON in the" @@ -519,7 +372,7 @@ _OaksLabText26:: ; 95664 (25:5664) cont "#MON history!" done -_OaksLabText27:: ; 95741 (25:5741) +_OaksLabText27:: text $53, ": Alright" line "Gramps! Leave it" cont "all to me!" @@ -537,12 +390,12 @@ _OaksLabText27:: ; 95741 (25:5741) cont $52, "! Hahaha!" done -_OaksLabText_1d405:: ; 957eb (25:57eb) +_OaksLabText_1d405:: text "I study #MON as" line "PROF.OAK's AIDE." done -_OaksLabText_441cc:: ; 9580c (25:580c) +_OaksLabText_441cc:: text "#DEX comp-" line "letion is:" @@ -557,41 +410,41 @@ _OaksLabText_441cc:: ; 9580c (25:580c) line "Rating:" prompt -_OaksLabText_44201:: ; 95858 (25:5858) +_OaksLabText_44201:: text "You still have" line "lots to do." cont "Look for #MON" cont "in grassy areas!" done -_OaksLabText_44206:: ; 95893 (25:5893) +_OaksLabText_44206:: text "You're on the" line "right track! " cont "Get a FLASH HM" cont "from my AIDE!" done -_OaksLabText_4420b:: ; 958cc (25:58cc) +_OaksLabText_4420b:: text "You still need" line "more #MON!" cont "Try to catch" cont "other species!" done -_OaksLabText_44210:: ; 95903 (25:5903) +_OaksLabText_44210:: text "Good, you're" line "trying hard!" cont "Get an ITEMFINDER" cont "from my AIDE!" done -_OaksLabText_44215:: ; 9593d (25:593d) +_OaksLabText_44215:: text "Looking good!" line "Go find my AIDE" cont "when you get 50!" done -_OaksLabText_4421a:: ; 9596d (25:596d) +_OaksLabText_4421a:: text "You finally got at" line "least 50 species!" cont "Be sure to get" @@ -599,73 +452,63 @@ _OaksLabText_4421a:: ; 9596d (25:596d) cont "AIDE!" done -_OaksLabText_4421f:: ; 959b8 (25:59b8) -IF DEF(_YELLOW) +_OaksLabText_4421f:: text "Oh! This is get-" line "ting even better!" -ELSE - text "Ho! This is geting" - line "even better!" -ENDC done -_OaksLabText_44224:: ; 959d9 (25:59d9) +_OaksLabText_44224:: text "Very good!" line "Go fish for some" cont "marine #MON!" done -_OaksLabText_44229:: ; 95a03 (25:5a03) +_OaksLabText_44229:: text "Wonderful!" line "Do you like to" cont "collect things?" done -_OaksLabText_4422e:: ; 95a2e (25:5a2e) +_OaksLabText_4422e:: text "I'm impressed!" line "It must have been" cont "difficult to do!" done -_OaksLabText_44233:: ; 95a60 (25:5a60) +_OaksLabText_44233:: text "You finally got at" line "least 100 species!" cont "I can't believe" cont "how good you are!" done -_OaksLabText_44238:: ; 95aa8 (25:5aa8) +_OaksLabText_44238:: text "You even have the" line "evolved forms of" cont "#MON! Super!" done -_OaksLabText_4423d:: ; 95ad9 (25:5ad9) +_OaksLabText_4423d:: text "Excellent! Trade" line "with friends to" cont "get some more!" done -_OaksLabText_44242:: ; 95b0a (25:5b0a) +_OaksLabText_44242:: text "Outstanding!" line "You've become a" cont "real pro at this!" done -_OaksLabText_44247:: ; 95b39 (25:5b39) +_OaksLabText_44247:: text "I have nothing" line "left to say!" cont "You're the" cont "authority now!" done -_OaksLabText_4424c:: ; 95b6f (25:5b6f) +_OaksLabText_4424c:: text "Your #DEX is" -IF DEF(_YELLOW) line "fully complete!" -ELSE - line "entirely complete!" -ENDC cont "Congratulations!" done - diff --git a/text/maps/pallet_town.asm b/text/maps/pallet_town.asm index f912e16e..6eb603a3 100644 --- a/text/maps/pallet_town.asm +++ b/text/maps/pallet_town.asm @@ -3,9 +3,21 @@ _OakAppearsText:: line "Don't go out!@@" _OakWalksUpText:: - text "OAK: It's unsafe!" - line "Wild #MON live" - cont "in tall grass!" + text "OAK: That was" + line "close!" + + para "Wild #MON live" + line "in tall grass!" + done + +_OakWhewText:: + text "OAK: Whew..." + done + +_OakGrassText:: + text "OAK: A #MON can" + line "appear anytime in" + cont "tall grass." para "You need your own" line "#MON for your" diff --git a/text/maps/pewter_gym.asm b/text/maps/pewter_gym.asm new file mode 100644 index 00000000..48d97e9d --- /dev/null +++ b/text/maps/pewter_gym.asm @@ -0,0 +1,171 @@ +_PewterGymText_5c49e:: + text "I'm BROCK!" + line "I'm PEWTER's GYM" + cont "LEADER!" + para "I believe in rock" + line "hard defense and" + cont "determination!" + para "That's why my" + line "#MON are all" + cont "the rock-type!" + + para "Do you still want" + line "to challenge me?" + cont "Fine then! Show" + cont "me your best!" + done + +_PewterGymText_5c4a3:: + text "There are all" + line "kinds of trainers" + cont "in the world!" + + para "Some raise #MON" + line "for fights. Some" + cont "see them as pets." + + para "I'm in training to" + line "become a #MON" + cont "breeder." + + para "If you take your" + line "#MON training" + cont "seriously, go" + cont "visit the GYM in" + cont "CERULEAN and test" + cont "your abilities!" + done + +_TM34PreReceiveText:: + text "Wait! Take this" + line "with you!" + done + +_ReceivedTM34Text:: + text $52, " received" + line "TM34!@@" + +_TM34ExplanationText:: + db $0 + para "A TM contains a" + line "technique that" + cont "can be taught to" + cont "#MON!" + + para "A TM is good only" + line "once! So when you" + cont "use one to teach" + cont "a new technique," + cont "pick the #MON" + cont "carefully!" + + para "TM34 contains" + line "BIDE!" + + para "Your #MON will" + line "absorb damage in" + cont "battle then pay" + cont "it back double!" + done + +_TM34NoRoomText:: + text "You don't have" + line "room for this!" + done +_PewterGymText_5c4bc:: + text "I took" + line "you for granted." + para "As proof of your" + line "victory, here's" + cont "the BOULDERBADGE!" + + para $52, " received" + line "the BOULDERBADGE!@@" + +_PewterGymText_5c4c1:: + db $0 + para "That's an official" + line "#MON LEAGUE" + cont "BADGE!" + + para "Its bearer's" + line "#MON become" + cont "more powerful!" + + para "The technique" + line "FLASH can now be" + cont "used anytime!" + prompt + +_PewterGymBattleText1:: + text "Stop right there," + line "kid!" + + para "You're still light" + line "years from facing" + cont "BROCK!" + done +_PewterGymEndBattleText1:: + text "Darn!" + para "Light years isn't" + line "time! It measures" + cont "distance!" + prompt + +_PewterGymAfterBattleText1:: + text "You're pretty hot," + line "but not as hot" + cont "as BROCK!" + done +_PewterGymText_5c515:: + text "Hiya! I can tell" + line "you have what it" + cont "takes to become a" + cont "#MON champ!" + + para "I'm no trainer," + line "but I can tell" + cont "you how to win!" + para "Let me take you" + line "to the top!" + done +_PewterGymText_5c51a:: + text "All right! Let's" + line "get happening!" + prompt + +_PewterGymText_5c51f:: + text "The 1st #MON" + line "out in a match is" + cont "at the top of the" + cont "#MON LIST!" + + para "By changing the" + line "order of #MON," + cont "matches could be" + cont "made easier!" + done + +_PewterGymText_5c524:: + text "It's a free" + line "service! Let's" + cont "get happening!" + prompt + +_PewterGymText_5c529:: + text "Just as I thought!" + line "You're #MON" + cont "champ material!" + done + +_PewterGymGuyText:: + text "All right! Let's" + line "get happening!" + para "It will be tough" + line "for your PIKACHU" + cont "at this GYM!" + para "Electric attacks" + line "are harmless to" + cont "BROCK's ground-" + cont "type #MON." + done \ No newline at end of file diff --git a/text/maps/pewter_gym_1.asm b/text/maps/pewter_gym_1.asm deleted file mode 100644 index 9f3a1213..00000000 --- a/text/maps/pewter_gym_1.asm +++ /dev/null @@ -1,19 +0,0 @@ -_PewterGymText_5c49e:: ; 9697a (25:697a) - text "I'm BROCK!" - line "I'm PEWTER's GYM" - cont "LEADER!" - - para "I believe in rock" - line "hard defense and" - cont "determination!" - - para "That's why my" - line "#MON are all" - cont "the rock-type!" - - para "Do you still want" - line "to challenge me?" - cont "Fine then! Show" - cont "me your best!" - done - diff --git a/text/maps/pewter_gym_2.asm b/text/maps/pewter_gym_2.asm deleted file mode 100644 index 433fd649..00000000 --- a/text/maps/pewter_gym_2.asm +++ /dev/null @@ -1,180 +0,0 @@ -_PewterGymText_5c4a3:: ; 98000 (26:4000) - text "There are all" - line "kinds of trainers" - cont "in the world!" - -IF DEF(_YELLOW) - para "Some raise #MON" - line "for fights. Some" - cont "see them as pets." - - para "I'm in training to" - line "become a #MON" - cont "breeder." - - para "If you take your" - line "#MON training" - cont "seriously, go" - cont "visit the GYM in" - cont "CERULEAN and test" - cont "your abilities!" - done -ELSE - para "You appear to be" - line "very gifted as a" - cont "#MON trainer!" - - para "Go to the GYM in" - line "CERULEAN and test" - cont "your abilities!" - done -ENDC - -_TM34PreReceiveText:: ; 98092 (26:4092) - text "Wait! Take this" - line "with you!" - done - -_ReceivedTM34Text:: ; 980ad (26:40ad) - text $52, " received" - line "TM34!@@" - -_TM34ExplanationText:: ; 980c0 (26:40c0) - db $0 - para "A TM contains a" - line "technique that" - cont "can be taught to" - cont "#MON!" - - para "A TM is good only" - line "once! So when you" - cont "use one to teach" - cont "a new technique," - cont "pick the #MON" - cont "carefully!" - - para "TM34 contains" - line "BIDE!" - - para "Your #MON will" - line "absorb damage in" - cont "battle then pay" - cont "it back double!" - done - -_TM34NoRoomText:: ; 981ab (26:41ab) - text "You don't have" - line "room for this!" - done - -_PewterGymText_5c4bc:: ; 981c9 (26:41c9) - text "I took" - line "you for granted." - - para "As proof of your" - line "victory, here's" - cont "the BOULDERBADGE!" - - para $52, " received" - line "the BOULDERBADGE!@@" - -_PewterGymText_5c4c1:: ; 98232 (26:4232) - db $0 - para "That's an official" - line "#MON LEAGUE" - cont "BADGE!" - - para "Its bearer's" - line "#MON become" - cont "more powerful!" - - para "The technique" - line "FLASH can now be" -IF DEF(_YELLOW) - cont "used anytime!" -ELSE - cont "used any time!" -ENDC - prompt - -_PewterGymBattleText1:: ; 982ae (26:42ae) - text "Stop right there," - line "kid!" - - para "You're still light" - line "years from facing" - cont "BROCK!" - done - -_PewterGymEndBattleText1:: ; 982f1 (26:42f1) - text "Darn!" - - para "Light years isn't" - line "time! It measures" - cont "distance!" - prompt - -_PewterGymAfterBattleText1:: ; 98325 (26:4325) - text "You're pretty hot," - line "but not as hot" - cont "as BROCK!" - done - -_PewterGymText_5c515:: ; 98351 (26:4351) - text "Hiya! I can tell" - line "you have what it" - cont "takes to become a" - cont "#MON champ!" - - para "I'm no trainer," - line "but I can tell" - cont "you how to win!" - - para "Let me take you" - line "to the top!" - done - -_PewterGymText_5c51a:: ; 983dc (26:43dc) - text "All right! Let's" - line "get happening!" - prompt - -_PewterGymText_5c51f:: ; 983fc (26:43fc) - text "The 1st #MON" - line "out in a match is" - cont "at the top of the" - cont "#MON LIST!" - - para "By changing the" - line "order of #MON," - cont "matches could be" - cont "made easier!" - done - -_PewterGymText_5c524:: ; 98476 (26:4476) - text "It's a free" - line "service! Let's" - cont "get happening!" - prompt - -_PewterGymText_5c529:: ; 9849f (26:449f) - text "Just as I thought!" - line "You're #MON" - cont "champ material!" - done - -IF DEF(_YELLOW) -_PewterGymGuyText:: - text "All right! Let's" - line "get happening!" - - para "It will be tough" - line "for your PIKACHU" - cont "at this GYM!" - - para "Electric attacks" - line "are harmless to" - cont "BROCK's ground-" - cont "type #MON." - done -ENDC diff --git a/text/maps/pokemon_tower_7f.asm b/text/maps/pokemon_tower_7f.asm index 2c1449b1..aab07f9c 100644 --- a/text/maps/pokemon_tower_7f.asm +++ b/text/maps/pokemon_tower_7f.asm @@ -50,56 +50,3 @@ _TowerRescueFujiText:: ; 99c1a (26:5c1a) cont "of this tower." done -_PokemonTower7BattleText1:: ; 99d31 (26:5d31) - text "What do you want?" - line "Why are you here?" - done - -_PokemonTower7EndBattleText1:: ; 99d56 (26:5d56) - text "I give up!" - prompt - -_PokemonTower7AfterBattleText1:: ; 99d62 (26:5d62) - text "I'm not going to" - line "forget this!" - done - -_PokemonTower7BattleText2:: ; 99d80 (26:5d80) - text "This old guy came" - line "and complained" - cont "about us harming" - cont "useless #MON!" - - para "We're talking it" - line "over as adults!" - done - -_PokemonTower7EndBattleText2:: ; 99de1 (26:5de1) - text "Please!" - line "No more!" - prompt - -_PokemonTower7AfterBattleText2:: ; 99df3 (26:5df3) - text "#MON are only" - line "good for making" - cont "money!" - - para "Stay out of our" - line "business!" - done - -_PokemonTower7BattleText3:: ; 99e33 (26:5e33) - text "You're not saving" - line "anyone, kid!" - done - -_PokemonTower7EndBattleText3:: ; 99e52 (26:5e52) - text "Don't" - line "fight us ROCKETs!" - prompt - -_PokemonTower7AfterBattleText3:: ; 99e6a (26:5e6a) - text "You're not getting" - line "away with this!" - done - diff --git a/text/maps/reds_house_1f.asm b/text/maps/reds_house_1f.asm index 16cf5129..f6b6007e 100644 --- a/text/maps/reds_house_1f.asm +++ b/text/maps/reds_house_1f.asm @@ -16,7 +16,7 @@ ENDC _MomHealText1:: IF DEF(_YELLOW) text "MOM: ",$52,", if" - line "your drive your" + line "you drive your" cont "#MON too hard," cont "they'll dislike" cont "you." diff --git a/text/maps/rock_tunnel_b2f.asm b/text/maps/rock_tunnel_b2f.asm new file mode 100644 index 00000000..1fe8b361 --- /dev/null +++ b/text/maps/rock_tunnel_b2f.asm @@ -0,0 +1,130 @@ +_RockTunnel2BattleText2:: ; 86a1d (21:6a1d) + text "Hikers leave twigs" + line "as trail markers." + done + +_RockTunnel2EndBattleText2:: ; 86a43 (21:6a43) + text "Ohhh!" + line "I did my best!" + prompt + +_RockTunnel2AfterBattleText2:: ; 86a59 (21:6a59) + text "I want to go " + line "home!" + done + +_RockTunnel2BattleText3:: ; 86a6e (21:6a6e) + text "Hahaha! Can you" + line "beat my power?" + done + +_RockTunnel2EndBattleText3:: ; 86a8e (21:6a8e) + text "Oops!" + line "Out-muscled!" + prompt + +_RockTunnel2AfterBattleText3:: ; 86aa2 (21:6aa2) + text "I go for power" + line "because I hate" + cont "thinking!" + done + +_RockTunnel2BattleText4:: ; 86acb (21:6acb) + text "You have a" + line "#DEX?" + cont "I want one too!" + done + +_RockTunnel2EndBattleText4:: ; 86aed (21:6aed) + text "Shoot!" + line "I'm so jealous!" + prompt + +_RockTunnel2AfterBattleText4:: ; 86b04 (21:6b04) + text "When you finish" + line "your #DEX, can" + cont "I have it?" + done + +_RockTunnel2BattleText5:: ; 86b2f (21:6b2f) + text "Do you know about" + line "costume players?" + done + +_RockTunnel2EndBattleText5:: ; 86b53 (21:6b53) + text "Well," + line "that's that." + prompt + +_RockTunnel2AfterBattleText5:: ; 86b66 (21:6b66) + text "Costume players" + line "dress up as" + cont "#MON for fun." + done + +_RockTunnel2BattleText6:: ; 86b91 (21:6b91) + text "My #MON" + line "techniques will" + cont "leave you crying!" + done + +_RockTunnel2EndBattleText6:: ; 86bbc (21:6bbc) + text "I give!" + line "You're a better" + cont "technician!" + prompt + +_RockTunnel2AfterBattleText6:: ; 86be0 (21:6be0) + text "In mountains," + line "you'll often find" + cont "rock-type #MON." + done + +_RockTunnel2BattleText7:: ; 86c10 (21:6c10) + text "I don't often" + line "come here, but I" + cont "will fight you." + done + +_RockTunnel2EndBattleText7:: ; 86c3f (21:6c3f) + text "Oh!" + line "I lost!" + prompt + +_RockTunnel2AfterBattleText7:: ; 86c4c (21:6c4c) + text "I like tiny" + line "#MON, big ones" + cont "are too scary!" + done + +_RockTunnel2BattleText8:: ; 86c77 (21:6c77) + text "Hit me with your" + line "best shot!" + done + +_RockTunnel2EndBattleText8:: ; 86c94 (21:6c94) + text "Fired" + line "away!" + prompt + +_RockTunnel2AfterBattleText8:: ; 88000 (22:4000) + text "I'll raise my" + line "#MON to beat" + cont "yours, kid!" + done + +_RockTunnel2BattleText9:: ; 88027 (22:4027) + text "I draw #MON" + line "when I'm home." + done + +_RockTunnel2EndBattleText9:: ; 88042 (22:4042) + text "Whew!" + line "I'm exhausted!" + prompt + +_RockTunnel2AfterBattleText9:: ; 88057 (22:4057) + text "I'm an artist," + line "not a fighter." + done + diff --git a/text/maps/rock_tunnel_b2f_1.asm b/text/maps/rock_tunnel_b2f_1.asm deleted file mode 100644 index 47dc2bb9..00000000 --- a/text/maps/rock_tunnel_b2f_1.asm +++ /dev/null @@ -1,109 +0,0 @@ -_RockTunnel2BattleText2:: ; 86a1d (21:6a1d) - text "Hikers leave twigs" - line "as trail markers." - done - -_RockTunnel2EndBattleText2:: ; 86a43 (21:6a43) - text "Ohhh!" - line "I did my best!" - prompt - -_RockTunnel2AfterBattleText2:: ; 86a59 (21:6a59) - text "I want to go " - line "home!" - done - -_RockTunnel2BattleText3:: ; 86a6e (21:6a6e) - text "Hahaha! Can you" - line "beat my power?" - done - -_RockTunnel2EndBattleText3:: ; 86a8e (21:6a8e) - text "Oops!" - line "Out-muscled!" - prompt - -_RockTunnel2AfterBattleText3:: ; 86aa2 (21:6aa2) - text "I go for power" - line "because I hate" - cont "thinking!" - done - -_RockTunnel2BattleText4:: ; 86acb (21:6acb) - text "You have a" - line "#DEX?" - cont "I want one too!" - done - -_RockTunnel2EndBattleText4:: ; 86aed (21:6aed) - text "Shoot!" - line "I'm so jealous!" - prompt - -_RockTunnel2AfterBattleText4:: ; 86b04 (21:6b04) - text "When you finish" - line "your #DEX, can" - cont "I have it?" - done - -_RockTunnel2BattleText5:: ; 86b2f (21:6b2f) - text "Do you know about" - line "costume players?" - done - -_RockTunnel2EndBattleText5:: ; 86b53 (21:6b53) - text "Well," - line "that's that." - prompt - -_RockTunnel2AfterBattleText5:: ; 86b66 (21:6b66) - text "Costume players" - line "dress up as" - cont "#MON for fun." - done - -_RockTunnel2BattleText6:: ; 86b91 (21:6b91) - text "My #MON" - line "techniques will" - cont "leave you crying!" - done - -_RockTunnel2EndBattleText6:: ; 86bbc (21:6bbc) - text "I give!" - line "You're a better" - cont "technician!" - prompt - -_RockTunnel2AfterBattleText6:: ; 86be0 (21:6be0) - text "In mountains," - line "you'll often find" - cont "rock-type #MON." - done - -_RockTunnel2BattleText7:: ; 86c10 (21:6c10) - text "I don't often" - line "come here, but I" - cont "will fight you." - done - -_RockTunnel2EndBattleText7:: ; 86c3f (21:6c3f) - text "Oh!" - line "I lost!" - prompt - -_RockTunnel2AfterBattleText7:: ; 86c4c (21:6c4c) - text "I like tiny" - line "#MON, big ones" - cont "are too scary!" - done - -_RockTunnel2BattleText8:: ; 86c77 (21:6c77) - text "Hit me with your" - line "best shot!" - done - -_RockTunnel2EndBattleText8:: ; 86c94 (21:6c94) - text "Fired" - line "away!" - prompt - diff --git a/text/maps/rock_tunnel_b2f_2.asm b/text/maps/rock_tunnel_b2f_2.asm deleted file mode 100644 index e76cdaaf..00000000 --- a/text/maps/rock_tunnel_b2f_2.asm +++ /dev/null @@ -1,21 +0,0 @@ -_RockTunnel2AfterBattleText8:: ; 88000 (22:4000) - text "I'll raise my" - line "#MON to beat" - cont "yours, kid!" - done - -_RockTunnel2BattleText9:: ; 88027 (22:4027) - text "I draw #MON" - line "when I'm home." - done - -_RockTunnel2EndBattleText9:: ; 88042 (22:4042) - text "Whew!" - line "I'm exhausted!" - prompt - -_RockTunnel2AfterBattleText9:: ; 88057 (22:4057) - text "I'm an artist," - line "not a fighter." - done - diff --git a/text/maps/rocket_hideout_b4f.asm b/text/maps/rocket_hideout_b4f.asm index e069e4a9..0e8fca91 100644 --- a/text/maps/rocket_hideout_b4f.asm +++ b/text/maps/rocket_hideout_b4f.asm @@ -51,38 +51,6 @@ _RocketHideout4Text_45584:: ; 82283 (20:6283) line "again..." done -_RocketHideout4BattleText2:: ; 82326 (20:6326) - text "I know you! You" - line "ruined our plans" - cont "at MT.MOON!" - done - -_RocketHideout4EndBattleText2:: ; 82354 (20:6354) - text "Burned" - line "again!" - prompt - -_RocketHide4AfterBattleText2:: ; 82363 (20:6363) - text "Do you have" - line "something against" - cont "TEAM ROCKET?" - done - -_RocketHideout4BattleText3:: ; 8238f (20:638f) - text "How can you not" - line "see the beauty of" - cont "our evil?" - done - -_RocketHideout4EndBattleText3:: ; 823bc (20:63bc) - text "Ayaya!" - prompt - -_RocketHide4AfterBattleText3:: ; 823c4 (20:63c4) - text "BOSS! I'm sorry I" - line "failed you!" - done - _RocketHideout4BattleText4:: ; 823e2 (20:63e2) text "The elevator" line "doesn't work? Who" diff --git a/text/maps/route_11.asm b/text/maps/route_11.asm new file mode 100644 index 00000000..ae48f3ca --- /dev/null +++ b/text/maps/route_11.asm @@ -0,0 +1,164 @@ +_Route11BattleText1:: ; 8e8ee (23:68ee) + text "Win, lose or draw!" + done + +_Route11EndBattleText1:: ; 8e902 (23:6902) + text "Atcha!" + line "Didn't go my way!" + prompt + +_Route11AfterBattleText1:: ; 8e91b (23:691b) + text "#MON is life!" + line "And to live is to" + cont "gamble!" + done + +_Route11BattleText2:: ; 8e944 (23:6944) + text "Competition! I" + line "can't get enough!" + done + +_Route11EndBattleText2:: ; 8e965 (23:6965) + text "I had" + line "a chance!" + prompt + +_Route11AfterBattleText2:: ; 8e976 (23:6976) + text "You can't be a" + line "coward in the" + cont "world of #MON!" + done + +_Route11BattleText3:: ; 8e9a2 (23:69a2) + text "Let's go, but" + line "don't cheat!" + done + +_Route11EndBattleText3:: ; 8e9bc (23:69bc) + text "Huh?" + line "That's not right!" + prompt + +_Route11AfterBattleText3:: ; 8e9d3 (23:69d3) + text "I did my best! I" + line "have no regrets!" + done + +_Route11BattleText4:: ; 8e9f6 (23:69f6) + text "Careful!" + line "I'm laying down" + cont "some cables!" + done + +_Route11EndBattleText4:: ; 8ea1c (23:6a1c) + text "That" + line "was electric!" + prompt + +_Route11AfterBattleText4:: ; 8ea30 (23:6a30) + text "Spread the word" + line "to save energy!" + done + +_Route11BattleText5:: ; 8ea51 (23:6a51) + text "I just became a" + line "trainer! But, I" + cont "think I can win!" + done + +_Route11EndBattleText5:: ; 8ea83 (23:6a83) + text "My" + line "#MON couldn't!" + prompt + +_Route11AfterBattleText5:: ; 8ea95 (23:6a95) + text "What do you want?" + line "Leave me alone!" + done + +_Route11BattleText6:: ; 8eab8 (23:6ab8) + text "Fwahaha! I have" + line "never lost!" + done + +_Route11EndBattleText6:: ; 8ead5 (23:6ad5) + text "My" + line "first loss!" + prompt + +_Route11AfterBattleText6:: ; 8eae5 (23:6ae5) + text "Luck of the draw!" + line "Just luck!" + done + +_Route11BattleText7:: ; 8eb03 (23:6b03) + text "I have never won" + line "before..." + done + +_Route11EndBattleText7:: ; 8eb1f (23:6b1f) + text "I saw" + line "this coming..." + prompt + +_Route11AfterBattleText7:: ; 8eb35 (23:6b35) + text "It's just luck." + line "Luck of the draw." + done + +_Route11BattleText8:: ; 8eb57 (23:6b57) + text "I'm the best in" + line "my class!" + done + +_Route11EndBattleText8:: ; 8eb71 (23:6b71) + text "Darn!" + line "I need to make my" + cont "#MON stronger!" + prompt + +_Route11AfterBattleText8:: ; 8eb99 (23:6b99) + text "There's a fat" + line "#MON that" + cont "comes down from" + cont "the mountains." + + para "It's strong if" + line "you can get it." + done + +_Route11BattleText9:: ; 8ebee (23:6bee) + text "Watch out for" + line "live wires!" + done + +_Route11EndBattleText9:: ; 90000 (24:4000) + text "Whoa!" + line "You spark plug!" + prompt + +_Route11AfterBattleText9:: ; 90017 (24:4017) + text "Well, better get" + line "back to work." + done + +_Route11BattleText10:: ; 90037 (24:4037) + text "My #MON should" + line "be ready by now!" + done + +_Route11EndBattleText10:: ; 90058 (24:4058) + text "Too" + line "much, too young!" + prompt + +_Route11AfterBattleText10:: ; 9006e (24:406e) + text "I better go find" + line "stronger ones!" + done + +_Route11Text11:: ; 9008f (24:408f) + text "DIGLETT's CAVE" + done + + diff --git a/text/maps/route_11_1.asm b/text/maps/route_11_1.asm deleted file mode 100644 index 0637cad3..00000000 --- a/text/maps/route_11_1.asm +++ /dev/null @@ -1,135 +0,0 @@ -_Route11BattleText1:: ; 8e8ee (23:68ee) - text "Win, lose or draw!" - done - -_Route11EndBattleText1:: ; 8e902 (23:6902) - text "Atcha!" - line "Didn't go my way!" - prompt - -_Route11AfterBattleText1:: ; 8e91b (23:691b) - text "#MON is life!" - line "And to live is to" - cont "gamble!" - done - -_Route11BattleText2:: ; 8e944 (23:6944) - text "Competition! I" - line "can't get enough!" - done - -_Route11EndBattleText2:: ; 8e965 (23:6965) - text "I had" - line "a chance!" - prompt - -_Route11AfterBattleText2:: ; 8e976 (23:6976) - text "You can't be a" - line "coward in the" - cont "world of #MON!" - done - -_Route11BattleText3:: ; 8e9a2 (23:69a2) - text "Let's go, but" - line "don't cheat!" - done - -_Route11EndBattleText3:: ; 8e9bc (23:69bc) - text "Huh?" - line "That's not right!" - prompt - -_Route11AfterBattleText3:: ; 8e9d3 (23:69d3) - text "I did my best! I" - line "have no regrets!" - done - -_Route11BattleText4:: ; 8e9f6 (23:69f6) - text "Careful!" - line "I'm laying down" - cont "some cables!" - done - -_Route11EndBattleText4:: ; 8ea1c (23:6a1c) - text "That" - line "was electric!" - prompt - -_Route11AfterBattleText4:: ; 8ea30 (23:6a30) - text "Spread the word" - line "to save energy!" - done - -_Route11BattleText5:: ; 8ea51 (23:6a51) - text "I just became a" - line "trainer! But, I" - cont "think I can win!" - done - -_Route11EndBattleText5:: ; 8ea83 (23:6a83) - text "My" - line "#MON couldn't!" - prompt - -_Route11AfterBattleText5:: ; 8ea95 (23:6a95) - text "What do you want?" - line "Leave me alone!" - done - -_Route11BattleText6:: ; 8eab8 (23:6ab8) - text "Fwahaha! I have" - line "never lost!" - done - -_Route11EndBattleText6:: ; 8ead5 (23:6ad5) - text "My" - line "first loss!" - prompt - -_Route11AfterBattleText6:: ; 8eae5 (23:6ae5) - text "Luck of the draw!" - line "Just luck!" - done - -_Route11BattleText7:: ; 8eb03 (23:6b03) - text "I have never won" - line "before..." - done - -_Route11EndBattleText7:: ; 8eb1f (23:6b1f) - text "I saw" - line "this coming..." - prompt - -_Route11AfterBattleText7:: ; 8eb35 (23:6b35) - text "It's just luck." - line "Luck of the draw." - done - -_Route11BattleText8:: ; 8eb57 (23:6b57) - text "I'm the best in" - line "my class!" - done - -_Route11EndBattleText8:: ; 8eb71 (23:6b71) - text "Darn!" - line "I need to make my" - cont "#MON stronger!" - prompt - -_Route11AfterBattleText8:: ; 8eb99 (23:6b99) - text "There's a fat" - line "#MON that" - cont "comes down from" - cont "the mountains." - - para "It's strong if" - line "you can get it." - done - -_Route11BattleText9:: ; 8ebee (23:6bee) - text "Watch out for" - line "live wires!" - done - - diff --git a/text/maps/route_11_2.asm b/text/maps/route_11_2.asm deleted file mode 100644 index 7edb3f06..00000000 --- a/text/maps/route_11_2.asm +++ /dev/null @@ -1,29 +0,0 @@ -_Route11EndBattleText9:: ; 90000 (24:4000) - text "Whoa!" - line "You spark plug!" - prompt - -_Route11AfterBattleText9:: ; 90017 (24:4017) - text "Well, better get" - line "back to work." - done - -_Route11BattleText10:: ; 90037 (24:4037) - text "My #MON should" - line "be ready by now!" - done - -_Route11EndBattleText10:: ; 90058 (24:4058) - text "Too" - line "much, too young!" - prompt - -_Route11AfterBattleText10:: ; 9006e (24:406e) - text "I better go find" - line "stronger ones!" - done - -_Route11Text11:: ; 9008f (24:408f) - text "DIGLETT's CAVE" - done - diff --git a/text/maps/route_22.asm b/text/maps/route_22.asm index 9935ce80..052fd331 100644 --- a/text/maps/route_22.asm +++ b/text/maps/route_22.asm @@ -1,3 +1,36 @@ +_Route22RivalDefeatedText1:: ; 923f4 (24:63f4) + text "Awww!" + line "You just lucked" + cont "out!" + prompt + +_Route22Text_511bc:: ; 92410 (24:6410) + text $53, ": What?" + line "Why do I have 2" + cont "#MON?" + + para "You should catch" + cont "some more too!" + prompt + +_Route22RivalDefeatedText2:: ; 92583 (24:6583) + text "What!?" + + para "I was just" + line "careless!" + prompt + +_Route22Text_511d0:: ; 925a0 (24:65a0) + text $53, ": Hahaha!" + line $52, "! That's" + cont "your best? You're" + cont "nowhere near as" + cont "good as me, pal!" + + para "Go train some" + line "more! You loser!" + prompt + _Route22RivalBeforeBattleText1:: ; 922cd (24:62cd) text $53, ": Hey!" line $52, "!" @@ -31,21 +64,6 @@ _Route22RivalAfterBattleText1:: ; 9236f (24:636f) cont "a move on!" done -_Route22RivalDefeatedText1:: ; 923f4 (24:63f4) - text "Awww!" - line "You just lucked" - cont "out!" - prompt - -_Route22Text_511bc:: ; 92410 (24:6410) - text $53, ": What?" - line "Why do I have 2" - cont "#MON?" - - para "You should catch" - cont "some more too!" - prompt - _Route22RivalBeforeBattleText2:: ; 92450 (24:6450) text $53, ": What?" line $52, "! What a" @@ -86,24 +104,6 @@ _Route22RivalAfterBattleText2:: ; 92506 (24:6506) cont "here. Smell ya!" done -_Route22RivalDefeatedText2:: ; 92583 (24:6583) - text "What!?" - - para "I was just" - line "careless!" - prompt - -_Route22Text_511d0:: ; 925a0 (24:65a0) - text $53, ": Hahaha!" - line $52, "! That's" - cont "your best? You're" - cont "nowhere near as" - cont "good as me, pal!" - - para "Go train some" - line "more! You loser!" - prompt - _Route22FrontGateText:: ; 92606 (24:6606) text "#MON LEAGUE" line "Front Gate" diff --git a/text/maps/route_24.asm b/text/maps/route_24.asm new file mode 100644 index 00000000..ca322101 --- /dev/null +++ b/text/maps/route_24.asm @@ -0,0 +1,156 @@ +_Route24Text_51510:: ; 92721 (24:6721) + text "Congratulations!" + line "You beat our 5" + cont "contest trainers!@@" + +_Route24Text_51515:: ; 92755 (24:6755) + db $0 + para "You just earned a" + line "fabulous prize!" + prompt + +_Route24Text_5151a:: ; 92779 (24:6779) + text $52, " received" + line "a @" + TX_RAM wcf4b + text "!@@" + +_Route24Text_51521:: ; 9278f (24:678f) + text "You don't have" + line "any room!" + done + +_Route24Text_51526:: ; 927a8 (24:67a8) + text "By the way, would" + line "you like to join" + cont "TEAM ROCKET?" + + para "We're a group" + line "dedicated to evil" + cont "using #MON!" + + para "Want to join?" + + para "Are you sure?" + + para "Come on, join us!" + + para "I'm telling you" + line "to join!" + + para "OK, you need" + line "convincing!" + + para "I'll make you an" + line "offer you can't" + cont "refuse!" + done + +_Route24Text_5152b:: ; 9288a (24:688a) + text "Arrgh!" + line "You are good!" + prompt + +_Route24Text_51530:: ; 928a0 (24:68a0) + text "With your ability," + line "you could become" + cont "a top leader in" + cont "TEAM ROCKET!" + done + +_Route24BattleText1:: ; 928e2 (24:68e2) + text "I saw your feat" + line "from the grass!" + done + +_Route24EndBattleText1:: ; 94000 (25:4000) + text "I" + line "thought not!" + prompt + +_Route24AfterBattleText1:: ; 94010 (25:4010) + text "I hid because the" + line "people on the" + cont "bridge scared me!" + done + +_Route24BattleText2:: ; 94043 (25:4043) + text "OK! I'm No. 5!" + line "I'll stomp you!" + done + +_Route24EndBattleText2:: ; 94061 (25:4061) + text "Whoa!" + line "Too much!" + prompt + +_Route24AfterBattleText2:: ; 94072 (25:4072) + text "I did my best, I" + line "have no regrets!" + done + +_Route24BattleText3:: ; 94095 (25:4095) + text "I'm No. 4!" + line "Getting tired?" + done + +_Route24EndBattleText3:: ; 940af (25:40af) + text "I lost" + line "too!" + prompt + +_Route24AfterBattleText3:: ; 940bc (25:40bc) + text "I did my best, so" + line "I've no regrets!" + done + +_Route24BattleText4:: ; 940df (25:40df) + text "Here's No. 3!" + line "I won't be easy!" + done + +_Route24EndBattleText4:: ; 940fd (25:40fd) + text "Ow!" + line "Stomped flat!" + prompt + +_Route24AfterBattleText4:: ; 94110 (25:4110) + text "I did my best, I" + line "have no regrets!" + done + +_Route24BattleText5:: ; 94133 (25:4133) + text "I'm second!" + line "Now it's serious!" + done + +_Route24EndBattleText5:: ; 94150 (25:4150) + text "How could I" + line "lose?" + prompt + +_Route24AfterBattleText5:: ; 94163 (25:4163) + text "I did my best, I" + line "have no regrets!" + done + +_Route24BattleText6:: ; 94186 (25:4186) + text "This is NUGGET" + line "BRIDGE! Beat us 5" + cont "trainers and win" + cont "a fabulous prize!" + + para "Think you got" + line "what it takes?" + done + +_Route24EndBattleText6:: ; 941e8 (25:41e8) + text "Whoo!" + line "Good stuff!" + prompt + +_Route24AfterBattleText6:: ; 941fb (25:41fb) + text "I did my best, I" + line "have no regrets!" + done + diff --git a/text/maps/route_24_1.asm b/text/maps/route_24_1.asm deleted file mode 100644 index 84a6d720..00000000 --- a/text/maps/route_24_1.asm +++ /dev/null @@ -1,65 +0,0 @@ -_Route24Text_51510:: ; 92721 (24:6721) - text "Congratulations!" - line "You beat our 5" - cont "contest trainers!@@" - -_Route24Text_51515:: ; 92755 (24:6755) - db $0 - para "You just earned a" - line "fabulous prize!" - prompt - -_Route24Text_5151a:: ; 92779 (24:6779) - text $52, " received" - line "a @" - TX_RAM wcf4b - text "!@@" - -_Route24Text_51521:: ; 9278f (24:678f) - text "You don't have" - line "any room!" - done - -_Route24Text_51526:: ; 927a8 (24:67a8) - text "By the way, would" - line "you like to join" - cont "TEAM ROCKET?" - - para "We're a group" - line "dedicated to evil" - cont "using #MON!" - - para "Want to join?" - - para "Are you sure?" - - para "Come on, join us!" - - para "I'm telling you" - line "to join!" - - para "OK, you need" - line "convincing!" - - para "I'll make you an" - line "offer you can't" - cont "refuse!" - done - -_Route24Text_5152b:: ; 9288a (24:688a) - text "Arrgh!" - line "You are good!" - prompt - -_Route24Text_51530:: ; 928a0 (24:68a0) - text "With your ability," - line "you could become" - cont "a top leader in" - cont "TEAM ROCKET!" - done - -_Route24BattleText1:: ; 928e2 (24:68e2) - text "I saw your feat" - line "from the grass!" - done - diff --git a/text/maps/route_24_2.asm b/text/maps/route_24_2.asm deleted file mode 100644 index 9a7613bb..00000000 --- a/text/maps/route_24_2.asm +++ /dev/null @@ -1,91 +0,0 @@ -_Route24EndBattleText1:: ; 94000 (25:4000) - text "I" - line "thought not!" - prompt - -_Route24AfterBattleText1:: ; 94010 (25:4010) - text "I hid because the" - line "people on the" - cont "bridge scared me!" - done - -_Route24BattleText2:: ; 94043 (25:4043) - text "OK! I'm No. 5!" - line "I'll stomp you!" - done - -_Route24EndBattleText2:: ; 94061 (25:4061) - text "Whoa!" - line "Too much!" - prompt - -_Route24AfterBattleText2:: ; 94072 (25:4072) - text "I did my best, I" - line "have no regrets!" - done - -_Route24BattleText3:: ; 94095 (25:4095) - text "I'm No. 4!" - line "Getting tired?" - done - -_Route24EndBattleText3:: ; 940af (25:40af) - text "I lost" - line "too!" - prompt - -_Route24AfterBattleText3:: ; 940bc (25:40bc) - text "I did my best, so" - line "I've no regrets!" - done - -_Route24BattleText4:: ; 940df (25:40df) - text "Here's No. 3!" - line "I won't be easy!" - done - -_Route24EndBattleText4:: ; 940fd (25:40fd) - text "Ow!" - line "Stomped flat!" - prompt - -_Route24AfterBattleText4:: ; 94110 (25:4110) - text "I did my best, I" - line "have no regrets!" - done - -_Route24BattleText5:: ; 94133 (25:4133) - text "I'm second!" - line "Now it's serious!" - done - -_Route24EndBattleText5:: ; 94150 (25:4150) - text "How could I" - line "lose?" - prompt - -_Route24AfterBattleText5:: ; 94163 (25:4163) - text "I did my best, I" - line "have no regrets!" - done - -_Route24BattleText6:: ; 94186 (25:4186) - text "This is NUGGET" - line "BRIDGE! Beat us 5" - cont "trainers and win" - cont "a fabulous prize!" - - para "Think you got" - line "what it takes?" - done - -_Route24EndBattleText6:: ; 941e8 (25:41e8) - text "Whoo!" - line "Good stuff!" - prompt - -_Route24AfterBattleText6:: ; 941fb (25:41fb) - text "I did my best, I" - line "have no regrets!" - done - diff --git a/text/maps/route_9.asm b/text/maps/route_9.asm deleted file mode 100644 index 353eb779..00000000 --- a/text/maps/route_9.asm +++ /dev/null @@ -1,175 +0,0 @@ -_Route9BattleText1:: ; 8e291 (23:6291) - text "You have #MON" - line "with you!" - cont "You're mine!" - done - -_Route9EndBattleText1:: ; 8e2b6 (23:62b6) - text "You" - line "deceived me!" - prompt - -_Route9AfterBattleText1:: ; 8e2c8 (23:62c8) - text "You need light to" - line "get through that" - cont "dark tunnel ahead." - done - -IF DEF(_YELLOW) -_Route9BattleTextAJ:: - text "I aim to be the" - line "ultimate trainer!" - done - -_Route9EndBattleTextAJ:: - text "My" - line "SANDSHREW lost?" - prompt - -_Route9AfterBattleTextAJ:: - text "I'll restart my" - line "100-win streak" - cont "with SANDSHREW." -ENDC - -_Route9BattleText2:: ; 8e2ff (23:62ff) - text "Who's that walking" - line "with those good" - cont "looking #MON?" - done - -_Route9EndBattleText2:: ; 8e330 (23:6330) - text "Out" - line "like a light!" - prompt - -_Route9AfterBattleText2:: ; 8e343 (23:6343) - text "Keep walking!" - done - -_Route9BattleText3:: ; 8e352 (23:6352) - text "I'm taking ROCK" - line "TUNNEL to go to" - cont "LAVENDER..." - done - -_Route9EndBattleText3:: ; 8e37e (23:637e) - text "Can't" - line "measure up!" - prompt - -_Route9AfterBattleText3:: ; 8e390 (23:6390) - text "Are you off to" - line "ROCK TUNNEL too?" - done - -_Route9BattleText4:: ; 8e3b1 (23:63b1) - text "Don't you dare" - line "condescend me!" - done - -_Route9EndBattleText4:: ; 8e3cf (23:63cf) - text "No!" - line "You're too much!" - prompt - -_Route9AfterBattleText4:: ; 8e3e4 (23:63e4) - text "You're obviously" - line "talented! Good" - cont "luck to you!" - done - -_Route9BattleText5:: ; 8e411 (23:6411) - text "Bwahaha!" - line "Great! I was" - cont "bored, eh!" - done - -_Route9EndBattleText5:: ; 8e433 (23:6433) - text "Keep it" - line "coming, eh!" - - para "Oh wait. I'm out" - line "of #MON!" - prompt - -_Route9AfterBattleText5:: ; 8e461 (23:6461) - text "You sure had guts" - line "standing up to me" - cont "there, eh?" - done - -_Route9BattleText6:: ; 8e491 (23:6491) - text "Hahaha!" - line "Aren't you a" - cont "little toughie!" - done - -_Route9EndBattleText6:: ; 8e4b6 (23:64b6) - text "What's" - line "that?" - prompt - -_Route9AfterBattleText6:: ; 8e4c3 (23:64c3) - text "Hahaha! Kids" - line "should be tough!" - done - -_Route9BattleText7:: ; 8e4e2 (23:64e2) - text "I got up early" - line "every day to" - cont "raise my #MON" - cont "from cocoons!" - done - -_Route9EndBattleText7:: ; 8e51b (23:651b) - text "WHAT?" - - para "What a total" - line "waste of time!" - prompt - -_Route9AfterBattleText7:: ; 8e53e (23:653e) - text "I have to collect" - line "more than bugs to" - cont "get stronger..." - done - -_Route9BattleText8:: ; 8e573 (23:6573) - text "Hahahaha!" - line "Come on, dude!" - done - -_Route9EndBattleText8:: ; 8e58d (23:658d) - text "Hahahaha!" - line "You beat me fair!" - prompt - -_Route9AfterBattleText8:: ; 8e5aa (23:65aa) - text "Hahahaha!" - line "Us hearty guys" - cont "always laugh!" - done - -_Route9BattleText9:: ; 8e5d2 (23:65d2) - text "Go, my super bug" - line "#MON!" - done - -_Route9EndBattleText9:: ; 8e5ea (23:65ea) - text "My" - line "bugs..." - prompt - -_Route9AfterBattleText9:: ; 8e5f6 (23:65f6) - text "If you don't like" - line "bug #MON, you" - cont "bug me!" - done - -_Route9Text11:: ; 8e61e (23:661e) - text "ROUTE 9" - line "CERULEAN CITY-" - cont "ROCK TUNNEL" - done - diff --git a/text/maps/route_9_1.asm b/text/maps/route_9_1.asm new file mode 100644 index 00000000..741c990c --- /dev/null +++ b/text/maps/route_9_1.asm @@ -0,0 +1,136 @@ +_Route9BattleText1:: + text "You have #MON" + line "with you!" + cont "You're mine!" + done + +_Route9EndBattleText1:: + text "You" + line "deceived me!" + prompt + +_Route9AfterBattleText1:: + text "You need light to" + line "get through that" + cont "dark tunnel ahead." + done + +_Route9BattleTextAJ:: + text "I aim to be the" + line "ultimate trainer!" + done + +_Route9EndBattleTextAJ:: + text "My" + line "SANDSHREW lost?" + prompt + +_Route9AfterBattleTextAJ:: + text "I'll restart my" + line "100-win streak" + cont "with SANDSHREW." + done + +_Route9BattleText3:: + text "I'm taking ROCK" + line "TUNNEL to go to" + cont "LAVENDER..." + done + +_Route9EndBattleText3:: + text "Can't" + line "measure up!" + prompt + +_Route9AfterBattleText3:: + text "Are you off to" + line "ROCK TUNNEL too?" + done + +_Route9BattleText4:: + text "Don't you dare" + line "condescend me!" + done + +_Route9EndBattleText4:: + text "No!" + line "You're too much!" + prompt + +_Route9AfterBattleText4:: + text "You're obviously" + line "talented! Good" + cont "luck to you!" + done + +_Route9BattleText5:: + text "Bwahaha!" + line "Great! I was" + cont "bored, eh!" + done + +_Route9EndBattleText5:: + text "Keep it" + line "coming, eh!" + + para "Oh wait. I'm out" + line "of #MON!" + prompt + +_Route9AfterBattleText5:: + text "You sure had guts" + line "standing up to me" + cont "there, eh?" + done + +_Route9BattleText6:: + text "Hahaha!" + line "Aren't you a" + cont "little toughie!" + done + +_Route9EndBattleText6:: + text "What's" + line "that?" + prompt + +_Route9AfterBattleText6:: + text "Hahaha! Kids" + line "should be tough!" + done + +_Route9BattleText7:: + text "I got up early" + line "every day to" + cont "raise my #MON" + cont "from cocoons!" + done + +_Route9EndBattleText7:: + text "WHAT?" + + para "What a total" + line "waste of time!" + prompt + +_Route9AfterBattleText7:: + text "I have to collect" + line "more than bugs to" + cont "get stronger..." + done + +_Route9BattleText8:: + text "Hahahaha!" + line "Come on, dude!" + done + +_Route9EndBattleText8:: + text "Hahahaha!" + line "You beat me fair!" + prompt + +_Route9AfterBattleText8:: + text "Hahahaha!" + line "Us hearty guys" + cont "always laugh!" + done diff --git a/text/maps/route_9_2.asm b/text/maps/route_9_2.asm new file mode 100755 index 00000000..0f51e6f1 --- /dev/null +++ b/text/maps/route_9_2.asm @@ -0,0 +1,21 @@ +_Route9BattleText9:: ; 8e5d2 (23:65d2) + text "Go, my super bug" + line "#MON!" + done + +_Route9EndBattleText9:: ; 8e5ea (23:65ea) + text "My" + line "bugs..." + prompt + +_Route9AfterBattleText9:: ; 8e5f6 (23:65f6) + text "If you don't like" + line "bug #MON, you" + cont "bug me!" + done + +_Route9Text11:: ; 8e61e (23:661e) + text "ROUTE 9" + line "CERULEAN CITY-" + cont "ROCK TUNNEL" + done diff --git a/text/maps/safari_zone_entrance.asm b/text/maps/safari_zone_entrance.asm index 79f70ea4..f0498280 100644 --- a/text/maps/safari_zone_entrance.asm +++ b/text/maps/safari_zone_entrance.asm @@ -3,6 +3,25 @@ _SafariZoneEntranceText1:: ; 9e6c7 (27:66c7) line "SAFARI ZONE!" done +SafariZoneEntranceText_9e814:: ; 9e814 (27:6814) + text "Leaving early?@@" + +_SafariZoneEntranceText_753bb:: ; 9e825 (27:6825) + text "Please return any" + line "SAFARI BALLs you" + cont "have left." + done + +_SafariZoneEntranceText_753c0:: ; 9e854 (27:6854) + text "Good Luck!" + done + +_SafariZoneEntranceText_753c5:: ; 9e860 (27:6860) + text "Did you get a" + line "good haul?" + cont "Come again!" + done + SafariZoneEntranceText_9e6e4:: ; 9e6e4 (27:66e4) text "For just ¥500," line "you can catch all" @@ -13,7 +32,9 @@ SafariZoneEntranceText_9e6e4:: ; 9e6e4 (27:66e4) line "join the hunt?@@" SafariZoneEntranceText_9e747:: ; 9e747 (27:6747) - text "That'll be ¥500" + text "That'll be ¥@" + TX_BCD wSubtrahend, $c3 + text "," line "please!" para "We only use a" @@ -41,25 +62,6 @@ _SafariZoneEntranceText_7536a:: ; 9e7fb (27:67fb) line "money!" done -SafariZoneEntranceText_9e814:: ; 9e814 (27:6814) - text "Leaving early?@@" - -_SafariZoneEntranceText_753bb:: ; 9e825 (27:6825) - text "Please return any" - line "SAFARI BALLs you" - cont "have left." - done - -_SafariZoneEntranceText_753c0:: ; 9e854 (27:6854) - text "Good Luck!" - done - -_SafariZoneEntranceText_753c5:: ; 9e860 (27:6860) - text "Did you get a" - line "good haul?" - cont "Come again!" - done - _SafariZoneEntranceText_753e6:: ; 9e886 (27:6886) text "Hi! Is it your" line "first time here?" diff --git a/text/maps/school.asm b/text/maps/school.asm index 9bdd9004..2bd526f9 100644 --- a/text/maps/school.asm +++ b/text/maps/school.asm @@ -1,21 +1,20 @@ -_SchoolText1:: ; 95d15 (25:5d15) +_SchoolText1:: text "Whew! I'm trying" line "to memorize all" cont "my notes." done -IF DEF(_YELLOW) _SchoolText3:: text "Sis says #MON" line "will become tame" cont "if you treat them" cont "nicely." -ENDC + done -_SchoolText2:: ; 95d40 (25:5d40) +_SchoolText2:: text "Okay!" para "Be sure to read" line "the blackboard" cont "carefully!" - done + done \ No newline at end of file diff --git a/text/maps/silph_co_10f.asm b/text/maps/silph_co_10f.asm index 75aa6003..ef7eb2f6 100644 --- a/text/maps/silph_co_10f.asm +++ b/text/maps/silph_co_10f.asm @@ -1,6 +1,6 @@ _SilphCo10Text_5a1d3:: ; 84d8d (21:4d8d) text "Waaaaa!" - cont "I'm scared!" + line "I'm scared!" done _SilphCo10Text_5a1d8:: ; 84da1 (21:4da1) diff --git a/text/maps/silph_co_11f.asm b/text/maps/silph_co_11f.asm index 3dbeee95..1df04c5c 100644 --- a/text/maps/silph_co_11f.asm +++ b/text/maps/silph_co_11f.asm @@ -104,21 +104,6 @@ _SilphCo10Text_62335:: ; 85131 (21:5131) line "shall return!" done -_SilphCo11BattleText1:: ; 851d6 (21:51d6) - text "Stop right there!" - line "Don't you move!" - done - -_SilphCo11EndBattleText1:: ; 851f8 (21:51f8) - text "Don't..." - line "Please!" - prompt - -_SilphCo11AfterBattleText1:: ; 85209 (21:5209) - text "So, you want to" - line "see my BOSS?" - done - _SilphCo11BattleText2:: ; 85227 (21:5227) text "Halt! Do you have" line "an appointment" @@ -136,8 +121,3 @@ _SilphCo11AfterBattleText2:: ; 8526a (21:526a) cont "#MON tough!" done -_SilphCo10Text_6237b:: ; 8529a (21:529a) - text "The monitor has" - line "#MON on it!" - done - diff --git a/text/maps/silph_co_5f.asm b/text/maps/silph_co_5f.asm new file mode 100644 index 00000000..cea48d51 --- /dev/null +++ b/text/maps/silph_co_5f.asm @@ -0,0 +1,112 @@ +_SilphCo5Text_1a010:: ; 82936 (20:6936) + text "TEAM ROCKET is" + line "in an uproar over" + cont "some intruder." + cont "That's you right?" + done + +_SilphCo5Text_1a015:: ; 82978 (20:6978) + text "TEAM ROCKET took" + line "off! You're our" + cont "hero! Thank you!" + done + +_SilphCo5BattleText2:: ; 829aa (20:69aa) + text "I heard a kid was" + line "wandering around." + done + +_SilphCo5EndBattleText2:: ; 829cf (20:69cf) + text "Boom!" + prompt + +_SilphCo5AfterBattleText2:: ; 829d6 (20:69d6) + text "It's not smart" + line "to pick a fight" + cont "with TEAM ROCKET!" + done + +_SilphCo5BattleText3:: ; 82a07 (20:6a07) + text "We study #" + line "BALL technology" + cont "on this floor!" + done + +_SilphCo5EndBattleText3:: ; 82a32 (20:6a32) + text "Dang!" + line "Blast it!" + prompt + +_SilphCo5AfterBattleText3:: ; 82a43 (20:6a43) + text "We worked on the" + line "ultimate #" + cont "BALL which would" + cont "catch anything!" + done + +_SilphCo5BattleText4:: ; 82a81 (20:6a81) + text "Whaaat? There" + line "shouldn't be any" +IF DEF(_YELLOW) + cont "children here!" +ELSE + cont "children here?" +ENDC + done + +_SilphCo5EndBattleText4:: ; 84000 (21:4000) + text "Oh" + line "goodness!" + prompt + +_SilphCo5AfterBattleText4:: ; 8400e (21:400e) + text "You're only on 5F." + line "It's a long way" + cont "to my BOSS!" + done + +_SilphCo5BattleText5:: ; 8403c (21:403c) + text "Show TEAM ROCKET" + line "a little respect!" + done + +_SilphCo5EndBattleText5:: ; 84060 (21:4060) + text "Cough..." + line "Cough..." + prompt + +_SilphCo5AfterBattleText5:: ; 84073 (21:4073) + text "Which reminds me." + + para "KOFFING evolves" + line "into WEEZING!" + done + +_SilphCo5Text9:: ; 840a4 (21:40a4) + text "It's a #MON" + line "REPORT!" + + para "#MON LAB" + line "created PORYGON," + cont "the first virtual" + cont "reality #MON." + done + +_SilphCo5Text10:: ; 840f2 (21:40f2) + text "It's a #MON" + line "REPORT!" + + para "Over 160 #MON" + line "techniques have" + cont "been confirmed." + done + +_SilphCo5Text11:: ; 84134 (21:4134) + text "It's a #MON" + line "REPORT!" + + para "4 #MON evolve" + line "only when traded" + cont "by link-cable." + done + diff --git a/text/maps/silph_co_5f_1.asm b/text/maps/silph_co_5f_1.asm deleted file mode 100644 index 7435c910..00000000 --- a/text/maps/silph_co_5f_1.asm +++ /dev/null @@ -1,56 +0,0 @@ -_SilphCo5Text_1a010:: ; 82936 (20:6936) - text "TEAM ROCKET is" - line "in an uproar over" - cont "some intruder." - cont "That's you right?" - done - -_SilphCo5Text_1a015:: ; 82978 (20:6978) - text "TEAM ROCKET took" - line "off! You're our" - cont "hero! Thank you!" - done - -_SilphCo5BattleText2:: ; 829aa (20:69aa) - text "I heard a kid was" - line "wandering around." - done - -_SilphCo5EndBattleText2:: ; 829cf (20:69cf) - text "Boom!" - prompt - -_SilphCo5AfterBattleText2:: ; 829d6 (20:69d6) - text "It's not smart" - line "to pick a fight" - cont "with TEAM ROCKET!" - done - -_SilphCo5BattleText3:: ; 82a07 (20:6a07) - text "We study #" - line "BALL technology" - cont "on this floor!" - done - -_SilphCo5EndBattleText3:: ; 82a32 (20:6a32) - text "Dang!" - line "Blast it!" - prompt - -_SilphCo5AfterBattleText3:: ; 82a43 (20:6a43) - text "We worked on the" - line "ultimate #" - cont "BALL which would" - cont "catch anything!" - done - -_SilphCo5BattleText4:: ; 82a81 (20:6a81) - text "Whaaat? There" - line "shouldn't be any" -IF DEF(_YELLOW) - cont "children here!" -ELSE - cont "children here?" -ENDC - done - diff --git a/text/maps/silph_co_5f_2.asm b/text/maps/silph_co_5f_2.asm deleted file mode 100644 index bb94eb6b..00000000 --- a/text/maps/silph_co_5f_2.asm +++ /dev/null @@ -1,56 +0,0 @@ -_SilphCo5EndBattleText4:: ; 84000 (21:4000) - text "Oh" - line "goodness!" - prompt - -_SilphCo5AfterBattleText4:: ; 8400e (21:400e) - text "You're only on 5F." - line "It's a long way" - cont "to my BOSS!" - done - -_SilphCo5BattleText5:: ; 8403c (21:403c) - text "Show TEAM ROCKET" - line "a little respect!" - done - -_SilphCo5EndBattleText5:: ; 84060 (21:4060) - text "Cough..." - line "Cough..." - prompt - -_SilphCo5AfterBattleText5:: ; 84073 (21:4073) - text "Which reminds me." - - para "KOFFING evolves" - line "into WEEZING!" - done - -_SilphCo5Text9:: ; 840a4 (21:40a4) - text "It's a #MON" - line "REPORT!" - - para "#MON LAB" - line "created PORYGON," - cont "the first virtual" - cont "reality #MON." - done - -_SilphCo5Text10:: ; 840f2 (21:40f2) - text "It's a #MON" - line "REPORT!" - - para "Over 160 #MON" - line "techniques have" - cont "been confirmed." - done - -_SilphCo5Text11:: ; 84134 (21:4134) - text "It's a #MON" - line "REPORT!" - - para "4 #MON evolve" - line "only when traded" - cont "by link-cable." - done - diff --git a/text/maps/ss_anne_9.asm b/text/maps/ss_anne_9.asm index c96a7581..adbfe345 100644 --- a/text/maps/ss_anne_9.asm +++ b/text/maps/ss_anne_9.asm @@ -24,32 +24,6 @@ _SSAnne9Text_61c10:: ; 81833 (20:5833) line "down small bushes." done -_SSAnne9Text_61c1f:: ; 81854 (20:5854) - text "Have you gone to" - line "the SAFARI ZONE" - cont "in FUCHSIA CITY?" - - para "It had many rare" - line "kinds of #MON!!" - done - -_SSAnne9Text_61c2e:: ; 818a8 (20:58a8) - text "Me and my Daddy" - line "think the SAFARI" - cont "ZONE is awesome!" - done - -_SSAnne9Text_61c3d:: ; 818db (20:58db) - text "The CAPTAIN looked" - line "really sick and" - cont "pale!" - done - -_SSAnne9Text_61c4c:: ; 81905 (20:5905) - text "I hear many people" - line "get seasick!" - done - _SSAnne9BattleText1:: ; 81926 (20:5926) text "Competing against" line "the young keeps" @@ -116,3 +90,29 @@ _SSAnne9AfterBattleText4:: ; 81a8b (20:5a8b) line "strong #MON!" done +_SSAnne9Text_61c1f:: ; 81854 (20:5854) + text "Have you gone to" + line "the SAFARI ZONE" + cont "in FUCHSIA CITY?" + + para "It had many rare" + line "kinds of #MON!!" + done + +_SSAnne9Text_61c2e:: ; 818a8 (20:58a8) + text "Me and my Daddy" + line "think the SAFARI" + cont "ZONE is awesome!" + done + +_SSAnne9Text_61c3d:: ; 818db (20:58db) + text "The CAPTAIN looked" + line "really sick and" + cont "pale!" + done + +_SSAnne9Text_61c4c:: ; 81905 (20:5905) + text "I hear many people" + line "get seasick!" + done + diff --git a/text/maps/vermilion_city.asm b/text/maps/vermilion_city.asm index 9c27bf64..a8807803 100644 --- a/text/maps/vermilion_city.asm +++ b/text/maps/vermilion_city.asm @@ -86,6 +86,47 @@ _VermilionCityText6:: ; a5891 (29:5891) line "once a year." done +_OfficerJennyText1:: + text "I just caught a" + line "SQUIRTLE that was" + cont "always getting" + cont "into mischief." + + para "I think it needs a" + line "good trainer to" + cont "set it straight." + done + +_OfficerJennyText2:: + text "You have the" + line "THUNDERBADGE!?" + + para "You must be a" + line "good trainer!" + + para "I just caught a" + line "SQUIRTLE that was" + cont "always getting" + cont "into mischief." + + para "Would you take" + line "good care of it?" + done + +_OfficerJennyText3:: + text "OK! Please treat" + line "SQUIRTLE right!@@" + +_OfficerJennyText4:: + text "Oh... What am I" + line "to do now?" + done + +_OfficerJennyText5:: + text "How is SQUIRTLE" + line "doing?" + done + _VermilionCityText7:: ; a58db (29:58db) text "VERMILION CITY" line "The Port of" diff --git a/text/maps/vermilion_gym.asm b/text/maps/vermilion_gym.asm new file mode 100644 index 00000000..952e06eb --- /dev/null +++ b/text/maps/vermilion_gym.asm @@ -0,0 +1,170 @@ +_VermilionGymText_5cb6d:: ; 9aaa5 (26:6aa5) + text "Ten-hut! Welcome" + line "to VERMILION GYM!" + + para "Will you look at" + line "that, a pint-size" + cont "challenger!" + + para "Hahaha! You've got" + line "big and brassy" + cont "nerves to take me" + cont "on with your puny" + cont "power!" + + para "A #MON battle" + line "is war! I'll show" + cont "you, civilian!" + + para "I'll shock you" + line "into surrender!" + done + +_VermilionGymText_5cb72:: ; 9c000 (27:4000) + text "A little word of" + line "advice, kid!" + + para "Electricity is" + line "sure powerful!" + + para "But, it's useless" + line "against ground-" + cont "type #MON!" + done + +_VermilionGymText_5cb77:: ; 9c069 (27:4069) + text "The THUNDERBADGE" + line "cranks up your" + cont "#MON's SPEED!" + + para "It also lets your" +IF DEF(_YELLOW) + line "#MON FLY any-" +ELSE + line "#MON FLY any" +ENDC + cont "time, kid!" + + para "You're special," + line "kid! Take this!" + done + +_ReceivedTM24Text:: ; 9c0e0 (27:40e0) + text $52, " received " + line "@" + TX_RAM wcf4b + text "!@@" + +_TM24ExplanationText:: ; 9c0f5 (27:40f5) + db $0 + para "TM24 contains" + line "THUNDERBOLT!" + + para "Teach it to an" + line "electric #MON!" + done + +_TM24NoRoomText:: ; 9c130 (27:4130) + text "Yo kid, make room" + line "in your pack!" + done + +_ReceivedThunderbadgeText:: ; 9c151 (27:4151) + text "Whoa!" + + para "You're the real" + line "deal, kid!" + + para "Fine then, take" + line "the THUNDERBADGE!" + prompt + +_VermilionGymBattleText1:: ; 9c194 (27:4194) + text "When I was in the" + line "Army, LT.SURGE" + cont "was my strict CO!" + done + +_VermilionGymEndBattleText1:: ; 9c1c8 (27:41c8) + text "Stop!" + line "You're very good!" + prompt + +_VermilionGymAfterBattleText1:: ; 9c1e0 (27:41e0) + text "The door won't" + line "open?" + + para "LT.SURGE always" + line "was cautious!" + done + +_VermilionGymBattleText2:: ; 9c213 (27:4213) + text "I'm a lightweight," + line "but I'm good with" + cont "electricity!" + done + +_VermilionGymEndBattleText2:: ; 9c244 (27:4244) + text "Fried!" + prompt + +_VermilionGymAfterBattleText2:: ; 9c24c (27:424c) + text "OK, I'll talk!" + + para "LT.SURGE said he" + line "hid door switches" + cont "inside something!" + done + +_VermilionGymBattleText3:: ; 9c290 (27:4290) + text "This is no place" + line "for kids!" + done + +_VermilionGymEndBattleText3:: ; 9c2ac (27:42ac) + text "Wow!" + line "Surprised me!" + prompt + +_VermilionGymAfterBattleText3:: ; 9c2c0 (27:42c0) + text "LT.SURGE set up" + line "double locks!" + cont "Here's a hint!" + + para "When you open the" + line "1st lock, the 2nd" + cont "lock is right" + cont "next to it!" + done + +_VermilionGymText_5cbf4:: ; 9c32b (27:432b) + text "Yo! Champ in" + line "making!" + + para "LT.SURGE has a" + line "nickname. People" + cont "refer to him as" + cont "the Lightning" + cont "American!" + + para "He's an expert on" + line "electric #MON!" + + para "Birds and water" + line "#MON are at" + cont "risk! Beware of" + cont "paralysis too!" + + para "LT.SURGE is very" + line "cautious!" + + para "You'll have to" + line "break a code to" + cont "get to him!" + done + +_VermilionGymText_5cbf9:: ; 9c429 (27:4429) + text "Whew! That match" + line "was electric!" + done + diff --git a/text/maps/vermilion_gym_1.asm b/text/maps/vermilion_gym_1.asm deleted file mode 100644 index dfa45279..00000000 --- a/text/maps/vermilion_gym_1.asm +++ /dev/null @@ -1,43 +0,0 @@ -_VermilionGymText_5cb6d:: ; 9aaa5 (26:6aa5) -IF DEF(_YELLOW) - text "Ten-hut! Welcome" - line "to VERMILION GYM!" - - para "Will you look at" - line "that, a pint-size" - cont "challenger!" - - para "Hahaha! You've got" - line "big and brassy" - cont "nerves to take me" - cont "on with your puny" - cont "power!" - - para "A #MON battle" - line "is war! I'll show" - cont "you, civilian!" - - para "I'll shock you" - line "into surrender!" -ELSE - text "Hey, kid! What do" - line "you think you're" - cont "doing here?" - - para "You won't live" - line "long in combat!" - cont "That's for sure!" - - para "I tell you kid," - line "electric #MON" - cont "saved me during" - cont "the war!" - - para "They zapped my" - line "enemies into" - cont "paralysis!" - - para "The same as I'll" - line "do to you!" -ENDC - done diff --git a/text/maps/vermilion_gym_2.asm b/text/maps/vermilion_gym_2.asm deleted file mode 100644 index ee7d14ee..00000000 --- a/text/maps/vermilion_gym_2.asm +++ /dev/null @@ -1,148 +0,0 @@ -_VermilionGymText_5cb72:: ; 9c000 (27:4000) - text "A little word of" - line "advice, kid!" - - para "Electricity is" - line "sure powerful!" - - para "But, it's useless" - line "against ground-" - cont "type #MON!" - done - -_VermilionGymText_5cb77:: ; 9c069 (27:4069) - text "The THUNDERBADGE" - line "cranks up your" - cont "#MON's SPEED!" - - para "It also lets your" -IF DEF(_YELLOW) - line "#MON FLY any-" -ELSE - line "#MON FLY any" -ENDC - cont "time, kid!" - - para "You're special," - line "kid! Take this!" - done - -_ReceivedTM24Text:: ; 9c0e0 (27:40e0) - text $52, " received " - line "@" - TX_RAM wcf4b - text "!@@" - -_TM24ExplanationText:: ; 9c0f5 (27:40f5) - db $0 - para "TM24 contains" - line "THUNDERBOLT!" - - para "Teach it to an" - line "electric #MON!" - done - -_TM24NoRoomText:: ; 9c130 (27:4130) - text "Yo kid, make room" - line "in your pack!" - done - -_ReceivedThunderbadgeText:: ; 9c151 (27:4151) - text "Whoa!" - - para "You're the real" - line "deal, kid!" - - para "Fine then, take" - line "the THUNDERBADGE!" - prompt - -_VermilionGymBattleText1:: ; 9c194 (27:4194) - text "When I was in the" - line "Army, LT.SURGE" - cont "was my strict CO!" - done - -_VermilionGymEndBattleText1:: ; 9c1c8 (27:41c8) - text "Stop!" - line "You're very good!" - prompt - -_VermilionGymAfterBattleText1:: ; 9c1e0 (27:41e0) - text "The door won't" - line "open?" - - para "LT.SURGE always" - line "was cautious!" - done - -_VermilionGymBattleText2:: ; 9c213 (27:4213) - text "I'm a lightweight," - line "but I'm good with" - cont "electricity!" - done - -_VermilionGymEndBattleText2:: ; 9c244 (27:4244) - text "Fried!" - prompt - -_VermilionGymAfterBattleText2:: ; 9c24c (27:424c) - text "OK, I'll talk!" - - para "LT.SURGE said he" - line "hid door switches" - cont "inside something!" - done - -_VermilionGymBattleText3:: ; 9c290 (27:4290) - text "This is no place" - line "for kids!" - done - -_VermilionGymEndBattleText3:: ; 9c2ac (27:42ac) - text "Wow!" - line "Surprised me!" - prompt - -_VermilionGymAfterBattleText3:: ; 9c2c0 (27:42c0) - text "LT.SURGE set up" - line "double locks!" - cont "Here's a hint!" - - para "When you open the" - line "1st lock, the 2nd" - cont "lock is right" - cont "next to it!" - done - -_VermilionGymText_5cbf4:: ; 9c32b (27:432b) - text "Yo! Champ in" - line "making!" - - para "LT.SURGE has a" - line "nickname. People" - cont "refer to him as" - cont "the Lightning" - cont "American!" - - para "He's an expert on" - line "electric #MON!" - - para "Birds and water" - line "#MON are at" - cont "risk! Beware of" - cont "paralysis too!" - - para "LT.SURGE is very" - line "cautious!" - - para "You'll have to" - line "break a code to" - cont "get to him!" - done - -_VermilionGymText_5cbf9:: ; 9c429 (27:4429) - text "Whew! That match" - line "was electric!" - done - diff --git a/text/maps/viridian_city.asm b/text/maps/viridian_city.asm index 7ff2d71d..0c461a68 100644 --- a/text/maps/viridian_city.asm +++ b/text/maps/viridian_city.asm @@ -1,3 +1,40 @@ +_ViridianCityText_19219:: ; a4807 (29:4807) + text "First, you need" + line "to weaken the" + cont "target #MON." + done + +_ViridianCityText_1920a:: ; a46f9 (29:46f9) + text "Ahh, I've had my" + line "coffee now and I" + cont "feel great!" + + para "Sure, you can go" + line "through!" + + para "I'm sorry I was" + line "so rude to you!" + + para "I see you're using" + line "a #DEX." + + para "I'll show you how" + line "to catch #MON" + cont "as my apology." + done + +_OldManTextAfterBattle:: ; a47e6 (29:47e6) + text "That didn't work!" + line "I must be losing" + cont "my touch." + + para "I've run out of" + line "# BALLs too." + + para "I have to get some" + line "at #MON MART." + done + _ViridianCityText1:: ; a43cc (29:43cc) text "Those # BALLs" line "at your waist!" @@ -5,7 +42,7 @@ _ViridianCityText1:: ; a43cc (29:43cc) para "It's great that" line "you can carry and" - cont "use #MON any" + cont "use #MON any-" cont "time, anywhere!" done @@ -97,44 +134,21 @@ _TM42NoRoomText:: ; a46d7 (29:46d7) line "stuff already." done -_ViridianCityText_1920a:: ; a46f9 (29:46f9) - text "Ahh, I've had my" - line "coffee now and I" - cont "feel great!" - - para "Sure you can go" - line "through!" - - para "Are you in a" - line "hurry?" - done - -_ViridianCityText_1920f:: ; a4754 (29:4754) - text "I see you're using" - line "a #DEX." - - para "When you catch a" - line "#MON, #DEX" - cont "is automatically" - cont "updated." - - para "What? Don't you" - line "know how to catch" - cont "#MON?" - - para "I'll show you" - line "how to then." +_OldManAgainText1:: + text "Hmm? You want me" + line "to show you how" + cont "to catch #MON" + cont "again?" done -_ViridianCityText_19214:: ; a47e6 (29:47e6) - text "Time is money..." - line "Go along then." +_OldManAgainText2:: + text "Dandy! Watch what" + line "I do closely now!" done -_ViridianCityText_19219:: ; a4807 (29:4807) - text "First, you need" - line "to weaken the" - cont "target #MON." +_OldManAgainText3:: + text "Oh... I'm not good" + line "enough for you." done _ViridianCityText8:: ; a4833 (29:4833) -- cgit v1.3.1-sl0p