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/silphco5.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/SilphCo5F.asm (renamed from scripts/silphco5.asm) | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/scripts/silphco5.asm b/scripts/SilphCo5F.asm index 42577498..d9deda5b 100755 --- a/scripts/silphco5.asm +++ b/scripts/SilphCo5F.asm @@ -1,11 +1,11 @@ -SilphCo5Script: +SilphCo5F_Script: call SilphCo5Script_19f4d call EnableAutoTextBoxDrawing - ld hl, SilphCo5TrainerHeaders - ld de, SilphCo5ScriptPointers - ld a, [wSilphCo5CurScript] + ld hl, SilphCo5TrainerHeader0 + ld de, SilphCo5F_ScriptPointers + ld a, [wSilphCo5FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo5CurScript], a + ld [wSilphCo5FCurScript], a ret SilphCo5Script_19f4d: @@ -65,12 +65,12 @@ SilphCo5Script_19f9e: SetEventAfterBranchReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR3, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 ret -SilphCo5ScriptPointers: +SilphCo5F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo5TextPointers: +SilphCo5F_TextPointers: dw SilphCo5Text1 dw SilphCo5Text2 dw SilphCo5Text3 @@ -83,8 +83,7 @@ SilphCo5TextPointers: dw SilphCo5Text10 dw SilphCo5Text11 -SilphCo5TrainerHeaders: -Silphco5TrainerHeader0: +SilphCo5TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_0 db ($1 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_0 @@ -93,28 +92,28 @@ Silphco5TrainerHeader0: dw SilphCo5EndBattleText2 ; TextEndBattle dw SilphCo5EndBattleText2 ; TextEndBattle -Silphco5TrainerHeader2: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2 +SilphCo5TrainerHeader1: + dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_1 db ($2 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_1 dw SilphCo5BattleText3 ; TextBeforeBattle dw SilphCo5AfterBattleText3 ; TextAfterBattle dw SilphCo5EndBattleText3 ; TextEndBattle dw SilphCo5EndBattleText3 ; TextEndBattle -Silphco5TrainerHeader3: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3 +SilphCo5TrainerHeader2: + dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_2 db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_2 dw SilphCo5BattleText4 ; TextBeforeBattle dw SilphCo5AfterBattleText4 ; TextAfterBattle dw SilphCo5EndBattleText4 ; TextEndBattle dw SilphCo5EndBattleText4 ; TextEndBattle -Silphco5TrainerHeader4: - dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_4 +SilphCo5TrainerHeader3: + dbEventFlagBit EVENT_BEAT_SILPH_CO_5F_TRAINER_3 db ($3 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_4 + dwEventFlagAddress EVENT_BEAT_SILPH_CO_5F_TRAINER_3 dw SilphCo5BattleText5 ; TextBeforeBattle dw SilphCo5AfterBattleText5 ; TextAfterBattle dw SilphCo5EndBattleText5 ; TextEndBattle @@ -139,7 +138,7 @@ SilphCo5Text_1a015: SilphCo5Text2: TX_ASM - ld hl, Silphco5TrainerHeader0 + ld hl, SilphCo5TrainerHeader0 call TalkToTrainer jp TextScriptEnd @@ -157,7 +156,7 @@ SilphCo5AfterBattleText2: SilphCo5Text3: TX_ASM - ld hl, Silphco5TrainerHeader2 + ld hl, SilphCo5TrainerHeader1 call TalkToTrainer jp TextScriptEnd @@ -175,7 +174,7 @@ SilphCo5AfterBattleText3: SilphCo5Text4: TX_ASM - ld hl, Silphco5TrainerHeader3 + ld hl, SilphCo5TrainerHeader2 call TalkToTrainer jp TextScriptEnd @@ -193,7 +192,7 @@ SilphCo5AfterBattleText4: SilphCo5Text5: TX_ASM - ld hl, Silphco5TrainerHeader4 + ld hl, SilphCo5TrainerHeader3 call TalkToTrainer jp TextScriptEnd |