summaryrefslogtreecommitdiff
path: root/scripts/rockethideout2.asm
diff options
context:
space:
mode:
authorDaniel Harding <corrnondacqb@yahoo.com>2015-07-03 16:03:10 -0500
committerDaniel Harding <corrnondacqb@yahoo.com>2015-07-03 16:03:10 -0500
commitec4c53559379f3bf7bd332905ba144e1d998f38b (patch)
treef8ee8f2d9c8042b55edb1a4761833511ab1695b1 /scripts/rockethideout2.asm
parentc43c338a5f7d90494b7e6e67c6533288bd28117d (diff)
parent5d9d26bd5c64a5b11021bdd46e2e0786ddef888d (diff)
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'scripts/rockethideout2.asm')
-rwxr-xr-xscripts/rockethideout2.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm
index 99754658..04e2c5d3 100755
--- a/scripts/rockethideout2.asm
+++ b/scripts/rockethideout2.asm
@@ -321,17 +321,17 @@ LoadSpinnerArrowTiles: ; 44fd7 (11:4fd7)
ld a, [wSpriteStateData1 + 2]
srl a
srl a
- ld hl, SpinnerPlayerFacingDirections ; $5083
+ ld hl, SpinnerPlayerFacingDirections
ld c, a
ld b, $0
add hl, bc
ld a, [hl]
ld [wSpriteStateData1 + 2], a
- ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
+ ld a, [W_CURMAPTILESET]
cp FACILITY
- ld hl, FacilitySpinnerArrows ; $5023
+ ld hl, FacilitySpinnerArrows
jr z, .asm_44ff6
- ld hl, GymSpinnerArrows ; $5053
+ ld hl, GymSpinnerArrows
.asm_44ff6
ld a, [wSimulatedJoypadStatesIndex]
bit 0, a
@@ -429,15 +429,15 @@ RocketHideout2TrainerHeader0: ; 450d1 (11:50d1)
db $1 ; flag's bit
db ($4 << 4) ; trainer's view range
dw wd817 ; flag's byte
- dw RocketHideout2BattleText2 ; 0x50e8 TextBeforeBattle
- dw RocketHideout2AfterBattleTxt2 ; 0x50f2 TextAfterBattle
- dw RocketHideout2EndBattleText2 ; 0x50ed TextEndBattle
- dw RocketHideout2EndBattleText2 ; 0x50ed TextEndBattle
+ dw RocketHideout2BattleText2 ; TextBeforeBattle
+ dw RocketHideout2AfterBattleTxt2 ; TextAfterBattle
+ dw RocketHideout2EndBattleText2 ; TextEndBattle
+ dw RocketHideout2EndBattleText2 ; TextEndBattle
db $ff
RocketHideout2Text1: ; 450de (11:50de)
- db $08 ; asm
+ TX_ASM
ld hl, RocketHideout2TrainerHeader0
call TalkToTrainer
jp TextScriptEnd