ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 01:14:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the definitions of King's Shield, Forest's Curse and Land's Wrath (#340)

Browse Source
This commit is contained in:
LOuroboros 2020-04-20 09:12:09 -03:00 committed by GitHub
parent 4697a5b687
commit 260cbe6b65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/constants/moves.h
View File

@ -584,7 +584,7 @@
#define MOVE_NOBLE_ROAR 568
#define MOVE_ION_DELUGE 569
#define MOVE_PARABOLIC_CHARGE 570
#define MOVE_FOREST_S_CURSE 571
#define MOVE_FORESTS_CURSE 571
#define MOVE_PETAL_BLIZZARD 572
#define MOVE_FREEZE_DRY 573
#define MOVE_DISARMING_VOICE 574
@ -629,7 +629,7 @@
#define MOVE_OBLIVION_WING 613
#define MOVE_THOUSAND_ARROWS 614
#define MOVE_THOUSAND_WAVES 615
#define MOVE_LAND_S_WRATH 616
#define MOVE_LANDS_WRATH 616
#define MOVE_LIGHT_OF_RUIN 617
#define MOVE_ORIGIN_PULSE 618
#define MOVE_PRECIPICE_BLADES 619

4
src/data/battle_moves.h
View File

@ -8011,7 +8011,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.split = SPLIT_SPECIAL,
},
[MOVE_FOREST_S_CURSE] =
[MOVE_FORESTS_CURSE] =
{
.effect = EFFECT_THIRD_TYPE,
.power = 0,
@ -8645,7 +8645,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.split = SPLIT_PHYSICAL,
},
[MOVE_LAND_S_WRATH] =
[MOVE_LANDS_WRATH] =
{
.effect = EFFECT_HIT,
.power = 90,

4
src/data/contest_moves.h
View File

@ -4557,7 +4557,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] =
.comboMoves = {0}
},
[MOVE_FOREST_S_CURSE] =
[MOVE_FORESTS_CURSE] =
{
.effect = CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS,
.contestCategory = CONTEST_CATEGORY_SMART,
@ -4917,7 +4917,7 @@ const struct ContestMove gContestMoves[MOVES_COUNT] =
.comboMoves = {COMBO_STARTER_THOUSAND_ARROWS},
},
[MOVE_LAND_S_WRATH] =
[MOVE_LANDS_WRATH] =
{
.effect = CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS,
.contestCategory = CONTEST_CATEGORY_TOUGH,

4
src/data/text/move_descriptions.h
View File

@ -3114,7 +3114,7 @@ const u8 *const gMoveDescriptionPointers[MOVES_COUNT - 1] =
[MOVE_NOBLE_ROAR - 1] = sNOBLE_ROARDescription,
[MOVE_ION_DELUGE - 1] = sION_DELUGEDescription,
[MOVE_PARABOLIC_CHARGE - 1] = sNotDoneYetDescription,
[MOVE_FOREST_S_CURSE - 1] = sFORESTS_CURSEDescription,
[MOVE_FORESTS_CURSE - 1] = sFORESTS_CURSEDescription,
[MOVE_PETAL_BLIZZARD - 1] = sPETAL_BLIZZARDDescription,
[MOVE_FREEZE_DRY - 1] = sFREEZE_DRYDescription,
[MOVE_DISARMING_VOICE - 1] = sDISARMING_VOICEDescription,
@ -3159,7 +3159,7 @@ const u8 *const gMoveDescriptionPointers[MOVES_COUNT - 1] =
[MOVE_OBLIVION_WING - 1] = sDRAINING_KISSDescription,
[MOVE_THOUSAND_ARROWS - 1] = sTHOUSAND_ARROWSDescription,
[MOVE_THOUSAND_WAVES - 1] = sTHOUSAND_WAVESDescription,
[MOVE_LAND_S_WRATH - 1] = sNotDoneYetDescription,
[MOVE_LANDS_WRATH - 1] = sNotDoneYetDescription,
[MOVE_LIGHT_OF_RUIN - 1] = sLIGHT_OF_RUINDescription,
[MOVE_ORIGIN_PULSE - 1] = sORIGIN_PULSEDescription,
[MOVE_PRECIPICE_BLADES - 1] = sPRECIPICE_BLADESDescription,

4
src/data/text/move_names.h
View File

@ -571,7 +571,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
[MOVE_NOBLE_ROAR] = _("Noble Roar"),
[MOVE_ION_DELUGE] = _("Ion Deluge"),
[MOVE_PARABOLIC_CHARGE] = _("Parabolic Ch"),
[MOVE_FOREST_S_CURSE] = _("ForestsCurse"),
[MOVE_FORESTS_CURSE] = _("ForestsCurse"),
[MOVE_PETAL_BLIZZARD] = _("Petal Storm"),
[MOVE_FREEZE_DRY] = _("Freeze Dry"),
[MOVE_DISARMING_VOICE] = _("Disarming Vo"),
@ -616,7 +616,7 @@ const u8 gMoveNames[MOVES_COUNT][MOVE_NAME_LENGTH + 1] =
[MOVE_OBLIVION_WING] = _("OblivionWing"),
[MOVE_THOUSAND_ARROWS] = _("Thousand Ar"),
[MOVE_THOUSAND_WAVES] = _("Thousand Wav"),
[MOVE_LAND_S_WRATH] = _("Lands Wrath"),
[MOVE_LANDS_WRATH] = _("Lands Wrath"),
[MOVE_LIGHT_OF_RUIN] = _("LightOfRuin"),
[MOVE_ORIGIN_PULSE] = _("Origin Pulse"),
[MOVE_PRECIPICE_BLADES] = _("Precipice Bl"),