added data for max moves
This commit is contained in:
AgustinGDLV
parent
7981887f0a
commit
056048daf9
9 changed files with 2514 additions and 6 deletions
|
|
@ -780,7 +780,7 @@ gBattleAnims_Moves::
|
|||
.4byte Move_GLACIAL_LANCE
|
||||
.4byte Move_ASTRAL_BARRAGE
|
||||
.4byte Move_EERIE_SPELL
|
||||
@@@@LA MOVES
|
||||
@@@@ LA MOVES
|
||||
.4byte Move_DIRE_CLAW
|
||||
.4byte Move_PSYSHIELD_BASH
|
||||
.4byte Move_POWER_SHIFT
|
||||
|
|
@ -841,6 +841,44 @@ gBattleAnims_Moves::
|
|||
.4byte Move_MENACING_MOONRAZE_MAELSTROM
|
||||
.4byte Move_LIGHT_THAT_BURNS_THE_SKY
|
||||
.4byte Move_SOUL_STEALING_7_STAR_STRIKE
|
||||
@@@@ MAX MOVES
|
||||
.4byte Move_MAX_GUARD
|
||||
.4byte Move_MAX_STRIKE_P
|
||||
.4byte Move_MAX_STRIKE_S
|
||||
.4byte Move_MAX_KNUCKLE_P
|
||||
.4byte Move_MAX_KNUCKLE_S
|
||||
.4byte Move_MAX_AIRSTREAM_P
|
||||
.4byte Move_MAX_AIRSTREAM_S
|
||||
.4byte Move_MAX_OOZE_P
|
||||
.4byte Move_MAX_OOZE_S
|
||||
.4byte Move_MAX_QUAKE_P
|
||||
.4byte Move_MAX_QUAKE_S
|
||||
.4byte Move_MAX_ROCKFALL_P
|
||||
.4byte Move_MAX_ROCKFALL_S
|
||||
.4byte Move_MAX_FLUTTERBY_P
|
||||
.4byte Move_MAX_FLUTTERBY_S
|
||||
.4byte Move_MAX_PHANTASM_P
|
||||
.4byte Move_MAX_PHANTASM_S
|
||||
.4byte Move_MAX_STEELSPIKE_P
|
||||
.4byte Move_MAX_STEELSPIKE_S
|
||||
.4byte Move_MAX_FLARE_P
|
||||
.4byte Move_MAX_FLARE_S
|
||||
.4byte Move_MAX_GEYSER_P
|
||||
.4byte Move_MAX_GEYSER_S
|
||||
.4byte Move_MAX_OVERGROWTH_P
|
||||
.4byte Move_MAX_OVERGROWTH_S
|
||||
.4byte Move_MAX_LIGHTNING_P
|
||||
.4byte Move_MAX_LIGHTNING_S
|
||||
.4byte Move_MAX_HAILSTORM_P
|
||||
.4byte Move_MAX_HAILSTORM_S
|
||||
.4byte Move_MAX_MINDSTORM_P
|
||||
.4byte Move_MAX_MINDSTORM_S
|
||||
.4byte Move_MAX_WYRMWIND_P
|
||||
.4byte Move_MAX_WYRMWIND_S
|
||||
.4byte Move_MAX_DARKNESS_P
|
||||
.4byte Move_MAX_DARKNESS_S
|
||||
.4byte Move_MAX_STARFALL_P
|
||||
.4byte Move_MAX_STARFALL_S
|
||||
@@@ Last Move - cannot be reached
|
||||
.4byte Move_COUNT
|
||||
|
||||
|
|
@ -30632,3 +30670,43 @@ SoulStealingSevenStarStrikeExplosion:
|
|||
launchtemplate gSoulStealExplosionSpriteTemplate 0x83 0x4 0x10 0x10 ANIM_TARGET 0x1
|
||||
delay 0x6
|
||||
return
|
||||
|
||||
@@@@@@@@@@ MAX MOVES @@@@@@@@@@
|
||||
Move_MAX_GUARD:
|
||||
Move_MAX_KNUCKLE_P::
|
||||
Move_MAX_KNUCKLE_S::
|
||||
Move_MAX_QUAKE_P::
|
||||
Move_MAX_QUAKE_S::
|
||||
Move_MAX_ROCKFALL_P::
|
||||
Move_MAX_ROCKFALL_S::
|
||||
Move_MAX_FLUTTERBY_P::
|
||||
Move_MAX_FLUTTERBY_S::
|
||||
Move_MAX_PHANTASM_P::
|
||||
Move_MAX_PHANTASM_S::
|
||||
Move_MAX_STEELSPIKE_P::
|
||||
Move_MAX_STEELSPIKE_S::
|
||||
Move_MAX_HAILSTORM_P::
|
||||
Move_MAX_HAILSTORM_S::
|
||||
Move_MAX_MINDSTORM_P::
|
||||
Move_MAX_MINDSTORM_S::
|
||||
Move_MAX_WYRMWIND_P::
|
||||
Move_MAX_WYRMWIND_S::
|
||||
Move_MAX_DARKNESS_P::
|
||||
Move_MAX_DARKNESS_S::
|
||||
Move_MAX_STARFALL_P::
|
||||
Move_MAX_STARFALL_S::
|
||||
Move_MAX_STRIKE_P::
|
||||
Move_MAX_STRIKE_S::
|
||||
Move_MAX_AIRSTREAM_P::
|
||||
Move_MAX_AIRSTREAM_S::
|
||||
Move_MAX_OOZE_P::
|
||||
Move_MAX_OOZE_S::
|
||||
Move_MAX_FLARE_P::
|
||||
Move_MAX_FLARE_S::
|
||||
Move_MAX_GEYSER_P::
|
||||
Move_MAX_GEYSER_S::
|
||||
Move_MAX_OVERGROWTH_P::
|
||||
Move_MAX_OVERGROWTH_S::
|
||||
Move_MAX_LIGHTNING_P::
|
||||
Move_MAX_LIGHTNING_S::
|
||||
end
|
||||
|
|
|
|||
|
|
@ -415,6 +415,15 @@ gBattleScriptsForMoveEffects::
|
|||
.4byte BattleScript_EffectSteelBeam @ EFFECT_STEEL_BEAM
|
||||
.4byte BattleScript_EffectExtremeEvoboost @ EFFECT_EXTREME_EVOBOOST
|
||||
.4byte BattleScript_EffectTerrainHit @ EFFECT_DAMAGE_SET_TERRAIN
|
||||
.4byte BattleScript_EffectMaxMove @ EFFECT_MAX_MOVE
|
||||
|
||||
BattleScript_EffectMaxMove::
|
||||
attackcanceler
|
||||
@setmaxmoveeffect
|
||||
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
|
||||
attackstring
|
||||
ppreduce
|
||||
goto BattleScript_HitFromCritCalc
|
||||
|
||||
BattleScript_AffectionBasedEndurance::
|
||||
playanimation BS_TARGET, B_ANIM_AFFECTION_HANGED_ON
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
#include "battle_bg.h"
|
||||
#include "pokeball.h"
|
||||
#include "battle_debug.h"
|
||||
#include "battle_dynamax.h"
|
||||
|
||||
#define GET_BATTLER_SIDE(battler) (GetBattlerPosition(battler) & BIT_SIDE)
|
||||
#define GET_BATTLER_SIDE2(battler) (gBattlerPositions[battler] & BIT_SIDE)
|
||||
|
|
|
|||
55
include/battle_dynamax.h
Normal file
55
include/battle_dynamax.h
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
#ifndef GUARD_BATTLE_RAID_H
|
||||
#define GUARD_BATTLE_RAID_H
|
||||
|
||||
enum MaxMoveEffect
|
||||
{
|
||||
MAX_EFFECT_NONE,
|
||||
MAX_EFFECT_RAISE_TEAM_ATTACK,
|
||||
MAX_EFFECT_RAISE_TEAM_DEFENSE,
|
||||
MAX_EFFECT_RAISE_TEAM_SPEED,
|
||||
MAX_EFFECT_RAISE_TEAM_SP_ATK,
|
||||
MAX_EFFECT_RAISE_TEAM_SP_DEF,
|
||||
MAX_EFFECT_LOWER_ATTACK,
|
||||
MAX_EFFECT_LOWER_DEFENSE,
|
||||
MAX_EFFECT_LOWER_SPEED,
|
||||
MAX_EFFECT_LOWER_SP_ATK,
|
||||
MAX_EFFECT_LOWER_SP_DEF,
|
||||
MAX_EFFECT_SUN,
|
||||
MAX_EFFECT_RAIN,
|
||||
MAX_EFFECT_SANDSTORM,
|
||||
MAX_EFFECT_HAIL,
|
||||
MAX_EFFECT_MISTY_TERRAIN,
|
||||
MAX_EFFECT_GRASSY_TERRAIN,
|
||||
MAX_EFFECT_ELECTRIC_TERRAIN,
|
||||
MAX_EFFECT_PSYCHIC_TERRAIN,
|
||||
MAX_EFFECT_VINE_LASH,
|
||||
MAX_EFFECT_WILDFIRE,
|
||||
MAX_EFFECT_CANNONADE,
|
||||
MAX_EFFECT_EFFECT_SPORE_FOES,
|
||||
MAX_EFFECT_PARALYZE_FOES,
|
||||
MAX_EFFECT_CONFUSE_FOES_PAY_DAY,
|
||||
MAX_EFFECT_CRIT_PLUS,
|
||||
MAX_EFFECT_MEAN_LOOK,
|
||||
MAX_EFFECT_AURORA_VEIL,
|
||||
MAX_EFFECT_INFATUATE_FOES,
|
||||
MAX_EFFECT_RECYCLE_BERRIES,
|
||||
MAX_EFFECT_POISON_FOES,
|
||||
MAX_EFFECT_STEALTH_ROCK,
|
||||
MAX_EFFECT_DEFOG,
|
||||
MAX_EFFECT_POISON_PARALYZE_FOES,
|
||||
MAX_EFFECT_HEAL_TEAM,
|
||||
MAX_EFFECT_SPITE,
|
||||
MAX_EFFECT_GRAVITY,
|
||||
MAX_EFFECT_VOLCAITH_FOES,
|
||||
MAX_EFFECT_SANDBLAST_FOES,
|
||||
MAX_EFFECT_YAWN_FOE,
|
||||
MAX_EFFECT_LOWER_EVASIVENESS_FOES,
|
||||
MAX_EFFECT_AROMATHERAPY,
|
||||
MAX_EFFECT_CONFUSE_FOES,
|
||||
MAX_EFFECT_STEELSURGE,
|
||||
MAX_EFFECT_TORMENT_FOES,
|
||||
MAX_EFFECT_LOWER_SPEED_2_FOES,
|
||||
MAX_EFFECT_FIRE_SPIN_FOES,
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
@ -396,7 +396,8 @@
|
|||
#define EFFECT_STEEL_BEAM 390
|
||||
#define EFFECT_EXTREME_EVOBOOST 391
|
||||
#define EFFECT_DAMAGE_SET_TERRAIN 392 // genesis supernova
|
||||
#define EFFECT_MAX_MOVE 393
|
||||
|
||||
#define NUM_BATTLE_MOVE_EFFECTS 393
|
||||
#define NUM_BATTLE_MOVE_EFFECTS 394
|
||||
|
||||
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H
|
||||
|
|
|
|||
|
|
@ -830,6 +830,7 @@
|
|||
#define MOVE_DEVASTATING_DRAKE (MOVES_COUNT + 15)
|
||||
#define MOVE_BLACK_HOLE_ECLIPSE (MOVES_COUNT + 16)
|
||||
#define MOVE_TWINKLE_TACKLE (MOVES_COUNT + 17)
|
||||
|
||||
// Signature Z Moves
|
||||
#define MOVE_CATASTROPIKA (MOVES_COUNT + 18)
|
||||
#define MOVE_10000000_VOLT_THUNDERBOLT (MOVES_COUNT + 19)
|
||||
|
|
@ -854,6 +855,117 @@
|
|||
|
||||
#define MOVES_COUNT_Z (LAST_Z_MOVE + 1)
|
||||
|
||||
//Max Moves
|
||||
#define MOVE_MAX_GUARD (FIRST_MAX_MOVE + 0)
|
||||
#define MOVE_MAX_STRIKE_P (FIRST_MAX_MOVE + 1)
|
||||
#define MOVE_MAX_STRIKE_S (FIRST_MAX_MOVE + 2)
|
||||
#define MOVE_MAX_KNUCKLE_P (FIRST_MAX_MOVE + 3)
|
||||
#define MOVE_MAX_KNUCKLE_S (FIRST_MAX_MOVE + 4)
|
||||
#define MOVE_MAX_AIRSTREAM_P (FIRST_MAX_MOVE + 5)
|
||||
#define MOVE_MAX_AIRSTREAM_S (FIRST_MAX_MOVE + 6)
|
||||
#define MOVE_MAX_OOZE_P (FIRST_MAX_MOVE + 7)
|
||||
#define MOVE_MAX_OOZE_S (FIRST_MAX_MOVE + 8)
|
||||
#define MOVE_MAX_QUAKE_P (FIRST_MAX_MOVE + 9)
|
||||
#define MOVE_MAX_QUAKE_S (FIRST_MAX_MOVE + 10)
|
||||
#define MOVE_MAX_ROCKFALL_P (FIRST_MAX_MOVE + 11)
|
||||
#define MOVE_MAX_ROCKFALL_S (FIRST_MAX_MOVE + 12)
|
||||
#define MOVE_MAX_FLUTTERBY_P (FIRST_MAX_MOVE + 13)
|
||||
#define MOVE_MAX_FLUTTERBY_S (FIRST_MAX_MOVE + 14)
|
||||
#define MOVE_MAX_PHANTASM_P (FIRST_MAX_MOVE + 15)
|
||||
#define MOVE_MAX_PHANTASM_S (FIRST_MAX_MOVE + 16)
|
||||
#define MOVE_MAX_STEELSPIKE_P (FIRST_MAX_MOVE + 17)
|
||||
#define MOVE_MAX_STEELSPIKE_S (FIRST_MAX_MOVE + 18)
|
||||
#define MOVE_MAX_FLARE_P (FIRST_MAX_MOVE + 19)
|
||||
#define MOVE_MAX_FLARE_S (FIRST_MAX_MOVE + 20)
|
||||
#define MOVE_MAX_GEYSER_P (FIRST_MAX_MOVE + 21)
|
||||
#define MOVE_MAX_GEYSER_S (FIRST_MAX_MOVE + 22)
|
||||
#define MOVE_MAX_OVERGROWTH_P (FIRST_MAX_MOVE + 23)
|
||||
#define MOVE_MAX_OVERGROWTH_S (FIRST_MAX_MOVE + 24)
|
||||
#define MOVE_MAX_LIGHTNING_P (FIRST_MAX_MOVE + 25)
|
||||
#define MOVE_MAX_LIGHTNING_S (FIRST_MAX_MOVE + 26)
|
||||
#define MOVE_MAX_MINDSTORM_P (FIRST_MAX_MOVE + 27)
|
||||
#define MOVE_MAX_MINDSTORM_S (FIRST_MAX_MOVE + 28)
|
||||
#define MOVE_MAX_HAILSTORM_P (FIRST_MAX_MOVE + 29)
|
||||
#define MOVE_MAX_HAILSTORM_S (FIRST_MAX_MOVE + 30)
|
||||
#define MOVE_MAX_WYRMWIND_P (FIRST_MAX_MOVE + 31)
|
||||
#define MOVE_MAX_WYRMWIND_S (FIRST_MAX_MOVE + 32)
|
||||
#define MOVE_MAX_DARKNESS_P (FIRST_MAX_MOVE + 33)
|
||||
#define MOVE_MAX_DARKNESS_S (FIRST_MAX_MOVE + 34)
|
||||
#define MOVE_MAX_STARFALL_P (FIRST_MAX_MOVE + 35)
|
||||
#define MOVE_MAX_STARFALL_S (FIRST_MAX_MOVE + 36)
|
||||
// Gigantamax Moves
|
||||
#define MOVE_G_MAX_VINE_LASH_P (FIRST_MAX_MOVE + 37)
|
||||
#define MOVE_G_MAX_VINE_LASH_S (FIRST_MAX_MOVE + 38)
|
||||
#define MOVE_G_MAX_WILDFIRE_P (FIRST_MAX_MOVE + 39)
|
||||
#define MOVE_G_MAX_WILDFIRE_S (FIRST_MAX_MOVE + 40)
|
||||
#define MOVE_G_MAX_CANNONADE_P (FIRST_MAX_MOVE + 41)
|
||||
#define MOVE_G_MAX_CANNONADE_S (FIRST_MAX_MOVE + 42)
|
||||
#define MOVE_G_MAX_BEFUDDLE_P (FIRST_MAX_MOVE + 43)
|
||||
#define MOVE_G_MAX_BEFUDDLE_S (FIRST_MAX_MOVE + 44)
|
||||
#define MOVE_G_MAX_VOLT_CRASH_P (FIRST_MAX_MOVE + 45)
|
||||
#define MOVE_G_MAX_VOLT_CRASH_S (FIRST_MAX_MOVE + 46)
|
||||
#define MOVE_G_MAX_GOLD_RUSH_P (FIRST_MAX_MOVE + 47)
|
||||
#define MOVE_G_MAX_GOLD_RUSH_S (FIRST_MAX_MOVE + 48)
|
||||
#define MOVE_G_MAX_CHI_STRIKE_P (FIRST_MAX_MOVE + 49)
|
||||
#define MOVE_G_MAX_CHI_STRIKE_S (FIRST_MAX_MOVE + 50)
|
||||
#define MOVE_G_MAX_TERROR_P (FIRST_MAX_MOVE + 51)
|
||||
#define MOVE_G_MAX_TERROR_S (FIRST_MAX_MOVE + 52)
|
||||
#define MOVE_G_MAX_FOAM_BURST_P (FIRST_MAX_MOVE + 53)
|
||||
#define MOVE_G_MAX_FOAM_BURST_S (FIRST_MAX_MOVE + 54)
|
||||
#define MOVE_G_MAX_RESONANCE_P (FIRST_MAX_MOVE + 55)
|
||||
#define MOVE_G_MAX_RESONANCE_S (FIRST_MAX_MOVE + 56)
|
||||
#define MOVE_G_MAX_CUDDLE_P (FIRST_MAX_MOVE + 57)
|
||||
#define MOVE_G_MAX_CUDDLE_S (FIRST_MAX_MOVE + 58)
|
||||
#define MOVE_G_MAX_REPLENISH_P (FIRST_MAX_MOVE + 59)
|
||||
#define MOVE_G_MAX_REPLENISH_S (FIRST_MAX_MOVE + 60)
|
||||
#define MOVE_G_MAX_MALODOR_P (FIRST_MAX_MOVE + 61)
|
||||
#define MOVE_G_MAX_MALODOR_S (FIRST_MAX_MOVE + 62)
|
||||
#define MOVE_G_MAX_MELTDOWN_P (FIRST_MAX_MOVE + 63)
|
||||
#define MOVE_G_MAX_MELTDOWN_S (FIRST_MAX_MOVE + 64)
|
||||
#define MOVE_G_MAX_DRUM_SOLO_P (FIRST_MAX_MOVE + 65)
|
||||
#define MOVE_G_MAX_DRUM_SOLO_S (FIRST_MAX_MOVE + 66)
|
||||
#define MOVE_G_MAX_FIREBALL_P (FIRST_MAX_MOVE + 67)
|
||||
#define MOVE_G_MAX_FIREBALL_S (FIRST_MAX_MOVE + 68)
|
||||
#define MOVE_G_MAX_HYDROSNIPE_P (FIRST_MAX_MOVE + 69)
|
||||
#define MOVE_G_MAX_HYDROSNIPE_S (FIRST_MAX_MOVE + 70)
|
||||
#define MOVE_G_MAX_WIND_RAGE_P (FIRST_MAX_MOVE + 71)
|
||||
#define MOVE_G_MAX_WIND_RAGE_S (FIRST_MAX_MOVE + 72)
|
||||
#define MOVE_G_MAX_GRAVITAS_P (FIRST_MAX_MOVE + 73)
|
||||
#define MOVE_G_MAX_GRAVITAS_S (FIRST_MAX_MOVE + 74)
|
||||
#define MOVE_G_MAX_STONESURGE_P (FIRST_MAX_MOVE + 75)
|
||||
#define MOVE_G_MAX_STONESURGE_S (FIRST_MAX_MOVE + 76)
|
||||
#define MOVE_G_MAX_VOLCALITH_P (FIRST_MAX_MOVE + 77)
|
||||
#define MOVE_G_MAX_VOLCALITH_S (FIRST_MAX_MOVE + 78)
|
||||
#define MOVE_G_MAX_TARTNESS_P (FIRST_MAX_MOVE + 79)
|
||||
#define MOVE_G_MAX_TARTNESS_S (FIRST_MAX_MOVE + 80)
|
||||
#define MOVE_G_MAX_SWEETNESS_P (FIRST_MAX_MOVE + 81)
|
||||
#define MOVE_G_MAX_SWEETNESS_S (FIRST_MAX_MOVE + 82)
|
||||
#define MOVE_G_MAX_SANDBLAST_P (FIRST_MAX_MOVE + 83)
|
||||
#define MOVE_G_MAX_SANDBLAST_S (FIRST_MAX_MOVE + 84)
|
||||
#define MOVE_G_MAX_STUN_SHOCK_P (FIRST_MAX_MOVE + 85)
|
||||
#define MOVE_G_MAX_STUN_SHOCK_S (FIRST_MAX_MOVE + 86)
|
||||
#define MOVE_G_MAX_CENTIFERNO_P (FIRST_MAX_MOVE + 87)
|
||||
#define MOVE_G_MAX_CENTIFERNO_S (FIRST_MAX_MOVE + 88)
|
||||
#define MOVE_G_MAX_SMITE_P (FIRST_MAX_MOVE + 89)
|
||||
#define MOVE_G_MAX_SMITE_S (FIRST_MAX_MOVE + 90)
|
||||
#define MOVE_G_MAX_SNOOZE_P (FIRST_MAX_MOVE + 91)
|
||||
#define MOVE_G_MAX_SNOOZE_S (FIRST_MAX_MOVE + 92)
|
||||
#define MOVE_G_MAX_FINALE_P (FIRST_MAX_MOVE + 93)
|
||||
#define MOVE_G_MAX_FINALE_S (FIRST_MAX_MOVE + 94)
|
||||
#define MOVE_G_MAX_STEELSURGE_P (FIRST_MAX_MOVE + 95)
|
||||
#define MOVE_G_MAX_STEELSURGE_S (FIRST_MAX_MOVE + 96)
|
||||
#define MOVE_G_MAX_DEPLETION_P (FIRST_MAX_MOVE + 97)
|
||||
#define MOVE_G_MAX_DEPLETION_S (FIRST_MAX_MOVE + 98)
|
||||
#define MOVE_G_MAX_ONE_BLOW_P (FIRST_MAX_MOVE + 99)
|
||||
#define MOVE_G_MAX_ONE_BLOW_S (FIRST_MAX_MOVE + 100)
|
||||
#define MOVE_G_MAX_RAPID_FLOW_P (FIRST_MAX_MOVE + 101)
|
||||
#define MOVE_G_MAX_RAPID_FLOW_S (FIRST_MAX_MOVE + 102)
|
||||
|
||||
#define FIRST_MAX_MOVE MOVES_COUNT_Z
|
||||
#define LAST_MAX_MOVE MOVE_G_MAX_RAPID_FLOW_S
|
||||
|
||||
#define MOVES_COUNT_DYNAMAX (LAST_MAX_MOVE + 1)
|
||||
|
||||
// Used for checks for moves affected by Disable, Mimic, etc.
|
||||
#define MOVE_UNAVAILABLE 0xFFFF
|
||||
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ extern const struct CompressedSpriteSheet gMonFrontPicTableFemale[];
|
|||
extern const struct Trainer gTrainers[];
|
||||
extern const u8 gTrainerClassNames[][13];
|
||||
extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1];
|
||||
extern const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1];
|
||||
extern const u8 gMoveNames[MOVES_COUNT_DYNAMAX][MOVE_NAME_LENGTH + 1];
|
||||
extern const u8 *const gZMoveNames[];
|
||||
|
||||
#endif // GUARD_DATA_H
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,6 +1,6 @@
|
|||
#if B_EXPANDED_MOVE_NAMES == TRUE
|
||||
// 16 letters
|
||||
const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
|
||||
const u8 gMoveNames[MOVES_COUNT_DYNAMAX][MOVE_NAME_LENGTH + 1] =
|
||||
{
|
||||
[MOVE_NONE] = _("-"),
|
||||
[MOVE_POUND] = _("Pound"),
|
||||
|
|
@ -781,10 +781,115 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
|
|||
[MOVE_SANDSEAR_STORM] = _("Sandsear Storm"),
|
||||
[MOVE_LUNAR_BLESSING] = _("Lunar Blessing"),
|
||||
[MOVE_TAKE_HEART] = _("Take Heart"),
|
||||
// Max Moves
|
||||
[MOVE_MAX_GUARD] = _("Max Guard"),
|
||||
[MOVE_MAX_STRIKE_P] = _("Max Strike"),
|
||||
[MOVE_MAX_STRIKE_S] = _("Max Strike"),
|
||||
[MOVE_MAX_KNUCKLE_P] = _("Max Knuckle"),
|
||||
[MOVE_MAX_KNUCKLE_S] = _("Max Knuckle"),
|
||||
[MOVE_MAX_AIRSTREAM_P] = _("Max Airstream"),
|
||||
[MOVE_MAX_AIRSTREAM_S] = _("Max Airstream"),
|
||||
[MOVE_MAX_OOZE_P] = _("Max Ooze"),
|
||||
[MOVE_MAX_OOZE_S] = _("Max Ooze"),
|
||||
[MOVE_MAX_QUAKE_P] = _("Max Quake"),
|
||||
[MOVE_MAX_QUAKE_S] = _("Max Quake"),
|
||||
[MOVE_MAX_ROCKFALL_P] = _("Max Rockfall"),
|
||||
[MOVE_MAX_ROCKFALL_S] = _("Max Rockfall"),
|
||||
[MOVE_MAX_FLUTTERBY_P] = _("Max Flutterby"),
|
||||
[MOVE_MAX_FLUTTERBY_S] = _("Max Flutterby"),
|
||||
[MOVE_MAX_PHANTASM_P] = _("Max Phantasm"),
|
||||
[MOVE_MAX_PHANTASM_S] = _("Max Phantasm"),
|
||||
[MOVE_MAX_STEELSPIKE_P] = _("Max Steelspike"),
|
||||
[MOVE_MAX_STEELSPIKE_S] = _("Max Steelspike"),
|
||||
[MOVE_MAX_FLARE_P] = _("Max Flare"),
|
||||
[MOVE_MAX_FLARE_S] = _("Max Flare"),
|
||||
[MOVE_MAX_GEYSER_P] = _("Max Geyser"),
|
||||
[MOVE_MAX_GEYSER_S] = _("Max Geyser"),
|
||||
[MOVE_MAX_OVERGROWTH_P] = _("Max Overgrowth"),
|
||||
[MOVE_MAX_OVERGROWTH_S] = _("Max Overgrowth"),
|
||||
[MOVE_MAX_LIGHTNING_P] = _("Max Lightning"),
|
||||
[MOVE_MAX_LIGHTNING_S] = _("Max Lightning"),
|
||||
[MOVE_MAX_HAILSTORM_P] = _("Max Hailstorm"),
|
||||
[MOVE_MAX_HAILSTORM_S] = _("Max Hailstorm"),
|
||||
[MOVE_MAX_MINDSTORM_P] = _("Max Mindstorm"),
|
||||
[MOVE_MAX_MINDSTORM_S] = _("Max Mindstorm"),
|
||||
[MOVE_MAX_WYRMWIND_P] = _("Max Wyrmwind"),
|
||||
[MOVE_MAX_WYRMWIND_S] = _("Max Wyrmwind"),
|
||||
[MOVE_MAX_DARKNESS_P] = _("Max Darkness"),
|
||||
[MOVE_MAX_DARKNESS_S] = _("Max Darkness"),
|
||||
[MOVE_MAX_STARFALL_P] = _("Max Starfall"),
|
||||
[MOVE_MAX_STARFALL_S] = _("Max Starfall"),
|
||||
// Gigantamax Moves
|
||||
[MOVE_G_MAX_VINE_LASH_P] = _("Gmax Vine Lash"),
|
||||
[MOVE_G_MAX_VINE_LASH_S] = _("Gmax Vine Lash"),
|
||||
[MOVE_G_MAX_WILDFIRE_P] = _("Gmax Wildfire"),
|
||||
[MOVE_G_MAX_WILDFIRE_S] = _("Gmax Wildfire"),
|
||||
[MOVE_G_MAX_CANNONADE_P] = _("Gmax Cannonade"),
|
||||
[MOVE_G_MAX_CANNONADE_S] = _("Gmax Cannonade"),
|
||||
[MOVE_G_MAX_BEFUDDLE_P] = _("Gmax Befuddle"),
|
||||
[MOVE_G_MAX_BEFUDDLE_S] = _("Gmax Befuddle"),
|
||||
[MOVE_G_MAX_VOLT_CRASH_P] = _("Gmax Volt Crash"),
|
||||
[MOVE_G_MAX_VOLT_CRASH_S] = _("Gmax Volt Crash"),
|
||||
[MOVE_G_MAX_GOLD_RUSH_P] = _("Gmax Gold Rush"),
|
||||
[MOVE_G_MAX_GOLD_RUSH_S] = _("Gmax Gold Rush"),
|
||||
[MOVE_G_MAX_CHI_STRIKE_P] = _("Gmax Chi Strike"),
|
||||
[MOVE_G_MAX_CHI_STRIKE_S] = _("Gmax Chi Strike"),
|
||||
[MOVE_G_MAX_TERROR_P] = _("Gmax Terror"),
|
||||
[MOVE_G_MAX_TERROR_S] = _("Gmax Terror"),
|
||||
[MOVE_G_MAX_FOAM_BURST_P] = _("Gmax Foam Burst"),
|
||||
[MOVE_G_MAX_FOAM_BURST_S] = _("Gmax Foam Burst"),
|
||||
[MOVE_G_MAX_RESONANCE_P] = _("Gmax Resonance"),
|
||||
[MOVE_G_MAX_RESONANCE_S] = _("Gmax Resonance"),
|
||||
[MOVE_G_MAX_CUDDLE_P] = _("Gmax Cuddle"),
|
||||
[MOVE_G_MAX_CUDDLE_S] = _("Gmax Cuddle"),
|
||||
[MOVE_G_MAX_REPLENISH_P] = _("Gmax Replenish"),
|
||||
[MOVE_G_MAX_REPLENISH_S] = _("Gmax Replenish"),
|
||||
[MOVE_G_MAX_MALODOR_P] = _("Gmax Malodor"),
|
||||
[MOVE_G_MAX_MALODOR_S] = _("Gmax Malodor"),
|
||||
[MOVE_G_MAX_MELTDOWN_P] = _("Gmax Meltdown"),
|
||||
[MOVE_G_MAX_MELTDOWN_S] = _("Gmax Meltdown"),
|
||||
[MOVE_G_MAX_DRUM_SOLO_P] = _("Gmax Drum Solo"),
|
||||
[MOVE_G_MAX_DRUM_SOLO_S] = _("Gmax Drum Solo"),
|
||||
[MOVE_G_MAX_FIREBALL_P] = _("Gmax Fireball"),
|
||||
[MOVE_G_MAX_FIREBALL_S] = _("Gmax Fireball"),
|
||||
[MOVE_G_MAX_HYDROSNIPE_P] = _("Gmax Hydrosnipe"),
|
||||
[MOVE_G_MAX_HYDROSNIPE_S] = _("Gmax Hydrosnipe"),
|
||||
[MOVE_G_MAX_WIND_RAGE_P] = _("Gmax Wind Rage"),
|
||||
[MOVE_G_MAX_WIND_RAGE_S] = _("Gmax Wind Rage"),
|
||||
[MOVE_G_MAX_GRAVITAS_P] = _("Gmax Gravitas"),
|
||||
[MOVE_G_MAX_GRAVITAS_S] = _("Gmax Gravitas"),
|
||||
[MOVE_G_MAX_STONESURGE_P] = _("Gmax Stonesurge"),
|
||||
[MOVE_G_MAX_STONESURGE_S] = _("Gmax Stonesurge"),
|
||||
[MOVE_G_MAX_VOLCALITH_P] = _("Gmax Volcalith"),
|
||||
[MOVE_G_MAX_VOLCALITH_S] = _("Gmax Volcalith"),
|
||||
[MOVE_G_MAX_TARTNESS_P] = _("Gmax Tartness"),
|
||||
[MOVE_G_MAX_TARTNESS_S] = _("Gmax Tartness"),
|
||||
[MOVE_G_MAX_SWEETNESS_P] = _("Gmax Sweetness"),
|
||||
[MOVE_G_MAX_SWEETNESS_S] = _("Gmax Sweetness"),
|
||||
[MOVE_G_MAX_SANDBLAST_P] = _("Gmax Sandblast"),
|
||||
[MOVE_G_MAX_SANDBLAST_S] = _("Gmax Sandblast"),
|
||||
[MOVE_G_MAX_STUN_SHOCK_P] = _("Gmax Stun Shock"),
|
||||
[MOVE_G_MAX_STUN_SHOCK_S] = _("Gmax Stun Shock"),
|
||||
[MOVE_G_MAX_CENTIFERNO_P] = _("Gmax Centiferno"),
|
||||
[MOVE_G_MAX_CENTIFERNO_S] = _("Gmax Centiferno"),
|
||||
[MOVE_G_MAX_SMITE_P] = _("Gmax Smite"),
|
||||
[MOVE_G_MAX_SMITE_S] = _("Gmax Smite"),
|
||||
[MOVE_G_MAX_SNOOZE_P] = _("Gmax Snooze"),
|
||||
[MOVE_G_MAX_SNOOZE_S] = _("Gmax Snooze"),
|
||||
[MOVE_G_MAX_FINALE_P] = _("Gmax Finale"),
|
||||
[MOVE_G_MAX_FINALE_S] = _("Gmax Finale"),
|
||||
[MOVE_G_MAX_STEELSURGE_P] = _("Gmax Steelsurge"),
|
||||
[MOVE_G_MAX_STEELSURGE_S] = _("Gmax Steelsurge"),
|
||||
[MOVE_G_MAX_DEPLETION_P] = _("Gmax Depletion"),
|
||||
[MOVE_G_MAX_DEPLETION_S] = _("Gmax Depletion"),
|
||||
[MOVE_G_MAX_ONE_BLOW_P] = _("Gmax One Blow"),
|
||||
[MOVE_G_MAX_ONE_BLOW_S] = _("Gmax One Blow"),
|
||||
[MOVE_G_MAX_RAPID_FLOW_P] = _("Gmax Rapid Flow"),
|
||||
[MOVE_G_MAX_RAPID_FLOW_S] = _("Gmax Rapid Flow"),
|
||||
};
|
||||
#else
|
||||
// 12 letters
|
||||
const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
|
||||
const u8 gMoveNames[MOVES_COUNT_DYNAMAX][MOVE_NAME_LENGTH + 1] =
|
||||
{
|
||||
[MOVE_NONE] = _("-"),
|
||||
[MOVE_POUND] = _("Pound"),
|
||||
|
|
@ -1565,6 +1670,111 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
|
|||
[MOVE_SANDSEAR_STORM] = _("SndsearStorm"),
|
||||
[MOVE_LUNAR_BLESSING] = _("LunarBlessng"),
|
||||
[MOVE_TAKE_HEART] = _("Take Heart"),
|
||||
// Max Moves
|
||||
[MOVE_MAX_GUARD] = _("M-Guard"),
|
||||
[MOVE_MAX_STRIKE_P] = _("M-Strike"),
|
||||
[MOVE_MAX_STRIKE_S] = _("M-Strike"),
|
||||
[MOVE_MAX_KNUCKLE_P] = _("M-Knuckle"),
|
||||
[MOVE_MAX_KNUCKLE_S] = _("M-Knuckle"),
|
||||
[MOVE_MAX_AIRSTREAM_P] = _("M-Airstream"),
|
||||
[MOVE_MAX_AIRSTREAM_S] = _("M-Airstream"),
|
||||
[MOVE_MAX_OOZE_P] = _("M-Ooze"),
|
||||
[MOVE_MAX_OOZE_S] = _("M-Ooze"),
|
||||
[MOVE_MAX_QUAKE_P] = _("M-Quake"),
|
||||
[MOVE_MAX_QUAKE_S] = _("M-Quake"),
|
||||
[MOVE_MAX_ROCKFALL_P] = _("M-Rockfall"),
|
||||
[MOVE_MAX_ROCKFALL_S] = _("M-Rockfall"),
|
||||
[MOVE_MAX_FLUTTERBY_P] = _("M-Flutterby"),
|
||||
[MOVE_MAX_FLUTTERBY_S] = _("M-Flutterby"),
|
||||
[MOVE_MAX_PHANTASM_P] = _("M-Phantasm"),
|
||||
[MOVE_MAX_PHANTASM_S] = _("M-Phantasm"),
|
||||
[MOVE_MAX_STEELSPIKE_P] = _("M-Steelspike"),
|
||||
[MOVE_MAX_STEELSPIKE_S] = _("M-Steelspike"),
|
||||
[MOVE_MAX_FLARE_P] = _("M-Flare"),
|
||||
[MOVE_MAX_FLARE_S] = _("M-Flare"),
|
||||
[MOVE_MAX_GEYSER_P] = _("M-Geyser"),
|
||||
[MOVE_MAX_GEYSER_S] = _("M-Geyser"),
|
||||
[MOVE_MAX_OVERGROWTH_P] = _("M-Overgrowth"),
|
||||
[MOVE_MAX_OVERGROWTH_S] = _("M-Overgrowth"),
|
||||
[MOVE_MAX_LIGHTNING_P] = _("M-Lightning"),
|
||||
[MOVE_MAX_LIGHTNING_S] = _("M-Lightning"),
|
||||
[MOVE_MAX_HAILSTORM_P] = _("M-Hailstorm"),
|
||||
[MOVE_MAX_HAILSTORM_S] = _("M-Hailstorm"),
|
||||
[MOVE_MAX_MINDSTORM_P] = _("M-Mindstorm"),
|
||||
[MOVE_MAX_MINDSTORM_S] = _("M-Mindstorm"),
|
||||
[MOVE_MAX_WYRMWIND_P] = _("M-Wyrmwind"),
|
||||
[MOVE_MAX_WYRMWIND_S] = _("M-Wyrmwind"),
|
||||
[MOVE_MAX_DARKNESS_P] = _("M-Darkness"),
|
||||
[MOVE_MAX_DARKNESS_S] = _("M-Darkness"),
|
||||
[MOVE_MAX_STARFALL_P] = _("M-Starfall"),
|
||||
[MOVE_MAX_STARFALL_S] = _("M-Starfall"),
|
||||
// Gigantamax Moves
|
||||
[MOVE_G_MAX_VINE_LASH_P] = _("G-Vine Lash"),
|
||||
[MOVE_G_MAX_VINE_LASH_S] = _("G-Vine Lash"),
|
||||
[MOVE_G_MAX_WILDFIRE_P] = _("G-Wildfire"),
|
||||
[MOVE_G_MAX_WILDFIRE_S] = _("G-Wildfire"),
|
||||
[MOVE_G_MAX_CANNONADE_P] = _("G-Cannonade"),
|
||||
[MOVE_G_MAX_CANNONADE_S] = _("G-Cannonade"),
|
||||
[MOVE_G_MAX_BEFUDDLE_P] = _("G-Befuddle"),
|
||||
[MOVE_G_MAX_BEFUDDLE_S] = _("G-Befuddle"),
|
||||
[MOVE_G_MAX_VOLT_CRASH_P] = _("G-VoltCrash"),
|
||||
[MOVE_G_MAX_VOLT_CRASH_S] = _("G-VoltCrash"),
|
||||
[MOVE_G_MAX_GOLD_RUSH_P] = _("G-Gold Rush"),
|
||||
[MOVE_G_MAX_GOLD_RUSH_S] = _("G-Gold Rush"),
|
||||
[MOVE_G_MAX_CHI_STRIKE_P] = _("G-ChiStrike"),
|
||||
[MOVE_G_MAX_CHI_STRIKE_S] = _("G-ChiStrike"),
|
||||
[MOVE_G_MAX_TERROR_P] = _("G-Terror"),
|
||||
[MOVE_G_MAX_TERROR_S] = _("G-Terror"),
|
||||
[MOVE_G_MAX_FOAM_BURST_P] = _("G-FoamBurst"),
|
||||
[MOVE_G_MAX_FOAM_BURST_S] = _("G-FoamBurst"),
|
||||
[MOVE_G_MAX_RESONANCE_P] = _("G-Resonance"),
|
||||
[MOVE_G_MAX_RESONANCE_S] = _("G-Resonance"),
|
||||
[MOVE_G_MAX_CUDDLE_P] = _("G-Cuddle"),
|
||||
[MOVE_G_MAX_CUDDLE_S] = _("G-Cuddle"),
|
||||
[MOVE_G_MAX_REPLENISH_P] = _("G-Replenish"),
|
||||
[MOVE_G_MAX_REPLENISH_S] = _("G-Replenish"),
|
||||
[MOVE_G_MAX_MALODOR_P] = _("G-Malodor"),
|
||||
[MOVE_G_MAX_MALODOR_S] = _("G-Malodor"),
|
||||
[MOVE_G_MAX_MELTDOWN_P] = _("G-Meltdown"),
|
||||
[MOVE_G_MAX_MELTDOWN_S] = _("G-Meltdown"),
|
||||
[MOVE_G_MAX_DRUM_SOLO_P] = _("G-Drum Solo"),
|
||||
[MOVE_G_MAX_DRUM_SOLO_S] = _("G-Drum Solo"),
|
||||
[MOVE_G_MAX_FIREBALL_P] = _("G-Fireball"),
|
||||
[MOVE_G_MAX_FIREBALL_S] = _("G-Fireball"),
|
||||
[MOVE_G_MAX_HYDROSNIPE_P] = _("G-Hydrsnipe"),
|
||||
[MOVE_G_MAX_HYDROSNIPE_S] = _("G-Hydrsnipe"),
|
||||
[MOVE_G_MAX_WIND_RAGE_P] = _("G-Wind Rage"),
|
||||
[MOVE_G_MAX_WIND_RAGE_S] = _("G-Wind Rage"),
|
||||
[MOVE_G_MAX_GRAVITAS_P] = _("G-Gravitas"),
|
||||
[MOVE_G_MAX_GRAVITAS_S] = _("G-Gravitas"),
|
||||
[MOVE_G_MAX_STONESURGE_P] = _("G-Stonesrge"),
|
||||
[MOVE_G_MAX_STONESURGE_S] = _("G-Stonesrge"),
|
||||
[MOVE_G_MAX_VOLCALITH_P] = _("G-Volcalith"),
|
||||
[MOVE_G_MAX_VOLCALITH_S] = _("G-Volcalith"),
|
||||
[MOVE_G_MAX_TARTNESS_P] = _("G-Tartness"),
|
||||
[MOVE_G_MAX_TARTNESS_S] = _("G-Tartness"),
|
||||
[MOVE_G_MAX_SWEETNESS_P] = _("G-Sweetness"),
|
||||
[MOVE_G_MAX_SWEETNESS_S] = _("G-Sweetness"),
|
||||
[MOVE_G_MAX_SANDBLAST_P] = _("G-Sandblast"),
|
||||
[MOVE_G_MAX_SANDBLAST_S] = _("G-Sandblast"),
|
||||
[MOVE_G_MAX_STUN_SHOCK_P] = _("G-StunShock"),
|
||||
[MOVE_G_MAX_STUN_SHOCK_S] = _("G-StunShock"),
|
||||
[MOVE_G_MAX_CENTIFERNO_P] = _("G-Centiferno"),
|
||||
[MOVE_G_MAX_CENTIFERNO_S] = _("G-Centiferno"),
|
||||
[MOVE_G_MAX_SMITE_P] = _("G-Smite"),
|
||||
[MOVE_G_MAX_SMITE_S] = _("G-Smite"),
|
||||
[MOVE_G_MAX_SNOOZE_P] = _("G-Snooze"),
|
||||
[MOVE_G_MAX_SNOOZE_S] = _("G-Snooze"),
|
||||
[MOVE_G_MAX_FINALE_P] = _("G-Finale"),
|
||||
[MOVE_G_MAX_FINALE_S] = _("G-Finale"),
|
||||
[MOVE_G_MAX_STEELSURGE_P] = _("G-Steelsrge"),
|
||||
[MOVE_G_MAX_STEELSURGE_S] = _("G-Steelsrge"),
|
||||
[MOVE_G_MAX_DEPLETION_P] = _("G-Depletion"),
|
||||
[MOVE_G_MAX_DEPLETION_S] = _("G-Depletion"),
|
||||
[MOVE_G_MAX_ONE_BLOW_P] = _("G-One Blow"),
|
||||
[MOVE_G_MAX_ONE_BLOW_S] = _("G-One Blow"),
|
||||
[MOVE_G_MAX_RAPID_FLOW_P] = _("G-Rapid Flow"),
|
||||
[MOVE_G_MAX_RAPID_FLOW_S] = _("G-Rapid Flow"),
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue