diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-10 17:53:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-10 17:53:21 -0500 |
| commit | 62f591394368802ba51e43f75b3ff272a9ec2a8e (patch) | |
| tree | c30b991cf5b990ac27327a8c8df0623e5ae85646 /maps/TradeCenter.asm | |
| parent | 66527d861f3b491f910c954c3f5d48a182d7ba12 (diff) | |
All map triggers use the `maptrigger` macro, not `dw`
.MapTriggers and .MapCallbacks lists are formatted consistently with .Warps, .XYTriggers, .Signposts, and .PersonEvents
Diffstat (limited to 'maps/TradeCenter.asm')
| -rw-r--r-- | maps/TradeCenter.asm | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 36f476de4..07cb18136 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -5,26 +5,21 @@ const_value set 2 TradeCenter_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .InitializeTradeCenter + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .SetWhichChris - ; callbacks - - dbw MAPCALLBACK_OBJECTS, TradeCenter_SetWhichChris - -.Trigger0: - priorityjump TradeCenter_Initialize +.InitializeTradeCenter: + priorityjump .InitializeAndPreparePokeCenter2F end -.Trigger1: +.DummyTrigger: end -TradeCenter_SetWhichChris: +.SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 disappear TRADECENTER_CHRIS2 @@ -36,7 +31,7 @@ TradeCenter_SetWhichChris: appear TRADECENTER_CHRIS2 return -TradeCenter_Initialize: +.InitializeAndPreparePokeCenter2F: dotrigger $1 domaptrigger POKECENTER_2F, $1 end |