Skip to content

Commit

Permalink
Add text fitting tests for move, ability, item, and pokedex descripti…
Browse files Browse the repository at this point in the history 
…ons (#5505)
  • Loading branch information
@kittenchilly
kittenchilly authored Oct 12, 2024
1 parent b5c8845 commit 743dc4d
Show file tree
Hide file tree
Showing 13 changed files with 212 additions and 165 deletions.
6 changes: 3 additions & 3 deletions src/data/abilities.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1550,7 +1550,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
[ABILITY_SLUSH_RUSH] =
{
.name = _("Slush Rush"),
.description = COMPOUND_STRING("Raises Speed in Hail or Snow."),
.description = COMPOUND_STRING("Raises Speed in Hail/Snow."),
.aiRating = 5,
},

Expand Down Expand Up @@ -2573,7 +2573,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
[ABILITY_TERA_SHELL] =
{
.name = _("Tera Shell"),
.description = COMPOUND_STRING("Resistant to types at full HP."),
.description = COMPOUND_STRING("Resists all at full HP."),
.aiRating = 10,
.cantBeCopied = TRUE,
.cantBeSwapped = TRUE,
Expand All @@ -2588,7 +2588,7 @@ const struct Ability gAbilitiesInfo[ABILITIES_COUNT] =
#else
.name = _("TeraformZero"),
#endif
.description = COMPOUND_STRING("Removes weather and terrain."),
.description = COMPOUND_STRING("Zeroes weather and terrain."),
.aiRating = 10,
.cantBeCopied = TRUE,
.cantBeSwapped = TRUE,
Expand Down
150 changes: 75 additions & 75 deletions src/data/items.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -538,9 +538,9 @@ const struct Item gItemsInfo[] =
.name = _("Sport Ball"),
.price = (I_PRICE < GEN_3 || I_PRICE >= GEN_9) ? 0 : 300,
.description = COMPOUND_STRING(
"A special Ball used\n"
"in the Bug-Catching\n"
"Contest."),
"A special Ball\n"
"used in the Bug-\n"
"Catching Contest."),
.pocket = POCKET_POKE_BALLS,
.type = ITEM_USE_BAG_MENU,
.battleUsage = EFFECT_ITEM_THROW_BALL,
Expand Down Expand Up @@ -3176,9 +3176,9 @@ const struct Item gItemsInfo[] =
.name = _("Jaw Fossil"),
.price = (I_PRICE >= GEN_7) ? 7000: 1000,
.description = COMPOUND_STRING(
"A piece of a prehis-\n"
"toric Pokémon's\n"
"large jaw."),
"A piece of a\n"
"prehistoric Poké-\n"
"mon's large jaw."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand All @@ -3192,9 +3192,9 @@ const struct Item gItemsInfo[] =
.name = _("Sail Fossil"),
.price = (I_PRICE >= GEN_7) ? 7000: 1000,
.description = COMPOUND_STRING(
"A piece of a prehis-\n"
"toric Pokémon's\n"
"skin sail."),
"A piece of a\n"
"prehistoric Poké-\n"
"mon's skin sail."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand Down Expand Up @@ -4169,8 +4169,8 @@ const struct Item gItemsInfo[] =
.price = (I_PRICE >= GEN_7) ? 2000 * TREASURE_FACTOR : 2100,
.description = COMPOUND_STRING(
"Loved by a certain\n"
"Pokémon. Imbued with\n"
"spiritual energy."),
"Pokémon. Imbued\n"
"with spirit energy."),
.pocket = POCKET_ITEMS,
.type = EVO_HELD_ITEM_TYPE,
.fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC,
Expand All @@ -4186,8 +4186,8 @@ const struct Item gItemsInfo[] =
.price = (I_PRICE >= GEN_9) ? 3000 : ((I_PRICE >= GEN_7) ? 2000 : 500),
.description = COMPOUND_STRING(
"A mysterious scale\n"
"that evolves certain\n"
"Pokémon. It shines."),
"that evolves a\n"
"certain Pokémon."),
.pocket = POCKET_ITEMS,
.type = EVO_HELD_ITEM_TYPE,
.fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC,
Expand Down Expand Up @@ -4220,8 +4220,8 @@ const struct Item gItemsInfo[] =
.name = _("Sachet"),
.price = (I_PRICE >= GEN_7) ? 2000 * TREASURE_FACTOR : 2100,
.description = COMPOUND_STRING(
"A sachet filled with\n"
"perfumes loved by\n"
"A sachet of strong\n"
"perfumes, loved by\n"
"a certain Pokémon."),
.pocket = POCKET_ITEMS,
.type = EVO_HELD_ITEM_TYPE,
Expand All @@ -4237,9 +4237,9 @@ const struct Item gItemsInfo[] =
.name = _("Oval Stone"),
.price = (I_PRICE >= GEN_7) ? 2000 : 2100,
.description = COMPOUND_STRING(
"Makes a certain\n"
"Pokémon evolve. It's\n"
"shaped like an egg."),
"Peculiar stone\n"
"that evolves a\n"
"certain Pokémon."),
.pocket = POCKET_ITEMS,
.type = EVO_HELD_ITEM_TYPE,
.fieldUseFunc = EVO_HELD_ITEM_FIELD_FUNC,
Expand Down Expand Up @@ -4749,8 +4749,8 @@ const struct Item gItemsInfo[] =
.holdEffect = HOLD_EFFECT_PLATE,
.holdEffectParam = 20,
.description = COMPOUND_STRING(
"A stone tablet that\n"
"boosts the power of\n"
"A tablet that ups\n"
"the power of\n"
"Fairy-type moves."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
Expand Down Expand Up @@ -4945,7 +4945,7 @@ const struct Item gItemsInfo[] =
.holdEffect = HOLD_EFFECT_MEMORY,
.holdEffectParam = 0,
.description = COMPOUND_STRING(
"A disc with Fighting\n"
"Disc with Fighting\n"
"type data. It swaps\n"
"Silvally's type."),
.pocket = POCKET_ITEMS,
Expand Down Expand Up @@ -7053,9 +7053,9 @@ const struct Item gItemsInfo[] =
.price = (I_PRICE >= GEN_7) ? 1000 : 10,
.holdEffect = HOLD_EFFECT_QUICK_POWDER,
.description = COMPOUND_STRING(
"An item to be held\n"
"by Ditto. This odd\n"
"powder boosts Speed."),
"A hold item that\n"
"raises the Speed\n"
"of Ditto."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand Down Expand Up @@ -7132,9 +7132,9 @@ const struct Item gItemsInfo[] =
.holdEffect = HOLD_EFFECT_ADAMANT_ORB,
.holdEffectParam = 20,
.description = COMPOUND_STRING(
"Boosts the power of\n"
"Dialga's Dragon and\n"
"Steel-type moves."),
"Powers up Dialga's\n"
"Dragon and Steel-\n"
"type moves."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand All @@ -7150,9 +7150,9 @@ const struct Item gItemsInfo[] =
.holdEffect = HOLD_EFFECT_LUSTROUS_ORB,
.holdEffectParam = 20,
.description = COMPOUND_STRING(
"Boosts the power of\n"
"Palkia's Dragon and\n"
"Water-type moves."),
"Powers up Palkia's\n"
"Dragon and Water-\n"
"type moves."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand All @@ -7168,7 +7168,7 @@ const struct Item gItemsInfo[] =
.holdEffect = HOLD_EFFECT_GRISEOUS_ORB,
.holdEffectParam = 20,
.description = COMPOUND_STRING(
"Powers up Giratina's\n"
"Boosts Giratina's\n"
"Dragon and Ghost-\n"
"type moves."),
.pocket = POCKET_ITEMS,
Expand Down Expand Up @@ -8107,9 +8107,9 @@ const struct Item gItemsInfo[] =
.holdEffect = HOLD_EFFECT_CELL_BATTERY,
.holdEffectParam = 0,
.description = COMPOUND_STRING(
"Raises Atk if the\n"
"holder is hit by an\n"
"Electric-type move."),
"Raises Attack if\n"
"the holder is hit by\n"
"an Electric move."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand Down Expand Up @@ -8454,8 +8454,8 @@ const struct Item gItemsInfo[] =
.holdEffectParam = 10,
.description = COMPOUND_STRING(
"A headband that\n"
"boosts the power of\n"
"physical moves."),
"boosts the power\n"
"of physical moves."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand Down Expand Up @@ -8525,9 +8525,9 @@ const struct Item gItemsInfo[] =
.price = (I_PRICE >= GEN_9) ? 50000 : ((I_PRICE >= GEN_7) ? 4000 : 200),
.holdEffect = HOLD_EFFECT_LIFE_ORB,
.description = COMPOUND_STRING(
"Boosts the power of\n"
"moves at the cost\n"
"of some HP per turn."),
"Boosts move power\n"
"but holder loses HP\n"
"with each attack."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand Down Expand Up @@ -8614,9 +8614,9 @@ const struct Item gItemsInfo[] =
.price = (I_PRICE >= GEN_9) ? 20000 : ((I_PRICE >= GEN_7) ? 4000 : 200),
.holdEffect = HOLD_EFFECT_IRON_BALL,
.description = COMPOUND_STRING(
"Cuts Speed and lets\n"
"Flying-types be hit\n"
"by Ground moves."),
"Cuts Speed and\n"
"becomes vulnerable\n"
"to Ground moves."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand Down Expand Up @@ -8663,9 +8663,9 @@ const struct Item gItemsInfo[] =
.price = (I_PRICE >= GEN_9) ? 10000 : ((I_PRICE >= GEN_7) ? 4000 : 200),
.holdEffect = HOLD_EFFECT_BLACK_SLUDGE,
.description = COMPOUND_STRING(
"Gradually restores\n"
"HP of Poison-types.\n"
"Damages others."),
"Restores HP for\n"
"Poison-types.\n"
"Damages all others."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand All @@ -8680,9 +8680,9 @@ const struct Item gItemsInfo[] =
.price = (I_PRICE >= GEN_9) ? 10000 : ((I_PRICE >= GEN_7) ? 4000 : 200),
.holdEffect = HOLD_EFFECT_GRIP_CLAW,
.description = COMPOUND_STRING(
"Makes binding moves\n"
"used by the holder\n"
"go on for 7 turns."),
"A held item that\n"
"extends binding\n"
"moves like Wrap."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand All @@ -8698,8 +8698,8 @@ const struct Item gItemsInfo[] =
.holdEffect = HOLD_EFFECT_STICKY_BARB,
.description = COMPOUND_STRING(
"Damages the holder\n"
"each turn. May latch\n"
"on to foes."),
"each turn. May\n"
"latch on to foes."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand All @@ -8714,9 +8714,9 @@ const struct Item gItemsInfo[] =
.price = (I_PRICE >= GEN_9) ? 20000 : ((I_PRICE >= GEN_7) ? 4000 : 100),
.holdEffect = HOLD_EFFECT_SHED_SHELL,
.description = COMPOUND_STRING(
"Enables the holder\n"
"to switch out of\n"
"battle without fail."),
"Allows the holder\n"
"to switch out\n"
"without fail."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand All @@ -8733,7 +8733,7 @@ const struct Item gItemsInfo[] =
.holdEffectParam = 30,
.description = COMPOUND_STRING(
"A held item that\n"
"boosts the power of\n"
"ups the power of\n"
"HP-stealing moves."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
Expand Down Expand Up @@ -8837,9 +8837,9 @@ const struct Item gItemsInfo[] =
.holdEffect = HOLD_EFFECT_AIR_BALLOON,
.holdEffectParam = 0,
.description = COMPOUND_STRING(
"Elevates the holder\n"
"in the air. If hit,\n"
"this item will burst."),
"Makes the holder\n"
"float but bursts\n"
"if hit by an attack."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand Down Expand Up @@ -8873,9 +8873,9 @@ const struct Item gItemsInfo[] =
.holdEffect = HOLD_EFFECT_RING_TARGET,
.holdEffectParam = 0,
.description = COMPOUND_STRING(
"Moves that wouldn't\n"
"have effect will\n"
"land on its holder."),
"Moves that usually\n"
"have no effect will\n"
"hit the holder."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand Down Expand Up @@ -8927,9 +8927,9 @@ const struct Item gItemsInfo[] =
.holdEffect = HOLD_EFFECT_WEAKNESS_POLICY,
.holdEffectParam = 0,
.description = COMPOUND_STRING(
"If hit by a Super\n"
"Effective move, ups\n"
"Atk and Sp. Atk."),
"If hit by a super-\n"
"effective move,\n"
"ups Atk and Sp. Atk."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand Down Expand Up @@ -8980,9 +8980,9 @@ const struct Item gItemsInfo[] =
.price = (I_PRICE >= GEN_9) ? 5000 : ((I_PRICE >= GEN_8) ? 4000 : 300),
.holdEffect = HOLD_EFFECT_ADRENALINE_ORB,
.description = COMPOUND_STRING(
"Boosts Speed if the\n"
"user is intimidated,\n"
"but only one time."),
"This orb boosts\n"
"Speed if the holder\n"
"is intimidated."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand Down Expand Up @@ -13042,9 +13042,9 @@ const struct Item gItemsInfo[] =
.price = 20000,
.holdEffect = HOLD_EFFECT_COVERT_CLOAK,
.description = COMPOUND_STRING(
"Protects the holder\n"
"from secondary\n"
"move effects."),
"Protects holder\n"
"from additional\n"
"effects of moves."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand Down Expand Up @@ -14009,11 +14009,11 @@ const struct Item gItemsInfo[] =
.description = COMPOUND_STRING(
#if B_X_ITEMS_BUFF >= GEN_7
"Sharply raises\n"
"offenses & defenses\n"
"offense & defense\n"
"during one battle."),
#else
"Raises offenses\n"
"and defenses during\n"
"Raises offense\n"
"and defense during\n"
"one battle."),
#endif
.pocket = POCKET_ITEMS,
Expand Down Expand Up @@ -14068,9 +14068,9 @@ const struct Item gItemsInfo[] =
.name = _("Pokéshi Doll"),
.price = 2000,
.description = COMPOUND_STRING(
"A wooden toy carved\n"
"in the image of a\n"
"Pokémon. Can be sold."),
"A wooden toy\n"
"resembling a Poké-.\n"
"mon. Can be sold."),
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
Expand Down
Loading

0 comments on commit 743dc4d

Please sign in to comment.