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

@@ -9,41 +9,36 @@ const_value set 2
WiseTriosRoom_MapScriptHeader:
.MapTriggers:
db 2
; triggers
dw UnknownScript_0x98572, 0
dw UnknownScript_0x98573, 0
maptrigger .DummyTrigger0
maptrigger .DummyTrigger1
.MapCallbacks:
db 1
dbw MAPCALLBACK_OBJECTS, .WiseTrioCallback
; callbacks
dbw MAPCALLBACK_OBJECTS, UnknownScript_0x98574
UnknownScript_0x98572:
.DummyTrigger0:
end
UnknownScript_0x98573:
.DummyTrigger1:
end
UnknownScript_0x98574:
.WiseTrioCallback:
checkevent EVENT_FOUGHT_SUICUNE
iftrue UnknownScript_0x98593
iftrue .NoWiseTrio
checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
iftrue UnknownScript_0x9858c
iftrue .WiseTrio2
checkitem CLEAR_BELL
iftrue UnknownScript_0x9858c
iftrue .WiseTrio2
clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
return
UnknownScript_0x9858c:
.WiseTrio2:
setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
return
UnknownScript_0x98593:
.NoWiseTrio:
setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1
setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2
return