diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-12 13:05:36 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-12 13:05:36 -0400 |
| commit | 2cf4efe15c50e84824bad8420b16009e6fa066c3 (patch) | |
| tree | 116e2fb232f85208892d47360e044e6eccfb4c20 /engine/battle/ghost_marowak_anim.asm | |
| parent | Merge pull request #3 from PikalaxALT/master (diff) | |
| download | pokeyellow-2cf4efe15c50e84824bad8420b16009e6fa066c3.tar.gz pokeyellow-2cf4efe15c50e84824bad8420b16009e6fa066c3.tar.xz pokeyellow-2cf4efe15c50e84824bad8420b16009e6fa066c3.zip | |
Rename some palette labels.
Also add replace.sh
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 719fcf0a..67ed3247 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/engine/battle/ghost_marowak_anim.asm @@ -2,7 +2,7 @@ MarowakAnim: ; 7092b (1c:492b) ; animate the ghost being unveiled as a Marowak ld a, $e4 ld [rOBP1], a - call Func_3061 + call UpdateGBCPal_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 coord hl, 12, 0 @@ -28,7 +28,7 @@ MarowakAnim: ; 7092b (1c:492b) sla a sla a ld [rOBP1], a - call Func_3061 + call UpdateGBCPal_OBP1 jr nz, .fadeOutGhostLoop call ClearSprites call CopyMonPicFromBGToSpriteVRAM ; copy Marowak pic from BG to sprite VRAM @@ -42,7 +42,7 @@ MarowakAnim: ; 7092b (1c:492b) srl b rra ld [rOBP1], a - call Func_3061 + call UpdateGBCPal_OBP1 ld a, b and a jr nz, .fadeInMarowakLoop |