diff options
Diffstat (limited to 'maps/Colosseum.asm')
| -rw-r--r-- | maps/Colosseum.asm | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index df7131bd6..41c7ad14b 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -1,4 +1,4 @@ -Colosseum_MapScriptHeader: ; 0x19345d +Colosseum_MapScriptHeader: ; trigger count db 3 @@ -15,67 +15,56 @@ Colosseum_MapScriptHeader: ; 0x19345d dbw 2, UnknownScript_0x193477 dbw 5, UnknownScript_0x193487 -; 0x193471 -UnknownScript_0x193471: ; 0x193471 +UnknownScript_0x193471: priorityjump UnknownScript_0x19348c end -; 0x193475 -UnknownScript_0x193475: ; 0x193475 +UnknownScript_0x193475: end -; 0x193476 -UnknownScript_0x193476: ; 0x193476 +UnknownScript_0x193476: end -; 0x193477 -UnknownScript_0x193477: ; 0x193477 +UnknownScript_0x193477: special Function29f47 iffalse UnknownScript_0x193482 disappear $3 appear $2 return -; 0x193482 -UnknownScript_0x193482: ; 0x193482 +UnknownScript_0x193482: disappear $2 appear $3 return -; 0x193487 -UnknownScript_0x193487: ; 0x193487 +UnknownScript_0x193487: domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $2 return -; 0x19348c -UnknownScript_0x19348c: ; 0x19348c +UnknownScript_0x19348c: dotrigger $1 domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $2 end -; 0x193493 -MapColosseumSignpost1Script: ; 0x193493 +MapColosseumSignpost1Script: special Function29ed9 newloadmap $f8 end -; 0x193499 -ChrisScript_0x193499: ; 0x193499 +ChrisScript_0x193499: loadfont writetext UnknownText_0x1934a0 closetext loadmovesprites end -; 0x1934a0 -UnknownText_0x1934a0: ; 0x1934a0 +UnknownText_0x1934a0: text "Your friend is" line "ready." done -; 0x1934b7 -Colosseum_MapEventHeader: ; 0x1934b7 +Colosseum_MapEventHeader: ; filler db 0, 0 @@ -96,4 +85,3 @@ Colosseum_MapEventHeader: ; 0x1934b7 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 |