diff options
Diffstat (limited to 'data/maps/PokemonLeague_AgathasRoom/scripts.inc')
| -rw-r--r-- | data/maps/PokemonLeague_AgathasRoom/scripts.inc | 46 |
1 files changed, 20 insertions, 26 deletions
diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 260a2acff..62293c1ec 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -1,20 +1,19 @@ PokemonLeague_AgathasRoom_MapScripts:: @ 8162810 - map_script 5, PokemonLeague_AgathasRoom_MapScript1_162825 - map_script 1, PokemonLeague_AgathasRoom_MapScript2_162830 - map_script 4, PokemonLeague_AgathasRoom_MapScript3_162851 - map_script 2, PokemonLeague_AgathasRoom_MapScript4_162860 + map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_AgathasRoom_OnResume + map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_AgathasRoom_OnLoad + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_AgathasRoom_OnWarp + map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_AgathasRoom_OnFrame .byte 0 -PokemonLeague_AgathasRoom_MapScript1_162825:: @ 8162825 +PokemonLeague_AgathasRoom_OnResume:: @ 8162825 setvar VAR_0x8004, 2 call EventScript_1A75D5 end -PokemonLeague_AgathasRoom_MapScript2_162830:: @ 8162830 - checkflag FLAG_DEFEATED_AGATHA - call_if TRUE, EventScript_16284B - compare_var_to_value VAR_MAP_SCENE_POKEMON_LEAGUE, 3 - call_if eq, EventScript_162845 +PokemonLeague_AgathasRoom_OnLoad:: @ 8162830 + call_if_set FLAG_DEFEATED_AGATHA, EventScript_16284B + compare VAR_MAP_SCENE_POKEMON_LEAGUE, 3 + call_if_eq EventScript_162845 end EventScript_162845:: @ 8162845 @@ -25,15 +24,15 @@ EventScript_16284B:: @ 816284B call EventScript_1A7538 return -PokemonLeague_AgathasRoom_MapScript3_162851:: @ 8162851 - map_script_2 VAR_0x4001, 0, EventScript_16285B +PokemonLeague_AgathasRoom_OnWarp:: @ 8162851 + map_script_2 VAR_TEMP_1, 0, EventScript_16285B .2byte 0 EventScript_16285B:: @ 816285B - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -PokemonLeague_AgathasRoom_MapScript4_162860:: @ 8162860 +PokemonLeague_AgathasRoom_OnFrame:: @ 8162860 map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 2, EventScript_16286A .2byte 0 @@ -48,21 +47,16 @@ PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877 lock faceplayer famechecker FAMECHECKER_AGATHA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 - checkflag FLAG_DEFEATED_AGATHA - goto_if TRUE, EventScript_162911 + goto_if_set FLAG_DEFEATED_AGATHA, EventScript_162911 famechecker FAMECHECKER_AGATHA, 0 famechecker FAMECHECKER_AGATHA, 4 famechecker FAMECHECKER_OAK, 4 - checkflag FLAG_SYS_GAME_CLEAR - call_if FALSE, EventScript_1628E9 - checkflag FLAG_SYS_GAME_CLEAR - call_if TRUE, EventScript_1628F2 + call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1628E9 + call_if_set FLAG_SYS_GAME_CLEAR, EventScript_1628F2 setflag FLAG_TEMP_3 setflag FLAG_TEMP_5 - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if FALSE, EventScript_1628FB - checkflag FLAG_SYS_CAN_LINK_WITH_RS - call_if TRUE, EventScript_162906 + call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1628FB + call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162906 clearflag FLAG_TEMP_5 goto EventScript_16291B @@ -78,11 +72,11 @@ EventScript_1628F2:: @ 81628F2 return EventScript_1628FB:: @ 81628FB - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_AGATHA, 0, Text_1786D7 + trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA, Text_1786D7 return EventScript_162906:: @ 8162906 - trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_ELITE_FOUR_AGATHA_2, 0, Text_1786D7 + trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA_2, Text_1786D7 return EventScript_162911:: @ 8162911 |