atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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 turnCountersTracker;
u16 wrappedMove[MAX_BATTLERS_COUNT];
u8 moveTarget[MAX_BATTLERS_COUNT];
u16 moveTarget[MAX_BATTLERS_COUNT];
u8 expGetterMonId;
u8 wildVictorySong;
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 HandleAction_RunBattleScript(void);
u32 SetRandomTarget(u32 battlerId);
u8 GetMoveTarget(u16 move, u8 setTarget);
u32 GetMoveTarget(u16 move, u8 setTarget);
u8 IsMonDisobedient(void);
u32 GetBattlerHoldEffect(u8 battlerId, bool32 checkNegating);
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_OPPONENTS_FIELD 0x40
#define MOVE_TARGET_ALLY 0x80
#define MOVE_TARGET_ALL_BATTLERS (MOVE_TARGET_BOTH | MOVE_TARGET_OPPONENTS_FIELD)
#define MOVE_TARGET_ALL_BATTLERS 0x100
#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)
{
u8 moveTarget;
u16 moveTarget;
u32 canSelectTarget = 0;
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
if (B_SHOW_TARGETS)
{
if ((moveTarget & MOVE_TARGET_ALL_BATTLERS) == MOVE_TARGET_ALL_BATTLERS)
if (moveTarget & MOVE_TARGET_ALL_BATTLERS)
{
u32 i = 0;
for (i = 0; i < gBattlersCount; i++)

2
src/battle_util.c
View file

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