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

expand move target field

Browse Source
This commit is contained in:
ghoulslash 2021-10-16 16:10:45 -04:00
parent df2223a5bc
commit 5509ceea04
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle.h
View File

@ -491,7 +491,7 @@ struct BattleStruct
u8 turnEffectsBattlerId; u8 turnEffectsBattlerId;
u8 turnCountersTracker; u8 turnCountersTracker;
u16 wrappedMove[MAX_BATTLERS_COUNT]; u16 wrappedMove[MAX_BATTLERS_COUNT];
u8 moveTarget[MAX_BATTLERS_COUNT]; u16 moveTarget[MAX_BATTLERS_COUNT];
u8 expGetterMonId; u8 expGetterMonId;
u8 wildVictorySong; u8 wildVictorySong;
u8 dynamicMoveType; u8 dynamicMoveType;

2
include/battle_util.h
View File

@ -109,7 +109,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn);
void ClearFuryCutterDestinyBondGrudge(u8 battlerId); void ClearFuryCutterDestinyBondGrudge(u8 battlerId);
void HandleAction_RunBattleScript(void); void HandleAction_RunBattleScript(void);
u32 SetRandomTarget(u32 battlerId); u32 SetRandomTarget(u32 battlerId);
u8 GetMoveTarget(u16 move, u8 setTarget); u32 GetMoveTarget(u16 move, u8 setTarget);
u8 IsMonDisobedient(void); u8 IsMonDisobedient(void);
u32 GetBattlerHoldEffect(u8 battlerId, bool32 checkNegating); u32 GetBattlerHoldEffect(u8 battlerId, bool32 checkNegating);
u32 GetBattlerHoldEffectParam(u8 battlerId); u32 GetBattlerHoldEffectParam(u8 battlerId);

3
include/constants/battle.h
View File

@ -386,7 +386,6 @@
#define MOVE_TARGET_FOES_AND_ALLY 0x20 #define MOVE_TARGET_FOES_AND_ALLY 0x20
#define MOVE_TARGET_OPPONENTS_FIELD 0x40 #define MOVE_TARGET_OPPONENTS_FIELD 0x40
#define MOVE_TARGET_ALLY 0x80 #define MOVE_TARGET_ALLY 0x80
#define MOVE_TARGET_ALL_BATTLERS 0x100
#define MOVE_TARGET_ALL_BATTLERS (MOVE_TARGET_BOTH | MOVE_TARGET_OPPONENTS_FIELD)
#endif // GUARD_CONSTANTS_BATTLE_H #endif // GUARD_CONSTANTS_BATTLE_H

4
src/battle_controller_player.c
View File

@ -590,7 +590,7 @@ static void TryShowAsTarget(u32 battlerId)
static void HandleInputChooseMove(void) static void HandleInputChooseMove(void)
{ {
u8 moveTarget; u16 moveTarget;
u32 canSelectTarget = 0; u32 canSelectTarget = 0;
struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]); struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct*)(&gBattleResources->bufferA[gActiveBattler][4]);
@ -644,7 +644,7 @@ static void HandleInputChooseMove(void)
// Show all available targets for multi-target moves // Show all available targets for multi-target moves
if (B_SHOW_TARGETS) if (B_SHOW_TARGETS)
{ {
if ((moveTarget & MOVE_TARGET_ALL_BATTLERS) == MOVE_TARGET_ALL_BATTLERS) if (moveTarget & MOVE_TARGET_ALL_BATTLERS)
{ {
u32 i = 0; u32 i = 0;
for (i = 0; i < gBattlersCount; i++) for (i = 0; i < gBattlersCount; i++)

2
src/battle_util.c
View File

@ -7018,7 +7018,7 @@ u32 SetRandomTarget(u32 battlerId)
return target; return target;
} }
u8 GetMoveTarget(u16 move, u8 setTarget) u32 GetMoveTarget(u16 move, u8 setTarget)
{ {
u8 targetBattler = 0; u8 targetBattler = 0;
u32 i, moveTarget, side; u32 i, moveTarget, side;