summaryrefslogtreecommitdiff
path: root/maps/BattleTowerBattleRoom.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/BattleTowerBattleRoom.asm')
-rw-r--r--maps/BattleTowerBattleRoom.asm41
1 files changed, 15 insertions, 26 deletions
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index a69d56865..7b5f809c8 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -1,4 +1,4 @@
-BattleTowerBattleRoom_MapScriptHeader: ; 0x9f40f
+BattleTowerBattleRoom_MapScriptHeader:
; trigger count
db 2
@@ -8,21 +8,18 @@ BattleTowerBattleRoom_MapScriptHeader: ; 0x9f40f
; callback count
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
@@ -58,14 +55,13 @@ UnknownScript_0x9f425: ; 0x9f425
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
@@ -79,7 +75,7 @@ UnknownScript_0x9f483: ; 0x9f483
waitbutton
special Function8c084
special Reset
-UnknownScript_0x9f4a3: ; 0x9f4a3
+UnknownScript_0x9f4a3:
writetext UnknownText_0x9efbf
yesorno
iffalse UnknownScript_0x9f477
@@ -92,9 +88,8 @@ UnknownScript_0x9f4a3: ; 0x9f4a3
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
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
@@ -105,19 +100,17 @@ UnknownScript_0x9f4c2: ; 0x9f4c2
closetext
loadmovesprites
end
-; 0x9f4d9
-UnknownScript_0x9f4d9: ; 0x9f4d9
+UnknownScript_0x9f4d9:
pause 60
special Function8c092
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,17 +130,15 @@ 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
@@ -167,4 +157,3 @@ BattleTowerBattleRoom_MapEventHeader: ; 0x9f52e
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