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

Hunger Switch and Aura Wheel

Browse Source 
Implement the ability Hunger Switch and the move Aura Wheel.
This commit is contained in:
BuffelSaft 2021-11-03 19:45:03 +13:00
parent 11e93aee69
commit 6ce1f01b8c
7 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/battle_scripts_1.s
View File

@ -392,10 +392,18 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectSparklySwirl @ EFFECT_SPARKLY_SWIRL .4byte BattleScript_EffectSparklySwirl @ EFFECT_SPARKLY_SWIRL
.4byte BattleScript_EffectPlasmaFists @ EFFECT_PLASMA_FISTS .4byte BattleScript_EffectPlasmaFists @ EFFECT_PLASMA_FISTS
.4byte BattleScript_EffectHyperspaceFury @ EFFECT_HYPERSPACE_FURY .4byte BattleScript_EffectHyperspaceFury @ EFFECT_HYPERSPACE_FURY
.4byte BattleScript_EffectAuraWheel @ EFFECT_AURA_WHEEL
BattleScript_EffectAuraWheel: @ Aura Wheel can only be used by Morpeko
jumpifspecies BS_ATTACKER, SPECIES_MORPEKO, BattleScript_EffectSpeedUpHit
jumpifspecies BS_ATTACKER, SPECIES_MORPEKO_HANGRY, BattleScript_EffectSpeedUpHit
printstring STRINGID_BUTPOKEMONCANTUSETHEMOVE
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectHyperspaceFury: BattleScript_EffectHyperspaceFury:
jumpifspecies BS_ATTACKER, SPECIES_TREECKO, BattleScript_EffectHyperspaceFuryUnbound jumpifspecies BS_ATTACKER, SPECIES_HOOPA_UNBOUND, BattleScript_EffectHyperspaceFuryUnbound
jumpifspecies BS_ATTACKER, SPECIES_MUDKIP, BattleScript_ButHoopaCantUseIt jumpifspecies BS_ATTACKER, SPECIES_HOOPA, BattleScript_ButHoopaCantUseIt
printstring STRINGID_BUTPOKEMONCANTUSETHEMOVE printstring STRINGID_BUTPOKEMONCANTUSETHEMOVE
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd goto BattleScript_MoveEnd

4
include/constants/battle_config.h
View File

@ -47,6 +47,10 @@
#define SPECIES_GRENINJA_ASH 10017 #define SPECIES_GRENINJA_ASH 10017
#define SPECIES_HOOPA 0 #define SPECIES_HOOPA 0
#define SPECIES_HOOPA_UNBOUND 10018 #define SPECIES_HOOPA_UNBOUND 10018
#define SPECIES_MELOETTA 0
#define SPECIES_MELOETTA_PIROUETTE 10019
#define SPECIES_MORPEKO 0
#define SPECIES_MORPEKO_HANGRY 10020
#endif #endif
// Items with peculiar battle effects. // Items with peculiar battle effects.

3
include/constants/battle_move_effects.h
View File

@ -375,7 +375,8 @@
#define EFFECT_SPARKLY_SWIRL 369 #define EFFECT_SPARKLY_SWIRL 369
#define EFFECT_PLASMA_FISTS 370 #define EFFECT_PLASMA_FISTS 370
#define EFFECT_HYPERSPACE_FURY 371 #define EFFECT_HYPERSPACE_FURY 371
#define EFFECT_AURA_WHEEL 372
#define NUM_BATTLE_MOVE_EFFECTS 372 #define NUM_BATTLE_MOVE_EFFECTS 373
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

4
src/battle_main.c
View File

@ -5221,6 +5221,10 @@ void SetTypeBeforeUsingMove(u16 move, u8 battlerAtk)
{ {
gBattleStruct->dynamicMoveType = 0x80 | TYPE_ELECTRIC; gBattleStruct->dynamicMoveType = 0x80 | TYPE_ELECTRIC;
} }
else if (move == MOVE_AURA_WHEEL && gBattleMons[battlerAtk].species == SPECIES_MORPEKO_HANGRY)
{
gBattleStruct->dynamicMoveType = 0x80 | TYPE_DARK;
}
// Check if a gem should activate. // Check if a gem should activate.
GET_MOVE_TYPE(move, moveType); GET_MOVE_TYPE(move, moveType);

17
src/battle_util.c
View File

@ -4562,6 +4562,22 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
effect++; effect++;
} }
break; break;
case ABILITY_HUNGER_SWITCH:
if (!(gBattleMons[battler].status2 & STATUS2_TRANSFORMED))
{
if (gBattleMons[battler].species == SPECIES_MORPEKO)
{
gBattleMons[battler].species = SPECIES_MORPEKO_HANGRY;
BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeEnd3);
}
else if (gBattleMons[battler].species == SPECIES_MORPEKO_HANGRY)
{
gBattleMons[battler].species = SPECIES_MORPEKO;
BattleScriptPushCursorAndCallback(BattleScript_AttackerFormChangeEnd3);
}
effect++;
}
break;
} }
} }
break; break;
@ -8969,6 +8985,7 @@ void UndoFormChange(u32 monId, u32 side, bool32 isSwitchingOut)
{SPECIES_WISHIWASHI_SCHOOL, SPECIES_WISHIWASHI}, {SPECIES_WISHIWASHI_SCHOOL, SPECIES_WISHIWASHI},
{SPECIES_CRAMORANT_GORGING, SPECIES_CRAMORANT}, {SPECIES_CRAMORANT_GORGING, SPECIES_CRAMORANT},
{SPECIES_CRAMORANT_GULPING, SPECIES_CRAMORANT}, {SPECIES_CRAMORANT_GULPING, SPECIES_CRAMORANT},
{SPECIES_MORPEKO_HANGRY, SPECIES_MORPEKO}
}; };
if (isSwitchingOut) // Don't revert Mimikyu Busted or Ash-Greninja when switching out if (isSwitchingOut) // Don't revert Mimikyu Busted or Ash-Greninja when switching out

2
src/data/battle_moves.h
View File

@ -11038,7 +11038,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_AURA_WHEEL] = [MOVE_AURA_WHEEL] =
{ {
.effect = EFFECT_SPEED_UP_HIT, .effect = EFFECT_AURA_WHEEL,
.power = 110, .power = 110,
.type = TYPE_ELECTRIC, .type = TYPE_ELECTRIC,
.accuracy = 100, .accuracy = 100,

4
src/data/pokemon/base_stats.h
View File

@ -6848,7 +6848,7 @@ const struct BaseStats gBaseStats[] =
.growthRate = GROWTH_MEDIUM_SLOW, .growthRate = GROWTH_MEDIUM_SLOW,
.eggGroup1 = EGG_GROUP_BUG, .eggGroup1 = EGG_GROUP_BUG,
.eggGroup2 = EGG_GROUP_BUG, .eggGroup2 = EGG_GROUP_BUG,
.abilities = {ABILITY_STURDY, ABILITY_NONE}, .abilities = {ABILITY_HUNGER_SWITCH, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_YELLOW, .bodyColor = BODY_COLOR_YELLOW,
.noFlip = FALSE, .noFlip = FALSE,
@ -7552,7 +7552,7 @@ const struct BaseStats gBaseStats[] =
.growthRate = GROWTH_FAST, .growthRate = GROWTH_FAST,
.eggGroup1 = EGG_GROUP_FIELD, .eggGroup1 = EGG_GROUP_FIELD,
.eggGroup2 = EGG_GROUP_FIELD, .eggGroup2 = EGG_GROUP_FIELD,
.abilities = {ABILITY_OWN_TEMPO, ABILITY_NONE}, .abilities = {ABILITY_HUNGER_SWITCH, ABILITY_NONE},
.safariZoneFleeRate = 0, .safariZoneFleeRate = 0,
.bodyColor = BODY_COLOR_WHITE, .bodyColor = BODY_COLOR_WHITE,
.noFlip = FALSE, .noFlip = FALSE,