Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

All map triggers use the maptrigger macro, not dw

Browse Source 
.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
Download Patch File Download Diff File Expand all files Collapse all files

48
maps/TeamRocketBaseB3F.asm
View File

@@ -17,31 +17,26 @@ const_value set 2
TeamRocketBaseB3F_MapScriptHeader:
.MapTriggers:
db 4
; triggers
maptrigger .Trigger0
maptrigger .Trigger1
maptrigger .Trigger2
maptrigger .Trigger3
maptrigger .LanceGetsPassword
maptrigger .DummyTrigger1
maptrigger .DummyTrigger2
maptrigger .DummyTrigger3
.MapCallbacks:
db 1
; callbacks
dbw MAPCALLBACK_TILES, .CheckGiovanniDoor
.Trigger0:
.LanceGetsPassword:
priorityjump LanceGetPasswordScript
end
.Trigger1:
.DummyTrigger1:
end
.Trigger2:
.DummyTrigger2:
end
.Trigger3:
.DummyTrigger3:
end
.CheckGiovanniDoor:
@@ -178,9 +173,8 @@ ScientistMitchScript:
closetext
end
BossDoor:
dw EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE
dw .Script
TeamRocketBaseB3FLockedDoor:
dw EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE, .Script
.Script:
opentext
@@ -207,7 +201,7 @@ BossDoor:
waitsfx
end
MapTeamRocketBaseB3FSignpost9Script:
TeamRocketBaseB3FOathScript:
jumpstd teamrocketoath
TeamRocketBaseB3FProtein:
@@ -590,16 +584,16 @@ TeamRocketBaseB3F_MapEventHeader:
.Signposts:
db 10
signpost 9, 10, SIGNPOST_IFNOTSET, BossDoor
signpost 9, 11, SIGNPOST_IFNOTSET, BossDoor
signpost 1, 10, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script
signpost 1, 11, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script
signpost 1, 12, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script
signpost 1, 13, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script
signpost 13, 4, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script
signpost 13, 5, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script
signpost 13, 6, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script
signpost 13, 7, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script
signpost 9, 10, SIGNPOST_IFNOTSET, TeamRocketBaseB3FLockedDoor
signpost 9, 11, SIGNPOST_IFNOTSET, TeamRocketBaseB3FLockedDoor
signpost 1, 10, SIGNPOST_READ, TeamRocketBaseB3FOathScript
signpost 1, 11, SIGNPOST_READ, TeamRocketBaseB3FOathScript
signpost 1, 12, SIGNPOST_READ, TeamRocketBaseB3FOathScript
signpost 1, 13, SIGNPOST_READ, TeamRocketBaseB3FOathScript
signpost 13, 4, SIGNPOST_READ, TeamRocketBaseB3FOathScript
signpost 13, 5, SIGNPOST_READ, TeamRocketBaseB3FOathScript
signpost 13, 6, SIGNPOST_READ, TeamRocketBaseB3FOathScript
signpost 13, 7, SIGNPOST_READ, TeamRocketBaseB3FOathScript
.PersonEvents:
db 14