diff options
Diffstat (limited to 'data/maps')
61 files changed, 2593 insertions, 2591 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/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 3d087c914..cf273bcb8 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -89,7 +89,7 @@ LilycoveCity_Harbor_EventScript_GoToSlateport:: @ 821E149 msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind - setvar VAR_PORTHOLE_STATE, 5 + setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE call LilycoveCity_Harbor_EventScript_BoardFerry warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate @@ -392,7 +392,7 @@ LilycoveCity_Harbor_EventScript_GoToSlateportUnused:: @ 821E575 msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind - setvar VAR_PORTHOLE_STATE, 5 + setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE call LilycoveCity_Harbor_EventScript_BoardFerry warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate 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/Route101/scripts.inc b/data/maps/Route101/scripts.inc index de28aa251..dca3dc47d 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -1,13 +1,13 @@ Route101_MapScripts:: @ 81EBCBA map_script MAP_SCRIPT_ON_TRANSITION, Route101_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_MapScript2_1EBCCB + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_OnFrame .byte 0 Route101_OnTransition: @ 81EBCC5 call ProfBirch_EventScript_UpdateLocation end -Route101_MapScript2_1EBCCB: @ 81EBCCB +Route101_OnFrame: @ 81EBCCB map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_HideMapNamePopup .2byte 0 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/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 0a8b6eafc..bccc903f1 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -309,11 +309,11 @@ Route110_EventScript_CyclingChallengeEnd:: @ 81EF661 lockall applymovement 21, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - call Route110_EventScript_1EF673 + call Route110_EventScript_CyclingChallengeResults releaseall end -Route110_EventScript_1EF673:: @ 81EF673 +Route110_EventScript_CyclingChallengeResults:: @ 81EF673 special FinishCyclingRoadChallenge msgbox Route110_Text_CyclingChallengeResultSummary, MSGBOX_DEFAULT switch VAR_RESULT diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index 37c70e351..5770ab0c0 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -40,7 +40,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_1F0FC5", + "script": "Route111_EventScript_Victor", "flag": "FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE" }, { @@ -92,7 +92,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route111_EventScript_1F121B", + "script": "Route111_EventScript_Heidi", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_1F1189", + "script": "Route111_EventScript_Man1", "flag": "0" }, { @@ -144,7 +144,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route111_EventScript_1F1204", + "script": "Route111_EventScript_Drew", "flag": "0" }, { @@ -157,7 +157,7 @@ "movement_range_y": 2, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route111_EventScript_1F1260", + "script": "Route111_EventScript_Dusty", "flag": "0" }, { @@ -170,7 +170,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route111_EventScript_1F1232", + "script": "Route111_EventScript_Beau", "flag": "0" }, { @@ -183,7 +183,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route111_EventScript_1F1249", + "script": "Route111_EventScript_Becky", "flag": "0" }, { @@ -248,7 +248,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_1F0EB9", + "script": "Route111_EventScript_Girl", "flag": "0" }, { @@ -391,7 +391,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route111_EventScript_1F12D9", + "script": "Route111_EventScript_Irene", "flag": "0" }, { @@ -404,7 +404,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route111_EventScript_1F12C2", + "script": "Route111_EventScript_Travis", "flag": "0" }, { @@ -417,7 +417,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route111_EventScript_1F12F0", + "script": "Route111_EventScript_Daisuke", "flag": "0" }, { @@ -430,7 +430,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route111_EventScript_1F1369", + "script": "Route111_EventScript_Brooke", "flag": "0" }, { @@ -443,7 +443,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route111_EventScript_1F1307", + "script": "Route111_EventScript_Wilton", "flag": "0" }, { @@ -469,7 +469,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_1F1192", + "script": "Route111_EventScript_Man2", "flag": "0" }, { @@ -482,7 +482,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route111_EventScript_1F13F9", + "script": "Route111_EventScript_Tyron", "flag": "0" }, { @@ -495,7 +495,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route111_EventScript_1F1410", + "script": "Route111_EventScript_Celina", "flag": "0" }, { @@ -508,7 +508,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route111_EventScript_1F13E2", + "script": "Route111_EventScript_Bianca", "flag": "0" }, { @@ -521,7 +521,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route111_EventScript_1F13CB", + "script": "Route111_EventScript_Hayden", "flag": "0" }, { @@ -534,7 +534,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route111_EventScript_1F143E", + "script": "Route111_EventScript_Bryan", "flag": "0" }, { @@ -547,7 +547,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route111_EventScript_1F1427", + "script": "Route111_EventScript_Celia", "flag": "0" }, { @@ -560,7 +560,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route111_EventScript_1F1455", + "script": "Route111_EventScript_Branden", "flag": "0" }, { @@ -586,7 +586,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_1F119B", + "script": "Route111_EventScript_Hiker", "flag": "0" }, { @@ -625,7 +625,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route111_EventScript_1F11E4", + "script": "Route111_EventScript_RockSmashTipFatMan", "flag": "FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY" } ], @@ -674,7 +674,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -683,7 +683,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F0A" + "script": "Route111_EventScript_ViciousSandstormTriggerDown" }, { "type": "trigger", @@ -692,7 +692,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F0A" + "script": "Route111_EventScript_ViciousSandstormTriggerDown" }, { "type": "trigger", @@ -701,7 +701,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F0A" + "script": "Route111_EventScript_ViciousSandstormTriggerDown" }, { "type": "trigger", @@ -710,7 +710,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -719,7 +719,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F16" + "script": "Route111_EventScript_ViciousSandstormTriggerLeft" }, { "type": "trigger", @@ -728,7 +728,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F16" + "script": "Route111_EventScript_ViciousSandstormTriggerLeft" }, { "type": "trigger", @@ -737,7 +737,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F16" + "script": "Route111_EventScript_ViciousSandstormTriggerLeft" }, { "type": "trigger", @@ -746,7 +746,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F16" + "script": "Route111_EventScript_ViciousSandstormTriggerLeft" }, { "type": "trigger", @@ -755,7 +755,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F0A" + "script": "Route111_EventScript_ViciousSandstormTriggerDown" }, { "type": "trigger", @@ -764,7 +764,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -773,7 +773,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -782,7 +782,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -791,7 +791,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -800,7 +800,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F16" + "script": "Route111_EventScript_ViciousSandstormTriggerLeft" }, { "type": "trigger", @@ -809,7 +809,7 @@ "elevation": 3, "var": "VAR_TEMP_3", "var_value": "0", - "script": "Route111_EventScript_1F0F16" + "script": "Route111_EventScript_ViciousSandstormTriggerLeft" }, { "type": "trigger", @@ -818,7 +818,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -827,7 +827,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -836,7 +836,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -845,7 +845,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -854,7 +854,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -863,7 +863,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -872,7 +872,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FB0" + "script": "Route111_EventScript_SunTrigger" }, { "type": "trigger", @@ -881,7 +881,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -890,7 +890,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -899,7 +899,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -908,7 +908,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -917,7 +917,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -926,7 +926,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -935,7 +935,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -944,7 +944,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -953,7 +953,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -962,7 +962,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" }, { "type": "trigger", @@ -971,7 +971,7 @@ "elevation": 3, "var": "0", "var_value": "0", - "script": "Route111_EventScript_1F0FBD" + "script": "Route111_EventScript_SandstormTrigger" } ], "bg_events": [ @@ -981,7 +981,7 @@ "y": 114, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route111_EventScript_1F115C" + "script": "Route111_EventScript_WinstrateHouseSign" }, { "type": "sign", @@ -989,7 +989,7 @@ "y": 126, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route111_EventScript_1F1153" + "script": "Route111_EventScript_RouteSignMauville" }, { "type": "sign", @@ -997,7 +997,7 @@ "y": 66, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route111_EventScript_1F1165" + "script": "Route111_EventScript_RouteSign112" }, { "type": "sign", @@ -1005,7 +1005,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route111_EventScript_1F116E" + "script": "Route111_EventScript_RouteSign113" }, { "type": "secret_base", @@ -1034,7 +1034,7 @@ "y": 19, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route111_EventScript_1F1177" + "script": "Route111_EventScript_OldLadysRestStopSign" }, { "type": "secret_base", @@ -1071,7 +1071,7 @@ "y": 84, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route111_EventScript_1F1180" + "script": "Route111_EventScript_TrainerTipsSpAtkSpDef" }, { "type": "secret_base", @@ -1109,7 +1109,7 @@ "y": 116, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route111_EventScript_1F146C" + "script": "Route111_EventScript_TrainerHillSign" } ] }
\ No newline at end of file diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 91d13e88c..b80ef6b84 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -1,22 +1,23 @@ Route111_MapScripts:: @ 81F0CA7 - map_script MAP_SCRIPT_ON_LOAD, Route111_MapScript1_1F0CBC + map_script MAP_SCRIPT_ON_LOAD, Route111_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, Route111_OnTransition - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_MapScript2_1F0E46 - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_MapScript2_1F0E56 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_OnFrame .byte 0 -Route111_MapScript1_1F0CBC: @ 81F0CBC - call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_1F0CD1 +Route111_OnLoad: @ 81F0CBC + call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_CloseDesertRuins compare VAR_MIRAGE_TOWER_STATE, 1 - call_if_eq Route111_EventScript_1F0CE4 + call_if_eq Route111_EventScript_ShowTemporaryMirageTower end -Route111_EventScript_1F0CD1:: @ 81F0CD1 +Route111_EventScript_CloseDesertRuins:: @ 81F0CD1 setmetatile 29, 86, METATILE_General_RockWall_RockBase, 1 setmetatile 29, 87, METATILE_General_RockWall_SandBase, 1 return -Route111_EventScript_1F0CE4:: @ 81F0CE4 +@ Show Mirage Tower just prior to disintegration. Mirage Tower is otherwise handled by the map layout +Route111_EventScript_ShowTemporaryMirageTower:: @ 81F0CE4 setmetatile 18, 53, METATILE_Mauville_MirageTower_Tile0, 0 setmetatile 19, 53, METATILE_Mauville_MirageTower_Tile1, 0 setmetatile 20, 53, METATILE_Mauville_MirageTower_Tile2, 0 @@ -40,53 +41,51 @@ Route111_EventScript_1F0CE4:: @ 81F0CE4 Route111_OnTransition: @ 81F0D87 setvar VAR_TRAINER_HILL_IS_ACTIVE, 0 special SetMirageTowerVisibility - call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C + call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_SetLayoutNoMirageTower compare VAR_MIRAGE_TOWER_STATE, 1 - call_if_eq Route111_EventScript_1F0DC2 + call_if_eq Route111_EventScript_SetFallingPlayerGfx compare VAR_MIRAGE_TOWER_STATE, 2 - call_if_eq Route111_EventScript_1F0E40 - call Route111_EventScript_1F0DE6 + call_if_eq Route111_EventScript_SetMirageTowerGone + call Route111_EventScript_CheckSetSandstorm call GabbyAndTy_EventScript_UpdateLocation checktrainerflag TRAINER_VICKY - goto_if_lt Route111_EventScript_1F0E26 + goto_if_lt Route111_EventScript_SetWinstratesNotDefeated end -Route111_EventScript_1F0DC2:: @ 81F0DC2 +Route111_EventScript_SetFallingPlayerGfx:: @ 81F0DC2 checkplayergender compare VAR_RESULT, MALE - goto_if_eq Route111_EventScript_1F0DDA + goto_if_eq Route111_EventScript_SetFallingPlayerGfxMale compare VAR_RESULT, FEMALE - goto_if_eq Route111_EventScript_1F0DE0 + goto_if_eq Route111_EventScript_SetFallingPlayerGfxFemale return -Route111_EventScript_1F0DDA:: @ 81F0DDA +Route111_EventScript_SetFallingPlayerGfxMale:: @ 81F0DDA setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return -Route111_EventScript_1F0DE0:: @ 81F0DE0 +Route111_EventScript_SetFallingPlayerGfxFemale:: @ 81F0DE0 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return -Route111_EventScript_1F0DE6:: @ 81F0DE6 +Route111_EventScript_CheckSetSandstorm:: @ 81F0DE6 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 34 - goto_if_lt Route111_EventScript_1F0E25 + goto_if_lt Route111_EventScript_EndCheckSetSandstorm compare VAR_TEMP_1, 107 - goto_if_gt Route111_EventScript_1F0E25 + goto_if_gt Route111_EventScript_EndCheckSetSandstorm compare VAR_TEMP_1, 72 - goto_if_gt Route111_EventScript_1F0E22 + goto_if_gt Route111_EventScript_SetSandstorm compare VAR_TEMP_0, 2000 - goto_if_gt Route111_EventScript_1F0E25 + goto_if_gt Route111_EventScript_EndCheckSetSandstorm compare VAR_TEMP_0, 8 - goto_if_lt Route111_EventScript_1F0E25 - -Route111_EventScript_1F0E22:: @ 81F0E22 + goto_if_lt Route111_EventScript_EndCheckSetSandstorm +Route111_EventScript_SetSandstorm:: @ 81F0E22 setweather WEATHER_SANDSTORM - -Route111_EventScript_1F0E25:: @ 81F0E25 +Route111_EventScript_EndCheckSetSandstorm:: @ 81F0E25 return -Route111_EventScript_1F0E26:: @ 81F0E26 +Route111_EventScript_SetWinstratesNotDefeated:: @ 81F0E26 clearflag FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE @@ -96,27 +95,27 @@ Route111_EventScript_1F0E26:: @ 81F0E26 cleartrainerflag TRAINER_VIVI end -Route111_EventScript_1F0E3C:: @ 81F0E3C +Route111_EventScript_SetLayoutNoMirageTower:: @ 81F0E3C setmaplayoutindex LAYOUT_ROUTE111_NO_MIRAGE_TOWER return -Route111_EventScript_1F0E40:: @ 81F0E40 +Route111_EventScript_SetMirageTowerGone:: @ 81F0E40 setvar VAR_MIRAGE_TOWER_STATE, 3 return -Route111_MapScript2_1F0E46: @ 81F0E46 - map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_1F0E50 +Route111_OnWarp: @ 81F0E46 + map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_HidePlayerForMirageTower .2byte 0 -Route111_EventScript_1F0E50:: @ 81F0E50 +Route111_EventScript_HidePlayerForMirageTower:: @ 81F0E50 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN end -Route111_MapScript2_1F0E56: @ 81F0E56 - map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_1F0E60 +Route111_OnFrame: @ 81F0E56 + map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_MirageTowerDisappear .2byte 0 -Route111_EventScript_1F0E60:: @ 81F0E60 +Route111_EventScript_MirageTowerDisappear:: @ 81F0E60 lockall special StartMirageTowerShake waitstate @@ -136,17 +135,18 @@ Route111_EventScript_1F0E60:: @ 81F0E60 waitstate setvar VAR_MIRAGE_TOWER_STATE, 2 clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL - goto_if_set FLAG_CHOSE_CLAW_FOSSIL, Route111_EventScript_1F0EA7 - msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT + goto_if_set FLAG_CHOSE_CLAW_FOSSIL, Route111_EventScript_RootFossilDisappeared + msgbox Route111_Text_ClawFossilDisappeared, MSGBOX_DEFAULT releaseall end -Route111_EventScript_1F0EA7:: @ 81F0EA7 - msgbox Route111_Text_1F1C9F, MSGBOX_DEFAULT +Route111_EventScript_RootFossilDisappeared:: @ 81F0EA7 + msgbox Route111_Text_RootFossilDisappeared, MSGBOX_DEFAULT releaseall end -Route111_Movement_1F0EB1:: @ 81F0EB1 +@ Unused +Route111_Movement_PlayerFall:: @ 81F0EB1 store_lock_anim walk_fast_down walk_fast_down @@ -156,498 +156,500 @@ Route111_Movement_1F0EB1:: @ 81F0EB1 walk_fast_down step_end -Route111_EventScript_1F0EB9:: @ 81F0EB9 +Route111_EventScript_Girl:: @ 81F0EB9 lock faceplayer dotimebasedevents - goto_if_set FLAG_DAILY_ROUTE_111_RECEIVED_BERRY, Route111_EventScript_1F0EF4 - msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT + goto_if_set FLAG_DAILY_ROUTE_111_RECEIVED_BERRY, Route111_EventScript_ReceivedBerry + msgbox Route111_Text_WateredPlantsEveryDayTakeBerry, MSGBOX_DEFAULT giveitem_std ITEM_RAZZ_BERRY - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_111_RECEIVED_BERRY special GetPlayerBigGuyGirlString - msgbox Route111_Text_2A6F3D, MSGBOX_DEFAULT + msgbox Route111_Text_GoingToTryToMakeDifferentColorBerries, MSGBOX_DEFAULT release end -Route111_EventScript_1F0EF4:: @ 81F0EF4 - msgbox Route111_Text_2A6F9A, MSGBOX_DEFAULT +Route111_EventScript_ReceivedBerry:: @ 81F0EF4 + msgbox Route111_Text_WhatColorBerriesToLookForToday, MSGBOX_DEFAULT release end -Route111_EventScript_1F0EFE:: @ 81F0EFE +@ Unused +Route111_EventScript_ViciousSandstormTriggerUp:: @ 81F0EFE lockall setvar VAR_0x8004, 0 - goto Route111_EventScript_1F0F2E + goto Route111_EventScript_ViciousSandstormTrigger end -Route111_EventScript_1F0F0A:: @ 81F0F0A +Route111_EventScript_ViciousSandstormTriggerDown:: @ 81F0F0A lockall setvar VAR_0x8004, 1 - goto Route111_EventScript_1F0F2E + goto Route111_EventScript_ViciousSandstormTrigger end -Route111_EventScript_1F0F16:: @ 81F0F16 +Route111_EventScript_ViciousSandstormTriggerLeft:: @ 81F0F16 lockall setvar VAR_0x8004, 2 - goto Route111_EventScript_1F0F2E + goto Route111_EventScript_ViciousSandstormTrigger end -Route111_EventScript_1F0F22:: @ 81F0F22 +@ Unused +Route111_EventScript_ViciousSandstormTriggerRight:: @ 81F0F22 lockall setvar VAR_0x8004, 3 - goto Route111_EventScript_1F0F2E + goto Route111_EventScript_ViciousSandstormTrigger end -Route111_EventScript_1F0F2E:: @ 81F0F2E +Route111_EventScript_ViciousSandstormTrigger:: @ 81F0F2E checkitem ITEM_GO_GOGGLES, 1 - compare VAR_RESULT, 0 - goto_if_eq Route111_EventScript_1F0F45 + compare VAR_RESULT, FALSE + goto_if_eq Route111_EventScript_PreventRouteAccess setvar VAR_TEMP_3, 1 releaseall end -Route111_EventScript_1F0F45:: @ 81F0F45 +Route111_EventScript_PreventRouteAccess:: @ 81F0F45 msgbox gText_SandstormIsVicious, MSGBOX_DEFAULT closemessage compare VAR_0x8004, 0 - call_if_eq Route111_EventScript_1F0F7C + call_if_eq Route111_EventScript_PushUpFromRoute compare VAR_0x8004, 1 - call_if_eq Route111_EventScript_1F0F87 + call_if_eq Route111_EventScript_PushDownFromRoute compare VAR_0x8004, 2 - call_if_eq Route111_EventScript_1F0F92 + call_if_eq Route111_EventScript_PushLeftFromRoute compare VAR_0x8004, 3 - call_if_eq Route111_EventScript_1F0F9D + call_if_eq Route111_EventScript_PushRightFromRoute releaseall end -Route111_EventScript_1F0F7C:: @ 81F0F7C - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FA8 +Route111_EventScript_PushUpFromRoute:: @ 81F0F7C + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushUpFromRoute waitmovement 0 return -Route111_EventScript_1F0F87:: @ 81F0F87 - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAA +Route111_EventScript_PushDownFromRoute:: @ 81F0F87 + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushDownFromRoute waitmovement 0 return -Route111_EventScript_1F0F92:: @ 81F0F92 - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAC +Route111_EventScript_PushLeftFromRoute:: @ 81F0F92 + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushLeftFromRoute waitmovement 0 return -Route111_EventScript_1F0F9D:: @ 81F0F9D - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAE +Route111_EventScript_PushRightFromRoute:: @ 81F0F9D + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushRightFromRoute waitmovement 0 return -Route111_Movement_1F0FA8: @ 81F0FA8 +Route111_Movement_PushUpFromRoute: @ 81F0FA8 walk_up step_end -Route111_Movement_1F0FAA: @ 81F0FAA +Route111_Movement_PushDownFromRoute: @ 81F0FAA walk_down step_end -Route111_Movement_1F0FAC: @ 81F0FAC +Route111_Movement_PushLeftFromRoute: @ 81F0FAC walk_left step_end -Route111_Movement_1F0FAE: @ 81F0FAE +Route111_Movement_PushRightFromRoute: @ 81F0FAE walk_right step_end -Route111_EventScript_1F0FB0:: @ 81F0FB0 +Route111_EventScript_SunTrigger:: @ 81F0FB0 setweather WEATHER_SUNNY fadenewbgm MUS_DOORO_X1 doweather setvar VAR_TEMP_3, 0 end -Route111_EventScript_1F0FBD:: @ 81F0FBD +Route111_EventScript_SandstormTrigger:: @ 81F0FBD setweather WEATHER_SANDSTORM fadenewbgm MUS_ASHROAD doweather end -Route111_EventScript_1F0FC5:: @ 81F0FC5 +Route111_EventScript_Victor:: @ 81F0FC5 lock faceplayer setflag FLAG_LANDMARK_WINSTRATE_FAMILY - msgbox Route111_Text_1F1475, MSGBOX_YESNO + msgbox Route111_Text_BattleOurFamily, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route111_EventScript_1F0FE7 - msgbox Route111_Text_1F14F5, MSGBOX_DEFAULT + goto_if_eq Route111_EventScript_BattleWinstrates + msgbox Route111_Text_IsThatSo, MSGBOX_DEFAULT release end -Route111_EventScript_1F0FE7:: @ 81F0FE7 - msgbox Route111_Text_1F1523, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542 +Route111_EventScript_BattleWinstrates:: @ 81F0FE7 + msgbox Route111_Text_VictorIntro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_VictorDefeat applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - call Route111_EventScript_1F113C - msgbox Route111_Text_1F156F, MSGBOX_DEFAULT + call Route111_EventScript_OpenWinstrateDoor + msgbox Route111_Text_VictorPostBattle, MSGBOX_DEFAULT closemessage - applymovement 1, Route111_Movement_1F114A + applymovement 1, Route111_Movement_WinstrateEnterHouse waitmovement 0 removeobject 1 - call Route111_EventScript_1F1143 - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F + call Route111_EventScript_CloseWinstrateDoor + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate waitmovement 0 - call Route111_EventScript_1F113C + call Route111_EventScript_OpenWinstrateDoor addobject 2 - applymovement 2, Route111_Movement_1F114D + applymovement 2, Route111_Movement_WinstrateExitHouse waitmovement 0 - call Route111_EventScript_1F1143 - msgbox Route111_Text_1F159D, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616 + call Route111_EventScript_CloseWinstrateDoor + msgbox Route111_Text_VictoriaIntro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_VictoriaDefeat applymovement 2, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - call Route111_EventScript_1F113C - msgbox Route111_Text_1F1645, MSGBOX_DEFAULT + call Route111_EventScript_OpenWinstrateDoor + msgbox Route111_Text_VictoriaPostBattle, MSGBOX_DEFAULT closemessage - applymovement 2, Route111_Movement_1F114A + applymovement 2, Route111_Movement_WinstrateEnterHouse waitmovement 0 removeobject 2 - call Route111_EventScript_1F1143 - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F + call Route111_EventScript_CloseWinstrateDoor + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate waitmovement 0 - call Route111_EventScript_1F113C + call Route111_EventScript_OpenWinstrateDoor addobject 3 - applymovement 3, Route111_Movement_1F114D + applymovement 3, Route111_Movement_WinstrateExitHouse waitmovement 0 - call Route111_EventScript_1F1143 - msgbox Route111_Text_1F167E, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6 + call Route111_EventScript_CloseWinstrateDoor + msgbox Route111_Text_ViviIntro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_VIVI, Route111_Text_ViviDefeat applymovement 3, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - call Route111_EventScript_1F113C - msgbox Route111_Text_1F16DC, MSGBOX_DEFAULT + call Route111_EventScript_OpenWinstrateDoor + msgbox Route111_Text_ViviPostBattle, MSGBOX_DEFAULT closemessage - applymovement 3, Route111_Movement_1F114A + applymovement 3, Route111_Movement_WinstrateEnterHouse waitmovement 0 removeobject 3 - call Route111_EventScript_1F1143 - applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F + call Route111_EventScript_CloseWinstrateDoor + applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate waitmovement 0 - call Route111_EventScript_1F113C + call Route111_EventScript_OpenWinstrateDoor addobject 4 - applymovement 4, Route111_Movement_1F114D + applymovement 4, Route111_Movement_WinstrateExitHouse waitmovement 0 - call Route111_EventScript_1F1143 - msgbox Route111_Text_1F16FB, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756 - msgbox Route111_Text_1F1788, MSGBOX_DEFAULT + call Route111_EventScript_CloseWinstrateDoor + msgbox Route111_Text_VickyIntro, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_VICKY, Route111_Text_VickyDefeat + msgbox Route111_Text_VickyPostBattle, MSGBOX_DEFAULT closemessage applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - call Route111_EventScript_1F113C - applymovement 4, Route111_Movement_1F114A + call Route111_EventScript_OpenWinstrateDoor + applymovement 4, Route111_Movement_WinstrateEnterHouse waitmovement 0 removeobject 4 - call Route111_EventScript_1F1143 + call Route111_EventScript_CloseWinstrateDoor release end -Route111_EventScript_1F113C:: @ 81F113C +Route111_EventScript_OpenWinstrateDoor:: @ 81F113C opendoor 13, 113 waitdooranim return -Route111_EventScript_1F1143:: @ 81F1143 +Route111_EventScript_CloseWinstrateDoor:: @ 81F1143 closedoor 13, 113 waitdooranim return -Route111_Movement_1F114A: @ 81F114A +Route111_Movement_WinstrateEnterHouse: @ 81F114A walk_in_place_fastest_up walk_up step_end -Route111_Movement_1F114D: @ 81F114D +Route111_Movement_WinstrateExitHouse: @ 81F114D walk_down step_end -Route111_Movement_1F114F: @ 81F114F +Route111_Movement_WaitForNextWinstrate: @ 81F114F delay_16 delay_16 delay_16 step_end -Route111_EventScript_1F1153:: @ 81F1153 - msgbox Route111_Text_1F18CE, MSGBOX_SIGN +Route111_EventScript_RouteSignMauville:: @ 81F1153 + msgbox Route111_Text_RouteSignMauville, MSGBOX_SIGN end -Route111_EventScript_1F115C:: @ 81F115C - msgbox Route111_Text_1F18E8, MSGBOX_SIGN +Route111_EventScript_WinstrateHouseSign:: @ 81F115C + msgbox Route111_Text_WinstrateHouseSign, MSGBOX_SIGN end -Route111_EventScript_1F1165:: @ 81F1165 - msgbox Route111_Text_1F1921, MSGBOX_SIGN +Route111_EventScript_RouteSign112:: @ 81F1165 + msgbox Route111_Text_RouteSign112, MSGBOX_SIGN end -Route111_EventScript_1F116E:: @ 81F116E - msgbox Route111_Text_1F1937, MSGBOX_SIGN +Route111_EventScript_RouteSign113:: @ 81F116E + msgbox Route111_Text_RouteSign113, MSGBOX_SIGN end -Route111_EventScript_1F1177:: @ 81F1177 - msgbox Route111_Text_1F194D, MSGBOX_SIGN +Route111_EventScript_OldLadysRestStopSign:: @ 81F1177 + msgbox Route111_Text_OldLadysRestStopSign, MSGBOX_SIGN end -Route111_EventScript_1F1180:: @ 81F1180 - msgbox Route111_Text_1F1987, MSGBOX_SIGN +Route111_EventScript_TrainerTipsSpAtkSpDef:: @ 81F1180 + msgbox Route111_Text_TrainerTipsSpAtkSpDef, MSGBOX_SIGN end -Route111_EventScript_1F1189:: @ 81F1189 - msgbox Route111_Text_1F17BA, MSGBOX_NPC +Route111_EventScript_Man1:: @ 81F1189 + msgbox Route111_Text_ToughToKeepWinningUpTheRanks, MSGBOX_NPC end -Route111_EventScript_1F1192:: @ 81F1192 - msgbox Route111_Text_1F186E, MSGBOX_NPC +Route111_EventScript_Man2:: @ 81F1192 + msgbox Route111_Text_WinstrateFamilyDestroyedMe, MSGBOX_NPC end -Route111_EventScript_1F119B:: @ 81F119B +Route111_EventScript_Hiker:: @ 81F119B lock faceplayer compare VAR_MIRAGE_TOWER_STATE, 3 - goto_if_eq Route111_EventScript_1F11C6 + goto_if_eq Route111_EventScript_HikerMirageTowerGone compare VAR_MIRAGE_TOWER_STATE, 2 - goto_if_eq Route111_EventScript_1F11D0 - goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F11DA - msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT + goto_if_eq Route111_EventScript_HikerMirageTowerDisintegrated + goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_HikerMirageTowerVisible + msgbox Route111_Text_ShouldBeMirageTowerAroundHere, MSGBOX_DEFAULT release end -Route111_EventScript_1F11C6:: @ 81F11C6 - msgbox Route111_Text_1F1C12, MSGBOX_DEFAULT +Route111_EventScript_HikerMirageTowerGone:: @ 81F11C6 + msgbox Route111_Text_MirageTowerHasntBeenSeenSince, MSGBOX_DEFAULT release end -Route111_EventScript_1F11D0:: @ 81F11D0 - msgbox Route111_Text_1F1B92, MSGBOX_DEFAULT +Route111_EventScript_HikerMirageTowerDisintegrated:: @ 81F11D0 + msgbox Route111_Text_ThatWasShockingSandRainedDown, MSGBOX_DEFAULT release end -Route111_EventScript_1F11DA:: @ 81F11DA - msgbox Route111_Text_1F1AC7, MSGBOX_DEFAULT +Route111_EventScript_HikerMirageTowerVisible:: @ 81F11DA + msgbox Route111_Text_MirageTowerClearlyVisible, MSGBOX_DEFAULT release end -Route111_EventScript_1F11E4:: @ 81F11E4 +Route111_EventScript_RockSmashTipFatMan:: @ 81F11E4 lockall applymovement 46, Common_Movement_FacePlayer waitmovement 0 - msgbox Route111_Text_1F1CCA, MSGBOX_DEFAULT + msgbox Route111_Text_MauvilleUncleToldMeToTakeRockSmash, MSGBOX_DEFAULT closemessage applymovement 46, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -Route111_EventScript_1F1204:: @ 81F1204 - trainerbattle_single TRAINER_DREW, Route111_Text_29878E, Route111_Text_29880A - msgbox Route111_Text_298853, MSGBOX_AUTOCLOSE +Route111_EventScript_Drew:: @ 81F1204 + trainerbattle_single TRAINER_DREW, Route111_Text_DrewIntro, Route111_Text_DrewDefeat + msgbox Route111_Text_DrewPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F121B:: @ 81F121B - trainerbattle_single TRAINER_HEIDI, Route111_Text_2988A3, Route111_Text_298908 - msgbox Route111_Text_29891B, MSGBOX_AUTOCLOSE +Route111_EventScript_Heidi:: @ 81F121B + trainerbattle_single TRAINER_HEIDI, Route111_Text_HeidiIntro, Route111_Text_HeidiDefeat + msgbox Route111_Text_HeidiPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F1232:: @ 81F1232 - trainerbattle_single TRAINER_BEAU, Route111_Text_29898E, Route111_Text_2989E6 - msgbox Route111_Text_298A03, MSGBOX_AUTOCLOSE +Route111_EventScript_Beau:: @ 81F1232 + trainerbattle_single TRAINER_BEAU, Route111_Text_BeauIntro, Route111_Text_BeauDefeat + msgbox Route111_Text_BeauPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F1249:: @ 81F1249 - trainerbattle_single TRAINER_BECKY, Route111_Text_298A65, Route111_Text_298AAF - msgbox Route111_Text_298AC0, MSGBOX_AUTOCLOSE +Route111_EventScript_Becky:: @ 81F1249 + trainerbattle_single TRAINER_BECKY, Route111_Text_BeckyIntro, Route111_Text_BeckyDefeat + msgbox Route111_Text_BeckyPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F1260:: @ 81F1260 - trainerbattle_single TRAINER_DUSTY_1, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C +Route111_EventScript_Dusty:: @ 81F1260 + trainerbattle_single TRAINER_DUSTY_1, Route111_Text_DustyIntro, Route111_Text_DustyDefeat, Route111_EventScript_RegisterDusty specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route111_EventScript_1F12AB - msgbox Route111_Text_298B9A, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route111_EventScript_RematchDusty + msgbox Route111_Text_DustyPostBattle, MSGBOX_DEFAULT release end -Route111_EventScript_1F128C:: @ 81F128C +Route111_EventScript_RegisterDusty:: @ 81F128C special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route111_Text_298C00, MSGBOX_DEFAULT + msgbox Route111_Text_DustyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_DUSTY_1 release end -Route111_EventScript_1F12AB:: @ 81F12AB - trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_298C5F, Route111_Text_298CD2 - msgbox Route111_Text_298D0C, MSGBOX_AUTOCLOSE +Route111_EventScript_RematchDusty:: @ 81F12AB + trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_DustyRematchIntro, Route111_Text_DustyRematchDefeat + msgbox Route111_Text_DustyPostRematch, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F12C2:: @ 81F12C2 - trainerbattle_single TRAINER_TRAVIS, Route111_Text_298DA9, Route111_Text_298DD8 - msgbox Route111_Text_298DF1, MSGBOX_AUTOCLOSE +Route111_EventScript_Travis:: @ 81F12C2 + trainerbattle_single TRAINER_TRAVIS, Route111_Text_TravisIntro, Route111_Text_TravisDefeat + msgbox Route111_Text_TravisPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F12D9:: @ 81F12D9 - trainerbattle_single TRAINER_IRENE, Route111_Text_298E2F, Route111_Text_298E6E - msgbox Route111_Text_298E8C, MSGBOX_AUTOCLOSE +Route111_EventScript_Irene:: @ 81F12D9 + trainerbattle_single TRAINER_IRENE, Route111_Text_IreneIntro, Route111_Text_IreneDefeat + msgbox Route111_Text_IrenePostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F12F0:: @ 81F12F0 - trainerbattle_single TRAINER_DAISUKE, Route111_Text_298EE6, Route111_Text_298F14 - msgbox Route111_Text_298F26, MSGBOX_AUTOCLOSE +Route111_EventScript_Daisuke:: @ 81F12F0 + trainerbattle_single TRAINER_DAISUKE, Route111_Text_DaisukeIntro, Route111_Text_DaisukeDefeat + msgbox Route111_Text_DaisukePostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F1307:: @ 81F1307 - trainerbattle_single TRAINER_WILTON_1, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333 +Route111_EventScript_Wilton:: @ 81F1307 + trainerbattle_single TRAINER_WILTON_1, Route111_Text_WiltonIntro, Route111_Text_WiltonDefeat, Route111_EventScript_RegisterWilton specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route111_EventScript_1F1352 - msgbox Route111_Text_298FD4, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route111_EventScript_RematchWilton + msgbox Route111_Text_WiltonPostBattle, MSGBOX_DEFAULT release end -Route111_EventScript_1F1333:: @ 81F1333 +Route111_EventScript_RegisterWilton:: @ 81F1333 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route111_Text_29903D, MSGBOX_DEFAULT + msgbox Route111_Text_WiltonRegister, MSGBOX_DEFAULT register_matchcall TRAINER_WILTON_1 release end -Route111_EventScript_1F1352:: @ 81F1352 - trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_29909B, Route111_Text_2990EE - msgbox Route111_Text_299102, MSGBOX_AUTOCLOSE +Route111_EventScript_RematchWilton:: @ 81F1352 + trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_WiltonRematchIntro, Route111_Text_WiltonRematchDefeat + msgbox Route111_Text_WiltonPostRematch, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F1369:: @ 81F1369 - trainerbattle_single TRAINER_BROOKE_1, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395 +Route111_EventScript_Brooke:: @ 81F1369 + trainerbattle_single TRAINER_BROOKE_1, Route111_Text_BrookeIntro, Route111_Text_BrookeDefeat, Route111_EventScript_RegisterBrooke specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route111_EventScript_1F13B4 - msgbox Route111_Text_2991C2, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route111_EventScript_RematchBrooke + msgbox Route111_Text_BrookePostBattle, MSGBOX_DEFAULT release end -Route111_EventScript_1F1395:: @ 81F1395 +Route111_EventScript_RegisterBrooke:: @ 81F1395 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route111_Text_29921D, MSGBOX_DEFAULT + msgbox Route111_Text_BrookeRegister, MSGBOX_DEFAULT register_matchcall TRAINER_BROOKE_1 release end -Route111_EventScript_1F13B4:: @ 81F13B4 - trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_29925D, Route111_Text_2992D6 - msgbox Route111_Text_2992F5, MSGBOX_AUTOCLOSE +Route111_EventScript_RematchBrooke:: @ 81F13B4 + trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_BrookeRematchIntro, Route111_Text_BrookeRematchDefeat + msgbox Route111_Text_BrookePostRematch, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F13CB:: @ 81F13CB - trainerbattle_single TRAINER_HAYDEN, Route111_Text_299682, Route111_Text_2996BE - msgbox Route111_Text_2996C5, MSGBOX_AUTOCLOSE +Route111_EventScript_Hayden:: @ 81F13CB + trainerbattle_single TRAINER_HAYDEN, Route111_Text_HaydenIntro, Route111_Text_HaydenDefeat + msgbox Route111_Text_HaydenPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F13E2:: @ 81F13E2 - trainerbattle_single TRAINER_BIANCA, Route111_Text_2996FE, Route111_Text_29973D - msgbox Route111_Text_29975D, MSGBOX_AUTOCLOSE +Route111_EventScript_Bianca:: @ 81F13E2 + trainerbattle_single TRAINER_BIANCA, Route111_Text_BiancaIntro, Route111_Text_BiancaDefeat + msgbox Route111_Text_BiancaPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F13F9:: @ 81F13F9 - trainerbattle_single TRAINER_TYRON, Route111_Text_299524, Route111_Text_299549 - msgbox Route111_Text_299576, MSGBOX_AUTOCLOSE +Route111_EventScript_Tyron:: @ 81F13F9 + trainerbattle_single TRAINER_TYRON, Route111_Text_TyronIntro, Route111_Text_TyronDefeat + msgbox Route111_Text_TyronPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F1410:: @ 81F1410 - trainerbattle_single TRAINER_CELINA, Route111_Text_2995F0, Route111_Text_299625 - msgbox Route111_Text_29964B, MSGBOX_AUTOCLOSE +Route111_EventScript_Celina:: @ 81F1410 + trainerbattle_single TRAINER_CELINA, Route111_Text_CelinaIntro, Route111_Text_CelinaDefeat + msgbox Route111_Text_CelinaPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F1427:: @ 81F1427 - trainerbattle_single TRAINER_CELIA, Route111_Text_29934B, Route111_Text_299384 - msgbox Route111_Text_2993A7, MSGBOX_AUTOCLOSE +Route111_EventScript_Celia:: @ 81F1427 + trainerbattle_single TRAINER_CELIA, Route111_Text_CeliaIntro, Route111_Text_CeliaDefeat + msgbox Route111_Text_CeliaPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F143E:: @ 81F143E - trainerbattle_single TRAINER_BRYAN, Route111_Text_299401, Route111_Text_299431 - msgbox Route111_Text_29945F, MSGBOX_AUTOCLOSE +Route111_EventScript_Bryan:: @ 81F143E + trainerbattle_single TRAINER_BRYAN, Route111_Text_BryanIntro, Route111_Text_BryanDefeat + msgbox Route111_Text_BryanPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F1455:: @ 81F1455 - trainerbattle_single TRAINER_BRANDEN, Route111_Text_299493, Route111_Text_2994C5 - msgbox Route111_Text_2994FB, MSGBOX_AUTOCLOSE +Route111_EventScript_Branden:: @ 81F1455 + trainerbattle_single TRAINER_BRANDEN, Route111_Text_BrandenIntro, Route111_Text_BrandenDefeat + msgbox Route111_Text_BrandenPostBattle, MSGBOX_AUTOCLOSE end -Route111_EventScript_1F146C:: @ 81F146C - msgbox Route111_Text_1F1D61, MSGBOX_SIGN +Route111_EventScript_TrainerHillSign:: @ 81F146C + msgbox Route111_Text_TrainerHillSign, MSGBOX_SIGN end -Route111_Text_1F1475: @ 81F1475 +Route111_Text_BattleOurFamily: @ 81F1475 .string "Hello! I take it you're a traveler.\p" .string "How's this? What do you say to taking\n" .string "on our family of four in a series of\l" .string "POKéMON battles?$" -Route111_Text_1F14F5: @ 81F14F5 +Route111_Text_IsThatSo: @ 81F14F5 .string "Is that so?\n" .string "Drop in, if you change your mind!$" -Route111_Text_1F1523: @ 81F1523 +Route111_Text_VictorIntro: @ 81F1523 .string "That's the spirit! I like you!$" -Route111_Text_1F1542: @ 81F1542 +Route111_Text_VictorDefeat: @ 81F1542 .string "Aiyah!\n" .string "You're a lot tougher than I expected!$" -Route111_Text_1F156F: @ 81F156F +Route111_Text_VictorPostBattle: @ 81F156F .string "Hey, all!\n" .string "I've found a pretty strong TRAINER!$" -Route111_Text_1F159D: @ 81F159D +Route111_Text_VictoriaIntro: @ 81F159D .string "Oh, my goodness! Aren't you young?\p" .string "You must be quite the TRAINER to beat\n" .string "my husband, though.\p" .string "It's my turn to battle now!$" -Route111_Text_1F1616: @ 81F1616 +Route111_Text_VictoriaDefeat: @ 81F1616 .string "Oh, gosh!\n" .string "I can't get over how strong you are!$" -Route111_Text_1F1645: @ 81F1645 +Route111_Text_VictoriaPostBattle: @ 81F1645 .string "There's a strong TRAINER here!\n" .string "This one's really strong!$" -Route111_Text_1F167E: @ 81F167E +Route111_Text_ViviIntro: @ 81F167E .string "You're stronger than Mommy? Wow!\p" .string "But I'm strong, too!\n" .string "Really! Honestly!$" -Route111_Text_1F16C6: @ 81F16C6 +Route111_Text_ViviDefeat: @ 81F16C6 .string "Huh? Did I just lose?$" -Route111_Text_1F16DC: @ 81F16DC +Route111_Text_ViviPostBattle: @ 81F16DC .string "This stinks…\p" .string "…Snivel… Grandma!$" -Route111_Text_1F16FB: @ 81F16FB +Route111_Text_VickyIntro: @ 81F16FB .string "How dare you make my granddaughter\n" .string "cry!\p" .string "For that, I'm going to smack you!\n" .string "Prepare to lose!$" -Route111_Text_1F1756: @ 81F1756 +Route111_Text_VickyDefeat: @ 81F1756 .string "Kwah! You are strong…\n" .string "My granddaughter was right…$" -Route111_Text_1F1788: @ 81F1788 +Route111_Text_VickyPostBattle: @ 81F1788 .string "If you're not in any hurry,\n" .string "visit with us awhile.$" -Route111_Text_1F17BA: @ 81F17BA +Route111_Text_ToughToKeepWinningUpTheRanks: @ 81F17BA .string "If you don't raise your POKéMON some\n" .string "more, it could be tough to keep winning\l" .string "up through the ranks.\p" @@ -655,32 +657,32 @@ Route111_Text_1F17BA: @ 81F17BA .string "ELITE FOUR are far stronger than\l" .string "any GYM LEADER.$" -Route111_Text_1F186E: @ 81F186E +Route111_Text_WinstrateFamilyDestroyedMe: @ 81F186E .string "I challenged the WINSTRATE family,\n" .string "but four matches in a row is tough\l" .string "going… They destroyed me.$" -Route111_Text_1F18CE: @ 81F18CE +Route111_Text_RouteSignMauville: @ 81F18CE .string "ROUTE 111\n" .string "{DOWN_ARROW} MAUVILLE CITY$" -Route111_Text_1F18E8: @ 81F18E8 +Route111_Text_WinstrateHouseSign: @ 81F18E8 .string "“Our family's hearts beat as one!”\n" .string "THE WINSTRATE'S HOUSE$" -Route111_Text_1F1921: @ 81F1921 +Route111_Text_RouteSign112: @ 81F1921 .string "ROUTE 111\n" .string "{LEFT_ARROW} ROUTE 112$" -Route111_Text_1F1937: @ 81F1937 +Route111_Text_RouteSign113: @ 81F1937 .string "ROUTE 111\n" .string "{LEFT_ARROW} ROUTE 113$" -Route111_Text_1F194D: @ 81F194D +Route111_Text_OldLadysRestStopSign: @ 81F194D .string "OLD LADY'S REST STOP\n" .string "“Come in and rest your tired bones.”$" -Route111_Text_1F1987: @ 81F1987 +Route111_Text_TrainerTipsSpAtkSpDef: @ 81F1987 .string "TRAINER TIPS\p" .string "One of the indicators of a POKéMON's\n" .string "powerfulness is SP. ATK. It stands for\l" @@ -688,14 +690,14 @@ Route111_Text_1F1987: @ 81F1987 .string "Likewise, SP. DEF stands for “SPECIAL\n" .string "DEFENSE.”$" -Route111_Text_1F1A22: @ 81F1A22 +Route111_Text_ShouldBeMirageTowerAroundHere: @ 81F1A22 .string "There should be a tower made of sand\n" .string "around here somewhere.\p" .string "But for some reason, it can be seen\n" .string "sometimes, and sometimes not.\p" .string "That's why I call it the MIRAGE TOWER.$" -Route111_Text_1F1AC7: @ 81F1AC7 +Route111_Text_MirageTowerClearlyVisible: @ 81F1AC7 .string "I see it!\n" .string "The tower of sand!\p" .string "The sand tower they called a mirage\n" @@ -705,7 +707,7 @@ Route111_Text_1F1AC7: @ 81F1AC7 .string "I want to go inside it, but I can't\n" .string "get my courage up for it…$" -Route111_Text_1F1B92: @ 81F1B92 +Route111_Text_ThatWasShockingSandRainedDown: @ 81F1B92 .string "Whoa…\n" .string "That was shocking.\p" .string "Sand rained down in chunks all of\n" @@ -713,21 +715,21 @@ Route111_Text_1F1B92: @ 81F1B92 .string "What was it like inside?\n" .string "Were there sandy ghosts and such?$" -Route111_Text_1F1C12: @ 81F1C12 +Route111_Text_MirageTowerHasntBeenSeenSince: @ 81F1C12 .string "Since I spoke to you, the tower of sand\n" .string "hasn't been seen.\p" .string "Perhaps it really was\n" .string "the MIRAGE TOWER…$" -Route111_Text_1F1C74: @ 81F1C74 +Route111_Text_ClawFossilDisappeared: @ 81F1C74 .string "The CLAW FOSSIL disappeared into\n" .string "the sand…$" -Route111_Text_1F1C9F: @ 81F1C9F +Route111_Text_RootFossilDisappeared: @ 81F1C9F .string "The ROOT FOSSIL disappeared into\n" .string "the sand…$" -Route111_Text_1F1CCA: @ 81F1CCA +Route111_Text_MauvilleUncleToldMeToTakeRockSmash: @ 81F1CCA .string "Oh, no!\p" .string "My uncle in MAUVILLE told me to take\n" .string "ROCK SMASH with me if I was going to\l" @@ -735,7 +737,7 @@ Route111_Text_1F1CCA: @ 81F1CCA .string "My uncle? He lives across from\n" .string "the bike shop in MAUVILLE.$" -Route111_Text_1F1D61: @ 81F1D61 +Route111_Text_TrainerHillSign: @ 81F1D61 .string "{RIGHT_ARROW} TRAINER HILL ENTRANCE\p" .string "“Scale the heights, you hot-blooded\n" .string "TRAINERS!”$" diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index b963c6c48..e52468f32 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -40,7 +40,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route112_EventScript_1F1DB7", + "script": "Route112_EventScript_MagmaGrunts", "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" }, { @@ -53,7 +53,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route112_EventScript_1F1E6A", + "script": "Route112_EventScript_Brice", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route112_EventScript_1F1EE3", + "script": "Route112_EventScript_Larry", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route112_EventScript_1F1EFA", + "script": "Route112_EventScript_Carol", "flag": "0" }, { @@ -92,7 +92,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route112_EventScript_1F1E81", + "script": "Route112_EventScript_Trent", "flag": "0" }, { @@ -105,7 +105,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route112_EventScript_1F1DB7", + "script": "Route112_EventScript_MagmaGrunts", "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" }, { @@ -170,7 +170,7 @@ "movement_range_y": 3, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route112_EventScript_1F1E61", + "script": "Route112_EventScript_Hiker", "flag": "0" }, { @@ -196,7 +196,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route112_EventScript_1F1F11", + "script": "Route112_EventScript_Bryant", "flag": "0" }, { @@ -209,7 +209,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route112_EventScript_1F1F28", + "script": "Route112_EventScript_Shayla", "flag": "0" } ], @@ -265,7 +265,7 @@ "y": 44, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route112_EventScript_1F1E4F" + "script": "Route112_EventScript_MtChimneySign" }, { "type": "sign", @@ -273,7 +273,7 @@ "y": 37, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route112_EventScript_1F1E46" + "script": "Route112_EventScript_MtChimneyCableCarSign" }, { "type": "sign", @@ -281,7 +281,7 @@ "y": 49, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route112_EventScript_1F1E58" + "script": "Route112_EventScript_RouteSignLavaridge" } ] }
\ No newline at end of file diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index beb572f08..4dd4fe112 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -7,13 +7,13 @@ Route112_OnTransition: @ 81F1DAE setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end -Route112_EventScript_1F1DB7:: @ 81F1DB7 +Route112_EventScript_MagmaGrunts:: @ 81F1DB7 lockall delay 40 applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 20 - msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT + msgbox Route112_Text_LeaderGoingToAwakenThing, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 @@ -21,7 +21,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 20 - msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT + msgbox Route112_Text_YeahWeNeedMeteorite, MSGBOX_DEFAULT closemessage applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 @@ -29,7 +29,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 1, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 20 - msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT + msgbox Route112_Text_OhThatsWhyCrewWentToFallarbor, MSGBOX_DEFAULT closemessage applymovement 1, Common_Movement_FaceOriginalDirection waitmovement 0 @@ -37,107 +37,107 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7 applymovement 6, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 20 - msgbox Route112_Text_1F2003, MSGBOX_DEFAULT + msgbox Route112_Text_CantLetAnyonePassUntilTheyreBack, MSGBOX_DEFAULT closemessage applymovement 6, Common_Movement_FaceOriginalDirection waitmovement 0 releaseall end -Route112_EventScript_1F1E46:: @ 81F1E46 - msgbox Route112_Text_1F20C1, MSGBOX_SIGN +Route112_EventScript_MtChimneyCableCarSign:: @ 81F1E46 + msgbox Route112_Text_MtChimneyCableCarSign, MSGBOX_SIGN end -Route112_EventScript_1F1E4F:: @ 81F1E4F - msgbox Route112_Text_1F20ED, MSGBOX_SIGN +Route112_EventScript_MtChimneySign:: @ 81F1E4F + msgbox Route112_Text_MtChimneySign, MSGBOX_SIGN end -Route112_EventScript_1F1E58:: @ 81F1E58 - msgbox Route112_Text_1F2138, MSGBOX_SIGN +Route112_EventScript_RouteSignLavaridge:: @ 81F1E58 + msgbox Route112_Text_RouteSignLavaridge, MSGBOX_SIGN end -Route112_EventScript_1F1E61:: @ 81F1E61 - msgbox Route112_Text_1F204E, MSGBOX_NPC +Route112_EventScript_Hiker:: @ 81F1E61 + msgbox Route112_Text_NotEasyToGetBackToLavaridge, MSGBOX_NPC end -Route112_EventScript_1F1E6A:: @ 81F1E6A - trainerbattle_single TRAINER_BRICE, Route112_Text_29978E, Route112_Text_2997CA - msgbox Route112_Text_2997DC, MSGBOX_AUTOCLOSE +Route112_EventScript_Brice:: @ 81F1E6A + trainerbattle_single TRAINER_BRICE, Route112_Text_BriceIntro, Route112_Text_BriceDefeat + msgbox Route112_Text_BricePostBattle, MSGBOX_AUTOCLOSE end -Route112_EventScript_1F1E81:: @ 81F1E81 - trainerbattle_single TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD +Route112_EventScript_Trent:: @ 81F1E81 + trainerbattle_single TRAINER_TRENT_1, Route112_Text_TrentIntro, Route112_Text_TrentDefeat, Route112_EventScript_RegisterTrent specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route112_EventScript_1F1ECC - msgbox Route112_Text_299896, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route112_EventScript_RematchTrent + msgbox Route112_Text_TrentPostBattle, MSGBOX_DEFAULT release end -Route112_EventScript_1F1EAD:: @ 81F1EAD +Route112_EventScript_RegisterTrent:: @ 81F1EAD special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route112_Text_29993C, MSGBOX_DEFAULT + msgbox Route112_Text_TrentRegister, MSGBOX_DEFAULT register_matchcall TRAINER_TRENT_1 release end -Route112_EventScript_1F1ECC:: @ 81F1ECC - trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_2999BD, Route112_Text_2999F7 - msgbox Route112_Text_299A0F, MSGBOX_AUTOCLOSE +Route112_EventScript_RematchTrent:: @ 81F1ECC + trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_TrentRematchIntro, Route112_Text_TrentRematchDefeat + msgbox Route112_Text_TrentRematchPostBattle, MSGBOX_AUTOCLOSE end -Route112_EventScript_1F1EE3:: @ 81F1EE3 - trainerbattle_single TRAINER_LARRY, Route112_Text_299A89, Route112_Text_299AAC - msgbox Route112_Text_299AB4, MSGBOX_AUTOCLOSE +Route112_EventScript_Larry:: @ 81F1EE3 + trainerbattle_single TRAINER_LARRY, Route112_Text_LarryIntro, Route112_Text_LarryDefeat + msgbox Route112_Text_LarryPostBattle, MSGBOX_AUTOCLOSE end -Route112_EventScript_1F1EFA:: @ 81F1EFA - trainerbattle_single TRAINER_CAROL, Route112_Text_299AE4, Route112_Text_299B36 - msgbox Route112_Text_299B4C, MSGBOX_AUTOCLOSE +Route112_EventScript_Carol:: @ 81F1EFA + trainerbattle_single TRAINER_CAROL, Route112_Text_CarolIntro, Route112_Text_CarolDefeat + msgbox Route112_Text_CarolPostBattle, MSGBOX_AUTOCLOSE end -Route112_EventScript_1F1F11:: @ 81F1F11 - trainerbattle_single TRAINER_BRYANT, Route112_Text_299BAE, Route112_Text_299BDF - msgbox Route112_Text_299BFB, MSGBOX_AUTOCLOSE +Route112_EventScript_Bryant:: @ 81F1F11 + trainerbattle_single TRAINER_BRYANT, Route112_Text_BryantIntro, Route112_Text_BryantDefeat + msgbox Route112_Text_BryantPostBattle, MSGBOX_AUTOCLOSE end -Route112_EventScript_1F1F28:: @ 81F1F28 - trainerbattle_single TRAINER_SHAYLA, Route112_Text_299C34, Route112_Text_299C8F - msgbox Route112_Text_299CC6, MSGBOX_AUTOCLOSE +Route112_EventScript_Shayla:: @ 81F1F28 + trainerbattle_single TRAINER_SHAYLA, Route112_Text_ShaylaIntro, Route112_Text_ShaylaDefeat + msgbox Route112_Text_ShaylaPostBattle, MSGBOX_AUTOCLOSE end -Route112_Text_1F1F3F: @ 81F1F3F +Route112_Text_LeaderGoingToAwakenThing: @ 81F1F3F .string "Hey, man, is our leader really going\n" .string "to awaken that thing?$" -Route112_Text_1F1F7A: @ 81F1F7A +Route112_Text_YeahWeNeedMeteorite: @ 81F1F7A .string "Sounds like it, yeah. But I heard\n" .string "we need a METEORITE to do it.$" -Route112_Text_1F1FBA: @ 81F1FBA +Route112_Text_OhThatsWhyCrewWentToFallarbor: @ 81F1FBA .string "Oh, I get it now. That's why the rest\n" .string "of the crew went out to FALLARBOR.$" -Route112_Text_1F2003: @ 81F2003 +Route112_Text_CantLetAnyonePassUntilTheyreBack: @ 81F2003 .string "You got it. And until they come back,\n" .string "we're not to let anyone pass, right.$" -Route112_Text_1F204E: @ 81F204E +Route112_Text_NotEasyToGetBackToLavaridge: @ 81F204E .string "Eh, I'd like to get to MAUVILLE, but if\n" .string "I went down these ledges, it'd be no\l" .string "easy matter to get back to LAVARIDGE.$" -Route112_Text_1F20C1: @ 81F20C1 +Route112_Text_MtChimneyCableCarSign: @ 81F20C1 .string "MT. CHIMNEY CABLE CAR\n" .string "“A short walk {UP_ARROW} way!”$" -Route112_Text_1F20ED: @ 81F20ED +Route112_Text_MtChimneySign: @ 81F20ED .string "MT. CHIMNEY\p" .string "“For LAVARIDGE TOWN or the summit,\n" .string "please take the CABLE CAR.”$" -Route112_Text_1F2138: @ 81F2138 +Route112_Text_RouteSignLavaridge: @ 81F2138 .string "ROUTE 112\n" .string "{LEFT_ARROW} LAVARIDGE TOWN$" diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index bcff99de4..ba3cf2452 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -40,7 +40,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route113_EventScript_1F2193", + "script": "Route113_EventScript_NinjaBoy", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route113_EventScript_1F218A", + "script": "Route113_EventScript_Gentleman", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route113_EventScript_1F21C0", + "script": "Route113_EventScript_Jaylen", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route113_EventScript_1F21D7", + "script": "Route113_EventScript_Dillon", "flag": "0" }, { @@ -92,7 +92,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route113_EventScript_1F21EE", + "script": "Route113_EventScript_Madeline", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 0, "trainer_type": "3", "trainer_sight_or_berry_tree_id": "1", - "script": "Route113_EventScript_1F2250", + "script": "Route113_EventScript_Lao", "flag": "0" }, { @@ -144,7 +144,7 @@ "movement_range_y": 0, "trainer_type": "3", "trainer_sight_or_berry_tree_id": "1", - "script": "Route113_EventScript_1F22B2", + "script": "Route113_EventScript_Lung", "flag": "0" }, { @@ -157,7 +157,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route113_EventScript_1F22C9", + "script": "Route113_EventScript_Tori", "flag": "0" }, { @@ -170,7 +170,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route113_EventScript_1F22E4", + "script": "Route113_EventScript_Tia", "flag": "0" }, { @@ -196,7 +196,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route113_EventScript_1F2344", + "script": "Route113_EventScript_Wyatt", "flag": "0" }, { @@ -209,7 +209,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route113_EventScript_1F232D", + "script": "Route113_EventScript_Lawrence", "flag": "0" }, { @@ -222,7 +222,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route113_EventScript_1F22FF", + "script": "Route113_EventScript_Sophie", "flag": "0" }, { @@ -235,7 +235,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route113_EventScript_1F2316", + "script": "Route113_EventScript_Coby", "flag": "0" } ], @@ -404,7 +404,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route113_EventScript_1F219C" + "script": "Route113_EventScript_RouteSign111" }, { "type": "sign", @@ -412,7 +412,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route113_EventScript_1F21A5" + "script": "Route113_EventScript_RouteSignFallarbor" }, { "type": "sign", @@ -420,7 +420,7 @@ "y": 4, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route113_EventScript_1F21B7" + "script": "Route113_EventScript_TrainerTipsRegisterKeyItems" }, { "type": "sign", @@ -428,7 +428,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route113_EventScript_1F21AE" + "script": "Route113_EventScript_GlassWorkshopSign" }, { "type": "secret_base", diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 89bf97373..612e4a864 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -1,170 +1,170 @@ Route113_MapScripts:: @ 81F2153 - map_script MAP_SCRIPT_ON_RESUME, Route113_MapScript1_1F215E + map_script MAP_SCRIPT_ON_RESUME, Route113_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Route113_OnTransition .byte 0 -Route113_MapScript1_1F215E: @ 81F215E +Route113_OnResume: @ 81F215E setstepcallback STEP_CB_ASH end Route113_OnTransition: @ 81F2161 clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE - call Route113_EventScript_1F216A + call Route113_EventScript_CheckSetAshWeather end -Route113_EventScript_1F216A:: @ 81F216A +Route113_EventScript_CheckSetAshWeather:: @ 81F216A getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_0, 19 - goto_if_lt Route113_EventScript_1F2189 + goto_if_lt Route113_EventScript_DontSetAshWeather compare VAR_TEMP_0, 84 - goto_if_gt Route113_EventScript_1F2189 + goto_if_gt Route113_EventScript_DontSetAshWeather setweather WEATHER_ASH return -Route113_EventScript_1F2189:: @ 81F2189 +Route113_EventScript_DontSetAshWeather:: @ 81F2189 return -Route113_EventScript_1F218A:: @ 81F218A - msgbox Route113_Text_1F235B, MSGBOX_NPC +Route113_EventScript_Gentleman:: @ 81F218A + msgbox Route113_Text_AshCanBeFashionedIntoGlass, MSGBOX_NPC end -Route113_EventScript_1F2193:: @ 81F2193 - msgbox Route113_Text_1F23CA, MSGBOX_NPC +Route113_EventScript_NinjaBoy:: @ 81F2193 + msgbox Route113_Text_FunWalkingThroughAsh, MSGBOX_NPC end -Route113_EventScript_1F219C:: @ 81F219C - msgbox Route113_Text_1F2440, MSGBOX_SIGN +Route113_EventScript_RouteSign111:: @ 81F219C + msgbox Route113_Text_RouteSign111, MSGBOX_SIGN end -Route113_EventScript_1F21A5:: @ 81F21A5 - msgbox Route113_Text_1F2456, MSGBOX_SIGN +Route113_EventScript_RouteSignFallarbor:: @ 81F21A5 + msgbox Route113_Text_RouteSignFallarbor, MSGBOX_SIGN end -Route113_EventScript_1F21AE:: @ 81F21AE - msgbox Route113_Text_1F24F8, MSGBOX_SIGN +Route113_EventScript_GlassWorkshopSign:: @ 81F21AE + msgbox Route113_Text_GlassWorkshopSign, MSGBOX_SIGN end -Route113_EventScript_1F21B7:: @ 81F21B7 - msgbox Route113_Text_1F2471, MSGBOX_SIGN +Route113_EventScript_TrainerTipsRegisterKeyItems:: @ 81F21B7 + msgbox Route113_Text_TrainerTipsRegisterKeyItems, MSGBOX_SIGN end -Route113_EventScript_1F21C0:: @ 81F21C0 - trainerbattle_single TRAINER_JAYLEN, Route113_Text_299D3C, Route113_Text_299D68 - msgbox Route113_Text_299D7D, MSGBOX_AUTOCLOSE +Route113_EventScript_Jaylen:: @ 81F21C0 + trainerbattle_single TRAINER_JAYLEN, Route113_Text_JaylenIntro, Route113_Text_JaylenDefeat + msgbox Route113_Text_JaylenPostBattle, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F21D7:: @ 81F21D7 - trainerbattle_single TRAINER_DILLON, Route113_Text_299DE3, Route113_Text_299E1C - msgbox Route113_Text_299E38, MSGBOX_AUTOCLOSE +Route113_EventScript_Dillon:: @ 81F21D7 + trainerbattle_single TRAINER_DILLON, Route113_Text_DillonIntro, Route113_Text_DillonDefeat + msgbox Route113_Text_DillonPostBattle, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F21EE:: @ 81F21EE - trainerbattle_single TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A +Route113_EventScript_Madeline:: @ 81F21EE + trainerbattle_single TRAINER_MADELINE_1, Route113_Text_MadelineIntro, Route113_Text_MadelineDefeat, Route113_EventScript_RegisterMadeline specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route113_EventScript_1F2239 - msgbox Route113_Text_299F15, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route113_EventScript_RematchMadeline + msgbox Route113_Text_MadelinePostBattle, MSGBOX_DEFAULT release end -Route113_EventScript_1F221A:: @ 81F221A +Route113_EventScript_RegisterMadeline:: @ 81F221A special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route113_Text_299F49, MSGBOX_DEFAULT + msgbox Route113_Text_MadelineRegister, MSGBOX_DEFAULT register_matchcall TRAINER_MADELINE_1 release end -Route113_EventScript_1F2239:: @ 81F2239 - trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_299F8A, Route113_Text_299FC9 - msgbox Route113_Text_299FD8, MSGBOX_AUTOCLOSE +Route113_EventScript_RematchMadeline:: @ 81F2239 + trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_MadelineRematchIntro, Route113_Text_MadelineRematchDefeat + msgbox Route113_Text_MadelinePostRematch, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F2250:: @ 81F2250 - trainerbattle_single TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C +Route113_EventScript_Lao:: @ 81F2250 + trainerbattle_single TRAINER_LAO_1, Route113_Text_LaoIntro, Route113_Text_LaoDefeat, Route113_EventScript_RegisterLao specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route113_EventScript_1F229B - msgbox Route113_Text_29A067, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route113_EventScript_RematchLao + msgbox Route113_Text_LaoPostBattle, MSGBOX_DEFAULT release end -Route113_EventScript_1F227C:: @ 81F227C +Route113_EventScript_RegisterLao:: @ 81F227C special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route113_Text_29A0A2, MSGBOX_DEFAULT + msgbox Route113_Text_LaoRegister, MSGBOX_DEFAULT register_matchcall TRAINER_LAO_1 release end -Route113_EventScript_1F229B:: @ 81F229B - trainerbattle_rematch TRAINER_LAO_1, Route113_Text_29A0E8, Route113_Text_29A11F - msgbox Route113_Text_29A13A, MSGBOX_AUTOCLOSE +Route113_EventScript_RematchLao:: @ 81F229B + trainerbattle_rematch TRAINER_LAO_1, Route113_Text_LaoRematchIntro, Route113_Text_LaoRematchDefeat + msgbox Route113_Text_LaoPostRematch, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F22B2:: @ 81F22B2 - trainerbattle_single TRAINER_LUNG, Route113_Text_29A192, Route113_Text_29A1C6 - msgbox Route113_Text_29A219, MSGBOX_AUTOCLOSE +Route113_EventScript_Lung:: @ 81F22B2 + trainerbattle_single TRAINER_LUNG, Route113_Text_LungIntro, Route113_Text_LungDefeat + msgbox Route113_Text_LungPostBattle, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F22C9:: @ 81F22C9 - trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F - msgbox Route113_Text_29A2DE, MSGBOX_AUTOCLOSE +Route113_EventScript_Tori:: @ 81F22C9 + trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_ToriIntro, Route113_Text_ToriDefeat, Route113_Text_ToriNotEnoughMons + msgbox Route113_Text_ToriPostBattle, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F22E4:: @ 81F22E4 - trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419 - msgbox Route113_Text_29A3DA, MSGBOX_AUTOCLOSE +Route113_EventScript_Tia:: @ 81F22E4 + trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_TiaIntro, Route113_Text_TiaDefeat, Route113_Text_TiaNotEnoughMons + msgbox Route113_Text_TiaPostBattle, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F22FF:: @ 81F22FF - trainerbattle_single TRAINER_SOPHIE, Route113_Text_29A4BF, Route113_Text_29A508 - msgbox Route113_Text_29A529, MSGBOX_AUTOCLOSE +Route113_EventScript_Sophie:: @ 81F22FF + trainerbattle_single TRAINER_SOPHIE, Route113_Text_SophieIntro, Route113_Text_SophieDefeat + msgbox Route113_Text_SophiePostBattle, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F2316:: @ 81F2316 - trainerbattle_single TRAINER_COBY, Route113_Text_29A453, Route113_Text_29A480 - msgbox Route113_Text_29A489, MSGBOX_AUTOCLOSE +Route113_EventScript_Coby:: @ 81F2316 + trainerbattle_single TRAINER_COBY, Route113_Text_CobyIntro, Route113_Text_CobyDefeat + msgbox Route113_Text_CobyPostBattle, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F232D:: @ 81F232D - trainerbattle_single TRAINER_LAWRENCE, Route113_Text_29A566, Route113_Text_29A5A0 - msgbox Route113_Text_29A5BE, MSGBOX_AUTOCLOSE +Route113_EventScript_Lawrence:: @ 81F232D + trainerbattle_single TRAINER_LAWRENCE, Route113_Text_LawrenceIntro, Route113_Text_LawrenceDefeat + msgbox Route113_Text_LawrencePostBattle, MSGBOX_AUTOCLOSE end -Route113_EventScript_1F2344:: @ 81F2344 - trainerbattle_single TRAINER_WYATT, Route113_Text_29A5E4, Route113_Text_29A628 - msgbox Route113_Text_29A65D, MSGBOX_AUTOCLOSE +Route113_EventScript_Wyatt:: @ 81F2344 + trainerbattle_single TRAINER_WYATT, Route113_Text_WyattIntro, Route113_Text_WyattDefeat + msgbox Route113_Text_WyattPostBattle, MSGBOX_AUTOCLOSE end -Route113_Text_1F235B: @ 81F235B +Route113_Text_AshCanBeFashionedIntoGlass: @ 81F235B .string "Wahahaha! Today's technology is a\n" .string "wondrous thing!\p" .string "Take this volcanic ash here.\n" .string "It can be fashioned into glass.$" -Route113_Text_1F23CA: @ 81F23CA +Route113_Text_FunWalkingThroughAsh: @ 81F23CA .string "It's fun walking through the volcano's\n" .string "ashes on the ground and grass.\p" .string "You can see where you walked--it's\n" .string "really neat!$" -Route113_Text_1F2440: @ 81F2440 +Route113_Text_RouteSign111: @ 81F2440 .string "ROUTE 113\n" .string "{RIGHT_ARROW} ROUTE 111$" -Route113_Text_1F2456: @ 81F2456 +Route113_Text_RouteSignFallarbor: @ 81F2456 .string "ROUTE 113\n" .string "{LEFT_ARROW} FALLARBOR TOWN$" -Route113_Text_1F2471: @ 81F2471 +Route113_Text_TrainerTipsRegisterKeyItems: @ 81F2471 .string "TRAINER TIPS\p" .string "You may register one of the KEY ITEMS\n" .string "in your BAG as SELECT.\p" .string "Simply press SELECT to use\n" .string "the registered item conveniently.$" -Route113_Text_1F24F8: @ 81F24F8 +Route113_Text_GlassWorkshopSign: @ 81F24F8 .string "GLASS WORKSHOP\n" .string "“Turning Volcanic Ash into Glass Items”$" diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index 1aee2d422..76a9083f4 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route114_EventScript_1F2640", + "script": "Route114_EventScript_Lenny", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route114_EventScript_1F2657", + "script": "Route114_EventScript_Lucas", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route114_EventScript_1F266E", + "script": "Route114_EventScript_Shane", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route114_EventScript_1F2685", + "script": "Route114_EventScript_Nancy", "flag": "0" }, { @@ -113,7 +113,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route114_EventScript_1F269C", + "script": "Route114_EventScript_Steve", "flag": "0" }, { @@ -178,7 +178,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_EventScript_1F25D1", + "script": "Route114_EventScript_RoarGentleman", "flag": "0" }, { @@ -191,7 +191,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_EventScript_1F2612", + "script": "Route114_EventScript_Poochyena", "flag": "0" }, { @@ -204,7 +204,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_EventScript_1F2582", + "script": "Route114_EventScript_Man", "flag": "0" }, { @@ -217,7 +217,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_EventScript_1F2777", + "script": "Route114_EventScript_Nolan", "flag": "0" }, { @@ -230,7 +230,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "Route114_EventScript_1F2760", + "script": "Route114_EventScript_Claude", "flag": "0" }, { @@ -243,7 +243,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route114_EventScript_1F26FE", + "script": "Route114_EventScript_Bernie", "flag": "0" }, { @@ -308,7 +308,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route114_EventScript_1F27A9", + "script": "Route114_EventScript_Ivy", "flag": "0" }, { @@ -321,7 +321,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route114_EventScript_1F278E", + "script": "Route114_EventScript_Tyra", "flag": "0" }, { @@ -334,7 +334,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route114_EventScript_1F27DB", + "script": "Route114_EventScript_Charlotte", "flag": "0" }, { @@ -347,7 +347,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route114_EventScript_1F27C4", + "script": "Route114_EventScript_Angelina", "flag": "0" }, { @@ -373,7 +373,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route114_EventScript_1F27F2", + "script": "Route114_EventScript_Kai", "flag": "0" } ], @@ -422,7 +422,7 @@ "y": 64, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route114_EventScript_1F2625" + "script": "Route114_EventScript_MeteorFallsSign" }, { "type": "sign", @@ -430,7 +430,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route114_EventScript_1F262E" + "script": "Route114_EventScript_FossilManiacsHouseSign" }, { "type": "secret_base", @@ -480,7 +480,7 @@ "y": 38, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route114_EventScript_1F2637" + "script": "Route114_EventScript_LanettesHouseSign" }, { "type": "hidden_item", diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index caf6e1496..1873f6f7a 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -1,7 +1,7 @@ Route114_MapScripts:: @ 81F252F map_script MAP_SCRIPT_ON_TRANSITION, Route114_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Route114_MapScript1_1F2561 - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_MapScript2_1F2578 + map_script MAP_SCRIPT_ON_LOAD, Route114_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_OnFrame .byte 0 Route114_OnTransition: @ 81F253F @@ -13,199 +13,199 @@ Route114_OnTransition: @ 81F253F call_if_eq UnusualWeather_StartGroudonWeather end -Route114_MapScript1_1F2561: @ 81F2561 +Route114_OnLoad: @ 81F2561 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114North compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114South end -Route114_MapScript2_1F2578: @ 81F2578 +Route114_OnFrame: @ 81F2578 map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 -Route114_EventScript_1F2582:: @ 81F2582 +Route114_EventScript_Man:: @ 81F2582 lock faceplayer dotimebasedevents - goto_if_set FLAG_DAILY_ROUTE_114_RECEIVED_BERRY, Route114_EventScript_1F25C7 - msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT - random 5 - addvar VAR_RESULT, 15 + goto_if_set FLAG_DAILY_ROUTE_114_RECEIVED_BERRY, Route114_EventScript_ReceivedBerry + msgbox Route114_Text_LoveUsingBerryCrushShareBerry, MSGBOX_DEFAULT + random NUM_ROUTE_114_MAN_BERRIES + addvar VAR_RESULT, NUM_ROUTE_114_MAN_BERRIES_SKIPPED addvar VAR_RESULT, FIRST_BERRY_INDEX giveitem_std VAR_RESULT - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_DAILY_ROUTE_114_RECEIVED_BERRY - msgbox Route114_Text_2A7034, MSGBOX_DEFAULT + msgbox Route114_Text_TryBerryCrushWithFriends, MSGBOX_DEFAULT release end -Route114_EventScript_1F25C7:: @ 81F25C7 - msgbox Route114_Text_2A706E, MSGBOX_DEFAULT +Route114_EventScript_ReceivedBerry:: @ 81F25C7 + msgbox Route114_Text_FunToThinkAboutBerries, MSGBOX_DEFAULT release end -Route114_EventScript_1F25D1:: @ 81F25D1 +Route114_EventScript_RoarGentleman:: @ 81F25D1 lock faceplayer - goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1F2608 - msgbox Route114_Text_1F2809, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_ReceivedRoar + msgbox Route114_Text_AllMyMonDoesIsRoarTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_TM05 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM05 - msgbox Route114_Text_1F2872, MSGBOX_DEFAULT + msgbox Route114_Text_ExplainRoar, MSGBOX_DEFAULT release end -Route114_EventScript_1F2608:: @ 81F2608 - msgbox Route114_Text_1F2872, MSGBOX_DEFAULT +Route114_EventScript_ReceivedRoar:: @ 81F2608 + msgbox Route114_Text_ExplainRoar, MSGBOX_DEFAULT release end -Route114_EventScript_1F2612:: @ 81F2612 +Route114_EventScript_Poochyena:: @ 81F2612 lock faceplayer waitse playmoncry SPECIES_POOCHYENA, 2 - msgbox Route114_Text_1F28A6, MSGBOX_DEFAULT + msgbox Route114_Text_Poochyena, MSGBOX_DEFAULT waitmoncry release end -Route114_EventScript_1F2625:: @ 81F2625 - msgbox Route114_Text_1F28B3, MSGBOX_SIGN +Route114_EventScript_MeteorFallsSign:: @ 81F2625 + msgbox Route114_Text_MeteorFallsSign, MSGBOX_SIGN end -Route114_EventScript_1F262E:: @ 81F262E - msgbox Route114_Text_1F28DB, MSGBOX_SIGN +Route114_EventScript_FossilManiacsHouseSign:: @ 81F262E + msgbox Route114_Text_FossilManiacsHouseSign, MSGBOX_SIGN end -Route114_EventScript_1F2637:: @ 81F2637 - msgbox Route114_Text_1F2910, MSGBOX_SIGN +Route114_EventScript_LanettesHouseSign:: @ 81F2637 + msgbox Route114_Text_LanettesHouse, MSGBOX_SIGN end -Route114_EventScript_1F2640:: @ 81F2640 - trainerbattle_single TRAINER_LENNY, Route114_Text_29A6B1, Route114_Text_29A707 - msgbox Route114_Text_29A715, MSGBOX_AUTOCLOSE +Route114_EventScript_Lenny:: @ 81F2640 + trainerbattle_single TRAINER_LENNY, Route114_Text_LennyIntro, Route114_Text_LennyDefeat + msgbox Route114_Text_LennyPostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F2657:: @ 81F2657 - trainerbattle_single TRAINER_LUCAS_1, Route114_Text_29A777, Route114_Text_29A7B5 - msgbox Route114_Text_29A7D4, MSGBOX_AUTOCLOSE +Route114_EventScript_Lucas:: @ 81F2657 + trainerbattle_single TRAINER_LUCAS_1, Route114_Text_LucasIntro, Route114_Text_LucasDefeat + msgbox Route114_Text_LucasPostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F266E:: @ 81F266E - trainerbattle_single TRAINER_SHANE, Route114_Text_29A818, Route114_Text_29A88F - msgbox Route114_Text_29A89F, MSGBOX_AUTOCLOSE +Route114_EventScript_Shane:: @ 81F266E + trainerbattle_single TRAINER_SHANE, Route114_Text_ShaneIntro, Route114_Text_ShaneDefeat + msgbox Route114_Text_ShanePostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F2685:: @ 81F2685 - trainerbattle_single TRAINER_NANCY, Route114_Text_29A8D9, Route114_Text_29A90E - msgbox Route114_Text_29A916, MSGBOX_AUTOCLOSE +Route114_EventScript_Nancy:: @ 81F2685 + trainerbattle_single TRAINER_NANCY, Route114_Text_NancyIntro, Route114_Text_NancyDefeat + msgbox Route114_Text_NancyPostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F269C:: @ 81F269C - trainerbattle_single TRAINER_STEVE_1, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8 +Route114_EventScript_Steve:: @ 81F269C + trainerbattle_single TRAINER_STEVE_1, Route114_Text_SteveIntro, Route114_Text_SteveDefeat, Route114_EventScript_RegisterSteve specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route114_EventScript_1F26E7 - msgbox Route114_Text_29A981, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route114_EventScript_RematchSteve + msgbox Route114_Text_StevePostBattle, MSGBOX_DEFAULT release end -Route114_EventScript_1F26C8:: @ 81F26C8 +Route114_EventScript_RegisterSteve:: @ 81F26C8 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route114_Text_29A9F7, MSGBOX_DEFAULT + msgbox Route114_Text_SteveRegister, MSGBOX_DEFAULT register_matchcall TRAINER_STEVE_1 release end -Route114_EventScript_1F26E7:: @ 81F26E7 - trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_29AA3E, Route114_Text_29AA67 - msgbox Route114_Text_29AA94, MSGBOX_AUTOCLOSE +Route114_EventScript_RematchSteve:: @ 81F26E7 + trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_SteveRematchIntro, Route114_Text_SteveRematchDefeat + msgbox Route114_Text_StevePostRematch, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F26FE:: @ 81F26FE - trainerbattle_single TRAINER_BERNIE_1, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A +Route114_EventScript_Bernie:: @ 81F26FE + trainerbattle_single TRAINER_BERNIE_1, Route114_Text_BernieIntro, Route114_Text_BernieDefeat, Route114_EventScript_RegisterBernie specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route114_EventScript_1F2749 - msgbox Route114_Text_29AB36, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route114_EventScript_RematchBernie + msgbox Route114_Text_BerniePostBattle, MSGBOX_DEFAULT release end -Route114_EventScript_1F272A:: @ 81F272A +Route114_EventScript_RegisterBernie:: @ 81F272A special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route114_Text_29ABA6, MSGBOX_DEFAULT + msgbox Route114_Text_BernieRegister, MSGBOX_DEFAULT register_matchcall TRAINER_BERNIE_1 release end -Route114_EventScript_1F2749:: @ 81F2749 - trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_29ABDC, Route114_Text_29AC10 - msgbox Route114_Text_29AC43, MSGBOX_AUTOCLOSE +Route114_EventScript_RematchBernie:: @ 81F2749 + trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_BernieRematchIntro, Route114_Text_BernieRematchDefeat + msgbox Route114_Text_BerniePostRematch, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F2760:: @ 81F2760 - trainerbattle_single TRAINER_CLAUDE, Route114_Text_29ACB3, Route114_Text_29AD0A - msgbox Route114_Text_29AD2E, MSGBOX_AUTOCLOSE +Route114_EventScript_Claude:: @ 81F2760 + trainerbattle_single TRAINER_CLAUDE, Route114_Text_ClaudeIntro, Route114_Text_ClaudeDefeat + msgbox Route114_Text_ClaudePostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F2777:: @ 81F2777 - trainerbattle_single TRAINER_NOLAN, Route114_Text_29ADA1, Route114_Text_29AE05 - msgbox Route114_Text_29AE3D, MSGBOX_AUTOCLOSE +Route114_EventScript_Nolan:: @ 81F2777 + trainerbattle_single TRAINER_NOLAN, Route114_Text_NolanIntro, Route114_Text_NolanDefeat + msgbox Route114_Text_NolanPostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F278E:: @ 81F278E - trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D - msgbox Route114_Text_29AF0B, MSGBOX_AUTOCLOSE +Route114_EventScript_Tyra:: @ 81F278E + trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_TyraIntro, Route114_Text_TyraDefeat, Route114_Text_TyraNotEnoughMons + msgbox Route114_Text_TyraPostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F27A9:: @ 81F27A9 - trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B - msgbox Route114_Text_29AFCF, MSGBOX_AUTOCLOSE +Route114_EventScript_Ivy:: @ 81F27A9 + trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_IvyIntro, Route114_Text_IvyDefeat, Route114_Text_IvyNotEnoughMons + msgbox Route114_Text_IvyPostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F27C4:: @ 81F27C4 - trainerbattle_single TRAINER_ANGELINA, Route114_Text_29B16F, Route114_Text_29B19C - msgbox Route114_Text_29B1BC, MSGBOX_AUTOCLOSE +Route114_EventScript_Angelina:: @ 81F27C4 + trainerbattle_single TRAINER_ANGELINA, Route114_Text_AngelinaIntro, Route114_Text_AngelinaDefeat + msgbox Route114_Text_AngelinaPostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F27DB:: @ 81F27DB - trainerbattle_single TRAINER_CHARLOTTE, Route114_Text_29B0DB, Route114_Text_29B0FB - msgbox Route114_Text_29B11A, MSGBOX_AUTOCLOSE +Route114_EventScript_Charlotte:: @ 81F27DB + trainerbattle_single TRAINER_CHARLOTTE, Route114_Text_CharlotteIntro, Route114_Text_CharlotteDefeat + msgbox Route114_Text_CharlottePostBattle, MSGBOX_AUTOCLOSE end -Route114_EventScript_1F27F2:: @ 81F27F2 - trainerbattle_single TRAINER_KAI, Route114_Text_29B05D, Route114_Text_29B089 - msgbox Route114_Text_29B0B5, MSGBOX_AUTOCLOSE +Route114_EventScript_Kai:: @ 81F27F2 + trainerbattle_single TRAINER_KAI, Route114_Text_KaiIntro, Route114_Text_KaiDefeat + msgbox Route114_Text_KaiPostBattle, MSGBOX_AUTOCLOSE end -Route114_Text_1F2809: @ 81F2809 +Route114_Text_AllMyMonDoesIsRoarTakeThis: @ 81F2809 .string "All my POKéMON does is ROAR…\n" .string "No one dares to come near me…\p" .string "Sigh… If you would, please take\n" .string "this TM away…$" -Route114_Text_1F2872: @ 81F2872 +Route114_Text_ExplainRoar: @ 81F2872 .string "TM05 contains ROAR.\n" .string "A ROAR sends POKéMON scurrying.$" -Route114_Text_1F28A6: @ 81F28A6 +Route114_Text_Poochyena: @ 81F28A6 .string "Bow! Bowwow!$" -Route114_Text_1F28B3: @ 81F28B3 +Route114_Text_MeteorFallsSign: @ 81F28B3 .string "METEOR FALLS\n" .string "RUSTBORO CITY THROUGH HERE$" -Route114_Text_1F28DB: @ 81F28DB +Route114_Text_FossilManiacsHouseSign: @ 81F28DB .string "FOSSIL MANIAC'S HOUSE\n" .string "“Fossils gratefully accepted!”$" -Route114_Text_1F2910: @ 81F2910 +Route114_Text_LanettesHouse: @ 81F2910 .string "LANETTE'S HOUSE$" diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index 53ce80ce7..c9f1d8833 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -35,7 +35,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route115_EventScript_1F2973", + "script": "Route115_EventScript_Woman", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route115_EventScript_1F298E", + "script": "Route115_EventScript_Timothy", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route115_EventScript_1F2A07", + "script": "Route115_EventScript_Nob", "flag": "0" }, { @@ -113,7 +113,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route115_EventScript_1F2A69", + "script": "Route115_EventScript_Cyndy", "flag": "0" }, { @@ -126,7 +126,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route115_EventScript_1F29F0", + "script": "Route115_EventScript_Koichi", "flag": "0" }, { @@ -139,7 +139,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route115_EventScript_1F2ACB", + "script": "Route115_EventScript_Hector", "flag": "0" }, { @@ -243,7 +243,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route115_EventScript_1F2AE2", + "script": "Route115_EventScript_Kyra", "flag": "0" }, { @@ -256,7 +256,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route115_EventScript_1F2AF9", + "script": "Route115_EventScript_Jaiden", "flag": "0" }, { @@ -269,7 +269,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route115_EventScript_1F2B27", + "script": "Route115_EventScript_Helene", "flag": "0" }, { @@ -282,7 +282,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route115_EventScript_1F2B10", + "script": "Route115_EventScript_Alix", "flag": "0" }, { @@ -295,7 +295,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route115_EventScript_1F2B3E", + "script": "Route115_EventScript_Marlene", "flag": "0" }, { @@ -370,7 +370,7 @@ "y": 64, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route115_EventScript_1F297C" + "script": "Route115_EventScript_RouteSignRustboro" }, { "type": "sign", @@ -378,7 +378,7 @@ "y": 38, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route115_EventScript_1F2985" + "script": "Route115_EventScript_MeteorFallsSign" }, { "type": "secret_base", diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 8877f31bd..74d0c6519 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -1,10 +1,10 @@ Route115_MapScripts:: @ 81F2920 - map_script MAP_SCRIPT_ON_LOAD, Route115_MapScript1_1F2930 + map_script MAP_SCRIPT_ON_LOAD, Route115_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, Route115_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_MapScript2_1F2969 + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_OnFrame .byte 0 -Route115_MapScript1_1F2930: @ 81F2930 +Route115_OnLoad: @ 81F2930 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115West compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST @@ -20,134 +20,134 @@ Route115_OnTransition: @ 81F2947 call_if_eq UnusualWeather_StartGroudonWeather end -Route115_MapScript2_1F2969: @ 81F2969 +Route115_OnFrame: @ 81F2969 map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 -Route115_EventScript_1F2973:: @ 81F2973 - msgbox Route115_Text_1F2B55, MSGBOX_NPC +Route115_EventScript_Woman:: @ 81F2973 + msgbox Route115_Text_NeverKnowWhenCavePokemonWillAppear, MSGBOX_NPC end -Route115_EventScript_1F297C:: @ 81F297C - msgbox Route115_Text_1F2BC9, MSGBOX_SIGN +Route115_EventScript_RouteSignRustboro:: @ 81F297C + msgbox Route115_Text_RouteSignRustboro, MSGBOX_SIGN end -Route115_EventScript_1F2985:: @ 81F2985 - msgbox Route115_Text_1F2BE3, MSGBOX_SIGN +Route115_EventScript_MeteorFallsSign:: @ 81F2985 + msgbox Route115_Text_MeteorFallsSign, MSGBOX_SIGN end -Route115_EventScript_1F298E:: @ 81F298E - trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA +Route115_EventScript_Timothy:: @ 81F298E + trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_TimothyIntro, Route115_Text_TimothyDefeat, Route115_EventScript_RegisterTimothy specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route115_EventScript_1F29D9 - msgbox Route115_Text_29B258, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route115_EventScript_RematchTimothy + msgbox Route115_Text_TimothyPostBattle, MSGBOX_DEFAULT release end -Route115_EventScript_1F29BA:: @ 81F29BA +Route115_EventScript_RegisterTimothy:: @ 81F29BA special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route115_Text_29B2B3, MSGBOX_DEFAULT + msgbox Route115_Text_TimothyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_TIMOTHY_1 release end -Route115_EventScript_1F29D9:: @ 81F29D9 - trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_29B32C, Route115_Text_29B372 - msgbox Route115_Text_29B385, MSGBOX_AUTOCLOSE +Route115_EventScript_RematchTimothy:: @ 81F29D9 + trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_TimothyRematchIntro, Route115_Text_TimothyRematchDefeat + msgbox Route115_Text_TimothyPostRematch, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F29F0:: @ 81F29F0 - trainerbattle_single TRAINER_KOICHI, Route115_Text_29B3CC, Route115_Text_29B3ED - msgbox Route115_Text_29B3FF, MSGBOX_AUTOCLOSE +Route115_EventScript_Koichi:: @ 81F29F0 + trainerbattle_single TRAINER_KOICHI, Route115_Text_KoichiIntro, Route115_Text_KoichiDefeat + msgbox Route115_Text_KoichiPostBattle, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F2A07:: @ 81F2A07 - trainerbattle_single TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33 +Route115_EventScript_Nob:: @ 81F2A07 + trainerbattle_single TRAINER_NOB_1, Route115_Text_NobIntro, Route115_Text_NobDefeat, Route115_EventScript_RegisterNob specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route115_EventScript_1F2A52 - msgbox Route115_Text_29B49D, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route115_EventScript_RematchNob + msgbox Route115_Text_NobPostBattle, MSGBOX_DEFAULT release end -Route115_EventScript_1F2A33:: @ 81F2A33 +Route115_EventScript_RegisterNob:: @ 81F2A33 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route115_Text_29B50B, MSGBOX_DEFAULT + msgbox Route115_Text_NobRegister, MSGBOX_DEFAULT register_matchcall TRAINER_NOB_1 release end -Route115_EventScript_1F2A52:: @ 81F2A52 - trainerbattle_rematch TRAINER_NOB_1, Route115_Text_29B547, Route115_Text_29B59D - msgbox Route115_Text_29B5B5, MSGBOX_AUTOCLOSE +Route115_EventScript_RematchNob:: @ 81F2A52 + trainerbattle_rematch TRAINER_NOB_1, Route115_Text_NobRematchIntro, Route115_Text_NobRematchDefeat + msgbox Route115_Text_NobPostRematch, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F2A69:: @ 81F2A69 - trainerbattle_single TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95 +Route115_EventScript_Cyndy:: @ 81F2A69 + trainerbattle_single TRAINER_CYNDY_1, Route115_Text_CyndyIntro, Route115_Text_CyndyDefeat, Route115_EventScript_RegisterCyndy specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route115_EventScript_1F2AB4 - msgbox Route115_Text_29B647, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route115_EventScript_RematchCyndy + msgbox Route115_Text_CyndyPostBattle, MSGBOX_DEFAULT release end -Route115_EventScript_1F2A95:: @ 81F2A95 +Route115_EventScript_RegisterCyndy:: @ 81F2A95 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route115_Text_29B6AB, MSGBOX_DEFAULT + msgbox Route115_Text_CyndyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_CYNDY_1 release end -Route115_EventScript_1F2AB4:: @ 81F2AB4 - trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_29B6FA, Route115_Text_29B71A - msgbox Route115_Text_29B737, MSGBOX_AUTOCLOSE +Route115_EventScript_RematchCyndy:: @ 81F2AB4 + trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_CyndyRematchIntro, Route115_Text_CyndyRematchDefeat + msgbox Route115_Text_CyndyPostRematch, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F2ACB:: @ 81F2ACB - trainerbattle_single TRAINER_HECTOR, Route115_Text_29B78F, Route115_Text_29B7C5 - msgbox Route115_Text_29B7EA, MSGBOX_AUTOCLOSE +Route115_EventScript_Hector:: @ 81F2ACB + trainerbattle_single TRAINER_HECTOR, Route115_Text_HectorIntro, Route115_Text_HectorDefeat + msgbox Route115_Text_HectorPostBattle, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F2AE2:: @ 81F2AE2 - trainerbattle_single TRAINER_KYRA, Route115_Text_29B826, Route115_Text_29B85D - msgbox Route115_Text_29B869, MSGBOX_AUTOCLOSE +Route115_EventScript_Kyra:: @ 81F2AE2 + trainerbattle_single TRAINER_KYRA, Route115_Text_KyraIntro, Route115_Text_KyraDefeat + msgbox Route115_Text_KyraPostBattle, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F2AF9:: @ 81F2AF9 - trainerbattle_single TRAINER_JAIDEN, Route115_Text_29B8C1, Route115_Text_29B8E8 - msgbox Route115_Text_29B904, MSGBOX_AUTOCLOSE +Route115_EventScript_Jaiden:: @ 81F2AF9 + trainerbattle_single TRAINER_JAIDEN, Route115_Text_JaidenIntro, Route115_Text_JaidenDefeat + msgbox Route115_Text_JaidenPostBattle, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F2B10:: @ 81F2B10 - trainerbattle_single TRAINER_ALIX, Route115_Text_29B9CB, Route115_Text_29B9F6 - msgbox Route115_Text_29BA04, MSGBOX_AUTOCLOSE +Route115_EventScript_Alix:: @ 81F2B10 + trainerbattle_single TRAINER_ALIX, Route115_Text_AlixIntro, Route115_Text_AlixDefeat + msgbox Route115_Text_AlixPostBattle, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F2B27:: @ 81F2B27 - trainerbattle_single TRAINER_HELENE, Route115_Text_29B92D, Route115_Text_29B958 - msgbox Route115_Text_29B971, MSGBOX_AUTOCLOSE +Route115_EventScript_Helene:: @ 81F2B27 + trainerbattle_single TRAINER_HELENE, Route115_Text_HeleneIntro, Route115_Text_HeleneDefeat + msgbox Route115_Text_HelenePostBattle, MSGBOX_AUTOCLOSE end -Route115_EventScript_1F2B3E:: @ 81F2B3E - trainerbattle_single TRAINER_MARLENE, Route115_Text_29BA2C, Route115_Text_29BA67 - msgbox Route115_Text_29BA87, MSGBOX_AUTOCLOSE +Route115_EventScript_Marlene:: @ 81F2B3E + trainerbattle_single TRAINER_MARLENE, Route115_Text_MarleneIntro, Route115_Text_MarleneDefeat + msgbox Route115_Text_MarlenePostBattle, MSGBOX_AUTOCLOSE end -Route115_Text_1F2B55: @ 81F2B55 +Route115_Text_NeverKnowWhenCavePokemonWillAppear: @ 81F2B55 .string "Exploring a cave isn't like walking\n" .string "on a road.\p" .string "You never know when wild POKéMON will\n" .string "appear. It's full of suspense.$" -Route115_Text_1F2BC9: @ 81F2BC9 +Route115_Text_RouteSignRustboro: @ 81F2BC9 .string "ROUTE 115\n" .string "{DOWN_ARROW} RUSTBORO CITY$" -Route115_Text_1F2BE3: @ 81F2BE3 +Route115_Text_MeteorFallsSign: @ 81F2BE3 .string "METEOR FALLS\n" .string "FALLARBOR TOWN THROUGH HERE$" diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 8a369e407..366fe1ed5 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route116_EventScript_1F2E89", + "script": "Route116_EventScript_Joey", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route116_EventScript_1F2EA0", + "script": "Route116_EventScript_Jose", "flag": "0" }, { @@ -165,7 +165,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_EventScript_1F2D84", + "script": "Route116_EventScript_Briney", "flag": "FLAG_HIDE_ROUTE_116_MR_BRINEY" }, { @@ -191,7 +191,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route116_EventScript_1F2F65", + "script": "Route116_EventScript_Clark", "flag": "0" }, { @@ -230,7 +230,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route116_EventScript_1F2F7C", + "script": "Route116_EventScript_Janice", "flag": "0" }, { @@ -243,7 +243,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route116_EventScript_1F2F93", + "script": "Route116_EventScript_Karen", "flag": "0" }, { @@ -256,7 +256,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route116_EventScript_1F2EB7", + "script": "Route116_EventScript_Jerry", "flag": "0" }, { @@ -269,7 +269,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_EventScript_1F2CA2", + "script": "Route116_EventScript_DevonEmployee", "flag": "FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE" }, { @@ -295,8 +295,8 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_EventScript_1F2C70", - "flag": "FLAG_HIDE_ROUTE_116_TUNNELER" + "script": "Route116_EventScript_WandasBoyfriend", + "flag": "FLAG_HIDE_ROUTE_116_WANDAS_BOYFRIEND" }, { "graphics_id": "EVENT_OBJ_GFX_MANIAC", @@ -308,7 +308,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route116_EventScript_1F2DB6", + "script": "Route116_EventScript_GlassesMan", "flag": "FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN" }, { @@ -321,7 +321,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route116_EventScript_1F3041", + "script": "Route116_EventScript_Sarah", "flag": "0" }, { @@ -334,7 +334,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route116_EventScript_1F3058", + "script": "Route116_EventScript_Dawson", "flag": "0" }, { @@ -373,7 +373,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route116_EventScript_1F3086", + "script": "Route116_EventScript_Johnson", "flag": "0" }, { @@ -386,7 +386,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route116_EventScript_1F306F", + "script": "Route116_EventScript_Devan", "flag": "0" } ], @@ -435,7 +435,7 @@ "elevation": 3, "var": "VAR_ROUTE116_STATE", "var_value": "1", - "script": "Route116_EventScript_1F2D95" + "script": "Route116_EventScript_BrineyTrigger" } ], "bg_events": [ @@ -445,7 +445,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route116_EventScript_1F2D57" + "script": "Route116_EventScript_RouteSignRustboro" }, { "type": "sign", @@ -453,7 +453,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route116_EventScript_1F2D60" + "script": "Route116_EventScript_RusturfTunnelSign" }, { "type": "sign", @@ -461,7 +461,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route116_EventScript_1F2D69" + "script": "Route116_EventScript_TunnelersRestHouseSign" }, { "type": "secret_base", @@ -483,7 +483,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route116_EventScript_1F2D72" + "script": "Route116_EventScript_TrainerTipsBToStopEvolution" }, { "type": "sign", @@ -491,7 +491,7 @@ "y": 10, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route116_EventScript_1F2D7B" + "script": "Route116_EventScript_TrainerTipsBagHasPockets" }, { "type": "secret_base", diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index f52c8a05f..1b69b312a 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -1,11 +1,11 @@ Route116_MapScripts:: @ 81F2C0C map_script MAP_SCRIPT_ON_TRANSITION, Route116_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Route116_MapScript1_1F2C4F - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_MapScript2_1F2C66 + map_script MAP_SCRIPT_ON_LOAD, Route116_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_OnFrame .byte 0 Route116_OnTransition: @ 81F2C1C - call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47 + call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_SetWandasBoyfriendPos compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH @@ -14,90 +14,90 @@ Route116_OnTransition: @ 81F2C1C call_if_eq UnusualWeather_StartGroudonWeather end -Route116_EventScript_1F2C47:: @ 81F2C47 +Route116_EventScript_SetWandasBoyfriendPos:: @ 81F2C47 setobjectxyperm 21, 38, 10 return -Route116_MapScript1_1F2C4F: @ 81F2C4F +Route116_OnLoad: @ 81F2C4F compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116North compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116South end -Route116_MapScript2_1F2C66: @ 81F2C66 +Route116_OnFrame: @ 81F2C66 map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 -Route116_EventScript_1F2C70:: @ 81F2C70 +Route116_EventScript_WandasBoyfriend:: @ 81F2C70 lock faceplayer - goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C8E - goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_1F2C98 - msgbox Route116_Text_1F3140, MSGBOX_DEFAULT + goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_BoyfriendGruntLeftTunnel + goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_BoyfriendGruntInTunnel + msgbox Route116_Text_WantToDigTunnel, MSGBOX_DEFAULT release end -Route116_EventScript_1F2C8E:: @ 81F2C8E - msgbox Route116_Text_1F32C1, MSGBOX_DEFAULT +Route116_EventScript_BoyfriendGruntLeftTunnel:: @ 81F2C8E + msgbox Route116_Text_GoonHightailedItOutOfTunnel, MSGBOX_DEFAULT release end -Route116_EventScript_1F2C98:: @ 81F2C98 - msgbox Route116_Text_1F3166, MSGBOX_DEFAULT +Route116_EventScript_BoyfriendGruntInTunnel:: @ 81F2C98 + msgbox Route116_Text_DiggingTunnelWhenGoonOrderedMeOut, MSGBOX_DEFAULT release end -Route116_EventScript_1F2CA2:: @ 81F2CA2 +Route116_EventScript_DevonEmployee:: @ 81F2CA2 lock faceplayer - goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_1F2D2B - msgbox Route116_Text_1F3317, MSGBOX_DEFAULT - goto Route116_EventScript_1F2CBB + goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_TryGiveRepeatBallAgain + msgbox Route116_Text_ThankYouTokenOfAppreciation, MSGBOX_DEFAULT + goto Route116_EventScript_GiveRepeatBall end -Route116_EventScript_1F2CBB:: @ 81F2CBB +Route116_EventScript_GiveRepeatBall:: @ 81F2CBB setflag FLAG_MET_DEVON_EMPLOYEE giveitem_std ITEM_REPEAT_BALL - compare VAR_RESULT, 0 - goto_if_eq Route116_EventScript_1F2D39 - msgbox Route116_Text_1F3521, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route116_EventScript_NoRoomForRepeatBall + msgbox Route116_Text_NewBallAvailableAtMart, MSGBOX_DEFAULT closemessage compare VAR_FACING, DIR_NORTH - call_if_eq Route116_EventScript_1F2D15 + call_if_eq Route116_EventScript_DevonEmployeeExit compare VAR_FACING, DIR_SOUTH - call_if_eq Route116_EventScript_1F2D15 + call_if_eq Route116_EventScript_DevonEmployeeExit compare VAR_FACING, DIR_WEST - call_if_eq Route116_EventScript_1F2D15 + call_if_eq Route116_EventScript_DevonEmployeeExit compare VAR_FACING, DIR_EAST - call_if_eq Route116_EventScript_1F2D20 + call_if_eq Route116_EventScript_DevonEmployeeExitEast removeobject VAR_LAST_TALKED clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE setflag FLAG_RECEIVED_REPEAT_BALL release end -Route116_EventScript_1F2D15:: @ 81F2D15 - applymovement VAR_LAST_TALKED, Route116_Movement_1F2D43 +Route116_EventScript_DevonEmployeeExit:: @ 81F2D15 + applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExit waitmovement 0 return -Route116_EventScript_1F2D20:: @ 81F2D20 - applymovement VAR_LAST_TALKED, Route116_Movement_1F2D4C +Route116_EventScript_DevonEmployeeExitEast:: @ 81F2D20 + applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExitEast waitmovement 0 return -Route116_EventScript_1F2D2B:: @ 81F2D2B - msgbox Route116_Text_1F35CE, MSGBOX_DEFAULT - goto Route116_EventScript_1F2CBB +Route116_EventScript_TryGiveRepeatBallAgain:: @ 81F2D2B + msgbox Route116_Text_TokenOfAppreciation, MSGBOX_DEFAULT + goto Route116_EventScript_GiveRepeatBall end -Route116_EventScript_1F2D39:: @ 81F2D39 - msgbox Route116_Text_1F3593, MSGBOX_DEFAULT +Route116_EventScript_NoRoomForRepeatBall:: @ 81F2D39 + msgbox Route116_Text_BagIsJamPacked, MSGBOX_DEFAULT release end -Route116_Movement_1F2D43: @ 81F2D43 +Route116_Movement_DevonEmployeeExit: @ 81F2D43 walk_left walk_left walk_left @@ -108,7 +108,7 @@ Route116_Movement_1F2D43: @ 81F2D43 walk_left step_end -Route116_Movement_1F2D4C: @ 81F2D4C +Route116_Movement_DevonEmployeeExitEast: @ 81F2D4C walk_down walk_left walk_left @@ -121,104 +121,104 @@ Route116_Movement_1F2D4C: @ 81F2D4C walk_left step_end -Route116_EventScript_1F2D57:: @ 81F2D57 - msgbox Route116_Text_1F379D, MSGBOX_SIGN +Route116_EventScript_RouteSignRustboro:: @ 81F2D57 + msgbox Route116_Text_RouteSignRustboro, MSGBOX_SIGN end -Route116_EventScript_1F2D60:: @ 81F2D60 - msgbox Route116_Text_1F37B7, MSGBOX_SIGN +Route116_EventScript_RusturfTunnelSign:: @ 81F2D60 + msgbox Route116_Text_RusturfTunnelSign, MSGBOX_SIGN end -Route116_EventScript_1F2D69:: @ 81F2D69 - msgbox Route116_Text_1F380F, MSGBOX_SIGN +Route116_EventScript_TunnelersRestHouseSign:: @ 81F2D69 + msgbox Route116_Text_TunnelersRestHouse, MSGBOX_SIGN end -Route116_EventScript_1F2D72:: @ 81F2D72 - msgbox Route116_Text_1F3825, MSGBOX_SIGN +Route116_EventScript_TrainerTipsBToStopEvolution:: @ 81F2D72 + msgbox Route116_Text_TrainerTipsBToStopEvolution, MSGBOX_SIGN end -Route116_EventScript_1F2D7B:: @ 81F2D7B - msgbox Route116_Text_1F38D4, MSGBOX_SIGN +Route116_EventScript_TrainerTipsBagHasPockets:: @ 81F2D7B + msgbox Route116_Text_TrainerTipsBagHasPockets, MSGBOX_SIGN end -Route116_EventScript_1F2D84:: @ 81F2D84 +Route116_EventScript_Briney:: @ 81F2D84 lock faceplayer - msgbox Route116_Text_1F309D, MSGBOX_DEFAULT + msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT setvar VAR_ROUTE116_STATE, 2 release end -Route116_EventScript_1F2D95:: @ 81F2D95 +Route116_EventScript_BrineyTrigger:: @ 81F2D95 lockall applymovement 11, Common_Movement_WalkInPlaceFastestRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox Route116_Text_1F309D, MSGBOX_DEFAULT + msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT setvar VAR_ROUTE116_STATE, 2 releaseall end -Route116_EventScript_1F2DB6:: @ 81F2DB6 +Route116_EventScript_GlassesMan:: @ 81F2DB6 lock faceplayer checkitem ITEM_BLACK_GLASSES, 1 - compare VAR_RESULT, 1 - goto_if_eq Route116_EventScript_1F2DF1 + compare VAR_RESULT, TRUE + goto_if_eq Route116_EventScript_PlayerHasGlasses specialvar VAR_RESULT, FoundBlackGlasses - compare VAR_RESULT, 1 - goto_if_eq Route116_EventScript_1F2DE2 - msgbox Route116_Text_1F3657, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route116_EventScript_FoundGlassesNotOnPlayer + msgbox Route116_Text_CanYouHelpMeFindGlasses, MSGBOX_DEFAULT release end -Route116_EventScript_1F2DE2:: @ 81F2DE2 - msgbox Route116_Text_1F3718, MSGBOX_DEFAULT +Route116_EventScript_FoundGlassesNotOnPlayer:: @ 81F2DE2 + msgbox Route116_Text_CantFindGlassesNotHere, MSGBOX_DEFAULT closemessage - goto Route116_EventScript_1F2E2A + goto Route116_EventScript_GlassesManExit end -Route116_EventScript_1F2DF1:: @ 81F2DF1 - msgbox Route116_Text_1F3657, MSGBOX_DEFAULT - msgbox Route116_Text_1F3688, MSGBOX_DEFAULT +Route116_EventScript_PlayerHasGlasses:: @ 81F2DF1 + msgbox Route116_Text_CanYouHelpMeFindGlasses, MSGBOX_DEFAULT + msgbox Route116_Text_MayISeeThoseGlasses, MSGBOX_DEFAULT specialvar VAR_RESULT, FoundBlackGlasses - compare VAR_RESULT, 1 - goto_if_eq Route116_EventScript_1F2E1B - msgbox Route116_Text_1F375E, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route116_EventScript_FoundGlassesOnPlayer + msgbox Route116_Text_NotWhatImLookingFor, MSGBOX_DEFAULT release end -Route116_EventScript_1F2E1B:: @ 81F2E1B - msgbox Route116_Text_1F36B4, MSGBOX_DEFAULT +Route116_EventScript_FoundGlassesOnPlayer:: @ 81F2E1B + msgbox Route116_Text_NotWhatImLookingForMaybeTheyArentHere, MSGBOX_DEFAULT closemessage - goto Route116_EventScript_1F2E2A + goto Route116_EventScript_GlassesManExit end -Route116_EventScript_1F2E2A:: @ 81F2E2A +Route116_EventScript_GlassesManExit:: @ 81F2E2A delay 20 compare VAR_FACING, DIR_NORTH - call_if_eq Route116_EventScript_1F2E5E + call_if_eq Route116_EventScript_GlassesManExitNormal compare VAR_FACING, DIR_SOUTH - call_if_eq Route116_EventScript_1F2E5E + call_if_eq Route116_EventScript_GlassesManExitNormal compare VAR_FACING, DIR_WEST - call_if_eq Route116_EventScript_1F2E5E + call_if_eq Route116_EventScript_GlassesManExitNormal compare VAR_FACING, DIR_EAST - call_if_eq Route116_EventScript_1F2E69 + call_if_eq Route116_EventScript_GlassesManExitEast removeobject VAR_LAST_TALKED release end -Route116_EventScript_1F2E5E:: @ 81F2E5E - applymovement VAR_LAST_TALKED, Route116_Movement_1F2E74 +Route116_EventScript_GlassesManExitNormal:: @ 81F2E5E + applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExit waitmovement 0 return -Route116_EventScript_1F2E69:: @ 81F2E69 - applymovement VAR_LAST_TALKED, Route116_Movement_1F2E7E +Route116_EventScript_GlassesManExitEast:: @ 81F2E69 + applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExitEast waitmovement 0 return -Route116_Movement_1F2E74: @ 81F2E74 +Route116_Movement_GlassesManExit: @ 81F2E74 walk_left walk_left walk_left @@ -230,7 +230,7 @@ Route116_Movement_1F2E74: @ 81F2E74 walk_left step_end -Route116_Movement_1F2E7E: @ 81F2E7E +Route116_Movement_GlassesManExitEast: @ 81F2E7E walk_up walk_left walk_left @@ -243,133 +243,133 @@ Route116_Movement_1F2E7E: @ 81F2E7E walk_left step_end -Route116_EventScript_1F2E89:: @ 81F2E89 - trainerbattle_single TRAINER_JOEY, Route116_Text_29BB79, Route116_Text_29BB9A - msgbox Route116_Text_29BBC6, MSGBOX_AUTOCLOSE +Route116_EventScript_Joey:: @ 81F2E89 + trainerbattle_single TRAINER_JOEY, Route116_Text_JoeyIntro, Route116_Text_JoeyDefeat + msgbox Route116_Text_JoeyPostBattle, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F2EA0:: @ 81F2EA0 - trainerbattle_single TRAINER_JOSE, Route116_Text_29BBFD, Route116_Text_29BC25 - msgbox Route116_Text_29BC42, MSGBOX_AUTOCLOSE +Route116_EventScript_Jose:: @ 81F2EA0 + trainerbattle_single TRAINER_JOSE, Route116_Text_JoseIntro, Route116_Text_JoseDefeat + msgbox Route116_Text_JosePostBattle, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F2EB7:: @ 81F2EB7 - trainerbattle_single TRAINER_JERRY_1, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8 +Route116_EventScript_Jerry:: @ 81F2EB7 + trainerbattle_single TRAINER_JERRY_1, Route116_Text_JerryIntro, Route116_Text_JerryDefeat, Route116_EventScript_TryRegisterJerryAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route116_EventScript_1F2F4E + compare VAR_RESULT, TRUE + goto_if_eq Route116_EventScript_RematchJerry setvar VAR_0x8004, TRAINER_JERRY_1 specialvar VAR_RESULT, IsTrainerRegistered - compare VAR_RESULT, 0 - goto_if_eq Route116_EventScript_1F2F22 - msgbox Route116_Text_29BD92, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route116_EventScript_TryRegisterJerry + msgbox Route116_Text_JerryPostBattle, MSGBOX_DEFAULT release end -Route116_EventScript_1F2EF8:: @ 81F2EF8 - goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2F03 +Route116_EventScript_TryRegisterJerryAfterBattle:: @ 81F2EF8 + goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterJerryAfterBattle release end -Route116_EventScript_1F2F03:: @ 81F2F03 +Route116_EventScript_RegisterJerryAfterBattle:: @ 81F2F03 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route116_Text_29BE71, MSGBOX_DEFAULT + msgbox Route116_Text_JerryRegister2, MSGBOX_DEFAULT register_matchcall TRAINER_JERRY_1 release end -Route116_EventScript_1F2F22:: @ 81F2F22 - goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2F35 - msgbox Route116_Text_29BD92, MSGBOX_DEFAULT +Route116_EventScript_TryRegisterJerry:: @ 81F2F22 + goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterJerry + msgbox Route116_Text_JerryPostBattle, MSGBOX_DEFAULT release end -Route116_EventScript_1F2F35:: @ 81F2F35 - msgbox Route116_Text_29BDEF, MSGBOX_DEFAULT +Route116_EventScript_RegisterJerry:: @ 81F2F35 + msgbox Route116_Text_JerryRegister1, MSGBOX_DEFAULT register_matchcall TRAINER_JERRY_1 release end -Route116_EventScript_1F2F4E:: @ 81F2F4E - trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_29BEF3, Route116_Text_29BF4C - msgbox Route116_Text_29BF68, MSGBOX_AUTOCLOSE +Route116_EventScript_RematchJerry:: @ 81F2F4E + trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_JerryRematchIntro, Route116_Text_JerryRematchDefeat + msgbox Route116_Text_JerryPostRematch, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F2F65:: @ 81F2F65 - trainerbattle_single TRAINER_CLARK, Route116_Text_29BACD, Route116_Text_29BB0F - msgbox Route116_Text_29BB31, MSGBOX_AUTOCLOSE +Route116_EventScript_Clark:: @ 81F2F65 + trainerbattle_single TRAINER_CLARK, Route116_Text_ClarkIntro, Route116_Text_ClarkDefeat + msgbox Route116_Text_ClarkPostBattle, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F2F7C:: @ 81F2F7C - trainerbattle_single TRAINER_JANICE, Route116_Text_29BC7F, Route116_Text_29BCB3 - msgbox Route116_Text_29BCCC, MSGBOX_AUTOCLOSE +Route116_EventScript_Janice:: @ 81F2F7C + trainerbattle_single TRAINER_JANICE, Route116_Text_JaniceIntro, Route116_Text_JaniceDefeat + msgbox Route116_Text_JanicePostBattle, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F2F93:: @ 81F2F93 - trainerbattle_single TRAINER_KAREN_1, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4 +Route116_EventScript_Karen:: @ 81F2F93 + trainerbattle_single TRAINER_KAREN_1, Route116_Text_KarenIntro, Route116_Text_KarenDefeat, Route116_EventScript_TryRegisterKarenAfterBattle specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route116_EventScript_1F302A + compare VAR_RESULT, TRUE + goto_if_eq Route116_EventScript_RematchKaren setvar VAR_0x8004, TRAINER_KAREN_1 specialvar VAR_RESULT, IsTrainerRegistered - compare VAR_RESULT, 0 - goto_if_eq Route116_EventScript_1F2FFE - msgbox Route116_Text_29C010, MSGBOX_DEFAULT + compare VAR_RESULT, FALSE + goto_if_eq Route116_EventScript_TryRegisterKaren + msgbox Route116_Text_KarenPostBattle, MSGBOX_DEFAULT release end -Route116_EventScript_1F2FD4:: @ 81F2FD4 - goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2FDF +Route116_EventScript_TryRegisterKarenAfterBattle:: @ 81F2FD4 + goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterKarenAfterBattle release end -Route116_EventScript_1F2FDF:: @ 81F2FDF +Route116_EventScript_RegisterKarenAfterBattle:: @ 81F2FDF special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route116_Text_29C096, MSGBOX_DEFAULT + msgbox Route116_Text_KarenRegister2, MSGBOX_DEFAULT register_matchcall TRAINER_KAREN_1 release end -Route116_EventScript_1F2FFE:: @ 81F2FFE - goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F3011 - msgbox Route116_Text_29C010, MSGBOX_DEFAULT +Route116_EventScript_TryRegisterKaren:: @ 81F2FFE + goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterKaren + msgbox Route116_Text_KarenPostBattle, MSGBOX_DEFAULT release end -Route116_EventScript_1F3011:: @ 81F3011 - msgbox Route116_Text_29C052, MSGBOX_DEFAULT +Route116_EventScript_RegisterKaren:: @ 81F3011 + msgbox Route116_Text_KarenRegister1, MSGBOX_DEFAULT register_matchcall TRAINER_KAREN_1 release end -Route116_EventScript_1F302A:: @ 81F302A - trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_29C0DA, Route116_Text_29C11F - msgbox Route116_Text_29C13B, MSGBOX_AUTOCLOSE +Route116_EventScript_RematchKaren:: @ 81F302A + trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_KarenRematchIntro, Route116_Text_KarenRematchDefeat + msgbox Route116_Text_KarenPostRematch, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F3041:: @ 81F3041 - trainerbattle_single TRAINER_SARAH, Route116_Text_29C173, Route116_Text_29C1B8 - msgbox Route116_Text_29C1EA, MSGBOX_AUTOCLOSE +Route116_EventScript_Sarah:: @ 81F3041 + trainerbattle_single TRAINER_SARAH, Route116_Text_SarahIntro, Route116_Text_SarahDefeat + msgbox Route116_Text_SarahPostBattle, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F3058:: @ 81F3058 - trainerbattle_single TRAINER_DAWSON, Route116_Text_29C266, Route116_Text_29C2C2 - msgbox Route116_Text_29C2DD, MSGBOX_AUTOCLOSE +Route116_EventScript_Dawson:: @ 81F3058 + trainerbattle_single TRAINER_DAWSON, Route116_Text_DawsonIntro, Route116_Text_DawsonDefeat + msgbox Route116_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F306F:: @ 81F306F - trainerbattle_single TRAINER_DEVAN, Route116_Text_29C350, Route116_Text_29C365 - msgbox Route116_Text_29C380, MSGBOX_AUTOCLOSE +Route116_EventScript_Devan:: @ 81F306F + trainerbattle_single TRAINER_DEVAN, Route116_Text_DevanIntro, Route116_Text_DevanDefeat + msgbox Route116_Text_DevanPostBattle, MSGBOX_AUTOCLOSE end -Route116_EventScript_1F3086:: @ 81F3086 - trainerbattle_single TRAINER_JOHNSON, Route116_Text_29C3C1, Route116_Text_29C3F7 - msgbox Route116_Text_29C418, MSGBOX_AUTOCLOSE +Route116_EventScript_Johnson:: @ 81F3086 + trainerbattle_single TRAINER_JOHNSON, Route116_Text_JohnsonIntro, Route116_Text_JohnsonDefeat + msgbox Route116_Text_JohnsonPostBattle, MSGBOX_AUTOCLOSE end -Route116_Text_1F309D: @ 81F309D +Route116_Text_ScoundrelMadeOffWithPeeko: @ 81F309D .string "Ohhh, what am I to do?\p" .string "We were on our walk, PEEKO and I, when\n" .string "we were jumped by an odd thug…\p" @@ -377,11 +377,11 @@ Route116_Text_1F309D: @ 81F309D .string "darling PEEKO!\p" .string "Wrrrooooooaaaar! PEEKO!$" -Route116_Text_1F3140: @ 81F3140 +Route116_Text_WantToDigTunnel: @ 81F3140 .string "Nnn… Roar!\p" .string "I want to dig that tunnel!$" -Route116_Text_1F3166: @ 81F3166 +Route116_Text_DiggingTunnelWhenGoonOrderedMeOut: @ 81F3166 .string "Nnn… Roar!\n" .string "What's going on?\p" .string "I was digging the tunnel without any\n" @@ -395,12 +395,12 @@ Route116_Text_1F3166: @ 81F3166 .string "something stupid and startle the\l" .string "POKéMON into an uproar.$" -Route116_Text_1F32C1: @ 81F32C1 +Route116_Text_GoonHightailedItOutOfTunnel: @ 81F32C1 .string "Nnn… Roar!\p" .string "That goofy goon hightailed it out of\n" .string "the tunnel! I can go back to digging!$" -Route116_Text_1F3317: @ 81F3317 +Route116_Text_ThankYouTokenOfAppreciation: @ 81F3317 .string "Oh! It's you!\p" .string "You're that person who not only helped\n" .string "me in PETALBURG WOODS, but also got\l" @@ -419,61 +419,61 @@ Route116_Text_1F3317: @ 81F3317 .string "As a token of our appreciation, this\n" .string "is our gift to our wonderful TRAINER!$" -Route116_Text_1F3521: @ 81F3521 +Route116_Text_NewBallAvailableAtMart: @ 81F3521 .string "Our new POKé BALL will be available\n" .string "at the POKéMON MART in RUSTBORO.\p" .string "Please do try it out!\n" .string "Thank you and bye-bye!$" -Route116_Text_1F3593: @ 81F3593 +Route116_Text_BagIsJamPacked: @ 81F3593 .string "Your BAG is jam-packed.\n" .string "I can't give you this REPEAT BALL.$" -Route116_Text_1F35CE: @ 81F35CE +Route116_Text_TokenOfAppreciation: @ 81F35CE .string "As a token of our appreciation for\n" .string "your delivering our package, I have\l" .string "a gift of a new kind of POKé BALL\l" .string "for our most wonderful TRAINER!$" -Route116_Text_1F3657: @ 81F3657 +Route116_Text_CanYouHelpMeFindGlasses: @ 81F3657 .string "I dropped my glasses…\n" .string "Can you help me find them?$" -Route116_Text_1F3688: @ 81F3688 +Route116_Text_MayISeeThoseGlasses: @ 81F3688 .string "Those glasses!\n" .string "May I see them for a second?$" -Route116_Text_1F36B4: @ 81F36B4 +Route116_Text_NotWhatImLookingForMaybeTheyArentHere: @ 81F36B4 .string "Hmm…\n" .string "These are BLACKGLASSES.\l" .string "They're not what I'm looking for…\p" .string "Maybe my glasses aren't around\n" .string "here…$" -Route116_Text_1F3718: @ 81F3718 +Route116_Text_CantFindGlassesNotHere: @ 81F3718 .string "Hmm…\n" .string "I can't find my glasses anywhere…\l" .string "Maybe they're not around here…$" -Route116_Text_1F375E: @ 81F375E +Route116_Text_NotWhatImLookingFor: @ 81F375E .string "Hmm…\n" .string "These are BLACKGLASSES.\l" .string "They're not what I'm looking for…$" -Route116_Text_1F379D: @ 81F379D +Route116_Text_RouteSignRustboro: @ 81F379D .string "ROUTE 116\n" .string "{LEFT_ARROW} RUSTBORO CITY$" -Route116_Text_1F37B7: @ 81F37B7 +Route116_Text_RusturfTunnelSign: @ 81F37B7 .string "RUSTURF TUNNEL\n" .string "“Linking RUSTBORO and VERDANTURF\p" .string "“The tunnel project has been\n" .string "canceled.”$" -Route116_Text_1F380F: @ 81F380F +Route116_Text_TunnelersRestHouse: @ 81F380F .string "TUNNELER'S REST HOUSE$" -Route116_Text_1F3825: @ 81F3825 +Route116_Text_TrainerTipsBToStopEvolution: @ 81F3825 .string "TRAINER TIPS\p" .string "If you want to stop a POKéMON from\n" .string "evolving, press the B Button while it\l" @@ -481,7 +481,7 @@ Route116_Text_1F3825: @ 81F3825 .string "The startled POKéMON will stop.\p" .string "This is called an evolution cancel.$" -Route116_Text_1F38D4: @ 81F38D4 +Route116_Text_TrainerTipsBagHasPockets: @ 81F38D4 .string "TRAINER TIPS\p" .string "Your BAG has several POCKETS.\p" .string "Items you obtain are automatically\n" diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index 12420784c..4bb513cdf 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -35,7 +35,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route117_EventScript_1F399A", + "script": "Route117_EventScript_Woman", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route117_EventScript_1F39A3", + "script": "Route117_EventScript_LittleBoy", "flag": "0" }, { @@ -126,7 +126,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route117_EventScript_1F3A94", + "script": "Route117_EventScript_Dylan", "flag": "0" }, { @@ -139,7 +139,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route117_EventScript_1F3A32", + "script": "Route117_EventScript_Lydia", "flag": "0" }, { @@ -152,7 +152,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route117_EventScript_1F39D0", + "script": "Route117_EventScript_Isaac", "flag": "0" }, { @@ -243,7 +243,7 @@ "movement_range_y": 2, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route117_EventScript_1F3AF6", + "script": "Route117_EventScript_Maria", "flag": "0" }, { @@ -256,7 +256,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route117_EventScript_1F3B58", + "script": "Route117_EventScript_Derek", "flag": "0" }, { @@ -269,7 +269,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route117_EventScript_1F3BD3", + "script": "Route117_EventScript_Meg", "flag": "0" }, { @@ -282,7 +282,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route117_EventScript_1F3B6F", + "script": "Route117_EventScript_Anna", "flag": "0" }, { @@ -295,7 +295,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route117_EventScript_1F39AC", + "script": "Route117_EventScript_Girl", "flag": "0" }, { @@ -308,7 +308,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route117_EventScript_1F3C4E", + "script": "Route117_EventScript_Brandi", "flag": "0" }, { @@ -321,7 +321,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route117_EventScript_1F3C65", + "script": "Route117_EventScript_Aisha", "flag": "0" }, { @@ -334,7 +334,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route117_EventScript_1F3C37", + "script": "Route117_EventScript_Melina", "flag": "0" } ], @@ -355,7 +355,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route117_EventScript_1F39B5" + "script": "Route117_EventScript_RouteSignVerdanturf" }, { "type": "sign", @@ -363,7 +363,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route117_EventScript_1F39BE" + "script": "Route117_EventScript_RouteSignMauville" }, { "type": "sign", @@ -371,7 +371,7 @@ "y": 5, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route117_EventScript_1F39C7" + "script": "Route117_EventScript_DayCareSign" }, { "type": "hidden_item", diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 40d121fc7..47d8eced9 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -3,211 +3,210 @@ Route117_MapScripts:: @ 81F397D .byte 0 Route117_OnTransition: @ 81F3983 - call Route117_EventScript_1F3989 + call Route117_EventScript_TryMoveDayCareMan end -Route117_EventScript_1F3989:: @ 81F3989 - goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_1F3999 +Route117_EventScript_TryMoveDayCareMan:: @ 81F3989 + goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_StopMoveDayCareMan setobjectxyperm 3, 47, 6 - -Route117_EventScript_1F3999:: @ 81F3999 +Route117_EventScript_StopMoveDayCareMan:: @ 81F3999 return -Route117_EventScript_1F399A:: @ 81F399A - msgbox Route117_Text_1F3CFD, MSGBOX_NPC +Route117_EventScript_Woman:: @ 81F399A + msgbox Route117_Text_ArentTheseFlowersPretty, MSGBOX_NPC end -Route117_EventScript_1F39A3:: @ 81F39A3 - msgbox Route117_Text_1F3D41, MSGBOX_NPC +Route117_EventScript_LittleBoy:: @ 81F39A3 + msgbox Route117_Text_AirIsTastyHere, MSGBOX_NPC end -Route117_EventScript_1F39AC:: @ 81F39AC - msgbox Route117_Text_1F3C7C, MSGBOX_NPC +Route117_EventScript_Girl:: @ 81F39AC + msgbox Route117_Text_DayCarePokemonHadNewMove, MSGBOX_NPC end -Route117_EventScript_1F39B5:: @ 81F39B5 - msgbox Route117_Text_1F3D58, MSGBOX_SIGN +Route117_EventScript_RouteSignVerdanturf:: @ 81F39B5 + msgbox Route117_Text_RouteSignVerdanturf, MSGBOX_SIGN end -Route117_EventScript_1F39BE:: @ 81F39BE - msgbox Route117_Text_1F3D74, MSGBOX_SIGN +Route117_EventScript_RouteSignMauville:: @ 81F39BE + msgbox Route117_Text_RouteSignMauville, MSGBOX_SIGN end -Route117_EventScript_1F39C7:: @ 81F39C7 - msgbox Route117_Text_1F3D8E, MSGBOX_SIGN +Route117_EventScript_DayCareSign:: @ 81F39C7 + msgbox Route117_Text_DayCareSign, MSGBOX_SIGN end -Route117_EventScript_1F39D0:: @ 81F39D0 - trainerbattle_single TRAINER_ISAAC_1, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC +Route117_EventScript_Isaac:: @ 81F39D0 + trainerbattle_single TRAINER_ISAAC_1, Route117_Text_IsaacIntro, Route117_Text_IsaacDefeat, Route117_EventScript_RegisterIsaac specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route117_EventScript_1F3A1B - msgbox Route117_Text_29C498, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route117_EventScript_RematchIsaac + msgbox Route117_Text_IsaacPostBattle, MSGBOX_DEFAULT release end -Route117_EventScript_1F39FC:: @ 81F39FC +Route117_EventScript_RegisterIsaac:: @ 81F39FC special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route117_Text_29C508, MSGBOX_DEFAULT + msgbox Route117_Text_IsaacRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ISAAC_1 release end -Route117_EventScript_1F3A1B:: @ 81F3A1B - trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_29C549, Route117_Text_29C58B - msgbox Route117_Text_29C5D0, MSGBOX_AUTOCLOSE +Route117_EventScript_RematchIsaac:: @ 81F3A1B + trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_IsaacRematchIntro, Route117_Text_IsaacRematchDefeat + msgbox Route117_Text_IsaacPostRematch, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3A32:: @ 81F3A32 - trainerbattle_single TRAINER_LYDIA_1, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E +Route117_EventScript_Lydia:: @ 81F3A32 + trainerbattle_single TRAINER_LYDIA_1, Route117_Text_LydiaIntro, Route117_Text_LydiaDefeat, Route117_EventScript_RegisterLydia specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route117_EventScript_1F3A7D - msgbox Route117_Text_29C679, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route117_EventScript_RematchLydia + msgbox Route117_Text_LydiaPostBattle, MSGBOX_DEFAULT release end -Route117_EventScript_1F3A5E:: @ 81F3A5E +Route117_EventScript_RegisterLydia:: @ 81F3A5E special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route117_Text_29C6BC, MSGBOX_DEFAULT + msgbox Route117_Text_LydiaRegister, MSGBOX_DEFAULT register_matchcall TRAINER_LYDIA_1 release end -Route117_EventScript_1F3A7D:: @ 81F3A7D - trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_29C6FD, Route117_Text_29C73E - msgbox Route117_Text_29C75A, MSGBOX_AUTOCLOSE +Route117_EventScript_RematchLydia:: @ 81F3A7D + trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_LydiaRematchIntro, Route117_Text_LydiaRematchDefeat + msgbox Route117_Text_LydiaPostRematch, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3A94:: @ 81F3A94 - trainerbattle_single TRAINER_DYLAN_1, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 +Route117_EventScript_Dylan:: @ 81F3A94 + trainerbattle_single TRAINER_DYLAN_1, Route117_Text_DylanIntro, Route117_Text_DylanDefeat, Route117_EventScript_RegisterDylan specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route117_EventScript_1F3ADF - msgbox Route117_Text_29C800, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route117_EventScript_RematchDylan + msgbox Route117_Text_DylanPostBattle, MSGBOX_DEFAULT release end -Route117_EventScript_1F3AC0:: @ 81F3AC0 +Route117_EventScript_RegisterDylan:: @ 81F3AC0 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route117_Text_29C846, MSGBOX_DEFAULT + msgbox Route117_Text_DylanRegister, MSGBOX_DEFAULT register_matchcall TRAINER_DYLAN_1 release end -Route117_EventScript_1F3ADF:: @ 81F3ADF - trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_29C880, Route117_Text_29C8E3 - msgbox Route117_Text_29C8FE, MSGBOX_AUTOCLOSE +Route117_EventScript_RematchDylan:: @ 81F3ADF + trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_DylanRematchIntro, Route117_Text_DylanRematchDefeat + msgbox Route117_Text_DylanPostRematch, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3AF6:: @ 81F3AF6 - trainerbattle_single TRAINER_MARIA_1, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 +Route117_EventScript_Maria:: @ 81F3AF6 + trainerbattle_single TRAINER_MARIA_1, Route117_Text_MariaIntro, Route117_Text_MariaDefeat, Route117_EventScript_RegisterMaria specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route117_EventScript_1F3B41 - msgbox Route117_Text_29C9D0, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route117_EventScript_RematchMaria + msgbox Route117_Text_MariaPostBattle, MSGBOX_DEFAULT release end -Route117_EventScript_1F3B22:: @ 81F3B22 +Route117_EventScript_RegisterMaria:: @ 81F3B22 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route117_Text_29CA32, MSGBOX_DEFAULT + msgbox Route117_Text_MariaRegister, MSGBOX_DEFAULT register_matchcall TRAINER_MARIA_1 release end -Route117_EventScript_1F3B41:: @ 81F3B41 - trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_29CA7C, Route117_Text_29CACC - msgbox Route117_Text_29CAF6, MSGBOX_AUTOCLOSE +Route117_EventScript_RematchMaria:: @ 81F3B41 + trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_MariaRematchIntro, Route117_Text_MariaRematchDefeat + msgbox Route117_Text_MariaPostRematch, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3B58:: @ 81F3B58 - trainerbattle_single TRAINER_DEREK, Route117_Text_29CB32, Route117_Text_29CB87 - msgbox Route117_Text_29CBAD, MSGBOX_AUTOCLOSE +Route117_EventScript_Derek:: @ 81F3B58 + trainerbattle_single TRAINER_DEREK, Route117_Text_DerekIntro, Route117_Text_DerekDefeat + msgbox Route117_Text_DerekPostBattle, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3B6F:: @ 81F3B6F - trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F +Route117_EventScript_Anna:: @ 81F3B6F + trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_AnnaIntro, Route117_Text_AnnaDefeat, Route117_Text_AnnaNotEnoughMons, Route117_EventScript_RegisterAnna specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route117_EventScript_1F3BB8 - msgbox Route117_Text_29CCCB, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route117_EventScript_RematchAnna + msgbox Route117_Text_AnnaPostBattle, MSGBOX_DEFAULT release end -Route117_EventScript_1F3B9F:: @ 81F3B9F - msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT +Route117_EventScript_RegisterAnna:: @ 81F3B9F + msgbox Route117_Text_AnnaAndMegRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ANNA_AND_MEG_1 release end -Route117_EventScript_1F3BB8:: @ 81F3BB8 - trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E - msgbox Route117_Text_29CF1C, MSGBOX_AUTOCLOSE +Route117_EventScript_RematchAnna:: @ 81F3BB8 + trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_AnnaRematchIntro, Route117_Text_AnnaRematchDefeat, Route117_Text_AnnaRematchNotEnoughMons + msgbox Route117_Text_AnnaPostRematch, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3BD3:: @ 81F3BD3 - trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03 +Route117_EventScript_Meg:: @ 81F3BD3 + trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_MegIntro, Route117_Text_MegDefeat, Route117_Text_MegNotEnoughMons, Route117_EventScript_RegisterMeg specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route117_EventScript_1F3C1C - msgbox Route117_Text_29CE17, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route117_EventScript_RematchMeg + msgbox Route117_Text_MegPostBattle, MSGBOX_DEFAULT release end -Route117_EventScript_1F3C03:: @ 81F3C03 - msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT +Route117_EventScript_RegisterMeg:: @ 81F3C03 + msgbox Route117_Text_AnnaAndMegRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ANNA_AND_MEG_1 release end -Route117_EventScript_1F3C1C:: @ 81F3C1C - trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053 - msgbox Route117_Text_29CFFE, MSGBOX_AUTOCLOSE +Route117_EventScript_RematchMeg:: @ 81F3C1C + trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_MegRematchIntro, Route117_Text_MegRematchDefeat, Route117_Text_MegRematchNotEnoughMons + msgbox Route117_Text_MegPostRematch, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3C37:: @ 81F3C37 - trainerbattle_single TRAINER_MELINA, Route117_Text_29D0B7, Route117_Text_29D0F1 - msgbox Route117_Text_29D10E, MSGBOX_AUTOCLOSE +Route117_EventScript_Melina:: @ 81F3C37 + trainerbattle_single TRAINER_MELINA, Route117_Text_MelinaIntro, Route117_Text_MelinaDefeat + msgbox Route117_Text_MelinaPostBattle, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3C4E:: @ 81F3C4E - trainerbattle_single TRAINER_BRANDI, Route117_Text_29D14B, Route117_Text_29D189 - msgbox Route117_Text_29D196, MSGBOX_AUTOCLOSE +Route117_EventScript_Brandi:: @ 81F3C4E + trainerbattle_single TRAINER_BRANDI, Route117_Text_BrandiIntro, Route117_Text_BrandiDefeat + msgbox Route117_Text_BrandiPostBattle, MSGBOX_AUTOCLOSE end -Route117_EventScript_1F3C65:: @ 81F3C65 - trainerbattle_single TRAINER_AISHA, Route117_Text_29D1D1, Route117_Text_29D206 - msgbox Route117_Text_29D24C, MSGBOX_AUTOCLOSE +Route117_EventScript_Aisha:: @ 81F3C65 + trainerbattle_single TRAINER_AISHA, Route117_Text_AishaIntro, Route117_Text_AishaDefeat + msgbox Route117_Text_AishaPostBattle, MSGBOX_AUTOCLOSE end -Route117_Text_1F3C7C: @ 81F3C7C +Route117_Text_DayCarePokemonHadNewMove: @ 81F3C7C .string "I left my POKéMON at the DAY CARE.\p" .string "When I got it back, it had a new move\n" .string "that I didn't teach it.\l" .string "I was really, really surprised.$" -Route117_Text_1F3CFD: @ 81F3CFD +Route117_Text_ArentTheseFlowersPretty: @ 81F3CFD .string "What do you think?\n" .string "Aren't these flowers pretty?\p" .string "I planted them all!$" -Route117_Text_1F3D41: @ 81F3D41 +Route117_Text_AirIsTastyHere: @ 81F3D41 .string "The air is tasty here!$" -Route117_Text_1F3D58: @ 81F3D58 +Route117_Text_RouteSignVerdanturf: @ 81F3D58 .string "ROUTE 117\n" .string "{LEFT_ARROW} VERDANTURF TOWN$" -Route117_Text_1F3D74: @ 81F3D74 +Route117_Text_RouteSignMauville: @ 81F3D74 .string "ROUTE 117\n" .string "{RIGHT_ARROW} MAUVILLE CITY$" -Route117_Text_1F3D8E: @ 81F3D8E +Route117_Text_DayCareSign: @ 81F3D8E .string "POKéMON DAY CARE\n" .string "“Let us raise your POKéMON.”$" diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index 40a988bad..d64adbb86 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -79,7 +79,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route118_EventScript_1F4079", + "script": "Route118_EventScript_Perry", "flag": "0" }, { @@ -118,7 +118,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_1F3E73", + "script": "Route118_EventScript_Girl", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_GabbyBattle5", + "script": "GabbyAndTy_EventScript_GabbyBattle5", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" }, { @@ -144,7 +144,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_TyBattle5", + "script": "GabbyAndTy_EventScript_TyBattle5", "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" }, { @@ -196,7 +196,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_1F3E14", + "script": "Route118_EventScript_GoodRodFisherman", "flag": "0" }, { @@ -209,7 +209,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route118_EventScript_1F3F87", + "script": "Route118_EventScript_Rose", "flag": "0" }, { @@ -222,7 +222,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "Route118_EventScript_1F4000", + "script": "Route118_EventScript_Wade", "flag": "0" }, { @@ -235,7 +235,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route118_EventScript_1F4090", + "script": "Route118_EventScript_Chester", "flag": "0" }, { @@ -248,7 +248,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route118_EventScript_1F3FE9", + "script": "Route118_EventScript_Barny", "flag": "0" }, { @@ -261,7 +261,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route118_EventScript_1F4017", + "script": "Route118_EventScript_Dalton", "flag": "0" }, { @@ -300,7 +300,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route118_EventScript_1F40A7", + "script": "Route118_EventScript_Deandre", "flag": "0" } ], @@ -328,7 +328,7 @@ "elevation": 3, "var": "VAR_ROUTE118_STATE", "var_value": "0", - "script": "Route118_EventScript_1F3E8E" + "script": "Route118_EventScript_StevenTrigger0" }, { "type": "trigger", @@ -337,7 +337,7 @@ "elevation": 3, "var": "VAR_ROUTE118_STATE", "var_value": "0", - "script": "Route118_EventScript_1F3EAE" + "script": "Route118_EventScript_StevenTrigger1" }, { "type": "trigger", @@ -346,7 +346,7 @@ "elevation": 3, "var": "VAR_ROUTE118_STATE", "var_value": "0", - "script": "Route118_EventScript_1F3EC4" + "script": "Route118_EventScript_StevenTrigger2" } ], "bg_events": [ @@ -363,7 +363,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route118_EventScript_1F3E7C" + "script": "Route118_EventScript_RouteSignMauville" }, { "type": "sign", @@ -371,7 +371,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route118_EventScript_1F3E85" + "script": "Route118_EventScript_RouteSign119" }, { "type": "secret_base", diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index fe9c4137d..7b2326b13 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -1,7 +1,7 @@ Route118_MapScripts:: @ 81F3DBC map_script MAP_SCRIPT_ON_TRANSITION, Route118_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Route118_MapScript1_1F3DF3 - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_MapScript2_1F3E0A + map_script MAP_SCRIPT_ON_LOAD, Route118_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_OnFrame .byte 0 Route118_OnTransition: @ 81F3DCC @@ -14,142 +14,142 @@ Route118_OnTransition: @ 81F3DCC call_if_eq UnusualWeather_StartGroudonWeather end -Route118_MapScript1_1F3DF3: @ 81F3DF3 +Route118_OnLoad: @ 81F3DF3 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118East compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118West end -Route118_MapScript2_1F3E0A: @ 81F3E0A +Route118_OnFrame: @ 81F3E0A map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 -Route118_EventScript_1F3E14:: @ 81F3E14 +Route118_EventScript_GoodRodFisherman:: @ 81F3E14 lock faceplayer - goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_1F3E69 - msgbox Route118_Text_1F427B, MSGBOX_YESNO + goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_ReceivedGoodRod + msgbox Route118_Text_YouAgreeGoodRodIsGood, MSGBOX_YESNO compare VAR_RESULT, YES - goto_if_eq Route118_EventScript_1F3E3E + goto_if_eq Route118_EventScript_ReceiveGoodRod compare VAR_RESULT, NO - goto_if_eq Route118_EventScript_1F3E5F + goto_if_eq Route118_EventScript_DeclineGoodRod end -Route118_EventScript_1F3E3E:: @ 81F3E3E - msgbox Route118_Text_1F42AF, MSGBOX_DEFAULT +Route118_EventScript_ReceiveGoodRod:: @ 81F3E3E + msgbox Route118_Text_IdenticalMindsTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_GOOD_ROD setflag FLAG_RECEIVED_GOOD_ROD - msgbox Route118_Text_1F42E7, MSGBOX_DEFAULT + msgbox Route118_Text_TryYourLuckFishing, MSGBOX_DEFAULT release end -Route118_EventScript_1F3E5F:: @ 81F3E5F - msgbox Route118_Text_1F4319, MSGBOX_DEFAULT +Route118_EventScript_DeclineGoodRod:: @ 81F3E5F + msgbox Route118_Text_DontYouLikeToFish, MSGBOX_DEFAULT release end -Route118_EventScript_1F3E69:: @ 81F3E69 - msgbox Route118_Text_1F4331, MSGBOX_DEFAULT +Route118_EventScript_ReceivedGoodRod:: @ 81F3E69 + msgbox Route118_Text_TryCatchingMonWithGoodRod, MSGBOX_DEFAULT release end -Route118_EventScript_1F3E73:: @ 81F3E73 - msgbox Route118_Text_1F4367, MSGBOX_NPC +Route118_EventScript_Girl:: @ 81F3E73 + msgbox Route118_Text_CanCrossRiversWithSurf, MSGBOX_NPC end -Route118_EventScript_1F3E7C:: @ 81F3E7C - msgbox Route118_Text_1F43F4, MSGBOX_SIGN +Route118_EventScript_RouteSignMauville:: @ 81F3E7C + msgbox Route118_Text_RouteSignMauville, MSGBOX_SIGN end -Route118_EventScript_1F3E85:: @ 81F3E85 - msgbox Route118_Text_1F440E, MSGBOX_SIGN +Route118_EventScript_RouteSign119:: @ 81F3E85 + msgbox Route118_Text_RouteSign119, MSGBOX_SIGN end -Route118_EventScript_1F3E8E:: @ 81F3E8E +Route118_EventScript_StevenTrigger0:: @ 81F3E8E lockall setvar VAR_0x8008, 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement 19, Route118_Movement_1F3F61 + applymovement 19, Route118_Movement_StevenApproachLedge0 waitmovement 0 - goto Route118_EventScript_1F3EE4 + goto Route118_EventScript_StevenTrigger end -Route118_EventScript_1F3EAE:: @ 81F3EAE +Route118_EventScript_StevenTrigger1:: @ 81F3EAE lockall setvar VAR_0x8008, 1 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - goto Route118_EventScript_1F3EE4 + goto Route118_EventScript_StevenTrigger end -Route118_EventScript_1F3EC4:: @ 81F3EC4 +Route118_EventScript_StevenTrigger2:: @ 81F3EC4 lockall setvar VAR_0x8008, 2 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp waitmovement 0 - applymovement 19, Route118_Movement_1F3F63 + applymovement 19, Route118_Movement_StevenApproachLedge2 waitmovement 0 - goto Route118_EventScript_1F3EE4 + goto Route118_EventScript_StevenTrigger end -Route118_EventScript_1F3EE4:: @ 81F3EE4 +Route118_EventScript_StevenTrigger:: @ 81F3EE4 playse SE_DANSA - applymovement 19, Route118_Movement_1F3F65 + applymovement 19, Route118_Movement_StevenJumpLedge waitmovement 0 delay 30 - msgbox Route118_Text_1F40BE, MSGBOX_DEFAULT + msgbox Route118_Text_StevenQuestions, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 0 - call_if_eq Route118_EventScript_1F3F28 + call_if_eq Route118_EventScript_StevenExit0 compare VAR_0x8008, 1 - call_if_eq Route118_EventScript_1F3F3A + call_if_eq Route118_EventScript_StevenExit1 compare VAR_0x8008, 2 - call_if_eq Route118_EventScript_1F3F4C + call_if_eq Route118_EventScript_StevenExit2 setvar VAR_ROUTE118_STATE, 1 removeobject 19 releaseall end -Route118_EventScript_1F3F28:: @ 81F3F28 - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E - applymovement 19, Route118_Movement_1F3F69 +Route118_EventScript_StevenExit0:: @ 81F3F28 + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit + applymovement 19, Route118_Movement_StevenExit0 waitmovement 0 return -Route118_EventScript_1F3F3A:: @ 81F3F3A - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E - applymovement 19, Route118_Movement_1F3F74 +Route118_EventScript_StevenExit1:: @ 81F3F3A + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit + applymovement 19, Route118_Movement_StevenExit1 waitmovement 0 return -Route118_EventScript_1F3F4C:: @ 81F3F4C - applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E - applymovement 19, Route118_Movement_1F3F7E +Route118_EventScript_StevenExit2:: @ 81F3F4C + applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit + applymovement 19, Route118_Movement_StevenExit2 waitmovement 0 return -Route118_Movement_1F3F5E: @ 81F3F5E +Route118_Movement_PlayerWatchStevenExit: @ 81F3F5E delay_16 walk_in_place_fastest_right step_end -Route118_Movement_1F3F61: @ 81F3F61 +Route118_Movement_StevenApproachLedge0: @ 81F3F61 walk_left step_end -Route118_Movement_1F3F63: @ 81F3F63 +Route118_Movement_StevenApproachLedge2: @ 81F3F63 walk_right step_end -Route118_Movement_1F3F65: @ 81F3F65 +Route118_Movement_StevenJumpLedge: @ 81F3F65 jump_2_down delay_16 walk_down step_end -Route118_Movement_1F3F69: @ 81F3F69 +Route118_Movement_StevenExit0: @ 81F3F69 walk_right walk_right walk_right @@ -162,7 +162,7 @@ Route118_Movement_1F3F69: @ 81F3F69 walk_right step_end -Route118_Movement_1F3F74: @ 81F3F74 +Route118_Movement_StevenExit1: @ 81F3F74 walk_right walk_right walk_right @@ -174,7 +174,7 @@ Route118_Movement_1F3F74: @ 81F3F74 walk_right step_end -Route118_Movement_1F3F7E: @ 81F3F7E +Route118_Movement_StevenExit2: @ 81F3F7E walk_right walk_right walk_right @@ -185,76 +185,76 @@ Route118_Movement_1F3F7E: @ 81F3F7E walk_right step_end -Route118_EventScript_1F3F87:: @ 81F3F87 - trainerbattle_single TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3 +Route118_EventScript_Rose:: @ 81F3F87 + trainerbattle_single TRAINER_ROSE_1, Route118_Text_RoseIntro, Route118_Text_RoseDefeat, Route118_EventScript_RegisterRose specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route118_EventScript_1F3FD2 - msgbox Route118_Text_29D2FA, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route118_EventScript_RematchRose + msgbox Route118_Text_RosePostBattle, MSGBOX_DEFAULT release end -Route118_EventScript_1F3FB3:: @ 81F3FB3 +Route118_EventScript_RegisterRose:: @ 81F3FB3 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route118_Text_29D343, MSGBOX_DEFAULT + msgbox Route118_Text_RoseRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ROSE_1 release end -Route118_EventScript_1F3FD2:: @ 81F3FD2 - trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_29D382, Route118_Text_29D3AA - msgbox Route118_Text_29D3D9, MSGBOX_AUTOCLOSE +Route118_EventScript_RematchRose:: @ 81F3FD2 + trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_RoseRematchIntro, Route118_Text_RoseRematchDefeat + msgbox Route118_Text_RosePostRematch, MSGBOX_AUTOCLOSE end -Route118_EventScript_1F3FE9:: @ 81F3FE9 - trainerbattle_single TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C - msgbox Route118_Text_29D587, MSGBOX_AUTOCLOSE +Route118_EventScript_Barny:: @ 81F3FE9 + trainerbattle_single TRAINER_BARNY, Route118_Text_BarnyIntro, Route118_Text_BarnyDefeat + msgbox Route118_Text_BarnyPostBattle, MSGBOX_AUTOCLOSE end -Route118_EventScript_1F4000:: @ 81F4000 - trainerbattle_single TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C - msgbox Route118_Text_29D663, MSGBOX_AUTOCLOSE +Route118_EventScript_Wade:: @ 81F4000 + trainerbattle_single TRAINER_WADE, Route118_Text_WadeIntro, Route118_Text_WadeDefeat + msgbox Route118_Text_WadePostBattle, MSGBOX_AUTOCLOSE end -Route118_EventScript_1F4017:: @ 81F4017 - trainerbattle_single TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043 +Route118_EventScript_Dalton:: @ 81F4017 + trainerbattle_single TRAINER_DALTON_1, Route118_Text_DaltonIntro, Route118_Text_DaltonDefeat, Route118_EventScript_RegisterDalton specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route118_EventScript_1F4062 - msgbox Route118_Text_29D6D8, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route118_EventScript_RematchDalton + msgbox Route118_Text_DaltonPostBattle, MSGBOX_DEFAULT release end -Route118_EventScript_1F4043:: @ 81F4043 +Route118_EventScript_RegisterDalton:: @ 81F4043 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route118_Text_29D74A, MSGBOX_DEFAULT + msgbox Route118_Text_DaltonRegister, MSGBOX_DEFAULT register_matchcall TRAINER_DALTON_1 release end -Route118_EventScript_1F4062:: @ 81F4062 - trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_29D789, Route118_Text_29D7CA - msgbox Route118_Text_29D7D5, MSGBOX_AUTOCLOSE +Route118_EventScript_RematchDalton:: @ 81F4062 + trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_DaltonRematchIntro, Route118_Text_DaltonRematchDefeat + msgbox Route118_Text_DaltonPostRematch, MSGBOX_AUTOCLOSE end -Route118_EventScript_1F4079:: @ 81F4079 - trainerbattle_single TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B - msgbox Route118_Text_29D46C, MSGBOX_AUTOCLOSE +Route118_EventScript_Perry:: @ 81F4079 + trainerbattle_single TRAINER_PERRY, Route118_Text_PerryIntro, Route118_Text_PerryDefeat + msgbox Route118_Text_PerryPostBattle, MSGBOX_AUTOCLOSE end -Route118_EventScript_1F4090:: @ 81F4090 - trainerbattle_single TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4 - msgbox Route118_Text_29D4DA, MSGBOX_AUTOCLOSE +Route118_EventScript_Chester:: @ 81F4090 + trainerbattle_single TRAINER_CHESTER, Route118_Text_ChesterIntro, Route118_Text_ChesterDefeat + msgbox Route118_Text_ChesterPostBattle, MSGBOX_AUTOCLOSE end -Route118_EventScript_1F40A7:: @ 81F40A7 - trainerbattle_single TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C - msgbox Route118_Text_29D872, MSGBOX_AUTOCLOSE +Route118_EventScript_Deandre:: @ 81F40A7 + trainerbattle_single TRAINER_DEANDRE, Route118_Text_DeandreIntro, Route118_Text_DeandreDefeat + msgbox Route118_Text_DeandrePostBattle, MSGBOX_AUTOCLOSE end -Route118_Text_1F40BE: @ 81F40BE +Route118_Text_StevenQuestions: @ 81F40BE .string "STEVEN: Hi, {PLAYER}{KUN}!\p" .string "It's me, STEVEN!\n" .string "We met in the cave near DEWFORD.\p" @@ -272,40 +272,40 @@ Route118_Text_1F40BE: @ 81F40BE .string "It would be nice if we were to meet\n" .string "again somewhere.$" -Route118_Text_1F427B: @ 81F427B +Route118_Text_YouAgreeGoodRodIsGood: @ 81F427B .string "Hmm!\n" .string "A GOOD ROD is really good!\p" .string "Wouldn't you agree?$" -Route118_Text_1F42AF: @ 81F42AF +Route118_Text_IdenticalMindsTakeThis: @ 81F42AF .string "Hmm!\n" .string "We're of identical minds!\p" .string "Hmm!\n" .string "Take this GOOD ROD!$" -Route118_Text_1F42E7: @ 81F42E7 +Route118_Text_TryYourLuckFishing: @ 81F42E7 .string "Wherever there's water, try your luck\n" .string "at fishing.$" -Route118_Text_1F4319: @ 81F4319 +Route118_Text_DontYouLikeToFish: @ 81F4319 .string "Don't you like to fish?$" -Route118_Text_1F4331: @ 81F4331 +Route118_Text_TryCatchingMonWithGoodRod: @ 81F4331 .string "Try catching all sorts of POKéMON\n" .string "with your GOOD ROD.$" -Route118_Text_1F4367: @ 81F4367 +Route118_Text_CanCrossRiversWithSurf: @ 81F4367 .string "Even if there isn't a boat, you can\n" .string "cross rivers and the sea if you have\l" .string "a POKéMON that knows SURF.\p" .string "POKéMON can be counted on to do so\n" .string "much!$" -Route118_Text_1F43F4: @ 81F43F4 +Route118_Text_RouteSignMauville: @ 81F43F4 .string "ROUTE 118\n" .string "{LEFT_ARROW} MAUVILLE CITY$" -Route118_Text_1F440E: @ 81F440E +Route118_Text_RouteSign119: @ 81F440E .string "ROUTE 118\n" .string "{UP_ARROW} ROUTE 119$" 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/maps/Route124/map.json b/data/maps/Route124/map.json index 913208954..01bc84377 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route124_EventScript_1F6585", + "script": "Route124_EventScript_Spencer", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route124_EventScript_1F659C", + "script": "Route124_EventScript_Roland", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route124_EventScript_1F65B3", + "script": "Route124_EventScript_Jenny", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 8, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route124_EventScript_1F6615", + "script": "Route124_EventScript_Grace", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route124_EventScript_1F662C", + "script": "Route124_EventScript_Chad", "flag": "0" }, { @@ -154,7 +154,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route124_EventScript_1F6643", + "script": "Route124_EventScript_Lila", "flag": "0" }, { @@ -167,7 +167,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route124_EventScript_1F66A7", + "script": "Route124_EventScript_Roy", "flag": "0" }, { @@ -180,7 +180,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route124_EventScript_1F670B", + "script": "Route124_EventScript_Declan", "flag": "0" }, { @@ -193,7 +193,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route124_EventScript_1F6722", + "script": "Route124_EventScript_Isabella", "flag": "0" } ], @@ -214,7 +214,7 @@ "y": 48, "elevation": 3, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "Route124_EventScript_1F657C" + "script": "Route124_EventScript_HuntersHouseSign" } ] }
\ No newline at end of file diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 23dd174f6..8d0837320 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -6,102 +6,102 @@ Route124_OnTransition: @ 81F6572 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather end -Route124_EventScript_1F657C:: @ 81F657C - msgbox Route124_Text_1F6739, MSGBOX_SIGN +Route124_EventScript_HuntersHouseSign:: @ 81F657C + msgbox Route124_Text_HuntersHouse, MSGBOX_SIGN end -Route124_EventScript_1F6585:: @ 81F6585 - trainerbattle_single TRAINER_SPENCER, Route124_Text_2A09B1, Route124_Text_2A0A02 - msgbox Route124_Text_2A0A20, MSGBOX_AUTOCLOSE +Route124_EventScript_Spencer:: @ 81F6585 + trainerbattle_single TRAINER_SPENCER, Route124_Text_SpencerIntro, Route124_Text_SpencerDefeat + msgbox Route124_Text_SpencerPostBattle, MSGBOX_AUTOCLOSE end -Route124_EventScript_1F659C:: @ 81F659C - trainerbattle_single TRAINER_ROLAND, Route124_Text_2A0A84, Route124_Text_2A0ACC - msgbox Route124_Text_2A0AD9, MSGBOX_AUTOCLOSE +Route124_EventScript_Roland:: @ 81F659C + trainerbattle_single TRAINER_ROLAND, Route124_Text_RolandIntro, Route124_Text_RolandDefeat + msgbox Route124_Text_RolandPostBattle, MSGBOX_AUTOCLOSE end -Route124_EventScript_1F65B3:: @ 81F65B3 - trainerbattle_single TRAINER_JENNY_1, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF +Route124_EventScript_Jenny:: @ 81F65B3 + trainerbattle_single TRAINER_JENNY_1, Route124_Text_JennyIntro, Route124_Text_JennyDefeat, Route124_EventScript_RegisterJenny specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route124_EventScript_1F65FE - msgbox Route124_Text_2A0B9A, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route124_EventScript_RematchJenny + msgbox Route124_Text_JennyPostBattle, MSGBOX_DEFAULT release end -Route124_EventScript_1F65DF:: @ 81F65DF +Route124_EventScript_RegisterJenny:: @ 81F65DF special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route124_Text_2A0C14, MSGBOX_DEFAULT + msgbox Route124_Text_JennyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_JENNY_1 release end -Route124_EventScript_1F65FE:: @ 81F65FE - trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_2A0C60, Route124_Text_2A0CA0 - msgbox Route124_Text_2A0CBE, MSGBOX_AUTOCLOSE +Route124_EventScript_RematchJenny:: @ 81F65FE + trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_JennyRematchIntro, Route124_Text_JennyRematchDefeat + msgbox Route124_Text_JennyPostRematch, MSGBOX_AUTOCLOSE end -Route124_EventScript_1F6615:: @ 81F6615 - trainerbattle_single TRAINER_GRACE, Route124_Text_2A0D0A, Route124_Text_2A0D3D - msgbox Route124_Text_2A0D66, MSGBOX_AUTOCLOSE +Route124_EventScript_Grace:: @ 81F6615 + trainerbattle_single TRAINER_GRACE, Route124_Text_GraceIntro, Route124_Text_GraceDefeat + msgbox Route124_Text_GracePostBattle, MSGBOX_AUTOCLOSE end -Route124_EventScript_1F662C:: @ 81F662C - trainerbattle_single TRAINER_CHAD, Route124_Text_2A0DA0, Route124_Text_2A0DFF - msgbox Route124_Text_2A0E1E, MSGBOX_AUTOCLOSE +Route124_EventScript_Chad:: @ 81F662C + trainerbattle_single TRAINER_CHAD, Route124_Text_ChadIntro, Route124_Text_ChadDefeat + msgbox Route124_Text_ChadPostBattle, MSGBOX_AUTOCLOSE end -Route124_EventScript_1F6643:: @ 81F6643 - trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 +Route124_EventScript_Lila:: @ 81F6643 + trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_LilaIntro, Route124_Text_LilaDefeat, Route124_Text_LilaNotEnoughMons, Route124_EventScript_RegisterLila specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route124_EventScript_1F668C - msgbox Route124_Text_2A0F3A, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route124_EventScript_RematchLila + msgbox Route124_Text_LilaPostBattle, MSGBOX_DEFAULT release end -Route124_EventScript_1F6673:: @ 81F6673 - msgbox Route124_Text_2A109F, MSGBOX_DEFAULT +Route124_EventScript_RegisterLila:: @ 81F6673 + msgbox Route124_Text_LilaRoyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_LILA_AND_ROY_1 release end -Route124_EventScript_1F668C:: @ 81F668C - trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A111E, Route124_Text_2A11B2, Route124_Text_2A1255 - msgbox Route124_Text_2A1203, MSGBOX_AUTOCLOSE +Route124_EventScript_RematchLila:: @ 81F668C + trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_LilaRematchIntro, Route124_Text_LilaRematchDefeat, Route124_Text_LilaRematchNotEnoughMons + msgbox Route124_Text_LilaPostRematch, MSGBOX_AUTOCLOSE end -Route124_EventScript_1F66A7:: @ 81F66A7 - trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 +Route124_EventScript_Roy:: @ 81F66A7 + trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_RoyIntro, Route124_Text_RoyDefeat, Route124_Text_RoyNotEnoughMons, Route124_EventScript_RegisterRoy specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route124_EventScript_1F66F0 - msgbox Route124_Text_2A103E, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route124_EventScript_RematchRoy + msgbox Route124_Text_RoyPostBattle, MSGBOX_DEFAULT release end -Route124_EventScript_1F66D7:: @ 81F66D7 - msgbox Route124_Text_2A109F, MSGBOX_DEFAULT +Route124_EventScript_RegisterRoy:: @ 81F66D7 + msgbox Route124_Text_LilaRoyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_LILA_AND_ROY_1 release end -Route124_EventScript_1F66F0:: @ 81F66F0 - trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_2A129A, Route124_Text_2A12DD, Route124_Text_2A1384 - msgbox Route124_Text_2A130F, MSGBOX_AUTOCLOSE +Route124_EventScript_RematchRoy:: @ 81F66F0 + trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_RoyRematchIntro, Route124_Text_RoyRematchDefeat, Route124_Text_RoyRematchNotEnoughMons + msgbox Route124_Text_RoyPostRematch, MSGBOX_AUTOCLOSE end -Route124_EventScript_1F670B:: @ 81F670B - trainerbattle_single TRAINER_DECLAN, Route124_Text_2A13BD, Route124_Text_2A142C - msgbox Route124_Text_2A144F, MSGBOX_AUTOCLOSE +Route124_EventScript_Declan:: @ 81F670B + trainerbattle_single TRAINER_DECLAN, Route124_Text_DeclanIntro, Route124_Text_DeclanDefeat + msgbox Route124_Text_DeclanPostBattle, MSGBOX_AUTOCLOSE end -Route124_EventScript_1F6722:: @ 81F6722 - trainerbattle_single TRAINER_ISABELLA, Route124_Text_2A148E, Route124_Text_2A14BC - msgbox Route124_Text_2A14ED, MSGBOX_AUTOCLOSE +Route124_EventScript_Isabella:: @ 81F6722 + trainerbattle_single TRAINER_ISABELLA, Route124_Text_IsabellaIntro, Route124_Text_IsabellaDefeat + msgbox Route124_Text_IsabellaPostBattle, MSGBOX_AUTOCLOSE end -Route124_Text_1F6739: @ 81F6739 +Route124_Text_HuntersHouse: @ 81F6739 .string "HUNTER'S HOUSE$" diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index 27615a521..402c42932 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -40,7 +40,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route125_EventScript_1F67A4", + "script": "Route125_EventScript_Nolen", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 5, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route125_EventScript_1F67BB", + "script": "Route125_EventScript_Stan", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route125_EventScript_1F67D2", + "script": "Route125_EventScript_Tanya", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 9, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route125_EventScript_1F67E9", + "script": "Route125_EventScript_Sharon", "flag": "0" }, { @@ -92,7 +92,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route125_EventScript_1F6800", + "script": "Route125_EventScript_Ernest", "flag": "0" }, { @@ -105,7 +105,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route125_EventScript_1F6862", + "script": "Route125_EventScript_Kim", "flag": "0" }, { @@ -118,7 +118,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route125_EventScript_1F687D", + "script": "Route125_EventScript_Iris", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route125_EventScript_1F6898", + "script": "Route125_EventScript_Presley", "flag": "0" }, { @@ -144,7 +144,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route125_EventScript_1F68AF", + "script": "Route125_EventScript_Auron", "flag": "0" }, { diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index bf845c152..5489c929e 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -1,7 +1,7 @@ Route125_MapScripts:: @ 81F6748 map_script MAP_SCRIPT_ON_TRANSITION, Route125_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Route125_MapScript1_1F6783 - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route125_MapScript2_1F679A + map_script MAP_SCRIPT_ON_LOAD, Route125_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route125_OnFrame .byte 0 Route125_OnTransition: @ 81F6758 @@ -14,76 +14,76 @@ Route125_OnTransition: @ 81F6758 call_if_eq UnusualWeather_StartKyogreWeather end -Route125_MapScript1_1F6783: @ 81F6783 +Route125_OnLoad: @ 81F6783 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125West compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST call_if_eq UnusualWeather_EventScript_PlaceTilesRoute125East end -Route125_MapScript2_1F679A: @ 81F679A +Route125_OnFrame: @ 81F679A map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 -Route125_EventScript_1F67A4:: @ 81F67A4 - trainerbattle_single TRAINER_NOLEN, Route125_Text_2A1527, Route125_Text_2A155A - msgbox Route125_Text_2A1567, MSGBOX_AUTOCLOSE +Route125_EventScript_Nolen:: @ 81F67A4 + trainerbattle_single TRAINER_NOLEN, Route125_Text_NolenIntro, Route125_Text_NolenDefeat + msgbox Route125_Text_NolenPostBattle, MSGBOX_AUTOCLOSE end -Route125_EventScript_1F67BB:: @ 81F67BB - trainerbattle_single TRAINER_STAN, Route125_Text_2A159F, Route125_Text_2A15C7 - msgbox Route125_Text_2A15D5, MSGBOX_AUTOCLOSE +Route125_EventScript_Stan:: @ 81F67BB + trainerbattle_single TRAINER_STAN, Route125_Text_StanIntro, Route125_Text_StanDefeat + msgbox Route125_Text_StanPostBattle, MSGBOX_AUTOCLOSE end -Route125_EventScript_1F67D2:: @ 81F67D2 - trainerbattle_single TRAINER_TANYA, Route125_Text_2A1615, Route125_Text_2A164D - msgbox Route125_Text_2A165E, MSGBOX_AUTOCLOSE +Route125_EventScript_Tanya:: @ 81F67D2 + trainerbattle_single TRAINER_TANYA, Route125_Text_TanyaIntro, Route125_Text_TanyaDefeat + msgbox Route125_Text_TanyaPostBattle, MSGBOX_AUTOCLOSE end -Route125_EventScript_1F67E9:: @ 81F67E9 - trainerbattle_single TRAINER_SHARON, Route125_Text_2A1686, Route125_Text_2A16C5 - msgbox Route125_Text_2A16CE, MSGBOX_AUTOCLOSE +Route125_EventScript_Sharon:: @ 81F67E9 + trainerbattle_single TRAINER_SHARON, Route125_Text_SharonIntro, Route125_Text_SharonDefeat + msgbox Route125_Text_SharonPostBattle, MSGBOX_AUTOCLOSE end -Route125_EventScript_1F6800:: @ 81F6800 - trainerbattle_single TRAINER_ERNEST_1, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C +Route125_EventScript_Ernest:: @ 81F6800 + trainerbattle_single TRAINER_ERNEST_1, Route125_Text_ErnestIntro, Route125_Text_ErnestDefeat, Route125_EventScript_RegisterErnest specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route125_EventScript_1F684B - msgbox Route125_Text_2A1755, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route125_EventScript_RematchErnest + msgbox Route125_Text_ErnestPostBattle, MSGBOX_DEFAULT release end -Route125_EventScript_1F682C:: @ 81F682C +Route125_EventScript_RegisterErnest:: @ 81F682C special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route125_Text_2A17CF, MSGBOX_DEFAULT + msgbox Route125_Text_ErnestRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ERNEST_1 release end -Route125_EventScript_1F684B:: @ 81F684B - trainerbattle_rematch TRAINER_ERNEST_1, Route125_Text_2A180E, Route125_Text_2A1851 - msgbox Route125_Text_2A187A, MSGBOX_AUTOCLOSE +Route125_EventScript_RematchErnest:: @ 81F684B + trainerbattle_rematch TRAINER_ERNEST_1, Route125_Text_ErnestRematchIntro, Route125_Text_ErnestRematchDefeat + msgbox Route125_Text_ErnestRematchPostBattle, MSGBOX_AUTOCLOSE end -Route125_EventScript_1F6862:: @ 81F6862 - trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_2A192B, Route125_Text_2A1989, Route125_Text_2A19F8 - msgbox Route125_Text_2A19A6, MSGBOX_AUTOCLOSE +Route125_EventScript_Kim:: @ 81F6862 + trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_KimIntro, Route125_Text_KimDefeat, Route125_Text_KimNotEnoughMons + msgbox Route125_Text_KimPostBattle, MSGBOX_AUTOCLOSE end -Route125_EventScript_1F687D:: @ 81F687D - trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_2A1A35, Route125_Text_2A1A71, Route125_Text_2A1AD9 - msgbox Route125_Text_2A1A92, MSGBOX_AUTOCLOSE +Route125_EventScript_Iris:: @ 81F687D + trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_IrisIntro, Route125_Text_IrisDefeat, Route125_Text_IrisNotEnoughMons + msgbox Route125_Text_IrisPostBattle, MSGBOX_AUTOCLOSE end -Route125_EventScript_1F6898:: @ 81F6898 - trainerbattle_single TRAINER_PRESLEY, Route125_Text_2A1B1A, Route125_Text_2A1B4E - msgbox Route125_Text_2A1B70, MSGBOX_AUTOCLOSE +Route125_EventScript_Presley:: @ 81F6898 + trainerbattle_single TRAINER_PRESLEY, Route125_Text_PresleyIntro, Route125_Text_PresleyDefeat + msgbox Route125_Text_PresleyPostBattle, MSGBOX_AUTOCLOSE end -Route125_EventScript_1F68AF:: @ 81F68AF - trainerbattle_single TRAINER_AURON, Route125_Text_2A1BCE, Route125_Text_2A1BFD - msgbox Route125_Text_2A1C2A, MSGBOX_AUTOCLOSE +Route125_EventScript_Auron:: @ 81F68AF + trainerbattle_single TRAINER_AURON, Route125_Text_AuronIntro, Route125_Text_AuronDefeat + msgbox Route125_Text_AuronPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index b8359bd84..db01091ac 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -40,7 +40,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route126_EventScript_1F68D6", + "script": "Route126_EventScript_Barry", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route126_EventScript_1F68ED", + "script": "Route126_EventScript_Dean", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route126_EventScript_1F6904", + "script": "Route126_EventScript_Nikki", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route126_EventScript_1F691B", + "script": "Route126_EventScript_Brenda", "flag": "0" }, { @@ -105,7 +105,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route126_EventScript_1F6960", + "script": "Route126_EventScript_Sienna", "flag": "0" }, { @@ -118,7 +118,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route126_EventScript_1F6977", + "script": "Route126_EventScript_Pablo", "flag": "0" }, { @@ -131,7 +131,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route126_EventScript_1F6949", + "script": "Route126_EventScript_Isobel", "flag": "0" }, { @@ -144,7 +144,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route126_EventScript_1F6932", + "script": "Route126_EventScript_Leonardo", "flag": "0" } ], diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index d1a2ff0f3..3624cc8a5 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -6,60 +6,60 @@ Route126_OnTransition: @ 81F68CC call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather end -Route126_EventScript_1F68D6:: @ 81F68D6 - trainerbattle_single TRAINER_BARRY, Route126_Text_2A1C95, Route126_Text_2A1CC8 - msgbox Route126_Text_2A1CDD, MSGBOX_AUTOCLOSE +Route126_EventScript_Barry:: @ 81F68D6 + trainerbattle_single TRAINER_BARRY, Route126_Text_BarryIntro, Route126_Text_BarryDefeat + msgbox Route126_Text_BarryPostBattle, MSGBOX_AUTOCLOSE end -Route126_EventScript_1F68ED:: @ 81F68ED - trainerbattle_single TRAINER_DEAN, Route126_Text_2A1D2A, Route126_Text_2A1D63 - msgbox Route126_Text_2A1D72, MSGBOX_AUTOCLOSE +Route126_EventScript_Dean:: @ 81F68ED + trainerbattle_single TRAINER_DEAN, Route126_Text_DeanIntro, Route126_Text_DeanDefeat + msgbox Route126_Text_DeanPostBattle, MSGBOX_AUTOCLOSE end -Route126_EventScript_1F6904:: @ 81F6904 - trainerbattle_single TRAINER_NIKKI, Route126_Text_2A1DAE, Route126_Text_2A1DC8 - msgbox Route126_Text_2A1E03, MSGBOX_AUTOCLOSE +Route126_EventScript_Nikki:: @ 81F6904 + trainerbattle_single TRAINER_NIKKI, Route126_Text_NikkiIntro, Route126_Text_NikkiDefeat + msgbox Route126_Text_NikkiPostBattle, MSGBOX_AUTOCLOSE end -Route126_EventScript_1F691B:: @ 81F691B - trainerbattle_single TRAINER_BRENDA, Route126_Text_2A1E3E, Route126_Text_2A1E63 - msgbox Route126_Text_2A1E70, MSGBOX_AUTOCLOSE +Route126_EventScript_Brenda:: @ 81F691B + trainerbattle_single TRAINER_BRENDA, Route126_Text_BrendaIntro, Route126_Text_BrendaDefeat + msgbox Route126_Text_BrendaPostBattle, MSGBOX_AUTOCLOSE end -Route126_EventScript_1F6932:: @ 81F6932 - trainerbattle_single TRAINER_LEONARDO, Route126_Text_2A2063, Route126_Text_2A20C6 - msgbox Route126_Text_2A20F7, MSGBOX_AUTOCLOSE +Route126_EventScript_Leonardo:: @ 81F6932 + trainerbattle_single TRAINER_LEONARDO, Route126_Text_LeonardoIntro, Route126_Text_LeonardoDefeat + msgbox Route126_Text_LeonardoPostBattle, MSGBOX_AUTOCLOSE end -Route126_EventScript_1F6949:: @ 81F6949 - trainerbattle_single TRAINER_ISOBEL, Route126_Text_2A216A, Route126_Text_2A21A3 - msgbox Route126_Text_2A21B8, MSGBOX_AUTOCLOSE +Route126_EventScript_Isobel:: @ 81F6949 + trainerbattle_single TRAINER_ISOBEL, Route126_Text_IsobelIntro, Route126_Text_IsobelDefeat + msgbox Route126_Text_IsobelPostBattle, MSGBOX_AUTOCLOSE end -Route126_EventScript_1F6960:: @ 81F6960 - trainerbattle_single TRAINER_SIENNA, Route126_Text_2A21EF, Route126_Text_2A2216 - msgbox Route126_Text_2A222A, MSGBOX_AUTOCLOSE +Route126_EventScript_Sienna:: @ 81F6960 + trainerbattle_single TRAINER_SIENNA, Route126_Text_SiennaIntro, Route126_Text_SiennaDefeat + msgbox Route126_Text_SiennaPostBattle, MSGBOX_AUTOCLOSE end -Route126_EventScript_1F6977:: @ 81F6977 - trainerbattle_single TRAINER_PABLO_1, Route126_Text_2A1EA5, Route126_Text_2A1EE3, Route126_EventScript_1F69A3 +Route126_EventScript_Pablo:: @ 81F6977 + trainerbattle_single TRAINER_PABLO_1, Route126_Text_PabloIntro, Route126_Text_PabloDefeat, Route126_EventScript_RegisterPablo specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route126_EventScript_1F69C2 - msgbox Route126_Text_2A1F10, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route126_EventScript_RematchPablo + msgbox Route126_Text_PabloPostBattle, MSGBOX_DEFAULT release end -Route126_EventScript_1F69A3:: @ 81F69A3 +Route126_EventScript_RegisterPablo:: @ 81F69A3 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route126_Text_2A1F5A, MSGBOX_DEFAULT + msgbox Route126_Text_PabloRegister, MSGBOX_DEFAULT register_matchcall TRAINER_PABLO_1 release end -Route126_EventScript_1F69C2:: @ 81F69C2 - trainerbattle_rematch TRAINER_PABLO_1, Route126_Text_2A1F98, Route126_Text_2A1FD8 - msgbox Route126_Text_2A200C, MSGBOX_AUTOCLOSE +Route126_EventScript_RematchPablo:: @ 81F69C2 + trainerbattle_rematch TRAINER_PABLO_1, Route126_Text_PabloRematchIntro, Route126_Text_PabloRematchDefeat + msgbox Route126_Text_PabloPostRematch, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index 08d39d971..626982ca2 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -45,7 +45,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route127_EventScript_1F6A35", + "script": "Route127_EventScript_Camden", "flag": "0" }, { @@ -58,7 +58,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route127_EventScript_1F6A4C", + "script": "Route127_EventScript_Donny", "flag": "0" }, { @@ -97,7 +97,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "Route127_EventScript_1F6A63", + "script": "Route127_EventScript_Jonah", "flag": "0" }, { @@ -110,7 +110,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "Route127_EventScript_1F6A91", + "script": "Route127_EventScript_Roger", "flag": "0" }, { @@ -123,7 +123,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "Route127_EventScript_1F6A7A", + "script": "Route127_EventScript_Henry", "flag": "0" }, { @@ -136,7 +136,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route127_EventScript_1F6AA8", + "script": "Route127_EventScript_Aidan", "flag": "0" }, { @@ -149,7 +149,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route127_EventScript_1F6AD6", + "script": "Route127_EventScript_Koji", "flag": "0" }, { @@ -162,7 +162,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route127_EventScript_1F6ABF", + "script": "Route127_EventScript_Athena", "flag": "0" }, { diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index db0fd0644..09d37dd7c 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -1,7 +1,7 @@ Route127_MapScripts:: @ 81F69D9 map_script MAP_SCRIPT_ON_TRANSITION, Route127_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Route127_MapScript1_1F6A14 - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_MapScript2_1F6A2B + map_script MAP_SCRIPT_ON_LOAD, Route127_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_OnFrame .byte 0 Route127_OnTransition: @ 81F69E9 @@ -14,71 +14,71 @@ Route127_OnTransition: @ 81F69E9 call_if_eq UnusualWeather_StartKyogreWeather end -Route127_MapScript1_1F6A14: @ 81F6A14 +Route127_OnLoad: @ 81F6A14 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127North compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH call_if_eq UnusualWeather_EventScript_PlaceTilesRoute127South end -Route127_MapScript2_1F6A2B: @ 81F6A2B +Route127_OnFrame: @ 81F6A2B map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 -Route127_EventScript_1F6A35:: @ 81F6A35 - trainerbattle_single TRAINER_CAMDEN, Route127_Text_2A225F, Route127_Text_2A2294 - msgbox Route127_Text_2A22A1, MSGBOX_AUTOCLOSE +Route127_EventScript_Camden:: @ 81F6A35 + trainerbattle_single TRAINER_CAMDEN, Route127_Text_CamdenIntro, Route127_Text_CamdenDefeat + msgbox Route127_Text_CamdenPostBattle, MSGBOX_AUTOCLOSE end -Route127_EventScript_1F6A4C:: @ 81F6A4C - trainerbattle_single TRAINER_DONNY, Route127_Text_2A22DD, Route127_Text_2A2315 - msgbox Route127_Text_2A232C, MSGBOX_AUTOCLOSE +Route127_EventScript_Donny:: @ 81F6A4C + trainerbattle_single TRAINER_DONNY, Route127_Text_DonnyIntro, Route127_Text_DonnyDefeat + msgbox Route127_Text_DonnyPostBattle, MSGBOX_AUTOCLOSE end -Route127_EventScript_1F6A63:: @ 81F6A63 - trainerbattle_single TRAINER_JONAH, Route127_Text_2A2381, Route127_Text_2A23E1 - msgbox Route127_Text_2A240C, MSGBOX_AUTOCLOSE +Route127_EventScript_Jonah:: @ 81F6A63 + trainerbattle_single TRAINER_JONAH, Route127_Text_JonahIntro, Route127_Text_JonahDefeat + msgbox Route127_Text_JonahPostBattle, MSGBOX_AUTOCLOSE end -Route127_EventScript_1F6A7A:: @ 81F6A7A - trainerbattle_single TRAINER_HENRY, Route127_Text_2A2450, Route127_Text_2A2483 - msgbox Route127_Text_2A2494, MSGBOX_AUTOCLOSE +Route127_EventScript_Henry:: @ 81F6A7A + trainerbattle_single TRAINER_HENRY, Route127_Text_HenryIntro, Route127_Text_HenryDefeat + msgbox Route127_Text_HenryPostBattle, MSGBOX_AUTOCLOSE end -Route127_EventScript_1F6A91:: @ 81F6A91 - trainerbattle_single TRAINER_ROGER, Route127_Text_2A24C6, Route127_Text_2A250B - msgbox Route127_Text_2A2538, MSGBOX_AUTOCLOSE +Route127_EventScript_Roger:: @ 81F6A91 + trainerbattle_single TRAINER_ROGER, Route127_Text_RogerIntro, Route127_Text_RogerDefeat + msgbox Route127_Text_RogerPostBattle, MSGBOX_AUTOCLOSE end -Route127_EventScript_1F6AA8:: @ 81F6AA8 - trainerbattle_single TRAINER_AIDAN, Route127_Text_2A257A, Route127_Text_2A25C1 - msgbox Route127_Text_2A25D2, MSGBOX_AUTOCLOSE +Route127_EventScript_Aidan:: @ 81F6AA8 + trainerbattle_single TRAINER_AIDAN, Route127_Text_AidanIntro, Route127_Text_AidanDefeat + msgbox Route127_Text_AidanPostBattle, MSGBOX_AUTOCLOSE end -Route127_EventScript_1F6ABF:: @ 81F6ABF - trainerbattle_single TRAINER_ATHENA, Route127_Text_2A27D0, Route127_Text_2A27FC - msgbox Route127_Text_2A2832, MSGBOX_AUTOCLOSE +Route127_EventScript_Athena:: @ 81F6ABF + trainerbattle_single TRAINER_ATHENA, Route127_Text_AthenaIntro, Route127_Text_AthenaDefeat + msgbox Route127_Text_AthenaPostBattle, MSGBOX_AUTOCLOSE end -Route127_EventScript_1F6AD6:: @ 81F6AD6 - trainerbattle_single TRAINER_KOJI_1, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 +Route127_EventScript_Koji:: @ 81F6AD6 + trainerbattle_single TRAINER_KOJI_1, Route127_Text_KojiIntro, Route127_Text_KojiDefeat, Route127_EventScript_RegisterKoji specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route127_EventScript_1F6B21 - msgbox Route127_Text_2A26AC, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route127_EventScript_RematchKoji + msgbox Route127_Text_KojiPostBattle, MSGBOX_DEFAULT release end -Route127_EventScript_1F6B02:: @ 81F6B02 +Route127_EventScript_RegisterKoji:: @ 81F6B02 special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route127_Text_2A26EE, MSGBOX_DEFAULT + msgbox Route127_Text_KojiRegister, MSGBOX_DEFAULT register_matchcall TRAINER_KOJI_1 release end -Route127_EventScript_1F6B21:: @ 81F6B21 - trainerbattle_rematch TRAINER_KOJI_1, Route127_Text_2A2734, Route127_Text_2A276B - msgbox Route127_Text_2A278E, MSGBOX_AUTOCLOSE +Route127_EventScript_RematchKoji:: @ 81F6B21 + trainerbattle_rematch TRAINER_KOJI_1, Route127_Text_KojiRematchIntro, Route127_Text_KojiRematchDefeat + msgbox Route127_Text_KojiPostRematch, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index 58246c247..a7de8ed19 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -45,7 +45,7 @@ "movement_range_y": 5, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route128_EventScript_1F6CBE", + "script": "Route128_EventScript_Isaiah", "flag": "0" }, { @@ -58,7 +58,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "Route128_EventScript_1F6D20", + "script": "Route128_EventScript_Katelyn", "flag": "0" }, { @@ -110,7 +110,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "Route128_EventScript_1F6DB0", + "script": "Route128_EventScript_Wayne", "flag": "0" }, { @@ -123,7 +123,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route128_EventScript_1F6D99", + "script": "Route128_EventScript_Ruben", "flag": "0" }, { @@ -136,7 +136,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route128_EventScript_1F6D82", + "script": "Route128_EventScript_Alexa", "flag": "0" }, { @@ -149,7 +149,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route128_EventScript_1F6DDE", + "script": "Route128_EventScript_Carlee", "flag": "0" }, { @@ -162,7 +162,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route128_EventScript_1F6DC7", + "script": "Route128_EventScript_Harrison", "flag": "0" } ], diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 10397be89..16b1294fc 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -1,48 +1,48 @@ Route128_MapScripts:: @ 81F6B38 map_script MAP_SCRIPT_ON_TRANSITION, Route128_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_MapScript2_1F6B4D + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_OnFrame .byte 0 Route128_OnTransition: @ 81F6B43 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather end -Route128_MapScript2_1F6B4D: @ 81F6B4D - map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_1F6B57 +Route128_OnFrame: @ 81F6B4D + map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_KyogreAwakenedScene .2byte 0 -Route128_EventScript_1F6B57:: @ 81F6B57 +Route128_EventScript_KyogreAwakenedScene:: @ 81F6B57 lockall delay 20 - applymovement 4, Route128_Movement_1F6C89 + applymovement 4, Route128_Movement_ArchieLookAround waitmovement 0 - msgbox Route128_Text_1F6DF5, MSGBOX_DEFAULT + msgbox Route128_Text_ArchieWhatHappened, MSGBOX_DEFAULT closemessage - applymovement 4, Route128_Movement_1F6C91 + applymovement 4, Route128_Movement_ArchieBackUp waitmovement 0 - msgbox Route128_Text_1F6E48, MSGBOX_DEFAULT + msgbox Route128_Text_ArchieIOnlyWanted, MSGBOX_DEFAULT closemessage - applymovement 5, Route128_Movement_1F6CAD + applymovement 5, Route128_Movement_MaxieApproachArchie waitmovement 0 applymovement 4, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT + msgbox Route128_Text_MaxieDoYouUnderstandNow, MSGBOX_DEFAULT closemessage - applymovement 5, Route128_Movement_1F6CBB + applymovement 5, Route128_Movement_MaxieApproachPlayer waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT + msgbox Route128_Text_MaxieResposibilityFallsToArchieAndMe, MSGBOX_DEFAULT closemessage - applymovement 4, Route128_Movement_1F6C96 + applymovement 4, Route128_Movement_ArchieRunLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft - applymovement 5, Route128_Movement_1F6CA8 + applymovement 5, Route128_Movement_MaxieWalkLeft waitmovement 0 - msgbox Route128_Text_1F704F, MSGBOX_DEFAULT + msgbox Route128_Text_MaxieThisDefiesBelief, MSGBOX_DEFAULT closemessage delay 40 - applymovement 5, Route128_Movement_1F6CB0 - applymovement 4, Route128_Movement_1F6C9B + applymovement 5, Route128_Movement_MaxieExit + applymovement 4, Route128_Movement_ArchieExit waitmovement 0 removeobject 5 removeobject 4 @@ -51,19 +51,19 @@ Route128_EventScript_1F6B57:: @ 81F6B57 dofieldeffect FLDEFF_NPCFLY_OUT waitfieldeffect FLDEFF_NPCFLY_OUT addobject 3 - applymovement 3, Route128_Movement_1F6C87 + applymovement 3, Route128_Movement_StevenApproachPlayer waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT + msgbox Route128_Text_StevenWhatIsHappening, MSGBOX_DEFAULT closemessage - applymovement 3, Route128_Movement_1F6C85 + applymovement 3, Route128_Movement_StevenWalkUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT + msgbox Route128_Text_StevenWholeWorldWillDrown, MSGBOX_DEFAULT applymovement 3, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox Route128_Text_1F721B, MSGBOX_DEFAULT + msgbox Route128_Text_StevenImGoingToSootopolis, MSGBOX_DEFAULT closemessage applymovement 3, Common_Movement_WalkInPlaceFastestDown waitmovement 0 @@ -78,10 +78,12 @@ Route128_EventScript_1F6B57:: @ 81F6B57 releaseall end +@ Unused Route128_Movement_1F6C76: @ 81F6C76 walk_fast_left step_end +@ Unused Route128_Movement_1F6C78: @ 81F6C78 walk_left walk_left @@ -97,15 +99,15 @@ Route128_Movement_1F6C78: @ 81F6C78 walk_up step_end -Route128_Movement_1F6C85: @ 81F6C85 +Route128_Movement_StevenWalkUp: @ 81F6C85 walk_up step_end -Route128_Movement_1F6C87: @ 81F6C87 +Route128_Movement_StevenApproachPlayer: @ 81F6C87 walk_fast_left step_end -Route128_Movement_1F6C89: @ 81F6C89 +Route128_Movement_ArchieLookAround: @ 81F6C89 walk_fast_down walk_in_place_fastest_left delay_16 @@ -115,21 +117,21 @@ Route128_Movement_1F6C89: @ 81F6C89 walk_in_place_fastest_down step_end -Route128_Movement_1F6C91: @ 81F6C91 +Route128_Movement_ArchieBackUp: @ 81F6C91 lock_facing_direction walk_slow_up delay_16 unlock_facing_direction step_end -Route128_Movement_1F6C96: @ 81F6C96 +Route128_Movement_ArchieRunLeft: @ 81F6C96 walk_fast_left walk_fast_left walk_fast_left walk_in_place_fastest_right step_end -Route128_Movement_1F6C9B: @ 81F6C9B +Route128_Movement_ArchieExit: @ 81F6C9B delay_16 delay_16 walk_fast_up @@ -144,19 +146,19 @@ Route128_Movement_1F6C9B: @ 81F6C9B walk_fast_up step_end -Route128_Movement_1F6CA8: @ 81F6CA8 +Route128_Movement_MaxieWalkLeft: @ 81F6CA8 walk_left walk_left delay_8 delay_4 step_end -Route128_Movement_1F6CAD: @ 81F6CAD +Route128_Movement_MaxieApproachArchie: @ 81F6CAD walk_left walk_in_place_fastest_down step_end -Route128_Movement_1F6CB0: @ 81F6CB0 +Route128_Movement_MaxieExit: @ 81F6CB0 walk_fast_left walk_fast_left walk_fast_left @@ -169,90 +171,90 @@ Route128_Movement_1F6CB0: @ 81F6CB0 walk_fast_up step_end -Route128_Movement_1F6CBB: @ 81F6CBB +Route128_Movement_MaxieApproachPlayer: @ 81F6CBB walk_right walk_in_place_fastest_down step_end -Route128_EventScript_1F6CBE:: @ 81F6CBE - trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_2A287F, Route128_Text_2A28AB, Route128_EventScript_1F6CEA +Route128_EventScript_Isaiah:: @ 81F6CBE + trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_IsaiahIntro, Route128_Text_IsaiahDefeat, Route128_EventScript_RegisterIsaiah specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route128_EventScript_1F6D09 - msgbox Route128_Text_2A28D7, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route128_EventScript_RematchIsaiah + msgbox Route128_Text_IsaiahPostBattle, MSGBOX_DEFAULT release end -Route128_EventScript_1F6CEA:: @ 81F6CEA +Route128_EventScript_RegisterIsaiah:: @ 81F6CEA special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route128_Text_2A2916, MSGBOX_DEFAULT + msgbox Route128_Text_IsaiahRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ISAIAH_1 release end -Route128_EventScript_1F6D09:: @ 81F6D09 - trainerbattle_rematch TRAINER_ISAIAH_1, Route128_Text_2A2975, Route128_Text_2A29B8 - msgbox Route128_Text_2A29DC, MSGBOX_AUTOCLOSE +Route128_EventScript_RematchIsaiah:: @ 81F6D09 + trainerbattle_rematch TRAINER_ISAIAH_1, Route128_Text_IsaiahRematchIntro, Route128_Text_IsaiahRematchDefeat + msgbox Route128_Text_IsaiahPostRematch, MSGBOX_AUTOCLOSE end -Route128_EventScript_1F6D20:: @ 81F6D20 - trainerbattle_single TRAINER_KATELYN_1, Route128_Text_2A2A1F, Route128_Text_2A2A94, Route128_EventScript_1F6D4C +Route128_EventScript_Katelyn:: @ 81F6D20 + trainerbattle_single TRAINER_KATELYN_1, Route128_Text_KatelynIntro, Route128_Text_KatelynDefeat, Route128_EventScript_RegisterKatelyn specialvar VAR_RESULT, ShouldTryRematchBattle - compare VAR_RESULT, 1 - goto_if_eq Route128_EventScript_1F6D6B - msgbox Route128_Text_2A2AB7, MSGBOX_DEFAULT + compare VAR_RESULT, TRUE + goto_if_eq Route128_EventScript_RematchKatelyn + msgbox Route128_Text_KatelynPostBattle, MSGBOX_DEFAULT release end -Route128_EventScript_1F6D4C:: @ 81F6D4C +Route128_EventScript_RegisterKatelyn:: @ 81F6D4C special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox Route128_Text_2A2AF9, MSGBOX_DEFAULT + msgbox Route128_Text_KatelynRegister, MSGBOX_DEFAULT register_matchcall TRAINER_KATELYN_1 release end -Route128_EventScript_1F6D6B:: @ 81F6D6B - trainerbattle_rematch TRAINER_KATELYN_1, Route128_Text_2A2B41, Route128_Text_2A2BAB - msgbox Route128_Text_2A2BDD, MSGBOX_AUTOCLOSE +Route128_EventScript_RematchKatelyn:: @ 81F6D6B + trainerbattle_rematch TRAINER_KATELYN_1, Route128_Text_KatelynRematchIntro, Route128_Text_KatelynRematchDefeat + msgbox Route128_Text_KatelynPostRematch, MSGBOX_AUTOCLOSE end -Route128_EventScript_1F6D82:: @ 81F6D82 - trainerbattle_single TRAINER_ALEXA, Route128_Text_2A2C1C, Route128_Text_2A2C79 - msgbox Route128_Text_2A2C95, MSGBOX_AUTOCLOSE +Route128_EventScript_Alexa:: @ 81F6D82 + trainerbattle_single TRAINER_ALEXA, Route128_Text_AlexaIntro, Route128_Text_AlexaDefeat + msgbox Route128_Text_AlexaPostBattle, MSGBOX_AUTOCLOSE end -Route128_EventScript_1F6D99:: @ 81F6D99 - trainerbattle_single TRAINER_RUBEN, Route128_Text_2A2CD9, Route128_Text_2A2CFE - msgbox Route128_Text_2A2D0D, MSGBOX_AUTOCLOSE +Route128_EventScript_Ruben:: @ 81F6D99 + trainerbattle_single TRAINER_RUBEN, Route128_Text_RubenIntro, Route128_Text_RubenDefeat + msgbox Route128_Text_RubenPostBattle, MSGBOX_AUTOCLOSE end -Route128_EventScript_1F6DB0:: @ 81F6DB0 - trainerbattle_single TRAINER_WAYNE, Route128_Text_2A2D3D, Route128_Text_2A2DA9 - msgbox Route128_Text_2A2DBA, MSGBOX_AUTOCLOSE +Route128_EventScript_Wayne:: @ 81F6DB0 + trainerbattle_single TRAINER_WAYNE, Route128_Text_WayneIntro, Route128_Text_WayneDefeat + msgbox Route128_Text_WaynePostBattle, MSGBOX_AUTOCLOSE end -Route128_EventScript_1F6DC7:: @ 81F6DC7 - trainerbattle_single TRAINER_HARRISON, Route128_Text_2A2E0F, Route128_Text_2A2E44 - msgbox Route128_Text_2A2E6C, MSGBOX_AUTOCLOSE +Route128_EventScript_Harrison:: @ 81F6DC7 + trainerbattle_single TRAINER_HARRISON, Route128_Text_HarrisonIntro, Route128_Text_HarrisonDefeat + msgbox Route128_Text_HarrisonPostBattle, MSGBOX_AUTOCLOSE end -Route128_EventScript_1F6DDE:: @ 81F6DDE - trainerbattle_single TRAINER_CARLEE, Route128_Text_2A2EC8, Route128_Text_2A2EFA - msgbox Route128_Text_2A2F2F, MSGBOX_AUTOCLOSE +Route128_EventScript_Carlee:: @ 81F6DDE + trainerbattle_single TRAINER_CARLEE, Route128_Text_CarleeIntro, Route128_Text_CarleeDefeat + msgbox Route128_Text_CarleePostBattle, MSGBOX_AUTOCLOSE end -Route128_Text_1F6DF5: @ 81F6DF5 +Route128_Text_ArchieWhatHappened: @ 81F6DF5 .string "ARCHIE: What happened…\n" .string "What is this wretched scene…\p" .string "Did I…make a horrible mistake?$" -Route128_Text_1F6E48: @ 81F6E48 +Route128_Text_ArchieIOnlyWanted: @ 81F6E48 .string "I…\n" .string "I only wanted…$" -Route128_Text_1F6E5A: @ 81F6E5A +Route128_Text_MaxieDoYouUnderstandNow: @ 81F6E5A .string "MAXIE: Do you understand now,\n" .string "ARCHIE?\p" .string "Do you finally see how disastrous\n" @@ -261,7 +263,7 @@ Route128_Text_1F6E5A: @ 81F6E5A .string "something before the situation goes\l" .string "completely out of control!$" -Route128_Text_1F6F1E: @ 81F6F1E +Route128_Text_MaxieResposibilityFallsToArchieAndMe: @ 81F6F1E .string "MAXIE: {PLAYER}, don't say anything.\p" .string "I know that I have no right to be\n" .string "critical of ARCHIE…\p" @@ -273,17 +275,17 @@ Route128_Text_1F6F1E: @ 81F6F1E .string "The responsibility for putting an end\n" .string "to this falls to ARCHIE and me…$" -Route128_Text_1F704F: @ 81F704F +Route128_Text_MaxieThisDefiesBelief: @ 81F704F .string "MAXIE: This defies belief…\p" .string "Those super-ancient POKéMON…\p" .string "Their power is unbelievable.\n" .string "They've upset the balance of nature…$" -Route128_Text_1F70C9: @ 81F70C9 +Route128_Text_StevenWhatIsHappening: @ 81F70C9 .string "STEVEN: {PLAYER}{KUN}!\n" .string "What is happening?$" -Route128_Text_1F70EA: @ 81F70EA +Route128_Text_StevenWholeWorldWillDrown: @ 81F70EA .string "This is terrible…\p" .string "After the scorching heat wave ended,\n" .string "this deluge began.\p" @@ -295,7 +297,7 @@ Route128_Text_1F70EA: @ 81F70EA .string "There's no point arguing here…\n" .string "SOOTOPOLIS might provide answers…$" -Route128_Text_1F721B: @ 81F721B +Route128_Text_StevenImGoingToSootopolis: @ 81F721B .string "{PLAYER}{KUN}…\n" .string "I don't know what you intend to do,\l" .string "but don't do anything reckless.\p" diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index 3183f9821..6b19cc320 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -40,7 +40,7 @@ "movement_range_y": 4, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route129_EventScript_1F72EC", + "script": "Route129_EventScript_Chase", "flag": "0" }, { @@ -53,7 +53,7 @@ "movement_range_y": 2, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route129_EventScript_1F7303", + "script": "Route129_EventScript_Allison", "flag": "0" }, { @@ -66,7 +66,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route129_EventScript_1F7331", + "script": "Route129_EventScript_Tisha", "flag": "0" }, { @@ -79,7 +79,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route129_EventScript_1F731A", + "script": "Route129_EventScript_Reed", "flag": "0" }, { @@ -92,7 +92,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route129_EventScript_1F7348", + "script": "Route129_EventScript_Clarence", "flag": "0" } ], diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index 0245db703..ae6c67e87 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -1,10 +1,10 @@ Route129_MapScripts:: @ 81F7284 map_script MAP_SCRIPT_ON_TRANSITION, Route129_OnTransition - map_script MAP_SCRIPT_ON_LOAD, Route129_MapScript1_1F7294 - map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_MapScript2_1F72E2 + map_script MAP_SCRIPT_ON_LOAD, Route129_OnLoad + map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_OnFrame .byte 0 -Route129_MapScript1_1F7294: @ 81F7294 +Route129_OnLoad: @ 81F7294 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST call_if_eq UnusualWeather_EventScript_PlaceTilesRoute129West compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST @@ -15,43 +15,43 @@ Route129_OnTransition: @ 81F72AB compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_SOOTOPOLIS_CITY_STATE, 4 - call_if_ge Route129_EventScript_1F72D8 + call_if_ge Route129_EventScript_CheckSetAlternatingWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST call_if_eq UnusualWeather_StartKyogreWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_EAST call_if_eq UnusualWeather_StartKyogreWeather end -Route129_EventScript_1F72D8:: @ 81F72D8 +Route129_EventScript_CheckSetAlternatingWeather:: @ 81F72D8 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather return -Route129_MapScript2_1F72E2: @ 81F72E2 +Route129_OnFrame: @ 81F72E2 map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1 .2byte 0 -Route129_EventScript_1F72EC:: @ 81F72EC - trainerbattle_single TRAINER_CHASE, Route129_Text_2A2F66, Route129_Text_2A2F9D - msgbox Route129_Text_2A2FB9, MSGBOX_AUTOCLOSE +Route129_EventScript_Chase:: @ 81F72EC + trainerbattle_single TRAINER_CHASE, Route129_Text_ChaseIntro, Route129_Text_ChaseDefeat + msgbox Route129_Text_ChasePostBattle, MSGBOX_AUTOCLOSE end -Route129_EventScript_1F7303:: @ 81F7303 - trainerbattle_single TRAINER_ALLISON, Route129_Text_2A2FF2, Route129_Text_2A3034 - msgbox Route129_Text_2A3048, MSGBOX_AUTOCLOSE +Route129_EventScript_Allison:: @ 81F7303 + trainerbattle_single TRAINER_ALLISON, Route129_Text_AllisonIntro, Route129_Text_AllisonDefeat + msgbox Route129_Text_AllisonPostBattle, MSGBOX_AUTOCLOSE end -Route129_EventScript_1F731A:: @ 81F731A - trainerbattle_single TRAINER_REED, Route129_Text_2A30CD, Route129_Text_2A30F1 - msgbox Route129_Text_2A3114, MSGBOX_AUTOCLOSE +Route129_EventScript_Reed:: @ 81F731A + trainerbattle_single TRAINER_REED, Route129_Text_ReedIntro, Route129_Text_ReedDefeat + msgbox Route129_Text_ReedPostBattle, MSGBOX_AUTOCLOSE end -Route129_EventScript_1F7331:: @ 81F7331 - trainerbattle_single TRAINER_TISHA, Route129_Text_2A314E, Route129_Text_2A317D - msgbox Route129_Text_2A31A6, MSGBOX_AUTOCLOSE +Route129_EventScript_Tisha:: @ 81F7331 + trainerbattle_single TRAINER_TISHA, Route129_Text_TishaIntro, Route129_Text_TishaDefeat + msgbox Route129_Text_TishaPostBattle, MSGBOX_AUTOCLOSE end -Route129_EventScript_1F7348:: @ 81F7348 - trainerbattle_single TRAINER_CLARENCE, Route129_Text_2A3204, Route129_Text_2A3239 - msgbox Route129_Text_2A3252, MSGBOX_AUTOCLOSE +Route129_EventScript_Clarence:: @ 81F7348 + trainerbattle_single TRAINER_CLARENCE, Route129_Text_ClarenceIntro, Route129_Text_ClarenceDefeat + msgbox Route129_Text_ClarencePostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index 18d168b17..c0b92a1a5 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -35,7 +35,7 @@ "movement_range_y": 6, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route130_EventScript_1F73BF", + "script": "Route130_EventScript_Rodney", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 4, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route130_EventScript_1F73D6", + "script": "Route130_EventScript_Katie", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 4, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route130_EventScript_1F73ED", + "script": "Route130_EventScript_Santiago", "flag": "0" } ], diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 9362e1d5d..f5bd7e051 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -4,10 +4,10 @@ Route130_MapScripts:: @ 81F735F Route130_OnTransition: @ 81F7365 compare VAR_SOOTOPOLIS_CITY_STATE, 4 - call_if_ge Route130_EventScript_1F73B5 + call_if_ge Route130_EventScript_CheckSetAlternatingWeather specialvar VAR_RESULT, IsMirageIslandPresent - compare VAR_RESULT, 1 - goto_if_eq Route130_EventScript_1F73B1 + compare VAR_RESULT, TRUE + goto_if_eq Route130_EventScript_SetMirageIslandLayout setflag FLAG_TEMP_11 setflag FLAG_TEMP_12 setflag FLAG_TEMP_13 @@ -26,26 +26,26 @@ Route130_OnTransition: @ 81F7365 setmaplayoutindex LAYOUT_ROUTE130 end -Route130_EventScript_1F73B1:: @ 81F73B1 +Route130_EventScript_SetMirageIslandLayout:: @ 81F73B1 setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND end -Route130_EventScript_1F73B5:: @ 81F73B5 +Route130_EventScript_CheckSetAlternatingWeather:: @ 81F73B5 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather return -Route130_EventScript_1F73BF:: @ 81F73BF - trainerbattle_single TRAINER_RODNEY, Route130_Text_2A328A, Route130_Text_2A32E6 - msgbox Route130_Text_2A3300, MSGBOX_AUTOCLOSE +Route130_EventScript_Rodney:: @ 81F73BF + trainerbattle_single TRAINER_RODNEY, Route130_Text_RodneyIntro, Route130_Text_RodneyDefeat + msgbox Route130_Text_RodneyPostBattle, MSGBOX_AUTOCLOSE end -Route130_EventScript_1F73D6:: @ 81F73D6 - trainerbattle_single TRAINER_KATIE, Route130_Text_2A3363, Route130_Text_2A33AC - msgbox Route130_Text_2A33F5, MSGBOX_AUTOCLOSE +Route130_EventScript_Katie:: @ 81F73D6 + trainerbattle_single TRAINER_KATIE, Route130_Text_KatieIntro, Route130_Text_KatieDefeat + msgbox Route130_Text_KatiePostBattle, MSGBOX_AUTOCLOSE end -Route130_EventScript_1F73ED:: @ 81F73ED - trainerbattle_single TRAINER_SANTIAGO, Route130_Text_2A343A, Route130_Text_2A346D - msgbox Route130_Text_2A3494, MSGBOX_AUTOCLOSE +Route130_EventScript_Santiago:: @ 81F73ED + trainerbattle_single TRAINER_SANTIAGO, Route130_Text_SantiagoIntro, Route130_Text_SantiagoDefeat + msgbox Route130_Text_SantiagoPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index 379b15b3d..af73808b6 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -35,7 +35,7 @@ "movement_range_y": 7, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route131_EventScript_1F7429", + "script": "Route131_EventScript_Richard", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 7, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route131_EventScript_1F7440", + "script": "Route131_EventScript_Herman", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route131_EventScript_1F7457", + "script": "Route131_EventScript_Susie", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 5, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route131_EventScript_1F746E", + "script": "Route131_EventScript_Kara", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route131_EventScript_1F7485", + "script": "Route131_EventScript_Reli", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route131_EventScript_1F74A0", + "script": "Route131_EventScript_Ian", "flag": "0" }, { @@ -113,7 +113,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route131_EventScript_1F74D2", + "script": "Route131_EventScript_Kevin", "flag": "0" }, { @@ -126,7 +126,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route131_EventScript_1F74BB", + "script": "Route131_EventScript_Talia", "flag": "0" } ], diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 1bb8cfdbc..d26100a10 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -4,55 +4,55 @@ Route131_MapScripts:: @ 81F7404 Route131_OnTransition: @ 81F740A compare VAR_SOOTOPOLIS_CITY_STATE, 4 - call_if_ge Route131_EventScript_1F741F - call Route131_EventScript_1F741B + call_if_ge Route131_EventScript_CheckSetAlternatingWeather + call Route131_EventScript_SetLayout end -Route131_EventScript_1F741B:: @ 81F741B +Route131_EventScript_SetLayout:: @ 81F741B setmaplayoutindex LAYOUT_ROUTE131_SKY_PILLAR return -Route131_EventScript_1F741F:: @ 81F741F +Route131_EventScript_CheckSetAlternatingWeather:: @ 81F741F call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather return -Route131_EventScript_1F7429:: @ 81F7429 - trainerbattle_single TRAINER_RICHARD, Route131_Text_2A34C8, Route131_Text_2A350D - msgbox Route131_Text_2A353D, MSGBOX_AUTOCLOSE +Route131_EventScript_Richard:: @ 81F7429 + trainerbattle_single TRAINER_RICHARD, Route131_Text_RichardIntro, Route131_Text_RichardDefeat + msgbox Route131_Text_RichardPostBattle, MSGBOX_AUTOCLOSE end -Route131_EventScript_1F7440:: @ 81F7440 - trainerbattle_single TRAINER_HERMAN, Route131_Text_2A35C6, Route131_Text_2A3626 - msgbox Route131_Text_2A362D, MSGBOX_AUTOCLOSE +Route131_EventScript_Herman:: @ 81F7440 + trainerbattle_single TRAINER_HERMAN, Route131_Text_HermanIntro, Route131_Text_HermanDefeat + msgbox Route131_Text_HermanPostBattle, MSGBOX_AUTOCLOSE end -Route131_EventScript_1F7457:: @ 81F7457 - trainerbattle_single TRAINER_SUSIE, Route131_Text_2A367B, Route131_Text_2A36AB - msgbox Route131_Text_2A36D6, MSGBOX_AUTOCLOSE +Route131_EventScript_Susie:: @ 81F7457 + trainerbattle_single TRAINER_SUSIE, Route131_Text_SusieIntro, Route131_Text_SusieDefeat + msgbox Route131_Text_SusiePostBattle, MSGBOX_AUTOCLOSE end -Route131_EventScript_1F746E:: @ 81F746E - trainerbattle_single TRAINER_KARA, Route131_Text_2A3751, Route131_Text_2A378A - msgbox Route131_Text_2A379F, MSGBOX_AUTOCLOSE +Route131_EventScript_Kara:: @ 81F746E + trainerbattle_single TRAINER_KARA, Route131_Text_KaraIntro, Route131_Text_KaraDefeat + msgbox Route131_Text_KaraPostBattle, MSGBOX_AUTOCLOSE end -Route131_EventScript_1F7485:: @ 81F7485 - trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A37E9, Route131_Text_2A381F, Route131_Text_2A38B7 - msgbox Route131_Text_2A3855, MSGBOX_AUTOCLOSE +Route131_EventScript_Reli:: @ 81F7485 + trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_ReliIntro, Route131_Text_ReliDefeat, Route131_Text_ReliNotEnoughMons + msgbox Route131_Text_ReliPostBattle, MSGBOX_AUTOCLOSE end -Route131_EventScript_1F74A0:: @ 81F74A0 - trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_2A38F8, Route131_Text_2A3925, Route131_Text_2A39CD - msgbox Route131_Text_2A3960, MSGBOX_AUTOCLOSE +Route131_EventScript_Ian:: @ 81F74A0 + trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_IanIntro, Route131_Text_IanDefeat, Route131_Text_IanNotEnoughMons + msgbox Route131_Text_IanPostBattle, MSGBOX_AUTOCLOSE end -Route131_EventScript_1F74BB:: @ 81F74BB - trainerbattle_single TRAINER_TALIA, Route131_Text_2A39FE, Route131_Text_2A3A38 - msgbox Route131_Text_2A3A48, MSGBOX_AUTOCLOSE +Route131_EventScript_Talia:: @ 81F74BB + trainerbattle_single TRAINER_TALIA, Route131_Text_TaliaIntro, Route131_Text_TaliaDefeat + msgbox Route131_Text_TaliaPostBattle, MSGBOX_AUTOCLOSE end -Route131_EventScript_1F74D2:: @ 81F74D2 - trainerbattle_single TRAINER_KEVIN, Route131_Text_2A3AA0, Route131_Text_2A3AFC - msgbox Route131_Text_2A3B02, MSGBOX_AUTOCLOSE +Route131_EventScript_Kevin:: @ 81F74D2 + trainerbattle_single TRAINER_KEVIN, Route131_Text_KevinIntro, Route131_Text_KevinDefeat + msgbox Route131_Text_KevinPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index 8a7597826..947f8d9cf 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -35,7 +35,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route132_EventScript_1F74EA", + "script": "Route132_EventScript_Gilbert", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route132_EventScript_1F7501", + "script": "Route132_EventScript_Dana", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route132_EventScript_1F752F", + "script": "Route132_EventScript_Kiyo", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "Route132_EventScript_1F7518", + "script": "Route132_EventScript_Ronald", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route132_EventScript_1F7546", + "script": "Route132_EventScript_Paxton", "flag": "0" }, { @@ -113,7 +113,7 @@ "movement_range_y": 4, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route132_EventScript_1F755D", + "script": "Route132_EventScript_Darcy", "flag": "0" }, { @@ -126,7 +126,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route132_EventScript_1F758B", + "script": "Route132_EventScript_Makayla", "flag": "0" }, { @@ -139,7 +139,7 @@ "movement_range_y": 4, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route132_EventScript_1F7574", + "script": "Route132_EventScript_Jonathan", "flag": "0" }, { diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc index aed4d0673..6b82102be 100644 --- a/data/maps/Route132/scripts.inc +++ b/data/maps/Route132/scripts.inc @@ -1,43 +1,43 @@ Route132_MapScripts:: @ 81F74E9 .byte 0 -Route132_EventScript_1F74EA:: @ 81F74EA - trainerbattle_single TRAINER_GILBERT, Route132_Text_2A3B4C, Route132_Text_2A3BAC - msgbox Route132_Text_2A3BC0, MSGBOX_AUTOCLOSE +Route132_EventScript_Gilbert:: @ 81F74EA + trainerbattle_single TRAINER_GILBERT, Route132_Text_GilbertIntro, Route132_Text_GilbertDefeat + msgbox Route132_Text_GilbertPostBattle, MSGBOX_AUTOCLOSE end -Route132_EventScript_1F7501:: @ 81F7501 - trainerbattle_single TRAINER_DANA, Route132_Text_2A3C04, Route132_Text_2A3C39 - msgbox Route132_Text_2A3C49, MSGBOX_AUTOCLOSE +Route132_EventScript_Dana:: @ 81F7501 + trainerbattle_single TRAINER_DANA, Route132_Text_DanaIntro, Route132_Text_DanaDefeat + msgbox Route132_Text_DanaPostBattle, MSGBOX_AUTOCLOSE end -Route132_EventScript_1F7518:: @ 81F7518 - trainerbattle_single TRAINER_RONALD, Route132_Text_2A3C7F, Route132_Text_2A3CAD - msgbox Route132_Text_2A3CC5, MSGBOX_AUTOCLOSE +Route132_EventScript_Ronald:: @ 81F7518 + trainerbattle_single TRAINER_RONALD, Route132_Text_RonaldIntro, Route132_Text_RonaldDefeat + msgbox Route132_Text_RonaldPostBattle, MSGBOX_AUTOCLOSE end -Route132_EventScript_1F752F:: @ 81F752F - trainerbattle_single TRAINER_KIYO, Route132_Text_2A3D26, Route132_Text_2A3D6C - msgbox Route132_Text_2A3D8B, MSGBOX_AUTOCLOSE +Route132_EventScript_Kiyo:: @ 81F752F + trainerbattle_single TRAINER_KIYO, Route132_Text_KiyoIntro, Route132_Text_KiyoDefeat + msgbox Route132_Text_KiyoPostBattle, MSGBOX_AUTOCLOSE end -Route132_EventScript_1F7546:: @ 81F7546 - trainerbattle_single TRAINER_PAXTON, Route132_Text_2A3F4F, Route132_Text_2A3FA8 - msgbox Route132_Text_2A3FE5, MSGBOX_AUTOCLOSE +Route132_EventScript_Paxton:: @ 81F7546 + trainerbattle_single TRAINER_PAXTON, Route132_Text_PaxtonIntro, Route132_Text_PaxtonDefeat + msgbox Route132_Text_PaxtonPostBattle, MSGBOX_AUTOCLOSE end -Route132_EventScript_1F755D:: @ 81F755D - trainerbattle_single TRAINER_DARCY, Route132_Text_2A4026, Route132_Text_2A406E - msgbox Route132_Text_2A40A4, MSGBOX_AUTOCLOSE +Route132_EventScript_Darcy:: @ 81F755D + trainerbattle_single TRAINER_DARCY, Route132_Text_DarcyIntro, Route132_Text_DarcyDefeat + msgbox Route132_Text_DarcyPostBattle, MSGBOX_AUTOCLOSE end -Route132_EventScript_1F7574:: @ 81F7574 - trainerbattle_single TRAINER_JONATHAN, Route132_Text_2A3EAC, Route132_Text_2A3EDD - msgbox Route132_Text_2A3F03, MSGBOX_AUTOCLOSE +Route132_EventScript_Jonathan:: @ 81F7574 + trainerbattle_single TRAINER_JONATHAN, Route132_Text_JonathanIntro, Route132_Text_JonathanDefeat + msgbox Route132_Text_JonathanPostBattle, MSGBOX_AUTOCLOSE end -Route132_EventScript_1F758B:: @ 81F758B - trainerbattle_single TRAINER_MAKAYLA, Route132_Text_2A3DF0, Route132_Text_2A3E2C - msgbox Route132_Text_2A3E4E, MSGBOX_AUTOCLOSE +Route132_EventScript_Makayla:: @ 81F758B + trainerbattle_single TRAINER_MAKAYLA, Route132_Text_MakaylaIntro, Route132_Text_MakaylaDefeat + msgbox Route132_Text_MakaylaPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index 8622515f0..fe492458a 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -35,7 +35,7 @@ "movement_range_y": 2, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route133_EventScript_1F75A3", + "script": "Route133_EventScript_Franklin", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route133_EventScript_1F75D1", + "script": "Route133_EventScript_Linda", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 2, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route133_EventScript_1F75BA", + "script": "Route133_EventScript_Debra", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route133_EventScript_1F75FF", + "script": "Route133_EventScript_Beck", "flag": "0" }, { @@ -113,7 +113,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "Route133_EventScript_1F75E8", + "script": "Route133_EventScript_Warren", "flag": "0" }, { @@ -126,7 +126,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route133_EventScript_1F7616", + "script": "Route133_EventScript_Mollie", "flag": "0" }, { @@ -139,7 +139,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route133_EventScript_1F762D", + "script": "Route133_EventScript_Conor", "flag": "0" }, { diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc index a91eeead3..ebe28f5db 100644 --- a/data/maps/Route133/scripts.inc +++ b/data/maps/Route133/scripts.inc @@ -1,38 +1,38 @@ Route133_MapScripts:: @ 81F75A2 .byte 0 -Route133_EventScript_1F75A3:: @ 81F75A3 - trainerbattle_single TRAINER_FRANKLIN, Route133_Text_2A40F0, Route133_Text_2A413F - msgbox Route133_Text_2A4154, MSGBOX_AUTOCLOSE +Route133_EventScript_Franklin:: @ 81F75A3 + trainerbattle_single TRAINER_FRANKLIN, Route133_Text_FranklinIntro, Route133_Text_FranklinDefeat + msgbox Route133_Text_FranklinPostBattle, MSGBOX_AUTOCLOSE end -Route133_EventScript_1F75BA:: @ 81F75BA - trainerbattle_single TRAINER_DEBRA, Route133_Text_2A41A8, Route133_Text_2A4200 - msgbox Route133_Text_2A420E, MSGBOX_AUTOCLOSE +Route133_EventScript_Debra:: @ 81F75BA + trainerbattle_single TRAINER_DEBRA, Route133_Text_DebraIntro, Route133_Text_DebraDefeat + msgbox Route133_Text_DebraPostBattle, MSGBOX_AUTOCLOSE end -Route133_EventScript_1F75D1:: @ 81F75D1 - trainerbattle_single TRAINER_LINDA, Route133_Text_2A4236, Route133_Text_2A4258 - msgbox Route133_Text_2A4264, MSGBOX_AUTOCLOSE +Route133_EventScript_Linda:: @ 81F75D1 + trainerbattle_single TRAINER_LINDA, Route133_Text_LindaIntro, Route133_Text_LindaDefeat + msgbox Route133_Text_LindaPostBattle, MSGBOX_AUTOCLOSE end -Route133_EventScript_1F75E8:: @ 81F75E8 - trainerbattle_single TRAINER_WARREN, Route133_Text_2A4290, Route133_Text_2A42E0 - msgbox Route133_Text_2A4304, MSGBOX_AUTOCLOSE +Route133_EventScript_Warren:: @ 81F75E8 + trainerbattle_single TRAINER_WARREN, Route133_Text_WarrenIntro, Route133_Text_WarrenDefeat + msgbox Route133_Text_WarrenPostBattle, MSGBOX_AUTOCLOSE end -Route133_EventScript_1F75FF:: @ 81F75FF - trainerbattle_single TRAINER_BECK, Route133_Text_2A436A, Route133_Text_2A439C - msgbox Route133_Text_2A43B9, MSGBOX_AUTOCLOSE +Route133_EventScript_Beck:: @ 81F75FF + trainerbattle_single TRAINER_BECK, Route133_Text_BeckIntro, Route133_Text_BeckDefeat + msgbox Route133_Text_BeckPostBattle, MSGBOX_AUTOCLOSE end -Route133_EventScript_1F7616:: @ 81F7616 - trainerbattle_single TRAINER_MOLLIE, Route133_Text_2A4401, Route133_Text_2A443A - msgbox Route133_Text_2A4477, MSGBOX_AUTOCLOSE +Route133_EventScript_Mollie:: @ 81F7616 + trainerbattle_single TRAINER_MOLLIE, Route133_Text_MollieIntro, Route133_Text_MollieDefeat + msgbox Route133_Text_MolliePostBattle, MSGBOX_AUTOCLOSE end -Route133_EventScript_1F762D:: @ 81F762D - trainerbattle_single TRAINER_CONOR, Route133_Text_2A44BA, Route133_Text_2A4505 - msgbox Route133_Text_2A4527, MSGBOX_AUTOCLOSE +Route133_EventScript_Conor:: @ 81F762D + trainerbattle_single TRAINER_CONOR, Route133_Text_ConorIntro, Route133_Text_ConorDefeat + msgbox Route133_Text_ConorPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index e45920576..fb4da1f92 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -35,7 +35,7 @@ "movement_range_y": 5, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route134_EventScript_1F7653", + "script": "Route134_EventScript_Jack", "flag": "0" }, { @@ -48,7 +48,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route134_EventScript_1F766A", + "script": "Route134_EventScript_Laurel", "flag": "0" }, { @@ -61,7 +61,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route134_EventScript_1F7698", + "script": "Route134_EventScript_Aaron", "flag": "0" }, { @@ -74,7 +74,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route134_EventScript_1F7681", + "script": "Route134_EventScript_Alex", "flag": "0" }, { @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route134_EventScript_1F76AF", + "script": "Route134_EventScript_Hitoshi", "flag": "0" }, { @@ -100,7 +100,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "Route134_EventScript_1F76F4", + "script": "Route134_EventScript_Marley", "flag": "0" }, { @@ -113,7 +113,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "Route134_EventScript_1F770B", + "script": "Route134_EventScript_Kelvin", "flag": "0" }, { @@ -126,7 +126,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "Route134_EventScript_1F76DD", + "script": "Route134_EventScript_Reyna", "flag": "0" }, { @@ -139,7 +139,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "Route134_EventScript_1F76C6", + "script": "Route134_EventScript_Hudson", "flag": "0" }, { diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index a941e19b5..3da2781b9 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -1,53 +1,53 @@ Route134_MapScripts:: @ 81F7644 - map_script MAP_SCRIPT_ON_RESUME, Route134_MapScript1_1F764A + map_script MAP_SCRIPT_ON_RESUME, Route134_OnResume .byte 0 -Route134_MapScript1_1F764A: @ 81F764A +Route134_OnResume: @ 81F764A setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6 end -Route134_EventScript_1F7653:: @ 81F7653 - trainerbattle_single TRAINER_JACK, Route134_Text_2A4571, Route134_Text_2A45BB - msgbox Route134_Text_2A45C5, MSGBOX_AUTOCLOSE +Route134_EventScript_Jack:: @ 81F7653 + trainerbattle_single TRAINER_JACK, Route134_Text_JackIntro, Route134_Text_JackDefeat + msgbox Route134_Text_JackPostBattle, MSGBOX_AUTOCLOSE end -Route134_EventScript_1F766A:: @ 81F766A - trainerbattle_single TRAINER_LAUREL, Route134_Text_2A4609, Route134_Text_2A4643 - msgbox Route134_Text_2A464B, MSGBOX_AUTOCLOSE +Route134_EventScript_Laurel:: @ 81F766A + trainerbattle_single TRAINER_LAUREL, Route134_Text_LaurelIntro, Route134_Text_LaurelDefeat + msgbox Route134_Text_LaurelPostBattle, MSGBOX_AUTOCLOSE end -Route134_EventScript_1F7681:: @ 81F7681 - trainerbattle_single TRAINER_ALEX, Route134_Text_2A4682, Route134_Text_2A46BE - msgbox Route134_Text_2A46D2, MSGBOX_AUTOCLOSE +Route134_EventScript_Alex:: @ 81F7681 + trainerbattle_single TRAINER_ALEX, Route134_Text_AlexIntro, Route134_Text_AlexDefeat + msgbox Route134_Text_AlexPostBattle, MSGBOX_AUTOCLOSE end -Route134_EventScript_1F7698:: @ 81F7698 - trainerbattle_single TRAINER_AARON, Route134_Text_2A479E, Route134_Text_2A47E1 - msgbox Route134_Text_2A47FD, MSGBOX_AUTOCLOSE +Route134_EventScript_Aaron:: @ 81F7698 + trainerbattle_single TRAINER_AARON, Route134_Text_AaronIntro, Route134_Text_AaronDefeat + msgbox Route134_Text_AaronPostBattle, MSGBOX_AUTOCLOSE end -Route134_EventScript_1F76AF:: @ 81F76AF - trainerbattle_single TRAINER_HITOSHI, Route134_Text_2A4709, Route134_Text_2A4745 - msgbox Route134_Text_2A475D, MSGBOX_AUTOCLOSE +Route134_EventScript_Hitoshi:: @ 81F76AF + trainerbattle_single TRAINER_HITOSHI, Route134_Text_HitoshiIntro, Route134_Text_HitoshiDefeat + msgbox Route134_Text_HitoshiPostBattle, MSGBOX_AUTOCLOSE end -Route134_EventScript_1F76C6:: @ 81F76C6 - trainerbattle_single TRAINER_HUDSON, Route134_Text_2A4A8F, Route134_Text_2A4AC1 - msgbox Route134_Text_2A4AD8, MSGBOX_AUTOCLOSE +Route134_EventScript_Hudson:: @ 81F76C6 + trainerbattle_single TRAINER_HUDSON, Route134_Text_HudsonIntro, Route134_Text_HudsonDefeat + msgbox Route134_Text_HudsonPostBattle, MSGBOX_AUTOCLOSE end -Route134_EventScript_1F76DD:: @ 81F76DD - trainerbattle_single TRAINER_REYNA, Route134_Text_2A49E9, Route134_Text_2A4A10 - msgbox Route134_Text_2A4A34, MSGBOX_AUTOCLOSE +Route134_EventScript_Reyna:: @ 81F76DD + trainerbattle_single TRAINER_REYNA, Route134_Text_ReynaIntro, Route134_Text_ReynaDefeat + msgbox Route134_Text_ReynaPostBattle, MSGBOX_AUTOCLOSE end -Route134_EventScript_1F76F4:: @ 81F76F4 - trainerbattle_single TRAINER_MARLEY, Route134_Text_2A4937, Route134_Text_2A496B - msgbox Route134_Text_2A49B1, MSGBOX_AUTOCLOSE +Route134_EventScript_Marley:: @ 81F76F4 + trainerbattle_single TRAINER_MARLEY, Route134_Text_MarleyIntro, Route134_Text_MarleyDefeat + msgbox Route134_Text_MarleyPostBattle, MSGBOX_AUTOCLOSE end -Route134_EventScript_1F770B:: @ 81F770B - trainerbattle_single TRAINER_KELVIN, Route134_Text_2A4875, Route134_Text_2A489B - msgbox Route134_Text_2A48BD, MSGBOX_AUTOCLOSE +Route134_EventScript_Kelvin:: @ 81F770B + trainerbattle_single TRAINER_KELVIN, Route134_Text_KelvinIntro, Route134_Text_KelvinDefeat + msgbox Route134_Text_KelvinPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 349ec616e..143ff4543 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -60,7 +60,7 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E closemessage call Common_EventScript_OutOfCenterPartyHeal msgbox RustboroCity_DevonCorp_3F_Text_MrStoneGoWithCautionAndCare, MSGBOX_DEFAULT - setflag FLAG_HIDE_ROUTE_116_TUNNELER + setflag FLAG_HIDE_ROUTE_116_WANDAS_BOYFRIEND clearflag FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND clearflag FLAG_HIDE_RUSTURF_TUNNEL_WANDA clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index ce6c3d2d0..3cf4b2cd0 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SSTidalCorridor_EventScript_23C119", + "script": "SSTidalCorridor_EventScript_ExitSailor", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 2, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SSTidalCorridor_EventScript_23C1A3", + "script": "SSTidalCorridor_EventScript_Sailor", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SSTidalCorridor_EventScript_23C0D9", + "script": "SSTidalCorridor_EventScript_Briney", "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SSTidalCorridor_EventScript_23C0E2", + "script": "SSTidalCorridor_EventScript_Peeko", "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" }, { @@ -153,7 +153,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SSTidalCorridor_EventScript_23C17D" + "script": "SSTidalCorridor_EventScript_Porthole" }, { "type": "sign", @@ -161,7 +161,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SSTidalCorridor_EventScript_23C17D" + "script": "SSTidalCorridor_EventScript_Porthole" }, { "type": "sign", @@ -169,7 +169,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SSTidalCorridor_EventScript_23C17D" + "script": "SSTidalCorridor_EventScript_Porthole" }, { "type": "sign", @@ -177,7 +177,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SSTidalCorridor_EventScript_23C17D" + "script": "SSTidalCorridor_EventScript_Porthole" }, { "type": "sign", @@ -185,7 +185,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SSTidalCorridor_EventScript_23C17D" + "script": "SSTidalCorridor_EventScript_Porthole" }, { "type": "sign", @@ -193,7 +193,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SSTidalCorridor_EventScript_23C17D" + "script": "SSTidalCorridor_EventScript_Porthole" }, { "type": "sign", @@ -201,7 +201,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SSTidalCorridor_EventScript_23C17D" + "script": "SSTidalCorridor_EventScript_Porthole" }, { "type": "sign", @@ -209,7 +209,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SSTidalCorridor_EventScript_23C17D" + "script": "SSTidalCorridor_EventScript_Porthole" }, { "type": "sign", @@ -217,7 +217,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SSTidalCorridor_EventScript_23C0F5" + "script": "SSTidalCorridor_EventScript_Cabin1Sign" }, { "type": "sign", @@ -225,7 +225,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SSTidalCorridor_EventScript_23C0FE" + "script": "SSTidalCorridor_EventScript_Cabin2Sign" }, { "type": "sign", @@ -233,7 +233,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SSTidalCorridor_EventScript_23C107" + "script": "SSTidalCorridor_EventScript_Cabin3Sign" }, { "type": "sign", @@ -241,7 +241,7 @@ "y": 9, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "SSTidalCorridor_EventScript_23C110" + "script": "SSTidalCorridor_EventScript_Cabin4Sign" } ] }
\ No newline at end of file diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index f91cc6a3b..6b88b7ae1 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -1,218 +1,218 @@ SSTidalCorridor_MapScripts:: @ 823BFCF - map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_MapScript2_23BFD5 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_OnFrame .byte 0 -SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5 - map_script_2 VAR_SS_TIDAL_SCOTT_STATE, 0, SSTidalCorridor_EventScript_23C219 - map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_23BFFF - map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_23C015 - map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_23C067 - map_script_2 VAR_PORTHOLE_STATE, 10, SSTidalCorridor_EventScript_23C07D +SSTidalCorridor_OnFrame: @ 823BFD5 + map_script_2 VAR_SS_TIDAL_SCOTT_STATE, 0, SSTidalCorridor_EventScript_ScottScene + map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_SLATEPORT, SSTidalCorridor_EventScript_DepartSlateportForLilycove + map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE, SSTidalCorridor_EventScript_DepartLilycoveForSlateport + map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_EXIT_CURRENTS_RIGHT, SSTidalCorridor_EventScript_HalfwayToLilycove + map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_EXIT_CURRENTS_LEFT, SSTidalCorridor_EventScript_ArrivedInSlateport .2byte 0 -SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF +SSTidalCorridor_EventScript_DepartSlateportForLilycove:: @ 823BFFF special SetSSTidalFlag - setvar VAR_PORTHOLE_STATE, 2 + setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_23C462, MSGBOX_DEFAULT + msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT releaseall end -SSTidalCorridor_EventScript_23C015:: @ 823C015 - setvar VAR_PORTHOLE_STATE, 6 +SSTidalCorridor_EventScript_DepartLilycoveForSlateport:: @ 823C015 + setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_LILYCOVE lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_23C4E3, MSGBOX_DEFAULT + msgbox SSTidal_Text_HopeYouEnjoyVoyage, MSGBOX_DEFAULT releaseall end -SSTidalRooms_EventScript_23C028:: @ 823C028 +SSTidalRooms_EventScript_HalfwayToSlateport:: @ 823C028 special SetSSTidalFlag - setvar VAR_PORTHOLE_STATE, 7 + setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT playse SE_PINPON - msgbox SSTidalRooms_Text_23C462, MSGBOX_DEFAULT + msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT return -SSTidalRooms_EventScript_23C03C:: @ 823C03C +SSTidalRooms_EventScript_ArrivedInLilycove:: @ 823C03C special ResetSSTidalFlag - setvar VAR_PORTHOLE_STATE, 4 + setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE playse SE_PINPON - msgbox SSTidalRooms_Text_23C553, MSGBOX_DEFAULT + msgbox SSTidal_Text_MadeLandInLilycove, MSGBOX_DEFAULT return -SSTidalCorridor_EventScript_23C050:: @ 823C050 - compare VAR_PORTHOLE_STATE, 2 - goto_if_eq SSTidalCorridor_EventScript_23C067 - compare VAR_PORTHOLE_STATE, 7 - goto_if_eq SSTidalCorridor_EventScript_23C07D +SSTidalCorridor_EventScript_ReachedStepCount:: @ 823C050 + compare VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT + goto_if_eq SSTidalCorridor_EventScript_HalfwayToLilycove + compare VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT + goto_if_eq SSTidalCorridor_EventScript_ArrivedInSlateport end -SSTidalCorridor_EventScript_23C067:: @ 823C067 +SSTidalCorridor_EventScript_HalfwayToLilycove:: @ 823C067 special ResetSSTidalFlag - setvar VAR_PORTHOLE_STATE, 3 + setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_LILYCOVE lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_23C4E3, MSGBOX_DEFAULT + msgbox SSTidal_Text_HopeYouEnjoyVoyage, MSGBOX_DEFAULT releaseall end -SSTidalCorridor_EventScript_23C07D:: @ 823C07D +SSTidalCorridor_EventScript_ArrivedInSlateport:: @ 823C07D special ResetSSTidalFlag - setvar VAR_PORTHOLE_STATE, 8 + setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT lockall playse SE_PINPON - msgbox SSTidalCorridor_Text_23C50F, MSGBOX_DEFAULT + msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT releaseall end -SSTidalRooms_EventScript_23C093:: @ 823C093 +SSTidalRooms_EventScript_ArrivedInSlateport:: @ 823C093 special ResetSSTidalFlag - setvar VAR_PORTHOLE_STATE, 8 + setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT playse SE_PINPON - msgbox SSTidalRooms_Text_23C50F, MSGBOX_DEFAULT + msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT return -SSTidalRooms_EventScript_23C0A7:: @ 823C0A7 - switch VAR_PORTHOLE_STATE - case 2, SSTidalRooms_EventScript_23C03C - case 3, SSTidalRooms_EventScript_23C03C - case 6, SSTidalRooms_EventScript_23C028 - case 7, SSTidalRooms_EventScript_23C093 +SSTidalRooms_EventScript_ProgessCruiseAfterBed:: @ 823C0A7 + switch VAR_SS_TIDAL_STATE + case SS_TIDAL_DEPART_SLATEPORT, SSTidalRooms_EventScript_ArrivedInLilycove + case SS_TIDAL_HALFWAY_LILYCOVE, SSTidalRooms_EventScript_ArrivedInLilycove + case SS_TIDAL_DEPART_LILYCOVE, SSTidalRooms_EventScript_HalfwayToSlateport + case SS_TIDAL_HALFWAY_SLATEPORT, SSTidalRooms_EventScript_ArrivedInSlateport return -SSTidalCorridor_EventScript_23C0D9:: @ 823C0D9 - msgbox SSTidalCorridor_Text_23C6EC, MSGBOX_NPC +SSTidalCorridor_EventScript_Briney:: @ 823C0D9 + msgbox SSTidalCorridor_Text_BrineyWelcomeAboard, MSGBOX_NPC end -SSTidalCorridor_EventScript_23C0E2:: @ 823C0E2 +SSTidalCorridor_EventScript_Peeko:: @ 823C0E2 lock faceplayer waitse playmoncry SPECIES_WINGULL, 0 - msgbox SSTidalCorridor_Text_23C7E1, MSGBOX_DEFAULT + msgbox SSTidalCorridor_Text_Peeko, MSGBOX_DEFAULT waitmoncry release end -SSTidalCorridor_EventScript_23C0F5:: @ 823C0F5 - msgbox SSTidalCorridor_Text_23C7F8, MSGBOX_SIGN +SSTidalCorridor_EventScript_Cabin1Sign:: @ 823C0F5 + msgbox SSTidalCorridor_Text_Cabin1, MSGBOX_SIGN end -SSTidalCorridor_EventScript_23C0FE:: @ 823C0FE - msgbox SSTidalCorridor_Text_23C800, MSGBOX_SIGN +SSTidalCorridor_EventScript_Cabin2Sign:: @ 823C0FE + msgbox SSTidalCorridor_Text_Cabin2, MSGBOX_SIGN end -SSTidalCorridor_EventScript_23C107:: @ 823C107 - msgbox SSTidalCorridor_Text_23C808, MSGBOX_SIGN +SSTidalCorridor_EventScript_Cabin3Sign:: @ 823C107 + msgbox SSTidalCorridor_Text_Cabin3, MSGBOX_SIGN end -SSTidalCorridor_EventScript_23C110:: @ 823C110 - msgbox SSTidalCorridor_Text_23C810, MSGBOX_SIGN +SSTidalCorridor_EventScript_Cabin4Sign:: @ 823C110 + msgbox SSTidalCorridor_Text_Cabin4, MSGBOX_SIGN end -SSTidalCorridor_EventScript_23C119:: @ 823C119 +SSTidalCorridor_EventScript_ExitSailor:: @ 823C119 lock faceplayer - compare VAR_PORTHOLE_STATE, 4 - goto_if_eq SSTidalCorridor_EventScript_23C13B - compare VAR_PORTHOLE_STATE, 8 - goto_if_eq SSTidalCorridor_EventScript_23C15A - msgbox SSTidalCorridor_Text_23C596, MSGBOX_DEFAULT + compare VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE + goto_if_eq SSTidalCorridor_EventScript_ExitLilycove + compare VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT + goto_if_eq SSTidalCorridor_EventScript_ExitSlateport + msgbox SSTidalCorridor_Text_CanRestInCabin2, MSGBOX_DEFAULT release end -SSTidalCorridor_EventScript_23C13B:: @ 823C13B +SSTidalCorridor_EventScript_ExitLilycove:: @ 823C13B setrespawn HEAL_LOCATION_LILYCOVE_CITY - msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT - call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_23C179 + msgbox SSTidalCorridor_Text_WeveArrived, MSGBOX_DEFAULT + call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_HideSnatchGiver warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end -SSTidalCorridor_EventScript_23C15A:: @ 823C15A +SSTidalCorridor_EventScript_ExitSlateport:: @ 823C15A setrespawn HEAL_LOCATION_SLATEPORT_CITY - msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT - call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_23C179 + msgbox SSTidalCorridor_Text_WeveArrived, MSGBOX_DEFAULT + call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_HideSnatchGiver warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release end -SSTidalCorridor_EventScript_23C179:: @ 823C179 +SSTidalCorridor_EventScript_HideSnatchGiver:: @ 823C179 setflag FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER return -SSTidalCorridor_EventScript_23C17D:: @ 823C17D +SSTidalCorridor_EventScript_Porthole:: @ 823C17D lockall - compare VAR_PORTHOLE_STATE, 2 - goto_if_eq SSTidalCorridor_EventScript_23C19E - compare VAR_PORTHOLE_STATE, 7 - goto_if_eq SSTidalCorridor_EventScript_23C19E - msgbox SSTidalCorridor_Text_23C6C3, MSGBOX_DEFAULT + compare VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT + goto_if_eq SSTidalCorridor_EventScript_LookThroughPorthole + compare VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT + goto_if_eq SSTidalCorridor_EventScript_LookThroughPorthole + msgbox SSTidalCorridor_Text_HorizonSpreadsBeyondPorthole, MSGBOX_DEFAULT releaseall end -SSTidalCorridor_EventScript_23C19E:: @ 823C19E - special sub_80FB7A4 +SSTidalCorridor_EventScript_LookThroughPorthole:: @ 823C19E + special LookThroughPorthole waitstate end -SSTidalCorridor_EventScript_23C1A3:: @ 823C1A3 +SSTidalCorridor_EventScript_Sailor:: @ 823C1A3 lock faceplayer - goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_23C1BD - call SSTidalCorridor_EventScript_23C1C7 - msgbox SSTidalCorridor_Text_23C65E, MSGBOX_DEFAULT + goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_EnjoyYourCruise + call SSTidalCorridor_EventScript_CheckIfTrainersDefeated + msgbox SSTidalCorridor_Text_VisitOtherCabins, MSGBOX_DEFAULT release end -SSTidalCorridor_EventScript_23C1BD:: @ 823C1BD - msgbox SSTidalCorridor_Text_23C6B0, MSGBOX_DEFAULT +SSTidalCorridor_EventScript_EnjoyYourCruise:: @ 823C1BD + msgbox SSTidalCorridor_Text_EnjoyYourCruise, MSGBOX_DEFAULT release end -SSTidalCorridor_EventScript_23C1C7:: @ 823C1C7 +SSTidalCorridor_EventScript_CheckIfTrainersDefeated:: @ 823C1C7 checktrainerflag TRAINER_PHILLIP - goto_if_lt SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated checktrainerflag TRAINER_LEONARD - goto_if_lt SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated checktrainerflag TRAINER_COLTON - goto_if_lt SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated checktrainerflag TRAINER_MICAH - goto_if_lt SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated checktrainerflag TRAINER_THOMAS - goto_if_lt SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated checktrainerflag TRAINER_LEA_AND_JED - goto_if_lt SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated checktrainerflag TRAINER_GARRET - goto_if_lt SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated checktrainerflag TRAINER_NAOMI - goto_if_lt SSTidalCorridor_EventScript_23C218 + goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS - goto SSTidalCorridor_EventScript_23C1BD + goto SSTidalCorridor_EventScript_EnjoyYourCruise return -SSTidalCorridor_EventScript_23C218:: @ 823C218 +SSTidalCorridor_EventScript_TrainerNotDefeated:: @ 823C218 return -SSTidalCorridor_EventScript_23C219:: @ 823C219 +SSTidalCorridor_EventScript_ScottScene:: @ 823C219 lockall - applymovement 5, SSTidalCorridor_Movement_23C26D + applymovement 5, SSTidalCorridor_Movement_ScottApproachPlayer waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT + msgbox SSTidalCorridor_Text_ScottBattleFrontierInvite, MSGBOX_DEFAULT closemessage - applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_23C27D - applymovement 1, SSTidalCorridor_Movement_23C284 - applymovement 5, SSTidalCorridor_Movement_23C275 + applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_PlayerWatchScottExit + applymovement 1, SSTidalCorridor_Movement_SailorMoveForScott + applymovement 5, SSTidalCorridor_Movement_ScottExit waitmovement 0 playse SE_KAIDAN waitse removeobject 5 - applymovement 1, SSTidalCorridor_Movement_23C28B + applymovement 1, SSTidalCorridor_Movement_SailorReturn waitmovement 0 delay 30 setflag FLAG_MET_SCOTT_ON_SS_TIDAL @@ -220,7 +220,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 releaseall end -SSTidalCorridor_Movement_23C26D: @ 823C26D +SSTidalCorridor_Movement_ScottApproachPlayer: @ 823C26D walk_left walk_left walk_left @@ -230,7 +230,7 @@ SSTidalCorridor_Movement_23C26D: @ 823C26D walk_left step_end -SSTidalCorridor_Movement_23C275: @ 823C275 +SSTidalCorridor_Movement_ScottExit: @ 823C275 walk_in_place_fastest_down delay_16 delay_16 @@ -240,7 +240,7 @@ SSTidalCorridor_Movement_23C275: @ 823C275 walk_left step_end -SSTidalCorridor_Movement_23C27D: @ 823C27D +SSTidalCorridor_Movement_PlayerWatchScottExit: @ 823C27D delay_16 delay_16 delay_16 @@ -249,7 +249,7 @@ SSTidalCorridor_Movement_23C27D: @ 823C27D walk_in_place_fastest_down step_end -SSTidalCorridor_Movement_23C284: @ 823C284 +SSTidalCorridor_Movement_SailorMoveForScott: @ 823C284 delay_16 walk_right walk_right @@ -258,13 +258,13 @@ SSTidalCorridor_Movement_23C284: @ 823C284 walk_in_place_fastest_left step_end -SSTidalCorridor_Movement_23C28B: @ 823C28B +SSTidalCorridor_Movement_SailorReturn: @ 823C28B walk_left walk_left walk_in_place_fastest_up step_end -SSTidalCorridor_Text_23C28F: @ 823C28F +SSTidalCorridor_Text_ScottBattleFrontierInvite: @ 823C28F .string "SCOTT: Well, hi, hi!\n" .string "{PLAYER}{KUN}, {PLAYER}{KUN}!\p" .string "Something's come up, so I have to\n" @@ -284,27 +284,25 @@ SSTidalCorridor_Text_23C28F: @ 823C28F .string "Okay, {PLAYER}{KUN}, I'll be waiting for you\n" .string "at the BATTLE FRONTIER!$" -SSTidalCorridor_Text_23C462: @ 823C462 -SSTidalRooms_Text_23C462: @ 823C462 +SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage: @ 823C462 .string "This ferry is built to plow through\n" .string "fast-running currents.\p" .string "We hope you enjoy your voyage with us.\n" .string "Feel free to explore the ship.$" -SSTidalCorridor_Text_23C4E3: @ 823C4E3 +SSTidal_Text_HopeYouEnjoyVoyage: @ 823C4E3 .string "We hope you enjoy your voyage on\n" .string "our ferry.$" -SSTidalCorridor_Text_23C50F: @ 823C50F -SSTidalRooms_Text_23C50F: @ 823C50F +SSTidal_Text_MadeLandInSlateport: @ 823C50F .string "We have made land in SLATEPORT CITY.\n" .string "Thank you for sailing with us.$" -SSTidalRooms_Text_23C553: @ 823C553 +SSTidal_Text_MadeLandInLilycove: @ 823C553 .string "We have made land in LILYCOVE CITY.\n" .string "Thank you for sailing with us.$" -SSTidalCorridor_Text_23C596: @ 823C596 +SSTidalCorridor_Text_CanRestInCabin2: @ 823C596 .string "It'll be some time before we make land,\n" .string "I reckon.\p" .string "You can rest up in your cabin if you'd\n" @@ -312,22 +310,22 @@ SSTidalCorridor_Text_23C596: @ 823C596 .string "The bed in there is soft and plushy.\n" .string "I can attest to how comfy it is!$" -SSTidalCorridor_Text_23C64F: @ 823C64F +SSTidalCorridor_Text_WeveArrived: @ 823C64F .string "We've arrived!$" -SSTidalCorridor_Text_23C65E: @ 823C65E +SSTidalCorridor_Text_VisitOtherCabins: @ 823C65E .string "Go visit other cabins.\n" .string "TRAINERS bored of the boat trip will\l" .string "be itching to battle.$" -SSTidalCorridor_Text_23C6B0: @ 823C6B0 +SSTidalCorridor_Text_EnjoyYourCruise: @ 823C6B0 .string "Enjoy your cruise!$" -SSTidalCorridor_Text_23C6C3: @ 823C6C3 +SSTidalCorridor_Text_HorizonSpreadsBeyondPorthole: @ 823C6C3 .string "The horizon spreads beyond\n" .string "the porthole.$" -SSTidalCorridor_Text_23C6EC: @ 823C6EC +SSTidalCorridor_Text_BrineyWelcomeAboard: @ 823C6EC .string "MR. BRINEY: Welcome aboard, {PLAYER}{KUN}!\p" .string "They made me honorary captain of\n" .string "the S.S. TIDAL!\p" @@ -337,17 +335,17 @@ SSTidalCorridor_Text_23C6EC: @ 823C6EC .string "Let me just say, it stirred my sleeping\n" .string "soul as a sailor!$" -SSTidalCorridor_Text_23C7E1: @ 823C7E1 +SSTidalCorridor_Text_Peeko: @ 823C7E1 .string "PEEKO: Pihyo pihyohyo…$" -SSTidalCorridor_Text_23C7F8: @ 823C7F8 +SSTidalCorridor_Text_Cabin1: @ 823C7F8 .string "Cabin 1$" -SSTidalCorridor_Text_23C800: @ 823C800 +SSTidalCorridor_Text_Cabin2: @ 823C800 .string "Cabin 2$" -SSTidalCorridor_Text_23C808: @ 823C808 +SSTidalCorridor_Text_Cabin3: @ 823C808 .string "Cabin 3$" -SSTidalCorridor_Text_23C810: @ 823C810 +SSTidalCorridor_Text_Cabin4: @ 823C810 .string "Cabin 4$" diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json index 3e678ca8c..45610454a 100644 --- a/data/maps/SSTidalLowerDeck/map.json +++ b/data/maps/SSTidalLowerDeck/map.json @@ -24,7 +24,7 @@ "movement_range_y": 4, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "SSTidalLowerDeck_EventScript_23C819", + "script": "SSTidalLowerDeck_EventScript_Phillip", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 4, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "SSTidalLowerDeck_EventScript_23C830", + "script": "SSTidalLowerDeck_EventScript_Leonard", "flag": "0" } ], diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc index 68761376d..c90366c23 100644 --- a/data/maps/SSTidalLowerDeck/scripts.inc +++ b/data/maps/SSTidalLowerDeck/scripts.inc @@ -1,38 +1,38 @@ SSTidalLowerDeck_MapScripts:: @ 823C818 .byte 0 -SSTidalLowerDeck_EventScript_23C819:: @ 823C819 - trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0 - msgbox SSTidalLowerDeck_Text_23C8B4, MSGBOX_AUTOCLOSE +SSTidalLowerDeck_EventScript_Phillip:: @ 823C819 + trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_PhillipIntro, SSTidalLowerDeck_Text_PhillipDefeat + msgbox SSTidalLowerDeck_Text_PhillipPostBattle, MSGBOX_AUTOCLOSE end -SSTidalLowerDeck_EventScript_23C830:: @ 823C830 - trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D - msgbox SSTidalLowerDeck_Text_23C98E, MSGBOX_AUTOCLOSE +SSTidalLowerDeck_EventScript_Leonard:: @ 823C830 + trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_LeonardIntro, SSTidalLowerDeck_Text_LeonardDefeat + msgbox SSTidalLowerDeck_Text_LeonardPostBattle, MSGBOX_AUTOCLOSE end -SSTidalLowerDeck_Text_23C847: @ 823C847 +SSTidalLowerDeck_Text_PhillipIntro: @ 823C847 .string "Arrrgh! I'm fed up and dog-tired of\n" .string "cleaning this huge place!\p" .string "Let's have a quick battle!$" -SSTidalLowerDeck_Text_23C8A0: @ 823C8A0 +SSTidalLowerDeck_Text_PhillipDefeat: @ 823C8A0 .string "Little bro, I lost!$" -SSTidalLowerDeck_Text_23C8B4: @ 823C8B4 +SSTidalLowerDeck_Text_PhillipPostBattle: @ 823C8B4 .string "We're the CLEANUP BROTHERS!\p" .string "The old one dumps the detergent,\n" .string "and the young one does the scrubbing!$" -SSTidalLowerDeck_Text_23C917: @ 823C917 +SSTidalLowerDeck_Text_LeonardIntro: @ 823C917 .string "This is the bottom of the ship's hull.\n" .string "There's plenty of room.\l" .string "It'll be alright for a POKéMON battle.$" -SSTidalLowerDeck_Text_23C97D: @ 823C97D +SSTidalLowerDeck_Text_LeonardDefeat: @ 823C97D .string "Big bro, I lost!$" -SSTidalLowerDeck_Text_23C98E: @ 823C98E +SSTidalLowerDeck_Text_LeonardPostBattle: @ 823C98E .string "We're the CLEANUP BROTHERS!\p" .string "The old one dumps the detergent,\n" .string "and the young one does the scrubbing!$" diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json index 8fb4bd05d..b2da534c3 100644 --- a/data/maps/SSTidalRooms/map.json +++ b/data/maps/SSTidalRooms/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "SSTidalRooms_EventScript_23CA49", + "script": "SSTidalRooms_EventScript_Colton", "flag": "0" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "SSTidalRooms_EventScript_23CA60", + "script": "SSTidalRooms_EventScript_Micah", "flag": "0" }, { @@ -50,7 +50,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "SSTidalRooms_EventScript_23CA77", + "script": "SSTidalRooms_EventScript_Thomas", "flag": "0" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "SSTidalRooms_EventScript_23CA8E", + "script": "SSTidalRooms_EventScript_Jed", "flag": "0" }, { @@ -76,7 +76,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "SSTidalRooms_EventScript_23CAA9", + "script": "SSTidalRooms_EventScript_Lea", "flag": "0" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "SSTidalRooms_EventScript_23CAC4", + "script": "SSTidalRooms_EventScript_Garret", "flag": "0" }, { @@ -102,7 +102,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "0", - "script": "SSTidalRooms_EventScript_23CADB", + "script": "SSTidalRooms_EventScript_Naomi", "flag": "0" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "SSTidalRooms_EventScript_23C9F2", + "script": "SSTidalRooms_EventScript_SnatchGiver", "flag": "FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER" } ], @@ -213,7 +213,7 @@ "y": 11, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SSTidalRooms_EventScript_23CA33" + "script": "SSTidalRooms_EventScript_Bed" }, { "type": "sign", @@ -221,7 +221,7 @@ "y": 12, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "SSTidalRooms_EventScript_23CA33" + "script": "SSTidalRooms_EventScript_Bed" } ] }
\ No newline at end of file diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index 3b8df90a3..bf2c5e36b 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -1,175 +1,175 @@ SSTidalRooms_MapScripts:: @ 823C9F1 .byte 0 -SSTidalRooms_EventScript_23C9F2:: @ 823C9F2 +SSTidalRooms_EventScript_SnatchGiver:: @ 823C9F2 lock faceplayer - goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_23CA29 - msgbox SSTidalRooms_Text_23D098, MSGBOX_DEFAULT + goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_ExplainSnatch + msgbox SSTidalRooms_Text_NotSuspiciousTakeThis, MSGBOX_DEFAULT giveitem_std ITEM_TM49 - compare VAR_RESULT, 0 + compare VAR_RESULT, FALSE goto_if_eq Common_EventScript_ShowBagIsFull setflag FLAG_RECEIVED_TM49 - msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT + msgbox SSTidalRooms_Text_ExplainSnatch, MSGBOX_DEFAULT release end -SSTidalRooms_EventScript_23CA29:: @ 823CA29 - msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT +SSTidalRooms_EventScript_ExplainSnatch:: @ 823CA29 + msgbox SSTidalRooms_Text_ExplainSnatch, MSGBOX_DEFAULT release end -SSTidalRooms_EventScript_23CA33:: @ 823CA33 +SSTidalRooms_EventScript_Bed:: @ 823CA33 lockall - msgbox SSTidalRooms_Text_23CAF2, MSGBOX_DEFAULT + msgbox SSTidalRooms_Text_TakeRestOnBed, MSGBOX_DEFAULT closemessage call Common_EventScript_OutOfCenterPartyHeal - call SSTidalRooms_EventScript_23C0A7 + call SSTidalRooms_EventScript_ProgessCruiseAfterBed releaseall end -SSTidalRooms_EventScript_23CA49:: @ 823CA49 - trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58 - msgbox SSTidalRooms_Text_23CB75, MSGBOX_AUTOCLOSE +SSTidalRooms_EventScript_Colton:: @ 823CA49 + trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_ColtonIntro, SSTidalRooms_Text_ColtonDefeat + msgbox SSTidalRooms_Text_ColtonPostBattle, MSGBOX_AUTOCLOSE end -SSTidalRooms_EventScript_23CA60:: @ 823CA60 - trainerbattle_single TRAINER_MICAH, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04 - msgbox SSTidalRooms_Text_23CC26, MSGBOX_AUTOCLOSE +SSTidalRooms_EventScript_Micah:: @ 823CA60 + trainerbattle_single TRAINER_MICAH, SSTidalRooms_Text_MicahIntro, SSTidalRooms_Text_MicahDefeat + msgbox SSTidalRooms_Text_MicahPostBattle, MSGBOX_AUTOCLOSE end -SSTidalRooms_EventScript_23CA77:: @ 823CA77 - trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A - msgbox SSTidalRooms_Text_23CCBB, MSGBOX_AUTOCLOSE +SSTidalRooms_EventScript_Thomas:: @ 823CA77 + trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_ThomasIntro, SSTidalRooms_Text_ThomasDefeat + msgbox SSTidalRooms_Text_ThomasPostBattle, MSGBOX_AUTOCLOSE end -SSTidalRooms_EventScript_23CA8E:: @ 823CA8E - trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CD04, SSTidalRooms_Text_23CD54, SSTidalRooms_Text_23CDC6 - msgbox SSTidalRooms_Text_23CD5F, MSGBOX_AUTOCLOSE +SSTidalRooms_EventScript_Jed:: @ 823CA8E + trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_JedIntro, SSTidalRooms_Text_JedDefeat, SSTidalRooms_Text_JedNotEnoughMons + msgbox SSTidalRooms_Text_JedPostBattle, MSGBOX_AUTOCLOSE end -SSTidalRooms_EventScript_23CAA9:: @ 823CAA9 - trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CE04, SSTidalRooms_Text_23CE4B, SSTidalRooms_Text_23CEB0 - msgbox SSTidalRooms_Text_23CE59, MSGBOX_AUTOCLOSE +SSTidalRooms_EventScript_Lea:: @ 823CAA9 + trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_LeaIntro, SSTidalRooms_Text_LeaDefeat, SSTidalRooms_Text_LeaNotEnoughMons + msgbox SSTidalRooms_Text_LeaPostBattle, MSGBOX_AUTOCLOSE end -SSTidalRooms_EventScript_23CAC4:: @ 823CAC4 - trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36 - msgbox SSTidalRooms_Text_23CF45, MSGBOX_AUTOCLOSE +SSTidalRooms_EventScript_Garret:: @ 823CAC4 + trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_GarretIntro, SSTidalRooms_Text_GarretDefeat + msgbox SSTidalRooms_Text_GarretPostBattle, MSGBOX_AUTOCLOSE end -SSTidalRooms_EventScript_23CADB:: @ 823CADB - trainerbattle_single TRAINER_NAOMI, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4 - msgbox SSTidalRooms_Text_23D013, MSGBOX_AUTOCLOSE +SSTidalRooms_EventScript_Naomi:: @ 823CADB + trainerbattle_single TRAINER_NAOMI, SSTidalRooms_Text_NaomiIntro, SSTidalRooms_Text_NaomiDefeat + msgbox SSTidalRooms_Text_NaomiPostBattle, MSGBOX_AUTOCLOSE end -SSTidalRooms_Text_23CAF2: @ 823CAF2 +SSTidalRooms_Text_TakeRestOnBed: @ 823CAF2 .string "There's a bed…\n" .string "Let's take a rest.$" -SSTidalRooms_Text_23CB14: @ 823CB14 +SSTidalRooms_Text_ColtonIntro: @ 823CB14 .string "I often sail to LILYCOVE CITY.\p" .string "I enjoy attending CONTESTS,\n" .string "you see.$" -SSTidalRooms_Text_23CB58: @ 823CB58 +SSTidalRooms_Text_ColtonDefeat: @ 823CB58 .string "That was an enjoyable match!$" -SSTidalRooms_Text_23CB75: @ 823CB75 +SSTidalRooms_Text_ColtonPostBattle: @ 823CB75 .string "I get so excited imagining what kinds\n" .string "of POKéMON I'll get to see in the next\l" .string "CONTEST. The anticipation of it thrills!$" -SSTidalRooms_Text_23CBEB: @ 823CBEB +SSTidalRooms_Text_MicahIntro: @ 823CBEB .string "Are your friends strong?$" -SSTidalRooms_Text_23CC04: @ 823CC04 +SSTidalRooms_Text_MicahDefeat: @ 823CC04 .string "Your friends are, indeed, strong.$" -SSTidalRooms_Text_23CC26: @ 823CC26 +SSTidalRooms_Text_MicahPostBattle: @ 823CC26 .string "Friends need not be human.\n" .string "For me, POKéMON are treasured friends!$" -SSTidalRooms_Text_23CC68: @ 823CC68 +SSTidalRooms_Text_ThomasIntro: @ 823CC68 .string "Child…\n" .string "Did you knock on the door?$" -SSTidalRooms_Text_23CC8A: @ 823CC8A +SSTidalRooms_Text_ThomasDefeat: @ 823CC8A .string "A loss is to be accepted without haste\n" .string "or panic.$" -SSTidalRooms_Text_23CCBB: @ 823CCBB +SSTidalRooms_Text_ThomasPostBattle: @ 823CCBB .string "To be never ruffled in any situation is\n" .string "the GENTLEMAN's code of conduct.$" -SSTidalRooms_Text_23CD04: @ 823CD04 +SSTidalRooms_Text_JedIntro: @ 823CD04 .string "JED: I feel a little shy about this, but…\n" .string "We'll show you our lovey-dovey power!$" -SSTidalRooms_Text_23CD54: @ 823CD54 +SSTidalRooms_Text_JedDefeat: @ 823CD54 .string "JED: Sigh…$" -SSTidalRooms_Text_23CD5F: @ 823CD5F +SSTidalRooms_Text_JedPostBattle: @ 823CD5F .string "JED: It's the first time that our lovey-\n" .string "dovey power couldn't prevail!\l" .string "You must be an awesome TRAINER!$" -SSTidalRooms_Text_23CDC6: @ 823CDC6 +SSTidalRooms_Text_JedNotEnoughMons: @ 823CDC6 .string "JED: You only have one POKéMON?\n" .string "Isn't that just too lonesome?$" -SSTidalRooms_Text_23CE04: @ 823CE04 +SSTidalRooms_Text_LeaIntro: @ 823CE04 .string "LEA: I feel a little silly, but…\n" .string "We'll show you our lovey-dovey power!$" -SSTidalRooms_Text_23CE4B: @ 823CE4B +SSTidalRooms_Text_LeaDefeat: @ 823CE4B .string "LEA: Oh, boo!$" -SSTidalRooms_Text_23CE59: @ 823CE59 +SSTidalRooms_Text_LeaPostBattle: @ 823CE59 .string "LEA: I can't believe it!\n" .string "Our lovey-dovey power failed…\l" .string "You must be an awesome TRAINER!$" -SSTidalRooms_Text_23CEB0: @ 823CEB0 +SSTidalRooms_Text_LeaNotEnoughMons: @ 823CEB0 .string "LEA: I wanted to battle…\n" .string "But you don't even have two POKéMON…$" -SSTidalRooms_Text_23CEEE: @ 823CEEE +SSTidalRooms_Text_GarretIntro: @ 823CEEE .string "Ah, you've come just in time.\p" .string "I'm bored, you see.\n" .string "You may entertain me.$" -SSTidalRooms_Text_23CF36: @ 823CF36 +SSTidalRooms_Text_GarretDefeat: @ 823CF36 .string "…That will do.$" -SSTidalRooms_Text_23CF45: @ 823CF45 +SSTidalRooms_Text_GarretPostBattle: @ 823CF45 .string "Perhaps I shall get Father to acquire\n" .string "a yacht for me.\l" .string "A yacht for me and POKéMON!$" -SSTidalRooms_Text_23CF97: @ 823CF97 +SSTidalRooms_Text_NaomiIntro: @ 823CF97 .string "Oh, you're such an adorable TRAINER.\n" .string "Would you like to have tea?\l" .string "Or would you rather battle?$" -SSTidalRooms_Text_23CFF4: @ 823CFF4 +SSTidalRooms_Text_NaomiDefeat: @ 823CFF4 .string "I see.\n" .string "You're the active sort.$" -SSTidalRooms_Text_23D013: @ 823D013 +SSTidalRooms_Text_NaomiPostBattle: @ 823D013 .string "A world cruise on a luxury liner has its\n" .string "charms, I must say…\p" .string "But, I will admit there is an appealing\n" .string "side to touring HOENN by ferry.$" -SSTidalRooms_Text_23D098: @ 823D098 +SSTidalRooms_Text_NotSuspiciousTakeThis: @ 823D098 .string "Uh… Hi! I… I'm not acting suspicious!\n" .string "Uh… You can have this! For free!\p" .string "It… Honestly, I didn't SNATCH it from\n" .string "someone! I'd never do such a thing!\l" .string "It's clean! You can use it!$" -SSTidalRooms_Text_23D145: @ 823D145 +SSTidalRooms_Text_ExplainSnatch: @ 823D145 .string "SNATCH steals the beneficial effects\n" .string "of certain moves before they can be\l" .string "used by a foe or ally.$" diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index bf30da747..1abb66b57 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -202,7 +202,7 @@ SlateportCity_Harbor_EventScript_Lilycove:: @ 820CB92 msgbox SlateportCity_Harbor_Text_LilycoveItIs, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_ChooseNewDestination - setvar VAR_PORTHOLE_STATE, 1 + setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_SLATEPORT call SlateportCity_Harbor_EventScript_BoardFerry warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate |