diff options
Diffstat (limited to 'scripts/vermilioncity.asm')
| -rwxr-xr-x | scripts/vermilioncity.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index 5121cfd9..b73797bb 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -2,7 +2,7 @@ VermilionCityScript: call EnableAutoTextBoxDrawing ld hl, wd492 res 7, [hl] - ld hl, wd126 + ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] push hl @@ -12,7 +12,7 @@ VermilionCityScript: res 5, [hl] call nz, VermilionCityScript_197c0 ld hl, VermilionCityScriptPointers - ld a, [W_VERMILIONCITYCURSCRIPT] + ld a, [wVermilionCityCurScript] call JumpTable call VermilionCityScript_19869 ret @@ -42,7 +42,7 @@ VermilionCityScript_197cb: SetEventReuseHL EVENT_WALKED_PAST_GUARD_AFTER_SS_ANNE_LEFT ret nz ld a, $2 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScriptPointers: @@ -79,7 +79,7 @@ VermilionCityScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret .asm_198de @@ -94,7 +94,7 @@ VermilionCityScript4: call ArePlayerCoordsInArray ret c ld a, $0 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScript2: @@ -107,7 +107,7 @@ VermilionCityScript2: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScript3: @@ -118,7 +118,7 @@ VermilionCityScript3: ld [wJoyIgnore], a ld [hJoyHeld], a ld a, $0 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityScript1: @@ -128,7 +128,7 @@ VermilionCityScript1: ld c, 10 call DelayFrames ld a, $0 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a ret VermilionCityTextPointers: @@ -201,7 +201,7 @@ VermilionCityText3: ld hl, SSAnneFlashedTicketText call PrintText ld a, $4 - ld [W_VERMILIONCITYCURSCRIPT], a + ld [wVermilionCityCurScript], a jr .asm_198fc .asm_198f6 ld hl, SSAnneNotHereText |