diff options
Diffstat (limited to 'data/maps')
26 files changed, 250 insertions, 251 deletions
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index aae6c0b13..22acc0361 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -1,140 +1,140 @@ EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_OnTransition - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A05 - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_228A14 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_OnFrame .byte 0 EverGrandeCity_ChampionsRoom_OnTransition: @ 82289FF call Common_EventScript_SetupRivalGfxId end -EverGrandeCity_ChampionsRoom_MapScript2_228A05: @ 8228A05 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A0F +EverGrandeCity_ChampionsRoom_OnWarp: @ 8228A05 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth .2byte 0 -EverGrandeCity_ChampionsRoom_EventScript_228A0F:: @ 8228A0F +EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth:: @ 8228A0F turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -EverGrandeCity_ChampionsRoom_MapScript2_228A14: @ 8228A14 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_228A1E +EverGrandeCity_ChampionsRoom_OnFrame: @ 8228A14 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_EnterRoom .2byte 0 -EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E +EverGrandeCity_ChampionsRoom_EventScript_EnterRoom:: @ 8228A1E lockall applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp4 waitmovement 0 delay 40 - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228A42 + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace waitmovement 0 setvar VAR_TEMP_1, 1 - goto EverGrandeCity_ChampionsRoom_EventScript_228A45 + goto EverGrandeCity_ChampionsRoom_EventScript_Wallace releaseall end -EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42 +EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace: @ 8228A42 walk_up walk_up step_end -EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45 +EverGrandeCity_ChampionsRoom_EventScript_Wallace:: @ 8228A45 playbgm MUS_DAIGO, 0 - msgbox EverGrandeCity_ChampionsRoom_Text_228C4C, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_228EAC - goto EverGrandeCity_ChampionsRoom_EventScript_228A61 + msgbox EverGrandeCity_ChampionsRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_Defeat + goto EverGrandeCity_ChampionsRoom_EventScript_Defeated end -EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61 +EverGrandeCity_ChampionsRoom_EventScript_Defeated:: @ 8228A61 playse SE_DOOR setmetatile 6, 1, METATILE_EliteFour_OpenDoorChampion_Frame, 0 setmetatile 6, 2, METATILE_EliteFour_OpenDoorChampion_Opening, 0 special DrawWholeMapView - msgbox EverGrandeCity_ChampionsRoom_Text_228F66, MSGBOX_DEFAULT + msgbox EverGrandeCity_ChampionsRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT closemessage playse SE_DOOR checkplayergender compare VAR_RESULT, MALE - call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228ABC + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic compare VAR_RESULT, FEMALE - call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC1 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic addobject 2 - call EverGrandeCity_ChampionsRoom_EventScript_228BFD + call EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer checkplayergender compare VAR_RESULT, MALE - goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AC6 + goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_MayAdvice compare VAR_RESULT, FEMALE - goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_228AFB + goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice end -EverGrandeCity_ChampionsRoom_EventScript_228ABC:: @ 8228ABC +EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic:: @ 8228ABC playbgm MUS_GIRL_SUP, 0 return -EverGrandeCity_ChampionsRoom_EventScript_228AC1:: @ 8228AC1 +EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic:: @ 8228AC1 playbgm MUS_BOY_SUP, 0 return -EverGrandeCity_ChampionsRoom_EventScript_228AC6:: @ 8228AC6 - msgbox EverGrandeCity_ChampionsRoom_Text_2290CA, MSGBOX_DEFAULT +EverGrandeCity_ChampionsRoom_EventScript_MayAdvice:: @ 8228AC6 + msgbox EverGrandeCity_ChampionsRoom_Text_MayAdvice, MSGBOX_DEFAULT delay 40 playse SE_PIN applymovement 2, Common_Movement_ExclamationMark waitmovement 0 applymovement 2, Common_Movement_Delay48 waitmovement 0 - call EverGrandeCity_ChampionsRoom_EventScript_228C12 - msgbox EverGrandeCity_ChampionsRoom_Text_22910B, MSGBOX_DEFAULT - goto EverGrandeCity_ChampionsRoom_EventScript_228B30 + call EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth + msgbox EverGrandeCity_ChampionsRoom_Text_MayItsAlreadyOver, MSGBOX_DEFAULT + goto EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF end -EverGrandeCity_ChampionsRoom_EventScript_228AFB:: @ 8228AFB - msgbox EverGrandeCity_ChampionsRoom_Text_229152, MSGBOX_DEFAULT +EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice:: @ 8228AFB + msgbox EverGrandeCity_ChampionsRoom_Text_BrendanAdvice, MSGBOX_DEFAULT delay 40 playse SE_PIN applymovement 2, Common_Movement_ExclamationMark waitmovement 0 applymovement 2, Common_Movement_Delay48 waitmovement 0 - call EverGrandeCity_ChampionsRoom_EventScript_228C12 - msgbox EverGrandeCity_ChampionsRoom_Text_2291A2, MSGBOX_DEFAULT - goto EverGrandeCity_ChampionsRoom_EventScript_228B30 + call EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth + msgbox EverGrandeCity_ChampionsRoom_Text_BrendanYouveWon, MSGBOX_DEFAULT + goto EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF end -EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 +EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: @ 8228B30 closemessage addobject 3 - applymovement 3, EverGrandeCity_ChampionsRoom_Movement_228C43 + applymovement 3, EverGrandeCity_ChampionsRoom_Movement_BirchArrives waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_2291E6, MSGBOX_DEFAULT - call EverGrandeCity_ChampionsRoom_EventScript_272184 - msgbox EverGrandeCity_ChampionsRoom_Text_22934D, MSGBOX_DEFAULT + msgbox EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex, MSGBOX_DEFAULT + call ProfBirch_EventScript_RatePokedex + msgbox EverGrandeCity_ChampionsRoom_Text_BirchCongratulations, MSGBOX_DEFAULT applymovement 1, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 20 applymovement 1, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_229399, MSGBOX_DEFAULT + msgbox EverGrandeCity_ChampionsRoom_Text_WallaceComeWithMe, MSGBOX_DEFAULT closemessage delay 30 - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3B - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C1D + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart applymovement 3, Common_Movement_WalkInPlaceFastestUp - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C38 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalFollows waitmovement 0 delay 20 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox EverGrandeCity_ChampionsRoom_Text_2293EB, MSGBOX_DEFAULT + msgbox EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside, MSGBOX_DEFAULT checkplayergender compare VAR_RESULT, MALE - call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BEB + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations compare VAR_RESULT, FEMALE - call_if_eq EverGrandeCity_ChampionsRoom_EventScript_228BF4 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations closemessage - applymovement 1, EverGrandeCity_ChampionsRoom_Movement_228C3F - applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_228C20 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_WallaceExit + applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExit waitmovement 0 setflag FLAG_HIDE_PETALBURG_GYM_GREETER warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 @@ -142,32 +142,32 @@ EverGrandeCity_ChampionsRoom_EventScript_228B30:: @ 8228B30 releaseall end -EverGrandeCity_ChampionsRoom_EventScript_228BEB:: @ 8228BEB - msgbox EverGrandeCity_ChampionsRoom_Text_229479, MSGBOX_DEFAULT +EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations:: @ 8228BEB + msgbox EverGrandeCity_ChampionsRoom_Text_MayCongratulations, MSGBOX_DEFAULT return -EverGrandeCity_ChampionsRoom_EventScript_228BF4:: @ 8228BF4 - msgbox EverGrandeCity_ChampionsRoom_Text_2294F5, MSGBOX_DEFAULT +EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations:: @ 8228BF4 + msgbox EverGrandeCity_ChampionsRoom_Text_BrendanCongratulations, MSGBOX_DEFAULT return -EverGrandeCity_ChampionsRoom_EventScript_228BFD:: @ 8228BFD - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C26 +EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer:: @ 8228BFD + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer waitmovement 0 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 return -EverGrandeCity_ChampionsRoom_EventScript_228C12:: @ 8228C12 - applymovement 2, EverGrandeCity_ChampionsRoom_Movement_228C2F +EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth:: @ 8228C12 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth waitmovement 0 return -EverGrandeCity_ChampionsRoom_Movement_228C1D: @ 8228C1D +EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart: @ 8228C1D walk_up walk_up step_end -EverGrandeCity_ChampionsRoom_Movement_228C20: @ 8228C20 +EverGrandeCity_ChampionsRoom_Movement_PlayerExit: @ 8228C20 walk_up delay_16 walk_up @@ -175,7 +175,7 @@ EverGrandeCity_ChampionsRoom_Movement_228C20: @ 8228C20 set_invisible step_end -EverGrandeCity_ChampionsRoom_Movement_228C26: @ 8228C26 +EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer: @ 8228C26 walk_up walk_up walk_up @@ -186,7 +186,7 @@ EverGrandeCity_ChampionsRoom_Movement_228C26: @ 8228C26 walk_in_place_fastest_right step_end -EverGrandeCity_ChampionsRoom_Movement_228C2F: @ 8228C2F +EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth: @ 8228C2F walk_in_place_fastest_up delay_16 walk_in_place_fastest_right @@ -197,24 +197,24 @@ EverGrandeCity_ChampionsRoom_Movement_228C2F: @ 8228C2F delay_16 step_end -EverGrandeCity_ChampionsRoom_Movement_228C38: @ 8228C38 +EverGrandeCity_ChampionsRoom_Movement_RivalFollows: @ 8228C38 walk_right walk_up step_end -EverGrandeCity_ChampionsRoom_Movement_228C3B: @ 8228C3B +EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart: @ 8228C3B walk_up walk_up walk_in_place_fastest_down step_end -EverGrandeCity_ChampionsRoom_Movement_228C3F: @ 8228C3F +EverGrandeCity_ChampionsRoom_Movement_WallaceExit: @ 8228C3F walk_up delay_8 set_invisible step_end -EverGrandeCity_ChampionsRoom_Movement_228C43: @ 8228C43 +EverGrandeCity_ChampionsRoom_Movement_BirchArrives: @ 8228C43 walk_up walk_up walk_up @@ -225,7 +225,7 @@ EverGrandeCity_ChampionsRoom_Movement_228C43: @ 8228C43 walk_in_place_fastest_left step_end -EverGrandeCity_ChampionsRoom_Text_228C4C: @ 8228C4C +EverGrandeCity_ChampionsRoom_Text_PreBattleSpeech: @ 8228C4C .string "WALLACE: Welcome, {PLAYER}{KUN}.\p" .string "That incident in SOOTOPOLIS CITY…\n" .string "That was superb work, putting an end\l" @@ -248,7 +248,7 @@ EverGrandeCity_ChampionsRoom_Text_228C4C: @ 8228C4C .string "their POKéMON in HOENN?\p" .string "Show me right here and now!$" -EverGrandeCity_ChampionsRoom_Text_228EAC: @ 8228EAC +EverGrandeCity_ChampionsRoom_Text_Defeat: @ 8228EAC .string "I, the CHAMPION, fall in defeat…\p" .string "That was wonderful work.\n" .string "You were elegant, infuriatingly so.\l" @@ -257,7 +257,7 @@ EverGrandeCity_ChampionsRoom_Text_228EAC: @ 8228EAC .string "You are a truly noble POKéMON\n" .string "TRAINER!$" -EverGrandeCity_ChampionsRoom_Text_228F66: @ 8228F66 +EverGrandeCity_ChampionsRoom_Text_PostBattleSpeech: @ 8228F66 .string "WALLACE: The POKéMON you sent into\n" .string "battle…\p" .string "At times they danced like a spring\n" @@ -272,29 +272,29 @@ EverGrandeCity_ChampionsRoom_Text_228F66: @ 8228F66 .string "I now proclaim you to be the new\n" .string "HOENN region…$" -EverGrandeCity_ChampionsRoom_Text_2290CA: @ 82290CA +EverGrandeCity_ChampionsRoom_Text_MayAdvice: @ 82290CA .string "MAY: {PLAYER}{KUN}!\p" .string "Here's some advice before you challenge\n" .string "the CHAMPION…$" -EverGrandeCity_ChampionsRoom_Text_22910B: @ 822910B +EverGrandeCity_ChampionsRoom_Text_MayItsAlreadyOver: @ 822910B .string "MAY: Huh?\n" .string "What, what, what?\p" .string "{PLAYER}{KUN}…\n" .string "Could it be that…\l" .string "It's already over?$" -EverGrandeCity_ChampionsRoom_Text_229152: @ 8229152 +EverGrandeCity_ChampionsRoom_Text_BrendanAdvice: @ 8229152 .string "BRENDAN: {PLAYER}!\p" .string "How would you like some advice before\n" .string "you challenge the CHAMPION?…$" -EverGrandeCity_ChampionsRoom_Text_2291A2: @ 82291A2 +EverGrandeCity_ChampionsRoom_Text_BrendanYouveWon: @ 82291A2 .string "BRENDAN: {PLAYER}…\p" .string "Are you trying to tell me…\n" .string "You've beaten the CHAMPION?$" -EverGrandeCity_ChampionsRoom_Text_2291E6: @ 82291E6 +EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex: @ 82291E6 .string "PROF. BIRCH: See?\n" .string "What did I tell you, {RIVAL}?\p" .string "Didn't I tell you that you don't need\n" @@ -310,25 +310,25 @@ EverGrandeCity_ChampionsRoom_Text_2291E6: @ 82291E6 .string "What became of your POKéDEX?\n" .string "Here, let me see.$" -EverGrandeCity_ChampionsRoom_Text_22934D: @ 822934D +EverGrandeCity_ChampionsRoom_Text_BirchCongratulations: @ 822934D .string "PROF. BIRCH: Anyways,\n" .string "congratulations!\p" .string "Now, go proudly into the final room!$" -EverGrandeCity_ChampionsRoom_Text_229399: @ 8229399 +EverGrandeCity_ChampionsRoom_Text_WallaceComeWithMe: @ 8229399 .string "WALLACE: {PLAYER}{KUN}…\p" .string "No, let me rephrase that properly.\p" .string "The new CHAMPION!\p" .string "Come with me.$" -EverGrandeCity_ChampionsRoom_Text_2293EB: @ 82293EB +EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside: @ 82293EB .string "WALLACE: I'm sorry, but…\p" .string "From here on, only those TRAINERS who\n" .string "have become CHAMPIONS may enter.\p" .string "You'll have to wait outside with\n" .string "PROF. BIRCH.$" -EverGrandeCity_ChampionsRoom_Text_229479: @ 8229479 +EverGrandeCity_ChampionsRoom_Text_MayCongratulations: @ 8229479 .string "MAY: Groan…\p" .string "… … … … … … … …\n" .string "… … … … … … … …\p" @@ -337,7 +337,7 @@ EverGrandeCity_ChampionsRoom_Text_229479: @ 8229479 .string "{PLAYER}{KUN}!\n" .string "Honestly, congratulations!$" -EverGrandeCity_ChampionsRoom_Text_2294F5: @ 82294F5 +EverGrandeCity_ChampionsRoom_Text_BrendanCongratulations: @ 82294F5 .string "BRENDAN: Whaaaat?! … … … … …\n" .string "… … … … … … … …\p" .string "It can't be helped if that's the rule.\p" diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index 4fb0d16ef..5ff910790 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_DrakesRoom_EventScript_2286F3", + "script": "EverGrandeCity_DrakesRoom_EventScript_Drake", "flag": "0" } ], diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index bfc1b6027..e2623e28c 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -1,67 +1,68 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 822869C - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_MapScript2_2286BB - map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_MapScript1_2286D2 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_DrakesRoom_MapScript2_227F3E + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_OnFrame + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_OnWarp .byte 0 -EverGrandeCity_DrakesRoom_MapScript2_2286AC: @ 82286AC - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_2286B6 +@ Unused, Drake uses Sidneys identical OnWarp for some reason +EverGrandeCity_DrakesRoom_OnWarp: @ 82286AC + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth .2byte 0 -EverGrandeCity_DrakesRoom_EventScript_2286B6:: @ 82286B6 +EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth:: @ 82286B6 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -EverGrandeCity_DrakesRoom_MapScript2_2286BB: @ 82286BB - map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_2286C5 +EverGrandeCity_DrakesRoom_OnFrame: @ 82286BB + map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_WalkInCloseDoor .2byte 0 -EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5 +EverGrandeCity_DrakesRoom_EventScript_WalkInCloseDoor:: @ 82286C5 lockall - call EverGrandeCity_DrakesRoom_EventScript_272475 + call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor setvar VAR_ELITE_4_STATE, 4 releaseall end -EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2 - call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_2286E7 +EverGrandeCity_DrakesRoom_OnLoad: @ 82286D2 + call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_ResetAdvanceToNextRoom compare VAR_ELITE_4_STATE, 4 - call_if_eq EverGrandeCity_DrakesRoom_EventScript_2286ED + call_if_eq EverGrandeCity_DrakesRoom_EventScript_CloseDoor end -EverGrandeCity_DrakesRoom_EventScript_2286E7:: @ 82286E7 - call EverGrandeCity_DrakesRoom_EventScript_2724BC +EverGrandeCity_DrakesRoom_EventScript_ResetAdvanceToNextRoom:: @ 82286E7 + call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom return -EverGrandeCity_DrakesRoom_EventScript_2286ED:: @ 82286ED - call EverGrandeCity_DrakesRoom_EventScript_27255F +EverGrandeCity_DrakesRoom_EventScript_CloseDoor:: @ 82286ED + call PokemonLeague_EliteFour_EventScript_CloseDoor return -EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3 +EverGrandeCity_DrakesRoom_EventScript_Drake:: @ 82286F3 lock faceplayer - goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_22871A + goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_DrakesRoom_Text_22873E, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_228895 - goto EverGrandeCity_DrakesRoom_EventScript_228724 + msgbox EverGrandeCity_DrakesRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_Defeat + goto EverGrandeCity_DrakesRoom_EventScript_Defeated end -EverGrandeCity_DrakesRoom_EventScript_22871A:: @ 822871A - msgbox EverGrandeCity_DrakesRoom_Text_2288B0, MSGBOX_DEFAULT +EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech:: @ 822871A + msgbox EverGrandeCity_DrakesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_DrakesRoom_EventScript_228724:: @ 8228724 +EverGrandeCity_DrakesRoom_EventScript_Defeated:: @ 8228724 setvar VAR_0x8004, 0 special sub_813BF7C setflag FLAG_DEFEATED_ELITE_4_DRAKE - call EverGrandeCity_DrakesRoom_EventScript_2723F8 - msgbox EverGrandeCity_DrakesRoom_Text_2288B0, MSGBOX_DEFAULT + call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles + msgbox EverGrandeCity_DrakesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_DrakesRoom_Text_22873E: @ 822873E +EverGrandeCity_DrakesRoom_Text_PreBattleSpeech: @ 822873E .string "I am the last of the POKéMON LEAGUE\n" .string "ELITE FOUR, DRAKE the DRAGON master!\p" .string "In their natural state, POKéMON are\n" @@ -74,10 +75,10 @@ EverGrandeCity_DrakesRoom_Text_22873E: @ 822873E .string "If you don't, then you will never\n" .string "prevail over me!$" -EverGrandeCity_DrakesRoom_Text_228895: @ 8228895 +EverGrandeCity_DrakesRoom_Text_Defeat: @ 8228895 .string "Superb, it should be said.$" -EverGrandeCity_DrakesRoom_Text_2288B0: @ 82288B0 +EverGrandeCity_DrakesRoom_Text_PostBattleSpeech: @ 82288B0 .string "You deserve every credit for coming\n" .string "this far as a TRAINER of POKéMON.\p" .string "You do seem to know what is needed.\p" diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index ea3116460..8d220202e 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_GlaciasRoom_EventScript_228469", + "script": "EverGrandeCity_GlaciasRoom_EventScript_Glacia", "flag": "0" } ], diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 00e829930..6836b886d 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -1,65 +1,65 @@ EverGrandeCity_GlaciasRoom_MapScripts:: @ 8228412 - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228431 - map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_MapScript1_228448 - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_228422 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_OnFrame + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_OnWarp .byte 0 -EverGrandeCity_GlaciasRoom_MapScript2_228422: @ 8228422 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_22842C +EverGrandeCity_GlaciasRoom_OnWarp: @ 8228422 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth .2byte 0 -EverGrandeCity_GlaciasRoom_EventScript_22842C:: @ 822842C +EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth:: @ 822842C turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -EverGrandeCity_GlaciasRoom_MapScript2_228431: @ 8228431 - map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_22843B +EverGrandeCity_GlaciasRoom_OnFrame: @ 8228431 + map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_WalkInCloseDoor .2byte 0 -EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B +EverGrandeCity_GlaciasRoom_EventScript_WalkInCloseDoor:: @ 822843B lockall - call EverGrandeCity_GlaciasRoom_EventScript_272475 + call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor setvar VAR_ELITE_4_STATE, 3 releaseall end -EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448 - call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_22845D +EverGrandeCity_GlaciasRoom_OnLoad: @ 8228448 + call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_ResetAdvanceToNextRoom compare VAR_ELITE_4_STATE, 3 - call_if_eq EverGrandeCity_GlaciasRoom_EventScript_228463 + call_if_eq EverGrandeCity_GlaciasRoom_EventScript_CloseDoor end -EverGrandeCity_GlaciasRoom_EventScript_22845D:: @ 822845D - call EverGrandeCity_GlaciasRoom_EventScript_2724BC +EverGrandeCity_GlaciasRoom_EventScript_ResetAdvanceToNextRoom:: @ 822845D + call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom return -EverGrandeCity_GlaciasRoom_EventScript_228463:: @ 8228463 - call EverGrandeCity_GlaciasRoom_EventScript_27255F +EverGrandeCity_GlaciasRoom_EventScript_CloseDoor:: @ 8228463 + call PokemonLeague_EliteFour_EventScript_CloseDoor return -EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469 +EverGrandeCity_GlaciasRoom_EventScript_Glacia:: @ 8228469 lock faceplayer - goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_228490 + goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_2285B4 - goto EverGrandeCity_GlaciasRoom_EventScript_22849A + msgbox EverGrandeCity_GlaciasRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_Defeat + goto EverGrandeCity_GlaciasRoom_EventScript_Defeated end -EverGrandeCity_GlaciasRoom_EventScript_228490:: @ 8228490 - msgbox EverGrandeCity_GlaciasRoom_Text_228640, MSGBOX_DEFAULT +EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech:: @ 8228490 + msgbox EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_GlaciasRoom_EventScript_22849A:: @ 822849A +EverGrandeCity_GlaciasRoom_EventScript_Defeated:: @ 822849A setflag FLAG_DEFEATED_ELITE_4_GLACIA - call EverGrandeCity_GlaciasRoom_EventScript_2723F8 - msgbox EverGrandeCity_GlaciasRoom_Text_228640, MSGBOX_DEFAULT + call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles + msgbox EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_GlaciasRoom_Text_2284AC: @ 82284AC +EverGrandeCity_GlaciasRoom_Text_PreBattleSpeech: @ 82284AC .string "Welcome, my name is GLACIA\n" .string "of the ELITE FOUR.\p" .string "I've traveled from afar to HOENN\n" @@ -70,14 +70,14 @@ EverGrandeCity_GlaciasRoom_Text_2284AC: @ 82284AC .string "It would please me to no end if I could\n" .string "go all out against you!$" -EverGrandeCity_GlaciasRoom_Text_2285B4: @ 82285B4 +EverGrandeCity_GlaciasRoom_Text_Defeat: @ 82285B4 .string "You and your POKéMON…\n" .string "How hot your spirits burn!\p" .string "The all-consuming heat overwhelms.\p" .string "It's no surprise that my icy skills\n" .string "failed to harm you.$" -EverGrandeCity_GlaciasRoom_Text_228640: @ 8228640 +EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech: @ 8228640 .string "Advance to the next room.\p" .string "And there, confirm the truly fearsome\n" .string "side of the POKéMON LEAGUE.$" diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json index a0072fd08..73ee3357d 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_PhoebesRoom_EventScript_2281CB", + "script": "EverGrandeCity_PhoebesRoom_EventScript_Phoebe", "flag": "0" } ], diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index b5a3a9999..4843359c0 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -1,65 +1,65 @@ EverGrandeCity_PhoebesRoom_MapScripts:: @ 8228174 - map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_MapScript1_2281AA - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228184 - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_228193 + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_OnFrame .byte 0 -EverGrandeCity_PhoebesRoom_MapScript2_228184: @ 8228184 - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_22818E +EverGrandeCity_PhoebesRoom_OnWarp: @ 8228184 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_PlayerTurnNorth .2byte 0 -EverGrandeCity_PhoebesRoom_EventScript_22818E:: @ 822818E +EverGrandeCity_PhoebesRoom_EventScript_PlayerTurnNorth:: @ 822818E turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -EverGrandeCity_PhoebesRoom_MapScript2_228193: @ 8228193 - map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_22819D +EverGrandeCity_PhoebesRoom_OnFrame: @ 8228193 + map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_WalkInCloseDoor .2byte 0 -EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D +EverGrandeCity_PhoebesRoom_EventScript_WalkInCloseDoor:: @ 822819D lockall - call EverGrandeCity_PhoebesRoom_EventScript_272475 + call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor setvar VAR_ELITE_4_STATE, 2 releaseall end -EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA - call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281BF +EverGrandeCity_PhoebesRoom_OnLoad: @ 82281AA + call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_ResetAdvanceToNextRoom compare VAR_ELITE_4_STATE, 2 - call_if_eq EverGrandeCity_PhoebesRoom_EventScript_2281C5 + call_if_eq EverGrandeCity_PhoebesRoom_EventScript_CloseDoor end -EverGrandeCity_PhoebesRoom_EventScript_2281BF:: @ 82281BF - call EverGrandeCity_PhoebesRoom_EventScript_2724BC +EverGrandeCity_PhoebesRoom_EventScript_ResetAdvanceToNextRoom:: @ 82281BF + call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom return -EverGrandeCity_PhoebesRoom_EventScript_2281C5:: @ 82281C5 - call EverGrandeCity_PhoebesRoom_EventScript_27255F +EverGrandeCity_PhoebesRoom_EventScript_CloseDoor:: @ 82281C5 + call PokemonLeague_EliteFour_EventScript_CloseDoor return -EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB +EverGrandeCity_PhoebesRoom_EventScript_Phoebe:: @ 82281CB lock faceplayer - goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281F2 + goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_PhoebesRoom_Text_22820E, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_228325 - goto EverGrandeCity_PhoebesRoom_EventScript_2281FC + msgbox EverGrandeCity_PhoebesRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_Defeat + goto EverGrandeCity_PhoebesRoom_EventScript_Defeated end -EverGrandeCity_PhoebesRoom_EventScript_2281F2:: @ 82281F2 - msgbox EverGrandeCity_PhoebesRoom_Text_228343, MSGBOX_DEFAULT +EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech:: @ 82281F2 + msgbox EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_PhoebesRoom_EventScript_2281FC:: @ 82281FC +EverGrandeCity_PhoebesRoom_EventScript_Defeated:: @ 82281FC setflag FLAG_DEFEATED_ELITE_4_PHOEBE - call EverGrandeCity_PhoebesRoom_EventScript_2723F8 - msgbox EverGrandeCity_PhoebesRoom_Text_228343, MSGBOX_DEFAULT + call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles + msgbox EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_PhoebesRoom_Text_22820E: @ 822820E +EverGrandeCity_PhoebesRoom_Text_PreBattleSpeech: @ 822820E .string "Ahahaha!\p" .string "I'm PHOEBE of the ELITE FOUR.\n" .string "I did my training on MT. PYRE.\p" @@ -70,11 +70,11 @@ EverGrandeCity_PhoebesRoom_Text_22820E: @ 822820E .string "So, come on, just try and see if you can\n" .string "even inflict damage on my POKéMON!$" -EverGrandeCity_PhoebesRoom_Text_228325: @ 8228325 +EverGrandeCity_PhoebesRoom_Text_Defeat: @ 8228325 .string "Oh, darn.\n" .string "I've gone and lost.$" -EverGrandeCity_PhoebesRoom_Text_228343: @ 8228343 +EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech: @ 8228343 .string "There's a definite bond between you\n" .string "and your POKéMON, too.\p" .string "I didn't recognize it, so it's only\n" diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index 87545b597..0aa57a944 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "EverGrandeCity_SidneysRoom_EventScript_227F64", + "script": "EverGrandeCity_SidneysRoom_EventScript_Sidney", "flag": "0" } ], diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 432747fda..74cd384fb 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -1,8 +1,8 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01 - map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_227F1D - map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F3E + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_OnWarp map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_OnTransition - map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_227F4D + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_OnFrame .byte 0 EverGrandeCity_SidneysRoom_OnTransition: @ 8227F16 @@ -10,63 +10,62 @@ EverGrandeCity_SidneysRoom_OnTransition: @ 8227F16 setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT end -EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D - call_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32 +EverGrandeCity_SidneysRoom_OnLoad: @ 8227F1D + call_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_ResetAdvanceToNextRoom compare VAR_ELITE_4_STATE, 1 - call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38 + call_if_eq EverGrandeCity_SidneysRoom_EventScript_CloseDoor end -EverGrandeCity_SidneysRoom_EventScript_227F32:: @ 8227F32 - call EverGrandeCity_SidneysRoom_EventScript_2724BC +EverGrandeCity_SidneysRoom_EventScript_ResetAdvanceToNextRoom:: @ 8227F32 + call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom return -EverGrandeCity_SidneysRoom_EventScript_227F38:: @ 8227F38 - call EverGrandeCity_SidneysRoom_EventScript_27255F +EverGrandeCity_SidneysRoom_EventScript_CloseDoor:: @ 8227F38 + call PokemonLeague_EliteFour_EventScript_CloseDoor return -EverGrandeCity_DrakesRoom_MapScript2_227F3E: @ 8227F3E -EverGrandeCity_SidneysRoom_MapScript2_227F3E: @ 8227F3E - map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_227F48 +EverGrandeCity_SidneysRoom_OnWarp: @ 8227F3E + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_PlayerTurnNorth .2byte 0 -EverGrandeCity_SidneysRoom_EventScript_227F48:: @ 8227F48 +EverGrandeCity_SidneysRoom_EventScript_PlayerTurnNorth:: @ 8227F48 turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH end -EverGrandeCity_SidneysRoom_MapScript2_227F4D: @ 8227F4D - map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_227F57 +EverGrandeCity_SidneysRoom_OnFrame: @ 8227F4D + map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_WalkInCloseDoor .2byte 0 -EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57 +EverGrandeCity_SidneysRoom_EventScript_WalkInCloseDoor:: @ 8227F57 lockall - call EverGrandeCity_SidneysRoom_EventScript_272475 + call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor setvar VAR_ELITE_4_STATE, 1 releaseall end -EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64 +EverGrandeCity_SidneysRoom_EventScript_Sidney:: @ 8227F64 lock faceplayer - goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_227F8B + goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech playbgm MUS_SITENNOU, 0 - msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_2280A2 - goto EverGrandeCity_SidneysRoom_EventScript_227F95 + msgbox EverGrandeCity_SidneysRoom_Text_PreBattleSpeech, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_Defeat + goto EverGrandeCity_SidneysRoom_EventScript_Defeated end -EverGrandeCity_SidneysRoom_EventScript_227F8B:: @ 8227F8B - msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT +EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech:: @ 8227F8B + msgbox EverGrandeCity_SidneysRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_SidneysRoom_EventScript_227F95:: @ 8227F95 +EverGrandeCity_SidneysRoom_EventScript_Defeated:: @ 8227F95 setflag FLAG_DEFEATED_ELITE_4_SIDNEY - call EverGrandeCity_SidneysRoom_EventScript_2723F8 - msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT + call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles + msgbox EverGrandeCity_SidneysRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT release end -EverGrandeCity_SidneysRoom_Text_227FA7: @ 8227FA7 +EverGrandeCity_SidneysRoom_Text_PreBattleSpeech: @ 8227FA7 .string "Welcome, challenger!\n" .string "I'm SIDNEY of the ELITE FOUR.\p" .string "I like that look you're giving me.\n" @@ -76,11 +75,11 @@ EverGrandeCity_SidneysRoom_Text_227FA7: @ 8227FA7 .string "a battle that can only be staged\l" .string "here in the POKéMON LEAGUE!$" -EverGrandeCity_SidneysRoom_Text_2280A2: @ 82280A2 +EverGrandeCity_SidneysRoom_Text_Defeat: @ 82280A2 .string "Well, how do you like that? I lost!\n" .string "Eh, it was fun, so it doesn't matter.$" -EverGrandeCity_SidneysRoom_Text_2280EC: @ 82280EC +EverGrandeCity_SidneysRoom_Text_PostBattleSpeech: @ 82280EC .string "Well, listen to what this loser has\n" .string "to say.\p" .string "You've got what it takes to go far.\n" diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 837cc28ad..3b470b8a6 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -9,7 +9,7 @@ LilycoveCity_ContestLobby_OnTransition: @ 821A21C end LilycoveCity_ContestLobby_EventScript_21A227:: @ 821A227 - getpricereduction 4 + getpricereduction POKENEWS_BLENDMASTER compare VAR_RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_21A23C clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index 654395dde..44b9b2d24 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207 .byte 0 LilycoveCity_DepartmentStoreRooftop_OnTransition: @ 822020D - getpricereduction 3 + getpricereduction POKENEWS_LILYCOVE compare VAR_RESULT, 1 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220227 compare VAR_RESULT, 0 @@ -51,7 +51,7 @@ LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248 LilycoveCity_DepartmentStoreRooftop_EventScript_220268:: @ 8220268 lock faceplayer - getpricereduction 3 + getpricereduction POKENEWS_LILYCOVE compare VAR_RESULT, 1 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220282 msgbox LilycoveCity_DepartmentStoreRooftop_Text_220463, MSGBOX_DEFAULT diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 67b0e79b3..283be0477 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -6,7 +6,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1 call Common_EventScript_SetupRivalGfxId - call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD + call ProfBirch_EventScript_UpdateLocation compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7 compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4 @@ -482,7 +482,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294 goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E - goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2 + goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E end @@ -497,19 +497,18 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294 end LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E - goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, LittlerootTown_ProfessorBirchsLab_EventScript_272141 + goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, ProfBirch_EventScript_RatePokedexOrRegister compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3 - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141 + goto_if_eq ProfBirch_EventScript_RatePokedexOrRegister compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 - goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_272141 + goto_if_ge ProfBirch_EventScript_RatePokedexOrRegister compare VAR_BIRCH_LAB_STATE, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FAA74, MSGBOX_DEFAULT release end -LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2:: @ 81FA2D2 -Route101_EventScript_1FA2D2:: @ 81FA2D2 +EventScript_RegisterProfBirch:: @ 81FA2D2 msgbox Route101_Text_2B5F52, MSGBOX_DEFAULT closemessage delay 30 diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index 07bfd3bb2..c811cd7fd 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -291,7 +291,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + "script": "Roulette_EventScript_Table1" }, { "type": "sign", @@ -299,7 +299,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + "script": "Roulette_EventScript_Table1" }, { "type": "sign", @@ -307,7 +307,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + "script": "Roulette_EventScript_Table1" }, { "type": "sign", @@ -315,7 +315,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + "script": "Roulette_EventScript_Table1" }, { "type": "sign", @@ -323,7 +323,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + "script": "Roulette_EventScript_Table1" }, { "type": "sign", @@ -331,7 +331,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + "script": "Roulette_EventScript_Table1" }, { "type": "sign", @@ -339,7 +339,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + "script": "Roulette_EventScript_Table2" }, { "type": "sign", @@ -347,7 +347,7 @@ "y": 6, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + "script": "Roulette_EventScript_Table2" }, { "type": "sign", @@ -355,7 +355,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + "script": "Roulette_EventScript_Table2" }, { "type": "sign", @@ -363,7 +363,7 @@ "y": 7, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + "script": "Roulette_EventScript_Table2" }, { "type": "sign", @@ -371,7 +371,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + "script": "Roulette_EventScript_Table2" }, { "type": "sign", @@ -379,7 +379,7 @@ "y": 8, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + "script": "Roulette_EventScript_Table2" } ] }
\ No newline at end of file diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index a6ee8ec85..6f6366c59 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -534,7 +534,7 @@ MauvilleCity_GameCorner_EventScript_2102D6:: @ 82102D6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -545,7 +545,7 @@ MauvilleCity_GameCorner_EventScript_2102F6:: @ 82102F6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 1 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -556,7 +556,7 @@ MauvilleCity_GameCorner_EventScript_210316:: @ 8210316 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 2 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -567,7 +567,7 @@ MauvilleCity_GameCorner_EventScript_210336:: @ 8210336 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 3 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -578,7 +578,7 @@ MauvilleCity_GameCorner_EventScript_210356:: @ 8210356 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 4 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -589,7 +589,7 @@ MauvilleCity_GameCorner_EventScript_210376:: @ 8210376 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 5 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -600,7 +600,7 @@ MauvilleCity_GameCorner_EventScript_210396:: @ 8210396 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 6 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -611,7 +611,7 @@ MauvilleCity_GameCorner_EventScript_2103B6:: @ 82103B6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 7 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -622,7 +622,7 @@ MauvilleCity_GameCorner_EventScript_2103D6:: @ 82103D6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 8 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -633,7 +633,7 @@ MauvilleCity_GameCorner_EventScript_2103F6:: @ 82103F6 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 9 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -644,7 +644,7 @@ MauvilleCity_GameCorner_EventScript_210416:: @ 8210416 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 10 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT @@ -655,15 +655,15 @@ MauvilleCity_GameCorner_EventScript_210436:: @ 8210436 lockall checkitem ITEM_COIN_CASE, 1 compare VAR_RESULT, 0 - goto_if_eq MauvilleCity_GameCorner_EventScript_210456 + goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase setvar VAR_0x8004, 11 specialvar VAR_RESULT, GetSlotMachineId playslotmachine VAR_RESULT releaseall end -MauvilleCity_GameCorner_EventScript_210456:: @ 8210456 - msgbox MauvilleCity_GameCorner_Text_210C2E, MSGBOX_DEFAULT +MauvilleCity_GameCorner_EventScript_NoCoinCase:: @ 8210456 + msgbox MauvilleCity_GameCorner_Text_CantPlayWithNoCoinCase, MSGBOX_DEFAULT releaseall end @@ -811,7 +811,7 @@ MauvilleCity_GameCorner_Text_210B04: @ 8210B04 .string "That would total 660 COINS, but it's\n" .string "very difficult to get.$" -MauvilleCity_GameCorner_Text_210C2E: @ 8210C2E +MauvilleCity_GameCorner_Text_CantPlayWithNoCoinCase: @ 8210C2E .string "You can't play if you don't have\n" .string "a COIN CASE.$" diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index 44d8b2137..7e8cfb959 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -87,7 +87,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route101_EventScript_272141", + "script": "ProfBirch_EventScript_RatePokedexOrRegister", "flag": "FLAG_HIDE_ROUTE_101_BIRCH" }, { diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index 4b8556286..3b5b22b37 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -4,7 +4,7 @@ Route101_MapScripts:: @ 81EBCBA .byte 0 Route101_OnTransition: @ 81EBCC5 - call Route101_EventScript_2720AD + call ProfBirch_EventScript_UpdateLocation end Route101_MapScript2_1EBCCB: @ 81EBCCB diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index bf207ec2f..8f5b9f2b3 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -165,7 +165,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "Route103_EventScript_272141", + "script": "ProfBirch_EventScript_RatePokedexOrRegister", "flag": "FLAG_HIDE_ROUTE_103_BIRCH" }, { diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 363da2cb4..9a185aa14 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -5,7 +5,7 @@ Route103_MapScripts:: @ 81EC38E Route103_OnTransition: @ 81EC399 call Common_EventScript_SetupRivalGfxId - call Route103_EventScript_2720AD + call ProfBirch_EventScript_UpdateLocation end Route103_MapScript1_1EC3A4: @ 81EC3A4 diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index c95511397..ff4b3dbe1 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -19,7 +19,7 @@ Route105_EventScript_1EE20B:: @ 81EE20B Route105_OnTransition: @ 81EE21E compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq Route105_EventScript_273D13 + call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_NORTH call_if_eq UnusualWeather_StartKyogreWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_105_SOUTH diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index faa79b861..3434d6753 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -6,7 +6,7 @@ Route114_MapScripts:: @ 81F252F Route114_OnTransition: @ 81F253F compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq Route114_EventScript_273D13 + call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH call_if_eq UnusualWeather_StartGroudonWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 7c5b63bcd..79d2caedc 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -13,7 +13,7 @@ Route115_MapScript1_1F2930: @ 81F2930 Route115_OnTransition: @ 81F2947 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq Route115_EventScript_273D13 + call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST call_if_eq UnusualWeather_StartGroudonWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index a314a454d..cef5051e0 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -7,7 +7,7 @@ Route116_MapScripts:: @ 81F2C0C Route116_OnTransition: @ 81F2C1C call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq Route116_EventScript_273D13 + call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH call_if_eq UnusualWeather_StartGroudonWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 858f0d598..661bd938c 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -7,7 +7,7 @@ Route118_MapScripts:: @ 81F3DBC Route118_OnTransition: @ 81F3DCC call Route118_EventScript_28CCC7 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq Route118_EventScript_273D13 + call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST call_if_eq UnusualWeather_StartGroudonWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 2c15eee3d..62b66e3a6 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -7,7 +7,7 @@ Route125_MapScripts:: @ 81F6748 Route125_OnTransition: @ 81F6758 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq Route125_EventScript_273D13 + call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_WEST call_if_eq UnusualWeather_StartKyogreWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_125_EAST diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 1829dbcfd..fcc666ec6 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -7,7 +7,7 @@ Route127_MapScripts:: @ 81F69D9 Route127_OnTransition: @ 81F69E9 call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetWeather15 compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq Route127_EventScript_273D13 + call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_NORTH call_if_eq UnusualWeather_StartKyogreWeather compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_127_SOUTH diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index d57a27cf9..43d828bcd 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -13,7 +13,7 @@ Route129_MapScript1_1F7294: @ 81F7294 Route129_OnTransition: @ 81F72AB compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1 - call_if_eq Route129_EventScript_273D13 + call_if_eq UnusualWeather_EventScript_HideMapNamePopup compare VAR_SOOTOPOLIS_CITY_STATE, 4 call_if_ge Route129_EventScript_1F72D8 compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_129_WEST |