ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-04 18:30:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cherrim

Browse Source
This commit is contained in:
DizzyEggg 2019-06-16 09:27:42 +02:00
parent 7629013dfe
commit 54bc7d329e
4 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
graphics_file_rules.mk
View File

@ -62,25 +62,16 @@ $(CASTFORMGFXDIR)/shiny.gbapal: $(CASTFORMGFXDIR)/shiny_normal_form.gbapal \
$(CHERRIMGFXDIR)/front.4bpp: $(CHERRIMGFXDIR)/front_normal.4bpp \ $(CHERRIMGFXDIR)/front.4bpp: $(CHERRIMGFXDIR)/front_normal.4bpp \
$(CHERRIMGFXDIR)/front_sun.4bpp $(CHERRIMGFXDIR)/front_sun.4bpp
@cat $^ >$@ @cat $^ >$@
$(CHERRIMGFXDIR)/anim_front.4bpp: $(CHERRIMGFXDIR)/anim_front_normal.4bpp \
$(CHERRIMGFXDIR)/front_sun.4bpp
@cat $^ >$@
### NOTE: Because Cherrim uses a two-frame sprite, the pals and back entry need to be duplicated.
$(CHERRIMGFXDIR)/back.4bpp: $(CHERRIMGFXDIR)/back_normal.4bpp \ $(CHERRIMGFXDIR)/back.4bpp: $(CHERRIMGFXDIR)/back_normal.4bpp \
$(CHERRIMGFXDIR)/back_normal.4bpp \
$(CHERRIMGFXDIR)/back_sun.4bpp $(CHERRIMGFXDIR)/back_sun.4bpp
@cat $^ >$@ @cat $^ >$@
$(CHERRIMGFXDIR)/normal.gbapal: $(CHERRIMGFXDIR)/normal_normal.gbapal \ $(CHERRIMGFXDIR)/normal.gbapal: $(CHERRIMGFXDIR)/normal_normal.gbapal \
$(CHERRIMGFXDIR)/normal_normal.gbapal \
$(CHERRIMGFXDIR)/normal_sun.gbapal $(CHERRIMGFXDIR)/normal_sun.gbapal
@cat $^ >$@ @cat $^ >$@
$(CHERRIMGFXDIR)/shiny.gbapal: $(CHERRIMGFXDIR)/shiny_normal.gbapal \ $(CHERRIMGFXDIR)/shiny.gbapal: $(CHERRIMGFXDIR)/shiny_normal.gbapal \
$(CHERRIMGFXDIR)/shiny_normal.gbapal \
$(CHERRIMGFXDIR)/shiny_sun.gbapal $(CHERRIMGFXDIR)/shiny_sun.gbapal
@cat $^ >$@ @cat $^ >$@

2
src/data/graphics/pokemon.h
View File

@ -452,7 +452,7 @@ const u32 gMonFrontPic_Pachirisu[] = INCBIN_U32("graphics/pokemon/pachirisu/anim
const u32 gMonFrontPic_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/anim_front.4bpp.lz"); const u32 gMonFrontPic_Buizel[] = INCBIN_U32("graphics/pokemon/buizel/anim_front.4bpp.lz");
const u32 gMonFrontPic_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/anim_front.4bpp.lz"); const u32 gMonFrontPic_Floatzel[] = INCBIN_U32("graphics/pokemon/floatzel/anim_front.4bpp.lz");
const u32 gMonFrontPic_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/anim_front.4bpp.lz"); const u32 gMonFrontPic_Cherubi[] = INCBIN_U32("graphics/pokemon/cherubi/anim_front.4bpp.lz");
const u32 gMonFrontPic_Cherrim[] = INCBIN_U32("graphics/pokemon/cherrim/anim_front.4bpp.lz"); const u32 gMonFrontPic_Cherrim[] = INCBIN_U32("graphics/pokemon/cherrim/front.4bpp.lz");
const u32 gMonFrontPic_ShellosE[] = INCBIN_U32("graphics/pokemon/shellosE/anim_front.4bpp.lz"); const u32 gMonFrontPic_ShellosE[] = INCBIN_U32("graphics/pokemon/shellosE/anim_front.4bpp.lz");
const u32 gMonFrontPic_GastrodonE[] = INCBIN_U32("graphics/pokemon/gastrodonE/anim_front.4bpp.lz"); const u32 gMonFrontPic_GastrodonE[] = INCBIN_U32("graphics/pokemon/gastrodonE/anim_front.4bpp.lz");
const u32 gMonFrontPic_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/anim_front.4bpp.lz"); const u32 gMonFrontPic_Ambipom[] = INCBIN_U32("graphics/pokemon/ambipom/anim_front.4bpp.lz");

9
src/data/pokemon_graphics/front_pic_anims.h
View File

@ -5101,17 +5101,15 @@ static const union AnimCmd sAnim_CHERUBI_1[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd sAnim_CHERRIM_1[] = static const union AnimCmd sAnim_CHERRIM_NORMAL[] =
{ {
ANIMCMD_FRAME(0, 30),
ANIMCMD_FRAME(1, 30),
ANIMCMD_FRAME(0, 1), ANIMCMD_FRAME(0, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd sAnim_CHERRIM_SUN[] = static const union AnimCmd sAnim_CHERRIM_SUN[] =
{ {
ANIMCMD_FRAME(2, 1), ANIMCMD_FRAME(1, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
@ -10501,8 +10499,7 @@ static const union AnimCmd *const sAnims_CHERUBI[] ={
}; };
static const union AnimCmd *const sAnims_CHERRIM[] ={ static const union AnimCmd *const sAnims_CHERRIM[] ={
sAnim_GeneralFrame0, sAnim_CHERRIM_NORMAL,
sAnim_CHERRIM_1,
sAnim_CHERRIM_SUN, sAnim_CHERRIM_SUN,
}; };

3
src/pokemon.c
View File

@ -7123,7 +7123,8 @@ bool8 HasTwoFramesAnimation(u16 species)
return (species != SPECIES_CASTFORM return (species != SPECIES_CASTFORM
&& species != SPECIES_DEOXYS && species != SPECIES_DEOXYS
&& species != SPECIES_SPINDA && species != SPECIES_SPINDA
&& species != SPECIES_UNOWN); && species != SPECIES_UNOWN
&& species != SPECIES_CHERRIM);
} }
bool8 sub_806F104(void) bool8 sub_806F104(void)