dbw BANK, addr replaced with dba

This commit is contained in:
PikalaxALT
2015-11-03 19:43:47 -05:00
parent 10beeb3c06
commit c5527a02ae
19 changed files with 593 additions and 589 deletions

View File

@@ -3,22 +3,22 @@ BattleTower1F_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x9e39d, 0
dw UnknownScript_0x9e3d3, 0
dw .Trigger0, 0
dw .Trigger1, 0
.MapCallbacks:
db 0
UnknownScript_0x9e39d:
.Trigger0:
writebyte BATTLE_TOWER_ACTION_09
special BattleTowerAction
iffalse UnknownScript_0x9e3d1
iffalse .SkipEverything
writebyte BATTLE_TOWER_ACTION_02
special BattleTowerAction
if_equal $0, UnknownScript_0x9e3d1
if_equal $2, UnknownScript_0x9e3c4
if_equal $3, UnknownScript_0x9e3d1
if_equal $4, UnknownScript_0x9e3d1
if_equal $0, .SkipEverything
if_equal $2, .priorityjump1
if_equal $3, .SkipEverything
if_equal $4, .SkipEverything
loadfont
writetext UnknownText_0x9f037
closetext
@@ -26,17 +26,15 @@ UnknownScript_0x9e39d:
priorityjump UnknownScript_0x9e44e
end
UnknownScript_0x9e3c4:
.priorityjump1:
priorityjump UnknownScript_0x9e555
UnknownScript_0x9e3c7:
writebyte BATTLE_TOWER_ACTION_04
special BattleTowerAction
writebyte BATTLE_TOWER_ACTION_06
special BattleTowerAction
UnknownScript_0x9e3d1:
.SkipEverything:
dotrigger $1
UnknownScript_0x9e3d3:
.Trigger1:
end
MapBattleTower1FSignpost0Script:

View File

@@ -3,29 +3,29 @@ BattleTowerHallway_MapScriptHeader:
db 2
; triggers
dw UnknownScript_0x9f5bb, 0
dw UnknownScript_0x9f5c0, 0
dw .Trigger0, 0
dw .Trigger1, 0
.MapCallbacks:
db 0
UnknownScript_0x9f5bb:
priorityjump UnknownScript_0x9f5c1
.Trigger0:
priorityjump .ChooseBattleRoom
dotrigger $1
UnknownScript_0x9f5c0:
.Trigger1:
end
UnknownScript_0x9f5c1:
.ChooseBattleRoom:
follow $2, PLAYER
callasm Function_0x9f5cb
jump Script_WalkToChosenBattleRoom
callasm .asm_load_battle_room
jump .WalkToChosenBattleRoom
Function_0x9f5cb:
.asm_load_battle_room:
ld a, [rSVBK]
push af
ld a, 3
ld a, BANK(wBTChoiceOfLvlGroup)
ld [rSVBK], a
ld a, [wBTChoiceOfLvlGroup]
ld [ScriptVar], a
@@ -38,35 +38,35 @@ Function_0x9f5cb:
; enter different rooms for different levels to battle against
; at least it should look like that
; because all warps lead to the same room
Script_WalkToChosenBattleRoom: ; 0x9f5dc
if_equal 3, Script_WalkToBattleRoomL30L40
if_equal 4, Script_WalkToBattleRoomL30L40
if_equal 5, Script_WalkToBattleRoomL50L60
if_equal 6, Script_WalkToBattleRoomL50L60
if_equal 7, Script_WalkToBattleRoomL70L80
if_equal 8, Script_WalkToBattleRoomL70L80
if_equal 9, Script_WalkToBattleRoomL90L100
if_equal 10, Script_WalkToBattleRoomL90L100
.WalkToChosenBattleRoom: ; 0x9f5dc
if_equal 3, .L30L40
if_equal 4, .L30L40
if_equal 5, .L50L60
if_equal 6, .L50L60
if_equal 7, .L70L80
if_equal 8, .L70L80
if_equal 9, .L90L100
if_equal 10, .L90L100
applymovement $2, MovementData_0x9e57a
jump Script_PlayerEntersBattleRoom
jump .EnterBattleRoom
Script_WalkToBattleRoomL30L40: ; 0x9f603
.L30L40: ; 0x9f603
applymovement $2, MovementData_0x9e57c
jump Script_PlayerEntersBattleRoom
jump .EnterBattleRoom
Script_WalkToBattleRoomL50L60: ; 0x9f60a
.L50L60: ; 0x9f60a
applymovement $2, MovementData_0x9e586
jump Script_PlayerEntersBattleRoom
jump .EnterBattleRoom
Script_WalkToBattleRoomL70L80: ; 0x9f611
.L70L80: ; 0x9f611
applymovement $2, MovementData_0x9e584
jump Script_PlayerEntersBattleRoom
jump .EnterBattleRoom
Script_WalkToBattleRoomL90L100: ; 0x9f618
.L90L100: ; 0x9f618
applymovement $2, MovementData_0x9e582
jump Script_PlayerEntersBattleRoom
jump .EnterBattleRoom
Script_PlayerEntersBattleRoom: ; 0x9f61f
.EnterBattleRoom: ; 0x9f61f
faceperson PLAYER, $2
loadfont
writetext Text_PleaseStepThisWay

View File

@@ -105,7 +105,7 @@ AcademyBlackboard:
db $80 ; flags
dn 3, 2 ; rows, columns
db 5 ; spacing
dbw BANK(.Text), .Text
dba .Text
dbw $1a, 0
.Text

View File

@@ -8,15 +8,15 @@ GoldenrodPokeCenter1F_MapScriptHeader:
NurseScript_0x60f91:
jumpstd pokecenternurse
UnknownScript_0x60f94:
GoldenrodPokeCenter1F_GSBallTriggerLeft:
writebyte BATTLE_TOWER_ACTION_0B
special BattleTowerAction
if_equal $b, UnknownScript_0x60f9e
if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end
UnknownScript_0x60f9e:
.gsball:
checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
iftrue UnknownScript_0x60fd8
iftrue .cancel
playsound SFX_EXIT_BUILDING
moveperson $3, $0, $7
disappear $3
@@ -37,18 +37,18 @@ UnknownScript_0x60f9e:
special RestartMapMusic
disappear $3
playsound SFX_EXIT_BUILDING
UnknownScript_0x60fd8:
.cancel:
end
UnknownScript_0x60fd9:
GoldenrodPokeCenter1F_GSBallTriggerRight:
writebyte BATTLE_TOWER_ACTION_0B
special BattleTowerAction
if_equal $b, UnknownScript_0x60fe3
if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end
UnknownScript_0x60fe3:
.gsball:
checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
iftrue UnknownScript_0x6101d
iftrue .cancel
playsound SFX_EXIT_BUILDING
moveperson $3, $0, $7
disappear $3
@@ -69,7 +69,7 @@ UnknownScript_0x60fe3:
special RestartMapMusic
disappear $3
playsound SFX_EXIT_BUILDING
UnknownScript_0x6101d:
.cancel:
end
GameboyKidScript_0x6101e:
@@ -810,8 +810,8 @@ GoldenrodPokeCenter1F_MapEventHeader:
.XYTriggers:
db 2
xy_trigger 0, $7, $3, $0, UnknownScript_0x60f94, $0, $0
xy_trigger 0, $7, $4, $0, UnknownScript_0x60fd9, $0, $0
xy_trigger 0, $7, $3, $0, GoldenrodPokeCenter1F_GSBallTriggerLeft, $0, $0
xy_trigger 0, $7, $4, $0, GoldenrodPokeCenter1F_GSBallTriggerRight, $0, $0
.Signposts:
db 0