diff options
Diffstat (limited to 'data/maps')
-rw-r--r-- | data/maps/Route3/map.json | 20 | ||||
-rw-r--r-- | data/maps/Route3/scripts.inc | 8 | ||||
-rw-r--r-- | data/maps/Route3/text.inc | 52 | ||||
-rw-r--r-- | data/maps/Route4/map.json | 10 | ||||
-rw-r--r-- | data/maps/Route4/scripts.inc | 14 | ||||
-rw-r--r-- | data/maps/Route4/text.inc | 67 | ||||
-rw-r--r-- | data/maps/Route4_PokemonCenter_1F/map.json | 12 | ||||
-rw-r--r-- | data/maps/Route4_PokemonCenter_1F/scripts.inc | 108 | ||||
-rw-r--r-- | data/maps/Route4_PokemonCenter_1F/text.inc | 22 | ||||
-rw-r--r-- | data/maps/Route5/map.json | 2 | ||||
-rw-r--r-- | data/maps/Route5/scripts.inc | 4 | ||||
-rw-r--r-- | data/maps/Route5/text.inc | 58 | ||||
-rw-r--r-- | data/maps/Route6/map.json | 14 | ||||
-rw-r--r-- | data/maps/Route6/scripts.inc | 4 | ||||
-rw-r--r-- | data/maps/Route6/text.inc | 38 | ||||
-rw-r--r-- | data/maps/Route7/map.json | 2 | ||||
-rw-r--r-- | data/maps/Route7/scripts.inc | 4 | ||||
-rw-r--r-- | data/maps/Route7/text.inc | 2 | ||||
-rw-r--r-- | data/maps/Route8/map.json | 28 | ||||
-rw-r--r-- | data/maps/Route8/scripts.inc | 4 | ||||
-rw-r--r-- | data/maps/Route8/text.inc | 108 | ||||
-rw-r--r-- | data/maps/Route9/map.json | 20 | ||||
-rw-r--r-- | data/maps/Route9/scripts.inc | 4 | ||||
-rw-r--r-- | data/maps/Route9/text.inc | 109 |
24 files changed, 357 insertions, 357 deletions
diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index af0de6644..7651e395a 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route3_EventScript_167F78", + "script": "Route3_EventScript_Youngster", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route3_EventScript_1A957B", + "script": "Route3_EventScript_Robin", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route3_EventScript_1A94C1", + "script": "Route3_EventScript_James", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route3_EventScript_1A953D", + "script": "Route3_EventScript_Sally", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route3_EventScript_1A9483", + "script": "Route3_EventScript_Greg", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route3_EventScript_1A9407", + "script": "Route3_EventScript_Calvin", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route3_EventScript_1A94FF", + "script": "Route3_EventScript_Janice", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route3_EventScript_1A9445", + "script": "Route3_EventScript_Colton", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route3_EventScript_1A93C9", + "script": "Route3_EventScript_Ben", "flag": "0" } ], @@ -152,7 +152,7 @@ "x": 72, "y": 11, "elevation": 0, - "script": "Route3_EventScript_167F81" + "script": "Route3_EventScript_RouteSign" }, { "type": "hidden_item", diff --git a/data/maps/Route3/scripts.inc b/data/maps/Route3/scripts.inc index bc44936d0..c8e3c1a58 100644 --- a/data/maps/Route3/scripts.inc +++ b/data/maps/Route3/scripts.inc @@ -1,10 +1,10 @@ Route3_MapScripts:: @ 8167F77 .byte 0 -Route3_EventScript_167F78:: @ 8167F78 - msgbox gUnknown_8183491, MSGBOX_NPC +Route3_EventScript_Youngster:: @ 8167F78 + msgbox Route3_Text_TunnelFromCeruleanTiring, MSGBOX_NPC end -Route3_EventScript_167F81:: @ 8167F81 - msgbox gUnknown_81838C0, MSGBOX_SIGN +Route3_EventScript_RouteSign:: @ 8167F81 + msgbox Route3_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route3/text.inc b/data/maps/Route3/text.inc index 32aa96e19..6e5ad9c69 100644 --- a/data/maps/Route3/text.inc +++ b/data/maps/Route3/text.inc @@ -1,104 +1,104 @@ -gUnknown_8183491:: @ 8183491 +Route3_Text_TunnelFromCeruleanTiring:: @ 8183491 .string "Whew… I better take a rest…\n" .string "Groan…\p" .string "That tunnel from CERULEAN takes a\n" .string "lot out of you!$" -Text_1834E6:: @ 81834E6 +Route3_Text_ColtonIntro:: @ 81834E6 .string "Hey!\n" .string "I saw you in VIRIDIAN FOREST!$" -Text_183509:: @ 8183509 +Route3_Text_ColtonDefeat:: @ 8183509 .string "You beat me again!$" -Text_18351C:: @ 818351C +Route3_Text_ColtonPostBattle:: @ 818351C .string "There are other kinds of POKéMON\n" .string "than the ones you find in forests.$" -Text_183560:: @ 8183560 +Route3_Text_BenIntro:: @ 8183560 .string "Hi!\n" .string "I like shorts!\p" .string "They're delightfully comfy and\n" .string "easy to wear!$" -Text_1835A0:: @ 81835A0 +Route3_Text_BenDefeat:: @ 81835A0 .string "I don't believe it!$" -Text_1835B4:: @ 81835B4 +Route3_Text_BenPostBattle:: @ 81835B4 .string "Are you using a POKéMON CENTER's\n" .string "PC for storing your POKéMON?\p" .string "Each BOX can hold up to\n" .string "30 POKéMON.$" -Text_183616:: @ 8183616 +Route3_Text_JaniceIntro:: @ 8183616 .string "Excuse me!\n" .string "You looked at me, didn't you?$" -Text_18363F:: @ 818363F +Route3_Text_JaniceDefeat:: @ 818363F .string "You're mean!$" -Text_18364C:: @ 818364C +Route3_Text_JanicePostBattle:: @ 818364C .string "You shouldn't be staring if you\n" .string "don't want to battle!$" -Text_183682:: @ 8183682 +Route3_Text_GregIntro:: @ 8183682 .string "Are you a TRAINER?\n" .string "Let's get with it right away!$" -Text_1836B3:: @ 81836B3 +Route3_Text_GregDefeat:: @ 81836B3 .string "If I had new POKéMON, I would've\n" .string "won!$" -Text_1836D9:: @ 81836D9 +Route3_Text_GregPostBattle:: @ 81836D9 .string "If a POKéMON BOX on the PC gets\n" .string "full, just switch to another BOX.$" -Text_18371B:: @ 818371B +Route3_Text_SallyIntro:: @ 818371B .string "That look you gave me…\n" .string "It's so intriguing!$" -Text_183746:: @ 8183746 +Route3_Text_SallyDefeat:: @ 8183746 .string "Be nice!$" -Text_18374F:: @ 818374F +Route3_Text_SallyPostBattle:: @ 818374F .string "You can avoid battles by not\n" .string "letting TRAINERS see you.$" -Text_183786:: @ 8183786 +Route3_Text_CalvinIntro:: @ 8183786 .string "Hey! You're not wearing shorts!\n" .string "What's wrong with you?$" -Text_1837BD:: @ 81837BD +Route3_Text_CalvinDefeat:: @ 81837BD .string "Lost!\n" .string "Lost! Lost!$" -Text_1837CF:: @ 81837CF +Route3_Text_CalvinPostBattle:: @ 81837CF .string "I always wear shorts, even in\n" .string "winter. That's my policy.$" -Text_183807:: @ 8183807 +Route3_Text_JamesIntro:: @ 8183807 .string "I'll battle you with the POKéMON\n" .string "I just caught.$" -Text_183837:: @ 8183837 +Route3_Text_JamesDefeat:: @ 8183837 .string "Done like dinner!$" -Text_183849:: @ 8183849 +Route3_Text_JamesPostBattle:: @ 8183849 .string "Trained POKéMON are stronger than\n" .string "the wild ones.$" -Text_18387A:: @ 818387A +Route3_Text_RobinIntro:: @ 818387A .string "Eek!\n" .string "Did you touch me?$" -Text_183891:: @ 8183891 +Route3_Text_RobinDefeat:: @ 8183891 .string "That's it?$" -Text_18389C:: @ 818389C +Route3_Text_RobinPostBattle:: @ 818389C .string "ROUTE 4 is at the foot of\n" .string "MT. MOON.$" -gUnknown_81838C0:: @ 81838C0 +Route3_Text_RouteSign:: @ 81838C0 .string "ROUTE 3\n" .string "MT. MOON AHEAD$" diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index 7fcf32a5d..13edbec1b 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_EventScript_167F8C", + "script": "Route4_EventScript_Woman", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route4_EventScript_1A95B9", + "script": "Route4_EventScript_Crissy", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_EventScript_1ACDEA", + "script": "Route4_EventScript_Boy", "flag": "0" }, { @@ -148,14 +148,14 @@ "x": 18, "y": 7, "elevation": 0, - "script": "Route4_EventScript_167F95" + "script": "Route4_EventScript_MtMoonSign" }, { "type": "bg_event_type_0", "x": 34, "y": 7, "elevation": 0, - "script": "Route4_EventScript_167F9E" + "script": "Route4_EventScript_RouteSign" }, { "type": "hidden_item", diff --git a/data/maps/Route4/scripts.inc b/data/maps/Route4/scripts.inc index 9055722eb..c6c7e6bbd 100644 --- a/data/maps/Route4/scripts.inc +++ b/data/maps/Route4/scripts.inc @@ -1,17 +1,17 @@ Route4_MapScripts:: @ 8167F8A .byte 0 -Route4_EventScript_167F8B:: @ 8167F8B +Route4_EventScript_Unused:: @ 8167F8B end -Route4_EventScript_167F8C:: @ 8167F8C - msgbox gUnknown_81838D7, MSGBOX_NPC +Route4_EventScript_Woman:: @ 8167F8C + msgbox Route4_Text_TrippedOverGeodude, MSGBOX_NPC end -Route4_EventScript_167F95:: @ 8167F95 - msgbox gUnknown_818399B, MSGBOX_SIGN +Route4_EventScript_MtMoonSign:: @ 8167F95 + msgbox Route4_Text_MtMoonEntrance, MSGBOX_SIGN end -Route4_EventScript_167F9E:: @ 8167F9E - msgbox gUnknown_81839B4, MSGBOX_SIGN +Route4_EventScript_RouteSign:: @ 8167F9E + msgbox Route4_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route4/text.inc b/data/maps/Route4/text.inc index 49648cde0..a6bd24787 100644 --- a/data/maps/Route4/text.inc +++ b/data/maps/Route4/text.inc @@ -1,24 +1,79 @@ -gUnknown_81838D7:: @ 81838D7 +Route4_Text_TrippedOverGeodude:: @ 81838D7 .string "Ouch! I tripped over a rocky\n" .string "POKéMON, GEODUDE!$" -Text_183906:: @ 8183906 +Route4_Text_CrissyIntro:: @ 8183906 .string "I came to MT. MOON in search of\n" .string "mushroom POKéMON.$" -Text_183938:: @ 8183938 +Route4_Text_CrissyDefeat:: @ 8183938 .string "After all I did to catch them!$" -Text_183957:: @ 8183957 +Route4_Text_CrissyPostBattle:: @ 8183957 .string "There might not be any more\n" .string "mushrooms here.\p" .string "I think I got them all.$" -gUnknown_818399B:: @ 818399B +Route4_Text_MtMoonEntrance:: @ 818399B .string "MT. MOON\n" .string "Tunnel Entrance$" -gUnknown_81839B4:: @ 81839B4 +Route4_Text_RouteSign:: @ 81839B4 .string "ROUTE 4\n" .string "MT. MOON - CERULEAN CITY$" +Text_MegaPunchTeach:: @ 81839D5 + .string "A punch of roaring ferocity!\p" + .string "Packed with destructive power!\p" + .string "When the chips are down,\n" + .string "MEGA PUNCH is the ultimate attack!\l" + .string "You agree, yes?\p" + .string "Now!\n" + .string "Let me teach it to your POKéMON!$" + +Text_MegaPunchDeclined:: @ 8183A83 + .string "You'll be back when you understand\n" + .string "the worth of MEGA PUNCH.$" + +Text_MegaPunchWhichMon:: @ 8183ABF + .string "Fine!\n" + .string "Which POKéMON will learn it?$" + +Text_MegaPunchTaught:: @ 8183AE2 + .string "Now, we are comrades in the way of\n" + .string "punching!\p" + .string "You should go before you're seen\n" + .string "by the misguided fool who trains\l" + .string "only his silly kicking over there.$" + +Text_MegaKickTeach:: @ 8183B74 + .string "A kick of brutal ferocity!\p" + .string "Packed with destructive power!\p" + .string "When you get right down to it,\n" + .string "MEGA KICK is the ultimate attack!\l" + .string "Don't you agree?\p" + .string "Okay!\n" + .string "I'll teach it to your POKéMON!$" + +Text_MegaKickDeclined:: @ 8183C25 + .string "You'll come crawling back when you\n" + .string "realize the value of MEGA KICK.$" + +Text_MegaKickWhichMon:: @ 8183C68 + .string "All right!\n" + .string "Which POKéMON wants to learn it?$" + +Text_MegaKickTaught:: @ 8183C94 + .string "Now, we are soul mates in the way\n" + .string "of kicking!\p" + .string "You should run before you're seen\n" + .string "by the deluded nitwit who trains\l" + .string "only simple punching over there.$" + +Route4_Text_PeopleLikeAndRespectBrock:: @ 8183D26 + .string "Oh, wow, that's the BOULDERBADGE!\n" + .string "You got it from BROCK, didn't you?\p" + .string "BROCK is cool. He's not just tough.\n" + .string "People like and respect him.\p" + .string "I want to become a GYM LEADER\n" + .string "like him.$" diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 1ce7fbebb..5797e4600 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F8BB", + "script": "Route4_PokemonCenter_1F_EventScript_Nurse", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F75F", + "script": "Route4_PokemonCenter_1F_EventScript_MagikarpSalesman", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F754", + "script": "Route4_PokemonCenter_1F_EventScript_Gentleman", "flag": "0" }, { @@ -64,7 +64,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F74B", + "script": "Route4_PokemonCenter_1F_EventScript_Boy", "flag": "0" }, { @@ -77,7 +77,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F8C4", + "script": "Route4_PokemonCenter_1F_EventScript_Youngster", "flag": "0" }, { @@ -90,7 +90,7 @@ "movement_range_y": 1, "trainer_type": 0, "trainer_sight_or_berry_tree_id": 0, - "script": "Route4_PokemonCenter_1F_EventScript_16F8CD", + "script": "Route4_PokemonCenter_1F_EventScript_Newspaper", "flag": "0" } ], diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index ca2c5f611..420e18d1a 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -1,3 +1,5 @@ +.equ MAGIKARP_PRICE, 500 + Route4_PokemonCenter_1F_MapScripts:: @ 816F739 map_script MAP_SCRIPT_ON_TRANSITION, Route4_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume @@ -8,149 +10,149 @@ Route4_PokemonCenter_1F_OnTransition:: @ 816F744 setrespawn SPAWN_ROUTE4 end -Route4_PokemonCenter_1F_EventScript_16F74B:: @ 816F74B - msgbox gUnknown_819D9D4, MSGBOX_NPC +Route4_PokemonCenter_1F_EventScript_Boy:: @ 816F74B + msgbox Route4_PokemonCenter_1F_Text_CanHaveSixMonsWithYou, MSGBOX_NPC end -Route4_PokemonCenter_1F_EventScript_16F754:: @ 816F754 +Route4_PokemonCenter_1F_EventScript_Gentleman:: @ 816F754 lock - msgbox gUnknown_819DA3A + msgbox Route4_PokemonCenter_1F_Text_TeamRocketAttacksCerulean release end -Route4_PokemonCenter_1F_EventScript_16F75F:: @ 816F75F +Route4_PokemonCenter_1F_EventScript_MagikarpSalesman:: @ 816F75F lock faceplayer - goto_if_set FLAG_BOUGHT_MAGIKARP, EventScript_16F8A2 + goto_if_set FLAG_BOUGHT_MAGIKARP, Route4_PokemonCenter_1F_EventScript_AlreadyBoughtMagikarp showmoneybox 0, 0, 0 checkplayergender compare VAR_RESULT, MALE - goto_if_eq EventScript_16F786 + goto_if_eq Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpMale compare VAR_RESULT, FEMALE - goto_if_eq EventScript_16F794 + goto_if_eq Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpFemale end -EventScript_16F786:: @ 816F786 - msgbox gUnknown_819DA9A, MSGBOX_YESNO - goto EventScript_16F7A2 +Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpMale:: @ 816F786 + msgbox Route4_PokemonCenter_1F_Text_LaddieBuyMagikarpForJust500, MSGBOX_YESNO + goto Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp end -EventScript_16F794:: @ 816F794 - msgbox gUnknown_819DB34, MSGBOX_YESNO - goto EventScript_16F7A2 +Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpFemale:: @ 816F794 + msgbox Route4_PokemonCenter_1F_Text_SweetieBuyMagikarpForJust500, MSGBOX_YESNO + goto Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp end -EventScript_16F7A2:: @ 816F7A2 +Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp:: @ 816F7A2 compare VAR_RESULT, NO - goto_if_eq EventScript_16F888 - checkmoney 500, 0 + goto_if_eq Route4_PokemonCenter_1F_EventScript_DeclineMagikarp + checkmoney MAGIKARP_PRICE, 0 compare VAR_RESULT, FALSE - goto_if_eq EventScript_16F895 + goto_if_eq Route4_PokemonCenter_1F_EventScript_NotEnoughMoney textcolor 3 - setvar VAR_TEMP_1, 129 + setvar VAR_TEMP_1, SPECIES_MAGIKARP givemon SPECIES_MAGIKARP, 5, ITEM_NONE compare VAR_RESULT, 0 - goto_if_eq EventScript_16F7F6 + goto_if_eq Route4_PokemonCenter_1F_EventScript_BuyMagikarpParty compare VAR_RESULT, 1 - goto_if_eq EventScript_16F822 + goto_if_eq Route4_PokemonCenter_1F_EventScript_BuyMagikarpPC compare VAR_RESULT, 2 - goto_if_eq EventScript_16F8AC + goto_if_eq Route4_PokemonCenter_1F_EventScript_NoRoomForMagikarp end -EventScript_16F7F6:: @ 816F7F6 - call EventScript_16F86F +Route4_PokemonCenter_1F_EventScript_BuyMagikarpParty:: @ 816F7F6 + call Route4_PokemonCenter_1F_EventScript_PayForMagikarp msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16F861 + goto_if_eq Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp call EventScript_GetGiftMonPartySlot fadescreen FADE_TO_BLACK hidemoneybox 0, 0 special ChangePokemonNickname waitstate - goto EventScript_16F86A + goto Route4_PokemonCenter_1F_EventScript_BoughtMagikarp end -EventScript_16F822:: @ 816F822 - call EventScript_16F86F +Route4_PokemonCenter_1F_EventScript_BuyMagikarpPC:: @ 816F822 + call Route4_PokemonCenter_1F_EventScript_PayForMagikarp msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO - goto_if_eq EventScript_16F84B + goto_if_eq Route4_PokemonCenter_1F_EventScript_TransferMagikarpCloseMoneyBox fadescreen FADE_TO_BLACK hidemoneybox 0, 0 special ChangeBoxPokemonNickname waitstate lock faceplayer - goto EventScript_16F856 + goto Route4_PokemonCenter_1F_EventScript_TransferMagikarp end -EventScript_16F84B:: @ 816F84B +Route4_PokemonCenter_1F_EventScript_TransferMagikarpCloseMoneyBox:: @ 816F84B call EventScript_TransferredToPC - goto EventScript_16F861 + goto Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp end -EventScript_16F856:: @ 816F856 +Route4_PokemonCenter_1F_EventScript_TransferMagikarp:: @ 816F856 call EventScript_TransferredToPC - goto EventScript_16F86A + goto Route4_PokemonCenter_1F_EventScript_BoughtMagikarp end -EventScript_16F861:: @ 816F861 +Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp:: @ 816F861 hidemoneybox 0, 0 - goto EventScript_16F86A + goto Route4_PokemonCenter_1F_EventScript_BoughtMagikarp end -EventScript_16F86A:: @ 816F86A +Route4_PokemonCenter_1F_EventScript_BoughtMagikarp:: @ 816F86A setflag FLAG_BOUGHT_MAGIKARP release end -EventScript_16F86F:: @ 816F86F - removemoney 500, 0 +Route4_PokemonCenter_1F_EventScript_PayForMagikarp:: @ 816F86F + removemoney MAGIKARP_PRICE, 0 updatemoneybox 0, 0, 0 playfanfare MUS_FANFA1 - message Text_19DBD3 + message Route4_PokemonCenter_1F_Text_PaidOutrageouslyForMagikarp waitmessage waitfanfare getspeciesname 0, SPECIES_MAGIKARP return -EventScript_16F888:: @ 816F888 - msgbox gUnknown_819DC07 +Route4_PokemonCenter_1F_EventScript_DeclineMagikarp:: @ 816F888 + msgbox Route4_PokemonCenter_1F_Text_OnlyDoingThisAsFavorToYou hidemoneybox 0, 0 release end -EventScript_16F895:: @ 816F895 - msgbox gUnknown_819DC78 +Route4_PokemonCenter_1F_EventScript_NotEnoughMoney:: @ 816F895 + msgbox Route4_PokemonCenter_1F_Text_YoullNeedMoreMoney hidemoneybox 0, 0 release end -EventScript_16F8A2:: @ 816F8A2 - msgbox gUnknown_819DC9A +Route4_PokemonCenter_1F_EventScript_AlreadyBoughtMagikarp:: @ 816F8A2 + msgbox Route4_PokemonCenter_1F_Text_IDontGiveRefunds release end -EventScript_16F8AC:: @ 816F8AC +Route4_PokemonCenter_1F_EventScript_NoRoomForMagikarp:: @ 816F8AC textcolor 0 - msgbox gUnknown_819DC3E + msgbox Route4_PokemonCenter_1F_Text_NoRoomForMorePokemon hidemoneybox 0, 0 release end -Route4_PokemonCenter_1F_EventScript_16F8BB:: @ 816F8BB +Route4_PokemonCenter_1F_EventScript_Nurse:: @ 816F8BB lock faceplayer call EventScript_PkmnCenterNurse release end -Route4_PokemonCenter_1F_EventScript_16F8C4:: @ 816F8C4 - msgbox gUnknown_819DCDB, MSGBOX_NPC +Route4_PokemonCenter_1F_EventScript_Youngster:: @ 816F8C4 + msgbox Route4_PokemonCenter_1F_Text_ShouldStoreMonsUsingPC, MSGBOX_NPC end -Route4_PokemonCenter_1F_EventScript_16F8CD:: @ 816F8CD +Route4_PokemonCenter_1F_EventScript_Newspaper:: @ 816F8CD lock - msgbox gUnknown_819DD54 + msgbox Route4_PokemonCenter_1F_Text_ItsANewspaper release end diff --git a/data/maps/Route4_PokemonCenter_1F/text.inc b/data/maps/Route4_PokemonCenter_1F/text.inc index f357b7f76..df65ae33a 100644 --- a/data/maps/Route4_PokemonCenter_1F/text.inc +++ b/data/maps/Route4_PokemonCenter_1F/text.inc @@ -1,54 +1,54 @@ -gUnknown_819D9D4:: @ 819D9D4 +Route4_PokemonCenter_1F_Text_CanHaveSixMonsWithYou:: @ 819D9D4 .string "Okay, set six POKé BALLS in my\n" .string "belt…\p" .string "Yeah, that'll do it. At most, you\n" .string "can have six POKéMON with you.$" -gUnknown_819DA3A:: @ 819DA3A +Route4_PokemonCenter_1F_Text_TeamRocketAttacksCerulean:: @ 819DA3A .string "TEAM ROCKET attacks CERULEAN\n" .string "citizens…\p" .string "Not a day goes by without TEAM\n" .string "ROCKET being in the news.$" -gUnknown_819DA9A:: @ 819DA9A +Route4_PokemonCenter_1F_Text_LaddieBuyMagikarpForJust500:: @ 819DA9A .string "MAN: Hello there, laddie!\n" .string "Have I got a deal just for you!\p" .string "I'll let you have a secret POKéMON\n" .string "- a MAGIKARP - for just ¥500!\p" .string "So, you'll buy it, am I right?$" -gUnknown_819DB34:: @ 819DB34 +Route4_PokemonCenter_1F_Text_SweetieBuyMagikarpForJust500:: @ 819DB34 .string "MAN: Hello there, sweetie pie!\n" .string "Have I got a deal just for you!\p" .string "I'll let you have a secret POKéMON\n" .string "- a MAGIKARP - for just ¥500!\p" .string "So, you'll buy it, am I right?$" -Text_19DBD3:: @ 819DBD3 +Route4_PokemonCenter_1F_Text_PaidOutrageouslyForMagikarp:: @ 819DBD3 .string "{PLAYER} paid an outrageous ¥500\n" .string "and bought the MAGIKARP…$" -gUnknown_819DC07:: @ 819DC07 +Route4_PokemonCenter_1F_Text_OnlyDoingThisAsFavorToYou:: @ 819DC07 .string "No? You say no? I'm only doing this\n" .string "as a favor to you!$" -gUnknown_819DC3E:: @ 819DC3E +Route4_PokemonCenter_1F_Text_NoRoomForMorePokemon:: @ 819DC3E .string "There's no more room for any more\n" .string "POKéMON, it looks like.$" -gUnknown_819DC78:: @ 819DC78 +Route4_PokemonCenter_1F_Text_YoullNeedMoreMoney:: @ 819DC78 .string "You'll need more money than that!$" -gUnknown_819DC9A:: @ 819DC9A +Route4_PokemonCenter_1F_Text_IDontGiveRefunds:: @ 819DC9A .string "MAN: Well, I don't give refunds.\n" .string "You knew what you were getting!$" -gUnknown_819DCDB:: @ 819DCDB +Route4_PokemonCenter_1F_Text_ShouldStoreMonsUsingPC:: @ 819DCDB .string "Sometimes, you'll have too many\n" .string "POKéMON with you to add any more.\p" .string "In that case, you should just\n" .string "store some using any PC.$" -gUnknown_819DD54:: @ 819DD54 +Route4_PokemonCenter_1F_Text_ItsANewspaper:: @ 819DD54 .string "It's a newspaper.$" diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json index 825ae6068..08ec22387 100644 --- a/data/maps/Route5/map.json +++ b/data/maps/Route5/map.json @@ -63,7 +63,7 @@ "x": 32, "y": 32, "elevation": 0, - "script": "Route5_EventScript_167FA8" + "script": "Route5_EventScript_UndergroundPathSign" } ] } diff --git a/data/maps/Route5/scripts.inc b/data/maps/Route5/scripts.inc index 3e1b507d2..cc5b0d1d2 100644 --- a/data/maps/Route5/scripts.inc +++ b/data/maps/Route5/scripts.inc @@ -1,6 +1,6 @@ Route5_MapScripts:: @ 8167FA7 .byte 0 -Route5_EventScript_167FA8:: @ 8167FA8 - msgbox gUnknown_8183DD4, MSGBOX_SIGN +Route5_EventScript_UndergroundPathSign:: @ 8167FA8 + msgbox Route5_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route5/text.inc b/data/maps/Route5/text.inc index 0a3e80874..1aab5cc6b 100644 --- a/data/maps/Route5/text.inc +++ b/data/maps/Route5/text.inc @@ -1,60 +1,4 @@ -Text_MegaPunchTeach:: @ 81839D5 - .string "A punch of roaring ferocity!\p" - .string "Packed with destructive power!\p" - .string "When the chips are down,\n" - .string "MEGA PUNCH is the ultimate attack!\l" - .string "You agree, yes?\p" - .string "Now!\n" - .string "Let me teach it to your POKéMON!$" - -Text_MegaPunchDeclined:: @ 8183A83 - .string "You'll be back when you understand\n" - .string "the worth of MEGA PUNCH.$" - -Text_MegaPunchWhichMon:: @ 8183ABF - .string "Fine!\n" - .string "Which POKéMON will learn it?$" - -Text_MegaPunchTaught:: @ 8183AE2 - .string "Now, we are comrades in the way of\n" - .string "punching!\p" - .string "You should go before you're seen\n" - .string "by the misguided fool who trains\l" - .string "only his silly kicking over there.$" - -Text_MegaKickTeach:: @ 8183B74 - .string "A kick of brutal ferocity!\p" - .string "Packed with destructive power!\p" - .string "When you get right down to it,\n" - .string "MEGA KICK is the ultimate attack!\l" - .string "Don't you agree?\p" - .string "Okay!\n" - .string "I'll teach it to your POKéMON!$" - -Text_MegaKickDeclined:: @ 8183C25 - .string "You'll come crawling back when you\n" - .string "realize the value of MEGA KICK.$" - -Text_MegaKickWhichMon:: @ 8183C68 - .string "All right!\n" - .string "Which POKéMON wants to learn it?$" - -Text_MegaKickTaught:: @ 8183C94 - .string "Now, we are soul mates in the way\n" - .string "of kicking!\p" - .string "You should run before you're seen\n" - .string "by the deluded nitwit who trains\l" - .string "only simple punching over there.$" - -Text_183D26:: @ 8183D26 - .string "Oh, wow, that's the BOULDERBADGE!\n" - .string "You got it from BROCK, didn't you?\p" - .string "BROCK is cool. He's not just tough.\n" - .string "People like and respect him.\p" - .string "I want to become a GYM LEADER\n" - .string "like him.$" - -gUnknown_8183DD4:: @ 8183DD4 +Route5_Text_UndergroundPathSign:: @ 8183DD4 .string "UNDERGROUND PATH\n" .string "CERULEAN CITY - VERMILION CITY$" diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index e6c4c7cf2..4ff0dc898 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route6_EventScript_1A9999", + "script": "Route6_EventScript_Keigo", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route6_EventScript_1A9A15", + "script": "Route6_EventScript_Ricky", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 0, - "script": "Route6_EventScript_1A9A91", + "script": "Route6_EventScript_Nancy", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route6_EventScript_1A99D7", + "script": "Route6_EventScript_Elijah", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route6_EventScript_1A9ACF", + "script": "Route6_EventScript_Isabelle", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route6_EventScript_1A9A53", + "script": "Route6_EventScript_Jeff", "flag": "0" } ], @@ -135,7 +135,7 @@ "x": 21, "y": 15, "elevation": 0, - "script": "Route6_EventScript_167FB2" + "script": "Route6_EventScript_UndergroundPathSign" }, { "type": "hidden_item", diff --git a/data/maps/Route6/scripts.inc b/data/maps/Route6/scripts.inc index 00b3efb56..575c05fe6 100644 --- a/data/maps/Route6/scripts.inc +++ b/data/maps/Route6/scripts.inc @@ -1,6 +1,6 @@ Route6_MapScripts:: @ 8167FB1 .byte 0 -Route6_EventScript_167FB2:: @ 8167FB2 - msgbox gUnknown_8184067, MSGBOX_SIGN +Route6_EventScript_UndergroundPathSign:: @ 8167FB2 + msgbox Route6_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route6/text.inc b/data/maps/Route6/text.inc index b8ae84e32..0242ceee8 100644 --- a/data/maps/Route6/text.inc +++ b/data/maps/Route6/text.inc @@ -1,73 +1,73 @@ -Text_183E04:: @ 8183E04 +Route6_Text_RickyIntro:: @ 8183E04 .string "Who's there?\n" .string "Quit listening in on us!$" -Text_183E2A:: @ 8183E2A +Route6_Text_RickyDefeat:: @ 8183E2A .string "I just can't win!$" -Text_183E3C:: @ 8183E3C +Route6_Text_RickyPostBattle:: @ 8183E3C .string "Whisper…\n" .string "Whisper…$" -Text_183E4E:: @ 8183E4E +Route6_Text_NancyIntro:: @ 8183E4E .string "Excuse me!\n" .string "This is a private conversation!$" -Text_183E79:: @ 8183E79 +Route6_Text_NancyDefeat:: @ 8183E79 .string "Ugh!\n" .string "I hate losing.$" -Text_183E8D:: @ 8183E8D +Route6_Text_NancyPostBattle:: @ 8183E8D .string "Whisper…\n" .string "Whisper…$" -Text_183E9F:: @ 8183E9F +Route6_Text_KeigoIntro:: @ 8183E9F .string "There aren't many bugs out here.$" -Text_183EC0:: @ 8183EC0 +Route6_Text_KeigoDefeat:: @ 8183EC0 .string "No!\n" .string "You're kidding!$" -Text_183ED4:: @ 8183ED4 +Route6_Text_KeigoPostBattle:: @ 8183ED4 .string "I like bugs, so I'm going back to\n" .string "VIRIDIAN FOREST.$" -Text_183F07:: @ 8183F07 +Route6_Text_JeffIntro:: @ 8183F07 .string "Huh?\n" .string "You want to talk to me?$" -Text_183F24:: @ 8183F24 +Route6_Text_JeffDefeat:: @ 8183F24 .string "This stinks…\n" .string "I couldn't beat your challenge…$" -Text_183F51:: @ 8183F51 +Route6_Text_JeffPostBattle:: @ 8183F51 .string "I should bring more POKéMON with\n" .string "me. I'll feel safer that way.$" -Text_183F90:: @ 8183F90 +Route6_Text_IsabelleIntro:: @ 8183F90 .string "Me?\n" .string "Well, okay. I'll play!$" -Text_183FAB:: @ 8183FAB +Route6_Text_IsabelleDefeat:: @ 8183FAB .string "Things just didn't work…$" -Text_183FC4:: @ 8183FC4 +Route6_Text_IsabellePostBattle:: @ 8183FC4 .string "I want to get stronger.\n" .string "What's your secret?$" -Text_183FF0:: @ 8183FF0 +Route6_Text_ElijahIntro:: @ 8183FF0 .string "I've never seen you around.\n" .string "Are you good?$" -Text_18401A:: @ 818401A +Route6_Text_ElijahDefeat:: @ 818401A .string "You're too good!$" -Text_18402B:: @ 818402B +Route6_Text_ElijahPostBattle:: @ 818402B .string "Are my POKéMON weak?\n" .string "Or, am I just bad?\l" .string "Which do you think?$" -gUnknown_8184067:: @ 8184067 +Route6_Text_UndergroundPathSign:: @ 8184067 .string "UNDERGROUND PATH\n" .string "CERULEAN CITY - VERMILION CITY$" diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json index d75cae2e4..e935d2d28 100644 --- a/data/maps/Route7/map.json +++ b/data/maps/Route7/map.json @@ -63,7 +63,7 @@ "x": 5, "y": 14, "elevation": 0, - "script": "Route7_EventScript_167FBC" + "script": "Route7_EventScript_UndergroundPathSign" }, { "type": "hidden_item", diff --git a/data/maps/Route7/scripts.inc b/data/maps/Route7/scripts.inc index 52d0f5f36..299d6bad8 100644 --- a/data/maps/Route7/scripts.inc +++ b/data/maps/Route7/scripts.inc @@ -1,6 +1,6 @@ Route7_MapScripts:: @ 8167FBB .byte 0 -Route7_EventScript_167FBC:: @ 8167FBC - msgbox gUnknown_8184097, MSGBOX_SIGN +Route7_EventScript_UndergroundPathSign:: @ 8167FBC + msgbox Route7_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route7/text.inc b/data/maps/Route7/text.inc index 3f1cdda5b..4a58cc14b 100644 --- a/data/maps/Route7/text.inc +++ b/data/maps/Route7/text.inc @@ -1,4 +1,4 @@ -gUnknown_8184097:: @ 8184097 +Route7_Text_UndergroundPathSign:: @ 8184097 .string "UNDERGROUND PATH\n" .string "CELADON CITY - LAVENDER TOWN$" diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 22663b469..144ae1d3f 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "Route8_EventScript_1AA1D5", + "script": "Route8_EventScript_Julia", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route8_EventScript_1AA30B", + "script": "Route8_EventScript_Rich", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route8_EventScript_1AA251", + "script": "Route8_EventScript_Glenn", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route8_EventScript_1AA11B", + "script": "Route8_EventScript_Paige", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "Route8_EventScript_1AA28F", + "script": "Route8_EventScript_Leslie", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route8_EventScript_1AA159", + "script": "Route8_EventScript_Andrea", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 6, - "script": "Route8_EventScript_1AA197", + "script": "Route8_EventScript_Megan", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route8_EventScript_1AA2CD", + "script": "Route8_EventScript_Stan", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route8_EventScript_1AA213", + "script": "Route8_EventScript_Aidan", "flag": "0" }, { @@ -179,7 +179,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route8_EventScript_1AA349", + "script": "Route8_EventScript_Eli", "flag": "0" }, { @@ -192,7 +192,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route8_EventScript_1AA38F", + "script": "Route8_EventScript_Anne", "flag": "0" }, { @@ -205,7 +205,7 @@ "movement_range_y": 2, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route8_EventScript_1AA3D5", + "script": "Route8_EventScript_Ricardo", "flag": "0" }, { @@ -218,7 +218,7 @@ "movement_range_y": 5, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route8_EventScript_1AA413", + "script": "Route8_EventScript_Jaren", "flag": "0" } ], @@ -245,7 +245,7 @@ "x": 16, "y": 5, "elevation": 0, - "script": "Route8_EventScript_167FC6" + "script": "Route8_EventScript_UndergroundPathSign" }, { "type": "hidden_item", diff --git a/data/maps/Route8/scripts.inc b/data/maps/Route8/scripts.inc index c0f7475f3..93e0aa38a 100644 --- a/data/maps/Route8/scripts.inc +++ b/data/maps/Route8/scripts.inc @@ -1,6 +1,6 @@ Route8_MapScripts:: @ 8167FC5 .byte 0 -Route8_EventScript_167FC6:: @ 8167FC6 - msgbox gUnknown_8184576, MSGBOX_SIGN +Route8_EventScript_UndergroundPathSign:: @ 8167FC6 + msgbox Route8_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route8/text.inc b/data/maps/Route8/text.inc index 83f725c6a..c9891575c 100644 --- a/data/maps/Route8/text.inc +++ b/data/maps/Route8/text.inc @@ -1,110 +1,162 @@ -Text_1840C5:: @ 81840C5 +Route8_Text_AidanIntro:: @ 81840C5 .string "You look good at POKéMON, but how\n" .string "is your chemistry grade?$" -Text_184100:: @ 8184100 +Route8_Text_AidanDefeat:: @ 8184100 .string "Ow!\n" .string "Meltdown!$" -Text_18410E:: @ 818410E +Route8_Text_AidanPostBattle:: @ 818410E .string "I am better at school than this!$" -Text_18412F:: @ 818412F +Route8_Text_StanIntro:: @ 818412F .string "All right!\n" .string "Let's play a game!$" -Text_18414D:: @ 818414D +Route8_Text_StanDefeat:: @ 818414D .string "Drat!\n" .string "Came up short!$" -Text_184162:: @ 8184162 +Route8_Text_StanPostBattle:: @ 8184162 .string "Things didn't work today.$" -Text_18417C:: @ 818417C +Route8_Text_GlennIntro:: @ 818417C .string "You should be informed.\n" .string "You need strategy to win at this!$" -Text_1841B6:: @ 81841B6 +Route8_Text_GlennDefeat:: @ 81841B6 .string "It's not logical!$" -Text_1841C8:: @ 81841C8 +Route8_Text_GlennPostBattle:: @ 81841C8 .string "Go with GRIMER first…and…\n" .string "…and…then…$" -Text_1841ED:: @ 81841ED +Route8_Text_PaigeIntro:: @ 81841ED .string "I like NIDORAN, so I collect them!$" -Text_184210:: @ 8184210 +Route8_Text_PaigeDefeat:: @ 8184210 .string "Why?\n" .string "Why??$" -Text_18421B:: @ 818421B +Route8_Text_PaigePostBattle:: @ 818421B .string "When POKéMON grow up, they get\n" .string "ugly! They shouldn't evolve.$" -Text_184257:: @ 8184257 +Route8_Text_LeslieIntro:: @ 8184257 .string "School is fun, but so are POKéMON.$" -Text_18427A:: @ 818427A +Route8_Text_LeslieDefeat:: @ 818427A .string "You made it clear to me that\n" .string "I should stick with school.$" -Text_1842B3:: @ 81842B3 +Route8_Text_LesliePostBattle:: @ 81842B3 .string "I was planning on getting some\n" .string "fresh air for a change, but…\p" .string "We're stuck here because of the\n" .string "gates at SAFFRON.$" -Text_184321:: @ 8184321 +Route8_Text_AndreaIntro:: @ 8184321 .string "MEOWTH is so cute, meow, meow,\n" .string "meow!$" -Text_184346:: @ 8184346 +Route8_Text_AndreaDefeat:: @ 8184346 .string "Meeeeyow!$" -Text_184350:: @ 8184350 +Route8_Text_AndreaPostBattle:: @ 8184350 .string "I think PIDGEY and RATTATA are\n" .string "cute, too!$" -Text_18437A:: @ 818437A +Route8_Text_MeganIntro:: @ 818437A .string "We must look silly standing here\n" .string "like this.$" -Text_1843A6:: @ 81843A6 +Route8_Text_MeganDefeat:: @ 81843A6 .string "Look what you did to my poor, cute\n" .string "POKéMON!$" -Text_1843D2:: @ 81843D2 +Route8_Text_MeganPostBattle:: @ 81843D2 .string "SAFFRON's gatekeeper won't let us\n" .string "go through.\p" .string "I know he's doing his job, but I\n" .string "think he's mean.$" -Text_184432:: @ 8184432 +Route8_Text_RichIntro:: @ 8184432 .string "I'm a rambling, gaming dude!$" -Text_18444F:: @ 818444F +Route8_Text_RichDefeat:: @ 818444F .string "Missed the big chance!$" -Text_184466:: @ 8184466 +Route8_Text_RichPostBattle:: @ 8184466 .string "Playing games and POKéMON are like\n" .string "eating peanuts! I just can't stop!$" -Text_1844AC:: @ 81844AC +Route8_Text_JuliaIntro:: @ 81844AC .string "What's a cute, round, and fluffy\n" .string "POKéMON?$" -Text_1844D6:: @ 81844D6 +Route8_Text_JuliaDefeat:: @ 81844D6 .string "Stop!\p" .string "Don't be so mean to my CLEFAIRY!$" -Text_1844FD:: @ 81844FD +Route8_Text_JuliaPostBattle:: @ 81844FD .string "I read that CLEFAIRY evolves when\n" .string "it's exposed to a MOON STONE.\p" .string "I read that in a POKéMON JOURNAL.\n" .string "I wonder if it's true?$" -gUnknown_8184576:: @ 8184576 +Route8_Text_UndergroundPathSign:: @ 8184576 .string "UNDERGROUND PATH\n" .string "CELADON CITY - LAVENDER TOWN$" +Route8_Text_EliIntro:: @ 81845A4 + .string "ELI: Twin power is fantastic.\n" + .string "Did you know?$" + +Route8_Text_EliDefeat:: @ 81845D0 + .string "ELI: But…\n" + .string "We used our twin power…$" + +Route8_Text_EliPostBattle:: @ 81845F2 + .string "ELI: I caught my POKéMON with\n" + .string "ANNE!$" + +Route8_Text_EliNotEnoughMons:: @ 8184616 + .string "ELI: We can't battle if you don't\n" + .string "have two POKéMON.$" + +Route8_Text_AnneIntro:: @ 818464A + .string "ANNE: We'll shock you with our twin\n" + .string "power!$" + +Route8_Text_AnneDefeat:: @ 8184675 + .string "ANNE: Our twin power…$" + +Route8_Text_AnnePostBattle:: @ 818468B + .string "ANNE: I'm raising POKéMON with\n" + .string "ELI.$" + +Route8_Text_AnneNotEnoughMons:: @ 81846AF + .string "ANNE: Hi, hi! Let's battle!\n" + .string "But bring two POKéMON.$" + +Route8_Text_RicardoIntro:: @ 81846E2 + .string "My bike's acting up, man.$" + +Route8_Text_RicardoDefeat:: @ 81846FC + .string "Aww, man.\n" + .string "I'm not into this.$" + +Route8_Text_RicardoPostBattle:: @ 8184719 + .string "I got grass caught up in my\n" + .string "spokes, man.$" + +Route8_Text_JarenIntro:: @ 8184742 + .string "Clear the way, or I'll run you\n" + .string "down!$" + +Route8_Text_JarenDefeat:: @ 8184767 + .string "You for real, kid?$" + +Route8_Text_JarenPostBattle:: @ 818477A + .string "Don't think you're all special and\n" + .string "all just because of this.$" diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index e67441c39..123be8d5a 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -36,7 +36,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route9_EventScript_1A9E71", + "script": "Route9_EventScript_Alicia", "flag": "0" }, { @@ -49,7 +49,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route9_EventScript_1A9F69", + "script": "Route9_EventScript_Jeremy", "flag": "0" }, { @@ -62,7 +62,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route9_EventScript_1A9EED", + "script": "Route9_EventScript_Alan", "flag": "0" }, { @@ -75,7 +75,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route9_EventScript_1A9DF5", + "script": "Route9_EventScript_Chris", "flag": "0" }, { @@ -88,7 +88,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 2, - "script": "Route9_EventScript_1A9D79", + "script": "Route9_EventScript_Brent", "flag": "0" }, { @@ -101,7 +101,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 3, - "script": "Route9_EventScript_1A9DB7", + "script": "Route9_EventScript_Conner", "flag": "0" }, { @@ -114,7 +114,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 1, - "script": "Route9_EventScript_1A9F2B", + "script": "Route9_EventScript_Brice", "flag": "0" }, { @@ -127,7 +127,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 4, - "script": "Route9_EventScript_1A9EAF", + "script": "Route9_EventScript_Caitlin", "flag": "0" }, { @@ -140,7 +140,7 @@ "movement_range_y": 1, "trainer_type": 1, "trainer_sight_or_berry_tree_id": 5, - "script": "Route9_EventScript_1A9E33", + "script": "Route9_EventScript_Drew", "flag": "0" }, { @@ -191,7 +191,7 @@ "x": 29, "y": 7, "elevation": 0, - "script": "Route9_EventScript_167FD0" + "script": "Route9_EventScript_RouteSign" }, { "type": "hidden_item", diff --git a/data/maps/Route9/scripts.inc b/data/maps/Route9/scripts.inc index 1b48cd68e..bd4be2115 100644 --- a/data/maps/Route9/scripts.inc +++ b/data/maps/Route9/scripts.inc @@ -1,6 +1,6 @@ Route9_MapScripts:: @ 8167FCF .byte 0 -Route9_EventScript_167FD0:: @ 8167FD0 - msgbox gUnknown_8184B66, MSGBOX_SIGN +Route9_EventScript_RouteSign:: @ 8167FD0 + msgbox Route9_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route9/text.inc b/data/maps/Route9/text.inc index 3a4506533..2f3762a87 100644 --- a/data/maps/Route9/text.inc +++ b/data/maps/Route9/text.inc @@ -1,159 +1,106 @@ -Text_1845A4:: @ 81845A4 - .string "ELI: Twin power is fantastic.\n" - .string "Did you know?$" - -Text_1845D0:: @ 81845D0 - .string "ELI: But…\n" - .string "We used our twin power…$" - -Text_1845F2:: @ 81845F2 - .string "ELI: I caught my POKéMON with\n" - .string "ANNE!$" - -Text_184616:: @ 8184616 - .string "ELI: We can't battle if you don't\n" - .string "have two POKéMON.$" - -Text_18464A:: @ 818464A - .string "ANNE: We'll shock you with our twin\n" - .string "power!$" - -Text_184675:: @ 8184675 - .string "ANNE: Our twin power…$" - -Text_18468B:: @ 818468B - .string "ANNE: I'm raising POKéMON with\n" - .string "ELI.$" - -Text_1846AF:: @ 81846AF - .string "ANNE: Hi, hi! Let's battle!\n" - .string "But bring two POKéMON.$" - -Text_1846E2:: @ 81846E2 - .string "My bike's acting up, man.$" - -Text_1846FC:: @ 81846FC - .string "Aww, man.\n" - .string "I'm not into this.$" - -Text_184719:: @ 8184719 - .string "I got grass caught up in my\n" - .string "spokes, man.$" - -Text_184742:: @ 8184742 - .string "Clear the way, or I'll run you\n" - .string "down!$" - -Text_184767:: @ 8184767 - .string "You for real, kid?$" - -Text_18477A:: @ 818477A - .string "Don't think you're all special and\n" - .string "all just because of this.$" - -Text_1847B7:: @ 81847B7 +Route9_Text_AliciaIntro:: @ 81847B7 .string "You have POKéMON with you!\n" .string "You're mine!$" -Text_1847DF:: @ 81847DF +Route9_Text_AliciaDefeat:: @ 81847DF .string "You deceived me…$" -Text_1847F0:: @ 81847F0 +Route9_Text_AliciaPostBattle:: @ 81847F0 .string "The tunnel coming up is pitch-black\n" .string "inside.\p" .string "You'll need FLASH to get through\n" .string "there.$" -Text_184844:: @ 8184844 +Route9_Text_ChrisIntro:: @ 8184844 .string "Who's that walking there with those\n" .string "good-looking POKéMON?$" -Text_18487E:: @ 818487E +Route9_Text_ChrisDefeat:: @ 818487E .string "Out like a light!$" -Text_184890:: @ 8184890 +Route9_Text_ChrisPostBattle:: @ 8184890 .string "Keep walking!$" -Text_18489E:: @ 818489E +Route9_Text_DrewIntro:: @ 818489E .string "I'm taking the ROCK TUNNEL to\n" .string "go to LAVENDER…$" -Text_1848CC:: @ 81848CC +Route9_Text_DrewDefeat:: @ 81848CC .string "Can't measure up…$" -Text_1848DE:: @ 81848DE +Route9_Text_DrewPostBattle:: @ 81848DE .string "Are you off to ROCK TUNNEL, too?$" -Text_1848FF:: @ 81848FF +Route9_Text_CaitlinIntro:: @ 81848FF .string "Don't you dare patronize me!$" -Text_18491C:: @ 818491C +Route9_Text_CaitlinDefeat:: @ 818491C .string "No!\n" .string "You're too much.$" -Text_184931:: @ 8184931 +Route9_Text_CaitlinPostBattle:: @ 8184931 .string "You're obviously talented.\n" .string "Good luck to you!$" -Text_18495E:: @ 818495E +Route9_Text_JeremyIntro:: @ 818495E .string "Bwahaha!\n" .string "Great! I was bored, eh!$" -Text_18497F:: @ 818497F +Route9_Text_JeremyDefeat:: @ 818497F .string "Keep it coming, eh!\p" .string "Oh wait.\n" .string "I'm out of POKéMON!$" -Text_1849B0:: @ 81849B0 +Route9_Text_JeremyPostBattle:: @ 81849B0 .string "You sure had guts standing up to\n" .string "me there, eh?$" -Text_1849DF:: @ 81849DF +Route9_Text_BriceIntro:: @ 81849DF .string "Hahaha!\n" .string "Aren't you a little toughie!$" -Text_184A04:: @ 8184A04 +Route9_Text_BriceDefeat:: @ 8184A04 .string "What's that?$" -Text_184A11:: @ 8184A11 +Route9_Text_BricePostBattle:: @ 8184A11 .string "Hahaha!\n" .string "Kids should be tough!$" -Text_184A2F:: @ 8184A2F +Route9_Text_BrentIntro:: @ 8184A2F .string "I got up early every day to raise\n" .string "my POKéMON from cocoons!$" -Text_184A6A:: @ 8184A6A +Route9_Text_BrentDefeat:: @ 8184A6A .string "WHAT?\p" .string "What a total waste of time!$" -Text_184A8C:: @ 8184A8C +Route9_Text_BrentPostBattle:: @ 8184A8C .string "I have to collect more than bugs\n" .string "to get stronger…$" -Text_184ABE:: @ 8184ABE +Route9_Text_AlanIntro:: @ 8184ABE .string "Hahahaha!\n" .string "Bring it on!$" -Text_184AD5:: @ 8184AD5 +Route9_Text_AlanDefeat:: @ 8184AD5 .string "Hahahaha!\n" .string "You beat me fair!$" -Text_184AF1:: @ 8184AF1 +Route9_Text_AlanPostBattle:: @ 8184AF1 .string "Hahahaha!\n" .string "Us hearty guys always laugh!$" -Text_184B18:: @ 8184B18 +Route9_Text_ConnerIntro:: @ 8184B18 .string "Go, my super BUG POKéMON!$" -Text_184B32:: @ 8184B32 +Route9_Text_ConnerDefeat:: @ 8184B32 .string "My bugs…$" -Text_184B3B:: @ 8184B3B +Route9_Text_ConnerPostBattle:: @ 8184B3B .string "If you don't like BUG POKéMON,\n" .string "you bug me!$" -gUnknown_8184B66:: @ 8184B66 +Route9_Text_RouteSign:: @ 8184B66 .string "ROUTE 9\n" .string "CERULEAN CITY - ROCK TUNNEL$" |