diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 15:06:23 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 23:33:10 -0500 |
| commit | c7796024590fec48ac79756793c1a6e3b54daf8f (patch) | |
| tree | 0d61caa7ebe429995a61e800d1d78c3a82aec886 /scripts/GameCorner.asm | |
| parent | Merge pull request #193 from luckytyphlosion/master (diff) | |
| download | pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.gz pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.xz pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.zip | |
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
| -rwxr-xr-x | scripts/GameCorner.asm (renamed from scripts/celadongamecorner.asm) | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/celadongamecorner.asm b/scripts/GameCorner.asm index cc81b076..265508e0 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/GameCorner.asm @@ -1,9 +1,9 @@ -CeladonGameCornerScript: +GameCorner_Script: call CeladonGameCornerScript_48bcf call CeladonGameCornerScript_48bec call EnableAutoTextBoxDrawing - ld hl, CeladonGameCornerScriptPointers - ld a, [wCeladonGameCornerCurScript] + ld hl, GameCorner_ScriptPointers + ld a, [wGameCornerCurScript] jp CallFunctionInTable CeladonGameCornerScript_48bcf: @@ -38,11 +38,11 @@ CeladonGameCornerScript_48bec: CeladonGameCornerScript_48c07: xor a ld [wJoyIgnore], a - ld [wCeladonGameCornerCurScript], a + ld [wGameCornerCurScript], a ld [wCurMapScript], a ret -CeladonGameCornerScriptPointers: +GameCorner_ScriptPointers: dw CeladonGameCornerScript0 dw CeladonGameCornerScript1 dw CeladonGameCornerScript2 @@ -78,7 +78,7 @@ CeladonGameCornerScript1: ld [H_SPRITEINDEX], a call MoveSprite ld a, $2 - ld [wCeladonGameCornerCurScript], a + ld [wGameCornerCurScript], a ret MovementData_48c5a: @@ -113,10 +113,10 @@ CeladonGameCornerScript2: set 5, [hl] set 6, [hl] ld a, $0 - ld [wCeladonGameCornerCurScript], a + ld [wGameCornerCurScript], a ret -CeladonGameCornerTextPointers: +GameCorner_TextPointers: dw CeladonGameCornerText1 dw CeladonGameCornerText2 dw CeladonGameCornerText3 @@ -427,7 +427,7 @@ CeladonGameCornerText11: ld [hJoyPressed], a ld [hJoyReleased], a ld a, $1 - ld [wCeladonGameCornerCurScript], a + ld [wGameCornerCurScript], a jp TextScriptEnd CeladonGameCornerText_48ece: |