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/battle/ghost_marowak_anim.asm | |
| 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/battle/ghost_marowak_anim.asm')
| -rw-r--r-- | engine/battle/ghost_marowak_anim.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm index 5b14f6df..1230b936 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/engine/battle/ghost_marowak_anim.asm @@ -2,7 +2,7 @@ MarowakAnim: ; animate the ghost being unveiled as a Marowak ld a, $e4 ldh [rOBP1], a - call UpdateGBCPal_OBP1 + call UpdateCGBPal_OBP1 call CopyMonPicFromBGToSpriteVRAM ; cover the BG ghost pic with a sprite ghost pic that looks the same ; now that the ghost pic is being displayed using sprites, clear the ghost pic from the BG tilemap hlcoord 12, 0 @@ -28,7 +28,7 @@ MarowakAnim: sla a sla a ldh [rOBP1], a - call UpdateGBCPal_OBP1 + call UpdateCGBPal_OBP1 jr nz, .fadeOutGhostLoop call ClearSprites call CopyMonPicFromBGToSpriteVRAM ; copy Marowak pic from BG to sprite VRAM @@ -42,7 +42,7 @@ MarowakAnim: srl b rra ldh [rOBP1], a - call UpdateGBCPal_OBP1 + call UpdateCGBPal_OBP1 ld a, b and a jr nz, .fadeInMarowakLoop |