diff options
| author | Daniel Harding <33dannye@gmail.com> | 2019-01-13 22:38:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-13 22:38:16 -0600 |
| commit | 725b86ebbec23bd1f53fd60bf0201c904fee951d (patch) | |
| tree | a37f4d33c5b77635c7ff72b91a73fcd90c4af915 /scripts/SilphCo8F.asm | |
| parent | Merge pull request #195 from Rangi42/master (diff) | |
| parent | Rename map files, labels, and constants to be consistent and work with Polish... (diff) | |
| download | pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.gz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.tar.xz pokeyellow-725b86ebbec23bd1f53fd60bf0201c904fee951d.zip | |
Merge pull request #196 from Rangi42/polishedmaps
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
| -rwxr-xr-x | scripts/SilphCo8F.asm (renamed from scripts/silphco8.asm) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/silphco8.asm b/scripts/SilphCo8F.asm index 498fd569..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,12 +70,12 @@ 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 |