diff options
Diffstat (limited to 'maps/Route43Gate.asm')
| -rw-r--r-- | maps/Route43Gate.asm | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index ee54a42c7..99ca71a58 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -6,36 +6,31 @@ const_value set 2 Route43Gate_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .RocketShakedown + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_NEWMAP, .CheckIfRockets - ; callbacks - - dbw MAPCALLBACK_NEWMAP, GateScript_CheckIfRockets - -.Trigger0: - priorityjump GateScript_RocketTakeover +.RocketShakedown: + priorityjump .RocketTakeover end -.Trigger1: +.DummyTrigger: end -GateScript_CheckIfRockets: +.CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT - iftrue GateScript_NoRockets + iftrue .NoRockets domaptrigger ROUTE_43, $0 return -GateScript_NoRockets: +.NoRockets: domaptrigger ROUTE_43, $1 return -GateScript_RocketTakeover: +.RocketTakeover: playmusic MUSIC_ROCKET_ENCOUNTER checkcode VAR_FACING if_equal DOWN, RocketScript_Southbound |