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/silphco8.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/SilphCo8F.asm (renamed from scripts/silphco8.asm) | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/scripts/silphco8.asm b/scripts/SilphCo8F.asm index 399f7bd5..ce6579f7 100755 --- a/scripts/silphco8.asm +++ b/scripts/SilphCo8F.asm @@ -1,11 +1,11 @@ -SilphCo8Script: +SilphCo8F_Script: call SilphCo8Script_5651a call EnableAutoTextBoxDrawing ld hl, SilphCo8TrainerHeader0 - ld de, SilphCo8ScriptPointers - ld a, [wSilphCo8CurScript] + ld de, SilphCo8F_ScriptPointers + ld a, [wSilphCo8FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo8CurScript], a + ld [wSilphCo8FCurScript], a ret SilphCo8Script_5651a: @@ -70,18 +70,17 @@ SilphCo8Script_5656d: SetEvent EVENT_SILPH_CO_8_UNLOCKED_DOOR ret -SilphCo8ScriptPointers: +SilphCo8F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo8TextPointers: +SilphCo8F_TextPointers: dw SilphCo8Text1 dw SilphCo8Text2 dw SilphCo8Text3 dw SilphCo8Text4 -SilphCo8TrainerHeaders: SilphCo8TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_8F_TRAINER_0 db ($4 << 4) ; trainer's view range |