Merge pull request #44 from zuperZACH/master

Zach gets off his butt and does something
2025-11-06 05:30:59 +13:00 · 2024-09-26 15:31:09 -04:00 · 2024-09-26 15:31:09 -04:00 · de6d1d9d56
parent 576ea491dc 9a2a97a942
commit de6d1d9d56
9 changed files with 25 additions and 12 deletions
--- a/gfx/pokemon/balumba/anim.asm
+++ b/gfx/pokemon/balumba/anim.asm
@ -1 +1,9 @@
+	frame 1, 10
+	setrepeat 3
+	frame 2, 04
+	frame 3, 04
+	frame 4, 04
+	frame 1, 04
+	dorepeat 2
+	frame 0, 10
 	endanim
--- a/gfx/pokemon/balumba/anim_idle.asm
+++ b/gfx/pokemon/balumba/anim_idle.asm
@ -1 +1,6 @@
+	frame 5, 08
+	frame 6, 04
+	frame 7, 04
+	frame 8, 04
+	frame 0, 10
 	endanim
--- a/gfx/pokemon/balumba/back.png
+++ b/gfx/pokemon/balumba/back.png
--- a/gfx/pokemon/balumba/front.png
+++ b/gfx/pokemon/balumba/front.png
--- a/gfx/pokemon/togekiss/anim.asm
+++ b/gfx/pokemon/togekiss/anim.asm
@ -1,7 +1,8 @@
-	setrepeat 2
-	frame 1, 12
-	frame 2, 12
-	frame 3, 12
-	frame 2, 12
-	dorepeat 1
-	endanim
+	frame 0, 08
+	frame 1, 02
+	frame 2, 08
+	frame 3, 03
+	frame 4, 06
+	frame 5, 02
+	frame 0, 16
+	endanim
--- a/gfx/pokemon/togekiss/anim_idle.asm
+++ b/gfx/pokemon/togekiss/anim_idle.asm
@ -1,4 +1,3 @@
-	frame 4, 06
-	frame 0, 06
-	frame 4, 06
+	frame 6, 04
+	frame 0, 16
 	endanim
--- a/gfx/pokemon/togekiss/back.png
+++ b/gfx/pokemon/togekiss/back.png
--- a/gfx/pokemon/togekiss/front.png
+++ b/gfx/pokemon/togekiss/front.png
--- a/gfx/pokemon/togekiss/shiny.pal
+++ b/gfx/pokemon/togekiss/shiny.pal
@ -1,4 +1,4 @@

-	RGB 31, 27, 11
-	RGB 00, 15, 24
+	RGB 31, 24, 08
+	RGB 02, 16, 31