diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-07-20 00:40:04 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-07-20 00:40:04 -0500 |
| commit | 70dde9d96b0e3025c72ae29783e94c56fa5cbe1c (patch) | |
| tree | ade46ab5d1d16300ab18f82e7727015b0b4e3ac7 /scripts/rockethideout3.asm | |
| parent | 25c27785aa83a12330ea58e1e35b2fec90dd84f4 (diff) | |
Clean up redundant labels
fix trainer header numbering
Diffstat (limited to 'scripts/rockethideout3.asm')
| -rwxr-xr-x | scripts/rockethideout3.asm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm index ac08e868..00a61568 100755 --- a/scripts/rockethideout3.asm +++ b/scripts/rockethideout3.asm @@ -1,6 +1,6 @@ RocketHideout3Script: call EnableAutoTextBoxDrawing - ld hl, RocketHideout3TrainerHeaders + ld hl, RocketHideout3TrainerHeader0 ld de, RocketHideout3ScriptPointers ld a, [wRocketHideout3CurScript] call ExecuteCurMapScriptInTable @@ -149,7 +149,6 @@ RocketHideout3TextPointers: dw PickUpItemText dw PickUpItemText -RocketHideout3TrainerHeaders: RocketHideout3TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -159,10 +158,10 @@ RocketHideout3TrainerHeader0: dw RocketHideout3EndBattleText2 ; TextEndBattle dw RocketHideout3EndBattleText2 ; TextEndBattle -RocketHideout3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2 +RocketHideout3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_3_TRAINER_1 dw RocketHideout3BattleTxt ; TextBeforeBattle dw RocketHideout3AfterBattleText3 ; TextAfterBattle dw RocketHideout3EndBattleText3 ; TextEndBattle @@ -190,7 +189,7 @@ RocketHideout3AfterBattleTxt2: RocketHideout3Text2: TX_ASM - ld hl, RocketHideout3TrainerHeader2 + ld hl, RocketHideout3TrainerHeader1 call TalkToTrainer jp TextScriptEnd |