Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed some gba sprites #5607

Merged
merged 1 commit into from
Oct 28, 2024
Merged

Fixed some gba sprites #5607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/data/pokemon/species_info/gen_1_families.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,6 +1596,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 12,
.frontAnimFrames = sAnims_Pidgey,
.frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SLIDE_SLOW : ANIM_V_STRETCH,
.enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 16 : 0,
.backPic = gMonBackPic_Pidgey,
.backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48),
.backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 11,
Expand Down Expand Up @@ -11488,6 +11489,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 19 : 15,
.frontAnimFrames = sAnims_Voltorb,
.frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SQUISH_AND_BOUNCE : ANIM_SWING_CONCAVE,
.enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 10 : 0,
.backPic = gMonBackPic_Voltorb,
.backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(48, 40),
.backPicYOffset = 14,
Expand Down Expand Up @@ -11551,6 +11553,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 11,
.frontAnimFrames = sAnims_Electrode,
.frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SQUISH_AND_BOUNCE : ANIM_SHRINK_GROW_VIBRATE_SLOW,
.enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 12 : 0,
.backPic = gMonBackPic_Electrode,
.backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(64, 40),
.backPicYOffset = 13,
Expand Down Expand Up @@ -17401,6 +17404,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 2,
.frontAnimFrames = sAnims_Articuno,
.frontAnimId = ANIM_GROW_VIBRATE,
.enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 6 : 0,
.backPic = gMonBackPic_Articuno,
.backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(64, 56),
.backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 5,
Expand Down Expand Up @@ -17685,6 +17689,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 1,
.frontAnimFrames = sAnims_Moltres,
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW,
.enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 5 : 0,
.backPic = gMonBackPic_Moltres,
.backPicSize = MON_COORDS_SIZE(64, 56),
.backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 5,
Expand Down Expand Up @@ -17952,6 +17957,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.frontPicYOffset = 0,
.frontAnimFrames = sAnims_Dragonite,
.frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SLIDE_SLOW : ANIM_V_SHAKE,
.enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 6 : 0,
.backPic = gMonBackPic_Dragonite,
.backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64),
.backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 1,
Expand Down
9 changes: 6 additions & 3 deletions src/data/pokemon/species_info/gen_3_families.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6759,6 +6759,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 17 : 14,
.frontAnimFrames = sAnims_Swablu,
.frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SLIDE : ANIM_GROW_VIBRATE,
.enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 12 : 0,
.backPic = gMonBackPic_Swablu,
.backPicSize = MON_COORDS_SIZE(64, 48),
.backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 11,
Expand Down Expand Up @@ -6822,6 +6823,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 1,
.frontAnimFrames = sAnims_Altaria,
.frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_STRETCH : ANIM_V_STRETCH,
.enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 0,
.backPic = gMonBackPic_Altaria,
.backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 48),
.backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 10,
Expand Down Expand Up @@ -8451,6 +8453,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 7,
.frontAnimFrames = sAnims_Banette,
.frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SWING_CONVEX : ANIM_CIRCULAR_STRETCH_TWICE,
.enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 0,
.backPic = gMonBackPic_Banette,
.backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(64, 64),
.backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 5,
Expand Down Expand Up @@ -8935,10 +8938,10 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.frontPicYOffset = 11,
.frontAnimFrames = sAnims_Chimecho,
.frontAnimId = ANIM_H_SLIDE_WOBBLE,
.enemyMonElevation = 16,
.enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 12 : 16,
.backPic = gMonBackPic_Chimecho,
.backPicSize = MON_COORDS_SIZE(64, 56),
.backPicYOffset = 9,
.backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 9,
.backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC,
.palette = gMonPalette_Chimecho,
.shinyPalette = gMonShinyPalette_Chimecho,
Expand Down Expand Up @@ -11433,7 +11436,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.frontAnimId = ANIM_GROW_VIBRATE,
.backPic = gMonBackPic_DeoxysNormal,
.backPicSize = MON_COORDS_SIZE(64, 56),
.backPicYOffset = 6,
.backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 6,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be 8 instead of 2?
(mainly cross-referencing the vanilla table https://github.com/pret/pokeemerald/blob/e45fe13af4551a080704b6a2a2ee87000c43d2b7/src/data/pokemon_graphics/enemy_mon_elevation.h#L64)

Copy link
Author

@SubzeroEclipse SubzeroEclipse Oct 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That sprite for Deoxys-N wasn't supposed to show up at all in vanilla Emerald, the 8 was used by the back sprite of Speed Forme :)
pokeemerald-0 (2)
I got the 2 by testing manually, there wasn't much I could refer to for placing the Normal form and that's why I left it alone besides the back that was easily observable (tried to look up Pokeruby's code, but the elevations there looks different from Emerald, and I couldn't find the section regarding the other placements)

.backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE,
.palette = gMonPalette_DeoxysNormal,
.shinyPalette = gMonShinyPalette_DeoxysNormal,
Expand Down
Loading