summaryrefslogtreecommitdiff
path: root/maps/TradeCenter.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/TradeCenter.asm')
-rw-r--r--maps/TradeCenter.asm21
1 files changed, 8 insertions, 13 deletions
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 36f476de4..e0c984b36 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