atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed some gba sprites (#5607)

Browse source
This commit is contained in:
Eclipse 2024-10-28 13:22:07 +01:00 committed by GitHub
parent 3442b09852
commit 5b5ecaa6ee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/data/pokemon/species_info/gen_1_families.h
View file

@ -1596,6 +1596,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 12, .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 13 : 12,
.frontAnimFrames = sAnims_Pidgey, .frontAnimFrames = sAnims_Pidgey,
.frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SLIDE_SLOW : ANIM_V_STRETCH, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SLIDE_SLOW : ANIM_V_STRETCH,
.enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 16 : 0,
.backPic = gMonBackPic_Pidgey, .backPic = gMonBackPic_Pidgey,
.backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48), .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 48) : MON_COORDS_SIZE(56, 48),
.backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 11, .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 8 : 11,
@ -11488,6 +11489,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 19 : 15, .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 19 : 15,
.frontAnimFrames = sAnims_Voltorb, .frontAnimFrames = sAnims_Voltorb,
.frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SQUISH_AND_BOUNCE : ANIM_SWING_CONCAVE, .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, .backPic = gMonBackPic_Voltorb,
.backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(48, 40), .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(40, 40) : MON_COORDS_SIZE(48, 40),
.backPicYOffset = 14, .backPicYOffset = 14,
@ -11551,6 +11553,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 11, .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 14 : 11,
.frontAnimFrames = sAnims_Electrode, .frontAnimFrames = sAnims_Electrode,
.frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SQUISH_AND_BOUNCE : ANIM_SHRINK_GROW_VIBRATE_SLOW, .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, .backPic = gMonBackPic_Electrode,
.backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(64, 40), .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(64, 40),
.backPicYOffset = 13, .backPicYOffset = 13,
@ -17401,6 +17404,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 2, .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 3 : 2,
.frontAnimFrames = sAnims_Articuno, .frontAnimFrames = sAnims_Articuno,
.frontAnimId = ANIM_GROW_VIBRATE, .frontAnimId = ANIM_GROW_VIBRATE,
.enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 6 : 0,
.backPic = gMonBackPic_Articuno, .backPic = gMonBackPic_Articuno,
.backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(64, 56), .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(64, 56),
.backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 5, .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 5,
@ -17685,6 +17689,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 1, .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 0 : 1,
.frontAnimFrames = sAnims_Moltres, .frontAnimFrames = sAnims_Moltres,
.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW, .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE_SLOW,
.enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 5 : 0,
.backPic = gMonBackPic_Moltres, .backPic = gMonBackPic_Moltres,
.backPicSize = MON_COORDS_SIZE(64, 56), .backPicSize = MON_COORDS_SIZE(64, 56),
.backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 5, .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 4 : 5,
@ -17952,6 +17957,7 @@ const struct SpeciesInfo gSpeciesInfoGen1[] =
.frontPicYOffset = 0, .frontPicYOffset = 0,
.frontAnimFrames = sAnims_Dragonite, .frontAnimFrames = sAnims_Dragonite,
.frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SLIDE_SLOW : ANIM_V_SHAKE, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SLIDE_SLOW : ANIM_V_SHAKE,
.enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 6 : 0,
.backPic = gMonBackPic_Dragonite, .backPic = gMonBackPic_Dragonite,
.backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64), .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 64),
.backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 1, .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 1,

9
src/data/pokemon/species_info/gen_3_families.h
View file

@ -6759,6 +6759,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 17 : 14, .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 17 : 14,
.frontAnimFrames = sAnims_Swablu, .frontAnimFrames = sAnims_Swablu,
.frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SLIDE : ANIM_GROW_VIBRATE, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_V_SLIDE : ANIM_GROW_VIBRATE,
.enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 12 : 0,
.backPic = gMonBackPic_Swablu, .backPic = gMonBackPic_Swablu,
.backPicSize = MON_COORDS_SIZE(64, 48), .backPicSize = MON_COORDS_SIZE(64, 48),
.backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 11, .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 9 : 11,
@ -6822,6 +6823,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 1, .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 1,
.frontAnimFrames = sAnims_Altaria, .frontAnimFrames = sAnims_Altaria,
.frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_STRETCH : ANIM_V_STRETCH, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_H_STRETCH : ANIM_V_STRETCH,
.enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 0,
.backPic = gMonBackPic_Altaria, .backPic = gMonBackPic_Altaria,
.backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 48), .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(64, 56) : MON_COORDS_SIZE(64, 48),
.backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 10, .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 6 : 10,
@ -8451,6 +8453,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 7, .frontPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 7,
.frontAnimFrames = sAnims_Banette, .frontAnimFrames = sAnims_Banette,
.frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SWING_CONVEX : ANIM_CIRCULAR_STRETCH_TWICE, .frontAnimId = P_GBA_STYLE_SPECIES_GFX ? ANIM_SWING_CONVEX : ANIM_CIRCULAR_STRETCH_TWICE,
.enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 8 : 0,
.backPic = gMonBackPic_Banette, .backPic = gMonBackPic_Banette,
.backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(64, 64), .backPicSize = P_GBA_STYLE_SPECIES_GFX ? MON_COORDS_SIZE(48, 40) : MON_COORDS_SIZE(64, 64),
.backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 5, .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 12 : 5,
@ -8935,10 +8938,10 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.frontPicYOffset = 11, .frontPicYOffset = 11,
.frontAnimFrames = sAnims_Chimecho, .frontAnimFrames = sAnims_Chimecho,
.frontAnimId = ANIM_H_SLIDE_WOBBLE, .frontAnimId = ANIM_H_SLIDE_WOBBLE,
.enemyMonElevation = 16, .enemyMonElevation = P_GBA_STYLE_SPECIES_GFX ? 12 : 16,
.backPic = gMonBackPic_Chimecho, .backPic = gMonBackPic_Chimecho,
.backPicSize = MON_COORDS_SIZE(64, 56), .backPicSize = MON_COORDS_SIZE(64, 56),
.backPicYOffset = 9, .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 7 : 9,
.backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC, .backAnimId = BACK_ANIM_CONVEX_DOUBLE_ARC,
.palette = gMonPalette_Chimecho, .palette = gMonPalette_Chimecho,
.shinyPalette = gMonShinyPalette_Chimecho, .shinyPalette = gMonShinyPalette_Chimecho,
@ -11433,7 +11436,7 @@ const struct SpeciesInfo gSpeciesInfoGen3[] =
.frontAnimId = ANIM_GROW_VIBRATE, .frontAnimId = ANIM_GROW_VIBRATE,
.backPic = gMonBackPic_DeoxysNormal, .backPic = gMonBackPic_DeoxysNormal,
.backPicSize = MON_COORDS_SIZE(64, 56), .backPicSize = MON_COORDS_SIZE(64, 56),
.backPicYOffset = 6, .backPicYOffset = P_GBA_STYLE_SPECIES_GFX ? 2 : 6,
.backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE, .backAnimId = BACK_ANIM_SHRINK_GROW_VIBRATE,
.palette = gMonPalette_DeoxysNormal, .palette = gMonPalette_DeoxysNormal,
.shinyPalette = gMonShinyPalette_DeoxysNormal, .shinyPalette = gMonShinyPalette_DeoxysNormal,