ref: d4fe2c9953027e1d459bbe4b4fe4c5131c10aa1a
parent: 92863b3446fce6fd1ee46574177d816aac428f89
author: yenatch <[email protected]>
date: Wed May 1 09:29:45 EDT 2013
remove incbins in BattleTower
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -4,7 +4,7 @@
; triggers
dw UnknownScript_0x9e39d, $0000
- dw $63d3, $0000
+ dw UnknownScript_0x9e3d3, $0000
; callback count
db 0
@@ -39,6 +39,7 @@
special $0086
UnknownScript_0x9e3d1: ; 0x9e3d1
dotrigger $1
+UnknownScript_0x9e3d3: ; 0x9e3d3
end
; 0x9e3d4
@@ -57,7 +58,7 @@
UnknownScript_0x9e3e2: ; 0x9e3e2
writebyte $2
special $0086
- if_equal $3, $74e4 ; wtf ?
+ if_equal $3, BattleTowerBattleRoomScript_0x9f4e4
loadfont
2writetext UnknownText_0x9e5ab
keeptextopen
@@ -119,7 +120,7 @@
warpsound
disappear $2
stopfollow
- applymovement $0, $6576
+ applymovement $0, MovementData_0x9e576
warpcheck
end
; 0x9e47a
@@ -177,9 +178,21 @@
end
; 0x9e4be
-INCBIN "baserom.gbc",$9e4be,$9e4e4 - $9e4be
-UnknownScript_0x9e4e4: ; 0x9e4e4
+UnknownScript_0x9e4be: ; 0x9e4be
+ 2writetext UnknownText_0x9ef1f
+ yesorno
+ iffalse UnknownScript_0x9e3fc
+ special $0004
+ iffalse UnknownScript_0x9e3fc
+ writebyte $1
+ special $0086
+ special $0075
+ if_equal $a, UnknownScript_0x9e3fc
+ if_not_equal $0, UnknownScript_0x9e550
+ 2writetext UnknownText_0x9e9eb
+ spriteface $2, $2
+ 2writetext UnknownText_0x9ea1b
closetext
spriteface $2, $0
loadmovesprites
@@ -282,6 +295,7 @@
step_up
step_up
step_up
+MovementData_0x9e576: ; 0x9e576
step_up
step_end
; 0x9e578
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -108,6 +108,7 @@
pause 60
special $002f
warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
+BattleTowerBattleRoomScript_0x9f4e4: ; 0x9f4e4
loadfont
2writetext UnknownText_0x9eaef
2jump UnknownScript_0x9e47a
@@ -136,7 +137,12 @@
end
; 0x9f50b
-INCBIN "baserom.gbc",$9f50b,$9f52e-$9f50b
+
+UnknownText_0x9f50b: ; 0x9f50b
+ db $0, "You'll be returned", $4f
+ db "after you SAVE.", $57
+; 0x9f52e
+
BattleTowerBattleRoom_MapEventHeader: ; 0x9f52e
; filler
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -21,11 +21,25 @@
UnknownScript_0x9f5c1: ; 0x9f5c1
follow $2, $0
- 3callasm $27, $75cb
+ 3callasm BANK(Function_0x9f5cb), Function_0x9f5cb
2jump UnknownScript_0x9f5dc
; 0x9f5cb
-INCBIN "baserom.gbc",$9f5cb,$9f5dc - $9f5cb
+
+Function_0x9f5cb: ; 0x9f5cb
+ ld a, [rSVBK]
+ push af
+
+ ld a, 3
+ ld [rSVBK], a
+ ld a, [$d800]
+ ld [ScriptVar], a
+
+ pop af
+ ld [rSVBK], a
+ ret
+; 0x9f5dc
+
UnknownScript_0x9f5dc: ; 0x9f5dc
if_equal $3, UnknownScript_0x9f603