diff options
Diffstat (limited to 'maps/Colosseum.asm')
| -rw-r--r-- | maps/Colosseum.asm | 61 |
1 files changed, 27 insertions, 34 deletions
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 6f8538bac..edaa5e0ad 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -1,16 +1,14 @@ -const_value set 2 + const_def 2 ; object constants const COLOSSEUM_CHRIS1 const COLOSSEUM_CHRIS2 Colosseum_MapScripts: -.SceneScripts: - db 3 - scene_script .InitializeColosseum - scene_script .DummyScene1 - scene_script .DummyScene2 - -.MapCallbacks: - db 2 + db 3 ; scene scripts + scene_script .InitializeColosseum ; SCENE_DEFAULT + scene_script .DummyScene1 ; SCENE_FINISHED + scene_script .DummyScene2 ; unused + + db 2 ; callbacks callback MAPCALLBACK_OBJECTS, .SetWhichChris callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F @@ -25,7 +23,7 @@ Colosseum_MapScripts: end .SetWhichChris: - special Special_CableClubCheckWhichChris + special CableClubCheckWhichChris iffalse .Chris2 disappear COLOSSEUM_CHRIS2 appear COLOSSEUM_CHRIS1 @@ -37,16 +35,16 @@ Colosseum_MapScripts: return .PreparePokecenter2F: - setmapscene POKECENTER_2F, 2 + setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM return .InitializeAndPreparePokecenter2F: - setscene 1 - setmapscene POKECENTER_2F, 2 + setscene SCENE_FINISHED + setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM end MapColosseumSignpost1Script: - special Special_Colosseum + special Colosseum newloadmap MAPSETUP_LINKRETURN end @@ -63,23 +61,18 @@ ChrisScript_0x193499: done Colosseum_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 4, 7, 3, POKECENTER_2F - warp_def 5, 7, 3, POKECENTER_2F - -.CoordEvents: - db 0 - -.BGEvents: - db 2 - bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script - bg_event 5, 4, BGEVENT_LEFT, MapColosseumSignpost1Script - -.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 0, 0 ; filler + + db 2 ; warp events + warp_event 4, 7, POKECENTER_2F, 3 + warp_event 5, 7, POKECENTER_2F, 3 + + db 0 ; coord events + + db 2 ; bg events + bg_event 4, 4, BGEVENT_RIGHT, MapColosseumSignpost1Script + bg_event 5, 4, BGEVENT_LEFT, MapColosseumSignpost1Script + + 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 |