diff options
| -rw-r--r-- | data/maps/FortreeCity_Gym/scripts.inc | 4 | ||||
| -rw-r--r-- | data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc | 6 | ||||
| -rw-r--r-- | data/maps/Route104/map.json | 46 | ||||
| -rw-r--r-- | data/maps/Route104/scripts.inc | 529 | ||||
| -rw-r--r-- | data/maps/Route119/map.json | 54 | ||||
| -rw-r--r-- | data/maps/Route119/scripts.inc | 410 | ||||
| -rw-r--r-- | data/maps/Route120/map.json | 32 | ||||
| -rw-r--r-- | data/maps/Route120/scripts.inc | 240 | ||||
| -rw-r--r-- | data/maps/Route121/map.json | 36 | ||||
| -rw-r--r-- | data/maps/Route121/scripts.inc | 144 | ||||
| -rw-r--r-- | data/maps/Route123/map.json | 40 | ||||
| -rw-r--r-- | data/maps/Route123/scripts.inc | 184 | ||||
| -rw-r--r-- | data/text/berries.inc | 14 | ||||
| -rw-r--r-- | data/text/trainers.inc | 512 | ||||
| -rw-r--r-- | include/constants/flags.h | 4 | ||||
| -rw-r--r-- | include/constants/metatile_labels.h | 4 | ||||
| -rw-r--r-- | include/constants/vars.h | 4 | ||||
| -rw-r--r-- | include/event_scripts.h | 2 | ||||
| -rw-r--r-- | include/field_specials.h | 4 | ||||
| -rw-r--r-- | src/field_control_avatar.c | 6 | ||||
| -rw-r--r-- | src/field_specials.c | 12 |
21 files changed, 1144 insertions, 1143 deletions
diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 0b0008d53..f69ec8204 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -43,8 +43,8 @@ FortreeCity_Gym_EventScript_WinonaDefeated:: @ 82165FD closemessage delay 30 setflag FLAG_ENABLE_WINONA_MATCH_CALL - setvar VAR_WINONA_CALL_STEP_COUNTER, 0 - setflag FLAG_REGISTER_WINONA_POKENAV + setvar VAR_SCOTT_FORTREE_CALL_STEP_COUNTER, 0 + setflag FLAG_SCOTT_CALL_FORTREE_GYM release end diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index ce7ebf3b6..b27cb1f8a 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -212,8 +212,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80 setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2 - setvar VAR_SCOTT_CALL_STEP_COUNTER, 0 - setflag FLAG_SCOTT_CALL_NATIONAL_DEX + setvar VAR_SCOTT_BF_CALL_STEP_COUNTER, 0 + setflag FLAG_SCOTT_CALL_BATTLE_FRONTIER releaseall end @@ -703,7 +703,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall:: @ 81FA4D6 lockall pokenavcall LittlerootTown_ProfessorBirchsLab_Text_ScottAboardSSTidalCall waitmessage - clearflag FLAG_SCOTT_CALL_NATIONAL_DEX + clearflag FLAG_SCOTT_CALL_BATTLE_FRONTIER releaseall end diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index a02a1e170..f31c512f7 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -40,7 +40,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_EventScript_1ED00F", + "script": "Route104_EventScript_BugCatcher", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_EventScript_1ED006", + "script": "Route104_EventScript_Girl1", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route104_EventScript_1ED38D", + "script": "Route104_EventScript_Haley", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_EventScript_1ED045", + "script": "Route104_EventScript_Boy1", "flag": "0" }, { @@ -92,7 +92,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_EventScript_1ED04E", + "script": "Route104_EventScript_Woman", "flag": "0" }, { @@ -105,7 +105,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_EventScript_1ED090", + "script": "Route104_EventScript_Girl2", "flag": "0" }, { @@ -144,7 +144,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_EventScript_1ED35F", + "script": "Route104_EventScript_Ivan", "flag": "0" }, { @@ -235,7 +235,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_EventScript_1ECF8C", + "script": "Route104_EventScript_ExpertF", "flag": "0" }, { @@ -313,7 +313,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_EventScript_1ECFCD", + "script": "Route104_EventScript_WhiteHerbFlorist", "flag": "FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST" }, { @@ -326,7 +326,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route104_EventScript_1ED597", + "script": "Route104_EventScript_Gina", "flag": "0" }, { @@ -339,7 +339,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route104_EventScript_1ED5B6", + "script": "Route104_EventScript_Mia", "flag": "0" }, { @@ -352,7 +352,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route104_EventScript_1ED43B", + "script": "Route104_EventScript_Winston", "flag": "0" }, { @@ -365,7 +365,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route104_EventScript_1ED4E9", + "script": "Route104_EventScript_Cindy", "flag": "0" }, { @@ -391,7 +391,7 @@ "movement_range_y": 6, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route104_EventScript_1ED376", + "script": "Route104_EventScript_Billy", "flag": "0" }, { @@ -443,7 +443,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_EventScript_1ED057", + "script": "Route104_EventScript_Boy2", "flag": "0" }, { @@ -456,7 +456,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_EventScript_1ED5D5", + "script": "Route104_EventScript_Darian", "flag": "0" }, { @@ -469,7 +469,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route104_EventScript_1ECC9E", + "script": "Route104_EventScript_Rival", "flag": "FLAG_HIDE_ROUTE_104_RIVAL" } ], @@ -539,7 +539,7 @@ "elevation": 3, "var": "VAR_ROUTE104_STATE", "var_value": "1", - "script": "Route104_EventScript_1ECCB3" + "script": "Route104_EventScript_RivalTrigger" } ], "bg_events": [ @@ -549,7 +549,7 @@ "y": 50, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route104_EventScript_1ED018" + "script": "Route104_EventScript_BrineysCottageSign" }, { "type": "sign", @@ -557,7 +557,7 @@ "y": 66, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route104_EventScript_1ED021" + "script": "Route104_EventScript_RouteSignPetalburg" }, { "type": "sign", @@ -565,7 +565,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route104_EventScript_1ED02A" + "script": "Route104_EventScript_RouteSignRustboro" }, { "type": "sign", @@ -573,7 +573,7 @@ "y": 20, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route104_EventScript_1ED033" + "script": "Route104_EventScript_FlowerShopSign" }, { "type": "sign", @@ -581,7 +581,7 @@ "y": 23, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route104_EventScript_1ED03C" + "script": "Route104_EventScript_TrainerTipsDoubleBattles" }, { "type": "hidden_item", diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 51528b6ef..46dd80119 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -14,39 +14,39 @@ Route104_EventScript_StartSailToDewford:: @ 81ECC47 Route104_OnTransition: @ 81ECC4E call Common_EventScript_SetupRivalGfxId - call Route104_EventScript_1ECC78 - call Route104_EventScript_1ECC5E + call Route104_EventScript_TrySetRivalPos + call Route104_EventScript_ShowOrHideWhiteHerbFlorist end -Route104_EventScript_1ECC5E:: @ 81ECC5E - goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_EventScript_1ECC74 - goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_1ECC74 +Route104_EventScript_ShowOrHideWhiteHerbFlorist:: @ 81ECC5E + goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_EventScript_HideWhiteHerbFlorist + goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_HideWhiteHerbFlorist clearflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST return -Route104_EventScript_1ECC74:: @ 81ECC74 +Route104_EventScript_HideWhiteHerbFlorist:: @ 81ECC74 setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST return -Route104_EventScript_1ECC78:: @ 81ECC78 +Route104_EventScript_TrySetRivalPos:: @ 81ECC78 compare VAR_BOARD_BRINEY_BOAT_STATE, 1 - goto_if_ge Route104_EventScript_1ECC9D - goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_1ECC9D - goto_if_unset FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECC9D + goto_if_ge Route104_EventScript_DontSetRivalPos + goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_DontSetRivalPos + goto_if_unset FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_DontSetRivalPos setobjectxyperm 34, 17, 52 return -Route104_EventScript_1ECC9D:: @ 81ECC9D +Route104_EventScript_DontSetRivalPos:: @ 81ECC9D return -Route104_EventScript_1ECC9E:: @ 81ECC9E +Route104_EventScript_Rival:: @ 81ECC9E lockall setvar VAR_0x8008, 1 applymovement 34, Common_Movement_FacePlayer waitmovement 0 - goto Route104_EventScript_1ECD33 + goto Route104_EventScript_RivalEncounter -Route104_EventScript_1ECCB3:: @ 81ECCB3 +Route104_EventScript_RivalTrigger:: @ 81ECCB3 lockall setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL setvar VAR_RUSTBORO_CITY_STATE, 8 @@ -56,9 +56,9 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 delay 10 addobject 34 clearflag FLAG_HIDE_ROUTE_104_RIVAL - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ECF86 + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerBackUp waitmovement 0 - applymovement 34, Route104_Movement_1ECF8A + applymovement 34, Route104_Movement_RivalExitBrineysCottage waitmovement 0 delay 20 setvar VAR_0x8008, 0 @@ -68,291 +68,292 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3 waitmovement 0 applymovement 34, Common_Movement_Delay48 waitmovement 0 - goto Route104_EventScript_1ECD33 + goto Route104_EventScript_RivalEncounter -Route104_EventScript_1ECD11:: @ 81ECD11 +@ Unused, shares script with Rustboro encounter instead +Route104_EventScript_PlayRivalMusic:: @ 81ECD11 checkplayergender compare VAR_RESULT, MALE - goto_if_eq Route104_EventScript_1ECD29 + goto_if_eq Route104_EventScript_PlayMayMusic compare VAR_RESULT, FEMALE - goto_if_eq Route104_EventScript_1ECD2E + goto_if_eq Route104_EventScript_PlayBrendanMusic return -Route104_EventScript_1ECD29:: @ 81ECD29 +Route104_EventScript_PlayMayMusic:: @ 81ECD29 playbgm MUS_GIRL_SUP, 1 return -Route104_EventScript_1ECD2E:: @ 81ECD2E +Route104_EventScript_PlayBrendanMusic:: @ 81ECD2E playbgm MUS_BOY_SUP, 1 return -Route104_EventScript_1ECD33:: @ 81ECD33 +Route104_EventScript_RivalEncounter:: @ 81ECD33 checkplayergender compare VAR_RESULT, MALE - goto_if_eq Route104_EventScript_1ECD4B + goto_if_eq Route104_EventScript_MayEncounter compare VAR_RESULT, FEMALE - goto_if_eq Route104_EventScript_1ECE6F + goto_if_eq Route104_EventScript_BrendanEncounter end -Route104_EventScript_1ECD4B:: @ 81ECD4B - goto_if_set FLAG_DEFEATED_RIVAL_ROUTE_104, Route104_EventScript_1ECE1C - goto_if_set FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECDD0 +Route104_EventScript_MayEncounter:: @ 81ECD4B + goto_if_set FLAG_DEFEATED_RIVAL_ROUTE_104, Route104_EventScript_MayDefeated + goto_if_set FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_MayAskToBattle setflag FLAG_REGISTER_RIVAL_POKENAV - msgbox Route104_Text_1EDBFF, MSGBOX_DEFAULT + msgbox Route104_Text_MayWeShouldRegister, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route104_Text_1EDC8F, MSGBOX_DEFAULT + msgbox Route104_Text_RegisteredMay, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_ENABLE_RIVAL_MATCH_CALL - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ECDCD - applymovement 34, Route104_Movement_1ECDC8 - msgbox Route104_Text_1EDCB1, MSGBOX_DEFAULT + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerFaceRival + applymovement 34, Route104_Movement_RivalWalkSlowLeft + msgbox Route104_Text_MayHowsYourPokedex, MSGBOX_DEFAULT closemessage waitmovement 0 - applymovement 34, Route104_Movement_1ECDCA + applymovement 34, Route104_Movement_RivalApproachPlayer waitmovement 0 copyobjectxytoperm 34 - msgbox Route104_Text_1EDCED, MSGBOX_YESNO + msgbox Route104_Text_MayMinesDecentLetsBattle, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route104_EventScript_1ECDED - msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT - call Route104_EventScript_1ECE31 + goto_if_eq Route104_EventScript_BattleMay + msgbox Route104_Text_MayHaventRaisedPokemon, MSGBOX_DEFAULT + call Route104_EventScript_RestoreMusic releaseall end -Route104_Movement_1ECDC8: @ 81ECDC8 +Route104_Movement_RivalWalkSlowLeft: @ 81ECDC8 walk_slow_left step_end -Route104_Movement_1ECDCA: @ 81ECDCA +Route104_Movement_RivalApproachPlayer: @ 81ECDCA walk_down face_right step_end -Route104_Movement_1ECDCD: @ 81ECDCD +Route104_Movement_PlayerFaceRival: @ 81ECDCD delay_4 walk_in_place_fastest_left step_end -Route104_EventScript_1ECDD0:: @ 81ECDD0 - msgbox Route104_Text_1EDD9F, MSGBOX_YESNO +Route104_EventScript_MayAskToBattle:: @ 81ECDD0 + msgbox Route104_Text_MayLetsBattle, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route104_EventScript_1ECDED - msgbox Route104_Text_1EDD2A, MSGBOX_DEFAULT + goto_if_eq Route104_EventScript_BattleMay + msgbox Route104_Text_MayHaventRaisedPokemon, MSGBOX_DEFAULT releaseall end -Route104_EventScript_1ECDED:: @ 81ECDED - msgbox Route104_Text_1EDDDB, MSGBOX_DEFAULT +Route104_EventScript_BattleMay:: @ 81ECDED + msgbox Route104_Text_MayIntro, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, Route104_EventScript_1ECE36 - case 1, Route104_EventScript_1ECE49 - case 2, Route104_EventScript_1ECE5C + case 0, Route104_EventScript_BattleMayTreecko + case 1, Route104_EventScript_BattleMayTorchic + case 2, Route104_EventScript_BattleMayMudkip end -Route104_EventScript_1ECE1C:: @ 81ECE1C - msgbox Route104_Text_1EDE3E, MSGBOX_DEFAULT +Route104_EventScript_MayDefeated:: @ 81ECE1C + msgbox Route104_Text_MayPostBattle, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if_eq Route104_EventScript_1ECE31 + call_if_eq Route104_EventScript_RestoreMusic releaseall end -Route104_EventScript_1ECE31:: @ 81ECE31 +Route104_EventScript_RestoreMusic:: @ 81ECE31 savebgm MUS_DUMMY fadedefaultbgm return -Route104_EventScript_1ECE36:: @ 81ECE36 - trainerbattle_no_intro TRAINER_MAY_14, Route104_Text_1EDE18 +Route104_EventScript_BattleMayTreecko:: @ 81ECE36 + trainerbattle_no_intro TRAINER_MAY_14, Route104_Text_MayDefeat setflag FLAG_DEFEATED_RIVAL_ROUTE_104 - goto Route104_EventScript_1ECE1C + goto Route104_EventScript_MayDefeated end -Route104_EventScript_1ECE49:: @ 81ECE49 - trainerbattle_no_intro TRAINER_MAY_15, Route104_Text_1EDE18 +Route104_EventScript_BattleMayTorchic:: @ 81ECE49 + trainerbattle_no_intro TRAINER_MAY_15, Route104_Text_MayDefeat setflag FLAG_DEFEATED_RIVAL_ROUTE_104 - goto Route104_EventScript_1ECE1C + goto Route104_EventScript_MayDefeated end -Route104_EventScript_1ECE5C:: @ 81ECE5C - trainerbattle_no_intro TRAINER_MAY_10, Route104_Text_1EDE18 +Route104_EventScript_BattleMayMudkip:: @ 81ECE5C + trainerbattle_no_intro TRAINER_MAY_10, Route104_Text_MayDefeat setflag FLAG_DEFEATED_RIVAL_ROUTE_104 - goto Route104_EventScript_1ECE1C + goto Route104_EventScript_MayDefeated end -Route104_EventScript_1ECE6F:: @ 81ECE6F - goto_if_set FLAG_DEFEATED_RIVAL_ROUTE_104, Route104_EventScript_1ECF38 - goto_if_set FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECEEC +Route104_EventScript_BrendanEncounter:: @ 81ECE6F + goto_if_set FLAG_DEFEATED_RIVAL_ROUTE_104, Route104_EventScript_BrendanDefeated + goto_if_set FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_BrendanAskToBattle setflag FLAG_REGISTER_RIVAL_POKENAV - msgbox Route104_Text_1EDF04, MSGBOX_DEFAULT + msgbox Route104_Text_BrendanWeShouldRegister, MSGBOX_DEFAULT closemessage delay 30 playfanfare MUS_ME_TORE_EYE - msgbox Route104_Text_1EDFA0, MSGBOX_DEFAULT + msgbox Route104_Text_RegisteredBrendan, MSGBOX_DEFAULT waitfanfare closemessage delay 30 setflag FLAG_ENABLE_RIVAL_MATCH_CALL - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ECDCD - applymovement 34, Route104_Movement_1ECDC8 - msgbox Route104_Text_1EDFC6, MSGBOX_DEFAULT + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerFaceRival + applymovement 34, Route104_Movement_RivalWalkSlowLeft + msgbox Route104_Text_BrendanHowsYourPokedex, MSGBOX_DEFAULT closemessage waitmovement 0 - applymovement 34, Route104_Movement_1ECDCA + applymovement 34, Route104_Movement_RivalApproachPlayer waitmovement 0 copyobjectxytoperm 34 - msgbox Route104_Text_1EE009, MSGBOX_YESNO + msgbox Route104_Text_BrendanDoingGreatLetsBattle, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route104_EventScript_1ECF09 - msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT - call Route104_EventScript_1ECE31 + goto_if_eq Route104_EventScript_BattleBrendan + msgbox Route104_Text_BrendanNoConfidence, MSGBOX_DEFAULT + call Route104_EventScript_RestoreMusic releaseall end -Route104_EventScript_1ECEEC:: @ 81ECEEC - msgbox Route104_Text_1EE094, MSGBOX_YESNO +Route104_EventScript_BrendanAskToBattle:: @ 81ECEEC + msgbox Route104_Text_BrendanLetsBattle, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route104_EventScript_1ECF09 - msgbox Route104_Text_1EE04D, MSGBOX_DEFAULT + goto_if_eq Route104_EventScript_BattleBrendan + msgbox Route104_Text_BrendanNoConfidence, MSGBOX_DEFAULT releaseall end -Route104_EventScript_1ECF09:: @ 81ECF09 - msgbox Route104_Text_1EE0C7, MSGBOX_DEFAULT +Route104_EventScript_BattleBrendan:: @ 81ECF09 + msgbox Route104_Text_BrendanIntro, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, Route104_EventScript_1ECF4D - case 1, Route104_EventScript_1ECF60 - case 2, Route104_EventScript_1ECF73 + case 0, Route104_EventScript_BattleBrendanTreecko + case 1, Route104_EventScript_BattleBrendanTorchic + case 2, Route104_EventScript_BattleBrendanMudkip end -Route104_EventScript_1ECF38:: @ 81ECF38 - msgbox Route104_Text_1EE120, MSGBOX_DEFAULT +Route104_EventScript_BrendanDefeated:: @ 81ECF38 + msgbox Route104_Text_BrendanPostBattle, MSGBOX_DEFAULT compare VAR_0x8008, 0 - call_if_eq Route104_EventScript_1ECE31 + call_if_eq Route104_EventScript_RestoreMusic releaseall end -Route104_EventScript_1ECF4D:: @ 81ECF4D - trainerbattle_no_intro TRAINER_BRENDAN_10, Route104_Text_1EE107 +Route104_EventScript_BattleBrendanTreecko:: @ 81ECF4D + trainerbattle_no_intro TRAINER_BRENDAN_10, Route104_Text_BrendanDefeat setflag FLAG_DEFEATED_RIVAL_ROUTE_104 - goto Route104_EventScript_1ECF38 + goto Route104_EventScript_BrendanDefeated end -Route104_EventScript_1ECF60:: @ 81ECF60 - trainerbattle_no_intro TRAINER_BRENDAN_12, Route104_Text_1EE107 +Route104_EventScript_BattleBrendanTorchic:: @ 81ECF60 + trainerbattle_no_intro TRAINER_BRENDAN_12, Route104_Text_BrendanDefeat setflag FLAG_DEFEATED_RIVAL_ROUTE_104 - goto Route104_EventScript_1ECF38 + goto Route104_EventScript_BrendanDefeated end -Route104_EventScript_1ECF73:: @ 81ECF73 - trainerbattle_no_intro TRAINER_BRENDAN_11, Route104_Text_1EE107 +Route104_EventScript_BattleBrendanMudkip:: @ 81ECF73 + trainerbattle_no_intro TRAINER_BRENDAN_11, Route104_Text_BrendanDefeat setflag FLAG_DEFEATED_RIVAL_ROUTE_104 - goto Route104_EventScript_1ECF38 + goto Route104_EventScript_BrendanDefeated end -Route104_Movement_1ECF86: @ 81ECF86 +Route104_Movement_PlayerBackUp: @ 81ECF86 lock_facing_direction walk_down unlock_facing_direction step_end -Route104_Movement_1ECF8A: @ 81ECF8A +Route104_Movement_RivalExitBrineysCottage: @ 81ECF8A walk_down step_end -Route104_EventScript_1ECF8C:: @ 81ECF8C +Route104_EventScript_ExpertF:: @ 81ECF8C lock faceplayer - goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104, Route104_EventScript_1ECFC3 - msgbox Route104_Text_2A6D86, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104, Route104_EventScript_ReceivedBerry + msgbox Route104_Text_PlantBerriesInSoilTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_CHESTO_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104 - msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT + msgbox Route104_Text_TrainersOftenMakeMonHoldBerries, MSGBOX_DEFAULT release end -Route104_EventScript_1ECFC3:: @ 81ECFC3 - msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT +Route104_EventScript_ReceivedBerry:: @ 81ECFC3 + msgbox Route104_Text_TrainersOftenMakeMonHoldBerries, MSGBOX_DEFAULT release end -Route104_EventScript_1ECFCD:: @ 81ECFCD +Route104_EventScript_WhiteHerbFlorist:: @ 81ECFCD lock faceplayer - goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_1ECFFC - msgbox Route104_Text_1ED96A, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_ReceivedWhiteHerb + msgbox Route104_Text_DontNeedThisTakeIt, MSGBOX_DEFAULT giveitem_std ITEM_WHITE_HERB - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_WHITE_HERB release end -Route104_EventScript_1ECFFC:: @ 81ECFFC - msgbox Route104_Text_1EDA0F, MSGBOX_DEFAULT +Route104_EventScript_ReceivedWhiteHerb:: @ 81ECFFC + msgbox Route104_Text_FlowerShopSellingSaplings, MSGBOX_DEFAULT release end -Route104_EventScript_1ED006:: @ 81ED006 - msgbox Route104_Text_1ED5EC, MSGBOX_NPC +Route104_EventScript_Girl1:: @ 81ED006 + msgbox Route104_Text_BrineyLivesInSeasideCottage, MSGBOX_NPC end -Route104_EventScript_1ED00F:: @ 81ED00F - msgbox Route104_Text_1ED662, MSGBOX_SIGN +Route104_EventScript_BugCatcher:: @ 81ED00F + msgbox Route104_Text_WhatsItLikeAtBottomOfSea, MSGBOX_SIGN end -Route104_EventScript_1ED018:: @ 81ED018 - msgbox Route104_Text_1EDA8C, MSGBOX_SIGN +Route104_EventScript_BrineysCottageSign:: @ 81ED018 + msgbox Route104_Text_MrBrineysCottage, MSGBOX_SIGN end -Route104_EventScript_1ED021:: @ 81ED021 - msgbox Route104_Text_1EDAA1, MSGBOX_SIGN +Route104_EventScript_RouteSignPetalburg:: @ 81ED021 + msgbox Route104_Text_RouteSignPetalburg, MSGBOX_SIGN end -Route104_EventScript_1ED02A:: @ 81ED02A - msgbox Route104_Text_1EDABC, MSGBOX_SIGN +Route104_EventScript_RouteSignRustboro:: @ 81ED02A + msgbox Route104_Text_RouteSignRustboro, MSGBOX_SIGN end -Route104_EventScript_1ED033:: @ 81ED033 - msgbox Route104_Text_1EDAD6, MSGBOX_SIGN +Route104_EventScript_FlowerShopSign:: @ 81ED033 + msgbox Route104_Text_PrettyPetalFlowShop, MSGBOX_SIGN end -Route104_EventScript_1ED03C:: @ 81ED03C - msgbox Route104_Text_1EDAEF, MSGBOX_SIGN +Route104_EventScript_TrainerTipsDoubleBattles:: @ 81ED03C + msgbox Route104_Text_TrainerTipsDoubleBattles, MSGBOX_SIGN end -Route104_EventScript_1ED045:: @ 81ED045 - msgbox Route104_Text_1ED6A2, MSGBOX_NPC +Route104_EventScript_Boy1:: @ 81ED045 + msgbox Route104_Text_ThrowBallAtWeakenedPokemon, MSGBOX_NPC end -Route104_EventScript_1ED04E:: @ 81ED04E - msgbox Route104_Text_1ED735, MSGBOX_NPC +Route104_EventScript_Woman:: @ 81ED04E + msgbox Route104_Text_OnlyThrowBallAtWildPokemon, MSGBOX_NPC end -Route104_EventScript_1ED057:: @ 81ED057 +Route104_EventScript_Boy2:: @ 81ED057 lock faceplayer - goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_1ED086 - msgbox Route104_Text_1ED838, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_ReceivedBulletSeed + msgbox Route104_Text_LikeFillingMouthWithSeedsTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_TM09 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM09 release end -Route104_EventScript_1ED086:: @ 81ED086 - msgbox Route104_Text_1ED8E7, MSGBOX_DEFAULT +Route104_EventScript_ReceivedBulletSeed:: @ 81ED086 + msgbox Route104_Text_TMsAreOneTimeUse, MSGBOX_DEFAULT release end -Route104_EventScript_1ED090:: @ 81ED090 - msgbox Route104_Text_1ED7A2, MSGBOX_NPC +Route104_EventScript_Girl2:: @ 81ED090 + msgbox Route104_Text_ImNotATrainer, MSGBOX_NPC end Route104_EventScript_SailToDewford:: @ 81ED099 @@ -365,19 +366,19 @@ Route104_EventScript_SailToDewford:: @ 81ED099 waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 call Common_EventScript_PlayBrineysBoatMusic - goto_if_set FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_1ED0D9 - goto_if_unset FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_1ED0EF + goto_if_set FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_SailToDewfordNoCall + goto_if_unset FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_SailToDewfordDadCalls end -Route104_EventScript_1ED0D9:: @ 81ED0D9 - applymovement 7, Route104_Movement_1ED28C - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED28C +Route104_EventScript_SailToDewfordNoCall:: @ 81ED0D9 + applymovement 7, Route104_Movement_SailToDewford + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewford waitmovement 0 - goto Route104_EventScript_1ED139 + goto Route104_EventScript_ArriveInDewford -Route104_EventScript_1ED0EF:: @ 81ED0EF - applymovement 7, Route104_Movement_1ED1C8 - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED1C8 +Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF + applymovement 7, Route104_Movement_SailToDewfordBeforeDadCalls + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewfordBeforeDadCalls waitmovement 0 pokenavcall Route104_Text_DadPokenavCall waitmessage @@ -388,25 +389,25 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF closemessage delay 30 setflag FLAG_ENABLE_NORMAN_MATCH_CALL - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED22A - applymovement 7, Route104_Movement_1ED22A, MAP_ROUTE104 + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_SailToDewfordAfterDadCalls + applymovement 7, Route104_Movement_SailToDewfordAfterDadCalls, MAP_ROUTE104 waitmovement 7, MAP_ROUTE104 waitmovement 0 - goto Route104_EventScript_1ED139 + goto Route104_EventScript_ArriveInDewford -Route104_EventScript_1ED139:: @ 81ED139 +Route104_EventScript_ArriveInDewford:: @ 81ED139 delay 50 - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED353 + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerExitBoat waitmovement 0 call Common_EventScript_StopBrineysBoatMusic showobjectat EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN - applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED355 + applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_PlayerMoveForBriney waitmovement 0 setobjectxyperm 2, 12, 8 addobject 2 setobjectpriority 2, MAP_DEWFORD_TOWN, 0 clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - applymovement 2, Route104_Movement_1ED35C + applymovement 2, Route104_Movement_BrineyExitBoat waitmovement 0 addobject 4 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN @@ -432,7 +433,7 @@ Route104_EventScript_LandedInDewford:: @ 81ED1BE releaseall end -Route104_Movement_1ED1C8: @ 81ED1C8 +Route104_Movement_SailToDewfordBeforeDadCalls: @ 81ED1C8 walk_down walk_down walk_down @@ -532,7 +533,7 @@ Route104_Movement_1ED1C8: @ 81ED1C8 walk_fastest_down step_end -Route104_Movement_1ED22A: @ 81ED22A +Route104_Movement_SailToDewfordAfterDadCalls: @ 81ED22A walk_fastest_down walk_fastest_down walk_fastest_down @@ -632,7 +633,7 @@ Route104_Movement_1ED22A: @ 81ED22A walk_down step_end -Route104_Movement_1ED28C: @ 81ED28C +Route104_Movement_SailToDewford: @ 81ED28C walk_down walk_down walk_down @@ -835,11 +836,11 @@ Route104_Movement_PlayerBoardBoat: @ 81ED34F walk_down step_end -Route104_Movement_1ED353: @ 81ED353 +Route104_Movement_PlayerExitBoat: @ 81ED353 walk_down step_end -Route104_Movement_1ED355: @ 81ED355 +Route104_Movement_PlayerMoveForBriney: @ 81ED355 walk_down walk_left walk_in_place_fastest_right @@ -850,214 +851,214 @@ Route104_Movement_BrineyBoardBoat: @ 81ED359 walk_down step_end -Route104_Movement_1ED35C: @ 81ED35C +Route104_Movement_BrineyExitBoat: @ 81ED35C walk_down walk_in_place_fastest_left step_end -Route104_EventScript_1ED35F:: @ 81ED35F - trainerbattle_single TRAINER_IVAN, Route104_Text_2954BD, Route104_Text_295509 - msgbox Route104_Text_29554E, MSGBOX_AUTOCLOSE +Route104_EventScript_Ivan:: @ 81ED35F + trainerbattle_single TRAINER_IVAN, Route104_Text_IvanIntro, Route104_Text_IvanDefeat + msgbox Route104_Text_IvanPostBattle, MSGBOX_AUTOCLOSE end -Route104_EventScript_1ED376:: @ 81ED376 - trainerbattle_single TRAINER_BILLY, Route104_Text_29558A, Route104_Text_2955B4 - msgbox Route104_Text_2955E8, MSGBOX_AUTOCLOSE +Route104_EventScript_Billy:: @ 81ED376 + trainerbattle_single TRAINER_BILLY, Route104_Text_BillyIntro, Route104_Text_BillyDefeat + msgbox Route104_Text_BillyPostBattle, MSGBOX_AUTOCLOSE end -Route104_EventScript_1ED38D:: @ 81ED38D - trainerbattle_single TRAINER_HALEY_1, Route104_Text_29563A, Route104_Text_29566F, Route104_EventScript_1ED3CE +Route104_EventScript_Haley:: @ 81ED38D + trainerbattle_single TRAINER_HALEY_1, Route104_Text_HaleyIntro, Route104_Text_HaleyDefeat, Route104_EventScript_TryRegisterHaleyAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route104_EventScript_1ED424 + compare VAR_RESULT, TRUE + goto_if_eq Route104_EventScript_RematchHaley setvar VAR_0x8004, TRAINER_HALEY_1 specialvar VAR_RESULT, IsTrainerRegistered - compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_1ED3F8 - msgbox Route104_Text_295689, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route104_EventScript_TryRegisterHaley + msgbox Route104_Text_HaleyPostBattle, MSGBOX_DEFAULT release end -Route104_EventScript_1ED3CE:: @ 81ED3CE +Route104_EventScript_TryRegisterHaleyAfterBattle:: @ 81ED3CE special PlayerFaceTrainerAfterBattle waitmovement 0 - goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED3DF + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterHaleyAfterBattle release end -Route104_EventScript_1ED3DF:: @ 81ED3DF - msgbox Route104_Text_29576B, MSGBOX_DEFAULT +Route104_EventScript_RegisterHaleyAfterBattle:: @ 81ED3DF + msgbox Route104_Text_HaleyRegister2, MSGBOX_DEFAULT register_matchcall TRAINER_HALEY_1 release end -Route104_EventScript_1ED3F8:: @ 81ED3F8 - goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED40B - msgbox Route104_Text_295689, MSGBOX_DEFAULT +Route104_EventScript_TryRegisterHaley:: @ 81ED3F8 + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterHaley + msgbox Route104_Text_HaleyPostBattle, MSGBOX_DEFAULT release end -Route104_EventScript_1ED40B:: @ 81ED40B - msgbox Route104_Text_2956FF, MSGBOX_DEFAULT +Route104_EventScript_RegisterHaley:: @ 81ED40B + msgbox Route104_Text_HaleyRegister1, MSGBOX_DEFAULT register_matchcall TRAINER_HALEY_1 release end -Route104_EventScript_1ED424:: @ 81ED424 - trainerbattle_rematch TRAINER_HALEY_1, Route104_Text_2957D7, Route104_Text_2957F0 - msgbox Route104_Text_29580C, MSGBOX_AUTOCLOSE +Route104_EventScript_RematchHaley:: @ 81ED424 + trainerbattle_rematch TRAINER_HALEY_1, Route104_Text_HaleyRematchIntro, Route104_Text_HaleyRematchDefeat + msgbox Route104_Text_HaleyPostRematch, MSGBOX_AUTOCLOSE end -Route104_EventScript_1ED43B:: @ 81ED43B - trainerbattle_single TRAINER_WINSTON_1, Route104_Text_295870, Route104_Text_2958AD, Route104_EventScript_1ED47C +Route104_EventScript_Winston:: @ 81ED43B + trainerbattle_single TRAINER_WINSTON_1, Route104_Text_WinstonIntro, Route104_Text_WinstonDefeat, Route104_EventScript_TryRegisterWinstonAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route104_EventScript_1ED4D2 + compare VAR_RESULT, TRUE + goto_if_eq Route104_EventScript_RematchWinston setvar VAR_0x8004, TRAINER_WINSTON_1 specialvar VAR_RESULT, IsTrainerRegistered - compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_1ED4A6 - msgbox Route104_Text_2958C1, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route104_EventScript_TryRegisterWinston + msgbox Route104_Text_WinstonPostBattle, MSGBOX_DEFAULT release end -Route104_EventScript_1ED47C:: @ 81ED47C +Route104_EventScript_TryRegisterWinstonAfterBattle:: @ 81ED47C special PlayerFaceTrainerAfterBattle waitmovement 0 - goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED48D + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterWinstonAfterBattle release end -Route104_EventScript_1ED48D:: @ 81ED48D - msgbox Route104_Text_29595A, MSGBOX_DEFAULT +Route104_EventScript_RegisterWinstonAfterBattle:: @ 81ED48D + msgbox Route104_Text_WinstonRegister2, MSGBOX_DEFAULT register_matchcall TRAINER_WINSTON_1 release end -Route104_EventScript_1ED4A6:: @ 81ED4A6 - goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED4B9 - msgbox Route104_Text_2958C1, MSGBOX_DEFAULT +Route104_EventScript_TryRegisterWinston:: @ 81ED4A6 + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterWinston + msgbox Route104_Text_WinstonPostBattle, MSGBOX_DEFAULT release end -Route104_EventScript_1ED4B9:: @ 81ED4B9 - msgbox Route104_Text_2958F8, MSGBOX_DEFAULT +Route104_EventScript_RegisterWinston:: @ 81ED4B9 + msgbox Route104_Text_WinstonRegister1, MSGBOX_DEFAULT register_matchcall TRAINER_WINSTON_1 release end -Route104_EventScript_1ED4D2:: @ 81ED4D2 - trainerbattle_rematch TRAINER_WINSTON_1, Route104_Text_2959BC, Route104_Text_2959FC - msgbox Route104_Text_295A1E, MSGBOX_AUTOCLOSE +Route104_EventScript_RematchWinston:: @ 81ED4D2 + trainerbattle_rematch TRAINER_WINSTON_1, Route104_Text_WinstonRematchIntro, Route104_Text_WinstonRematchDefeat + msgbox Route104_Text_WinstonPostRematch, MSGBOX_AUTOCLOSE end -Route104_EventScript_1ED4E9:: @ 81ED4E9 - trainerbattle_single TRAINER_CINDY_1, Route104_Text_295A7E, Route104_Text_295ABB, Route104_EventScript_1ED52A +Route104_EventScript_Cindy:: @ 81ED4E9 + trainerbattle_single TRAINER_CINDY_1, Route104_Text_CindyIntro, Route104_Text_CindyDefeat, Route104_EventScript_TryRegisterCindyAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route104_EventScript_1ED580 + compare VAR_RESULT, TRUE + goto_if_eq Route104_EventScript_RematchCindy setvar VAR_0x8004, TRAINER_CINDY_1 specialvar VAR_RESULT, IsTrainerRegistered - compare VAR_RESULT, 0 - goto_if_eq Route104_EventScript_1ED554 - msgbox Route104_Text_295AC3, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route104_EventScript_TryRegisterCindy + msgbox Route104_Text_CindyPostBattle, MSGBOX_DEFAULT release end -Route104_EventScript_1ED52A:: @ 81ED52A +Route104_EventScript_TryRegisterCindyAfterBattle:: @ 81ED52A special PlayerFaceTrainerAfterBattle waitmovement 0 - goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED53B + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterCindyAfterBattle release end -Route104_EventScript_1ED53B:: @ 81ED53B - msgbox Route104_Text_295B60, MSGBOX_DEFAULT +Route104_EventScript_RegisterCindyAfterBattle:: @ 81ED53B + msgbox Route104_Text_CindyRegister2, MSGBOX_DEFAULT register_matchcall TRAINER_CINDY_1 release end -Route104_EventScript_1ED554:: @ 81ED554 - goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED567 - msgbox Route104_Text_295AC3, MSGBOX_DEFAULT +Route104_EventScript_TryRegisterCindy:: @ 81ED554 + goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterCindy + msgbox Route104_Text_CindyPostBattle, MSGBOX_DEFAULT release end -Route104_EventScript_1ED567:: @ 81ED567 - msgbox Route104_Text_295B01, MSGBOX_DEFAULT +Route104_EventScript_RegisterCindy:: @ 81ED567 + msgbox Route104_Text_CindyRegister1, MSGBOX_DEFAULT register_matchcall TRAINER_CINDY_1 release end -Route104_EventScript_1ED580:: @ 81ED580 - trainerbattle_rematch TRAINER_CINDY_1, Route104_Text_295BC8, Route104_Text_295BFA - msgbox Route104_Text_295C1F, MSGBOX_AUTOCLOSE +Route104_EventScript_RematchCindy:: @ 81ED580 + trainerbattle_rematch TRAINER_CINDY_1, Route104_Text_CindyRematchIntro, Route104_Text_CindyRematchDefeat + msgbox Route104_Text_CindyPostRematch, MSGBOX_AUTOCLOSE end -Route104_EventScript_1ED597:: @ 81ED597 - trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_2952BB, Route104_Text_2952E6, Route104_Text_295330 +Route104_EventScript_Gina:: @ 81ED597 + trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_GinaIntro, Route104_Text_GinaDefeat, Route104_Text_GinaNotEnoughMons special GetPlayerBigGuyGirlString - msgbox Route104_Text_2952FE, MSGBOX_DEFAULT + msgbox Route104_Text_GinaPostBattle, MSGBOX_DEFAULT release end -Route104_EventScript_1ED5B6:: @ 81ED5B6 - trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_2953AF, Route104_Text_2953E1, Route104_Text_295449 +Route104_EventScript_Mia:: @ 81ED5B6 + trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_MiaIntro, Route104_Text_MiaDefeat, Route104_Text_MiaNotEnoughMons special GetPlayerBigGuyGirlString - msgbox Route104_Text_29540D, MSGBOX_DEFAULT + msgbox Route104_Text_MiaPostBattle, MSGBOX_DEFAULT release end -Route104_EventScript_1ED5D5:: @ 81ED5D5 - trainerbattle_single TRAINER_DARIAN, Route104_Text_295C5D, Route104_Text_295CC9 - msgbox Route104_Text_295CD3, MSGBOX_AUTOCLOSE +Route104_EventScript_Darian:: @ 81ED5D5 + trainerbattle_single TRAINER_DARIAN, Route104_Text_DarianIntro, Route104_Text_DarianDefeat + msgbox Route104_Text_DarianPostBattle, MSGBOX_AUTOCLOSE end -Route104_Text_1ED5EC: @ 81ED5EC +Route104_Text_BrineyLivesInSeasideCottage: @ 81ED5EC .string "That seaside cottage is where\n" .string "MR. BRINEY lives.\p" .string "He was once a mighty sailor who never\n" .string "feared the sea, however stormy.$" -Route104_Text_1ED662: @ 81ED662 +Route104_Text_WhatsItLikeAtBottomOfSea: @ 81ED662 .string "The sea, huh?\p" .string "I wonder what it's like at the bottom\n" .string "of the sea?$" -Route104_Text_1ED6A2: @ 81ED6A2 +Route104_Text_ThrowBallAtWeakenedPokemon: @ 81ED6A2 .string "If you're going to throw a POKé BALL,\n" .string "weaken the wild POKéMON first.\p" .string "It will be easier to catch if it's been\n" .string "poisoned, burned, or lulled to sleep.$" -Route104_Text_1ED735: @ 81ED735 +Route104_Text_OnlyThrowBallAtWildPokemon: @ 81ED735 .string "You're a thief if you try to steal\n" .string "someone else's POKéMON.\p" .string "You should throw POKé BALLS only at\n" .string "wild POKéMON.$" -Route104_Text_1ED7A2: @ 81ED7A2 +Route104_Text_ImNotATrainer: @ 81ED7A2 .string "Oh, no, I'm not a TRAINER.\p" .string "But that's right, if TRAINERS lock eyes,\n" .string "it's a challenge to battle.\p" .string "If you don't want to battle, stay out\n" .string "of their sight.$" -Route104_Text_1ED838: @ 81ED838 +Route104_Text_LikeFillingMouthWithSeedsTakeThis: @ 81ED838 .string "I like filling my mouth with seeds,\n" .string "then spitting them out fast!\p" .string "You can have this, so you try it out!\p" .string "Use it on a POKéMON, and it will learn\n" .string "a move for firing seeds rapidly.$" -Route104_Text_1ED8E7: @ 81ED8E7 +Route104_Text_TMsAreOneTimeUse: @ 81ED8E7 .string "A word of advice!\p" .string "A TM, TECHNICAL MACHINE, is good only\n" .string "for one-time use.\p" .string "Once you use it, it's gone.\n" .string "Think twice before using it!$" -Route104_Text_1ED96A: @ 81ED96A +Route104_Text_DontNeedThisTakeIt: @ 81ED96A .string "This FLOWER SHOP started selling\n" .string "saplings recently.\p" .string "It made me so happy, I went overboard\n" @@ -1065,27 +1066,27 @@ Route104_Text_1ED96A: @ 81ED96A .string "I don't need this WHITE HERB anymore.\n" .string "Would you take it, please?$" -Route104_Text_1EDA0F: @ 81EDA0F +Route104_Text_FlowerShopSellingSaplings: @ 81EDA0F .string "This FLOWER SHOP started selling\n" .string "saplings recently.\p" .string "It made me so happy, I went overboard\n" .string "shopping. Where should I put them?$" -Route104_Text_1EDA8C: @ 81EDA8C +Route104_Text_MrBrineysCottage: @ 81EDA8C .string "MR. BRINEY'S COTTAGE$" -Route104_Text_1EDAA1: @ 81EDAA1 +Route104_Text_RouteSignPetalburg: @ 81EDAA1 .string "ROUTE 1O4\n" .string "{RIGHT_ARROW} PETALBURG CITY$" -Route104_Text_1EDABC: @ 81EDABC +Route104_Text_RouteSignRustboro: @ 81EDABC .string "ROUTE 1O4\n" .string "{UP_ARROW} RUSTBORO CITY$" -Route104_Text_1EDAD6: @ 81EDAD6 +Route104_Text_PrettyPetalFlowShop: @ 81EDAD6 .string "PRETTY PETAL FLOWER SHOP$" -Route104_Text_1EDAEF: @ 81EDAEF +Route104_Text_TrainerTipsDoubleBattles: @ 81EDAEF .string "TRAINER TIPS\p" .string "In the HOENN region there are pairs\n" .string "of TRAINERS who challenge others\l" @@ -1096,45 +1097,45 @@ Route104_Text_1EDAEF: @ 81EDAEF .string "left of the list and the top one.\l" .string "Watch how POKéMON are lined up.$" -Route104_Text_1EDBFF: @ 81EDBFF +Route104_Text_MayWeShouldRegister: @ 81EDBFF .string "MAY: Oh, hi, {PLAYER}{KUN}!\p" .string "DEVON upgraded your POKéNAV with\n" .string "the MATCH CALL system, huh?\p" .string "We should register each other so we\n" .string "can get in contact anytime.$" -Route104_Text_1EDC8F: @ 81EDC8F +Route104_Text_RegisteredMay: @ 81EDC8F .string "{PLAYER} registered MAY\n" .string "in the POKéNAV.$" -Route104_Text_1EDCB1: @ 81EDCB1 +Route104_Text_MayHowsYourPokedex: @ 81EDCB1 .string "MAY: Oh, by the way, {PLAYER}{KUN},\n" .string "how's your POKéDEX coming along?$" -Route104_Text_1EDCED: @ 81EDCED +Route104_Text_MayMinesDecentLetsBattle: @ 81EDCED .string "Mine's looking pretty decent.\n" .string "So…\l" .string "How about a little battle?$" -Route104_Text_1EDD2A: @ 81EDD2A +Route104_Text_MayHaventRaisedPokemon: @ 81EDD2A .string "MAY: Oh, what's the matter?\p" .string "Haven't you caught or raised your\n" .string "POKéMON very much?\p" .string "That's not very good for a TRAINER!$" -Route104_Text_1EDD9F: @ 81EDD9F +Route104_Text_MayLetsBattle: @ 81EDD9F .string "MAY: So, what do you think?\n" .string "How about a little battle here?$" -Route104_Text_1EDDDB: @ 81EDDDB +Route104_Text_MayIntro: @ 81EDDDB .string "MAY: You just became a TRAINER,\n" .string "{PLAYER}{KUN}. I'm not going to lose!$" -Route104_Text_1EDE18: @ 81EDE18 +Route104_Text_MayDefeat: @ 81EDE18 .string "Yikes!\n" .string "You're better than I expected!$" -Route104_Text_1EDE3E: @ 81EDE3E +Route104_Text_MayPostBattle: @ 81EDE3E .string "MAY: I can tell you've gotten pretty\n" .string "good with the way you handle POKéMON.\p" .string "But instead of only making them\n" @@ -1142,43 +1143,43 @@ Route104_Text_1EDE3E: @ 81EDE3E .string "It's important to become friends with\n" .string "POKéMON, too.$" -Route104_Text_1EDF04: @ 81EDF04 +Route104_Text_BrendanWeShouldRegister: @ 81EDF04 .string "BRENDAN: Oh, hey, {PLAYER}!\p" .string "Cool, you had DEVON install the MATCH\n" .string "CALL system on your POKéNAV!\p" .string "Let's register each other in our\n" .string "POKéNAVS so we can keep in touch.$" -Route104_Text_1EDFA0: @ 81EDFA0 +Route104_Text_RegisteredBrendan: @ 81EDFA0 .string "{PLAYER} registered BRENDAN\n" .string "in the POKéNAV.$" -Route104_Text_1EDFC6: @ 81EDFC6 +Route104_Text_BrendanHowsYourPokedex: @ 81EDFC6 .string "BRENDAN: {PLAYER}, how's your POKéDEX?\n" .string "Have you filled in any pages yet?$" -Route104_Text_1EE009: @ 81EE009 +Route104_Text_BrendanDoingGreatLetsBattle: @ 81EE009 .string "Me, I'm doing great!\p" .string "Want to check out how good I am with\n" .string "a battle?$" -Route104_Text_1EE04D: @ 81EE04D +Route104_Text_BrendanNoConfidence: @ 81EE04D .string "BRENDAN: What's the matter? Don't have\n" .string "any confidence in your POKéMON?$" -Route104_Text_1EE094: @ 81EE094 +Route104_Text_BrendanLetsBattle: @ 81EE094 .string "BRENDAN: What's up?\n" .string "Want to have a battle with me?$" -Route104_Text_1EE0C7: @ 81EE0C7 +Route104_Text_BrendanIntro: @ 81EE0C7 .string "BRENDAN: I know you just became\n" .string "a TRAINER, but I won't go easy!$" -Route104_Text_1EE107: @ 81EE107 +Route104_Text_BrendanDefeat: @ 81EE107 .string "Hmm…\n" .string "You're pretty good.$" -Route104_Text_1EE120: @ 81EE120 +Route104_Text_BrendanPostBattle: @ 81EE120 .string "BRENDAN: You've gotten pretty decent\n" .string "at handling POKéMON.\p" .string "But, you know, you shouldn't just be\n" diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index badd5d14e..2d1be0635 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route119_EventScript_1F47E2", + "script": "Route119_EventScript_Greg", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route119_EventScript_1F47B4", + "script": "Route119_EventScript_Taylor", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route119_EventScript_1F479D", + "script": "Route119_EventScript_Donald", "flag": "0" }, { @@ -113,7 +113,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route119_EventScript_1F4810", + "script": "Route119_EventScript_Jackson", "flag": "0" }, { @@ -126,7 +126,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route119_EventScript_1F4786", + "script": "Route119_EventScript_Brent", "flag": "0" }, { @@ -139,7 +139,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route119_EventScript_1F4872", + "script": "Route119_EventScript_Catherine", "flag": "0" }, { @@ -152,7 +152,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route119_EventScript_1F47CB", + "script": "Route119_EventScript_Doug", "flag": "0" }, { @@ -165,7 +165,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route119_EventScript_1F47F9", + "script": "Route119_EventScript_Kent", "flag": "0" }, { @@ -178,7 +178,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route119_EventScript_1F4902", + "script": "Route119_EventScript_Yasu", "flag": "0" }, { @@ -191,7 +191,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route119_EventScript_1F4919", + "script": "Route119_EventScript_Takashi", "flag": "0" }, { @@ -204,7 +204,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route119_EventScript_1F48D4", + "script": "Route119_EventScript_Hugh", "flag": "0" }, { @@ -217,7 +217,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route119_EventScript_1F48EB", + "script": "Route119_EventScript_Phil", "flag": "0" }, { @@ -321,7 +321,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_EventScript_1F49A3", + "script": "Route119_EventScript_BridgeAquaGrunt1", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { @@ -334,7 +334,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_EventScript_1F49BA", + "script": "Route119_EventScript_BridgeAquaGrunt2", "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" }, { @@ -360,7 +360,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_EventScript_1F49D1", + "script": "Route119_EventScript_Boy1", "flag": "0" }, { @@ -425,7 +425,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_EventScript_1F476B", + "script": "Route119_EventScript_CyclingTriathleteM", "flag": "0" }, { @@ -451,7 +451,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_EventScript_1F49DA", + "script": "Route119_EventScript_Boy2", "flag": "0" }, { @@ -464,7 +464,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route119_EventScript_1F4930", + "script": "Route119_EventScript_Hideo", "flag": "0" }, { @@ -503,7 +503,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "Route119_EventScript_1F4947", + "script": "Route119_EventScript_Chris", "flag": "0" }, { @@ -516,7 +516,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route119_EventScript_1F498C", + "script": "Route119_EventScript_Rachel", "flag": "0" }, { @@ -529,7 +529,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route119_EventScript_1F4975", + "script": "Route119_EventScript_Dayton", "flag": "0" }, { @@ -542,7 +542,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route119_EventScript_1F495E", + "script": "Route119_EventScript_Fabian", "flag": "0" }, { @@ -609,7 +609,7 @@ "elevation": 0, "var": "VAR_ROUTE119_STATE", "var_value": "0", - "script": "Route119_EventScript_1F4472" + "script": "Route119_EventScript_RivalTrigger1" }, { "type": "trigger", @@ -618,7 +618,7 @@ "elevation": 0, "var": "VAR_ROUTE119_STATE", "var_value": "0", - "script": "Route119_EventScript_1F447D" + "script": "Route119_EventScript_RivalTrigger2" }, { "type": "weather", @@ -775,7 +775,7 @@ "y": 33, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route119_EventScript_1F477D" + "script": "Route119_EventScript_WeatherInstituteSign" }, { "type": "sign", @@ -783,7 +783,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route119_EventScript_1F4774" + "script": "Route119_EventScript_RouteSignFortree" }, { "type": "secret_base", @@ -914,7 +914,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route119_EventScript_1F49E3" + "script": "Route119_EventScript_TrainerTipsDecoration" } ] }
\ No newline at end of file diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 4658c2407..36647e931 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -1,13 +1,13 @@ Route119_MapScripts:: @ 81F4424 - map_script MAP_SCRIPT_ON_RESUME, Route119_MapScript1_1F442F + map_script MAP_SCRIPT_ON_RESUME, Route119_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Route119_OnTransition .byte 0 -Route119_MapScript1_1F442F: @ 81F442F - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_1F4439 +Route119_OnResume: @ 81F442F + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_TryRemoveKecleon end -Route119_EventScript_1F4439:: @ 81F4439 +Route119_EventScript_TryRemoveKecleon:: @ 81F4439 specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn @@ -18,231 +18,231 @@ Route119_OnTransition: @ 81F444D call Common_EventScript_SetupRivalGfxId call Common_EventScript_SetupRivalOnBikeGfxId compare VAR_WEATHER_INSTITUTE_STATE, 1 - call_if_eq Route119_EventScript_1F4466 + call_if_eq Route119_EventScript_MoveInstituteWorkersDownstairs special SetRoute119Weather end -Route119_EventScript_1F4466:: @ 81F4466 +Route119_EventScript_MoveInstituteWorkersDownstairs:: @ 81F4466 setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS clearflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS setvar VAR_WEATHER_INSTITUTE_STATE, 2 return -Route119_EventScript_1F4472:: @ 81F4472 +Route119_EventScript_RivalTrigger1:: @ 81F4472 setvar VAR_TEMP_1, 1 - goto Route119_EventScript_1F4488 + goto Route119_EventScript_RivalEncounter end -Route119_EventScript_1F447D:: @ 81F447D +Route119_EventScript_RivalTrigger2:: @ 81F447D setvar VAR_TEMP_1, 2 - goto Route119_EventScript_1F4488 + goto Route119_EventScript_RivalEncounter end -Route119_EventScript_1F4488:: @ 81F4488 +Route119_EventScript_RivalEncounter:: @ 81F4488 lockall - addobject 25 + addobject 25 @ Rival on bike checkplayergender compare VAR_RESULT, MALE - call_if_eq Route119_EventScript_1F4501 + call_if_eq Route119_EventScript_PlayMayMusic compare VAR_RESULT, FEMALE - call_if_eq Route119_EventScript_1F4506 + call_if_eq Route119_EventScript_PlayBrendanMusic delay 65 compare VAR_TEMP_1, 1 - call_if_eq Route119_EventScript_1F46C6 + call_if_eq Route119_EventScript_RivalEnter1 compare VAR_TEMP_1, 2 - call_if_eq Route119_EventScript_1F46D1 + call_if_eq Route119_EventScript_RivalEnter2 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 delay 30 compare VAR_TEMP_1, 1 - call_if_eq Route119_EventScript_1F4700 + call_if_eq Route119_EventScript_SetRivalPos1 compare VAR_TEMP_1, 2 - call_if_eq Route119_EventScript_1F470F + call_if_eq Route119_EventScript_SetRivalPos2 removeobject 25 - addobject 16 + addobject 16 @ Rival on foot delay 30 checkplayergender compare VAR_RESULT, MALE - goto_if_eq Route119_EventScript_1F450B + goto_if_eq Route119_EventScript_BattleMay compare VAR_RESULT, FEMALE - goto_if_eq Route119_EventScript_1F4585 + goto_if_eq Route119_EventScript_BattleBrendan releaseall end -Route119_EventScript_1F4501:: @ 81F4501 +Route119_EventScript_PlayMayMusic:: @ 81F4501 playbgm MUS_GIRL_SUP, 1 return -Route119_EventScript_1F4506:: @ 81F4506 +Route119_EventScript_PlayBrendanMusic:: @ 81F4506 playbgm MUS_BOY_SUP, 1 return -Route119_EventScript_1F450B:: @ 81F450B - msgbox Route119_Text_1F49FD, MSGBOX_DEFAULT +Route119_EventScript_BattleMay:: @ 81F450B + msgbox Route119_Text_MayIntro, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, Route119_EventScript_1F453A - case 1, Route119_EventScript_1F454A - case 2, Route119_EventScript_1F455A + case 0, Route119_EventScript_BattleMayTreecko + case 1, Route119_EventScript_BattleMayTorchic + case 2, Route119_EventScript_BattleMayMudkip end -Route119_EventScript_1F453A:: @ 81F453A - trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_1F4A98 - goto Route119_EventScript_1F456A +Route119_EventScript_BattleMayTreecko:: @ 81F453A + trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_MayDefeat + goto Route119_EventScript_DefeatedMay end -Route119_EventScript_1F454A:: @ 81F454A - trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_1F4A98 - goto Route119_EventScript_1F456A +Route119_EventScript_BattleMayTorchic:: @ 81F454A + trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_MayDefeat + goto Route119_EventScript_DefeatedMay end -Route119_EventScript_1F455A:: @ 81F455A - trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_1F4A98 - goto Route119_EventScript_1F456A +Route119_EventScript_BattleMayMudkip:: @ 81F455A + trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_MayDefeat + goto Route119_EventScript_DefeatedMay end -Route119_EventScript_1F456A:: @ 81F456A - msgbox Route119_Text_1F4AF3, MSGBOX_DEFAULT - call Route119_EventScript_1F45FF - msgbox Route119_Text_1F4B56, MSGBOX_DEFAULT - goto Route119_EventScript_1F460F +Route119_EventScript_DefeatedMay:: @ 81F456A + msgbox Route119_Text_MayPresentForYou, MSGBOX_DEFAULT + call Route119_EventScript_GiveFlyHM + msgbox Route119_Text_MayExplainFly, MSGBOX_DEFAULT + goto Route119_EventScript_RivalExitScottArrive end -Route119_EventScript_1F4585:: @ 81F4585 - msgbox Route119_Text_1F4C9A, MSGBOX_DEFAULT +Route119_EventScript_BattleBrendan:: @ 81F4585 + msgbox Route119_Text_BrendanIntro, MSGBOX_DEFAULT switch VAR_STARTER_MON - case 0, Route119_EventScript_1F45B4 - case 1, Route119_EventScript_1F45C4 - case 2, Route119_EventScript_1F45D4 + case 0, Route119_EventScript_BattleBrendanTreecko + case 1, Route119_EventScript_BattleBrendanTorchic + case 2, Route119_EventScript_BattleBrendanMudkip end -Route119_EventScript_1F45B4:: @ 81F45B4 - trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_1F4D24 - goto Route119_EventScript_1F45E4 +Route119_EventScript_BattleBrendanTreecko:: @ 81F45B4 + trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_BrendanDefeat + goto Route119_EventScript_DefeatedBrendan end -Route119_EventScript_1F45C4:: @ 81F45C4 - trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_1F4D24 - goto Route119_EventScript_1F45E4 +Route119_EventScript_BattleBrendanTorchic:: @ 81F45C4 + trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_BrendanDefeat + goto Route119_EventScript_DefeatedBrendan end -Route119_EventScript_1F45D4:: @ 81F45D4 - trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_1F4D24 - goto Route119_EventScript_1F45E4 +Route119_EventScript_BattleBrendanMudkip:: @ 81F45D4 + trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_BrendanDefeat + goto Route119_EventScript_DefeatedBrendan end -Route119_EventScript_1F45E4:: @ 81F45E4 - msgbox Route119_Text_1F4D4B, MSGBOX_DEFAULT - call Route119_EventScript_1F45FF - msgbox Route119_Text_1F4DB5, MSGBOX_DEFAULT - goto Route119_EventScript_1F460F +Route119_EventScript_DefeatedBrendan:: @ 81F45E4 + msgbox Route119_Text_BrendanIllGiveYouThis, MSGBOX_DEFAULT + call Route119_EventScript_GiveFlyHM + msgbox Route119_Text_BrendanExplainFly, MSGBOX_DEFAULT + goto Route119_EventScript_RivalExitScottArrive end -Route119_EventScript_1F45FF:: @ 81F45FF +Route119_EventScript_GiveFlyHM:: @ 81F45FF giveitem_std ITEM_HM02 setflag FLAG_RECEIVED_HM02 return -Route119_EventScript_1F460F:: @ 81F460F +Route119_EventScript_RivalExitScottArrive:: @ 81F460F closemessage compare VAR_TEMP_1, 1 - call_if_eq Route119_EventScript_1F4700 + call_if_eq Route119_EventScript_SetRivalPos1 compare VAR_TEMP_1, 2 - call_if_eq Route119_EventScript_1F470F - removeobject 16 - addobject 25 + call_if_eq Route119_EventScript_SetRivalPos2 + removeobject 16 @ Rival on foot + addobject 25 @ Rival on bike delay 30 compare VAR_TEMP_1, 1 - call_if_eq Route119_EventScript_1F46DC + call_if_eq Route119_EventScript_RivalExit1 compare VAR_TEMP_1, 2 - call_if_eq Route119_EventScript_1F46EE + call_if_eq Route119_EventScript_RivalExit2 removeobject 25 setvar VAR_ROUTE119_STATE, 1 savebgm MUS_DUMMY fadedefaultbgm delay 60 compare VAR_TEMP_1, 1 - call_if_eq Route119_EventScript_1F46A0 + call_if_eq Route119_EventScript_SetScottPos1 compare VAR_TEMP_1, 2 - call_if_eq Route119_EventScript_1F46A8 - addobject 43 - applymovement 43, Route119_Movement_1F4752 + call_if_eq Route119_EventScript_SetScottPos2 + addobject 43 @ Scott + applymovement 43, Route119_Movement_ScottEnter waitmovement 0 addvar VAR_SCOTT_STATE, 1 - msgbox Route119_Text_1F4E60, MSGBOX_DEFAULT + msgbox Route119_Text_ScottWayToGoBeSeeingYou, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 - call_if_eq Route119_EventScript_1F46B0 + call_if_eq Route119_EventScript_ScottExit1 compare VAR_TEMP_1, 2 - call_if_eq Route119_EventScript_1F46BB + call_if_eq Route119_EventScript_ScottExit2 removeobject 43 releaseall end -Route119_EventScript_1F46A0:: @ 81F46A0 +Route119_EventScript_SetScottPos1:: @ 81F46A0 setobjectxyperm 43, 27, 25 return -Route119_EventScript_1F46A8:: @ 81F46A8 +Route119_EventScript_SetScottPos2:: @ 81F46A8 setobjectxyperm 43, 28, 25 return -Route119_EventScript_1F46B0:: @ 81F46B0 - applymovement 43, Route119_Movement_1F475A +Route119_EventScript_ScottExit1:: @ 81F46B0 + applymovement 43, Route119_Movement_ScottExit1 waitmovement 0 return -Route119_EventScript_1F46BB:: @ 81F46BB - applymovement 43, Route119_Movement_1F4763 +Route119_EventScript_ScottExit2:: @ 81F46BB + applymovement 43, Route119_Movement_ScottExit2 waitmovement 0 return -Route119_EventScript_1F46C6:: @ 81F46C6 - applymovement 25, Route119_Movement_1F4728 +Route119_EventScript_RivalEnter1:: @ 81F46C6 + applymovement 25, Route119_Movement_RivalEnter1 waitmovement 0 return -Route119_EventScript_1F46D1:: @ 81F46D1 - applymovement 25, Route119_Movement_1F4732 +Route119_EventScript_RivalEnter2:: @ 81F46D1 + applymovement 25, Route119_Movement_RivalEnter2 waitmovement 0 return -Route119_EventScript_1F46DC:: @ 81F46DC - applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_1F471E - applymovement 25, Route119_Movement_1F473D +Route119_EventScript_RivalExit1:: @ 81F46DC + applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit1 + applymovement 25, Route119_Movement_RivalExit1 waitmovement 0 return -Route119_EventScript_1F46EE:: @ 81F46EE - applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_1F4723 - applymovement 25, Route119_Movement_1F4747 +Route119_EventScript_RivalExit2:: @ 81F46EE + applymovement EVENT_OBJ_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit2 + applymovement 25, Route119_Movement_RivalExit2 waitmovement 0 return -Route119_EventScript_1F4700:: @ 81F4700 +Route119_EventScript_SetRivalPos1:: @ 81F4700 setobjectxyperm 16, 25, 32 setobjectxyperm 25, 25, 32 return -Route119_EventScript_1F470F:: @ 81F470F +Route119_EventScript_SetRivalPos2:: @ 81F470F setobjectxyperm 16, 26, 32 setobjectxyperm 25, 26, 32 return -Route119_Movement_1F471E: @ 81F471E +Route119_Movement_PlayerWatchRivalExit1: @ 81F471E delay_16 walk_in_place_fastest_right delay_8 walk_in_place_fastest_up step_end -Route119_Movement_1F4723: @ 81F4723 +Route119_Movement_PlayerWatchRivalExit2: @ 81F4723 delay_16 walk_in_place_fastest_left delay_8 walk_in_place_fastest_up step_end -Route119_Movement_1F4728: @ 81F4728 +Route119_Movement_RivalEnter1: @ 81F4728 walk_fast_right walk_fast_right walk_fast_right @@ -254,7 +254,7 @@ Route119_Movement_1F4728: @ 81F4728 walk_fast_up step_end -Route119_Movement_1F4732: @ 81F4732 +Route119_Movement_RivalEnter2: @ 81F4732 walk_fast_right walk_fast_right walk_fast_right @@ -267,7 +267,7 @@ Route119_Movement_1F4732: @ 81F4732 walk_fast_up step_end -Route119_Movement_1F473D: @ 81F473D +Route119_Movement_RivalExit1: @ 81F473D walk_fast_right walk_fast_up walk_fast_up @@ -279,7 +279,7 @@ Route119_Movement_1F473D: @ 81F473D walk_fast_up step_end -Route119_Movement_1F4747: @ 81F4747 +Route119_Movement_RivalExit2: @ 81F4747 walk_fast_left walk_fast_up walk_fast_up @@ -292,7 +292,7 @@ Route119_Movement_1F4747: @ 81F4747 walk_fast_up step_end -Route119_Movement_1F4752: @ 81F4752 +Route119_Movement_ScottEnter: @ 81F4752 walk_down walk_down walk_down @@ -302,7 +302,7 @@ Route119_Movement_1F4752: @ 81F4752 walk_down step_end -Route119_Movement_1F475A: @ 81F475A +Route119_Movement_ScottExit1: @ 81F475A walk_up walk_right walk_right @@ -313,7 +313,7 @@ Route119_Movement_1F475A: @ 81F475A walk_up step_end -Route119_Movement_1F4763: @ 81F4763 +Route119_Movement_ScottExit2: @ 81F4763 walk_up walk_right walk_up @@ -323,179 +323,179 @@ Route119_Movement_1F4763: @ 81F4763 walk_up step_end -Route119_EventScript_1F476B:: @ 81F476B - msgbox Route119_Text_1F5261, MSGBOX_NPC +Route119_EventScript_CyclingTriathleteM:: @ 81F476B + msgbox Route119_Text_TallGrassSnaresBikeTires, MSGBOX_NPC end -Route119_EventScript_1F4774:: @ 81F4774 - msgbox Route119_Text_1F530E, MSGBOX_SIGN +Route119_EventScript_RouteSignFortree:: @ 81F4774 + msgbox Route119_Text_RouteSignFortree, MSGBOX_SIGN end -Route119_EventScript_1F477D:: @ 81F477D - msgbox Route119_Text_1F5327, MSGBOX_SIGN +Route119_EventScript_WeatherInstituteSign:: @ 81F477D + msgbox Route119_Text_WeatherInstitute, MSGBOX_SIGN end -Route119_EventScript_1F4786:: @ 81F4786 - trainerbattle_single TRAINER_BRENT, Route119_Text_29D8C2, Route119_Text_29D8F0 - msgbox Route119_Text_29D902, MSGBOX_AUTOCLOSE +Route119_EventScript_Brent:: @ 81F4786 + trainerbattle_single TRAINER_BRENT, Route119_Text_BrentIntro, Route119_Text_BrentDefeat + msgbox Route119_Text_BrentPostBattle, MSGBOX_AUTOCLOSE end -Route119_EventScript_1F479D:: @ 81F479D - trainerbattle_single TRAINER_DONALD, Route119_Text_29D941, Route119_Text_29D97C - msgbox Route119_Text_29D993, MSGBOX_AUTOCLOSE +Route119_EventScript_Donald:: @ 81F479D + trainerbattle_single TRAINER_DONALD, Route119_Text_DonaldIntro, Route119_Text_DonaldDefeat + msgbox Route119_Text_DonaldPostBattle, MSGBOX_AUTOCLOSE end -Route119_EventScript_1F47B4:: @ 81F47B4 - trainerbattle_single TRAINER_TAYLOR, Route119_Text_29D9CD, Route119_Text_29DA14 - msgbox Route119_Text_29DA2C, MSGBOX_AUTOCLOSE +Route119_EventScript_Taylor:: @ 81F47B4 + trainerbattle_single TRAINER_TAYLOR, Route119_Text_TaylorIntro, Route119_Text_TaylorDefeat + msgbox Route119_Text_TaylorPostBattle, MSGBOX_AUTOCLOSE end -Route119_EventScript_1F47CB:: @ 81F47CB - trainerbattle_single TRAINER_DOUG, Route119_Text_29DA7D, Route119_Text_29DABC - msgbox Route119_Text_29DADB, MSGBOX_AUTOCLOSE +Route119_EventScript_Doug:: @ 81F47CB + trainerbattle_single TRAINER_DOUG, Route119_Text_DougIntro, Route119_Text_DougDefeat + msgbox Route119_Text_DougPostBattle, MSGBOX_AUTOCLOSE end -Route119_EventScript_1F47E2:: @ 81F47E2 - trainerbattle_single TRAINER_GREG, Route119_Text_29DB17, Route119_Text_29DB66 - msgbox Route119_Text_29DB7C, MSGBOX_AUTOCLOSE +Route119_EventScript_Greg:: @ 81F47E2 + trainerbattle_single TRAINER_GREG, Route119_Text_GregIntro, Route119_Text_GregDefeat + msgbox Route119_Text_GregPostBattle, MSGBOX_AUTOCLOSE end -Route119_EventScript_1F47F9:: @ 81F47F9 - trainerbattle_single TRAINER_KENT, Route119_Text_29DBC2, Route119_Text_29DC20 - msgbox Route119_Text_29DC2B, MSGBOX_AUTOCLOSE +Route119_EventScript_Kent:: @ 81F47F9 + trainerbattle_single TRAINER_KENT, Route119_Text_KentIntro, Route119_Text_KentDefeat + msgbox Route119_Text_KentPostBattle, MSGBOX_AUTOCLOSE end -Route119_EventScript_1F4810:: @ 81F4810 - trainerbattle_single TRAINER_JACKSON_1, Route119_Text_29DC4C, Route119_Text_29DC9F, Route119_EventScript_1F483C +Route119_EventScript_Jackson:: @ 81F4810 + trainerbattle_single TRAINER_JACKSON_1, Route119_Text_JacksonIntro, Route119_Text_JacksonDefeat, Route119_EventScript_RegisterJackson specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route119_EventScript_1F485B - msgbox Route119_Text_29DCC6, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route119_EventScript_RematchJackson + msgbox Route119_Text_JacksonPostBattle, MSGBOX_DEFAULT release end -Route119_EventScript_1F483C:: @ 81F483C +Route119_EventScript_RegisterJackson:: @ 81F483C special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route119_Text_29DD1C, MSGBOX_DEFAULT + msgbox Route119_Text_JacksonRegister, MSGBOX_DEFAULT register_matchcall TRAINER_JACKSON_1 release end -Route119_EventScript_1F485B:: @ 81F485B - trainerbattle_rematch TRAINER_JACKSON_1, Route119_Text_29DD62, Route119_Text_29DDA5 - msgbox Route119_Text_29DDBD, MSGBOX_AUTOCLOSE +Route119_EventScript_RematchJackson:: @ 81F485B + trainerbattle_rematch TRAINER_JACKSON_1, Route119_Text_JacksonRematchIntro, Route119_Text_JacksonRematchDefeat + msgbox Route119_Text_JacksonPostRematch, MSGBOX_AUTOCLOSE end -Route119_EventScript_1F4872:: @ 81F4872 - trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_29DE0F, Route119_Text_29DE5D, Route119_EventScript_1F489E +Route119_EventScript_Catherine:: @ 81F4872 + trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_CatherineIntro, Route119_Text_CatherineDefeat, Route119_EventScript_RegisterCatherine specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route119_EventScript_1F48BD - msgbox Route119_Text_29DE88, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route119_EventScript_RematchCatherine + msgbox Route119_Text_CatherinePostBattle, MSGBOX_DEFAULT release end -Route119_EventScript_1F489E:: @ 81F489E +Route119_EventScript_RegisterCatherine:: @ 81F489E special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route119_Text_29DEF7, MSGBOX_DEFAULT + msgbox Route119_Text_CatherineRegister, MSGBOX_DEFAULT register_matchcall TRAINER_CATHERINE_1 release end -Route119_EventScript_1F48BD:: @ 81F48BD - trainerbattle_rematch TRAINER_CATHERINE_1, Route119_Text_29DF6B, Route119_Text_29DF92 - msgbox Route119_Text_29DFAF, MSGBOX_AUTOCLOSE +Route119_EventScript_RematchCatherine:: @ 81F48BD + trainerbattle_rematch TRAINER_CATHERINE_1, Route119_Text_CatherineRematchIntro, Route119_Text_CatherineRematchDefeat + msgbox Route119_Text_CatherinePostRematch, MSGBOX_AUTOCLOSE end -Route119_EventScript_1F48D4:: @ 81F48D4 - trainerbattle_single TRAINER_HUGH, Route119_Text_29E007, Route119_Text_29E063 - msgbox Route119_Text_29E071, MSGBOX_AUTOCLOSE +Route119_EventScript_Hugh:: @ 81F48D4 + trainerbattle_single TRAINER_HUGH, Route119_Text_HughIntro, Route119_Text_HughDefeat + msgbox Route119_Text_HughPostBattle, MSGBOX_AUTOCLOSE end -Route119_EventScript_1F48EB:: @ 81F48EB - trainerbattle_single TRAINER_PHIL, Route119_Text_29E0A5, Route119_Text_29E0E1 - msgbox Route119_Text_29E0F6, MSGBOX_AUTOCLOSE +Route119_EventScript_Phil:: @ 81F48EB + trainerbattle_single TRAINER_PHIL, Route119_Text_PhilIntro, Route119_Text_PhilDefeat + msgbox Route119_Text_PhilPostBattle, MSGBOX_AUTOCLOSE end -Route119_EventScript_1F4902:: @ 81F4902 - trainerbattle_single TRAINER_YASU, Route119_Text_29E134, Route119_Text_29E18D - msgbox Route119_Text_29E19D, MSGBOX_AUTOCLOSE +Route119_EventScript_Yasu:: @ 81F4902 + trainerbattle_single TRAINER_YASU, Route119_Text_YasuIntro, Route119_Text_YasuDefeat + msgbox Route119_Text_YasuPostBattle, MSGBOX_AUTOCLOSE end -Route119_EventScript_1F4919:: @ 81F4919 - trainerbattle_single TRAINER_TAKASHI, Route119_Text_29E1F5, Route119_Text_29E22B - msgbox Route119_Text_29E245, MSGBOX_AUTOCLOSE +Route119_EventScript_Takashi:: @ 81F4919 + trainerbattle_single TRAINER_TAKASHI, Route119_Text_TakashiIntro, Route119_Text_TakashiDefeat + msgbox Route119_Text_TakashiPostBattle, MSGBOX_AUTOCLOSE end -Route119_EventScript_1F4930:: @ 81F4930 - trainerbattle_single TRAINER_HIDEO, Route119_Text_29E26A, Route119_Text_29E288 - msgbox Route119_Text_29E2A3, MSGBOX_AUTOCLOSE +Route119_EventScript_Hideo:: @ 81F4930 + trainerbattle_single TRAINER_HIDEO, Route119_Text_HideoIntro, Route119_Text_HideoDefeat + msgbox Route119_Text_HideoPostBattle, MSGBOX_AUTOCLOSE end -Route119_EventScript_1F4947:: @ 81F4947 - trainerbattle_single TRAINER_CHRIS, Route119_Text_29E30D, Route119_Text_29E372 - msgbox Route119_Text_29E3A2, MSGBOX_AUTOCLOSE +Route119_EventScript_Chris:: @ 81F4947 + trainerbattle_single TRAINER_CHRIS, Route119_Text_ChrisIntro, Route119_Text_ChrisDefeat + msgbox Route119_Text_ChrisPostBattle, MSGBOX_AUTOCLOSE end -Route119_EventScript_1F495E:: @ 81F495E - trainerbattle_single TRAINER_FABIAN, Route119_Text_29E3FF, Route119_Text_29E44F - msgbox Route119_Text_29E492, MSGBOX_AUTOCLOSE +Route119_EventScript_Fabian:: @ 81F495E + trainerbattle_single TRAINER_FABIAN, Route119_Text_FabianIntro, Route119_Text_FabianDefeat + msgbox Route119_Text_FabianPostBattle, MSGBOX_AUTOCLOSE end -Route119_EventScript_1F4975:: @ 81F4975 - trainerbattle_single TRAINER_DAYTON, Route119_Text_29E4DF, Route119_Text_29E513 - msgbox Route119_Text_29E532, MSGBOX_AUTOCLOSE +Route119_EventScript_Dayton:: @ 81F4975 + trainerbattle_single TRAINER_DAYTON, Route119_Text_DaytonIntro, Route119_Text_DaytonDefeat + msgbox Route119_Text_DaytonPostBattle, MSGBOX_AUTOCLOSE end -Route119_EventScript_1F498C:: @ 81F498C - trainerbattle_single TRAINER_RACHEL, Route119_Text_29E56F, Route119_Text_29E5B1 - msgbox Route119_Text_29E5CB, MSGBOX_AUTOCLOSE +Route119_EventScript_Rachel:: @ 81F498C + trainerbattle_single TRAINER_RACHEL, Route119_Text_RachelIntro, Route119_Text_RachelDefeat + msgbox Route119_Text_RachelPostBattle, MSGBOX_AUTOCLOSE end -Route119_EventScript_1F49A3:: @ 81F49A3 +Route119_EventScript_BridgeAquaGrunt1:: @ 81F49A3 lock faceplayer - msgbox Route119_Text_1F50EB, MSGBOX_DEFAULT + msgbox Route119_Text_StayAwayFromWeatherInstitute, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -Route119_EventScript_1F49BA:: @ 81F49BA +Route119_EventScript_BridgeAquaGrunt2:: @ 81F49BA lock faceplayer - msgbox Route119_Text_1F5147, MSGBOX_DEFAULT + msgbox Route119_Text_DontGoNearWeatherInstitute, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection waitmovement 0 release end -Route119_EventScript_1F49D1:: @ 81F49D1 - msgbox Route119_Text_1F51A2, MSGBOX_NPC +Route119_EventScript_Boy1:: @ 81F49D1 + msgbox Route119_Text_ThoughtFlyByCatchingBirdMons, MSGBOX_NPC end -Route119_EventScript_1F49DA:: @ 81F49DA - msgbox Route119_Text_1F52B9, MSGBOX_NPC +Route119_EventScript_Boy2:: @ 81F49DA + msgbox Route119_Text_CanYourMonMakeSecretBase, MSGBOX_NPC end -Route119_EventScript_1F49E3:: @ 81F49E3 - msgbox Route119_Text_1F5339, MSGBOX_SIGN +Route119_EventScript_TrainerTipsDecoration:: @ 81F49E3 + msgbox Route119_Text_TrainerTipsDecoration, MSGBOX_SIGN end -Route119_EventScript_1F49EC:: @ 81F49EC +Route119_EventScript_ScottWonAtFortreeGymCall:: @ 81F49EC lockall - pokenavcall Route119_Text_1F4FBA + pokenavcall Route119_Text_ScottYouWonAtFortreeGym waitmessage - clearflag FLAG_REGISTER_WINONA_POKENAV + clearflag FLAG_SCOTT_CALL_FORTREE_GYM addvar VAR_SCOTT_STATE, 1 releaseall end -Route119_Text_1F49FD: @ 81F49FD +Route119_Text_MayIntro: @ 81F49FD .string "MAY: {PLAYER}{KUN}!\n" .string "Where were you? I was looking for you!\p" .string "How much stronger have you gotten?\n" @@ -503,18 +503,18 @@ Route119_Text_1F49FD: @ 81F49FD .string "Ready with your POKéMON?\n" .string "Of course you are! Go!$" -Route119_Text_1F4A98: @ 81F4A98 +Route119_Text_MayDefeat: @ 81F4A98 .string "Achah!\n" .string "{PLAYER}{KUN}, you're strong!\p" .string "I was worried that you might be\n" .string "struggling with your training.$" -Route119_Text_1F4AF3: @ 81F4AF3 +Route119_Text_MayPresentForYou: @ 81F4AF3 .string "MAY: But I had absolutely nothing to\n" .string "worry about! Keep it up!\p" .string "And, here! I have a present for you.$" -Route119_Text_1F4B56: @ 81F4B56 +Route119_Text_MayExplainFly: @ 81F4B56 .string "MAY: Use FLY, and your POKéMON will\n" .string "instantly carry you to any town you've\l" .string "already visited.\p" @@ -527,7 +527,7 @@ Route119_Text_1F4B56: @ 81F4B56 .string "{PLAYER}{KUN}.\p" .string "Well, let's meet again somewhere!$" -Route119_Text_1F4C9A: @ 81F4C9A +Route119_Text_BrendanIntro: @ 81F4C9A .string "BRENDAN: {PLAYER}! So this is where\n" .string "you've been looking for POKéMON?\p" .string "Let me see how good you got.\n" @@ -535,17 +535,17 @@ Route119_Text_1F4C9A: @ 81F4C9A .string "Now!\n" .string "It's a battle, so battle!$" -Route119_Text_1F4D24: @ 81F4D24 +Route119_Text_BrendanDefeat: @ 81F4D24 .string "Hmm…\n" .string "You've gotten pretty darn decent.$" -Route119_Text_1F4D4B: @ 81F4D4B +Route119_Text_BrendanIllGiveYouThis: @ 81F4D4B .string "BRENDAN: I'd say you're good enough\n" .string "to search for POKéMON anywhere.\p" .string "Here, I'll give you this.\n" .string "Try it out.$" -Route119_Text_1F4DB5: @ 81F4DB5 +Route119_Text_BrendanExplainFly: @ 81F4DB5 .string "BRENDAN: Use FLY, and your POKéMON\n" .string "instantly carries you to any town\l" .string "you've already visited.\p" @@ -553,7 +553,7 @@ Route119_Text_1F4DB5: @ 81F4DB5 .string "to do that.\p" .string "Anyway, I have to move along.$" -Route119_Text_1F4E60: @ 81F4E60 +Route119_Text_ScottWayToGoBeSeeingYou: @ 81F4E60 .string "SCOTT: Hahahah!\n" .string "Way to go, {PLAYER}{KUN}!\p" .string "I just passed by a TRAINER riding\n" @@ -568,7 +568,7 @@ Route119_Text_1F4E60: @ 81F4E60 .string "Well, I'll be seeing you!$" -Route119_Text_1F4FBA: @ 81F4FBA +Route119_Text_ScottYouWonAtFortreeGym: @ 81F4FBA .string "… … … … … …\n" .string "… … … … … Beep!\p" .string "SCOTT: Hiya, {PLAYER}{KUN}, it's me!\p" @@ -583,17 +583,17 @@ Route119_Text_1F4FBA: @ 81F4FBA .string "… … … … … …\n" .string "… … … … … Click!$" -Route119_Text_1F50EB: @ 81F50EB +Route119_Text_StayAwayFromWeatherInstitute: @ 81F50EB .string "We're standing lookout here.\p" .string "Hey, you! Stay away from the WEATHER\n" .string "INSTITUTE. It's not safe.$" -Route119_Text_1F5147: @ 81F5147 +Route119_Text_DontGoNearWeatherInstitute: @ 81F5147 .string "Lookout duty is surprisingly boring.\p" .string "Hey, you! Please don't go near the\n" .string "WEATHER INSTITUTE.$" -Route119_Text_1F51A2: @ 81F51A2 +Route119_Text_ThoughtFlyByCatchingBirdMons: @ 81F51A2 .string "I thought you FLY by catching a whole\n" .string "flock of BIRD POKéMON, and then\l" .string "hanging on to them somehow.\p" @@ -602,25 +602,25 @@ Route119_Text_1F51A2: @ 81F51A2 .string "I wish I'd known about that a long\n" .string "time ago…$" -Route119_Text_1F5261: @ 81F5261 +Route119_Text_TallGrassSnaresBikeTires: @ 81F5261 .string "Tch…\n" .string "It's a no-go…\p" .string "The tall grass snares BIKE tires.\n" .string "There's no way you can cycle here.$" -Route119_Text_1F52B9: @ 81F52B9 +Route119_Text_CanYourMonMakeSecretBase: @ 81F52B9 .string "Can your POKéMON use its SECRET POWER\n" .string "on a big pile of grass and make a\l" .string "SECRET BASE?$" -Route119_Text_1F530E: @ 81F530E +Route119_Text_RouteSignFortree: @ 81F530E .string "ROUTE 119\n" .string "{RIGHT_ARROW} FORTREE CITY$" -Route119_Text_1F5327: @ 81F5327 +Route119_Text_WeatherInstitute: @ 81F5327 .string "WEATHER INSTITUTE$" -Route119_Text_1F5339: @ 81F5339 +Route119_Text_TrainerTipsDecoration: @ 81F5339 .string "TRAINER TIPS\p" .string "Up to sixteen decorations and\n" .string "furniture items can be placed in\l" diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index 8bcfafc72..61e7d2892 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -165,7 +165,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route120_EventScript_1F57D7", + "script": "Route120_EventScript_Colin", "flag": "0" }, { @@ -178,7 +178,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route120_EventScript_1F57EE", + "script": "Route120_EventScript_Robert", "flag": "0" }, { @@ -191,7 +191,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route120_EventScript_1F5850", + "script": "Route120_EventScript_Lorenzo", "flag": "0" }, { @@ -204,7 +204,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route120_EventScript_1F5867", + "script": "Route120_EventScript_Jenna", "flag": "0" }, { @@ -217,7 +217,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route120_EventScript_1F587E", + "script": "Route120_EventScript_Jeffrey", "flag": "0" }, { @@ -321,7 +321,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route120_EventScript_1F5527", + "script": "Route120_EventScript_BerryBeauty", "flag": "0" }, { @@ -334,7 +334,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route120_EventScript_1F58E0", + "script": "Route120_EventScript_Jennifer", "flag": "0" }, { @@ -347,7 +347,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route120_EventScript_1F58F7", + "script": "Route120_EventScript_Chip", "flag": "0" }, { @@ -360,7 +360,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route120_EventScript_1F590E", + "script": "Route120_EventScript_Clarissa", "flag": "0" }, { @@ -373,7 +373,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route120_EventScript_1F5925", + "script": "Route120_EventScript_Angelica", "flag": "0" }, { @@ -464,7 +464,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route120_EventScript_1F593C", + "script": "Route120_EventScript_Keigo", "flag": "0" }, { @@ -477,7 +477,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route120_EventScript_1F5953", + "script": "Route120_EventScript_Riley", "flag": "0" }, { @@ -568,7 +568,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route120_EventScript_1F5981", + "script": "Route120_EventScript_Callie", "flag": "0" }, { @@ -581,7 +581,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route120_EventScript_1F596A", + "script": "Route120_EventScript_Leonel", "flag": "0" }, { @@ -756,7 +756,7 @@ "y": 3, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route120_EventScript_1F57C5" + "script": "Route120_EventScript_RouteSignFortree" }, { "type": "sign", @@ -764,7 +764,7 @@ "y": 88, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route120_EventScript_1F57CE" + "script": "Route120_EventScript_RouteSign121" }, { "type": "secret_base", diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 9ef80e893..f4ef4da87 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -39,137 +39,137 @@ Route120_EventScript_RemoveKecleon:: @ 81F5460 return Route120_OnLoad: @ 81F5474 - call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_1F5490 - call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54A3 - call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54C8 + call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_CloseAncientTomb + call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_SetBridgeClearMetatiles + call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_SetBridgeKecleonMovement end -Route120_EventScript_1F5490:: @ 81F5490 +Route120_EventScript_CloseAncientTomb:: @ 81F5490 setmetatile 7, 54, METATILE_General_RockWall_RockBase, 1 setmetatile 7, 55, METATILE_General_RockWall_SandBase, 1 return -Route120_EventScript_1F54A3:: @ 81F54A3 - setmetatile 13, 15, METATILE_Fortree_WoodBridge_Kecleon0, 0 - setmetatile 12, 16, METATILE_Fortree_WoodBridge_Kecleon1, 0 +Route120_EventScript_SetBridgeClearMetatiles:: @ 81F54A3 + setmetatile 13, 15, METATILE_Fortree_WoodBridge1_Top, 0 + setmetatile 12, 16, METATILE_Fortree_WoodBridge1_Bottom, 0 setmetatile 12, 17, METATILE_General_ReflectiveWater, 0 setmetatile 13, 17, METATILE_General_ReflectiveWater, 0 return -Route120_EventScript_1F54C8:: @ 81F54C8 +Route120_EventScript_SetBridgeKecleonMovement:: @ 81F54C8 setobjectmovementtype 36, MOVEMENT_TYPE_FACE_RIGHT return Route120_OnTransition: @ 81F54CD call GabbyAndTy_EventScript_UpdateLocation - call Route120_EventScript_1F54D8 + call Route120_EventScript_SetWeather end -Route120_EventScript_1F54D8:: @ 81F54D8 +Route120_EventScript_SetWeather:: @ 81F54D8 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 14 - goto_if_le Route120_EventScript_1F5503 + goto_if_le Route120_EventScript_SetSunnyWeather compare VAR_TEMP_1, 60 - goto_if_le Route120_EventScript_1F5507 + goto_if_le Route120_EventScript_TrySetRainyWeather compare VAR_TEMP_1, 61 - goto_if_ge Route120_EventScript_1F54FF + goto_if_ge Route120_EventScript_SetCloudyWeather return -Route120_EventScript_1F54FF:: @ 81F54FF +Route120_EventScript_SetCloudyWeather:: @ 81F54FF setweather WEATHER_CLOUDS return -Route120_EventScript_1F5503:: @ 81F5503 +Route120_EventScript_SetSunnyWeather:: @ 81F5503 setweather WEATHER_SUNNY return -Route120_EventScript_1F5507:: @ 81F5507 +Route120_EventScript_TrySetRainyWeather:: @ 81F5507 compare VAR_TEMP_0, 7 - goto_if_le Route120_EventScript_1F5523 + goto_if_le Route120_EventScript_SetRainyWeather compare VAR_TEMP_0, 19 - goto_if_le Route120_EventScript_1F5503 - goto Route120_EventScript_1F5523 + goto_if_le Route120_EventScript_SetSunnyWeather + goto Route120_EventScript_SetRainyWeather end -Route120_EventScript_1F5523:: @ 81F5523 +Route120_EventScript_SetRainyWeather:: @ 81F5523 setweather WEATHER_RAIN_LIGHT return -Route120_EventScript_1F5527:: @ 81F5527 +Route120_EventScript_BerryBeauty:: @ 81F5527 lock faceplayer dotimebasedevents - goto_if_set FLAG_DAILY_ROUTE_120_RECEIVED_BERRY, Route120_EventScript_1F5625 - msgbox Route120_Text_2A70C7, MSGBOX_YESNO + goto_if_set FLAG_DAILY_ROUTE_120_RECEIVED_BERRY, Route120_EventScript_ReceivedBerry + msgbox Route120_Text_BerriesExpressionOfLoveIsntIt, MSGBOX_YESNO compare VAR_RESULT, YES - call_if_eq Route120_EventScript_1F562F + call_if_eq Route120_EventScript_BerryLove compare VAR_RESULT, NO - call_if_eq Route120_EventScript_1F5638 + call_if_eq Route120_EventScript_BerryNotLove specialvar VAR_RESULT, GetPlayerTrainerIdOnesDigit switch VAR_RESULT - case 0, Route120_EventScript_1F55CA - case 5, Route120_EventScript_1F55CA - case 1, Route120_EventScript_1F55D5 - case 6, Route120_EventScript_1F55D5 - case 2, Route120_EventScript_1F55E0 - case 7, Route120_EventScript_1F55E0 - case 3, Route120_EventScript_1F55EB - case 8, Route120_EventScript_1F55EB - case 4, Route120_EventScript_1F55F6 - case 9, Route120_EventScript_1F55F6 - end - -Route120_EventScript_1F55CA:: @ 81F55CA + case 0, Route120_EventScript_GiveFigyBerry + case 5, Route120_EventScript_GiveFigyBerry + case 1, Route120_EventScript_GiveWikiBerry + case 6, Route120_EventScript_GiveWikiBerry + case 2, Route120_EventScript_GiveMagoBerry + case 7, Route120_EventScript_GiveMagoBerry + case 3, Route120_EventScript_GiveAguavBerry + case 8, Route120_EventScript_GiveAguavBerry + case 4, Route120_EventScript_GiveIapapaBerry + case 9, Route120_EventScript_GiveIapapaBerry + end + +Route120_EventScript_GiveFigyBerry:: @ 81F55CA setvar VAR_0x8004, ITEM_FIGY_BERRY - goto Route120_EventScript_1F5601 + goto Route120_EventScript_GiveBerry end -Route120_EventScript_1F55D5:: @ 81F55D5 +Route120_EventScript_GiveWikiBerry:: @ 81F55D5 setvar VAR_0x8004, ITEM_WIKI_BERRY - goto Route120_EventScript_1F5601 + goto Route120_EventScript_GiveBerry end -Route120_EventScript_1F55E0:: @ 81F55E0 +Route120_EventScript_GiveMagoBerry:: @ 81F55E0 setvar VAR_0x8004, ITEM_MAGO_BERRY - goto Route120_EventScript_1F5601 + goto Route120_EventScript_GiveBerry end -Route120_EventScript_1F55EB:: @ 81F55EB +Route120_EventScript_GiveAguavBerry:: @ 81F55EB setvar VAR_0x8004, ITEM_AGUAV_BERRY - goto Route120_EventScript_1F5601 + goto Route120_EventScript_GiveBerry end -Route120_EventScript_1F55F6:: @ 81F55F6 +Route120_EventScript_GiveIapapaBerry:: @ 81F55F6 setvar VAR_0x8004, ITEM_IAPAPA_BERRY - goto Route120_EventScript_1F5601 + goto Route120_EventScript_GiveBerry end -Route120_EventScript_1F5601:: @ 81F5601 +Route120_EventScript_GiveBerry:: @ 81F5601 giveitem_std VAR_0x8004 compare VAR_RESULT, 0 goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_120_RECEIVED_BERRY - msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT + msgbox Route120_Text_BerryIsRareRaiseItWithCare, MSGBOX_DEFAULT release end -Route120_EventScript_1F5625:: @ 81F5625 - msgbox Route120_Text_2A7217, MSGBOX_DEFAULT +Route120_EventScript_ReceivedBerry:: @ 81F5625 + msgbox Route120_Text_IllGetMoreBerriesFromBerryMaster, MSGBOX_DEFAULT release end -Route120_EventScript_1F562F:: @ 81F562F - msgbox Route120_Text_2A7147, MSGBOX_DEFAULT +Route120_EventScript_BerryLove:: @ 81F562F + msgbox Route120_Text_YesYouUnderstand, MSGBOX_DEFAULT return -Route120_EventScript_1F5638:: @ 81F5638 - msgbox Route120_Text_2A7183, MSGBOX_DEFAULT +Route120_EventScript_BerryNotLove:: @ 81F5638 + msgbox Route120_Text_MakeYourOwnImpressions, MSGBOX_DEFAULT return Route120_EventScript_Steven:: @ 81F5641 lock faceplayer - goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE_120, Route120_EventScript_1F5672 + goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE_120, Route120_EventScript_StevenAskReadyForBattle msgbox Route120_Text_StevenGreeting, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Route120_EventScript_StevenNotReady @@ -177,12 +177,12 @@ Route120_EventScript_Steven:: @ 81F5641 end Route120_EventScript_StevenNotReady:: @ 81F5665 - msgbox Route120_Text_1F5AAC, MSGBOX_DEFAULT + msgbox Route120_Text_StevenIllWaitHere, MSGBOX_DEFAULT setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE_120 release end -Route120_EventScript_1F5672:: @ 81F5672 +Route120_EventScript_StevenAskReadyForBattle:: @ 81F5672 msgbox Route120_Text_StevenReadyForBattle, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Route120_EventScript_StevenNotReady @@ -249,8 +249,8 @@ Route120_EventScript_StevenGiveDeconScope:: @ 81F572C delay 15 removeobject 31 waitfieldeffect FLDEFF_NPCFLY_OUT - setmetatile 13, 15, METATILE_Fortree_WoodBridge_Kecleon0, 0 - setmetatile 12, 16, METATILE_Fortree_WoodBridge_Kecleon1, 0 + setmetatile 13, 15, METATILE_Fortree_WoodBridge1_Top, 0 + setmetatile 12, 16, METATILE_Fortree_WoodBridge1_Bottom, 0 setmetatile 12, 17, METATILE_General_ReflectiveWater, 0 setmetatile 13, 17, METATILE_General_ReflectiveWater, 0 special DrawWholeMapView @@ -276,111 +276,111 @@ Route120_EventScript_InvisibleBridgeKecleon:: @ 81F57BC msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_NPC end -Route120_EventScript_1F57C5:: @ 81F57C5 - msgbox Route120_Text_1F5DCB, MSGBOX_SIGN +Route120_EventScript_RouteSignFortree:: @ 81F57C5 + msgbox Route120_Text_RouteSignFortree, MSGBOX_SIGN end -Route120_EventScript_1F57CE:: @ 81F57CE - msgbox Route120_Text_1F5DE4, MSGBOX_SIGN +Route120_EventScript_RouteSign121:: @ 81F57CE + msgbox Route120_Text_RouteSign121, MSGBOX_SIGN end -Route120_EventScript_1F57D7:: @ 81F57D7 - trainerbattle_single TRAINER_COLIN, Route120_Text_29E62D, Route120_Text_29E665 - msgbox Route120_Text_29E67A, MSGBOX_AUTOCLOSE +Route120_EventScript_Colin:: @ 81F57D7 + trainerbattle_single TRAINER_COLIN, Route120_Text_ColinIntro, Route120_Text_ColinDefeat + msgbox Route120_Text_ColinPostBattle, MSGBOX_AUTOCLOSE end -Route120_EventScript_1F57EE:: @ 81F57EE - trainerbattle_single TRAINER_ROBERT_1, Route120_Text_29E6E3, Route120_Text_29E70A, Route120_EventScript_1F581A +Route120_EventScript_Robert:: @ 81F57EE + trainerbattle_single TRAINER_ROBERT_1, Route120_Text_RobertIntro, Route120_Text_RobertDefeat, Route120_EventScript_RegisterRobert specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route120_EventScript_1F5839 - msgbox Route120_Text_29E726, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route120_EventScript_RematchRobert + msgbox Route120_Text_RobertPostBattle, MSGBOX_DEFAULT release end -Route120_EventScript_1F581A:: @ 81F581A +Route120_EventScript_RegisterRobert:: @ 81F581A special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route120_Text_29E75D, MSGBOX_DEFAULT + msgbox Route120_Text_RobertRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ROBERT_1 release end -Route120_EventScript_1F5839:: @ 81F5839 - trainerbattle_rematch TRAINER_ROBERT_1, Route120_Text_29E7AA, Route120_Text_29E7E1 - msgbox Route120_Text_29E804, MSGBOX_AUTOCLOSE +Route120_EventScript_RematchRobert:: @ 81F5839 + trainerbattle_rematch TRAINER_ROBERT_1, Route120_Text_RobertRematchIntro, Route120_Text_RobertRematchDefeat + msgbox Route120_Text_RobertPostRematch, MSGBOX_AUTOCLOSE end -Route120_EventScript_1F5850:: @ 81F5850 - trainerbattle_single TRAINER_LORENZO, Route120_Text_29E843, Route120_Text_29E884 - msgbox Route120_Text_29E8C5, MSGBOX_AUTOCLOSE +Route120_EventScript_Lorenzo:: @ 81F5850 + trainerbattle_single TRAINER_LORENZO, Route120_Text_LorenzoIntro, Route120_Text_LorenzoDefeat + msgbox Route120_Text_LorenzoPostBattle, MSGBOX_AUTOCLOSE end -Route120_EventScript_1F5867:: @ 81F5867 - trainerbattle_single TRAINER_JENNA, Route120_Text_29E91C, Route120_Text_29E980 - msgbox Route120_Text_29E996, MSGBOX_AUTOCLOSE +Route120_EventScript_Jenna:: @ 81F5867 + trainerbattle_single TRAINER_JENNA, Route120_Text_JennaIntro, Route120_Text_JennaDefeat + msgbox Route120_Text_JennaPostBattle, MSGBOX_AUTOCLOSE end -Route120_EventScript_1F587E:: @ 81F587E - trainerbattle_single TRAINER_JEFFREY_1, Route120_Text_29E9D7, Route120_Text_29E9FF, Route120_EventScript_1F58AA +Route120_EventScript_Jeffrey:: @ 81F587E + trainerbattle_single TRAINER_JEFFREY_1, Route120_Text_JeffreyIntro, Route120_Text_JeffreyDefeat, Route120_EventScript_RegisterJeffrey specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route120_EventScript_1F58C9 - msgbox Route120_Text_29EA08, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route120_EventScript_RematchJeffrey + msgbox Route120_Text_JeffreyPostBattle, MSGBOX_DEFAULT release end -Route120_EventScript_1F58AA:: @ 81F58AA +Route120_EventScript_RegisterJeffrey:: @ 81F58AA special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route120_Text_29EA31, MSGBOX_DEFAULT + msgbox Route120_Text_JeffreyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_JEFFREY_1 release end -Route120_EventScript_1F58C9:: @ 81F58C9 - trainerbattle_rematch TRAINER_JEFFREY_1, Route120_Text_29EA61, Route120_Text_29EA8F - msgbox Route120_Text_29EAA9, MSGBOX_AUTOCLOSE +Route120_EventScript_RematchJeffrey:: @ 81F58C9 + trainerbattle_rematch TRAINER_JEFFREY_1, Route120_Text_JeffreyRematchIntro, Route120_Text_JeffreyRematchDefeat + msgbox Route120_Text_JeffreyPostRematch, MSGBOX_AUTOCLOSE end -Route120_EventScript_1F58E0:: @ 81F58E0 - trainerbattle_single TRAINER_JENNIFER, Route120_Text_29EAEF, Route120_Text_29EB53 - msgbox Route120_Text_29EB6E, MSGBOX_AUTOCLOSE +Route120_EventScript_Jennifer:: @ 81F58E0 + trainerbattle_single TRAINER_JENNIFER, Route120_Text_JenniferIntro, Route120_Text_JenniferDefeat + msgbox Route120_Text_JenniferPostBattle, MSGBOX_AUTOCLOSE end -Route120_EventScript_1F58F7:: @ 81F58F7 - trainerbattle_single TRAINER_CHIP, Route120_Text_29EBAF, Route120_Text_29EC25 - msgbox Route120_Text_29EC41, MSGBOX_AUTOCLOSE +Route120_EventScript_Chip:: @ 81F58F7 + trainerbattle_single TRAINER_CHIP, Route120_Text_ChipIntro, Route120_Text_ChipDefeat + msgbox Route120_Text_ChipPostBattle, MSGBOX_AUTOCLOSE end -Route120_EventScript_1F590E:: @ 81F590E - trainerbattle_single TRAINER_CLARISSA, Route120_Text_29ECA6, Route120_Text_29ECEF - msgbox Route120_Text_29ED19, MSGBOX_AUTOCLOSE +Route120_EventScript_Clarissa:: @ 81F590E + trainerbattle_single TRAINER_CLARISSA, Route120_Text_ClarissaIntro, Route120_Text_ClarissaDefeat + msgbox Route120_Text_ClarissaPostBattle, MSGBOX_AUTOCLOSE end -Route120_EventScript_1F5925:: @ 81F5925 - trainerbattle_single TRAINER_ANGELICA, Route120_Text_29ED71, Route120_Text_29EDD3 - msgbox Route120_Text_29EDF7, MSGBOX_AUTOCLOSE +Route120_EventScript_Angelica:: @ 81F5925 + trainerbattle_single TRAINER_ANGELICA, Route120_Text_AngelicaIntro, Route120_Text_AngelicaDefeat + msgbox Route120_Text_AngelicaPostBattle, MSGBOX_AUTOCLOSE end -Route120_EventScript_1F593C:: @ 81F593C - trainerbattle_single TRAINER_KEIGO, Route120_Text_29EE50, Route120_Text_29EE97 - msgbox Route120_Text_29EED4, MSGBOX_AUTOCLOSE +Route120_EventScript_Keigo:: @ 81F593C + trainerbattle_single TRAINER_KEIGO, Route120_Text_KeigoIntro, Route120_Text_KeigoDefeat + msgbox Route120_Text_KeigoPostBattle, MSGBOX_AUTOCLOSE end -Route120_EventScript_1F5953:: @ 81F5953 - trainerbattle_single TRAINER_RILEY, Route120_Text_29EF08, Route120_Text_29EF63 - msgbox Route120_Text_29EF89, MSGBOX_AUTOCLOSE +Route120_EventScript_Riley:: @ 81F5953 + trainerbattle_single TRAINER_RILEY, Route120_Text_RileyIntro, Route120_Text_RileyDefeat + msgbox Route120_Text_RileyPostBattle, MSGBOX_AUTOCLOSE end -Route120_EventScript_1F596A:: @ 81F596A - trainerbattle_single TRAINER_LEONEL, Route120_Text_29F04F, Route120_Text_29F080 - msgbox Route120_Text_29F0A1, MSGBOX_AUTOCLOSE +Route120_EventScript_Leonel:: @ 81F596A + trainerbattle_single TRAINER_LEONEL, Route120_Text_LeonelIntro, Route120_Text_LeonelDefeat + msgbox Route120_Text_LeonelPostBattle, MSGBOX_AUTOCLOSE end -Route120_EventScript_1F5981:: @ 81F5981 - trainerbattle_single TRAINER_CALLIE, Route120_Text_29EFB1, Route120_Text_29EFE1 - msgbox Route120_Text_29F002, MSGBOX_AUTOCLOSE +Route120_EventScript_Callie:: @ 81F5981 + trainerbattle_single TRAINER_CALLIE, Route120_Text_CallieIntro, Route120_Text_CallieDefeat + msgbox Route120_Text_CalliePostBattle, MSGBOX_AUTOCLOSE end Route120_Text_StevenGreeting: @ 81F5998 @@ -396,7 +396,7 @@ Route120_Text_StevenGreeting: @ 81F5998 .string "{PLAYER}{KUN}, are your POKéMON ready for\n" .string "battle?$" -Route120_Text_1F5AAC: @ 81F5AAC +Route120_Text_StevenIllWaitHere: @ 81F5AAC .string "STEVEN: No?\p" .string "I'll wait here, so you can get ready.$" @@ -444,10 +444,10 @@ Kecleon_Text_UseDevonScopeMonAttacked: @ 81F5D63 .string "visible!\p" .string "The startled POKéMON attacked!$" -Route120_Text_1F5DCB: @ 81F5DCB +Route120_Text_RouteSignFortree: @ 81F5DCB .string "ROUTE 120\n" .string "{LEFT_ARROW} FORTREE CITY$" -Route120_Text_1F5DE4: @ 81F5DE4 +Route120_Text_RouteSign121: @ 81F5DE4 .string "{RIGHT_ARROW} ROUTE 121\n" .string "{LEFT_ARROW} ROUTE 120$" diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index 9382ab375..9d91c47d1 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -40,7 +40,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route121_EventScript_1F5DFD", + "script": "Route121_EventScript_Woman", "flag": "0" }, { @@ -157,7 +157,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route121_EventScript_1F5F04", + "script": "Route121_EventScript_Kate", "flag": "0" }, { @@ -170,7 +170,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route121_EventScript_1F5F1F", + "script": "Route121_EventScript_Joy", "flag": "0" }, { @@ -248,7 +248,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route121_EventScript_1F5E74", + "script": "Route121_EventScript_Vanessa", "flag": "0" }, { @@ -261,7 +261,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route121_EventScript_1F5E8B", + "script": "Route121_EventScript_Walter", "flag": "0" }, { @@ -274,7 +274,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route121_EventScript_1F5EED", + "script": "Route121_EventScript_Tammy", "flag": "0" }, { @@ -287,7 +287,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route121_EventScript_1F5F3A", + "script": "Route121_EventScript_Jessica", "flag": "0" }, { @@ -326,7 +326,7 @@ "movement_range_y": 4, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route121_EventScript_1F5F9C", + "script": "Route121_EventScript_Cale", "flag": "0" }, { @@ -339,7 +339,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route121_EventScript_1F5FB3", + "script": "Route121_EventScript_Myles", "flag": "0" }, { @@ -352,7 +352,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route121_EventScript_1F5FCA", + "script": "Route121_EventScript_Pat", "flag": "0" }, { @@ -365,7 +365,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route121_EventScript_1F5FE1", + "script": "Route121_EventScript_Marcel", "flag": "0" }, { @@ -378,7 +378,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route121_EventScript_1F5FF8", + "script": "Route121_EventScript_Cristin", "flag": "0" }, { @@ -425,7 +425,7 @@ "elevation": 3, "var": "VAR_ROUTE121_STATE", "var_value": "0", - "script": "Route121_EventScript_1F5E18" + "script": "Route121_EventScript_AquaGruntsMoveOut" }, { "type": "trigger", @@ -434,7 +434,7 @@ "elevation": 3, "var": "VAR_ROUTE121_STATE", "var_value": "0", - "script": "Route121_EventScript_1F5E18" + "script": "Route121_EventScript_AquaGruntsMoveOut" }, { "type": "trigger", @@ -443,7 +443,7 @@ "elevation": 3, "var": "VAR_ROUTE121_STATE", "var_value": "0", - "script": "Route121_EventScript_1F5E18" + "script": "Route121_EventScript_AquaGruntsMoveOut" }, { "type": "trigger", @@ -452,7 +452,7 @@ "elevation": 3, "var": "VAR_ROUTE121_STATE", "var_value": "0", - "script": "Route121_EventScript_1F5E18" + "script": "Route121_EventScript_AquaGruntsMoveOut" } ], "bg_events": [ @@ -462,7 +462,7 @@ "y": 14, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route121_EventScript_1F5E06" + "script": "Route121_EventScript_MtPyrePierSign" }, { "type": "secret_base", @@ -498,7 +498,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route121_EventScript_1F5E0F" + "script": "Route121_EventScript_SafariZoneSign" }, { "type": "hidden_item", diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 06862972c..81330b6e8 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -1,28 +1,28 @@ Route121_MapScripts:: @ 81F5DFC .byte 0 -Route121_EventScript_1F5DFD:: @ 81F5DFD - msgbox Route121_Text_1F607F, MSGBOX_NPC +Route121_EventScript_Woman:: @ 81F5DFD + msgbox Route121_Text_AheadLoomsMtPyre, MSGBOX_NPC end -Route121_EventScript_1F5E06:: @ 81F5E06 - msgbox Route121_Text_1F60D3, MSGBOX_SIGN +Route121_EventScript_MtPyrePierSign:: @ 81F5E06 + msgbox Route121_Text_MtPyrePierSign, MSGBOX_SIGN end -Route121_EventScript_1F5E0F:: @ 81F5E0F - msgbox Route121_Text_1F611E, MSGBOX_SIGN +Route121_EventScript_SafariZoneSign:: @ 81F5E0F + msgbox Route121_Text_SafariZoneSign, MSGBOX_SIGN end -Route121_EventScript_1F5E18:: @ 81F5E18 +Route121_EventScript_AquaGruntsMoveOut:: @ 81F5E18 lockall playbgm MUS_AQA_0, 0 applymovement 13, Common_Movement_WalkInPlaceRight waitmovement 0 - msgbox Route121_Text_1F605A, MSGBOX_DEFAULT + msgbox Route121_Text_OkayMoveOutToMtPyre, MSGBOX_DEFAULT closemessage - applymovement 12, Route121_Movement_1F5E59 - applymovement 13, Route121_Movement_1F5E62 - applymovement 14, Route121_Movement_1F5E6B + applymovement 12, Route121_Movement_Grunt1Exit + applymovement 13, Route121_Movement_Grunt2Exit + applymovement 14, Route121_Movement_Grunt3Exit waitmovement 0 fadedefaultbgm removeobject 12 @@ -32,7 +32,7 @@ Route121_EventScript_1F5E18:: @ 81F5E18 releaseall end -Route121_Movement_1F5E59: @ 81F5E59 +Route121_Movement_Grunt1Exit: @ 81F5E59 walk_down walk_down walk_down @@ -43,7 +43,7 @@ Route121_Movement_1F5E59: @ 81F5E59 walk_down step_end -Route121_Movement_1F5E62: @ 81F5E62 +Route121_Movement_Grunt2Exit: @ 81F5E62 walk_down walk_down walk_down @@ -54,7 +54,7 @@ Route121_Movement_1F5E62: @ 81F5E62 walk_down step_end -Route121_Movement_1F5E6B: @ 81F5E6B +Route121_Movement_Grunt3Exit: @ 81F5E6B walk_down walk_down walk_down @@ -65,127 +65,127 @@ Route121_Movement_1F5E6B: @ 81F5E6B walk_down step_end -Route121_EventScript_1F5E74:: @ 81F5E74 - trainerbattle_single TRAINER_VANESSA, Route121_Text_29F0EC, Route121_Text_29F11F - msgbox Route121_Text_29F138, MSGBOX_AUTOCLOSE +Route121_EventScript_Vanessa:: @ 81F5E74 + trainerbattle_single TRAINER_VANESSA, Route121_Text_VanessaIntro, Route121_Text_VanessaDefeat + msgbox Route121_Text_VanessaPostBattle, MSGBOX_AUTOCLOSE end -Route121_EventScript_1F5E8B:: @ 81F5E8B - trainerbattle_single TRAINER_WALTER_1, Route121_Text_29F199, Route121_Text_29F20D, Route121_EventScript_1F5EB7 +Route121_EventScript_Walter:: @ 81F5E8B + trainerbattle_single TRAINER_WALTER_1, Route121_Text_WalterIntro, Route121_Text_WalterDefeat, Route121_EventScript_RegisterWalter specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route121_EventScript_1F5ED6 - msgbox Route121_Text_29F21E, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route121_EventScript_RematchWalter + msgbox Route121_Text_WalterPostBattle, MSGBOX_DEFAULT release end -Route121_EventScript_1F5EB7:: @ 81F5EB7 +Route121_EventScript_RegisterWalter:: @ 81F5EB7 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route121_Text_29F25B, MSGBOX_DEFAULT + msgbox Route121_Text_WalterRegister, MSGBOX_DEFAULT register_matchcall TRAINER_WALTER_1 release end -Route121_EventScript_1F5ED6:: @ 81F5ED6 - trainerbattle_rematch TRAINER_WALTER_1, Route121_Text_29F2A6, Route121_Text_29F31A - msgbox Route121_Text_29F32B, MSGBOX_AUTOCLOSE +Route121_EventScript_RematchWalter:: @ 81F5ED6 + trainerbattle_rematch TRAINER_WALTER_1, Route121_Text_WalterRematchIntro, Route121_Text_WalterRematchDefeat + msgbox Route121_Text_WalterPostRematch, MSGBOX_AUTOCLOSE end -Route121_EventScript_1F5EED:: @ 81F5EED - trainerbattle_single TRAINER_TAMMY, Route121_Text_29F381, Route121_Text_29F3B9 - msgbox Route121_Text_29F3C6, MSGBOX_AUTOCLOSE +Route121_EventScript_Tammy:: @ 81F5EED + trainerbattle_single TRAINER_TAMMY, Route121_Text_TammyIntro, Route121_Text_TammyDefeat + msgbox Route121_Text_TammyPostBattle, MSGBOX_AUTOCLOSE end -Route121_EventScript_1F5F04:: @ 81F5F04 - trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_29F3FB, Route121_Text_29F43F, Route121_Text_29F4C9 - msgbox Route121_Text_29F476, MSGBOX_AUTOCLOSE +Route121_EventScript_Kate:: @ 81F5F04 + trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_KateIntro, Route121_Text_KateDefeat, Route121_Text_KateNotEnoughMons + msgbox Route121_Text_KatePostBattle, MSGBOX_AUTOCLOSE end -Route121_EventScript_1F5F1F:: @ 81F5F1F - trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_29F521, Route121_Text_29F564, Route121_Text_29F5CE - msgbox Route121_Text_29F582, MSGBOX_AUTOCLOSE +Route121_EventScript_Joy:: @ 81F5F1F + trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_JoyIntro, Route121_Text_JoyDefeat, Route121_Text_JoyNotEnoughMons + msgbox Route121_Text_JoyPostBattle, MSGBOX_AUTOCLOSE end -Route121_EventScript_1F5F3A:: @ 81F5F3A - trainerbattle_single TRAINER_JESSICA_1, Route121_Text_29F612, Route121_Text_29F641, Route121_EventScript_1F5F66 +Route121_EventScript_Jessica:: @ 81F5F3A + trainerbattle_single TRAINER_JESSICA_1, Route121_Text_JessicaIntro, Route121_Text_JessicaDefeat, Route121_EventScript_RegisterJessica specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route121_EventScript_1F5F85 - msgbox Route121_Text_29F66F, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route121_EventScript_RematchJessica + msgbox Route121_Text_JessicaPostBattle, MSGBOX_DEFAULT release end -Route121_EventScript_1F5F66:: @ 81F5F66 +Route121_EventScript_RegisterJessica:: @ 81F5F66 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route121_Text_29F69F, MSGBOX_DEFAULT + msgbox Route121_Text_JessicaRegister, MSGBOX_DEFAULT register_matchcall TRAINER_JESSICA_1 release end -Route121_EventScript_1F5F85:: @ 81F5F85 - trainerbattle_rematch TRAINER_JESSICA_1, Route121_Text_29F6E4, Route121_Text_29F710 - msgbox Route121_Text_29F740, MSGBOX_AUTOCLOSE +Route121_EventScript_RematchJessica:: @ 81F5F85 + trainerbattle_rematch TRAINER_JESSICA_1, Route121_Text_JessicaRematchIntro, Route121_Text_JessicaRematchDefeat + msgbox Route121_Text_JessicaPostRematch, MSGBOX_AUTOCLOSE end -Route121_EventScript_1F5F9C:: @ 81F5F9C - trainerbattle_single TRAINER_CALE, Route121_Text_29F91A, Route121_Text_29F97B - msgbox Route121_Text_29F9AE, MSGBOX_AUTOCLOSE +Route121_EventScript_Cale:: @ 81F5F9C + trainerbattle_single TRAINER_CALE, Route121_Text_CaleIntro, Route121_Text_CaleDefeat + msgbox Route121_Text_CalePostBattle, MSGBOX_AUTOCLOSE end -Route121_EventScript_1F5FB3:: @ 81F5FB3 - trainerbattle_single TRAINER_MYLES, Route121_Text_29FA1E, Route121_Text_29FA64 - msgbox Route121_Text_29FA73, MSGBOX_AUTOCLOSE +Route121_EventScript_Myles:: @ 81F5FB3 + trainerbattle_single TRAINER_MYLES, Route121_Text_MylesIntro, Route121_Text_MylesDefeat + msgbox Route121_Text_MylesPostBattle, MSGBOX_AUTOCLOSE end -Route121_EventScript_1F5FCA:: @ 81F5FCA - trainerbattle_single TRAINER_PAT, Route121_Text_29FAA7, Route121_Text_29FAD8 - msgbox Route121_Text_29FAEA, MSGBOX_AUTOCLOSE +Route121_EventScript_Pat:: @ 81F5FCA + trainerbattle_single TRAINER_PAT, Route121_Text_PatIntro, Route121_Text_PatDefeat + msgbox Route121_Text_PatPostBattle, MSGBOX_AUTOCLOSE end -Route121_EventScript_1F5FE1:: @ 81F5FE1 - trainerbattle_single TRAINER_MARCEL, Route121_Text_29FB35, Route121_Text_29FB8C - msgbox Route121_Text_29FBA8, MSGBOX_AUTOCLOSE +Route121_EventScript_Marcel:: @ 81F5FE1 + trainerbattle_single TRAINER_MARCEL, Route121_Text_MarcelIntro, Route121_Text_MarcelDefeat + msgbox Route121_Text_MarcelPostBattle, MSGBOX_AUTOCLOSE end -Route121_EventScript_1F5FF8:: @ 81F5FF8 - trainerbattle_single TRAINER_CRISTIN_1, Route121_Text_29F770, Route121_Text_29F7C1, Route121_EventScript_1F6024 +Route121_EventScript_Cristin:: @ 81F5FF8 + trainerbattle_single TRAINER_CRISTIN_1, Route121_Text_CristinIntro, Route121_Text_CristinDefeat, Route121_EventScript_RegisterCristin specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route121_EventScript_1F6043 - msgbox Route121_Text_29F7D4, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route121_EventScript_RematchCristin + msgbox Route121_Text_CristinPostBattle, MSGBOX_DEFAULT release end -Route121_EventScript_1F6024:: @ 81F6024 +Route121_EventScript_RegisterCristin:: @ 81F6024 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route121_Text_29F80D, MSGBOX_DEFAULT + msgbox Route121_Text_CristinRegister, MSGBOX_DEFAULT register_matchcall TRAINER_CRISTIN_1 release end -Route121_EventScript_1F6043:: @ 81F6043 - trainerbattle_rematch TRAINER_CRISTIN_1, Route121_Text_29F855, Route121_Text_29F8A8 - msgbox Route121_Text_29F8D0, MSGBOX_AUTOCLOSE +Route121_EventScript_RematchCristin:: @ 81F6043 + trainerbattle_rematch TRAINER_CRISTIN_1, Route121_Text_CristinRematchIntro, Route121_Text_CristinRematchDefeat + msgbox Route121_Text_CristinPostRematch, MSGBOX_AUTOCLOSE end -Route121_Text_1F605A: @ 81F605A +Route121_Text_OkayMoveOutToMtPyre: @ 81F605A .string "Okay!\n" .string "We're to move out to MT. PYRE!$" -Route121_Text_1F607F: @ 81F607F +Route121_Text_AheadLoomsMtPyre: @ 81F607F .string "Ahead looms MT. PYRE…\p" .string "It is a natural monument to the spirits \n" .string "of departed POKéMON…$" -Route121_Text_1F60D3: @ 81F60D3 +Route121_Text_MtPyrePierSign: @ 81F60D3 .string "MT. PYRE PIER\p" .string "…The sign is old and worn out.\n" .string "The words are barely legible…$" -Route121_Text_1F611E: @ 81F611E +Route121_Text_SafariZoneSign: @ 81F611E .string "“Filled with rare POKéMON!”\n" .string "SAFARI ZONE$" diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json index c13d17a0c..fc4af6b3c 100644 --- a/data/maps/Route123/map.json +++ b/data/maps/Route123/map.json @@ -126,7 +126,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route123_EventScript_1F61C5", + "script": "Route123_EventScript_Wendy", "flag": "0" }, { @@ -139,7 +139,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route123_EventScript_1F61DC", + "script": "Route123_EventScript_Braxton", "flag": "0" }, { @@ -308,7 +308,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route123_EventScript_1F6151", + "script": "Route123_EventScript_GigaDrainGirl", "flag": "0" }, { @@ -360,7 +360,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route123_EventScript_1F61F3", + "script": "Route123_EventScript_Violet", "flag": "0" }, { @@ -373,7 +373,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route123_EventScript_1F62E9", + "script": "Route123_EventScript_Yuki", "flag": "0" }, { @@ -386,7 +386,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route123_EventScript_1F62CE", + "script": "Route123_EventScript_Miu", "flag": "0" }, { @@ -399,7 +399,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route123_EventScript_1F620A", + "script": "Route123_EventScript_Cameron", "flag": "0" }, { @@ -412,7 +412,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route123_EventScript_1F626C", + "script": "Route123_EventScript_Jacki", "flag": "0" }, { @@ -425,7 +425,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route123_EventScript_1F6304", + "script": "Route123_EventScript_Kindra", "flag": "0" }, { @@ -464,7 +464,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route123_EventScript_1F6377", + "script": "Route123_EventScript_Jonas", "flag": "0" }, { @@ -477,7 +477,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route123_EventScript_1F6360", + "script": "Route123_EventScript_Kayley", "flag": "0" }, { @@ -490,7 +490,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route123_EventScript_1F6349", + "script": "Route123_EventScript_Ed", "flag": "0" }, { @@ -503,7 +503,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route123_EventScript_1F63BC", + "script": "Route123_EventScript_Fernando", "flag": "0" }, { @@ -516,7 +516,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route123_EventScript_1F6332", + "script": "Route123_EventScript_Alberto", "flag": "0" }, { @@ -529,7 +529,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route123_EventScript_1F631B", + "script": "Route123_EventScript_Frederick", "flag": "0" }, { @@ -555,7 +555,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route123_EventScript_1F638E", + "script": "Route123_EventScript_Jazmyn", "flag": "0" }, { @@ -568,7 +568,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route123_EventScript_1F63A5", + "script": "Route123_EventScript_Davis", "flag": "0" }, { @@ -757,7 +757,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route123_EventScript_1F61B3" + "script": "Route123_EventScript_RouteSignMtPyre" }, { "type": "secret_base", @@ -779,7 +779,7 @@ "y": 12, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route123_EventScript_1F61AA" + "script": "Route123_EventScript_RouteSign" }, { "type": "hidden_item", @@ -795,7 +795,7 @@ "y": 7, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route123_EventScript_1F61BC" + "script": "Route123_EventScript_BerryMastersHouseSign" }, { "type": "secret_base", diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index b5b3e6179..b74b16865 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -6,198 +6,198 @@ Route123_OnTransition: @ 81F614D special SetRoute123Weather end -Route123_EventScript_1F6151:: @ 81F6151 +Route123_EventScript_GigaDrainGirl:: @ 81F6151 lock faceplayer - goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_1F61A0 - msgbox Route123_Text_1F641E, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_ReceivedGigaDrain + msgbox Route123_Text_LoveGrassMonsHaveAny, MSGBOX_DEFAULT special IsGrassTypeInParty - compare VAR_RESULT, 0 - goto_if_eq Route123_EventScript_1F619E - msgbox Route123_Text_1F645D, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route123_EventScript_NoGrassMons + msgbox Route123_Text_YouLikeGrassMonsTooHaveThis, MSGBOX_DEFAULT giveitem_std ITEM_TM19 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM19 - msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT + msgbox Route123_Text_CheckTreesWithMyGrassMon, MSGBOX_DEFAULT release end -Route123_EventScript_1F619E:: @ 81F619E +Route123_EventScript_NoGrassMons:: @ 81F619E release end -Route123_EventScript_1F61A0:: @ 81F61A0 - msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT +Route123_EventScript_ReceivedGigaDrain:: @ 81F61A0 + msgbox Route123_Text_CheckTreesWithMyGrassMon, MSGBOX_DEFAULT release end -Route123_EventScript_1F61AA:: @ 81F61AA - msgbox Route123_Text_1F6511, MSGBOX_SIGN +Route123_EventScript_RouteSign:: @ 81F61AA + msgbox Route123_Text_RouteSign, MSGBOX_SIGN end -Route123_EventScript_1F61B3:: @ 81F61B3 - msgbox Route123_Text_1F6529, MSGBOX_SIGN +Route123_EventScript_RouteSignMtPyre:: @ 81F61B3 + msgbox Route123_Text_RouteSignMtPyre, MSGBOX_SIGN end -Route123_EventScript_1F61BC:: @ 81F61BC - msgbox Route123_Text_1F6557, MSGBOX_SIGN +Route123_EventScript_BerryMastersHouseSign:: @ 81F61BC + msgbox Route123_Text_BerryMastersHouse, MSGBOX_SIGN end -Route123_EventScript_1F61C5:: @ 81F61C5 - trainerbattle_single TRAINER_WENDY, Route123_Text_29FBEB, Route123_Text_29FC23 - msgbox Route123_Text_29FC42, MSGBOX_AUTOCLOSE +Route123_EventScript_Wendy:: @ 81F61C5 + trainerbattle_single TRAINER_WENDY, Route123_Text_WendyIntro, Route123_Text_WendyDefeat + msgbox Route123_Text_WendyPostBattle, MSGBOX_AUTOCLOSE end -Route123_EventScript_1F61DC:: @ 81F61DC - trainerbattle_single TRAINER_BRAXTON, Route123_Text_29FC6F, Route123_Text_29FCD6 - msgbox Route123_Text_29FCF4, MSGBOX_AUTOCLOSE +Route123_EventScript_Braxton:: @ 81F61DC + trainerbattle_single TRAINER_BRAXTON, Route123_Text_BraxtonIntro, Route123_Text_BraxtonDefeat + msgbox Route123_Text_BraxtonPostBattle, MSGBOX_AUTOCLOSE end -Route123_EventScript_1F61F3:: @ 81F61F3 - trainerbattle_single TRAINER_VIOLET, Route123_Text_29FD1D, Route123_Text_29FD53 - msgbox Route123_Text_29FD7B, MSGBOX_AUTOCLOSE +Route123_EventScript_Violet:: @ 81F61F3 + trainerbattle_single TRAINER_VIOLET, Route123_Text_VioletIntro, Route123_Text_VioletDefeat + msgbox Route123_Text_VioletPostBattle, MSGBOX_AUTOCLOSE end -Route123_EventScript_1F620A:: @ 81F620A - trainerbattle_single TRAINER_CAMERON_1, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 +Route123_EventScript_Cameron:: @ 81F620A + trainerbattle_single TRAINER_CAMERON_1, Route123_Text_CameronIntro, Route123_Text_CameronDefeat, Route123_EventScript_RegisterCameron specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route123_EventScript_1F6255 - msgbox Route123_Text_29FE2A, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route123_EventScript_RematchCameron + msgbox Route123_Text_CameronPostBattle, MSGBOX_DEFAULT release end -Route123_EventScript_1F6236:: @ 81F6236 +Route123_EventScript_RegisterCameron:: @ 81F6236 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route123_Text_29FE70, MSGBOX_DEFAULT + msgbox Route123_Text_CameronRegister, MSGBOX_DEFAULT register_matchcall TRAINER_CAMERON_1 release end -Route123_EventScript_1F6255:: @ 81F6255 - trainerbattle_rematch TRAINER_CAMERON_1, Route123_Text_29FED4, Route123_Text_29FF1B - msgbox Route123_Text_29FF27, MSGBOX_AUTOCLOSE +Route123_EventScript_RematchCameron:: @ 81F6255 + trainerbattle_rematch TRAINER_CAMERON_1, Route123_Text_CameronRematchIntro, Route123_Text_CameronRematchDefeat + msgbox Route123_Text_CameronPostRematch, MSGBOX_AUTOCLOSE end -Route123_EventScript_1F626C:: @ 81F626C - trainerbattle_single TRAINER_JACKI_1, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 +Route123_EventScript_Jacki:: @ 81F626C + trainerbattle_single TRAINER_JACKI_1, Route123_Text_JackiIntro, Route123_Text_JackiDefeat, Route123_EventScript_RegisterJacki specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route123_EventScript_1F62B7 - msgbox Route123_Text_29FFE5, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route123_EventScript_RematchJacki + msgbox Route123_Text_JackiPostBattle, MSGBOX_DEFAULT release end -Route123_EventScript_1F6298:: @ 81F6298 +Route123_EventScript_RegisterJacki:: @ 81F6298 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route123_Text_2A0027, MSGBOX_DEFAULT + msgbox Route123_Text_JackiRegister, MSGBOX_DEFAULT register_matchcall TRAINER_JACKI_1 release end -Route123_EventScript_1F62B7:: @ 81F62B7 - trainerbattle_rematch TRAINER_JACKI_1, Route123_Text_2A005E, Route123_Text_2A008D - msgbox Route123_Text_2A0099, MSGBOX_AUTOCLOSE +Route123_EventScript_RematchJacki:: @ 81F62B7 + trainerbattle_rematch TRAINER_JACKI_1, Route123_Text_JackiRematchIntro, Route123_Text_JackiRematchDefeat + msgbox Route123_Text_JackiPostRematch, MSGBOX_AUTOCLOSE end -Route123_EventScript_1F62CE:: @ 81F62CE - trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_2A00D6, Route123_Text_2A0119, Route123_Text_2A016D - msgbox Route123_Text_2A012E, MSGBOX_AUTOCLOSE +Route123_EventScript_Miu:: @ 81F62CE + trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_MiuIntro, Route123_Text_MiuDefeat, Route123_Text_MiuNotEnoughMons + msgbox Route123_Text_MiuPostBattle, MSGBOX_AUTOCLOSE end -Route123_EventScript_1F62E9:: @ 81F62E9 - trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_2A01A7, Route123_Text_2A01D8, Route123_Text_2A0224 - msgbox Route123_Text_2A01EE, MSGBOX_AUTOCLOSE +Route123_EventScript_Yuki:: @ 81F62E9 + trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_YukiIntro, Route123_Text_YukiDefeat, Route123_Text_YukiNotEnoughMons + msgbox Route123_Text_YukiPostBattle, MSGBOX_AUTOCLOSE end -Route123_EventScript_1F6304:: @ 81F6304 - trainerbattle_single TRAINER_KINDRA, Route123_Text_2A025F, Route123_Text_2A02A6 - msgbox Route123_Text_2A02C1, MSGBOX_AUTOCLOSE +Route123_EventScript_Kindra:: @ 81F6304 + trainerbattle_single TRAINER_KINDRA, Route123_Text_KindraIntro, Route123_Text_KindraDefeat + msgbox Route123_Text_KindraPostBattle, MSGBOX_AUTOCLOSE end -Route123_EventScript_1F631B:: @ 81F631B - trainerbattle_single TRAINER_FREDRICK, Route123_Text_2A060A, Route123_Text_2A0631 - msgbox Route123_Text_2A0672, MSGBOX_AUTOCLOSE +Route123_EventScript_Frederick:: @ 81F631B + trainerbattle_single TRAINER_FREDRICK, Route123_Text_FrederickIntro, Route123_Text_FrederickDefeat + msgbox Route123_Text_FrederickPostBattle, MSGBOX_AUTOCLOSE end -Route123_EventScript_1F6332:: @ 81F6332 - trainerbattle_single TRAINER_ALBERTO, Route123_Text_2A06AF, Route123_Text_2A0704 - msgbox Route123_Text_2A072B, MSGBOX_AUTOCLOSE +Route123_EventScript_Alberto:: @ 81F6332 + trainerbattle_single TRAINER_ALBERTO, Route123_Text_AlbertoIntro, Route123_Text_AlbertoDefeat + msgbox Route123_Text_AlbertoPostBattle, MSGBOX_AUTOCLOSE end -Route123_EventScript_1F6349:: @ 81F6349 - trainerbattle_single TRAINER_ED, Route123_Text_2A079B, Route123_Text_2A07F0 - msgbox Route123_Text_2A080D, MSGBOX_AUTOCLOSE +Route123_EventScript_Ed:: @ 81F6349 + trainerbattle_single TRAINER_ED, Route123_Text_EdIntro, Route123_Text_EdDefeat + msgbox Route123_Text_EdPostBattle, MSGBOX_AUTOCLOSE end -Route123_EventScript_1F6360:: @ 81F6360 - trainerbattle_single TRAINER_KAYLEY, Route123_Text_2A0902, Route123_Text_2A0943 - msgbox Route123_Text_2A096E, MSGBOX_AUTOCLOSE +Route123_EventScript_Kayley:: @ 81F6360 + trainerbattle_single TRAINER_KAYLEY, Route123_Text_KayleyIntro, Route123_Text_KayleyDefeat + msgbox Route123_Text_KayleyPostBattle, MSGBOX_AUTOCLOSE end -Route123_EventScript_1F6377:: @ 81F6377 - trainerbattle_single TRAINER_JONAS, Route123_Text_2A0854, Route123_Text_2A088A - msgbox Route123_Text_2A08CA, MSGBOX_AUTOCLOSE +Route123_EventScript_Jonas:: @ 81F6377 + trainerbattle_single TRAINER_JONAS, Route123_Text_JonasIntro, Route123_Text_JonasDefeat + msgbox Route123_Text_JonasPostBattle, MSGBOX_AUTOCLOSE end -Route123_EventScript_1F638E:: @ 81F638E - trainerbattle_single TRAINER_JAZMYN, Route123_Text_2A054E, Route123_Text_2A0592 - msgbox Route123_Text_2A05AC, MSGBOX_AUTOCLOSE +Route123_EventScript_Jazmyn:: @ 81F638E + trainerbattle_single TRAINER_JAZMYN, Route123_Text_JazmynIntro, Route123_Text_JazmynDefeat + msgbox Route123_Text_JazmynPostBattle, MSGBOX_AUTOCLOSE end -Route123_EventScript_1F63A5:: @ 81F63A5 - trainerbattle_single TRAINER_DAVIS, Route123_Text_2A04C0, Route123_Text_2A04FE - msgbox Route123_Text_2A0512, MSGBOX_AUTOCLOSE +Route123_EventScript_Davis:: @ 81F63A5 + trainerbattle_single TRAINER_DAVIS, Route123_Text_DavisIntro, Route123_Text_DavisDefeat + msgbox Route123_Text_DavisPostBattle, MSGBOX_AUTOCLOSE end -Route123_EventScript_1F63BC:: @ 81F63BC - trainerbattle_single TRAINER_FERNANDO_1, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 +Route123_EventScript_Fernando:: @ 81F63BC + trainerbattle_single TRAINER_FERNANDO_1, Route123_Text_FernandoIntro, Route123_Text_FernandoDefeat, Route123_EventScript_RegisterFernando specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route123_EventScript_1F6407 - msgbox Route123_Text_2A0389, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route123_EventScript_RematchFernando + msgbox Route123_Text_FernandoPostBattle, MSGBOX_DEFAULT release end -Route123_EventScript_1F63E8:: @ 81F63E8 +Route123_EventScript_RegisterFernando:: @ 81F63E8 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route123_Text_2A03C1, MSGBOX_DEFAULT + msgbox Route123_Text_FernandoRegister, MSGBOX_DEFAULT register_matchcall TRAINER_FERNANDO_1 release end -Route123_EventScript_1F6407:: @ 81F6407 - trainerbattle_rematch TRAINER_FERNANDO_1, Route123_Text_2A03FB, Route123_Text_2A045A - msgbox Route123_Text_2A0487, MSGBOX_AUTOCLOSE +Route123_EventScript_RematchFernando:: @ 81F6407 + trainerbattle_rematch TRAINER_FERNANDO_1, Route123_Text_FernandoRematchIntro, Route123_Text_FernandoRematchDefeat + msgbox Route123_Text_FernandoPostRematch, MSGBOX_AUTOCLOSE end -Route123_Text_1F641E: @ 81F641E +Route123_Text_LoveGrassMonsHaveAny: @ 81F641E .string "I love GRASS-type POKéMON!\p" .string "Do you have any GRASS-type POKéMON?$" -Route123_Text_1F645D: @ 81F645D +Route123_Text_YouLikeGrassMonsTooHaveThis: @ 81F645D .string "Oh?\p" .string "You like GRASS-type POKéMON, too,\n" .string "don't you?\p" .string "I'm so happy, you can have this!\n" .string "It's a token of our friendship.$" -Route123_Text_1F64CF: @ 81F64CF +Route123_Text_CheckTreesWithMyGrassMon: @ 81F64CF .string "I check trees with my GRASS-type\n" .string "POKéMON. I'm like a tree doctor.$" -Route123_Text_1F6511: @ 81F6511 +Route123_Text_RouteSign: @ 81F6511 .string "{RIGHT_ARROW} ROUTE 123\n" .string "{LEFT_ARROW} ROUTE 118$" -Route123_Text_1F6529: @ 81F6529 +Route123_Text_RouteSignMtPyre: @ 81F6529 .string "{UP_ARROW} MT. PYRE\n" .string "“Forbidden to the faint of heart.”$" -Route123_Text_1F6557: @ 81F6557 +Route123_Text_BerryMastersHouse: @ 81F6557 .string "BERRY MASTER'S HOUSE$" diff --git a/data/text/berries.inc b/data/text/berries.inc index ad12032ea..152690e20 100644 --- a/data/text/berries.inc +++ b/data/text/berries.inc @@ -3,14 +3,14 @@ PetalburgCity_Gym_Text_GiveEnigmaBerry: @ 82A6D3D .string "I just received a very rare BERRY.\n" .string "I'd like you to have it.$" -Route104_Text_2A6D86: @ 82A6D86 +Route104_Text_PlantBerriesInSoilTakeThis: @ 82A6D86 .string "If you see BERRIES growing in loamy\n" .string "soil, feel free to take them.\p" .string "But make sure you plant a BERRY in the\n" .string "same spot. That's common courtesy.\p" .string "Here, I'll share this with you.$" -Route104_Text_2A6E32: @ 82A6E32 +Route104_Text_TrainersOftenMakeMonHoldBerries: @ 82A6E32 .string "The way you look, you must be a\n" .string "TRAINER, no?\p" .string "TRAINERS often make POKéMON hold\n" @@ -48,27 +48,27 @@ Route114_Text_FunToThinkAboutBerries: @ 82A706E .string "Should you use or hoard BERRIES?\p" .string "It's fun to think about.$" -Route120_Text_2A70C7: @ 82A70C7 +Route120_Text_BerriesExpressionOfLoveIsntIt: @ 82A70C7 .string "BERRIES grow by soaking up sunlight.\p" .string "We help the BERRIES grow by watering\n" .string "them regularly.\p" .string "It's an expression of love, isn't it?$" -Route120_Text_2A7147: @ 82A7147 +Route120_Text_YesYouUnderstand: @ 82A7147 .string "Yes, yes.\n" .string "You understand what I mean.\p" .string "You should take this.$" -Route120_Text_2A7183: @ 82A7183 +Route120_Text_MakeYourOwnImpressions: @ 82A7183 .string "Oh… But it is important to make your\n" .string "own impressions, I guess…\p" .string "You can have this.$" -Route120_Text_2A71D5: @ 82A71D5 +Route120_Text_BerryIsRareRaiseItWithCare: @ 82A71D5 .string "I think that BERRY is rare.\n" .string "I hope you raise it with loving care.$" -Route120_Text_2A7217: @ 82A7217 +Route120_Text_IllGetMoreBerriesFromBerryMaster: @ 82A7217 .string "I'll get more BERRIES from\n" .string "the BERRY MASTER.$" diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 3c66046f8..9e971b223 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -245,185 +245,185 @@ Route103_Text_MarcosPostBattle: @ 8295246 .string "have gathered.\p" .string "Heh, maybe I should turn pro.$" -Route104_Text_2952BB: @ 82952BB +Route104_Text_GinaIntro: @ 82952BB .string "GINA: Okay, let's battle with our\n" .string "POKéMON!$" -Route104_Text_2952E6: @ 82952E6 +Route104_Text_GinaDefeat: @ 82952E6 .string "GINA: Losing upsets me!$" -Route104_Text_2952FE: @ 82952FE +Route104_Text_GinaPostBattle: @ 82952FE .string "GINA: You are strong!\n" .string "We have to train lots more!$" -Route104_Text_295330: @ 8295330 +Route104_Text_GinaNotEnoughMons: @ 8295330 .string "GINA: Oh? Only one POKéMON?\n" .string "Then, we don't battle with you.\p" .string "If there's only one POKéMON, it will\n" .string "be lonesome. That's not nice.$" -Route104_Text_2953AF: @ 82953AF +Route104_Text_MiaIntro: @ 82953AF .string "MIA: We are twins, so we battle\n" .string "POKéMON together.$" -Route104_Text_2953E1: @ 82953E1 +Route104_Text_MiaDefeat: @ 82953E1 .string "MIA: We battled together, but we\n" .string "both lost…$" -Route104_Text_29540D: @ 829540D +Route104_Text_MiaPostBattle: @ 829540D .string "MIA: We will train our POKéMON more\n" .string "and be strong like you.$" -Route104_Text_295449: @ 8295449 +Route104_Text_MiaNotEnoughMons: @ 8295449 .string "MIA: You want to battle with us?\p" .string "It's a big no-no if you don't have two\n" .string "POKéMON with you.\l" .string "We're too strong for you!$" -Route104_Text_2954BD: @ 82954BD +Route104_Text_IvanIntro: @ 82954BD .string "Why keep it a secret?\n" .string "I'm the WATER POKéMON expert!\p" .string "Huh?\n" .string "You don't know me?$" -Route104_Text_295509: @ 8295509 +Route104_Text_IvanDefeat: @ 8295509 .string "I thought I wasn't too bad, if I may\n" .string "say so, but I guess not… Bleah…$" -Route104_Text_29554E: @ 829554E +Route104_Text_IvanPostBattle: @ 829554E .string "I got too into fishing.\n" .string "I forgot I had to raise my POKéMON…$" -Route104_Text_29558A: @ 829558A +Route104_Text_BillyIntro: @ 829558A .string "Leaving footprints in the sand is\n" .string "so fun!$" -Route104_Text_2955B4: @ 82955B4 +Route104_Text_BillyDefeat: @ 82955B4 .string "Waah! I got sand in my runners!\n" .string "They're all gritty!$" -Route104_Text_2955E8: @ 82955E8 +Route104_Text_BillyPostBattle: @ 82955E8 .string "I want to leave my footprints in\n" .string "the sand everywhere, but they\l" .string "disappear quickly…$" -Route104_Text_29563A: @ 829563A +Route104_Text_HaleyIntro: @ 829563A .string "Should I…\n" .string "Or shouldn't I?\p" .string "Okay, sure, I will battle!$" -Route104_Text_29566F: @ 829566F +Route104_Text_HaleyDefeat: @ 829566F .string "I shouldn't have battled…$" -Route104_Text_295689: @ 8295689 +Route104_Text_HaleyPostBattle: @ 8295689 .string "If you're faced with a decision and\n" .string "you let someone else choose for you,\l" .string "you will regret it, however things\l" .string "turn out.$" -Route104_Text_2956FF: @ 82956FF +Route104_Text_HaleyRegister1: @ 82956FF .string "You're strong, but should I register\n" .string "you in my POKéNAV?\l" .string "Maybe I shouldn't…\p" .string "Okay, sure, I will register you!$" -Route104_Text_29576B: @ 829576B +Route104_Text_HaleyRegister2: @ 829576B .string "You're strong, but should I register\n" .string "you in my POKéNAV?\l" .string "Maybe I shouldn't…\p" .string "Okay, sure, I will register you!$" -Route104_Text_2957D7: @ 82957D7 +Route104_Text_HaleyRematchIntro: @ 82957D7 .string "Come on, battle with me!$" -Route104_Text_2957F0: @ 82957F0 +Route104_Text_HaleyRematchDefeat: @ 82957F0 .string "Ohh…\n" .string "I thought I could win…$" -Route104_Text_29580C: @ 829580C +Route104_Text_HaleyPostRematch: @ 829580C .string "I made the decision to battle, so\n" .string "I can accept this loss with grace.\p" .string "I am still upset about losing!$" -Route104_Text_295870: @ 8295870 +Route104_Text_WinstonIntro: @ 8295870 .string "Oh, sure, I'll accept your challenge.\n" .string "I have a lot of money.$" -Route104_Text_2958AD: @ 82958AD +Route104_Text_WinstonDefeat: @ 82958AD .string "Why couldn't I win?$" -Route104_Text_2958C1: @ 82958C1 +Route104_Text_WinstonPostBattle: @ 82958C1 .string "There are some things money can't buy.\n" .string "That's POKéMON…$" -Route104_Text_2958F8: @ 82958F8 +Route104_Text_WinstonRegister1: @ 82958F8 .string "Hm?\n" .string "Ah, you've obtained a POKéNAV.\p" .string "I will gladly register you.\n" .string "After all, I have plenty of money.$" -Route104_Text_29595A: @ 829595A +Route104_Text_WinstonRegister2: @ 829595A .string "Hm?\n" .string "Ah, you've obtained a POKéNAV.\p" .string "I will gladly register you.\n" .string "After all, I have plenty of money.$" -Route104_Text_2959BC: @ 82959BC +Route104_Text_WinstonRematchIntro: @ 82959BC .string "After I lost to you, I learned a bunch\n" .string "of things about POKéMON.$" -Route104_Text_2959FC: @ 82959FC +Route104_Text_WinstonRematchDefeat: @ 82959FC .string "I lost again?\n" .string "Why couldn't I win?$" -Route104_Text_295A1E: @ 8295A1E +Route104_Text_WinstonPostRematch: @ 8295A1E .string "I'm fabulously wealthy, but I can't\n" .string "seem to win at POKéMON…\p" .string "It's so deep, the world of POKéMON…$" -Route104_Text_295A7E: @ 8295A7E +Route104_Text_CindyIntro: @ 8295A7E .string "We must have been fated to meet.\n" .string "May I ask you for a battle?$" -Route104_Text_295ABB: @ 8295ABB +Route104_Text_CindyDefeat: @ 8295ABB .string "Oh, my!$" -Route104_Text_295AC3: @ 8295AC3 +Route104_Text_CindyPostBattle: @ 8295AC3 .string "“Hello” is the beginning of “good-bye.”\n" .string "I hope we meet again.$" -Route104_Text_295B01: @ 8295B01 +Route104_Text_CindyRegister1: @ 8295B01 .string "Hello, we meet again.\p" .string "We seem to be drawn together. Let's\n" .string "register each other in our POKéNAVS.$" -Route104_Text_295B60: @ 8295B60 +Route104_Text_CindyRegister2: @ 8295B60 .string "We should commemorate how we seem\n" .string "to be drawn to each other.\p" .string "Let's register each other in our\n" .string "POKéNAVS.$" -Route104_Text_295BC8: @ 8295BC8 +Route104_Text_CindyRematchIntro: @ 8295BC8 .string "Hello, we meet again.\n" .string "May I ask you for a battle?$" -Route104_Text_295BFA: @ 8295BFA +Route104_Text_CindyRematchDefeat: @ 8295BFA .string "Oh, my…\n" .string "I did the best that I could…$" -Route104_Text_295C1F: @ 8295C1F +Route104_Text_CindyPostRematch: @ 8295C1F .string "“Hello” is the beginning of “good-bye.”\n" .string "I hope we meet again.$" -Route104_Text_295C5D: @ 8295C5D +Route104_Text_DarianIntro: @ 8295C5D .string "I fished up a tough-looking POKéMON!\p" .string "It has this magical quality to it!\n" .string "It surely looks tough, yes it does!$" -Route104_Text_295CC9: @ 8295CC9 +Route104_Text_DarianDefeat: @ 8295CC9 .string "What the…$" -Route104_Text_295CD3: @ 8295CD3 +Route104_Text_DarianPostBattle: @ 8295CD3 .string "Hey, MAGIKARP, you sure don't live up\n" .string "to your name, do you?$" @@ -2693,900 +2693,900 @@ Route118_Text_DeandrePostBattle: @ 829D872 .string "battle team?\p" .string "You can copy me--I don't mind!$" -Route119_Text_29D8C2: @ 829D8C2 +Route119_Text_BrentIntro: @ 829D8C2 .string "We're the MIMIC CIRCLE!\n" .string "We MIMIC what you do!$" -Route119_Text_29D8F0: @ 829D8F0 +Route119_Text_BrentDefeat: @ 829D8F0 .string "Whoopsie!\n" .string "I lost!$" -Route119_Text_29D902: @ 829D902 +Route119_Text_BrentPostBattle: @ 829D902 .string "What's so good about mimicry?\p" .string "Fufufu…\n" .string "You'll never understand…$" -Route119_Text_29D941: @ 829D941 +Route119_Text_DonaldIntro: @ 829D941 .string "So, we finally meet!\n" .string "My BUG POKéMON will keep you company!$" -Route119_Text_29D97C: @ 829D97C +Route119_Text_DonaldDefeat: @ 829D97C .string "I wish we'd never met…$" -Route119_Text_29D993: @ 829D993 +Route119_Text_DonaldPostBattle: @ 829D993 .string "I want to MIMIC you some more.\n" .string "Can you hurry up and move?$" -Route119_Text_29D9CD: @ 829D9CD +Route119_Text_TaylorIntro: @ 829D9CD .string "If you step forward, we step forward.\p" .string "If you turn right, we turn, too…$" -Route119_Text_29DA14: @ 829DA14 +Route119_Text_TaylorDefeat: @ 829DA14 .string "But if you win, I lose…$" -Route119_Text_29DA2C: @ 829DA2C +Route119_Text_TaylorPostBattle: @ 829DA2C .string "I can't MIMIC you winning the match.\n" .string "That's just impossible…\l" .string "It's burning me up…$" -Route119_Text_29DA7D: @ 829DA7D +Route119_Text_DougIntro: @ 829DA7D .string "Yep, you've finally caught me!\n" .string "Or were you trying to avoid me?$" -Route119_Text_29DABC: @ 829DABC +Route119_Text_DougDefeat: @ 829DABC .string "Whoop, that was a great match!$" -Route119_Text_29DADB: @ 829DADB +Route119_Text_DougPostBattle: @ 829DADB .string "We're the MIMIC CIRCLE!\n" .string "I hope you enjoyed our performance.$" -Route119_Text_29DB17: @ 829DB17 +Route119_Text_GregIntro: @ 829DB17 .string "You don't know who I am, do you?\p" .string "But, I also don't know you.\n" .string "So, we'll battle!$" -Route119_Text_29DB66: @ 829DB66 +Route119_Text_GregDefeat: @ 829DB66 .string "You're pretty strong!$" -Route119_Text_29DB7C: @ 829DB7C +Route119_Text_GregPostBattle: @ 829DB7C .string "Until you go away somewhere, we'll\n" .string "keep on mimicking your every move.$" -Route119_Text_29DBC2: @ 829DBC2 +Route119_Text_KentIntro: @ 829DBC2 .string "The MIMIC CIRCLE was formed by people\n" .string "who like to MIMIC.\p" .string "A battle starts the instant we meet!$" -Route119_Text_29DC20: @ 829DC20 +Route119_Text_KentDefeat: @ 829DC20 .string "I give up!$" -Route119_Text_29DC2B: @ 829DC2B +Route119_Text_KentPostBattle: @ 829DC2B .string "Won't you join our MIMIC CIRCLE?$" -Route119_Text_29DC4C: @ 829DC4C +Route119_Text_JacksonIntro: @ 829DC4C .string "Who has the knowledge and\n" .string "the technique for survival?\p" .string "POKéMON RANGERS, that's who!$" -Route119_Text_29DC9F: @ 829DC9F +Route119_Text_JacksonDefeat: @ 829DC9F .string "I didn't have enough POKéMON\n" .string "know-how…$" -Route119_Text_29DCC6: @ 829DCC6 +Route119_Text_JacksonPostBattle: @ 829DCC6 .string "To break away from civilization and\n" .string "awaken the wild spirit within!\p" .string "That's our vision.$" -Route119_Text_29DD1C: @ 829DD1C +Route119_Text_JacksonRegister: @ 829DD1C .string "I hope you'll give me a rematch without\n" .string "mocking my lack of knowledge.$" -Route119_Text_29DD62: @ 829DD62 +Route119_Text_JacksonRematchIntro: @ 829DD62 .string "I'm going to regain my wild spirit by\n" .string "being together with POKéMON.$" -Route119_Text_29DDA5: @ 829DDA5 +Route119_Text_JacksonRematchDefeat: @ 829DDA5 .string "You've remained strong!$" -Route119_Text_29DDBD: @ 829DDBD +Route119_Text_JacksonPostRematch: @ 829DDBD .string "Believe in your POKéMON.\n" .string "Believe in yourself.\p" .string "The road will reveal itself to you.$" -Route119_Text_29DE0F: @ 829DE0F +Route119_Text_CatherineIntro: @ 829DE0F .string "Oh? Look at you.\p" .string "For someone on an adventure,\n" .string "you're traveling awfully light.$" -Route119_Text_29DE5D: @ 829DE5D +Route119_Text_CatherineDefeat: @ 829DE5D .string "Accidents happen when you're not\n" .string "prepared!$" -Route119_Text_29DE88: @ 829DE88 +Route119_Text_CatherinePostBattle: @ 829DE88 .string "You're traveling light but you have\n" .string "everything you need.\p" .string "You're on top of things mentally and\n" .string "physically, too.$" -Route119_Text_29DEF7: @ 829DEF7 +Route119_Text_CatherineRegister: @ 829DEF7 .string "Do you have a POKéNAV?\n" .string "It's a must-have tool for any TRAINER.\p" .string "Oh, you do have one!\n" .string "Let's register each other, then!$" -Route119_Text_29DF6B: @ 829DF6B +Route119_Text_CatherineRematchIntro: @ 829DF6B .string "How's your journey with POKéMON\n" .string "going?$" -Route119_Text_29DF92: @ 829DF92 +Route119_Text_CatherineRematchDefeat: @ 829DF92 .string "I'm still missing something…$" -Route119_Text_29DFAF: @ 829DFAF +Route119_Text_CatherinePostRematch: @ 829DFAF .string "In the same way that you, as a TRAINER,\n" .string "rely on your POKéMON, your POKéMON\l" .string "rely on you.$" -Route119_Text_29E007: @ 829E007 +Route119_Text_HughIntro: @ 829E007 .string "The vast sky holds untold promise!\p" .string "Nothing can compare to the sheer\n" .string "exhilaration of flight!$" -Route119_Text_29E063: @ 829E063 +Route119_Text_HughDefeat: @ 829E063 .string "Down and out!$" -Route119_Text_29E071: @ 829E071 +Route119_Text_HughPostBattle: @ 829E071 .string "My BIRD POKéMON made my dreams of\n" .string "flying come true!$" -Route119_Text_29E0A5: @ 829E0A5 +Route119_Text_PhilIntro: @ 829E0A5 .string "I'll show you the true potential of me\n" .string "and my BIRD POKéMON!$" -Route119_Text_29E0E1: @ 829E0E1 +Route119_Text_PhilDefeat: @ 829E0E1 .string "We lacked potential…$" -Route119_Text_29E0F6: @ 829E0F6 +Route119_Text_PhilPostBattle: @ 829E0F6 .string "Ever since I was a little kid, I always\n" .string "admired BIRD POKéMON…$" -Route119_Text_29E134: @ 829E134 +Route119_Text_YasuIntro: @ 829E134 .string "To lurk in shadows, and live in\n" .string "darkness… That is my destiny.\p" .string "I emerge to challenge you!$" -Route119_Text_29E18D: @ 829E18D +Route119_Text_YasuDefeat: @ 829E18D .string "I admit defeat!$" -Route119_Text_29E19D: @ 829E19D +Route119_Text_YasuPostBattle: @ 829E19D .string "Those defeated in battle withdraw\n" .string "quietly back into the shadows.\l" .string "That, too, is destiny…$" -Route119_Text_29E1F5: @ 829E1F5 +Route119_Text_TakashiIntro: @ 829E1F5 .string "If you're not on your guard,\n" .string "you're in for some pain!$" -Route119_Text_29E22B: @ 829E22B +Route119_Text_TakashiDefeat: @ 829E22B .string "You're surprisingly good!$" -Route119_Text_29E245: @ 829E245 +Route119_Text_TakashiPostBattle: @ 829E245 .string "My surprise attack ended in\n" .string "failure…$" -Route119_Text_29E26A: @ 829E26A +Route119_Text_HideoIntro: @ 829E26A .string "To hide a tree, use a forest!$" -Route119_Text_29E288: @ 829E288 +Route119_Text_HideoDefeat: @ 829E288 .string "I bow to your superiority.$" -Route119_Text_29E2A3: @ 829E2A3 +Route119_Text_HideoPostBattle: @ 829E2A3 .string "To hide a tree, use a forest!\n" .string "To hide a POKéMON, use a POKéMON!\p" .string "There is no deep, hidden meaning\n" .string "to that.$" -Route119_Text_29E30D: @ 829E30D +Route119_Text_ChrisIntro: @ 829E30D .string "You spoke to me…\n" .string "So you want to challenge me!\p" .string "Sure! I'll try out the POKéMON I caught\n" .string "while SURFING!$" -Route119_Text_29E372: @ 829E372 +Route119_Text_ChrisDefeat: @ 829E372 .string "I don't have a clue about what it\n" .string "takes to win.$" -Route119_Text_29E3A2: @ 829E3A2 +Route119_Text_ChrisPostBattle: @ 829E3A2 .string "Go for a SURF on my POKéMON…\p" .string "Then fish off its back…\p" .string "It's an indescribably luxuriant moment!$" -Route119_Text_29E3FF: @ 829E3FF +Route119_Text_FabianIntro: @ 829E3FF .string "Hit me with a power chord!\n" .string "Victory is mine!\l" .string "It's our time to shine, whoa, yeah!$" -Route119_Text_29E44F: @ 829E44F +Route119_Text_FabianDefeat: @ 829E44F .string "You showed me who's the boss!\n" .string "We'll have to take the loss, oh, no!$" -Route119_Text_29E492: @ 829E492 +Route119_Text_FabianPostBattle: @ 829E492 .string "Hit me with another power chord!\n" .string "Leave me alone!\l" .string "Your win you have to atone!$" -Route119_Text_29E4DF: @ 829E4DF +Route119_Text_DaytonIntro: @ 829E4DF .string "Hohoho!\n" .string "I like kid TRAINERS!\l" .string "Let's have a good one!$" -Route119_Text_29E513: @ 829E513 +Route119_Text_DaytonDefeat: @ 829E513 .string "You're pretty amazing!\n" .string "Hohoho!$" -Route119_Text_29E532: @ 829E532 +Route119_Text_DaytonPostBattle: @ 829E532 .string "Hohoho!\n" .string "I'll try emulating the pep of kid\l" .string "TRAINERS like you!$" -Route119_Text_29E56F: @ 829E56F +Route119_Text_RachelIntro: @ 829E56F .string "Wherever and whenever I may be,\n" .string "I always have my parasol in hand.$" -Route119_Text_29E5B1: @ 829E5B1 +Route119_Text_RachelDefeat: @ 829E5B1 .string "Oh, but…\n" .string "That's not fair.$" -Route119_Text_29E5CB: @ 829E5CB +Route119_Text_RachelPostBattle: @ 829E5CB .string "You're asking if my parasol is heavy?\n" .string "Your BAG is filled with more junk than\l" .string "I ever carry around.$" -Route120_Text_29E62D: @ 829E62D +Route120_Text_ColinIntro: @ 829E62D .string "Do you have any moves that can strike\n" .string "a flying POKéMON?$" -Route120_Text_29E665: @ 829E665 +Route120_Text_ColinDefeat: @ 829E665 .string "You soared above me!$" -Route120_Text_29E67A: @ 829E67A +Route120_Text_ColinPostBattle: @ 829E67A .string "The move FLY is convenient,\n" .string "don't you think?\p" .string "While the POKéMON is flying,\n" .string "almost no moves can strike it.$" -Route120_Text_29E6E3: @ 829E6E3 +Route120_Text_RobertIntro: @ 829E6E3 .string "My POKéMON is strong!\n" .string "How about yours?$" -Route120_Text_29E70A: @ 829E70A +Route120_Text_RobertDefeat: @ 829E70A .string "Your POKéMON were stronger…$" -Route120_Text_29E726: @ 829E726 +Route120_Text_RobertPostBattle: @ 829E726 .string "A POKéMON that grows steadily is one\n" .string "you can count on.$" -Route120_Text_29E75D: @ 829E75D +Route120_Text_RobertRegister: @ 829E75D .string "You can be counted on to get better.\n" .string "I'd like to register you in my POKéNAV!$" -Route120_Text_29E7AA: @ 829E7AA +Route120_Text_RobertRematchIntro: @ 829E7AA .string "A POKéMON that grows steadily is one\n" .string "you can count on.$" -Route120_Text_29E7E1: @ 829E7E1 +Route120_Text_RobertRematchDefeat: @ 829E7E1 .string "Your POKéMON are seriously strong.$" -Route120_Text_29E804: @ 829E804 +Route120_Text_RobertPostRematch: @ 829E804 .string "My POKéMON are growing stronger.\n" .string "I have to grow stronger, too.$" -Route120_Text_29E843: @ 829E843 +Route120_Text_LorenzoIntro: @ 829E843 .string "I'll check your POKéMON and see if\n" .string "they're fit for the outdoors.$" -Route120_Text_29E884: @ 829E884 +Route120_Text_LorenzoDefeat: @ 829E884 .string "With POKéMON that strong, you're in\n" .string "no danger of needing rescue!$" -Route120_Text_29E8C5: @ 829E8C5 +Route120_Text_LorenzoPostBattle: @ 829E8C5 .string "To travel wherever your heart desires\n" .string "with POKéMON…\l" .string "That's the joy of being a TRAINER.$" -Route120_Text_29E91C: @ 829E91C +Route120_Text_JennaIntro: @ 829E91C .string "How's your physical fitness?\n" .string "If you're not fit, you could have a\l" .string "rough time in critical situations.$" -Route120_Text_29E980: @ 829E980 +Route120_Text_JennaDefeat: @ 829E980 .string "I'm totally fit, but…$" -Route120_Text_29E996: @ 829E996 +Route120_Text_JennaPostBattle: @ 829E996 .string "Fitness training is in my routine.\n" .string "I always run with my POKéMON.$" -Route120_Text_29E9D7: @ 829E9D7 +Route120_Text_JeffreyIntro: @ 829E9D7 .string "… … … … … …\n" .string "… … … … … …\l" .string "Want to battle?$" -Route120_Text_29E9FF: @ 829E9FF +Route120_Text_JeffreyDefeat: @ 829E9FF .string "Lost it…$" -Route120_Text_29EA08: @ 829EA08 +Route120_Text_JeffreyPostBattle: @ 829EA08 .string "… … … … … …\n" .string "… … … … … …\l" .string "I'll try harder…$" -Route120_Text_29EA31: @ 829EA31 +Route120_Text_JeffreyRegister: @ 829EA31 .string "… … … … … …\n" .string "… … … … … …\l" .string "Do you have a POKéNAV…?$" -Route120_Text_29EA61: @ 829EA61 +Route120_Text_JeffreyRematchIntro: @ 829EA61 .string "… … … … … …\n" .string "… … … … … …\l" .string "Want to battle again?$" -Route120_Text_29EA8F: @ 829EA8F +Route120_Text_JeffreyRematchDefeat: @ 829EA8F .string "… … … … … …\n" .string "I lost again…$" -Route120_Text_29EAA9: @ 829EAA9 +Route120_Text_JeffreyPostRematch: @ 829EAA9 .string "… … … … … …\n" .string "… … … … … …\l" .string "I'll try harder…\l" .string "For my precious BUG POKéMON…$" -Route120_Text_29EAEF: @ 829EAEF +Route120_Text_JenniferIntro: @ 829EAEF .string "POKéMON have many special abilities.\n" .string "If you want to become a first-class\l" .string "TRAINER, learn about them.$" -Route120_Text_29EB53: @ 829EB53 +Route120_Text_JenniferDefeat: @ 829EB53 .string "You're obviously thinking.$" -Route120_Text_29EB6E: @ 829EB6E +Route120_Text_JenniferPostBattle: @ 829EB6E .string "The special abilities of POKéMON\n" .string "will make battle styles change.$" -Route120_Text_29EBAF: @ 829EBAF +Route120_Text_ChipIntro: @ 829EBAF .string "Who might you be?\p" .string "Are you perhaps searching for ancient\n" .string "ruins that are rumored to possibly\l" .string "exist according to legend?$" -Route120_Text_29EC25: @ 829EC25 +Route120_Text_ChipDefeat: @ 829EC25 .string "What a disgraceful setback…$" -Route120_Text_29EC41: @ 829EC41 +Route120_Text_ChipPostBattle: @ 829EC41 .string "That giant rock… I would like to\n" .string "believe it may indeed contain ancient\l" .string "ruins. But I see no entrance.$" -Route120_Text_29ECA6: @ 829ECA6 +Route120_Text_ClarissaIntro: @ 829ECA6 .string "Why am I carrying this parasol?\p" .string "I'll tell you if you can win against me.$" -Route120_Text_29ECEF: @ 829ECEF +Route120_Text_ClarissaDefeat: @ 829ECEF .string "A parasol can't ward off POKéMON\n" .string "attacks…$" -Route120_Text_29ED19: @ 829ED19 +Route120_Text_ClarissaPostBattle: @ 829ED19 .string "I don't think strong sunlight is good\n" .string "for my POKéMON.\l" .string "So I shield them with my parasol.$" -Route120_Text_29ED71: @ 829ED71 +Route120_Text_AngelicaIntro: @ 829ED71 .string "Me, POKéMON, and my parasol…\p" .string "If any one of them is missing,\n" .string "the picture of beauty will be ruined.$" -Route120_Text_29EDD3: @ 829EDD3 +Route120_Text_AngelicaDefeat: @ 829EDD3 .string "You've completely ruined my beauty…$" -Route120_Text_29EDF7: @ 829EDF7 +Route120_Text_AngelicaPostBattle: @ 829EDF7 .string "A parasol wouldn't suit you at all.\p" .string "Why, something like this would only\n" .string "get in your way.$" -Route120_Text_29EE50: @ 829EE50 +Route120_Text_KeigoIntro: @ 829EE50 .string "I will adopt the movements of POKéMON\n" .string "and create new ninja techniques.$" -Route120_Text_29EE97: @ 829EE97 +Route120_Text_KeigoDefeat: @ 829EE97 .string "The creation of new ninja techniques\n" .string "is but a distant dream…$" -Route120_Text_29EED4: @ 829EED4 +Route120_Text_KeigoPostBattle: @ 829EED4 .string "Perhaps I ought to apprentice under\n" .string "a ninja sensei.$" -Route120_Text_29EF08: @ 829EF08 +Route120_Text_RileyIntro: @ 829EF08 .string "We ninja conceal ourselves under our\n" .string "camouflage cloaks.\l" .string "I bet you didn't know where I was!$" -Route120_Text_29EF63: @ 829EF63 +Route120_Text_RileyDefeat: @ 829EF63 .string "I lost!\n" .string "I should camouflage my shame!$" -Route120_Text_29EF89: @ 829EF89 +Route120_Text_RileyPostBattle: @ 829EF89 .string "Our camouflage cloaks are all\n" .string "handmade.$" -Route120_Text_29EFB1: @ 829EFB1 +Route120_Text_CallieIntro: @ 829EFB1 .string "If you don't pay attention,\n" .string "you could get hurt!$" -Route120_Text_29EFE1: @ 829EFE1 +Route120_Text_CallieDefeat: @ 829EFE1 .string "Ouch!\n" .string "I was the one to get hurt.$" -Route120_Text_29F002: @ 829F002 +Route120_Text_CalliePostBattle: @ 829F002 .string "I wonder… Should I evolve my POKéMON?\n" .string "They're cute the way they are, though.$" -Route120_Text_29F04F: @ 829F04F +Route120_Text_LeonelIntro: @ 829F04F .string "Your party POKéMON…\n" .string "Do you have different types?$" -Route120_Text_29F080: @ 829F080 +Route120_Text_LeonelDefeat: @ 829F080 .string "I've seen your policy in action!$" -Route120_Text_29F0A1: @ 829F0A1 +Route120_Text_LeonelPostBattle: @ 829F0A1 .string "I think it's awesome you're so strong\n" .string "battling with your favorite POKéMON.$" -Route121_Text_29F0EC: @ 829F0EC +Route121_Text_VanessaIntro: @ 829F0EC .string "Will you play with my delightfully\n" .string "pretty POKéMON?$" -Route121_Text_29F11F: @ 829F11F +Route121_Text_VanessaDefeat: @ 829F11F .string "This isn't what I meant!$" -Route121_Text_29F138: @ 829F138 +Route121_Text_VanessaPostBattle: @ 829F138 .string "I'm going to a CONTEST in LILYCOVE.\p" .string "My POKéMON should have no problem\n" .string "sweeping the MASTER CLASS.$" -Route121_Text_29F199: @ 829F199 +Route121_Text_WalterIntro: @ 829F199 .string "With my POKéMON, I have traveled\n" .string "to the world's four corners.\p" .string "You might say I have some confidence\n" .string "in my abilities.$" -Route121_Text_29F20D: @ 829F20D +Route121_Text_WalterDefeat: @ 829F20D .string "Ah, well played.$" -Route121_Text_29F21E: @ 829F21E +Route121_Text_WalterPostBattle: @ 829F21E .string "I would like to circle the globe once\n" .string "again with my POKéMON.$" -Route121_Text_29F25B: @ 829F25B +Route121_Text_WalterRegister: @ 829F25B .string "Your POKéMON prowess is remarkable.\n" .string "Allow me to register you as a memento.$" -Route121_Text_29F2A6: @ 829F2A6 +Route121_Text_WalterRematchIntro: @ 829F2A6 .string "With my POKéMON, I have traveled\n" .string "to the world's four corners.\p" .string "You might say I have some confidence\n" .string "in my abilities.$" -Route121_Text_29F31A: @ 829F31A +Route121_Text_WalterRematchDefeat: @ 829F31A .string "Ah, well played.$" -Route121_Text_29F32B: @ 829F32B +Route121_Text_WalterPostRematch: @ 829F32B .string "Your POKéMON and you…\p" .string "Your prowess together will be\n" .string "considered strong, even overseas.$" -Route121_Text_29F381: @ 829F381 +Route121_Text_TammyIntro: @ 829F381 .string "There are powers beyond our\n" .string "understanding in the world…$" -Route121_Text_29F3B9: @ 829F3B9 +Route121_Text_TammyDefeat: @ 829F3B9 .string "I have lost…$" -Route121_Text_29F3C6: @ 829F3C6 +Route121_Text_TammyPostBattle: @ 829F3C6 .string "MT. PYRE…\n" .string "There is a mysterious power\l" .string "at work there…$" -Route121_Text_29F3FB: @ 829F3FB +Route121_Text_KateIntro: @ 829F3FB .string "KATE: Together, we're fearless!\n" .string "We'll demonstrate how tough we are!$" -Route121_Text_29F43F: @ 829F43F +Route121_Text_KateDefeat: @ 829F43F .string "KATE: I blew it in front of my junior\n" .string "student partner…$" -Route121_Text_29F476: @ 829F476 +Route121_Text_KatePostBattle: @ 829F476 .string "KATE: When someone's relying on me,\n" .string "I get this urge to look cool in front\l" .string "of them…$" -Route121_Text_29F4C9: @ 829F4C9 +Route121_Text_KateNotEnoughMons: @ 829F4C9 .string "KATE: If you've only got one POKéMON,\n" .string "we can't battle with you.\p" .string "That would be bullying.$" -Route121_Text_29F521: @ 829F521 +Route121_Text_JoyIntro: @ 829F521 .string "JOY: Together, we're fearless!\n" .string "We'll demonstrate how tough we are!$" -Route121_Text_29F564: @ 829F564 +Route121_Text_JoyDefeat: @ 829F564 .string "JOY: Please forgive me, KATE!$" -Route121_Text_29F582: @ 829F582 +Route121_Text_JoyPostBattle: @ 829F582 .string "JOY: Ehehe, I'll have to train with KATE,\n" .string "my senior student partner, again.$" -Route121_Text_29F5CE: @ 829F5CE +Route121_Text_JoyNotEnoughMons: @ 829F5CE .string "JOY: You need at least two POKéMON\n" .string "if you're going to challenge us!$" -Route121_Text_29F612: @ 829F612 +Route121_Text_JessicaIntro: @ 829F612 .string "Stop! Have a good look at my precious\n" .string "POKéMON!$" -Route121_Text_29F641: @ 829F641 +Route121_Text_JessicaDefeat: @ 829F641 .string "Oh, how dare you!\n" .string "Don't take it so seriously!$" -Route121_Text_29F66F: @ 829F66F +Route121_Text_JessicaPostBattle: @ 829F66F .string "Maybe I'll go catch more POKéMON at\n" .string "the SAFARI.$" -Route121_Text_29F69F: @ 829F69F +Route121_Text_JessicaRegister: @ 829F69F .string "I took it easy on you this time!\n" .string "It won't be that way the next time!$" -Route121_Text_29F6E4: @ 829F6E4 +Route121_Text_JessicaRematchIntro: @ 829F6E4 .string "My precious POKéMON grew!\n" .string "Have a good look!$" -Route121_Text_29F710: @ 829F710 +Route121_Text_JessicaRematchDefeat: @ 829F710 .string "Oh, how dare you!\n" .string "You still won't take it easy!$" -Route121_Text_29F740: @ 829F740 +Route121_Text_JessicaPostRematch: @ 829F740 .string "Maybe I'll go catch more POKéMON at\n" .string "the SAFARI.$" -Route121_Text_29F770: @ 829F770 +Route121_Text_CristinIntro: @ 829F770 .string "I have this routine.\n" .string "Defeat five TRAINERS a day.\l" .string "Guess what? You're number five!$" -Route121_Text_29F7C1: @ 829F7C1 +Route121_Text_CristinDefeat: @ 829F7C1 .string "No!\n" .string "You're horrid!$" -Route121_Text_29F7D4: @ 829F7D4 +Route121_Text_CristinPostBattle: @ 829F7D4 .string "I didn't expect to lose this easily…\n" .string "I'll win next time!$" -Route121_Text_29F80D: @ 829F80D +Route121_Text_CristinRegister: @ 829F80D .string "That was total humiliation!\n" .string "I won't forget you…\l" .string "Hand over your POKéNAV!$" -Route121_Text_29F855: @ 829F855 +Route121_Text_CristinRematchIntro: @ 829F855 .string "I have this new routine.\n" .string "Defeat ten TRAINERS a day.\l" .string "Guess what? You're number ten!$" -Route121_Text_29F8A8: @ 829F8A8 +Route121_Text_CristinRematchDefeat: @ 829F8A8 .string "Wait! That's nasty!\n" .string "I demand a rematch!$" -Route121_Text_29F8D0: @ 829F8D0 +Route121_Text_CristinPostRematch: @ 829F8D0 .string "An opponent I just can't beat…\n" .string "Snivel…\l" .string "I can't believe this is happening…$" -Route121_Text_29F91A: @ 829F91A +Route121_Text_CaleIntro: @ 829F91A .string "Can't you see that I have all this\n" .string "stuff with me?\p" .string "Despite that, you still insist that\n" .string "we battle?$" -Route121_Text_29F97B: @ 829F97B +Route121_Text_CaleDefeat: @ 829F97B .string "Of course I lost!\n" .string "I'm holding stuff in both hands!$" -Route121_Text_29F9AE: @ 829F9AE +Route121_Text_CalePostBattle: @ 829F9AE .string "I bought too much stuff at\n" .string "the LILYCOVE DEPT. STORE.\p" .string "It's up the road from here.\n" .string "I wish I had a BAG like yours.$" -Route121_Text_29FA1E: @ 829FA1E +Route121_Text_MylesIntro: @ 829FA1E .string "There's nothing I love more than\n" .string "checking out other people's POKéMON!$" -Route121_Text_29FA64: @ 829FA64 +Route121_Text_MylesDefeat: @ 829FA64 .string "Super awesome!$" -Route121_Text_29FA73: @ 829FA73 +Route121_Text_MylesPostBattle: @ 829FA73 .string "They're great, your POKéMON!\n" .string "How do you raise them?$" -Route121_Text_29FAA7: @ 829FAA7 +Route121_Text_PatIntro: @ 829FAA7 .string "I want everybody to see the POKéMON\n" .string "I've raised!$" -Route121_Text_29FAD8: @ 829FAD8 +Route121_Text_PatDefeat: @ 829FAD8 .string "Wow!\n" .string "Spectacular!$" -Route121_Text_29FAEA: @ 829FAEA +Route121_Text_PatPostBattle: @ 829FAEA .string "I raise every POKéMON with the same\n" .string "love and care--I don't pick favorites.$" -Route121_Text_29FB35: @ 829FB35 +Route121_Text_MarcelIntro: @ 829FB35 .string "My POKéMON have never tasted defeat!\n" .string "On their next win, I'm entering them\l" .string "in CONTESTS.$" -Route121_Text_29FB8C: @ 829FB8C +Route121_Text_MarcelDefeat: @ 829FB8C .string "Oh, now what happened here?$" -Route121_Text_29FBA8: @ 829FBA8 +Route121_Text_MarcelPostBattle: @ 829FBA8 .string "I may have to train my gang some more\n" .string "before entering any CONTEST.$" -Route123_Text_29FBEB: @ 829FBEB +Route123_Text_WendyIntro: @ 829FBEB .string "Want to determine how strong you are?\n" .string "I'll be the test!$" -Route123_Text_29FC23: @ 829FC23 +Route123_Text_WendyDefeat: @ 829FC23 .string "You passed with flying colors!$" -Route123_Text_29FC42: @ 829FC42 +Route123_Text_WendyPostBattle: @ 829FC42 .string "To best even me…\n" .string "Your strength is marvelous!$" -Route123_Text_29FC6F: @ 829FC6F +Route123_Text_BraxtonIntro: @ 829FC6F .string "You seem to have a big collection\n" .string "of GYM BADGES.\p" .string "Let me see if you're actually worthy of\n" .string "those BADGES!$" -Route123_Text_29FCD6: @ 829FCD6 +Route123_Text_BraxtonDefeat: @ 829FCD6 .string "Oh, you're worthy, all right!$" -Route123_Text_29FCF4: @ 829FCF4 +Route123_Text_BraxtonPostBattle: @ 829FCF4 .string "You did your BADGES proud in that\n" .string "match!$" -Route123_Text_29FD1D: @ 829FD1D +Route123_Text_VioletIntro: @ 829FD1D .string "They say that good times are filled\n" .string "with good aromas.$" -Route123_Text_29FD53: @ 829FD53 +Route123_Text_VioletDefeat: @ 829FD53 .string "Oh…\n" .string "I smell the bitter scent of misery…$" -Route123_Text_29FD7B: @ 829FD7B +Route123_Text_VioletPostBattle: @ 829FD7B .string "The BERRY MASTER's garden is filled\n" .string "with uplifting fragrances.$" -Route123_Text_29FDBA: @ 829FDBA +Route123_Text_CameronIntro: @ 829FDBA .string "Being a psychic is about willpower.\p" .string "I've willed myself not to lose to\n" .string "anyone. That makes me strong!$" -Route123_Text_29FE1E: @ 829FE1E +Route123_Text_CameronDefeat: @ 829FE1E .string "I feel sad…$" -Route123_Text_29FE2A: @ 829FE2A +Route123_Text_CameronPostBattle: @ 829FE2A .string "Being a psychic is about willpower.\n" .string "I thought I wouldn't lose to you…$" -Route123_Text_29FE70: @ 829FE70 +Route123_Text_CameronRegister: @ 829FE70 .string "I sense it!\n" .string "You and I shall battle again!\l" .string "I can't tell if I'll win, though…\p" .string "Let's see your POKéNAV.$" -Route123_Text_29FED4: @ 829FED4 +Route123_Text_CameronRematchIntro: @ 829FED4 .string "I've convinced myself that I won't\n" .string "lose anymore. That makes me strong!$" -Route123_Text_29FF1B: @ 829FF1B +Route123_Text_CameronRematchDefeat: @ 829FF1B .string "I feel sad…$" -Route123_Text_29FF27: @ 829FF27 +Route123_Text_CameronPostRematch: @ 829FF27 .string "I should train at MT. PYRE…\n" .string "I'll never beat you this way…$" -Route123_Text_29FF61: @ 829FF61 +Route123_Text_JackiIntro: @ 829FF61 .string "Don't be too happy if your POKéMON\n" .string "develop psychic powers.\p" .string "You need to refine those powers to\n" .string "make them really useful.$" -Route123_Text_29FFD8: @ 829FFD8 +Route123_Text_JackiDefeat: @ 829FFD8 .string "Overwhelmed!$" -Route123_Text_29FFE5: @ 829FFE5 +Route123_Text_JackiPostBattle: @ 829FFE5 .string "We all have psychic powers.\n" .string "We've just forgotten how to use them.$" -Route123_Text_2A0027: @ 82A0027 +Route123_Text_JackiRegister: @ 82A0027 .string "I would like to face you again.\n" .string "Is that okay with you?$" -Route123_Text_2A005E: @ 82A005E +Route123_Text_JackiRematchIntro: @ 82A005E .string "Have you awoken the psychic powers\n" .string "within you?$" -Route123_Text_2A008D: @ 82A008D +Route123_Text_JackiRematchDefeat: @ 82A008D .string "Astounding!$" -Route123_Text_2A0099: @ 82A0099 +Route123_Text_JackiPostRematch: @ 82A0099 .string "Your power with POKéMON…\n" .string "That could be a psychic power, too.$" -Route123_Text_2A00D6: @ 82A00D6 +Route123_Text_MiuIntro: @ 82A00D6 .string "MIU: Hello, TRAINER. I hope your\n" .string "POKéMON won't cry when they lose.$" -Route123_Text_2A0119: @ 82A0119 +Route123_Text_MiuDefeat: @ 82A0119 .string "MIU: Uh-oh, we lost.$" -Route123_Text_2A012E: @ 82A012E +Route123_Text_MiuPostBattle: @ 82A012E .string "MIU: TRAINER, your POKéMON are\n" .string "strong because you are friends.$" -Route123_Text_2A016D: @ 82A016D +Route123_Text_MiuNotEnoughMons: @ 82A016D .string "MIU: It's no fun to battle if you\n" .string "don't have two POKéMON.$" -Route123_Text_2A01A7: @ 82A01A7 +Route123_Text_YukiIntro: @ 82A01A7 .string "YUKI: Okay!\n" .string "We're beating the TRAINER's POKéMON!$" -Route123_Text_2A01D8: @ 82A01D8 +Route123_Text_YukiDefeat: @ 82A01D8 .string "YUKI: Uh-oh, we lost.$" -Route123_Text_2A01EE: @ 82A01EE +Route123_Text_YukiPostBattle: @ 82A01EE .string "YUKI: Why are you so strong?\n" .string "We've never lost before.$" -Route123_Text_2A0224: @ 82A0224 +Route123_Text_YukiNotEnoughMons: @ 82A0224 .string "YUKI: It's no fun to battle if you\n" .string "don't have two POKéMON.$" -Route123_Text_2A025F: @ 82A025F +Route123_Text_KindraIntro: @ 82A025F .string "MT. PYRE…\n" .string "Where the spirits of POKéMON sleep…\l" .string "Will your POKéMON sleep?$" -Route123_Text_2A02A6: @ 82A02A6 +Route123_Text_KindraDefeat: @ 82A02A6 .string "Overflowing with vitality…$" -Route123_Text_2A02C1: @ 82A02C1 +Route123_Text_KindraPostBattle: @ 82A02C1 .string "MT. PYRE…\n" .string "Where the spirits of POKéMON sleep…\p" .string "It must overflow with a power that\n" .string "soothes spirits…$" -Route123_Text_2A0323: @ 82A0323 +Route123_Text_FernandoIntro: @ 82A0323 .string "I'll turn your lights out while\n" .string "I rip through this tune!$" -Route123_Text_2A035C: @ 82A035C +Route123_Text_FernandoDefeat: @ 82A035C .string "Hey, hold it!\n" .string "I was still playing the intro!$" -Route123_Text_2A0389: @ 82A0389 +Route123_Text_FernandoPostBattle: @ 82A0389 .string "You're rock steady.\n" .string "I'd like to write a tune about you.$" -Route123_Text_2A03C1: @ 82A03C1 +Route123_Text_FernandoRegister: @ 82A03C1 .string "The next time, lend your ears to\n" .string "the full tune, will you?$" -Route123_Text_2A03FB: @ 82A03FB +Route123_Text_FernandoRematchIntro: @ 82A03FB .string "Today's the day I'm going to do it!\n" .string "I'll turn out your lights before\l" .string "I finish singing my song!$" -Route123_Text_2A045A: @ 82A045A +Route123_Text_FernandoRematchDefeat: @ 82A045A .string "Hey, hold it!\n" .string "I haven't even hit the chorus!$" -Route123_Text_2A0487: @ 82A0487 +Route123_Text_FernandoPostRematch: @ 82A0487 .string "I thought you'd be so enthralled\n" .string "by my tune, you'd lose.$" -Route123_Text_2A04C0: @ 82A04C0 +Route123_Text_DavisIntro: @ 82A04C0 .string "This is my awesome BUG POKéMON!\n" .string "My big brother got it for me.$" -Route123_Text_2A04FE: @ 82A04FE +Route123_Text_DavisDefeat: @ 82A04FE .string "Waaaah!\n" .string "You meanie!$" -Route123_Text_2A0512: @ 82A0512 +Route123_Text_DavisPostBattle: @ 82A0512 .string "Don't tell my brother I lost.\n" .string "You have to keep it a secret!$" -Route123_Text_2A054E: @ 82A054E +Route123_Text_JazmynIntro: @ 82A054E .string "My confidence will get a boost by\n" .string "beating someone obviously strong!$" -Route123_Text_2A0592: @ 82A0592 +Route123_Text_JazmynDefeat: @ 82A0592 .string "There goes my confidence…$" -Route123_Text_2A05AC: @ 82A05AC +Route123_Text_JazmynPostBattle: @ 82A05AC .string "They say that you can't judge a person\n" .string "by their appearance.\p" .string "But often, their looks don't lie…$" -Route123_Text_2A060A: @ 82A060A +Route123_Text_FrederickIntro: @ 82A060A .string "Hello, child!\n" .string "Can you spare some time?$" -Route123_Text_2A0631: @ 82A0631 +Route123_Text_FrederickDefeat: @ 82A0631 .string "Ah, a mighty capable child!\n" .string "Let me contribute to your allowance.$" -Route123_Text_2A0672: @ 82A0672 +Route123_Text_FrederickPostBattle: @ 82A0672 .string "Contribute to your allowance?\n" .string "Wasn't the prize money enough?$" -Route123_Text_2A06AF: @ 82A06AF +Route123_Text_AlbertoIntro: @ 82A06AF .string "I have to tell you, BIRD POKéMON\n" .string "are my obsession!\p" .string "Birds are cool!\n" .string "They're the best!$" -Route123_Text_2A0704: @ 82A0704 +Route123_Text_AlbertoDefeat: @ 82A0704 .string "Even in defeat, BIRD POKéMON are cool!$" -Route123_Text_2A072B: @ 82A072B +Route123_Text_AlbertoPostBattle: @ 82A072B .string "I gather BIRD POKéMON feathers that\n" .string "scatter during battles.\p" .string "I'm going to make a hat with\n" .string "BIRD POKéMON feathers.$" -Route123_Text_2A079B: @ 82A079B +Route123_Text_EdIntro: @ 82A079B .string "When there are no TRAINERS around,\n" .string "I let my POKéMON battle each other.\l" .string "I watch them.$" -Route123_Text_2A07F0: @ 82A07F0 +Route123_Text_EdDefeat: @ 82A07F0 .string "I kind of like your POKéMON.$" -Route123_Text_2A080D: @ 82A080D +Route123_Text_EdPostBattle: @ 82A080D .string "Hehe, I'm swiping your battling ideas!\n" .string "I think they'll make me better.$" -Route123_Text_2A0854: @ 82A0854 +Route123_Text_JonasIntro: @ 82A0854 .string "I lay in ambush, and a TRAINER has\n" .string "landed in my trap!$" -Route123_Text_2A088A: @ 82A088A +Route123_Text_JonasDefeat: @ 82A088A .string "If you don't lose, how am I supposed\n" .string "to have fun playing ninja?$" -Route123_Text_2A08CA: @ 82A08CA +Route123_Text_JonasPostBattle: @ 82A08CA .string "I'm going to ambush a weaker-looking\n" .string "TRAINER next time.$" -Route123_Text_2A0902: @ 82A0902 +Route123_Text_KayleyIntro: @ 82A0902 .string "I just bought this parasol.\n" .string "My cuteness should be up by a third!$" -Route123_Text_2A0943: @ 82A0943 +Route123_Text_KayleyDefeat: @ 82A0943 .string "You're better than me by about\n" .string "five times!$" -Route123_Text_2A096E: @ 82A096E +Route123_Text_KayleyPostBattle: @ 82A096E .string "Using accessories effectively is\n" .string "the secret behind fashion appeal.$" diff --git a/include/constants/flags.h b/include/constants/flags.h index 1fe162f72..cecf109ba 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -125,7 +125,7 @@ #define FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT 0x6F #define FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE 0x70 #define FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE 0x71 // Unused Flag. Used in R/S to indicate whether player defeated or caught Groudon/Kyogre in Cave of Origin. -#define FLAG_SCOTT_CALL_NATIONAL_DEX 0x72 // Used in order to activate a phone call from Scott, inviting the player to the SS Tidal. +#define FLAG_SCOTT_CALL_BATTLE_FRONTIER 0x72 // Used in order to activate a phone call from Scott, inviting the player to the SS Tidal. #define FLAG_RECEIVED_METEORITE 0x73 #define FLAG_ADVENTURE_STARTED 0x74 // RECEIVED Pokédex. #define FLAG_DEFEATED_MAGMA_SPACE_CENTER 0x75 // Set when Team Magma is defeated at Mossdeep's Space Center. @@ -151,7 +151,7 @@ #define FLAG_THANKED_FOR_PLAYING_WITH_WALLY 0x87 #define FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL 0x88 // Set after defeating Wally outside Mauville Gym. Will activate a call later to register Wally. #define FLAG_RECEIVED_HM01 0x89 -#define FLAG_REGISTER_WINONA_POKENAV 0x8A // Set after obtaining registering Winona, and cleared after Scott's call. +#define FLAG_SCOTT_CALL_FORTREE_GYM 0x8A // Trigger calls from Scott after defeating Winona #define FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY 0x8B #define FLAG_RECEIVED_6_SODA_POP 0x8C #define FLAG_DEFEATED_SEASHORE_HOUSE 0x8D diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index c3ec28406..58ac90eab 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -149,8 +149,8 @@ #define METATILE_Fortree_SecretBase_LongGrass_BottomLeft 0x281 #define METATILE_Fortree_SecretBase_LongGrass_BottomMid 0x282 #define METATILE_Fortree_SecretBase_LongGrass_BottomRight 0x283 -#define METATILE_Fortree_WoodBridge_Kecleon0 0x297 -#define METATILE_Fortree_WoodBridge_Kecleon1 0x29F +#define METATILE_Fortree_WoodBridge1_Top 0x297 +#define METATILE_Fortree_WoodBridge1_Bottom 0x29F // gTileset_Sootopolis #define METATILE_Sootopolis_Door_Closed 0x248 diff --git a/include/constants/vars.h b/include/constants/vars.h index 0d217b192..ce395ad82 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -257,9 +257,9 @@ #define VAR_SECRET_BASE_IS_NOT_LOCAL 0x40F0 // Set to TRUE while in another player's secret base. #define VAR_DAILY_BP 0x40F1 #define VAR_WALLY_CALL_STEP_COUNTER 0x40F2 -#define VAR_WINONA_CALL_STEP_COUNTER 0x40F3 +#define VAR_SCOTT_FORTREE_CALL_STEP_COUNTER 0x40F3 #define VAR_ROXANNE_CALL_STEP_COUNTER 0x40F4 -#define VAR_SCOTT_CALL_STEP_COUNTER 0x40F5 +#define VAR_SCOTT_BF_CALL_STEP_COUNTER 0x40F5 #define VAR_RIVAL_RAYQUAZA_CALL_STEP_COUNTER 0x40F6 #define VAR_UNUSED_0x40F7 0x40F7 // Unused Var #define VAR_UNUSED_0x40F8 0x40F8 // Unused Var diff --git a/include/event_scripts.h b/include/event_scripts.h index 2d52b3d04..4c369c2d4 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -553,7 +553,7 @@ extern const u8 EventScript_EggHatch[]; extern const u8 UnusualWeather_EventScript_EndEventAndCleanup_1[]; extern const u8 IslandCave_EventScript_OpenRegiEntrance[]; extern const u8 MauvilleCity_EventScript_RegisterWallyCall[]; -extern const u8 Route119_EventScript_1F49EC[]; +extern const u8 Route119_EventScript_ScottWonAtFortreeGymCall[]; extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall[]; extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall[]; diff --git a/include/field_specials.h b/include/field_specials.h index 952081e93..3529290a6 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -13,8 +13,8 @@ void IncrementBirthIslandRockStepCount(void); bool8 UnusualWeatherHasExpired(void); bool8 ShouldDoBrailleRegicePuzzle(void); bool32 ShouldDoWallyCall(void); -bool32 ShouldDoWinonaCall(void); -bool32 ShouldDoScottCall(void); +bool32 ShouldDoScottFortreeCall(void); +bool32 ShouldDoScottBattleFrontierCall(void); bool32 ShouldDoRoxanneCall(void); bool32 ShouldDoRivalRayquazaCall(void); bool32 CountSSTidalStep(u16 delta); diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index b09a6f728..9ed331494 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -571,12 +571,12 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) ScriptContext1_SetupScript(MauvilleCity_EventScript_RegisterWallyCall); return TRUE; } - if (ShouldDoWinonaCall() == TRUE) + if (ShouldDoScottFortreeCall() == TRUE) { - ScriptContext1_SetupScript(Route119_EventScript_1F49EC); + ScriptContext1_SetupScript(Route119_EventScript_ScottWonAtFortreeGymCall); return TRUE; } - if (ShouldDoScottCall() == TRUE) + if (ShouldDoScottBattleFrontierCall() == TRUE) { ScriptContext1_SetupScript(LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall); return TRUE; diff --git a/src/field_specials.c b/src/field_specials.c index 0d9f495a9..0a8e5fb36 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -395,9 +395,9 @@ bool32 ShouldDoWallyCall(void) return TRUE; } -bool32 ShouldDoWinonaCall(void) +bool32 ShouldDoScottFortreeCall(void) { - if (FlagGet(FLAG_REGISTER_WINONA_POKENAV)) + if (FlagGet(FLAG_SCOTT_CALL_FORTREE_GYM)) { switch (gMapHeader.mapType) { @@ -405,7 +405,7 @@ bool32 ShouldDoWinonaCall(void) case MAP_TYPE_CITY: case MAP_TYPE_ROUTE: case MAP_TYPE_OCEAN_ROUTE: - if (++(*GetVarPointer(VAR_WINONA_CALL_STEP_COUNTER)) < 10) + if (++(*GetVarPointer(VAR_SCOTT_FORTREE_CALL_STEP_COUNTER)) < 10) { return FALSE; } @@ -422,9 +422,9 @@ bool32 ShouldDoWinonaCall(void) return TRUE; } -bool32 ShouldDoScottCall(void) +bool32 ShouldDoScottBattleFrontierCall(void) { - if (FlagGet(FLAG_SCOTT_CALL_NATIONAL_DEX)) + if (FlagGet(FLAG_SCOTT_CALL_BATTLE_FRONTIER)) { switch (gMapHeader.mapType) { @@ -432,7 +432,7 @@ bool32 ShouldDoScottCall(void) case MAP_TYPE_CITY: case MAP_TYPE_ROUTE: case MAP_TYPE_OCEAN_ROUTE: - if (++(*GetVarPointer(VAR_SCOTT_CALL_STEP_COUNTER)) < 10) + if (++(*GetVarPointer(VAR_SCOTT_BF_CALL_STEP_COUNTER)) < 10) { return FALSE; } |