summaryrefslogtreecommitdiff
path: root/maps/BattleTowerBattleRoom.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/BattleTowerBattleRoom.asm')
-rw-r--r--maps/BattleTowerBattleRoom.asm73
1 files changed, 31 insertions, 42 deletions
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index a69d56865..82753c221 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -1,28 +1,25 @@
-BattleTowerBattleRoom_MapScriptHeader: ; 0x9f40f
- ; trigger count
+BattleTowerBattleRoom_MapScriptHeader:
+.MapTriggers:
db 2
; triggers
dw UnknownScript_0x9f419, $0000
dw UnknownScript_0x9f420, $0000
- ; callback count
+.MapCallbacks:
db 0
-; 0x9f419
-UnknownScript_0x9f419: ; 0x9f419
+UnknownScript_0x9f419:
disappear $2
priorityjump UnknownScript_0x9f421
dotrigger $1
-; 0x9f420
-UnknownScript_0x9f420: ; 0x9f420
+UnknownScript_0x9f420:
end
-; 0x9f421
-UnknownScript_0x9f421: ; 0x9f421
+UnknownScript_0x9f421:
applymovement $0, MovementData_0x9e58c
-UnknownScript_0x9f425: ; 0x9f425
+UnknownScript_0x9f425:
writebyte $2
special Function170b44
appear $2
@@ -34,7 +31,7 @@ UnknownScript_0x9f425: ; 0x9f425
keeptextopen
loadmovesprites
special Function170215
- special Function8c084
+ special FadeBlackBGMap
reloadmap
if_not_equal $0, UnknownScript_0x9f4c2
copybytetovar wcf64
@@ -49,23 +46,22 @@ UnknownScript_0x9f425: ; 0x9f425
closetext
loadmovesprites
playmusic MUSIC_HEAL
- special Function8c084
- special Function1047eb
+ special FadeBlackBGMap
+ special LoadMapPalettes
pause 60
- special Function8c079
+ special FadeInBGMap
special RestartMapMusic
loadfont
writetext UnknownText_0x9eebc
yesorno
iffalse UnknownScript_0x9f483
-UnknownScript_0x9f477: ; 0x9f477
+UnknownScript_0x9f477:
loadmovesprites
applymovement $0, MovementData_0x9e5a9
applymovement $3, MovementData_0x9e5a1
jump UnknownScript_0x9f425
-; 0x9f483
-UnknownScript_0x9f483: ; 0x9f483
+UnknownScript_0x9f483:
writetext UnknownText_0x9ef5e
yesorno
iffalse UnknownScript_0x9f4a3
@@ -77,9 +73,9 @@ UnknownScript_0x9f483: ; 0x9f483
special Function170687
playsound SFX_SAVE
waitbutton
- special Function8c084
+ special FadeBlackBGMap
special Reset
-UnknownScript_0x9f4a3: ; 0x9f4a3
+UnknownScript_0x9f4a3:
writetext UnknownText_0x9efbf
yesorno
iffalse UnknownScript_0x9f477
@@ -88,15 +84,14 @@ UnknownScript_0x9f4a3: ; 0x9f4a3
writebyte $6
special Function170687
loadmovesprites
- special Function8c084
+ special FadeBlackBGMap
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
loadfont
jump UnknownScript_0x9e4b0
-; 0x9f4c2
-UnknownScript_0x9f4c2: ; 0x9f4c2
+UnknownScript_0x9f4c2:
pause 60
- special Function8c092
+ special Special_BattleTowerFade
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
writebyte $4
special Function170687
@@ -105,19 +100,17 @@ UnknownScript_0x9f4c2: ; 0x9f4c2
closetext
loadmovesprites
end
-; 0x9f4d9
-UnknownScript_0x9f4d9: ; 0x9f4d9
+UnknownScript_0x9f4d9:
pause 60
- special Function8c092
+ special Special_BattleTowerFade
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
-BattleTowerBattleRoomScript_0x9f4e4: ; 0x9f4e4
+BattleTowerBattleRoomScript_0x9f4e4:
loadfont
writetext UnknownText_0x9eaef
jump UnknownScript_0x9e47a
-; 0x9f4eb
-UnknownScript_0x9f4eb: ; 0x9f4eb
+UnknownScript_0x9f4eb:
writebyte $4
special Function170687
loadfont
@@ -125,9 +118,8 @@ UnknownScript_0x9f4eb: ; 0x9f4eb
closetext
loadmovesprites
end
-; 0x9f4f7
-UnknownScript_0x9f4f7: ; 0x9f4f7
+UnknownScript_0x9f4f7:
writebyte $4
special Function170687
writebyte $6
@@ -138,33 +130,30 @@ UnknownScript_0x9f4f7: ; 0x9f4f7
closetext
loadmovesprites
end
-; 0x9f50b
-UnknownText_0x9f50b: ; 0x9f50b
+UnknownText_0x9f50b:
text "You'll be returned"
line "after you SAVE."
done
-; 0x9f52e
-BattleTowerBattleRoom_MapEventHeader: ; 0x9f52e
+BattleTowerBattleRoom_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $3, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY
warp_def $7, $4, 4, GROUP_BATTLE_TOWER_HALLWAY, MAP_BATTLE_TOWER_HALLWAY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 2
- person_event SPRITE_YOUNGSTER, 4, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, $0791
- person_event SPRITE_RECEPTIONIST, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, $ffff
-; 0x9f558
+ person_event SPRITE_YOUNGSTER, 4, 8, OW_UP | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
+ person_event SPRITE_RECEPTIONIST, 10, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, ObjectEvent, -1