diff options
Diffstat (limited to 'scripts/PalletTown.asm')
| -rwxr-xr-x | scripts/PalletTown.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm index 5ad7d40f..ff500ca0 100755 --- a/scripts/PalletTown.asm +++ b/scripts/PalletTown.asm @@ -27,8 +27,8 @@ PalletTownScript0: ld [hJoyHeld], a ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a - ld a, $FF - call PlaySound ; stop music + ld a, SFX_STOP_ALL_MUSIC + call PlaySound ld a, BANK(Music_MeetProfOak) ld c, a ld a, MUSIC_MEET_PROF_OAK ; “oak appears” music @@ -61,7 +61,7 @@ PalletTownScript1: PalletTownScript2: ld a, 1 - ld [H_SPRITEINDEX], a + ld [hSpriteIndex], a ld a, SPRITE_FACING_UP ld [hSpriteFacingDirection], a call SetSpriteFacingDirectionAndDelay @@ -79,7 +79,7 @@ PalletTownScript2: predef FindPathToPlayer ; load Oak’s movement into wNPCMovementDirections2 ld de, wNPCMovementDirections2 ld a, 1 ; oak - ld [H_SPRITEINDEX], a + ld [hSpriteIndex], a call MoveSprite ld a, $FF ld [wJoyIgnore], a @@ -111,7 +111,7 @@ PalletTownScript3: ld [wNPCMovementScriptFunctionNum], a ld a, 1 ld [wNPCMovementScriptPointerTableNum], a - ld a, [H_LOADEDROMBANK] + ld a, [hLoadedROMBank] ld [wNPCMovementScriptBank], a ; trigger the next script |