All map triggers use the maptrigger macro, not dw

.MapTriggers and .MapCallbacks lists are formatted consistently with .Warps, .XYTriggers, .Signposts, and .PersonEvents
This commit is contained in:
Remy Oukaour
2017-12-10 17:53:21 -05:00
parent 66527d861f
commit 62f5913943
133 changed files with 659 additions and 1082 deletions

View File

@@ -15,29 +15,23 @@ const_value set 2
Route36NationalParkGate_MapScriptHeader:
.MapTriggers:
db 3
; triggers
maptrigger .Trigger0
maptrigger .Trigger1
maptrigger .Trigger2
maptrigger .DummyTrigger0
maptrigger .DummyTrigger1
maptrigger .LeaveContestEarly
.MapCallbacks:
db 2
; callbacks
dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning
dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable
.Trigger0:
.DummyTrigger0:
end
.Trigger1:
.DummyTrigger1:
end
.Trigger2:
priorityjump .LeftTheContestEarly
.LeaveContestEarly:
priorityjump .LeavingContestEarly
end
.CheckIfContestRunning:
@@ -69,7 +63,7 @@ Route36NationalParkGate_MapScriptHeader:
.Return:
return
.LeftTheContestEarly:
.LeavingContestEarly:
spriteface PLAYER, UP
opentext
checkcode VAR_CONTESTMINUTES