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/SaffronGym.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/SaffronGym.asm (renamed from scripts/saffrongym.asm) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/saffrongym.asm b/scripts/SaffronGym.asm index cbf935e7..e51763e5 100755 --- a/scripts/saffrongym.asm +++ b/scripts/SaffronGym.asm @@ -1,11 +1,11 @@ -SaffronGymScript: +SaffronGym_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, .extra call EnableAutoTextBoxDrawing ld hl, SaffronGymTrainerHeader0 - ld de, SaffronGymScriptPointers + ld de, SaffronGym_ScriptPointers ld a, [wSaffronGymCurScript] call ExecuteCurMapScriptInTable ld [wSaffronGymCurScript], a @@ -29,7 +29,7 @@ SaffronGymText_5d048: ld [wCurMapScript], a ret -SaffronGymScriptPointers: +SaffronGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -70,7 +70,7 @@ SaffronGymText_5d068: jp SaffronGymText_5d048 -SaffronGymTextPointers: +SaffronGym_TextPointers: dw SaffronGymText1 dw SaffronGymText2 dw SaffronGymText3 |