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/rockethideout1.asm | |
| parent | 25c27785aa83a12330ea58e1e35b2fec90dd84f4 (diff) | |
Clean up redundant labels
fix trainer header numbering
Diffstat (limited to 'scripts/rockethideout1.asm')
| -rwxr-xr-x | scripts/rockethideout1.asm | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/scripts/rockethideout1.asm b/scripts/rockethideout1.asm index 6aa7c813..88b3a7e9 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/rockethideout1.asm @@ -1,7 +1,7 @@ RocketHideout1Script: call RocketHideout1Script_44be0 call EnableAutoTextBoxDrawing - ld hl, RocketHideout1TrainerHeaders + ld hl, RocketHideout1TrainerHeader0 ld de, RocketHideout1ScriptPointers ld a, [wRocketHideout1CurScript] call ExecuteCurMapScriptInTable @@ -15,7 +15,7 @@ RocketHideout1Script_44be0: ret z CheckEvent EVENT_677 jr nz, .asm_44c01 - CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 + CheckEventReuseA EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 jr nz, .asm_44bf7 ld a, $54 jr .asm_44c03 @@ -44,7 +44,6 @@ RocketHideout1TextPointers: dw PickUpItemText dw PickUpItemText -RocketHideout1TrainerHeaders: RocketHideout1TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0 db ($3 << 4) ; trainer's view range @@ -54,37 +53,37 @@ RocketHideout1TrainerHeader0: dw RocketHideout1EndBattleText2 ; TextEndBattle dw RocketHideout1EndBattleText2 ; TextEndBattle -RocketHideout1TrainerHeader2: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 +RocketHideout1TrainerHeader1: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_1 dw RocketHideout1BattleText3 ; TextBeforeBattle dw RocketHideout1AfterBattleTxt3 ; TextAfterBattle dw RocketHideout1EndBattleText3 ; TextEndBattle dw RocketHideout1EndBattleText3 ; TextEndBattle -RocketHideout1TrainerHeader3: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 +RocketHideout1TrainerHeader2: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_2 dw RocketHideout1BattleText4 ; TextBeforeBattle dw RocketHideout1AfterBattleTxt4 ; TextAfterBattle dw RocketHideout1EndBattleText4 ; TextEndBattle dw RocketHideout1EndBattleText4 ; TextEndBattle -RocketHideout1TrainerHeader4: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 +RocketHideout1TrainerHeader3: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_3 dw RocketHideout1BattleText5 ; TextBeforeBattle dw RocketHideout1AfterBattleTxt5 ; TextAfterBattle dw RocketHideout1EndBattleText5 ; TextEndBattle dw RocketHideout1EndBattleText5 ; TextEndBattle -RocketHideout1TrainerHeader5: - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 +RocketHideout1TrainerHeader4: + dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 dw RocketHideout1BattleText6 ; TextBeforeBattle dw RocketHideout1AfterBattleTxt6 ; TextAfterBattle dw RocketHideout1EndBattleText6 ; TextEndBattle @@ -100,32 +99,32 @@ RocketHideout1Text1: RocketHideout1Text2: TX_ASM - ld hl, RocketHideout1TrainerHeader2 + ld hl, RocketHideout1TrainerHeader1 call TalkToTrainer jp TextScriptEnd RocketHideout1Text3: TX_ASM - ld hl, RocketHideout1TrainerHeader3 + ld hl, RocketHideout1TrainerHeader2 call TalkToTrainer jp TextScriptEnd RocketHideout1Text4: TX_ASM - ld hl, RocketHideout1TrainerHeader4 + ld hl, RocketHideout1TrainerHeader3 call TalkToTrainer jp TextScriptEnd RocketHideout1Text5: TX_ASM - ld hl, RocketHideout1TrainerHeader5 + ld hl, RocketHideout1TrainerHeader4 call TalkToTrainer jp TextScriptEnd RocketHideout1EndBattleText6: TX_FAR _RocketHideout1EndBattleText6 TX_ASM - SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_5 + SetEvent EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_4 ld hl, RocketHideout1Text_44c9f ret |