diff options
Diffstat (limited to 'maps/Colosseum.asm')
| -rw-r--r-- | maps/Colosseum.asm | 76 |
1 files changed, 32 insertions, 44 deletions
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index df7131bd6..a23704d74 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -1,99 +1,87 @@ -Colosseum_MapScriptHeader: ; 0x19345d - ; trigger count +Colosseum_MapScriptHeader: +.MapTriggers: db 3 ; triggers - dw UnknownScript_0x193471, $0000 - dw UnknownScript_0x193475, $0000 - dw UnknownScript_0x193476, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 + dw .Trigger3, $0000 - ; callback count +.MapCallbacks: db 2 ; callbacks - dbw 2, UnknownScript_0x193477 + dbw 2, ColosseumScript_SetWhichChris - dbw 5, UnknownScript_0x193487 -; 0x193471 + dbw 5, ColosseumScript_InitializeCB -UnknownScript_0x193471: ; 0x193471 - priorityjump UnknownScript_0x19348c +.Trigger1: + priorityjump ColosseumScript_Initialize end -; 0x193475 -UnknownScript_0x193475: ; 0x193475 +.Trigger2: end -; 0x193476 -UnknownScript_0x193476: ; 0x193476 +.Trigger3: end -; 0x193477 -UnknownScript_0x193477: ; 0x193477 - special Function29f47 - iffalse UnknownScript_0x193482 +ColosseumScript_SetWhichChris: + special Special_CableClubCheckWhichChris + iffalse .Chris2 disappear $3 appear $2 return -; 0x193482 -UnknownScript_0x193482: ; 0x193482 +.Chris2: disappear $2 appear $3 return -; 0x193487 -UnknownScript_0x193487: ; 0x193487 +ColosseumScript_InitializeCB: domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $2 return -; 0x19348c -UnknownScript_0x19348c: ; 0x19348c +ColosseumScript_Initialize: dotrigger $1 domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $2 end -; 0x193493 -MapColosseumSignpost1Script: ; 0x193493 - special Function29ed9 +MapColosseumSignpost1Script: + special Special_Colosseum newloadmap $f8 end -; 0x193499 -ChrisScript_0x193499: ; 0x193499 +ChrisScript_0x193499: loadfont - writetext UnknownText_0x1934a0 + writetext .FriendReadyText closetext loadmovesprites end -; 0x1934a0 -UnknownText_0x1934a0: ; 0x1934a0 +.FriendReadyText: text "Your friend is" line "ready." done -; 0x1934b7 -Colosseum_MapEventHeader: ; 0x1934b7 +Colosseum_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $4, 3, GROUP_POKECENTER_2F, MAP_POKECENTER_2F warp_def $7, $5, 3, GROUP_POKECENTER_2F, MAP_POKECENTER_2F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 4, 4, $3, MapColosseumSignpost1Script - signpost 4, 5, $4, MapColosseumSignpost1Script + signpost 4, 4, SIGNPOST_RIGHT, MapColosseumSignpost1Script + signpost 4, 5, SIGNPOST_LEFT, MapColosseumSignpost1Script - ; people-events +.PersonEvents: db 2 - person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0000 - person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, $0001 -; 0x1934eb + person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS + person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT |