diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-03 16:03:10 -0500 |
| commit | ec4c53559379f3bf7bd332905ba144e1d998f38b (patch) | |
| tree | f8ee8f2d9c8042b55edb1a4761833511ab1695b1 /scripts/rockethideout3.asm | |
| parent | c43c338a5f7d90494b7e6e67c6533288bd28117d (diff) | |
| parent | 5d9d26bd5c64a5b11021bdd46e2e0786ddef888d (diff) | |
Merge pull request #98 from dannye/master
Renaming and clean up
Diffstat (limited to 'scripts/rockethideout3.asm')
| -rwxr-xr-x | scripts/rockethideout3.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm index 6dc467ab..e7a7b63b 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,24 +158,24 @@ 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 RocketHideout3Text1: ; 4531b (11:531b) - db $08 ; asm + TX_ASM ld hl, RocketHideout3TrainerHeader0 call TalkToTrainer jp TextScriptEnd @@ -193,7 +193,7 @@ RocketHideout3AfterBattleTxt2: ; 4532f (11:532f) db "@" RocketHideout3Text2: ; 45334 (11:5334) - db $08 ; asm + TX_ASM ld hl, RocketHideout3TrainerHeader2 call TalkToTrainer jp TextScriptEnd |