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/FightingDojo.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/FightingDojo.asm (renamed from scripts/fightingdojo.asm) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/fightingdojo.asm b/scripts/FightingDojo.asm index 5c7704f5..fc691dba 100755 --- a/scripts/fightingdojo.asm +++ b/scripts/FightingDojo.asm @@ -1,7 +1,7 @@ -FightingDojoScript: +FightingDojo_Script: call EnableAutoTextBoxDrawing ld hl, FightingDojoTrainerHeader0 - ld de, FightingDojoScriptPointers + ld de, FightingDojo_ScriptPointers ld a, [wFightingDojoCurScript] call ExecuteCurMapScriptInTable ld [wFightingDojoCurScript], a @@ -14,7 +14,7 @@ FightingDojoScript_5cd70: ld [wCurMapScript], a ret -FightingDojoScriptPointers: +FightingDojo_ScriptPointers: dw FightingDojoScript1 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -80,7 +80,7 @@ FightingDojoScript3: ld [wCurMapScript], a ret -FightingDojoTextPointers: +FightingDojo_TextPointers: dw FightingDojoText1 dw FightingDojoText2 dw FightingDojoText3 |