diff options
Diffstat (limited to 'data/maps/EverGrandeCity_SidneysRoom/scripts.inc')
| -rw-r--r-- | data/maps/EverGrandeCity_SidneysRoom/scripts.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index b2b731004..7bd896364 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -1,7 +1,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F - map_script 1, EverGrandeCity_SidneysRoom_MapScript1_15B54F - map_script 4, EverGrandeCity_SidneysRoom_MapScript2_15B570 - map_script 2, EverGrandeCity_SidneysRoom_MapScript2_15B57F + map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_15B54F + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_15B570 + map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_15B57F .byte 0 EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F @@ -11,11 +11,11 @@ EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F end EverGrandeCity_SidneysRoom_EventScript_15B564:: @ 815B564 - call EverGrandeCity_SidneysRoom_EventScript_1A0757 + call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom return EverGrandeCity_SidneysRoom_EventScript_15B56A:: @ 815B56A - call EverGrandeCity_SidneysRoom_EventScript_1A07FA + call PokemonLeague_EliteFour_EventScript_CloseDoor return EverGrandeCity_DrakesRoom_MapScript2_15B570:: @ 815B570 @@ -24,7 +24,7 @@ EverGrandeCity_SidneysRoom_MapScript2_15B570:: @ 815B570 .2byte 0 EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A - turnobject 255, 2 + turnobject OBJ_EVENT_ID_PLAYER, 2 end EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F @@ -33,7 +33,7 @@ EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589 lockall - call EverGrandeCity_SidneysRoom_EventScript_1A0710 + call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor setvar VAR_ELITE_4_STATE, 1 releaseall end @@ -43,19 +43,19 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 faceplayer goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD playbgm MUS_SITENNOU, FALSE - msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 - trainerbattle 3, TRAINER_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 + msgbox EverGrandeCity_SidneysRoom_Text_190728, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_190823 goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 end EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD - msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4 + msgbox EverGrandeCity_SidneysRoom_Text_19086D, MSGBOX_DEFAULT release end EverGrandeCity_SidneysRoom_EventScript_15B5C7:: @ 815B5C7 setflag FLAG_DEFEATED_ELITE_4_SYDNEY - call EverGrandeCity_SidneysRoom_EventScript_1A0693 - msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4 + call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles + msgbox EverGrandeCity_SidneysRoom_Text_19086D, MSGBOX_DEFAULT release end |