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

Restore sassy nature effect (#4598)

Browse source
This commit is contained in:
sneed 2024-05-19 12:43:28 +03:00 committed by GitHub
parent 849bd0c8bb
commit 334668be26
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/battle_anim_smokescreen.c
View file

@ -15,6 +15,8 @@
static void SpriteCB_SmokescreenImpactMain(struct Sprite *); static void SpriteCB_SmokescreenImpactMain(struct Sprite *);
static void SpriteCB_SmokescreenImpact(struct Sprite *); static void SpriteCB_SmokescreenImpact(struct Sprite *);
// The below data for smokescreen starts and ends with some data that belongs to battle_gfx_sfx_util.c
static const struct CompressedSpriteSheet sSmokescreenImpactSpriteSheet = static const struct CompressedSpriteSheet sSmokescreenImpactSpriteSheet =
{ {
.data = gSmokescreenImpactTiles, .size = 0x180, .tag = TAG_SMOKESCREEN .data = gSmokescreenImpactTiles, .size = 0x180, .tag = TAG_SMOKESCREEN

6
src/pokemon.c
View file

@ -366,8 +366,6 @@ const struct SpindaSpot gSpindaSpotGraphics[] =
// Support percentages are listed in comments off to the side instead // Support percentages are listed in comments off to the side instead
#define PALACE_STYLE(atk, def, atkLow, defLow) {atk, atk + def, atkLow, atkLow + defLow} #define PALACE_STYLE(atk, def, atkLow, defLow) {atk, atk + def, atkLow, atkLow + defLow}
// The below data for smokescreen starts and ends with some data that belongs to battle_gfx_sfx_util.c
const struct NatureInfo gNaturesInfo[NUM_NATURES] = const struct NatureInfo gNaturesInfo[NUM_NATURES] =
{ {
[NATURE_HARDY] = [NATURE_HARDY] =
@ -637,8 +635,8 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] =
[NATURE_SASSY] = [NATURE_SASSY] =
{ {
.name = COMPOUND_STRING("Sassy"), .name = COMPOUND_STRING("Sassy"),
.statDown = STAT_SPDEF, .statUp = STAT_SPDEF,
.statUp = STAT_SPEED, .statDown = STAT_SPEED,
.backAnim = 1, .backAnim = 1,
.pokeBlockAnim = {ANIM_SASSY, AFFINE_TURN_UP_HIGH}, .pokeBlockAnim = {ANIM_SASSY, AFFINE_TURN_UP_HIGH},
.natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlSassy, .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlSassy,