diff --git a/include/pokemon.h b/include/pokemon.h index 4b48f6999a0..31f825f5380 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -613,6 +613,7 @@ struct NatureInfo u8 battlePalacePercents[4]; u8 battlePalaceFlavorText; u8 battlePalaceSmokescreen; + const u8 *natureGirlMessage; }; #define SPINDA_SPOT_WIDTH 16 diff --git a/src/field_specials.c b/src/field_specials.c index 1005d06bf26..0ca09347dc0 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -2792,41 +2792,13 @@ void SetBattleTowerLinkPlayerGfx(void) void ShowNatureGirlMessage(void) { - static const u8 *const sNatureGirlMessages[NUM_NATURES] = { - [NATURE_HARDY] = BattleFrontier_Lounge5_Text_NatureGirlHardy, - [NATURE_LONELY] = BattleFrontier_Lounge5_Text_NatureGirlLonely, - [NATURE_BRAVE] = BattleFrontier_Lounge5_Text_NatureGirlBrave, - [NATURE_ADAMANT] = BattleFrontier_Lounge5_Text_NatureGirlAdamant, - [NATURE_NAUGHTY] = BattleFrontier_Lounge5_Text_NatureGirlNaughty, - [NATURE_BOLD] = BattleFrontier_Lounge5_Text_NatureGirlBold, - [NATURE_DOCILE] = BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky, - [NATURE_RELAXED] = BattleFrontier_Lounge5_Text_NatureGirlRelaxed, - [NATURE_IMPISH] = BattleFrontier_Lounge5_Text_NatureGirlImpish, - [NATURE_LAX] = BattleFrontier_Lounge5_Text_NatureGirlLax, - [NATURE_TIMID] = BattleFrontier_Lounge5_Text_NatureGirlTimid, - [NATURE_HASTY] = BattleFrontier_Lounge5_Text_NatureGirlHasty, - [NATURE_SERIOUS] = BattleFrontier_Lounge5_Text_NatureGirlSerious, - [NATURE_JOLLY] = BattleFrontier_Lounge5_Text_NatureGirlJolly, - [NATURE_NAIVE] = BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky, - [NATURE_MODEST] = BattleFrontier_Lounge5_Text_NatureGirlModest, - [NATURE_MILD] = BattleFrontier_Lounge5_Text_NatureGirlMild, - [NATURE_QUIET] = BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky, - [NATURE_BASHFUL] = BattleFrontier_Lounge5_Text_NatureGirlBashful, - [NATURE_RASH] = BattleFrontier_Lounge5_Text_NatureGirlRash, - [NATURE_CALM] = BattleFrontier_Lounge5_Text_NatureGirlCalm, - [NATURE_GENTLE] = BattleFrontier_Lounge5_Text_NatureGirlGentle, - [NATURE_SASSY] = BattleFrontier_Lounge5_Text_NatureGirlSassy, - [NATURE_CAREFUL] = BattleFrontier_Lounge5_Text_NatureGirlCareful, - [NATURE_QUIRKY] = BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky, - }; - u8 nature; if (gSpecialVar_0x8004 >= PARTY_SIZE) gSpecialVar_0x8004 = 0; nature = GetNature(&gPlayerParty[gSpecialVar_0x8004]); - ShowFieldMessage(sNatureGirlMessages[nature]); + ShowFieldMessage(gNaturesInfo[nature].natureGirlMessage); } void UpdateFrontierGambler(u16 daysSince) diff --git a/src/pokemon.c b/src/pokemon.c index 67f431658cc..045959461d8 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -374,6 +374,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Hardy"), .pokeBlockAnim = {ANIM_HARDY, AFFINE_NONE}, .backAnim = 0, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlHardy, .battlePalacePercents = PALACE_STYLE(61, 7, 61, 7), //32% support >= 50% HP, 32% support < 50% HP .battlePalaceFlavorText = B_MSG_EAGER_FOR_MORE, .battlePalaceSmokescreen = PALACE_TARGET_STRONGER, @@ -382,6 +383,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Lonely"), .pokeBlockAnim = {ANIM_LONELY, AFFINE_NONE}, .backAnim = 2, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlLonely, .battlePalacePercents = PALACE_STYLE(20, 25, 84, 8), //55%, 8% .battlePalaceFlavorText = B_MSG_GLINT_IN_EYE, .battlePalaceSmokescreen = PALACE_TARGET_STRONGER, @@ -390,6 +392,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Brave"), .pokeBlockAnim = {ANIM_BRAVE, AFFINE_TURN_UP}, .backAnim = 0, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlBrave, .battlePalacePercents = PALACE_STYLE(70, 15, 32, 60), //15%, 8% .battlePalaceFlavorText = B_MSG_GETTING_IN_POS, .battlePalaceSmokescreen = PALACE_TARGET_WEAKER, @@ -398,6 +401,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Adamant"), .pokeBlockAnim = {ANIM_ADAMANT, AFFINE_NONE}, .backAnim = 0, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlAdamant, .battlePalacePercents = PALACE_STYLE(38, 31, 70, 15), //31%, 15% .battlePalaceFlavorText = B_MSG_GLINT_IN_EYE, .battlePalaceSmokescreen = PALACE_TARGET_STRONGER, @@ -406,6 +410,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Naughty"), .pokeBlockAnim = {ANIM_NAUGHTY, AFFINE_NONE}, .backAnim = 0, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlNaughty, .battlePalacePercents = PALACE_STYLE(20, 70, 70, 22), //10%, 8% .battlePalaceFlavorText = B_MSG_GLINT_IN_EYE, .battlePalaceSmokescreen = PALACE_TARGET_WEAKER, @@ -414,6 +419,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Bold"), .pokeBlockAnim = {ANIM_BOLD, AFFINE_NONE}, .backAnim = 1, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlBold, .battlePalacePercents = PALACE_STYLE(30, 20, 32, 58), //50%, 10% .battlePalaceFlavorText = B_MSG_GETTING_IN_POS, .battlePalaceSmokescreen = PALACE_TARGET_WEAKER, @@ -422,6 +428,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Docile"), .pokeBlockAnim = {ANIM_DOCILE, AFFINE_NONE}, .backAnim = 1, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky, .battlePalacePercents = PALACE_STYLE(56, 22, 56, 22), //22%, 22% .battlePalaceFlavorText = B_MSG_EAGER_FOR_MORE, .battlePalaceSmokescreen = PALACE_TARGET_RANDOM, @@ -430,6 +437,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Relaxed"), .pokeBlockAnim = {ANIM_RELAXED, AFFINE_TURN_UP_AND_DOWN}, .backAnim = 1, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlRelaxed, .battlePalacePercents = PALACE_STYLE(25, 15, 75, 15), //60%, 10% .battlePalaceFlavorText = B_MSG_GLINT_IN_EYE, .battlePalaceSmokescreen = PALACE_TARGET_STRONGER, @@ -438,6 +446,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Impish"), .pokeBlockAnim = {ANIM_IMPISH, AFFINE_NONE}, .backAnim = 0, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlImpish, .battlePalacePercents = PALACE_STYLE(69, 6, 28, 55), //25%, 17% .battlePalaceFlavorText = B_MSG_GETTING_IN_POS, .battlePalaceSmokescreen = PALACE_TARGET_STRONGER, @@ -446,6 +455,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Lax"), .pokeBlockAnim = {ANIM_LAX, AFFINE_NONE}, .backAnim = 1, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlLax, .battlePalacePercents = PALACE_STYLE(35, 10, 29, 6), //55%, 65% .battlePalaceFlavorText = B_MSG_GROWL_DEEPLY, .battlePalaceSmokescreen = PALACE_TARGET_STRONGER, @@ -454,6 +464,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Timid"), .pokeBlockAnim = {ANIM_TIMID, AFFINE_NONE}, .backAnim = 2, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlTimid, .battlePalacePercents = PALACE_STYLE(62, 10, 30, 20), //28%, 50% .battlePalaceFlavorText = B_MSG_GROWL_DEEPLY, .battlePalaceSmokescreen = PALACE_TARGET_WEAKER, @@ -462,6 +473,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Hasty"), .pokeBlockAnim = {ANIM_HASTY, AFFINE_NONE}, .backAnim = 0, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlHasty, .battlePalacePercents = PALACE_STYLE(58, 37, 88, 6), //5%, 6% .battlePalaceFlavorText = B_MSG_GLINT_IN_EYE, .battlePalaceSmokescreen = PALACE_TARGET_WEAKER, @@ -470,6 +482,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Serious"), .pokeBlockAnim = {ANIM_SERIOUS, AFFINE_TURN_DOWN}, .backAnim = 1, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlSerious, .battlePalacePercents = PALACE_STYLE(34, 11, 29, 11), //55%, 60% .battlePalaceFlavorText = B_MSG_EAGER_FOR_MORE, .battlePalaceSmokescreen = PALACE_TARGET_WEAKER, @@ -478,6 +491,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Jolly"), .pokeBlockAnim = {ANIM_JOLLY, AFFINE_NONE}, .backAnim = 0, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlJolly, .battlePalacePercents = PALACE_STYLE(35, 5, 35, 60), //60%, 5% .battlePalaceFlavorText = B_MSG_GETTING_IN_POS, .battlePalaceSmokescreen = PALACE_TARGET_STRONGER, @@ -486,6 +500,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Naive"), .pokeBlockAnim = {ANIM_NAIVE, AFFINE_NONE}, .backAnim = 0, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky, .battlePalacePercents = PALACE_STYLE(56, 22, 56, 22), //22%, 22% .battlePalaceFlavorText = B_MSG_EAGER_FOR_MORE, .battlePalaceSmokescreen = PALACE_TARGET_RANDOM, @@ -494,6 +509,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Modest"), .pokeBlockAnim = {ANIM_MODEST, AFFINE_TURN_DOWN_SLOW}, .backAnim = 2, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlModest, .battlePalacePercents = PALACE_STYLE(35, 45, 34, 60), //20%, 6% .battlePalaceFlavorText = B_MSG_GETTING_IN_POS, .battlePalaceSmokescreen = PALACE_TARGET_WEAKER, @@ -502,6 +518,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Mild"), .pokeBlockAnim = {ANIM_MILD, AFFINE_NONE}, .backAnim = 2, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlMild, .battlePalacePercents = PALACE_STYLE(44, 50, 34, 6), //6%, 60% .battlePalaceFlavorText = B_MSG_GROWL_DEEPLY, .battlePalaceSmokescreen = PALACE_TARGET_STRONGER, @@ -510,6 +527,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Quiet"), .pokeBlockAnim = {ANIM_QUIET, AFFINE_NONE}, .backAnim = 2, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky, .battlePalacePercents = PALACE_STYLE(56, 22, 56, 22), //22%, 22% .battlePalaceFlavorText = B_MSG_EAGER_FOR_MORE, .battlePalaceSmokescreen = PALACE_TARGET_WEAKER, @@ -518,6 +536,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Bashful"), .pokeBlockAnim = {ANIM_BASHFUL, AFFINE_NONE}, .backAnim = 2, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlBashful, .battlePalacePercents = PALACE_STYLE(30, 58, 30, 58), //12%, 12% .battlePalaceFlavorText = B_MSG_EAGER_FOR_MORE, .battlePalaceSmokescreen = PALACE_TARGET_WEAKER, @@ -526,6 +545,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Rash"), .pokeBlockAnim = {ANIM_RASH, AFFINE_NONE}, .backAnim = 1, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlRash, .battlePalacePercents = PALACE_STYLE(30, 13, 27, 6), //57%, 67% .battlePalaceFlavorText = B_MSG_GROWL_DEEPLY, .battlePalaceSmokescreen = PALACE_TARGET_STRONGER, @@ -534,6 +554,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Calm"), .pokeBlockAnim = {ANIM_CALM, AFFINE_NONE}, .backAnim = 1, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlCalm, .battlePalacePercents = PALACE_STYLE(40, 50, 25, 62), //10%, 13% .battlePalaceFlavorText = B_MSG_GETTING_IN_POS, .battlePalaceSmokescreen = PALACE_TARGET_STRONGER, @@ -542,6 +563,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Gentle"), .pokeBlockAnim = {ANIM_GENTLE, AFFINE_TURN_DOWN_SLIGHT}, .backAnim = 2, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlGentle, .battlePalacePercents = PALACE_STYLE(18, 70, 90, 5), //12%, 5% .battlePalaceFlavorText = B_MSG_GLINT_IN_EYE, .battlePalaceSmokescreen = PALACE_TARGET_STRONGER, @@ -550,6 +572,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Sassy"), .pokeBlockAnim = {ANIM_SASSY, AFFINE_TURN_UP_HIGH}, .backAnim = 1, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlSassy, .battlePalacePercents = PALACE_STYLE(88, 6, 22, 20), //6%, 58% .battlePalaceFlavorText = B_MSG_GROWL_DEEPLY, .battlePalaceSmokescreen = PALACE_TARGET_WEAKER, @@ -558,6 +581,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Careful"), .pokeBlockAnim = {ANIM_CAREFUL, AFFINE_NONE}, .backAnim = 2, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlCareful, .battlePalacePercents = PALACE_STYLE(42, 50, 42, 5), //8%, 53% .battlePalaceFlavorText = B_MSG_GROWL_DEEPLY, .battlePalaceSmokescreen = PALACE_TARGET_WEAKER, @@ -566,6 +590,7 @@ const struct NatureInfo gNaturesInfo[NUM_NATURES] = .name = COMPOUND_STRING("Quirky"), .pokeBlockAnim = {ANIM_QUIRKY, AFFINE_NONE}, .backAnim = 1, + .natureGirlMessage = BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky, .battlePalacePercents = PALACE_STYLE(56, 22, 56, 22), //22%, 22% .battlePalaceFlavorText = B_MSG_EAGER_FOR_MORE, .battlePalaceSmokescreen = PALACE_TARGET_STRONGER,