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/VermilionGym.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/VermilionGym.asm (renamed from scripts/vermiliongym.asm) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/vermiliongym.asm b/scripts/VermilionGym.asm index c22ce9ce..5755628c 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/VermilionGym.asm @@ -1,4 +1,4 @@ -VermilionGymScript: +VermilionGym_Script: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -10,7 +10,7 @@ VermilionGymScript: call nz, VermilionGymScript_5ca6d call EnableAutoTextBoxDrawing ld hl, VermilionGymTrainerHeader0 - ld de, VermilionGymScriptPointers + ld de, VermilionGym_ScriptPointers ld a, [wVermilionGymCurScript] call ExecuteCurMapScriptInTable ld [wVermilionGymCurScript], a @@ -48,7 +48,7 @@ VermilionGymScript_5ca8a: ld [wCurMapScript], a ret -VermilionGymScriptPointers: +VermilionGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -89,7 +89,7 @@ VermilionGymScript_5caaa: jp VermilionGymScript_5ca8a -VermilionGymTextPointers: +VermilionGym_TextPointers: dw VermilionGymText1 dw VermilionGymText2 dw VermilionGymText3 |