summaryrefslogtreecommitdiff
path: root/scripts/rockethideout3.asm
diff options
context:
space:
mode:
authorU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-07-03 14:38:12 -0500
committerU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-07-03 14:38:12 -0500
commitf4a31b3e0b7ca89e14c4e3836f3d3ad15f38e5ce (patch)
treec5eb931244f739bd3a88d488586923b2a0762b74 /scripts/rockethideout3.asm
parentcd649184f556db777d592671a7274bfa4a8423d7 (diff)
Rename/organize part 2 of 4
rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github
Diffstat (limited to 'scripts/rockethideout3.asm')
-rwxr-xr-xscripts/rockethideout3.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm
index 6dc467ab..f94438e9 100755
--- a/scripts/rockethideout3.asm
+++ b/scripts/rockethideout3.asm
@@ -135,7 +135,7 @@ RocketHideout3ArrowMovement12: ; 452e1 (11:52e1)
db $40,$01
db $FF
-RocketHideout3Script3 ; 452e4 (11:452e4)
+RocketHideout3Script3: ; 452e4 (11:452e4)
ld a, [wSimulatedJoypadStatesIndex]
and a
jp nz, LoadSpinnerArrowTiles
@@ -158,19 +158,19 @@ RocketHideout3TrainerHeader0: ; 45302 (11:5302)
db $1 ; flag's bit
db ($2 << 4) ; trainer's view range
dw wd819 ; flag's byte
- dw RocketHideout3BattleText2 ; 0x5325 TextBeforeBattle
- dw RocketHideout3AfterBattleTxt2 ; 0x532f TextAfterBattle
- dw RocketHideout3EndBattleText2 ; 0x532a TextEndBattle
- dw RocketHideout3EndBattleText2 ; 0x532a TextEndBattle
+ dw RocketHideout3BattleText2 ; TextBeforeBattle
+ dw RocketHideout3AfterBattleTxt2 ; TextAfterBattle
+ dw RocketHideout3EndBattleText2 ; TextEndBattle
+ dw RocketHideout3EndBattleText2 ; TextEndBattle
RocketHideout3TrainerHeader2: ; 4530e (11:530e)
db $2 ; flag's bit
db ($4 << 4) ; trainer's view range
dw wd819 ; flag's byte
- dw RocketHideout3BattleTxt ; 0x533e TextBeforeBattle
- dw RocketHideout3AfterBattleText3 ; 0x5348 TextAfterBattle
- dw RocketHideout3EndBattleText3 ; 0x5343 TextEndBattle
- dw RocketHideout3EndBattleText3 ; 0x5343 TextEndBattle
+ dw RocketHideout3BattleTxt ; TextBeforeBattle
+ dw RocketHideout3AfterBattleText3 ; TextAfterBattle
+ dw RocketHideout3EndBattleText3 ; TextEndBattle
+ dw RocketHideout3EndBattleText3 ; TextEndBattle
db $ff