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/silphco5.asm | |
| parent | 25c27785aa83a12330ea58e1e35b2fec90dd84f4 (diff) | |
Clean up redundant labels
fix trainer header numbering
Diffstat (limited to 'scripts/silphco5.asm')
| -rwxr-xr-x | scripts/silphco5.asm | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/scripts/silphco5.asm b/scripts/silphco5.asm index 42577498..45a81b68 100755 --- a/scripts/silphco5.asm +++ b/scripts/silphco5.asm @@ -1,7 +1,7 @@ SilphCo5Script: call SilphCo5Script_19f4d call EnableAutoTextBoxDrawing - ld hl, SilphCo5TrainerHeaders + ld hl, SilphCo5TrainerHeader0 ld de, SilphCo5ScriptPointers ld a, [wSilphCo5CurScript] call ExecuteCurMapScriptInTable @@ -83,8 +83,7 @@ SilphCo5TextPointers: dw SilphCo5Text10 dw SilphCo5Text11 -SilphCo5TrainerHeaders: -Silphco5TrainerHeader0: +SilphCo5TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_0 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_0 @@ -93,28 +92,28 @@ Silphco5TrainerHeader0: dw SilphCo5EndBattleText2 ; TextEndBattle dw SilphCo5EndBattleText2 ; TextEndBattle -Silphco5TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2 +SilphCo5TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_1 dw SilphCo5BattleText3 ; TextBeforeBattle dw SilphCo5AfterBattleText3 ; TextAfterBattle dw SilphCo5EndBattleText3 ; TextEndBattle dw SilphCo5EndBattleText3 ; TextEndBattle -Silphco5TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3 +SilphCo5TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2 dw SilphCo5BattleText4 ; TextBeforeBattle dw SilphCo5AfterBattleText4 ; TextAfterBattle dw SilphCo5EndBattleText4 ; TextEndBattle dw SilphCo5EndBattleText4 ; TextEndBattle -Silphco5TrainerHeader4: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_4 +SilphCo5TrainerHeader3: + dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3 dw SilphCo5BattleText5 ; TextBeforeBattle dw SilphCo5AfterBattleText5 ; TextAfterBattle dw SilphCo5EndBattleText5 ; TextEndBattle @@ -139,7 +138,7 @@ SilphCo5Text_1a015: SilphCo5Text2: TX_ASM - ld hl, Silphco5TrainerHeader0 + ld hl, SilphCo5TrainerHeader0 call TalkToTrainer jp TextScriptEnd @@ -157,7 +156,7 @@ SilphCo5AfterBattleText2: SilphCo5Text3: TX_ASM - ld hl, Silphco5TrainerHeader2 + ld hl, SilphCo5TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -175,7 +174,7 @@ SilphCo5AfterBattleText3: SilphCo5Text4: TX_ASM - ld hl, Silphco5TrainerHeader3 + ld hl, SilphCo5TrainerHeader2 call TalkToTrainer jp TextScriptEnd @@ -193,7 +192,7 @@ SilphCo5AfterBattleText4: SilphCo5Text5: TX_ASM - ld hl, Silphco5TrainerHeader4 + ld hl, SilphCo5TrainerHeader3 call TalkToTrainer jp TextScriptEnd |