This commit is contained in:
Kermalis 2023-09-09 19:03:23 -04:00
parent 21cf77f46f
commit 48cc64847d
3 changed files with 31 additions and 31 deletions

View File

@ -24,21 +24,21 @@ bool8 *GetBoughtFriendAreas(void);
const u8 *GetFriendAreaDescription(u8 index);
const u8 *GetFriendAreaName(u8 index);
s32 GetFriendAreaPrice(u8 index);
bool8 GetFriendAreaStatus(u8);
u8 GetFriendAreaUnlockCondition(u8);
bool8 GetFriendAreaStatus(u8 index);
u8 GetFriendAreaUnlockCondition(u8 index);
bool8 HasAllFriendAreas(void);
void InitializeFriendAreas(void);
void LoadFriendAreas(void);
u32 ReadSavedFriendAreas(u8 *, s32);
u32 SaveFriendAreas(u8 *, u32);
void UnlockFriendArea(u8);
u32 ReadSavedFriendAreas(u8 *, s32 size);
u32 SaveFriendAreas(u8 *, u32 size);
void UnlockFriendArea(u8 index);
u8 sub_80923D4(s32 target);
void sub_8092404(u8, u16 *, bool8, bool8);
void sub_809249C(u8, bool8);
void sub_8092558(u8 *, u8);
void sub_8092578(u8 *, u8, bool8);
void sub_8092638(u8, unkStruct_8092638 *, bool8, bool8);
void sub_809249C(u8 friendArea, bool8 clear);
void sub_8092558(u8 *buffer, u8 index);
void sub_8092578(u8 *buffer, u8 index, bool8 printPrice);
void sub_8092638(u8 friendArea, unkStruct_8092638 *, bool8 checkLeader, bool8 checkDungeon);
void sub_80926F8(u8, unkStruct_8092638 *, u8);
#endif // GUARD_FRIEND_AREA_H

View File

@ -24,28 +24,28 @@ typedef struct MoveDataFile
bool8 CanBeSnatched(u16 moveID);
void CopyAndResetMoves(Move *, Move *);
void CopyBareMoveData(Move *, Move *);
bool8 DoesMoveCharge(u16);
bool8 FailsWhileMuzzled(u16);
const u8 *GetHMTMMoves(s16);
const u8 *GetLevelUpMoves(s16);
bool8 DoesMoveCharge(u16 move);
bool8 FailsWhileMuzzled(u16 moveID);
const u8 *GetHMTMMoves(s16 species);
const u8 *GetLevelUpMoves(s16 species);
s32 GetLinkedSequence(s32, Move *, u16 *);
s32 GetMoveAccuracyOrAIChance(Move *, u32);
s32 GetMoveAccuracyOrAIChance(Move *move, u32 accuracyType);
u8 GetMoveAIWeight(Move *);
s32 GetMoveBasePower(Move *);
u32 GetMoveBasePP(Move *);
u32 GetMoveCritChance(Move *);
u32 GetMoveMaxUpgradeLevel(Move *);
u32 GetMoveNumberOfChainedHits(Move *);
s16 GetMoveTargetAndRange(Move *, bool32);
u8 *GetMoveUseText(u16);
s16 GetMoveTargetAndRange(Move *move, bool32 isAI);
u8 *GetMoveUseText(u16 moveID);
u8 GetMoveType(Move *);
void InitPokemonMove(Move *, u16);
void InitZeroedPPPokemonMove(Move *, u16);
void InitPokemonMove(Move *move, u16 moveID);
void InitZeroedPPPokemonMove(Move *move, u16 moveID);
bool8 IsAnyMoveLinked(s32, Move *);
bool8 IsMoveEnabled(s32, Move *);
bool8 IsMoveSet(s32, Move *);
bool8 IsNextMoveLinked(s32, Move *);
bool8 IsReflectedByMagicCoat(u16);
bool8 IsMoveEnabled(s32 index, Move *moves);
bool8 IsMoveSet(s32 index, Move *moves);
bool8 IsNextMoveLinked(s32 index, Move *moves);
bool8 IsReflectedByMagicCoat(u16 moveID);
bool8 IsSoundMove(Move *);
void LoadWazaParameters(void);
bool8 MoveCannotHitFrozen(Move *);
@ -53,9 +53,9 @@ bool8 MoveIgnoresTaunted(Move *);
void RemoveLinkSequenceFromMoves8(Move *, s32);
void RestorePokemonMoves(struct unkStruct_8094924 *, Move *);
void SavePokemonMoves(struct unkStruct_8094924 *, Move *);
bool8 ToggleMoveEnabled(s32, Move *);
bool8 ToggleSetMove(s32, Move *);
bool8 TryLinkMovesAfter(s32, Move *);
bool8 ToggleMoveEnabled(s32 index, Move *moves);
bool8 ToggleSetMove(s32 index, Move *moves);
bool8 TryLinkMovesAfter(s32 index, Move *moves);
void unk_CopyMoves4To8(Move *, Move *);
void unk_CopyMoves4To8AndClearFlag2Unk4(Move *, Move *);
s32 unk_FindMoveEnabledForAIAfter4(Move *, s32);
@ -72,8 +72,8 @@ s32 unk_SetMoveToFirstInLinkedSequence4(Move *, s32);
s32 unk_SetMoveToFirstInLinkedSequence8_v2(Move *, s32);
s32 unk_SetMoveToLastInLinkedSequence4(Move *, s32);
s32 unk_SetMoveToLastInLinkedSequence8_v2(Move *, s32);
bool8 UnlinkMovesAfter(s32, Move *);
void UnSetMove(s32, Move *);
bool8 UnlinkMovesAfter(s32 index, Move *moves);
void UnSetMove(s32 index, Move *moves);
u8 sub_809287C(Move *);
void sub_80928A0(u8 *, Move *, const unkStruct_80928C0 *);

View File

@ -713,16 +713,16 @@ s32 unk_SetMoveToFirstInLinkedSequence8_v2(Move *moves, s32 index)
return result;
}
bool8 IsMoveSet(s32 index, Move *struct_ptr)
bool8 IsMoveSet(s32 index, Move *moves)
{
if (struct_ptr[index].moveFlags & MOVE_FLAG_SET)
if (moves[index].moveFlags & MOVE_FLAG_SET)
return TRUE;
return FALSE;
}
bool8 IsMoveEnabled(s32 index, Move *struct_ptr)
bool8 IsMoveEnabled(s32 index, Move *moves)
{
if (struct_ptr[index].moveFlags & MOVE_FLAG_ENABLED_FOR_AI)
if (moves[index].moveFlags & MOVE_FLAG_ENABLED_FOR_AI)
return TRUE;
return FALSE;
}