From 334668be26fba2b684d8dd0b16ad8d365bd5ea2c Mon Sep 17 00:00:00 2001 From: sneed <56992013+Sneed69@users.noreply.github.com> Date: Sun, 19 May 2024 12:43:28 +0300 Subject: [PATCH] Restore sassy nature effect (#4598) --- src/battle_anim_smokescreen.c | 2 ++ src/pokemon.c | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/battle_anim_smokescreen.c b/src/battle_anim_smokescreen.c index dceb9792ed..3b05ef6280 100644 --- a/src/battle_anim_smokescreen.c +++ b/src/battle_anim_smokescreen.c @@ -15,6 +15,8 @@ static void SpriteCB_SmokescreenImpactMain(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 = { .data = gSmokescreenImpactTiles, .size = 0x180, .tag = TAG_SMOKESCREEN diff --git a/src/pokemon.c b/src/pokemon.c index c06bc7a1dc..fa61ab6ff5 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -366,8 +366,6 @@ const struct SpindaSpot gSpindaSpotGraphics[] = // Support percentages are listed in comments off to the side instead #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] = { [NATURE_HARDY] = @@ -637,8 +635,8 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = [NATURE_SASSY] = { .name = COMPOUND_STRING("Sassy"), - .statDown = STAT_SPDEF, - .statUp = STAT_SPEED, + .statUp = STAT_SPDEF, + .statDown = STAT_SPEED, .backAnim = 1, .pokeBlockAnim = {ANIM_SASSY, AFFINE_TURN_UP_HIGH}, .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlSassy,