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

Fixed

Browse Source
This commit is contained in:
MissingNoL 2021-05-23 18:30:22 -07:00
parent 0d47269798
commit 07a9674d22
4 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/battle_scripts_1.s
View File

@ -6058,17 +6058,6 @@ BattleScript_AtkDefDownTryDef:
BattleScript_AtkDefDownRet: BattleScript_AtkDefDownRet:
return return
BattleScript_DefDown::
setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
setstatchanger STAT_DEF, 1, TRUE
statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_BUFF_ALLOW_PTR, BattleScript_DefDownRet
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DefDownRet
printfromtable gStatDownStringIds
waitmessage 0x40
BattleScript_DefDownRet:
return
BattleScript_DefSpDefDown:: BattleScript_DefSpDefDown::
setbyte sSTAT_ANIM_PLAYED, FALSE setbyte sSTAT_ANIM_PLAYED, FALSE
playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS

1
include/battle_scripts.h
View File

@ -90,7 +90,6 @@ extern const u8 BattleScript_SelectingNotAllowedMoveTauntInPalace[];
extern const u8 BattleScript_WishComesTrue[]; extern const u8 BattleScript_WishComesTrue[];
extern const u8 BattleScript_IngrainTurnHeal[]; extern const u8 BattleScript_IngrainTurnHeal[];
extern const u8 BattleScript_AtkDefDown[]; extern const u8 BattleScript_AtkDefDown[];
extern const u8 BattleScript_DefDown[]; // Hyperspace Fury
extern const u8 BattleScript_DefSpDefDown[]; extern const u8 BattleScript_DefSpDefDown[];
extern const u8 BattleScript_KnockedOff[]; extern const u8 BattleScript_KnockedOff[];
extern const u8 BattleScript_MoveUsedIsImprisoned[]; extern const u8 BattleScript_MoveUsedIsImprisoned[];

5
src/battle_script_commands.c
View File

@ -3149,11 +3149,6 @@ void SetMoveEffect(bool32 primary, u32 certain)
gBattlescriptCurrInstr = BattleScript_MoveEffectFeint; gBattlescriptCurrInstr = BattleScript_MoveEffectFeint;
} }
} }
if (gCurrentMove == MOVE_HYPERSPACE_FURY)
{
BattleScriptPush(gBattlescriptCurrInstr + 1);
gBattlescriptCurrInstr = BattleScript_DefDown;
}
break; break;
case MOVE_EFFECT_SPECTRAL_THIEF: case MOVE_EFFECT_SPECTRAL_THIEF:
gBattleStruct->stolenStats[0] = 0; // Stats to steal. gBattleStruct->stolenStats[0] = 0; // Stats to steal.

3
src/data/battle_moves.h
View File

@ -9581,7 +9581,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_HYPERSPACE_FURY] = [MOVE_HYPERSPACE_FURY] =
{ {
.effect = EFFECT_FEINT, .effect = EFFECT_ATTACKER_DEFENSE_DOWN_HIT,
.power = 100, .power = 100,
.type = TYPE_DARK, .type = TYPE_DARK,
.accuracy = 0, .accuracy = 0,
@ -9591,6 +9591,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
.priority = 0, .priority = 0,
.flags = FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, .flags = FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,
.argument = MOVE_EFFECT_FEINT,
}, },
[MOVE_SHORE_UP] = [MOVE_SHORE_UP] =