diff options
Diffstat (limited to 'maps/TradeCenter.asm')
| -rw-r--r-- | maps/TradeCenter.asm | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 36f476de4..ebd3d8a3a 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -3,28 +3,23 @@ const_value set 2 const TRADECENTER_CHRIS2 TradeCenter_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + scene_script .InitializeTradeCenter + scene_script .DummyScene .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .SetWhichChris - ; callbacks - - dbw MAPCALLBACK_OBJECTS, TradeCenter_SetWhichChris - -.Trigger0: - priorityjump TradeCenter_Initialize +.InitializeTradeCenter: + priorityjump .InitializeAndPreparePokecenter2F end -.Trigger1: +.DummyScene: end -TradeCenter_SetWhichChris: +.SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 disappear TRADECENTER_CHRIS2 @@ -36,9 +31,9 @@ TradeCenter_SetWhichChris: appear TRADECENTER_CHRIS2 return -TradeCenter_Initialize: - dotrigger $1 - domaptrigger POKECENTER_2F, $1 +.InitializeAndPreparePokecenter2F: + setscene $1 + setmapscene POKECENTER_2F, $1 end MapTradeCenterSignpost1Script: @@ -67,15 +62,15 @@ TradeCenter_MapEventHeader: warp_def $7, $4, 2, POKECENTER_2F warp_def $7, $5, 2, POKECENTER_2F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 2 - signpost 4, 4, SIGNPOST_RIGHT, MapTradeCenterSignpost1Script - signpost 4, 5, SIGNPOST_LEFT, MapTradeCenterSignpost1Script + bg_event 4, 4, BGEVENT_RIGHT, MapTradeCenterSignpost1Script + bg_event 4, 5, BGEVENT_LEFT, MapTradeCenterSignpost1Script -.PersonEvents: +.ObjectEvents: db 2 - person_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS - person_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT + object_event SPRITE_CHRIS, 4, 3, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS + object_event SPRITE_CHRIS, 4, 6, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT |