summaryrefslogtreecommitdiff
path: root/maps/TradeCenter.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/TradeCenter.asm')
-rw-r--r--maps/TradeCenter.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 4ac5ad2a..2282d9d5 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -1,13 +1,13 @@
- object_const_def ; object_event constants
+ object_const_def
const TRADECENTER_CHRIS1
const TRADECENTER_CHRIS2
TradeCenter_MapScripts:
- db 2 ; scene scripts
+ def_scene_scripts
scene_script .InitializeTradeCenter ; SCENE_DEFAULT
scene_script .DummyScene ; SCENE_FINISHED
- db 1 ; callbacks
+ def_callbacks
callback MAPCALLBACK_OBJECTS, .SetWhichChris
.InitializeTradeCenter:
@@ -55,16 +55,16 @@ TradeCenterFriendScript:
TradeCenter_MapEvents:
db 0, 0 ; filler
- db 2 ; warp events
+ def_warp_events
warp_event 4, 7, POKECENTER_2F, 2
warp_event 5, 7, POKECENTER_2F, 2
- db 0 ; coord events
+ def_coord_events
- db 2 ; bg events
+ def_bg_events
bg_event 4, 4, BGEVENT_RIGHT, TradeCenterConsoleScript
bg_event 5, 4, BGEVENT_LEFT, TradeCenterConsoleScript
- db 2 ; object events
+ def_object_events
object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CableClubFriendScript, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2