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/silphco6.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/SilphCo6F.asm (renamed from scripts/silphco6.asm) | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/scripts/silphco6.asm b/scripts/SilphCo6F.asm index c40c7d70..ddbcba79 100755 --- a/scripts/silphco6.asm +++ b/scripts/SilphCo6F.asm @@ -1,11 +1,11 @@ -SilphCo6Script: +SilphCo6F_Script: call SilphCo6Script_1a1bf call EnableAutoTextBoxDrawing - ld hl, SilphCo6TrainerHeaders - ld de, SilphCo6ScriptPointers - ld a, [wSilphCo6CurScript] + ld hl, SilphCo6TrainerHeader0 + ld de, SilphCo6F_ScriptPointers + ld a, [wSilphCo6FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo6CurScript], a + ld [wSilphCo6FCurScript], a ret SilphCo6Script_1a1bf: @@ -34,12 +34,12 @@ SilphCo6Script_1a1e6: SetEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR ret -SilphCo6ScriptPointers: +SilphCo6F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo6TextPointers: +SilphCo6F_TextPointers: dw SilphCo6Text1 dw SilphCo6Text2 dw SilphCo6Text3 @@ -51,7 +51,6 @@ SilphCo6TextPointers: dw PickUpItemText dw PickUpItemText -SilphCo6TrainerHeaders: SilphCo6TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_0 db ($2 << 4) ; trainer's view range @@ -61,19 +60,19 @@ SilphCo6TrainerHeader0: dw SilphCo6EndBattleText2 ; TextEndBattle dw SilphCo6EndBattleText2 ; TextEndBattle -SilphCo6TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_2 +SilphCo6TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_1 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_1 dw SilphCo6BattleText3 ; TextBeforeBattle dw SilphCo6AfterBattleText3 ; TextAfterBattle dw SilphCo6EndBattleText3 ; TextEndBattle dw SilphCo6EndBattleText3 ; TextEndBattle -SilphCo6TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_3, 1 +SilphCo6TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_3, 1 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_6F_TRAINER_2, 1 dw SilphCo6BattleText4 ; TextBeforeBattle dw SilphCo6AfterBattleText4 ; TextAfterBattle dw SilphCo6EndBattleText4 ; TextEndBattle @@ -186,7 +185,7 @@ SilphCo6AfterBattleText2: SilphCo6Text7: TX_ASM - ld hl, SilphCo6TrainerHeader2 + ld hl, SilphCo6TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -204,7 +203,7 @@ SilphCo6AfterBattleText3: SilphCo6Text8: TX_ASM - ld hl, SilphCo6TrainerHeader3 + ld hl, SilphCo6TrainerHeader2 call TalkToTrainer jp TextScriptEnd |