diff options
Diffstat (limited to 'maps/TradeCenter.asm')
| -rw-r--r-- | maps/TradeCenter.asm | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 62232df4f..eff2e414a 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -1,15 +1,13 @@ -const_value set 2 + const_def 2 ; object constants const TRADECENTER_CHRIS1 const TRADECENTER_CHRIS2 TradeCenter_MapScripts: -.SceneScripts: - db 2 - scene_script .InitializeTradeCenter - scene_script .DummyScene + db 2 ; scene scripts + scene_script .InitializeTradeCenter ; SCENE_DEFAULT + scene_script .DummyScene ; SCENE_FINISHED -.MapCallbacks: - db 1 + db 1 ; callbacks callback MAPCALLBACK_OBJECTS, .SetWhichChris .InitializeTradeCenter: @@ -20,7 +18,7 @@ TradeCenter_MapScripts: end .SetWhichChris: - special Special_CableClubCheckWhichChris + special CableClubCheckWhichChris iffalse .Chris2 disappear TRADECENTER_CHRIS2 appear TRADECENTER_CHRIS1 @@ -32,12 +30,12 @@ TradeCenter_MapScripts: return .InitializeAndPreparePokecenter2F: - setscene 1 - setmapscene POKECENTER_2F, 1 + setscene SCENE_FINISHED + setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TRADE_CENTER end MapTradeCenterSignpost1Script: - special Special_TradeCenter + special TradeCenter newloadmap MAPSETUP_LINKRETURN end @@ -54,23 +52,18 @@ ChrisScript_0x19340b: done TradeCenter_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 4, 7, 2, POKECENTER_2F - warp_def 5, 7, 2, POKECENTER_2F + db 2 ; warp events + warp_event 4, 7, POKECENTER_2F, 2 + warp_event 5, 7, POKECENTER_2F, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script - bg_event 5, 4, BGEVENT_LEFT, MapTradeCenterSignpost1Script + db 2 ; bg events + bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script + bg_event 5, 4, BGEVENT_LEFT, MapTradeCenterSignpost1Script -.ObjectEvents: - db 2 - object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS - object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT + db 2 ; object events + object_event 3, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 + object_event 6, 4, SPRITE_CHRIS, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 |