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/SilphCo5F.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/SilphCo5F.asm (renamed from scripts/silphco5.asm) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/silphco5.asm b/scripts/SilphCo5F.asm index 45a81b68..d9deda5b 100755 --- a/scripts/silphco5.asm +++ b/scripts/SilphCo5F.asm @@ -1,11 +1,11 @@ -SilphCo5Script: +SilphCo5F_Script: call SilphCo5Script_19f4d call EnableAutoTextBoxDrawing ld hl, SilphCo5TrainerHeader0 - ld de, SilphCo5ScriptPointers - ld a, [wSilphCo5CurScript] + 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 |