diff --git a/src/data/text/nature_names.h b/src/data/text/nature_names.h deleted file mode 100644 index 5cf2d8024ca3..000000000000 --- a/src/data/text/nature_names.h +++ /dev/null @@ -1,54 +0,0 @@ -static const u8 sHardyNatureName[] = _("Hardy"); -static const u8 sLonelyNatureName[] = _("Lonely"); -static const u8 sBraveNatureName[] = _("Brave"); -static const u8 sAdamantNatureName[] = _("Adamant"); -static const u8 sNaughtyNatureName[] = _("Naughty"); -static const u8 sBoldNatureName[] = _("Bold"); -static const u8 sDocileNatureName[] = _("Docile"); -static const u8 sRelaxedNatureName[] = _("Relaxed"); -static const u8 sImpishNatureName[] = _("Impish"); -static const u8 sLaxNatureName[] = _("Lax"); -static const u8 sTimidNatureName[] = _("Timid"); -static const u8 sHastyNatureName[] = _("Hasty"); -static const u8 sSeriousNatureName[] = _("Serious"); -static const u8 sJollyNatureName[] = _("Jolly"); -static const u8 sNaiveNatureName[] = _("Naive"); -static const u8 sModestNatureName[] = _("Modest"); -static const u8 sMildNatureName[] = _("Mild"); -static const u8 sQuietNatureName[] = _("Quiet"); -static const u8 sBashfulNatureName[] = _("Bashful"); -static const u8 sRashNatureName[] = _("Rash"); -static const u8 sCalmNatureName[] = _("Calm"); -static const u8 sGentleNatureName[] = _("Gentle"); -static const u8 sSassyNatureName[] = _("Sassy"); -static const u8 sCarefulNatureName[] = _("Careful"); -static const u8 sQuirkyNatureName[] = _("Quirky"); - -const u8 *const gNatureNamePointers[NUM_NATURES] = -{ - [NATURE_HARDY] = sHardyNatureName, - [NATURE_LONELY] = sLonelyNatureName, - [NATURE_BRAVE] = sBraveNatureName, - [NATURE_ADAMANT] = sAdamantNatureName, - [NATURE_NAUGHTY] = sNaughtyNatureName, - [NATURE_BOLD] = sBoldNatureName, - [NATURE_DOCILE] = sDocileNatureName, - [NATURE_RELAXED] = sRelaxedNatureName, - [NATURE_IMPISH] = sImpishNatureName, - [NATURE_LAX] = sLaxNatureName, - [NATURE_TIMID] = sTimidNatureName, - [NATURE_HASTY] = sHastyNatureName, - [NATURE_SERIOUS] = sSeriousNatureName, - [NATURE_JOLLY] = sJollyNatureName, - [NATURE_NAIVE] = sNaiveNatureName, - [NATURE_MODEST] = sModestNatureName, - [NATURE_MILD] = sMildNatureName, - [NATURE_QUIET] = sQuietNatureName, - [NATURE_BASHFUL] = sBashfulNatureName, - [NATURE_RASH] = sRashNatureName, - [NATURE_CALM] = sCalmNatureName, - [NATURE_GENTLE] = sGentleNatureName, - [NATURE_SASSY] = sSassyNatureName, - [NATURE_CAREFUL] = sCarefulNatureName, - [NATURE_QUIRKY] = sQuirkyNatureName, -}; diff --git a/src/pokemon.c b/src/pokemon.c index a2e357f13416..96811a92dd24 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -362,6 +362,35 @@ const struct SpindaSpot gSpindaSpotGraphics[] = #include "data/pokemon/item_effects.h" +const u8 *const gNatureNamePointers[NUM_NATURES] = +{ + [NATURE_HARDY] = COMPOUND_STRING("Hardy"), + [NATURE_LONELY] = COMPOUND_STRING("Lonely"), + [NATURE_BRAVE] = COMPOUND_STRING("Brave"), + [NATURE_ADAMANT] = COMPOUND_STRING("Adamant"), + [NATURE_NAUGHTY] = COMPOUND_STRING("Naughty"), + [NATURE_BOLD] = COMPOUND_STRING("Bold"), + [NATURE_DOCILE] = COMPOUND_STRING("Docile"), + [NATURE_RELAXED] = COMPOUND_STRING("Relaxed"), + [NATURE_IMPISH] = COMPOUND_STRING("Impish"), + [NATURE_LAX] = COMPOUND_STRING("Lax"), + [NATURE_TIMID] = COMPOUND_STRING("Timid"), + [NATURE_HASTY] = COMPOUND_STRING("Hasty"), + [NATURE_SERIOUS] = COMPOUND_STRING("Serious"), + [NATURE_JOLLY] = COMPOUND_STRING("Jolly"), + [NATURE_NAIVE] = COMPOUND_STRING("Naive"), + [NATURE_MODEST] = COMPOUND_STRING("Modest"), + [NATURE_MILD] = COMPOUND_STRING("Mild"), + [NATURE_QUIET] = COMPOUND_STRING("Quiet"), + [NATURE_BASHFUL] = COMPOUND_STRING("Bashful"), + [NATURE_RASH] = COMPOUND_STRING("Rash"), + [NATURE_CALM] = COMPOUND_STRING("Calm"), + [NATURE_GENTLE] = COMPOUND_STRING("Gentle"), + [NATURE_SASSY] = COMPOUND_STRING("Sassy"), + [NATURE_CAREFUL] = COMPOUND_STRING("Careful"), + [NATURE_QUIRKY] = COMPOUND_STRING("Quirky"), +}; + const s8 gNatureStatTable[NUM_NATURES][NUM_NATURE_STATS] = { // Attack Defense Speed Sp.Atk Sp. Def [NATURE_HARDY] = { 0, 0, 0, 0, 0 }, diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 8502996620f1..b6a64c0211db 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -322,7 +322,6 @@ static void SummaryScreen_DestroyAnimDelayTask(void); // const rom data #include "data/text/move_descriptions.h" -#include "data/text/nature_names.h" static const struct BgTemplate sBgTemplates[] = {