diff options
Diffstat (limited to 'scripts/pewtercity.asm')
| -rwxr-xr-x | scripts/pewtercity.asm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index 1e9a922a..cece9d38 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -3,7 +3,7 @@ PewterCityScript: ; 192f5 (6:52f5) ld hl, wPreventBlackout res 7, [hl] ld hl, PewterCityScriptPointers - ld a, [W_PEWTERCITYCURSCRIPT] + ld a, [wPewterCityCurScript] call JumpTable ret @@ -18,7 +18,7 @@ PewterCityScriptPointers: ; 19307 (6:5307) PewterCityScript0: ; 19315 (6:5315) xor a - ld [W_MUSEUM1FCURSCRIPT], a + ld [wMuseum1FCurScript], a ResetEvent EVENT_BOUGHT_MUSEUM_TICKET call PewterCityScript_1925e ret @@ -76,7 +76,7 @@ PewterCityScript1: ; 19280 (6:5280) ld de, MovementData_PewterMuseumGuyExit call MoveSprite ld a, $2 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret MovementData_PewterMuseumGuyExit: ; 192ce (6:52ce) @@ -94,7 +94,7 @@ PewterCityScript2: ; 192d3 (6:52d3) ld [wMissableObjectIndex], a predef HideObject ld a, $3 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret PewterCityScript3: ; 192e9 (6:52e9) @@ -107,7 +107,7 @@ PewterCityScript3: ; 192e9 (6:52e9) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret PewterCityScript4: ; 19305 (6:5305) @@ -141,7 +141,7 @@ PewterCityScript4: ; 19305 (6:5305) ld de, MovementData_PewterGymGuyExit call MoveSprite ld a, $5 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret MovementData_PewterGymGuyExit: ; 19353 (6:5353) @@ -160,7 +160,7 @@ PewterCityScript5: ; 19359 (6:5359) ld [wMissableObjectIndex], a predef HideObject ld a, $6 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret PewterCityScript6: ; 1936f (6:536f) @@ -173,7 +173,7 @@ PewterCityScript6: ; 1936f (6:536f) xor a ld [wJoyIgnore], a ld a, $0 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a ret PewterCityTextPointers: ; 1938b (6:538b) @@ -226,7 +226,7 @@ PewterCityText3: ; 193b1 (6:53b1) ld [wSpriteIndex], a call GetSpritePosition2 ld a, $1 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a .asm_193ee jp TextScriptEnd @@ -290,7 +290,7 @@ PewterCityText5: ; 19436 (6:5436) ld [wSpriteIndex], a call GetSpritePosition2 ld a, $4 - ld [W_PEWTERCITYCURSCRIPT], a + ld [wPewterCityCurScript], a jp TextScriptEnd PewterCityText_1945d: ; 1945d (6:545d) |