ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Triple Axe's target, added its effect and fixed Ceaseless Edge's

Browse Source
This commit is contained in:
LOuroboros 2022-12-14 09:14:40 -03:00
parent 2cb9400ef0
commit 1229fa752a
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/battle_scripts_1.s
View File

@ -419,6 +419,14 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectCeaselessEdge @ EFFECT_CEASELESS_EDGE .4byte BattleScript_EffectCeaselessEdge @ EFFECT_CEASELESS_EDGE
.4byte BattleScript_EffectShellTrap @ EFFECT_SHELL_TRAP .4byte BattleScript_EffectShellTrap @ EFFECT_SHELL_TRAP
.4byte BattleScript_EffectDireClaw @ EFFECT_DIRE_CLAW .4byte BattleScript_EffectDireClaw @ EFFECT_DIRE_CLAW
.4byte BattleScript_EffectStoneAxe @ EFFECT_STONE_AXE
BattleScript_EffectStoneAxe::
call BattleScript_EffectHit_Ret
setstealthrock BattleScript_ButItFailed
printstring STRINGID_POINTEDSTONESFLOAT
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectDireClaw:: BattleScript_EffectDireClaw::
setmoveeffect MOVE_EFFECT_DIRE_CLAW setmoveeffect MOVE_EFFECT_DIRE_CLAW
@ -444,10 +452,6 @@ BattleScript_ShellTrapSetUp::
BattleScript_EffectCeaselessEdge:: BattleScript_EffectCeaselessEdge::
call BattleScript_EffectHit_Ret call BattleScript_EffectHit_Ret
trysetspikes BattleScript_ButItFailedAtkStringPpReduce trysetspikes BattleScript_ButItFailedAtkStringPpReduce
attackstring
ppreduce
attackanimation
waitanimation
printstring STRINGID_SPIKESSCATTERED printstring STRINGID_SPIKESSCATTERED
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd goto BattleScript_MoveEnd

3
include/constants/battle_move_effects.h
View File

@ -400,7 +400,8 @@
#define EFFECT_CEASELESS_EDGE 394 #define EFFECT_CEASELESS_EDGE 394
#define EFFECT_SHELL_TRAP 395 #define EFFECT_SHELL_TRAP 395
#define EFFECT_DIRE_CLAW 396 #define EFFECT_DIRE_CLAW 396
#define EFFECT_STONE_AXE 397
#define NUM_BATTLE_MOVE_EFFECTS 397 #define NUM_BATTLE_MOVE_EFFECTS 398
#endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

4
src/data/battle_moves.h
View File

@ -13326,13 +13326,13 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
[MOVE_STONE_AXE] = [MOVE_STONE_AXE] =
{ {
.effect = EFFECT_PLACEHOLDER, // EFFECT_STONE_AXE, .effect = EFFECT_STONE_AXE,
.power = 65, .power = 65,
.type = TYPE_ROCK, .type = TYPE_ROCK,
.accuracy = 90, .accuracy = 90,
.pp = 15, .pp = 15,
.secondaryEffectChance = 0, .secondaryEffectChance = 0,
.target = MOVE_TARGET_USER, .target = MOVE_TARGET_SELECTED,
.priority = 0, .priority = 0,
.flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SHEER_FORCE_BOOST,
.split = SPLIT_PHYSICAL, .split = SPLIT_PHYSICAL,