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/silphco11.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/SilphCo11F.asm (renamed from scripts/silphco11.asm) | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/scripts/silphco11.asm b/scripts/SilphCo11F.asm index cb922453..e58dbebe 100755 --- a/scripts/silphco11.asm +++ b/scripts/SilphCo11F.asm @@ -1,11 +1,11 @@ -SilphCo11Script: +SilphCo11F_Script: call SilphCo11Script_62127 call EnableAutoTextBoxDrawing - ld hl, SilphCo11TrainerHeaders - ld de, SilphCo11ScriptPointers - ld a, [wSilphCo11CurScript] + ld hl, SilphCo11TrainerHeader0 + ld de, SilphCo11F_ScriptPointers + ld a, [wSilphCo11FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo11CurScript], a + ld [wSilphCo11FCurScript], a ret SilphCo11Script_62127: @@ -75,11 +75,11 @@ SilphCo11Script_62185: xor a ld [wJoyIgnore], a SilphCo11Script_62189: - ld [wSilphCo11CurScript], a + ld [wSilphCo11FCurScript], a ld [wCurMapScript], a ret -SilphCo11ScriptPointers: +SilphCo11F_ScriptPointers: dw SilphCo11Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -463,7 +463,7 @@ SilphCo11Script_6246d: predef HideObject ret -SilphCo11TextPointers: +SilphCo11F_TextPointers: dw SilphCo11Text1 dw SilphCo11Text2 dw SilphCo11Text3 @@ -475,7 +475,6 @@ SilphCo11TextPointers: dw SilphCo11Text9 dw SilphCo11Text10 -SilphCo11TrainerHeaders: SilphCo11TrainerHeader0: dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_1 db ($3 << 4) |