diff options
| author | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
| commit | ca019eac8fd96559f4d4e712f0b53e95492e5dcb (patch) | |
| tree | 209a500e3bda6c2109e5acec60448e9e52f8c2af /engine/pikachu | |
| parent | Use more ldpikacry (diff) | |
| parent | Require RGBDS 0.9.3 for its DMG palette specs (#513) (diff) | |
| download | pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.gz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.xz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/pikachu')
| -rw-r--r-- | engine/pikachu/pikachu_movement.asm | 2 | ||||
| -rw-r--r-- | engine/pikachu/pikachu_pcm.asm | 34 | ||||
| -rw-r--r-- | engine/pikachu/pikachu_pic_animation.asm | 2 |
3 files changed, 19 insertions, 19 deletions
diff --git a/engine/pikachu/pikachu_movement.asm b/engine/pikachu/pikachu_movement.asm index d789f152..3643a9bc 100644 --- a/engine/pikachu/pikachu_movement.asm +++ b/engine/pikachu/pikachu_movement.asm @@ -883,7 +883,7 @@ LoadPikachuShadowOAMData: .OAMData: db 2 db $0c, $00, $ff, 0 - db $0c, $08, $ff, 1 << OAM_X_FLIP + db $0c, $08, $ff, OAM_XFLIP .LoadOAMData: ld a, e diff --git a/engine/pikachu/pikachu_pcm.asm b/engine/pikachu/pikachu_pcm.asm index bdfae0eb..643492ce 100644 --- a/engine/pikachu/pikachu_pcm.asm +++ b/engine/pikachu/pikachu_pcm.asm @@ -24,12 +24,12 @@ PlayPikachuSoundClip:: push bc push hl ld a, $80 - ldh [rNR52], a + ldh [rAUDENA], a ld a, $77 - ldh [rNR50], a + ldh [rAUDVOL], a xor a - ldh [rNR30], a - ld hl, rWave_0 ; wave data + ldh [rAUD3ENA], a + ld hl, _AUD3WAVERAM ld de, wRedrawRowOrColumnSrcTiles .saveWaveDataLoop ld a, [hl] @@ -47,18 +47,18 @@ ELSE ld a, $80 ENDC vc_patch_end - ldh [rNR30], a - ldh a, [rNR51] + ldh [rAUD3ENA], a + ldh a, [rAUDTERM] or $44 - ldh [rNR51], a + ldh [rAUDTERM], a ld a, $ff - ldh [rNR31], a + ldh [rAUD3LEN], a ld a, $20 - ldh [rNR32], a + ldh [rAUD3LEVEL], a ld a, $ff - ldh [rNR33], a + ldh [rAUD3LOW], a ld a, $87 - ldh [rNR34], a + ldh [rAUD3HIGH], a pop hl pop bc call PlayPikachuPCM @@ -66,10 +66,10 @@ ENDC ld [wc0f3], a ld [wc0f3 + 1], a ld a, $80 - ldh [rNR52], a + ldh [rAUDENA], a xor a - ldh [rNR30], a - ld hl, rWave_0 + ldh [rAUD3ENA], a + ld hl, _AUD3WAVERAM ld de, wRedrawRowOrColumnSrcTiles .reloadWaveDataLoop ld a, [de] @@ -79,10 +79,10 @@ ENDC cp $40 ; end of wave data jr nz, .reloadWaveDataLoop ld a, $80 - ldh [rNR30], a - ldh a, [rNR51] + ldh [rAUD3ENA], a + ldh a, [rAUDTERM] and $bb - ldh [rNR51], a + ldh [rAUDTERM], a xor a ld [wChannelSoundIDs + CHAN5], a ld [wChannelSoundIDs + CHAN6], a diff --git a/engine/pikachu/pikachu_pic_animation.asm b/engine/pikachu/pikachu_pic_animation.asm index 56ad6436..a7fd80f3 100644 --- a/engine/pikachu/pikachu_pic_animation.asm +++ b/engine/pikachu/pikachu_pic_animation.asm @@ -222,7 +222,7 @@ PikaPicAnimTimerAndJoypad: ret nz call JoypadLowSensitivity ldh a, [hJoyPressed] - and A_BUTTON | B_BUTTON + and PAD_A | PAD_B ret CheckPikaPicAnimTimer: |