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/SilphCo2F.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/SilphCo2F.asm (renamed from scripts/silphco2.asm) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/silphco2.asm b/scripts/SilphCo2F.asm index e77c45dd..5fd542cb 100755 --- a/scripts/silphco2.asm +++ b/scripts/SilphCo2F.asm @@ -1,11 +1,11 @@ -SilphCo2Script: +SilphCo2F_Script: call SilphCo2Script_59d07 call EnableAutoTextBoxDrawing ld hl, SilphCo2TrainerHeader0 - ld de, SilphCo2ScriptPointers - ld a, [wSilphCo2CurScript] + ld de, SilphCo2F_ScriptPointers + ld a, [wSilphCo2FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo2CurScript], a + ld [wSilphCo2FCurScript], a ret SilphCo2Script_59d07: @@ -86,12 +86,12 @@ SilphCo2Script_59d6f: SetEventAfterBranchReuseHL EVENT_SILPH_CO_2_UNLOCKED_DOOR2, EVENT_SILPH_CO_2_UNLOCKED_DOOR1 ret -SilphCo2ScriptPointers: +SilphCo2F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo2TextPointers: +SilphCo2F_TextPointers: dw SilphCo2Text1 dw SilphCo2Text2 dw SilphCo2Text3 |