diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /scripts/mtmoon1.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | scripts/MtMoon1F.asm (renamed from scripts/mtmoon1.asm) | 61 |
1 files changed, 30 insertions, 31 deletions
diff --git a/scripts/mtmoon1.asm b/scripts/MtMoon1F.asm index 604e490a..cb120420 100755 --- a/scripts/mtmoon1.asm +++ b/scripts/MtMoon1F.asm @@ -1,18 +1,18 @@ -MtMoon1Script: +MtMoon1F_Script: call EnableAutoTextBoxDrawing ld hl, MtMoon1TrainerHeader0 - ld de, MtMoon1ScriptPointers - ld a, [wMtMoon1CurScript] + ld de, MtMoon1F_ScriptPointers + ld a, [wMtMoon1FCurScript] call ExecuteCurMapScriptInTable - ld [wMtMoon1CurScript], a + ld [wMtMoon1FCurScript], a ret -MtMoon1ScriptPointers: +MtMoon1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -MtMoon1TextPointers: +MtMoon1F_TextPointers: dw MtMoon1Text1 dw MtMoon1Text2 dw MtMoon1Text3 @@ -28,7 +28,6 @@ MtMoon1TextPointers: dw PickUpItemText dw MtMoon1Text14 -MtMoon1TrainerHeaders: MtMoon1TrainerHeader0: dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -38,55 +37,55 @@ MtMoon1TrainerHeader0: dw MtMoon1EndBattleText2 ; TextEndBattle dw MtMoon1EndBattleText2 ; TextEndBattle -MtMoon1TrainerHeader2: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_2 +MtMoon1TrainerHeader1: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_1 dw MtMoon1BattleText3 ; TextBeforeBattle dw MtMoon1AfterBattleText3 ; TextAfterBattle dw MtMoon1EndBattleText3 ; TextEndBattle dw MtMoon1EndBattleText3 ; TextEndBattle -MtMoon1TrainerHeader3: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_3 +MtMoon1TrainerHeader2: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_2 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_2 dw MtMoon1BattleText4 ; TextBeforeBattle dw MtMoon1AfterBattleText4 ; TextAfterBattle dw MtMoon1EndBattleText4 ; TextEndBattle dw MtMoon1EndBattleText4 ; TextEndBattle -MtMoon1TrainerHeader4: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_4 +MtMoon1TrainerHeader3: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_3 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_3 dw MtMoon1BattleText5 ; TextBeforeBattle dw MtMoon1AfterBattleText5 ; TextAfterBattle dw MtMoon1EndBattleText5 ; TextEndBattle dw MtMoon1EndBattleText5 ; TextEndBattle -MtMoon1TrainerHeader5: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_5 +MtMoon1TrainerHeader4: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_4 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_5 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_4 dw MtMoon1BattleText6 ; TextBeforeBattle dw MtMoon1AfterBattleText6 ; TextAfterBattle dw MtMoon1EndBattleText6 ; TextEndBattle dw MtMoon1EndBattleText6 ; TextEndBattle -MtMoon1TrainerHeader6: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_6 +MtMoon1TrainerHeader5: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_5 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_6 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_5 dw MtMoon1BattleText7 ; TextBeforeBattle dw MtMoon1AfterBattleText7 ; TextAfterBattle dw MtMoon1EndBattleText7 ; TextEndBattle dw MtMoon1EndBattleText7 ; TextEndBattle -MtMoon1TrainerHeader7: - dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_7 +MtMoon1TrainerHeader6: + dbEventFlagBit EVENT_BEAT_MT_MOON_1_TRAINER_6 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_7 + dwEventFlagAddress EVENT_BEAT_MT_MOON_1_TRAINER_6 dw MtMoon1BattleText8 ; TextBeforeBattle dw MtMoon1AfterBattleText8 ; TextAfterBattle dw MtMoon1EndBattleText8 ; TextEndBattle @@ -101,32 +100,32 @@ MtMoon1Text1: MtMoon1Text2: TX_ASM - ld hl, MtMoon1TrainerHeader2 + ld hl, MtMoon1TrainerHeader1 jr MtMoon1TalkToTrainer MtMoon1Text3: TX_ASM - ld hl, MtMoon1TrainerHeader3 + ld hl, MtMoon1TrainerHeader2 jr MtMoon1TalkToTrainer MtMoon1Text4: TX_ASM - ld hl, MtMoon1TrainerHeader4 + ld hl, MtMoon1TrainerHeader3 jr MtMoon1TalkToTrainer MtMoon1Text5: TX_ASM - ld hl, MtMoon1TrainerHeader5 + ld hl, MtMoon1TrainerHeader4 jr MtMoon1TalkToTrainer MtMoon1Text6: TX_ASM - ld hl, MtMoon1TrainerHeader6 + ld hl, MtMoon1TrainerHeader5 jr MtMoon1TalkToTrainer MtMoon1Text7: TX_ASM - ld hl, MtMoon1TrainerHeader7 + ld hl, MtMoon1TrainerHeader6 MtMoon1TalkToTrainer: call TalkToTrainer jp TextScriptEnd |