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

@@ -13,68 +13,62 @@ const_value set 2
TinTower1F_MapScriptHeader:
.MapTriggers:
db 2
; triggers
dw UnknownScript_0x18502a, 0
dw UnknownScript_0x18502e, 0
maptrigger .FaceSuicune
maptrigger .DummyTrigger
.MapCallbacks:
db 2
dbw MAPCALLBACK_OBJECTS, .NPCsCallback
dbw MAPCALLBACK_TILES, .StairsCallback
; callbacks
dbw MAPCALLBACK_OBJECTS, UnknownScript_0x18502f
dbw MAPCALLBACK_TILES, TinTowerStairsCallback
UnknownScript_0x18502a:
priorityjump SuicuneBattle
.FaceSuicune:
priorityjump .SuicuneBattle
end
UnknownScript_0x18502e:
.DummyTrigger:
end
UnknownScript_0x18502f:
.NPCsCallback:
checkevent EVENT_GOT_RAINBOW_WING
iftrue UnknownScript_0x185047
iftrue .GotRainbowWing
checkevent EVENT_BEAT_ELITE_FOUR
iffalse UnknownScript_0x185050
iffalse .FaceBeasts
special SpecialBeastsCheck
iffalse UnknownScript_0x185050
iffalse .FaceBeasts
clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2
setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1
UnknownScript_0x185047:
.GotRainbowWing:
checkevent EVENT_FOUGHT_HO_OH
iffalse .Done
appear TINTOWER1F_EUSINE
.Done:
return
UnknownScript_0x185050:
.FaceBeasts:
checkevent EVENT_FOUGHT_SUICUNE
iftrue UnknownScript_0x185077
iftrue .FoughtSuicune
appear TINTOWER1F_SUICUNE
writebyte RAIKOU
special SpecialMonCheck
iftrue UnknownScript_0x185065
iftrue .NoRaikou
appear TINTOWER1F_RAIKOU
jump UnknownScript_0x185067
jump .CheckEntei
UnknownScript_0x185065:
.NoRaikou:
disappear TINTOWER1F_RAIKOU
UnknownScript_0x185067:
.CheckEntei:
writebyte ENTEI
special SpecialMonCheck
iftrue UnknownScript_0x185074
iftrue .NoEntei
appear TINTOWER1F_ENTEI
jump UnknownScript_0x185076
jump .BeastsDone
UnknownScript_0x185074:
.NoEntei:
disappear TINTOWER1F_ENTEI
UnknownScript_0x185076:
.BeastsDone:
return
UnknownScript_0x185077:
.FoughtSuicune:
disappear TINTOWER1F_SUICUNE
disappear TINTOWER1F_RAIKOU
disappear TINTOWER1F_ENTEI
@@ -82,14 +76,14 @@ UnknownScript_0x185077:
setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2
return
TinTowerStairsCallback:
.StairsCallback:
checkevent EVENT_GOT_RAINBOW_WING
iftrue .NoChange
iftrue .DontHideStairs
changeblock $a, $2, $9
.NoChange:
.DontHideStairs:
return
SuicuneBattle:
.SuicuneBattle:
applymovement PLAYER, TinTowerPlayerMovement1
pause 15
writebyte RAIKOU