diff options
Diffstat (limited to 'scripts/pewtercity.asm')
| -rwxr-xr-x | scripts/pewtercity.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/pewtercity.asm b/scripts/pewtercity.asm index 5ee83f34..b7271b05 100755 --- a/scripts/pewtercity.asm +++ b/scripts/pewtercity.asm @@ -1,8 +1,11 @@ PewterCityScript: call EnableAutoTextBoxDrawing + ld hl, wd492 + res 7, [hl] ld hl, PewterCityScriptPointers ld a, [wPewterCityCurScript] - jp CallFunctionInTable + call JumpTable + ret PewterCityScriptPointers: dw PewterCityScript0 @@ -15,7 +18,7 @@ PewterCityScriptPointers: PewterCityScript0: xor a - ld [wMuseum1fCurScript], a + ld [wMuseum1FCurScript], a ResetEvent EVENT_BOUGHT_MUSEUM_TICKET call PewterCityScript_1925e ret @@ -26,7 +29,7 @@ PewterCityScript_1925e: ld hl, CoordsData_19277 call ArePlayerCoordsInArray ret nc - ld a, $f0 + ld a, $fc ld [wJoyIgnore], a ld a, $5 ld [hSpriteIndexOrTextID], a @@ -48,9 +51,9 @@ PewterCityScript1: ld a, SPRITE_FACING_UP ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay - ld a, ($3 << 4) | SPRITE_FACING_UP + ld a, SPRITE_FACING_UP ld [hSpriteImageIndex], a - call SetSpriteImageIndexAfterSettingFacingDirection + call SpriteFunc_34a1 call PlayDefaultMusic ld hl, wFlags_0xcd60 set 4, [hl] @@ -115,10 +118,7 @@ PewterCityScript4: ld [H_SPRITEINDEX], a ld a, SPRITE_FACING_LEFT ld [hSpriteFacingDirection], a - call SetSpriteFacingDirectionAndDelay - ld a, ($1 << 4) | SPRITE_FACING_LEFT - ld [hSpriteImageIndex], a - call SetSpriteImageIndexAfterSettingFacingDirection + call SpriteFunc_34a1 call PlayDefaultMusic ld hl, wFlags_0xcd60 set 4, [hl] |