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/silphco7.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/SilphCo7F.asm (renamed from scripts/silphco7.asm) | 41 |
1 files changed, 20 insertions, 21 deletions
diff --git a/scripts/silphco7.asm b/scripts/SilphCo7F.asm index 2e93d92a..a8dc032d 100755 --- a/scripts/silphco7.asm +++ b/scripts/SilphCo7F.asm @@ -1,11 +1,11 @@ -SilphCo7Script: +SilphCo7F_Script: call SilphCo7Script_51b77 call EnableAutoTextBoxDrawing - ld hl, SilphCo7TrainerHeaders - ld de, SilphCo7ScriptPointers - ld a, [wSilphCo7CurScript] + ld hl, SilphCo7TrainerHeader0 + ld de, SilphCo7F_ScriptPointers + ld a, [wSilphCo7FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo7CurScript], a + ld [wSilphCo7FCurScript], a ret SilphCo7Script_51b77: @@ -106,11 +106,11 @@ SilphCo7Text_51c0c: ld [wJoyIgnore], a SilphCo7Text_51c10: - ld [wSilphCo7CurScript], a + ld [wSilphCo7FCurScript], a ld [wCurMapScript], a ret -SilphCo7ScriptPointers: +SilphCo7F_ScriptPointers: dw SilphCo7Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -248,7 +248,7 @@ SilphCo7Script5: ld [wJoyIgnore], a jp SilphCo7Text_51c10 -SilphCo7TextPointers: +SilphCo7F_TextPointers: dw SilphCo7Text1 dw SilphCo7Text2 dw SilphCo7Text3 @@ -265,7 +265,6 @@ SilphCo7TextPointers: dw SilphCo7Text14 dw SilphCo7Text15 -SilphCo7TrainerHeaders: SilphCo7TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -275,28 +274,28 @@ SilphCo7TrainerHeader0: dw SilphCo7EndBattleText1 ; TextEndBattle dw SilphCo7EndBattleText1 ; TextEndBattle -SilphCo7TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_2 +SilphCo7TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_1 dw SilphCo7BattleText2 ; TextBeforeBattle dw SilphCo7AfterBattleText2 ; TextAfterBattle dw SilphCo7EndBattleText2 ; TextEndBattle dw SilphCo7EndBattleText2 ; TextEndBattle -SilphCo7TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_3 +SilphCo7TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_2 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_2 dw SilphCo7BattleText3 ; TextBeforeBattle dw SilphCo7AfterBattleText3 ; TextAfterBattle dw SilphCo7EndBattleText3 ; TextEndBattle dw SilphCo7EndBattleText3 ; TextEndBattle -SilphCo7TrainerHeader4: - dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_4, 1 +SilphCo7TrainerHeader3: + dbEventFlagBit EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_4, 1 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_7F_TRAINER_3, 1 dw SilphCo7BattleText4 ; TextBeforeBattle dw SilphCo7AfterBattleText4 ; TextAfterBattle dw SilphCo7EndBattleText4 ; TextEndBattle @@ -435,7 +434,7 @@ SilphCo7AfterBattleText1: SilphCo7Text6: TX_ASM - ld hl, SilphCo7TrainerHeader2 + ld hl, SilphCo7TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -453,7 +452,7 @@ SilphCo7AfterBattleText2: SilphCo7Text7: TX_ASM - ld hl, SilphCo7TrainerHeader3 + ld hl, SilphCo7TrainerHeader2 call TalkToTrainer jp TextScriptEnd @@ -471,7 +470,7 @@ SilphCo7AfterBattleText3: SilphCo7Text8: TX_ASM - ld hl, SilphCo7TrainerHeader4 + ld hl, SilphCo7TrainerHeader3 call TalkToTrainer jp TextScriptEnd |