diff options
| author | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
| commit | 6cb885a9f68b9f445d7fa45279731336fe0247d4 (patch) | |
| tree | 39736ab1dd8ebcc57f8e981db6103285743d5530 /engine/minigame | |
| parent | Identify unnamed functions in map_sprites.asm (#126) (diff) | |
| parent | Fix some label typos, and add some constants instead of raw numbers (#492) (diff) | |
| download | pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.gz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.xz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/minigame')
| -rw-r--r-- | engine/minigame/surfing_pikachu.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/engine/minigame/surfing_pikachu.asm b/engine/minigame/surfing_pikachu.asm index 6d31c7b7..f30d567c 100644 --- a/engine/minigame/surfing_pikachu.asm +++ b/engine/minigame/surfing_pikachu.asm @@ -29,9 +29,9 @@ SurfingPikachuMinigame:: ldh [rBGP], a ldh [rOBP0], a ldh [rOBP1], a - call UpdateGBCPal_BGP - call UpdateGBCPal_OBP0 - call UpdateGBCPal_OBP1 + call UpdateCGBPal_BGP + call UpdateCGBPal_OBP0 + call UpdateCGBPal_OBP1 call ClearObjectAnimationBuffers call ClearSprites xor a @@ -257,8 +257,8 @@ SurfingPikachuMinigame_LoadGFXAndLayout: ldh [rOBP0], a ld a, $e0 ldh [rOBP1], a - call UpdateGBCPal_OBP0 - call UpdateGBCPal_OBP1 + call UpdateCGBPal_OBP0 + call UpdateCGBPal_OBP1 ret SurfingPikachuMinigame_SetBGPals: @@ -267,13 +267,13 @@ SurfingPikachuMinigame_SetBGPals: jr nz, .sgb ld a, $d0 ldh [rBGP], a - call UpdateGBCPal_BGP + call UpdateCGBPal_BGP ret .sgb ld a, $e4 ldh [rBGP], a - call UpdateGBCPal_BGP + call UpdateCGBPal_BGP ret Func_f81ff: @@ -2376,8 +2376,8 @@ SurfingPikachuMinigameIntro: ldh [rOBP0], a ld a, $e0 ldh [rOBP1], a - call UpdateGBCPal_OBP0 - call UpdateGBCPal_OBP1 + call UpdateCGBPal_OBP0 + call UpdateCGBPal_OBP1 call DelayFrame ld a, MUSIC_SURFING_PIKACHU ld c, BANK(Music_SurfingPikachu) @@ -2518,9 +2518,9 @@ SurfingPikachuMinigame_BlankPals: ldh [rBGP], a ldh [rOBP0], a ldh [rOBP1], a - call UpdateGBCPal_BGP - call UpdateGBCPal_OBP0 - call UpdateGBCPal_OBP1 + call UpdateCGBPal_BGP + call UpdateCGBPal_OBP0 + call UpdateCGBPal_OBP1 ret SurfingPikachuMinigame_NormalPals: @@ -2529,9 +2529,9 @@ SurfingPikachuMinigame_NormalPals: ldh [rOBP0], a ld a, $e0 ldh [rOBP1], a - call UpdateGBCPal_BGP - call UpdateGBCPal_OBP0 - call UpdateGBCPal_OBP1 + call UpdateCGBPal_BGP + call UpdateCGBPal_OBP0 + call UpdateCGBPal_OBP1 ret SurfingPikachu_ClearTileMap: |