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/mansion3.asm | |
| parent | 25c27785aa83a12330ea58e1e35b2fec90dd84f4 (diff) | |
Clean up redundant labels
fix trainer header numbering
Diffstat (limited to 'scripts/mansion3.asm')
| -rwxr-xr-x | scripts/mansion3.asm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/mansion3.asm b/scripts/mansion3.asm index afb46671..abe76df8 100755 --- a/scripts/mansion3.asm +++ b/scripts/mansion3.asm @@ -90,7 +90,6 @@ Mansion3TextPointers: dw Mansion3Text5 dw Mansion3Text6 -Mansion3TrainerHeaders: Mansion3TrainerHeader0: dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_0 db ($0 << 4) ; trainer's view range @@ -100,10 +99,10 @@ Mansion3TrainerHeader0: dw Mansion3EndBattleText1 ; TextEndBattle dw Mansion3EndBattleText1 ; TextEndBattle -Mansion3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_2 +Mansion3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MANSION_3_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_MANSION_3_TRAINER_1 dw Mansion3BattleText2 ; TextBeforeBattle dw Mansion3AfterBattleText2 ; TextAfterBattle dw Mansion3EndBattleText2 ; TextEndBattle @@ -119,7 +118,7 @@ Mansion3Text1: Mansion3Text2: TX_ASM - ld hl, Mansion3TrainerHeader2 + ld hl, Mansion3TrainerHeader1 call TalkToTrainer jp TextScriptEnd |