diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-31 19:16:44 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-31 19:16:44 -0400 |
| commit | 1caab64abe5867164ac7a2eeef351d9432c6a1b9 (patch) | |
| tree | 6bc93bf9c04233f0bf2142bcf33863cb5a8326e1 /engine | |
| parent | d892958921cb55180ee97cbd88ae8b740ca962d3 (diff) | |
Clean up Yellow's WRAM
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/minigame/surfing_pikachu.asm | 8 | ||||
| -rw-r--r-- | engine/pikachu/pikachu_pcm.asm | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engine/minigame/surfing_pikachu.asm b/engine/minigame/surfing_pikachu.asm index b362c933..e554b14a 100644 --- a/engine/minigame/surfing_pikachu.asm +++ b/engine/minigame/surfing_pikachu.asm @@ -487,8 +487,8 @@ Func_f8324: xor a ldh [hLCDCPointer], a ld [wSurfingMinigameSCX], a - ld [wSurfingMinigameSCX + 1], a - ld [wSurfingMinigameSCX + 2], a + ld [wSurfingMinigameSCX2], a + ld [wSurfingMinigameSCXHi], a ret Func_f835c: @@ -1879,13 +1879,13 @@ SurfingMinigame_ScrollAndGenerateBGMap: ld a, h ldh [hSCX], a SurfingMinigame_GenerateBGMap: - ld hl, wSurfingMinigameSCX + 1 + ld hl, wSurfingMinigameSCX2 ldh a, [hSCX] cp [hl] ret z ld [hl], a and $f0 - ld hl, wSurfingMinigameSCX + 2 + ld hl, wSurfingMinigameSCXHi cp [hl] ret z ld [hl], a diff --git a/engine/pikachu/pikachu_pcm.asm b/engine/pikachu/pikachu_pcm.asm index bf1aa57f..5ef6fbc3 100644 --- a/engine/pikachu/pikachu_pcm.asm +++ b/engine/pikachu/pikachu_pcm.asm @@ -57,7 +57,7 @@ PlayPikachuSoundClip:: call PlayPikachuPCM xor a ld [wc0f3], a - ld [wc0f4], a + ld [wc0f3 + 1], a ld a, $80 ldh [rNR52], a xor a |