diff options
| author | einstein95 <einstein95@users.noreply.github.com> | 2016-12-27 11:57:05 +1300 |
|---|---|---|
| committer | einstein95 <einstein95@users.noreply.github.com> | 2016-12-27 11:57:05 +1300 |
| commit | f73893db566c67ee9e1b4b6b309853503351d8ca (patch) | |
| tree | 6b420d9e1ab47f11bf6240b48d237c810f4b6aa1 /scripts/mtmoon3.asm | |
| parent | fde4f79b3ba6a6653b91801e26865155b89a6be0 (diff) | |
Update to latest pokered
Diffstat (limited to 'scripts/mtmoon3.asm')
| -rwxr-xr-x | scripts/mtmoon3.asm | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index de36db4f..60cd1ab8 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -166,7 +166,6 @@ MtMoon3TextPointers: dw PickUpItemText dw MtMoon3Text_49f99 -MtMoon3TrainerHeaders: MtMoon3TrainerHeader0: dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_0 db ($4 << 4) ; trainer's view range @@ -176,28 +175,28 @@ MtMoon3TrainerHeader0: dw MtMoon3EndBattleText2 ; TextEndBattle dw MtMoon3EndBattleText2 ; TextEndBattle -MtMoon3TrainerHeader2: - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_2 +MtMoon3TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_1 dw MtMoon3BattleText3 ; TextBeforeBattle dw MtMoon3AfterBattleText3 ; TextAfterBattle dw MtMoon3EndBattleText3 ; TextEndBattle dw MtMoon3EndBattleText3 ; TextEndBattle -MtMoon3TrainerHeader3: - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_3 +MtMoon3TrainerHeader2: + dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_2 dw MtMoon3BattleText4 ; TextBeforeBattle dw MtMoon3AfterBattleText4 ; TextAfterBattle dw MtMoon3EndBattleText4 ; TextEndBattle dw MtMoon3EndBattleText4 ; TextEndBattle -MtMoon3TrainerHeader4: - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_4 +MtMoon3TrainerHeader3: + dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_3 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_3 dw MtMoon3BattleText5 ; TextBeforeBattle dw MtMoon3AfterBattleText5 ; TextAfterBattle dw MtMoon3EndBattleText5 ; TextEndBattle @@ -245,19 +244,19 @@ MtMoon3Text2: MtMoon3Text3: TX_ASM - ld hl, MtMoon3TrainerHeader2 + ld hl, MtMoon3TrainerHeader1 call TalkToTrainer jp TextScriptEnd MtMoon3Text4: TX_ASM - ld hl, MtMoon3TrainerHeader3 + ld hl, MtMoon3TrainerHeader2 call TalkToTrainer jp TextScriptEnd MtMoon3Text5: TX_ASM - ld hl, MtMoon3TrainerHeader4 + ld hl, MtMoon3TrainerHeader3 call TalkToTrainer jp TextScriptEnd |