summaryrefslogtreecommitdiff
path: root/maps/Route40BattleTowerGate.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route40BattleTowerGate.asm')
-rw-r--r--maps/Route40BattleTowerGate.asm48
1 files changed, 19 insertions, 29 deletions
diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm
index 9a9ef164f..f5905a9ba 100644
--- a/maps/Route40BattleTowerGate.asm
+++ b/maps/Route40BattleTowerGate.asm
@@ -1,29 +1,25 @@
-Route40BattleTowerGate_MapScriptHeader: ; 0x9f660
- ; trigger count
+Route40BattleTowerGate_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 1
; callbacks
dbw 2, UnknownScript_0x9f665
-; 0x9f665
-UnknownScript_0x9f665: ; 0x9f665
- clearevent $07cf
+UnknownScript_0x9f665:
+ clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
return
-; 0x9f669
-RockerScript_0x9f669: ; 0x9f669
+RockerScript_0x9f669:
jumptextfaceplayer UnknownText_0x9f716
-; 0x9f66c
-TwinScript_0x9f66c: ; 0x9f66c
+TwinScript_0x9f66c:
jumptextfaceplayer UnknownText_0x9f7c8
-; 0x9f66f
-UnknownText_0x9f66f: ; 0x9f66f
+UnknownText_0x9f66f:
text "Did you come to"
line "see the BATTLE"
cont "TOWER too?"
@@ -31,9 +27,8 @@ UnknownText_0x9f66f: ; 0x9f66f
para "But I guess you"
line "can't go in yet."
done
-; 0x9f6ba
-UnknownText_0x9f6ba: ; 0x9f6ba
+UnknownText_0x9f6ba:
text "BATTLE TOWER has"
line "opened."
@@ -43,9 +38,8 @@ UnknownText_0x9f6ba: ; 0x9f6ba
para "up a cool line for"
line "when I win."
done
-; 0x9f716
-UnknownText_0x9f716: ; 0x9f716
+UnknownText_0x9f716:
text "Are you going to"
line "the BATTLE TOWER?"
@@ -55,18 +49,16 @@ UnknownText_0x9f716: ; 0x9f716
para "whole lot, you can"
line "win special gifts."
done
-; 0x9f783
-UnknownText_0x9f783: ; 0x9f783
+UnknownText_0x9f783:
text "I'm going to train"
line "my #MON so I'll"
para "be all ready for"
line "the BATTLE TOWER."
done
-; 0x9f7c8
-UnknownText_0x9f7c8: ; 0x9f7c8
+UnknownText_0x9f7c8:
text "The levels of the"
line "#MON I want to"
@@ -76,27 +68,25 @@ UnknownText_0x9f7c8: ; 0x9f7c8
para "I have to go train"
line "them now!"
done
-; 0x9f81e
-Route40BattleTowerGate_MapEventHeader: ; 0x9f81e
+Route40BattleTowerGate_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 4
warp_def $7, $4, 1, GROUP_ROUTE_40, MAP_ROUTE_40
warp_def $7, $5, 1, GROUP_ROUTE_40, MAP_ROUTE_40
warp_def $0, $4, 1, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE
warp_def $0, $5, 2, GROUP_BATTLE_TOWER_OUTSIDE, MAP_BATTLE_TOWER_OUTSIDE
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 2
- person_event SPRITE_ROCKER, 7, 7, $3, $0, 255, 255, $a0, 0, RockerScript_0x9f669, $07cf
- person_event SPRITE_TWIN, 9, 11, $4, $10, 255, 255, $80, 0, TwinScript_0x9f66c, $ffff
-; 0x9f852
+ person_event SPRITE_ROCKER, 7, 7, OW_DOWN | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, RockerScript_0x9f669, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
+ person_event SPRITE_TWIN, 9, 11, OW_UP | $0, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, TwinScript_0x9f66c, -1