diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 79c4014..09f1448 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -310,7 +310,7 @@ PokemonCries:: mon_cry CRY_TYPHLOSION, 239, 247 ; STEELIX mon_cry CRY_DUNSPARCE, 274, 232 ; SNUBBULL mon_cry CRY_DUNSPARCE, 0, 384 ; GRANBULL - mon_cry CRY_NIDORAN_M, 0, 0 ; CARETORKER (incomplete) + mon_cry CRY_RAIKOU, 64, 512 ; CARETORKER mon_cry CRY_SLOWKING, 352, 224 ; QWILFISH mon_cry CRY_NIDORAN_M, 0, 0 ; KAZEPPELIN (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; QWILFATHER (incomplete) diff --git a/gfx/pokemon/caretorker/anim.asm b/gfx/pokemon/caretorker/anim.asm index 875f7be..01b1095 100644 --- a/gfx/pokemon/caretorker/anim.asm +++ b/gfx/pokemon/caretorker/anim.asm @@ -1 +1,15 @@ - endanim \ No newline at end of file + frame 0, 08 + frame 1, 06 + frame 2, 10 + frame 0, 06 + frame 2, 10 + frame 0, 04 + frame 3, 08 + frame 4, 08 + frame 3, 08 + frame 4, 08 + frame 3, 08 + frame 4, 08 + frame 3, 06 + frame 5, 18 + endanim diff --git a/gfx/pokemon/caretorker/anim_idle.asm b/gfx/pokemon/caretorker/anim_idle.asm index 875f7be..9328ab3 100644 --- a/gfx/pokemon/caretorker/anim_idle.asm +++ b/gfx/pokemon/caretorker/anim_idle.asm @@ -1 +1,4 @@ + frame 3, 08 + frame 0, 08 + frame 3, 08 endanim \ No newline at end of file diff --git a/gfx/pokemon/caretorker/back.png b/gfx/pokemon/caretorker/back.png index c7216be..fe5b57c 100644 Binary files a/gfx/pokemon/caretorker/back.png and b/gfx/pokemon/caretorker/back.png differ diff --git a/gfx/pokemon/caretorker/front.png b/gfx/pokemon/caretorker/front.png index e0a9da9..7978ebb 100644 Binary files a/gfx/pokemon/caretorker/front.png and b/gfx/pokemon/caretorker/front.png differ diff --git a/gfx/pokemon/caretorker/shiny.pal b/gfx/pokemon/caretorker/shiny.pal index 5c88669..950185f 100644 --- a/gfx/pokemon/caretorker/shiny.pal +++ b/gfx/pokemon/caretorker/shiny.pal @@ -1,2 +1,2 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + RGB 31, 22, 31 + RGB 04, 17, 28 \ No newline at end of file