diff options
Diffstat (limited to 'scripts/celadongamecorner.asm')
| -rwxr-xr-x | scripts/celadongamecorner.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index d0433efd..43aae927 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -3,11 +3,11 @@ CeladonGameCornerScript: call CeladonGameCornerScript_48bec call EnableAutoTextBoxDrawing ld hl, CeladonGameCornerScriptPointers - ld a, [W_CELADONGAMECORNERCURSCRIPT] + ld a, [wCeladonGameCornerCurScript] jp JumpTable CeladonGameCornerScript_48bcf: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] ret z @@ -24,7 +24,7 @@ CeladonGameCornerScript_48bcf: ret CeladonGameCornerScript_48bec: - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] ret z @@ -38,8 +38,8 @@ CeladonGameCornerScript_48bec: CeladonGameCornerScript_48c07: xor a ld [wJoyIgnore], a - ld [W_CELADONGAMECORNERCURSCRIPT], a - ld [W_CURMAPSCRIPT], a + ld [wCeladonGameCornerCurScript], a + ld [wCurMapScript], a ret CeladonGameCornerScriptPointers: @@ -82,7 +82,7 @@ CeladonGameCornerScript1: ld [H_SPRITEINDEX], a call MoveSprite ld a, $2 - ld [W_CELADONGAMECORNERCURSCRIPT], a + ld [wCeladonGameCornerCurScript], a ret MovementData_48c5a: @@ -113,11 +113,11 @@ CeladonGameCornerScript2: ld a, HS_GAME_CORNER_ROCKET ld [wMissableObjectIndex], a predef HideObject - ld hl, wd126 + ld hl, wCurrentMapScriptFlags set 5, [hl] set 6, [hl] ld a, $0 - ld [W_CELADONGAMECORNERCURSCRIPT], a + ld [wCeladonGameCornerCurScript], a ret CeladonGameCornerTextPointers: @@ -429,7 +429,7 @@ CeladonGameCornerText11: ld [hJoyPressed], a ld [hJoyReleased], a ld a, $1 - ld [W_CELADONGAMECORNERCURSCRIPT], a + ld [wCeladonGameCornerCurScript], a jp TextScriptEnd CeladonGameCornerText_48ece: |