From 4ef465d4e5492fc7fbfab0030120477354ecf2dd Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Wed, 10 May 2023 21:00:34 -0500 Subject: [PATCH 1/4] FIELD_PLAYER_AVATAR -> PlayerAvatar Notation from pokeemerald --- include/field_player_avatar.h | 160 +++++++++++++++++----------------- include/field_system.h | 2 +- include/field_use_item.h | 2 +- include/overlay_01.h | 6 +- include/overlay_01_021F1AFC.h | 6 +- include/unk_0205CB48.h | 8 +- include/unk_020632B0.h | 2 +- src/field_player_avatar.c | 160 +++++++++++++++++----------------- 8 files changed, 173 insertions(+), 173 deletions(-) diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 89ff13de2..353e846ad 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -11,9 +11,9 @@ typedef struct FlypointsPlayerSub { u16 hasRunningShoes; u16 unk2; u32 unk4; -} FIELD_PLAYER_AVATAR_SUB; +} PlayerAvatar_SUB; -typedef struct FIELD_PLAYER_AVATAR { +typedef struct PlayerAvatar { u32 unk0; u32 transFlag; u32 unk8; @@ -28,9 +28,9 @@ typedef struct FIELD_PLAYER_AVATAR { int unk2c; LocalMapObject* mapObject; u32 unk34; - FIELD_PLAYER_AVATAR_SUB* unk38; + PlayerAvatar_SUB* unk38; u32 unk3c; -} FIELD_PLAYER_AVATAR; //size: 0x40 +} PlayerAvatar; //size: 0x40 int sub_0205C268(u32 unkA); u8 sub_0205C278(void); @@ -39,87 +39,87 @@ u8 sub_0205C2C0(u32 unkA); u8 sub_0205C2E8(u32 unkA); u8 sub_0205C310(u32 unkA); u8 sub_0205C350(u32 unkA); -FIELD_PLAYER_AVATAR* sub_0205C390(MapObjectMan *man, int x, int y, int direction, int a4, int gender, int a6, struct FlypointsPlayerSub *a7); -FIELD_PLAYER_AVATAR* sub_0205C408(MapObjectMan* man, FIELD_PLAYER_AVATAR_SUB* avatar_sub, int gender); -void PlayerAvatar_FreeToHeap(FIELD_PLAYER_AVATAR* avatar); -void PlayerAvatar_DeleteFromMap(FIELD_PLAYER_AVATAR* avatar); -FIELD_PLAYER_AVATAR* sub_0205C4E0(); -void sub_0205C500(FIELD_PLAYER_AVATAR* avatar, int state, u32 gender, FIELD_PLAYER_AVATAR_SUB* unkD); -void CreatePlayerAvatarMapObject(FIELD_PLAYER_AVATAR* avatar, MapObjectMan* man, u32 sprite, u32 direction, u32 x, u32 y); +PlayerAvatar* sub_0205C390(MapObjectMan *man, int x, int y, int direction, int a4, int gender, int a6, struct FlypointsPlayerSub *a7); +PlayerAvatar* sub_0205C408(MapObjectMan* man, PlayerAvatar_SUB* avatar_sub, int gender); +void PlayerAvatar_FreeToHeap(PlayerAvatar* avatar); +void PlayerAvatar_DeleteFromMap(PlayerAvatar* avatar); +PlayerAvatar* sub_0205C4E0(); +void sub_0205C500(PlayerAvatar* avatar, int state, u32 gender, PlayerAvatar_SUB* unkD); +void CreatePlayerAvatarMapObject(PlayerAvatar* avatar, MapObjectMan* man, u32 sprite, u32 direction, u32 x, u32 y); LocalMapObject* sub_0205C600(MapObjectMan* man); LocalMapObject* sub_0205C640(MapObjectMan* man); -int PlayerAvatar_GetFacingDirection(FIELD_PLAYER_AVATAR* avatar); -void PlayerAvatar_SetFacingDirection(FIELD_PLAYER_AVATAR* avatar, int direction); -u32 PlayerAvatar_GetNextFacing(FIELD_PLAYER_AVATAR* avatar); -int GetPlayerXCoord(FIELD_PLAYER_AVATAR* avatar); -int GetPlayerYCoord(FIELD_PLAYER_AVATAR* avatar); -int GetPlayerLastXCoord(FIELD_PLAYER_AVATAR* avatar); -int GetPlayerLastYCoord(FIELD_PLAYER_AVATAR* avatar); -void PlayerAvatar_GetPositionVec(FIELD_PLAYER_AVATAR* avatar, VecFx32* vec); -VecFx32* PlayerAvatar_GetPositionVecConst(FIELD_PLAYER_AVATAR* avatar); -void sub_0205C6C8(FIELD_PLAYER_AVATAR* avatar, u32 unkA); -u32 sub_0205C6CC(FIELD_PLAYER_AVATAR* avatar); -void sub_0205C6D0(FIELD_PLAYER_AVATAR* avatar, u32 unkA); -u32 sub_0205C6D4(FIELD_PLAYER_AVATAR* avatar); -void sub_0205C6D8(FIELD_PLAYER_AVATAR* avatar, LocalMapObject* obj); -LocalMapObject* PlayerAvatar_GetMapObject(FIELD_PLAYER_AVATAR* avatar); -LocalMapObject* PlayerAvatar_GetMapObjectConst(FIELD_PLAYER_AVATAR* avatar); -void PlayerAvatar_SetState(FIELD_PLAYER_AVATAR* avatar, int state); -int PlayerAvatar_GetState(FIELD_PLAYER_AVATAR* avatar); -void PlayerAvatar_OrrTransitionFlags(FIELD_PLAYER_AVATAR* avatar, u32 flag); -void PlayerAvatar_SetTransitionFlags(FIELD_PLAYER_AVATAR* avatar, u32 flag); -u32 PlayerAvatar_GetTransitionFlags(FIELD_PLAYER_AVATAR* avatar); -void PlayerAvatar_SetGender(FIELD_PLAYER_AVATAR* avatar, u32 gender); -int PlayerAvatar_GetGender(FIELD_PLAYER_AVATAR* avatar); -void sub_0205C728(FIELD_PLAYER_AVATAR* avatar, u32 unkA); -void sub_0205C730(FIELD_PLAYER_AVATAR* avatar, u32 unkA); -u32 sub_0205C73C(FIELD_PLAYER_AVATAR* avatar, u32 unkA); -u32 sub_0205C744(FIELD_PLAYER_AVATAR* avatar); -void sub_0205C748(FIELD_PLAYER_AVATAR* avatar, u32 unkA); -void sub_0205C74C(FIELD_PLAYER_AVATAR* avatar); -int sub_0205C758(FIELD_PLAYER_AVATAR* avatar, int unkB, int unkC); -void sub_0205C768(FIELD_PLAYER_AVATAR* avatar, int unkA); -int sub_0205C76C(FIELD_PLAYER_AVATAR* avatar); -void sub_0205C770(FIELD_PLAYER_AVATAR* avatar, int unkA); -int sub_0205C774(FIELD_PLAYER_AVATAR* avatar); -void sub_0205C778(FIELD_PLAYER_AVATAR* avatar, int unkB, int unkC); -void sub_0205C78C(FIELD_PLAYER_AVATAR* avatar, u32 unkA); -u32 sub_0205C790(FIELD_PLAYER_AVATAR* avatar); -void sub_0205C794(FIELD_PLAYER_AVATAR* avatar, FIELD_PLAYER_AVATAR_SUB* unkA); -FIELD_PLAYER_AVATAR_SUB* sub_0205C798(FIELD_PLAYER_AVATAR* avatar); -void sub_0205C79C(FIELD_PLAYER_AVATAR* avatar, u32 unkA); -u32 sub_0205C7A0(FIELD_PLAYER_AVATAR* avatar); -u32 sub_0205C7A4(FIELD_PLAYER_AVATAR* avatar); -void sub_0205C7A8(FIELD_PLAYER_AVATAR* avatar); -void sub_0205C7B4(FIELD_PLAYER_AVATAR* avatar); +int PlayerAvatar_GetFacingDirection(PlayerAvatar* avatar); +void PlayerAvatar_SetFacingDirection(PlayerAvatar* avatar, int direction); +u32 PlayerAvatar_GetNextFacing(PlayerAvatar* avatar); +int GetPlayerXCoord(PlayerAvatar* avatar); +int GetPlayerYCoord(PlayerAvatar* avatar); +int GetPlayerLastXCoord(PlayerAvatar* avatar); +int GetPlayerLastYCoord(PlayerAvatar* avatar); +void PlayerAvatar_GetPositionVec(PlayerAvatar* avatar, VecFx32* vec); +VecFx32* PlayerAvatar_GetPositionVecConst(PlayerAvatar* avatar); +void sub_0205C6C8(PlayerAvatar* avatar, u32 unkA); +u32 sub_0205C6CC(PlayerAvatar* avatar); +void sub_0205C6D0(PlayerAvatar* avatar, u32 unkA); +u32 sub_0205C6D4(PlayerAvatar* avatar); +void sub_0205C6D8(PlayerAvatar* avatar, LocalMapObject* obj); +LocalMapObject* PlayerAvatar_GetMapObject(PlayerAvatar* avatar); +LocalMapObject* PlayerAvatar_GetMapObjectConst(PlayerAvatar* avatar); +void PlayerAvatar_SetState(PlayerAvatar* avatar, int state); +int PlayerAvatar_GetState(PlayerAvatar* avatar); +void PlayerAvatar_OrrTransitionFlags(PlayerAvatar* avatar, u32 flag); +void PlayerAvatar_SetTransitionFlags(PlayerAvatar* avatar, u32 flag); +u32 PlayerAvatar_GetTransitionFlags(PlayerAvatar* avatar); +void PlayerAvatar_SetGender(PlayerAvatar* avatar, u32 gender); +int PlayerAvatar_GetGender(PlayerAvatar* avatar); +void sub_0205C728(PlayerAvatar* avatar, u32 unkA); +void sub_0205C730(PlayerAvatar* avatar, u32 unkA); +u32 sub_0205C73C(PlayerAvatar* avatar, u32 unkA); +u32 sub_0205C744(PlayerAvatar* avatar); +void sub_0205C748(PlayerAvatar* avatar, u32 unkA); +void sub_0205C74C(PlayerAvatar* avatar); +int sub_0205C758(PlayerAvatar* avatar, int unkB, int unkC); +void sub_0205C768(PlayerAvatar* avatar, int unkA); +int sub_0205C76C(PlayerAvatar* avatar); +void sub_0205C770(PlayerAvatar* avatar, int unkA); +int sub_0205C774(PlayerAvatar* avatar); +void sub_0205C778(PlayerAvatar* avatar, int unkB, int unkC); +void sub_0205C78C(PlayerAvatar* avatar, u32 unkA); +u32 sub_0205C790(PlayerAvatar* avatar); +void sub_0205C794(PlayerAvatar* avatar, PlayerAvatar_SUB* unkA); +PlayerAvatar_SUB* sub_0205C798(PlayerAvatar* avatar); +void sub_0205C79C(PlayerAvatar* avatar, u32 unkA); +u32 sub_0205C7A0(PlayerAvatar* avatar); +u32 sub_0205C7A4(PlayerAvatar* avatar); +void sub_0205C7A8(PlayerAvatar* avatar); +void sub_0205C7B4(PlayerAvatar* avatar); void FlypointsPlayerSub_init(struct FlypointsPlayerSub* fpsub); BOOL FlypointsPlayerSub_CheckRunningShoes(struct FlypointsPlayerSub* fpsub); void FlypointsPlayerSub_SetRunningShoesFlag(struct FlypointsPlayerSub* fpsub, BOOL unkB); -int sub_0205C7EC(FIELD_PLAYER_AVATAR_SUB* avatar); -void sub_0205C7F8(FIELD_PLAYER_AVATAR_SUB* unkPtr, int state); -void sub_0205C800(FIELD_PLAYER_AVATAR* avatar, int state); -void sub_0205C810(FIELD_PLAYER_AVATAR* avatar, u32 unkA, u32 unkB); -void sub_0205C838(FIELD_PLAYER_AVATAR* avatar, int unkA); -void PlayerAvatar_ToggleAutomaticHeightUpdating(FIELD_PLAYER_AVATAR* avatar, u8 unkA); -void PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply(FIELD_PLAYER_AVATAR* avatar, BOOL unkA); +int sub_0205C7EC(PlayerAvatar_SUB* avatar); +void sub_0205C7F8(PlayerAvatar_SUB* unkPtr, int state); +void sub_0205C800(PlayerAvatar* avatar, int state); +void sub_0205C810(PlayerAvatar* avatar, u32 unkA, u32 unkB); +void sub_0205C838(PlayerAvatar* avatar, int unkA); +void PlayerAvatar_ToggleAutomaticHeightUpdating(PlayerAvatar* avatar, u8 unkA); +void PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply(PlayerAvatar* avatar, BOOL unkA); u32 PlayerAvatar_GetSpriteByStateAndGender(u32 unkA, BOOL unkB); u32 PlayerAvatar_GetTransitionBits(u32 unkA); -FIELD_PLAYER_AVATAR* FieldSys_GetPlayerAvatar(FieldSystem* fsys); -void sub_0205CA20(FIELD_PLAYER_AVATAR* avatar, BOOL unkA); -BOOL sub_0205CA38(FIELD_PLAYER_AVATAR* avatar); -void sub_0205CA4C(FIELD_PLAYER_AVATAR* avatar, BOOL unkA); -BOOL sub_0205CA64(FIELD_PLAYER_AVATAR* avatar); -void sub_0205CA78(FIELD_PLAYER_AVATAR* avatar, BOOL unkB); -BOOL sub_0205CA90(FIELD_PLAYER_AVATAR* avatar); -void sub_0205CAA4(FIELD_PLAYER_AVATAR* avatar, u8 unkA); -BOOL sub_0205CABC(FIELD_PLAYER_AVATAR* avatar); -void sub_0205CAD0(FIELD_PLAYER_AVATAR* avatar, BOOL unkA); -void sub_0205CAE8(FIELD_PLAYER_AVATAR* avatar); -void sub_0205CAF4(FIELD_PLAYER_AVATAR* avatar); -BOOL sub_0205CB00(FIELD_PLAYER_AVATAR* avatar); -void sub_0205CB14(FIELD_PLAYER_AVATAR* avatar, BOOL unkA); -u32 sub_0205CB2C(FIELD_PLAYER_AVATAR* avatar); -u16 sub_0205CB38(FIELD_PLAYER_AVATAR* avatar); -void sub_0205CB40(FIELD_PLAYER_AVATAR* avatar, u16 unkA); +PlayerAvatar* FieldSys_GetPlayerAvatar(FieldSystem* fsys); +void sub_0205CA20(PlayerAvatar* avatar, BOOL unkA); +BOOL sub_0205CA38(PlayerAvatar* avatar); +void sub_0205CA4C(PlayerAvatar* avatar, BOOL unkA); +BOOL sub_0205CA64(PlayerAvatar* avatar); +void sub_0205CA78(PlayerAvatar* avatar, BOOL unkB); +BOOL sub_0205CA90(PlayerAvatar* avatar); +void sub_0205CAA4(PlayerAvatar* avatar, u8 unkA); +BOOL sub_0205CABC(PlayerAvatar* avatar); +void sub_0205CAD0(PlayerAvatar* avatar, BOOL unkA); +void sub_0205CAE8(PlayerAvatar* avatar); +void sub_0205CAF4(PlayerAvatar* avatar); +BOOL sub_0205CB00(PlayerAvatar* avatar); +void sub_0205CB14(PlayerAvatar* avatar, BOOL unkA); +u32 sub_0205CB2C(PlayerAvatar* avatar); +u16 sub_0205CB38(PlayerAvatar* avatar); +void sub_0205CB40(PlayerAvatar* avatar, u16 unkA); -#endif //POKEHEARTGOLD_FIELD_PLAYER_AVATAR_H +#endif //POKEHEARTGOLD_PlayerAvatar_H diff --git a/include/field_system.h b/include/field_system.h index 9140e589c..4c175d381 100644 --- a/include/field_system.h +++ b/include/field_system.h @@ -123,7 +123,7 @@ struct FieldSystem { MAPMATRIX *mapMatrix; u8 filler34[0x8]; MapObjectMan *mapObjectMan; - FIELD_PLAYER_AVATAR *playerAvatar; + PlayerAvatar *playerAvatar; void *unk_44; u8 filler48[0xC]; void *unk54; diff --git a/include/field_use_item.h b/include/field_use_item.h index d9bbc93aa..6559fe983 100644 --- a/include/field_use_item.h +++ b/include/field_use_item.h @@ -19,7 +19,7 @@ struct ItemCheckUseData { u16 haveRocketCostume:1; u16 facingTile; u16 standingTile; - FIELD_PLAYER_AVATAR *playerAvatar; + PlayerAvatar *playerAvatar; FieldSystem *fsys; }; diff --git a/include/overlay_01.h b/include/overlay_01.h index a87739b41..f135b0ca6 100644 --- a/include/overlay_01.h +++ b/include/overlay_01.h @@ -25,8 +25,8 @@ struct UnkStruct_ov01_021EDC28; void ov01_021E636C(int a0); void ov01_021EFAF8(FieldSystem *fsys); -void ov01_PlayerAvatar_OrrTransitionFlags(FIELD_PLAYER_AVATAR *avatar, int a1); -void ov01_PlayerAvatar_ApplyTransitionFlags(FIELD_PLAYER_AVATAR *avatar); +void ov01_PlayerAvatar_OrrTransitionFlags(PlayerAvatar *avatar, int a1); +void ov01_PlayerAvatar_ApplyTransitionFlags(PlayerAvatar *avatar); void ov01_021F35C4(FieldSystem *fsys, int a1, int *a2); u32 GetHoneySweetScentWorkSize(void); BOOL Task_HoneyOrSweetScent(TaskManager *taskManager); @@ -42,7 +42,7 @@ void ov01_02205790(FieldSystem *fsys, u8 a1); void ov01_02205784(LocalMapObject *object); BOOL ov01_022057C4(FieldSystem *fsys); BOOL ov01_02205D68(FieldSystem *fsys); -BOOL Field_PlayerCanStartSurfingByStandingAndFacingTileBehaviors(FIELD_PLAYER_AVATAR *fieldPlayerAvatar, int standingTile, int facingTile); +BOOL Field_PlayerCanStartSurfingByStandingAndFacingTileBehaviors(PlayerAvatar *fieldPlayerAvatar, int standingTile, int facingTile); BOOL MetatileBehavior_IsRockClimbInDirection(int facingTile, int facingDirection); BOOL FieldSys_FacingModelIsHeadbuttTree(FieldSystem *fsys); BOOL Task_UseSweetScentInField(TaskManager *taskManager); diff --git a/include/overlay_01_021F1AFC.h b/include/overlay_01_021F1AFC.h index 37da7dd6b..e8c31ef08 100644 --- a/include/overlay_01_021F1AFC.h +++ b/include/overlay_01_021F1AFC.h @@ -3,8 +3,8 @@ #include "field_player_avatar.h" -void ov01_PlayerAvatar_OrrTransitionFlags(FIELD_PLAYER_AVATAR *playerAvatar, int flags); -void ov01_PlayerAvatar_ApplyTransitionFlags(FIELD_PLAYER_AVATAR *playerAvatar); -void ov01_021F2F24(FIELD_PLAYER_AVATAR *playerAvatar); +void ov01_PlayerAvatar_OrrTransitionFlags(PlayerAvatar *playerAvatar, int flags); +void ov01_PlayerAvatar_ApplyTransitionFlags(PlayerAvatar *playerAvatar); +void ov01_021F2F24(PlayerAvatar *playerAvatar); #endif //POKEHEARTGOLD_OVERLAY_01_021F1AFC_H diff --git a/include/unk_0205CB48.h b/include/unk_0205CB48.h index 858a239f2..ca5a8a0fc 100644 --- a/include/unk_0205CB48.h +++ b/include/unk_0205CB48.h @@ -3,9 +3,9 @@ #include "field_player_avatar.h" -void PlayerAvatar_GetCoordsInFront(FIELD_PLAYER_AVATAR *playerAvatar, int *x, int *z); -void sub_0205CE68(FIELD_PLAYER_AVATAR *playerAvatar); -void sub_0205CB48(FIELD_PLAYER_AVATAR *playerAvatar, FsysUnkSub2C *a1, int a2, u16 a3, u16 a4, int a5); -void sub_0205CF44(FIELD_PLAYER_AVATAR *playerAvatar); +void PlayerAvatar_GetCoordsInFront(PlayerAvatar *playerAvatar, int *x, int *z); +void sub_0205CE68(PlayerAvatar *playerAvatar); +void sub_0205CB48(PlayerAvatar *playerAvatar, FsysUnkSub2C *a1, int a2, u16 a3, u16 a4, int a5); +void sub_0205CF44(PlayerAvatar *playerAvatar); #endif //POKEHEARTGOLD_UNK_0205CB48_H diff --git a/include/unk_020632B0.h b/include/unk_020632B0.h index c7d95c478..6455aa429 100644 --- a/include/unk_020632B0.h +++ b/include/unk_020632B0.h @@ -3,7 +3,7 @@ #include "script.h" -int sub_0206457C(FieldSystem *fsys, LocalMapObject *localMapObject, FIELD_PLAYER_AVATAR *playerAvatar, int a3, int a4, int a5, int a6, u16 trainerNum); +int sub_0206457C(FieldSystem *fsys, LocalMapObject *localMapObject, PlayerAvatar *playerAvatar, int a3, int a4, int a5, int a6, u16 trainerNum); BOOL sub_02064598(void); void sub_020645AC(int a0); diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 2d9d8505f..328b99538 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -121,8 +121,8 @@ u8 sub_0205C350(u32 unkA) { return ret; } -FIELD_PLAYER_AVATAR* sub_0205C390(MapObjectMan *man, int x, int y, int direction, int state, int gender, int a6, struct FlypointsPlayerSub *a7) { - FIELD_PLAYER_AVATAR* avatar = sub_0205C4E0(); +PlayerAvatar* sub_0205C390(MapObjectMan *man, int x, int y, int direction, int state, int gender, int a6, struct FlypointsPlayerSub *a7) { + PlayerAvatar* avatar = sub_0205C4E0(); sub_0205C500(avatar, state, gender, a7); int sprite; if (a6 == 2) { @@ -152,8 +152,8 @@ FIELD_PLAYER_AVATAR* sub_0205C390(MapObjectMan *man, int x, int y, int direction return avatar; } -FIELD_PLAYER_AVATAR* sub_0205C408(MapObjectMan* man, FIELD_PLAYER_AVATAR_SUB* avatar_sub, int gender) { - FIELD_PLAYER_AVATAR* avatar = sub_0205C4E0(); +PlayerAvatar* sub_0205C408(MapObjectMan* man, PlayerAvatar_SUB* avatar_sub, int gender) { + PlayerAvatar* avatar = sub_0205C4E0(); int state = sub_0205C7EC(avatar_sub); sub_0205C500(avatar, state, gender, avatar_sub); LocalMapObject* mapObj = sub_0205C640(man); @@ -165,7 +165,7 @@ FIELD_PLAYER_AVATAR* sub_0205C408(MapObjectMan* man, FIELD_PLAYER_AVATAR_SUB* av return avatar; } -void sub_0205C46C(FIELD_PLAYER_AVATAR* avatar) { +void sub_0205C46C(PlayerAvatar* avatar) { LocalMapObject* mapObj = PlayerAvatar_GetMapObject(avatar); if (!mapObj) { GF_ASSERT(FALSE); @@ -180,25 +180,25 @@ void sub_0205C46C(FIELD_PLAYER_AVATAR* avatar) { } } -void PlayerAvatar_FreeToHeap(FIELD_PLAYER_AVATAR* avatar) { +void PlayerAvatar_FreeToHeap(PlayerAvatar* avatar) { FreeToHeap(avatar); } -void PlayerAvatar_DeleteFromMap(FIELD_PLAYER_AVATAR* avatar) { +void PlayerAvatar_DeleteFromMap(PlayerAvatar* avatar) { MapObject_Remove(PlayerAvatar_GetMapObject(avatar)); PlayerAvatar_FreeToHeap(avatar); } -FIELD_PLAYER_AVATAR* sub_0205C4E0() { - FIELD_PLAYER_AVATAR* avatar = AllocFromHeap(11, sizeof(FIELD_PLAYER_AVATAR)); +PlayerAvatar* sub_0205C4E0() { + PlayerAvatar* avatar = AllocFromHeap(11, sizeof(PlayerAvatar)); if (!avatar) { GF_ASSERT(FALSE); } - memset(avatar, 0, sizeof(FIELD_PLAYER_AVATAR)); + memset(avatar, 0, sizeof(PlayerAvatar)); return avatar; } -void sub_0205C500(FIELD_PLAYER_AVATAR* avatar, int state, u32 gender, FIELD_PLAYER_AVATAR_SUB* avatar_sub) { +void sub_0205C500(PlayerAvatar* avatar, int state, u32 gender, PlayerAvatar_SUB* avatar_sub) { sub_0205C794(avatar, avatar_sub); sub_0205C6C8(avatar, 0); sub_0205C6D0(avatar, 0); @@ -212,7 +212,7 @@ void sub_0205C500(FIELD_PLAYER_AVATAR* avatar, int state, u32 gender, FIELD_PLAY sub_0205CA4C(avatar, TRUE); } -void CreatePlayerAvatarMapObject(FIELD_PLAYER_AVATAR* avatar, MapObjectMan* man, u32 sprite, u32 direction, u32 x, u32 y) { +void CreatePlayerAvatarMapObject(PlayerAvatar* avatar, MapObjectMan* man, u32 sprite, u32 direction, u32 x, u32 y) { LocalMapObject* mapObj = CreateSpecialFieldObject(man, x, y, direction, sprite, 1, 1); if (!mapObj) { GF_ASSERT(FALSE); @@ -251,71 +251,71 @@ LocalMapObject* sub_0205C640(MapObjectMan* man) { return mapObj; } -int PlayerAvatar_GetFacingDirection(FIELD_PLAYER_AVATAR* avatar) { +int PlayerAvatar_GetFacingDirection(PlayerAvatar* avatar) { return MapObject_GetFacingDirection(PlayerAvatar_GetMapObject(avatar)); } -void PlayerAvatar_SetFacingDirection(FIELD_PLAYER_AVATAR* avatar, int direction) { +void PlayerAvatar_SetFacingDirection(PlayerAvatar* avatar, int direction) { MapObject_SetFacingDirection(PlayerAvatar_GetMapObject(avatar), direction); } -u32 PlayerAvatar_GetNextFacing(FIELD_PLAYER_AVATAR* avatar) { +u32 PlayerAvatar_GetNextFacing(PlayerAvatar* avatar) { return MapObject_GetNextFacing(PlayerAvatar_GetMapObject(avatar)); } -int GetPlayerXCoord(FIELD_PLAYER_AVATAR* avatar) { +int GetPlayerXCoord(PlayerAvatar* avatar) { return MapObject_GetCurrentX(PlayerAvatar_GetMapObject(avatar)); } -int GetPlayerYCoord(FIELD_PLAYER_AVATAR* avatar) { +int GetPlayerYCoord(PlayerAvatar* avatar) { return MapObject_GetCurrentY(PlayerAvatar_GetMapObject(avatar)); } -int GetPlayerLastXCoord(FIELD_PLAYER_AVATAR* avatar) { +int GetPlayerLastXCoord(PlayerAvatar* avatar) { return MapObject_GetPrevX(PlayerAvatar_GetMapObject(avatar)); } -int GetPlayerLastYCoord(FIELD_PLAYER_AVATAR* avatar) { +int GetPlayerLastYCoord(PlayerAvatar* avatar) { return MapObject_GetPrevY(PlayerAvatar_GetMapObject(avatar)); } -void PlayerAvatar_GetPositionVec(FIELD_PLAYER_AVATAR* avatar, VecFx32* vec) { +void PlayerAvatar_GetPositionVec(PlayerAvatar* avatar, VecFx32* vec) { MapObject_GetPositionVec(PlayerAvatar_GetMapObject(avatar), vec); } -VecFx32* PlayerAvatar_GetPositionVecConst(FIELD_PLAYER_AVATAR* avatar) { +VecFx32* PlayerAvatar_GetPositionVecConst(PlayerAvatar* avatar) { return MapObject_GetPositionVecPtr(PlayerAvatar_GetMapObjectConst(avatar)); } -void sub_0205C6C8(FIELD_PLAYER_AVATAR* avatar, u32 unkA) { +void sub_0205C6C8(PlayerAvatar* avatar, u32 unkA) { avatar->unk10 = unkA; } -u32 sub_0205C6CC(FIELD_PLAYER_AVATAR* avatar) { +u32 sub_0205C6CC(PlayerAvatar* avatar) { return avatar->unk10; } -void sub_0205C6D0(FIELD_PLAYER_AVATAR* avatar, u32 unkA) { +void sub_0205C6D0(PlayerAvatar* avatar, u32 unkA) { avatar->unk14 = unkA; } -u32 sub_0205C6D4(FIELD_PLAYER_AVATAR* avatar) { +u32 sub_0205C6D4(PlayerAvatar* avatar) { return avatar->unk14; } -void sub_0205C6D8(FIELD_PLAYER_AVATAR* avatar, LocalMapObject* obj) { +void sub_0205C6D8(PlayerAvatar* avatar, LocalMapObject* obj) { avatar->mapObject = obj; } -LocalMapObject* PlayerAvatar_GetMapObject(FIELD_PLAYER_AVATAR* avatar) { +LocalMapObject* PlayerAvatar_GetMapObject(PlayerAvatar* avatar) { return avatar->mapObject; } -LocalMapObject* PlayerAvatar_GetMapObjectConst(FIELD_PLAYER_AVATAR* avatar) { +LocalMapObject* PlayerAvatar_GetMapObjectConst(PlayerAvatar* avatar) { return avatar->mapObject; } -void PlayerAvatar_SetState(FIELD_PLAYER_AVATAR* avatar, int state) { +void PlayerAvatar_SetState(PlayerAvatar* avatar, int state) { if(state >= PLAYER_STATE_UNK_SP) { GF_ASSERT(FALSE); } @@ -323,59 +323,59 @@ void PlayerAvatar_SetState(FIELD_PLAYER_AVATAR* avatar, int state) { sub_0205C800(avatar, state); } -int PlayerAvatar_GetState(FIELD_PLAYER_AVATAR* avatar) { +int PlayerAvatar_GetState(PlayerAvatar* avatar) { if(!avatar) { GF_ASSERT(FALSE); } return avatar->state; } -void PlayerAvatar_OrrTransitionFlags(FIELD_PLAYER_AVATAR* avatar, u32 flag) { +void PlayerAvatar_OrrTransitionFlags(PlayerAvatar* avatar, u32 flag) { avatar->transFlag = avatar->transFlag | flag; } -void PlayerAvatar_SetTransitionFlags(FIELD_PLAYER_AVATAR* avatar, u32 flag) { +void PlayerAvatar_SetTransitionFlags(PlayerAvatar* avatar, u32 flag) { avatar->transFlag = flag; } -u32 PlayerAvatar_GetTransitionFlags(FIELD_PLAYER_AVATAR* avatar) { +u32 PlayerAvatar_GetTransitionFlags(PlayerAvatar* avatar) { return avatar->transFlag; } -void PlayerAvatar_SetGender(FIELD_PLAYER_AVATAR* avatar, u32 gender) { +void PlayerAvatar_SetGender(PlayerAvatar* avatar, u32 gender) { avatar->gender = gender; } -int PlayerAvatar_GetGender(FIELD_PLAYER_AVATAR* avatar) { +int PlayerAvatar_GetGender(PlayerAvatar* avatar) { return avatar->gender; } -void sub_0205C728(FIELD_PLAYER_AVATAR* avatar, u32 unkA) { +void sub_0205C728(PlayerAvatar* avatar, u32 unkA) { avatar->unk0 = avatar->unk0 | unkA; } -void sub_0205C730(FIELD_PLAYER_AVATAR* avatar, u32 unkA) { +void sub_0205C730(PlayerAvatar* avatar, u32 unkA) { avatar->unk0 = avatar->unk0 & ~unkA; } -u32 sub_0205C73C(FIELD_PLAYER_AVATAR* avatar, u32 unkA) { +u32 sub_0205C73C(PlayerAvatar* avatar, u32 unkA) { return avatar->unk0 & unkA; } -u32 sub_0205C744(FIELD_PLAYER_AVATAR* avatar) { +u32 sub_0205C744(PlayerAvatar* avatar) { return avatar->unk24; } -void sub_0205C748(FIELD_PLAYER_AVATAR* avatar, u32 unkA) { +void sub_0205C748(PlayerAvatar* avatar, u32 unkA) { avatar->unk24 = unkA; } -void sub_0205C74C(FIELD_PLAYER_AVATAR* avatar) { +void sub_0205C74C(PlayerAvatar* avatar) { avatar->unk24 = 0; sub_0205CA78(avatar, FALSE); } -int sub_0205C758(FIELD_PLAYER_AVATAR* avatar, int unkB, int unkC) { +int sub_0205C758(PlayerAvatar* avatar, int unkB, int unkC) { int var = avatar->unk24 + unkB; avatar->unk24 = var; if (var > unkC) { @@ -384,60 +384,60 @@ int sub_0205C758(FIELD_PLAYER_AVATAR* avatar, int unkB, int unkC) { return avatar->unk24; } -void sub_0205C768(FIELD_PLAYER_AVATAR* avatar, int unkA) { +void sub_0205C768(PlayerAvatar* avatar, int unkA) { avatar->unk28 = unkA; } -int sub_0205C76C(FIELD_PLAYER_AVATAR* avatar) { +int sub_0205C76C(PlayerAvatar* avatar) { return avatar->unk28; } -void sub_0205C770(FIELD_PLAYER_AVATAR* avatar, int unkA) { +void sub_0205C770(PlayerAvatar* avatar, int unkA) { avatar->unk2c = unkA; } -int sub_0205C774(FIELD_PLAYER_AVATAR* avatar) { +int sub_0205C774(PlayerAvatar* avatar) { return avatar->unk2c; } -void sub_0205C778(FIELD_PLAYER_AVATAR* avatar, int unkB, int unkC) { +void sub_0205C778(PlayerAvatar* avatar, int unkB, int unkC) { sub_0205C768(avatar, unkB); sub_0205C770(avatar, unkC); } -void sub_0205C78C(FIELD_PLAYER_AVATAR* avatar, u32 unkA) { +void sub_0205C78C(PlayerAvatar* avatar, u32 unkA) { avatar->unk34 = unkA; } -u32 sub_0205C790(FIELD_PLAYER_AVATAR* avatar) { +u32 sub_0205C790(PlayerAvatar* avatar) { return avatar->unk34; } -void sub_0205C794(FIELD_PLAYER_AVATAR* avatar, FIELD_PLAYER_AVATAR_SUB* unkA) { +void sub_0205C794(PlayerAvatar* avatar, PlayerAvatar_SUB* unkA) { avatar->unk38 = unkA; } -FIELD_PLAYER_AVATAR_SUB* sub_0205C798(FIELD_PLAYER_AVATAR* avatar) { +PlayerAvatar_SUB* sub_0205C798(PlayerAvatar* avatar) { return avatar->unk38; } -void sub_0205C79C(FIELD_PLAYER_AVATAR* avatar, u32 unkA) { +void sub_0205C79C(PlayerAvatar* avatar, u32 unkA) { avatar->unk8 = unkA; } -u32 sub_0205C7A0(FIELD_PLAYER_AVATAR* avatar) { +u32 sub_0205C7A0(PlayerAvatar* avatar) { return avatar->unk8; } -u32 sub_0205C7A4(FIELD_PLAYER_AVATAR* avatar) { +u32 sub_0205C7A4(PlayerAvatar* avatar) { return avatar->unkc; } -void sub_0205C7A8(FIELD_PLAYER_AVATAR* avatar) { +void sub_0205C7A8(PlayerAvatar* avatar) { avatar->unkc = (avatar->unkc + 1) & TRUE; } -void sub_0205C7B4(FIELD_PLAYER_AVATAR* avatar) { +void sub_0205C7B4(PlayerAvatar* avatar) { avatar->unkc = 0; } @@ -465,31 +465,31 @@ void FlypointsPlayerSub_SetRunningShoesFlag(struct FlypointsPlayerSub* fpsub, BO } } -int sub_0205C7EC(FIELD_PLAYER_AVATAR_SUB* avatar) { +int sub_0205C7EC(PlayerAvatar_SUB* avatar) { if (!avatar) { return 0; } return avatar->unk4; } -void sub_0205C7F8(FIELD_PLAYER_AVATAR_SUB* unkPtr, int state) { +void sub_0205C7F8(PlayerAvatar_SUB* unkPtr, int state) { if (!unkPtr) { return; } unkPtr->unk4 = state; } -void sub_0205C800(FIELD_PLAYER_AVATAR* avatar, int state) { +void sub_0205C800(PlayerAvatar* avatar, int state) { sub_0205C7F8(sub_0205C798(avatar), state); } -void sub_0205C810(FIELD_PLAYER_AVATAR* avatar, u32 unkA, u32 unkB) { +void sub_0205C810(PlayerAvatar* avatar, u32 unkA, u32 unkB) { sub_0205FBC0(PlayerAvatar_GetMapObject(avatar), unkA, unkB); sub_0205C6C8(avatar, 0); sub_0205C6D0(avatar, 0); } -void sub_0205C838(FIELD_PLAYER_AVATAR* avatar, int unkA) { +void sub_0205C838(PlayerAvatar* avatar, int unkA) { LocalMapObject* mapObj = PlayerAvatar_GetMapObject(avatar); VecFx32 vec; MapObject_GetPositionVec(mapObj, &vec); @@ -497,7 +497,7 @@ void sub_0205C838(FIELD_PLAYER_AVATAR* avatar, int unkA) { MapObject_SetPositionVec(mapObj, &vec); } -void PlayerAvatar_ToggleAutomaticHeightUpdating(FIELD_PLAYER_AVATAR* avatar, u8 state) { +void PlayerAvatar_ToggleAutomaticHeightUpdating(PlayerAvatar* avatar, u8 state) { LocalMapObject* mapObj = PlayerAvatar_GetMapObject(avatar); if (state == TRUE) { MapObject_SetFlag23(mapObj, FALSE); @@ -507,7 +507,7 @@ void PlayerAvatar_ToggleAutomaticHeightUpdating(FIELD_PLAYER_AVATAR* avatar, u8 } } -void PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply(FIELD_PLAYER_AVATAR* avatar, BOOL state) { +void PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply(PlayerAvatar* avatar, BOOL state) { LocalMapObject* mapObj = PlayerAvatar_GetMapObject(avatar); if (state == TRUE) { MapObject_SetFlag23(mapObj, FALSE); @@ -628,11 +628,11 @@ u32 PlayerAvatar_GetTransitionBits(u32 unkA) { } } -FIELD_PLAYER_AVATAR* FieldSys_GetPlayerAvatar(FieldSystem* fsys) { +PlayerAvatar* FieldSys_GetPlayerAvatar(FieldSystem* fsys) { return fsys->playerAvatar; } -void sub_0205CA20(FIELD_PLAYER_AVATAR* avatar, BOOL unkA) { +void sub_0205CA20(PlayerAvatar* avatar, BOOL unkA) { if (unkA == TRUE) { sub_0205C728(avatar, 1); } @@ -641,14 +641,14 @@ void sub_0205CA20(FIELD_PLAYER_AVATAR* avatar, BOOL unkA) { } } -BOOL sub_0205CA38(FIELD_PLAYER_AVATAR* avatar) { +BOOL sub_0205CA38(PlayerAvatar* avatar) { if (sub_0205C73C(avatar, 1)) { return TRUE; } return FALSE; } -void sub_0205CA4C(FIELD_PLAYER_AVATAR* avatar, BOOL unkA) { +void sub_0205CA4C(PlayerAvatar* avatar, BOOL unkA) { if (unkA == TRUE) { sub_0205C728(avatar, 2); } @@ -657,14 +657,14 @@ void sub_0205CA4C(FIELD_PLAYER_AVATAR* avatar, BOOL unkA) { } } -BOOL sub_0205CA64(FIELD_PLAYER_AVATAR* avatar) { +BOOL sub_0205CA64(PlayerAvatar* avatar) { if (sub_0205C73C(avatar, 2)) { return TRUE; } return FALSE; } -void sub_0205CA78(FIELD_PLAYER_AVATAR* avatar, BOOL unkB) { +void sub_0205CA78(PlayerAvatar* avatar, BOOL unkB) { if (unkB == TRUE) { sub_0205C728(avatar, 4); } @@ -673,14 +673,14 @@ void sub_0205CA78(FIELD_PLAYER_AVATAR* avatar, BOOL unkB) { } } -BOOL sub_0205CA90(FIELD_PLAYER_AVATAR* avatar) { +BOOL sub_0205CA90(PlayerAvatar* avatar) { if (sub_0205C73C(avatar, 4)) { return TRUE; } return FALSE; } -void sub_0205CAA4(FIELD_PLAYER_AVATAR* avatar, u8 unkA) { +void sub_0205CAA4(PlayerAvatar* avatar, u8 unkA) { if (unkA == 1) { sub_0205C728(avatar, 8); } @@ -689,14 +689,14 @@ void sub_0205CAA4(FIELD_PLAYER_AVATAR* avatar, u8 unkA) { } } -BOOL sub_0205CABC(FIELD_PLAYER_AVATAR* avatar) { +BOOL sub_0205CABC(PlayerAvatar* avatar) { if (sub_0205C73C(avatar, 8)) { return TRUE; } return FALSE; } -void sub_0205CAD0(FIELD_PLAYER_AVATAR* avatar, BOOL unkA) { +void sub_0205CAD0(PlayerAvatar* avatar, BOOL unkA) { if (unkA == TRUE) { sub_0205C728(avatar, 32); } @@ -705,22 +705,22 @@ void sub_0205CAD0(FIELD_PLAYER_AVATAR* avatar, BOOL unkA) { } } -void sub_0205CAE8(FIELD_PLAYER_AVATAR* avatar) { +void sub_0205CAE8(PlayerAvatar* avatar) { sub_0205C728(avatar, 64); } -void sub_0205CAF4(FIELD_PLAYER_AVATAR* avatar) { +void sub_0205CAF4(PlayerAvatar* avatar) { sub_0205C730(avatar, 64); } -BOOL sub_0205CB00(FIELD_PLAYER_AVATAR* avatar) { +BOOL sub_0205CB00(PlayerAvatar* avatar) { if (sub_0205C73C(avatar, 64)) { return TRUE; } return FALSE; } -void sub_0205CB14(FIELD_PLAYER_AVATAR* avatar, BOOL unkA) { +void sub_0205CB14(PlayerAvatar* avatar, BOOL unkA) { if (unkA == TRUE) { sub_0205C728(avatar, 128); } @@ -729,14 +729,14 @@ void sub_0205CB14(FIELD_PLAYER_AVATAR* avatar, BOOL unkA) { } } -u32 sub_0205CB2C(FIELD_PLAYER_AVATAR* avatar) { +u32 sub_0205CB2C(PlayerAvatar* avatar) { return sub_0205C73C(avatar, 128); } -u16 sub_0205CB38(FIELD_PLAYER_AVATAR* avatar) { +u16 sub_0205CB38(PlayerAvatar* avatar) { return avatar->unk38->unk2; } -void sub_0205CB40(FIELD_PLAYER_AVATAR* avatar, u16 unkA) { +void sub_0205CB40(PlayerAvatar* avatar, u16 unkA) { avatar->unk38->unk2 = unkA; } From d229f7f7eb430e4178f46b89f6695267fdfe8eda Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Wed, 10 May 2023 21:10:12 -0500 Subject: [PATCH 2/4] BAG_DATA -> Bag, ITEM_SLOT -> BagPocket BagPocket from pokeemerald, Bag is new --- include/bag.h | 146 +++++++++++++++++++-------------------- include/bag_view.h | 8 +-- include/field_use_item.h | 2 +- include/item.h | 6 +- include/unk_0203E348.h | 2 +- src/bag.c | 88 +++++++++++------------ src/bag_view.c | 2 +- src/item.c | 6 +- src/scrcmd_daycare.c | 2 +- src/scrcmd_items.c | 10 +-- 10 files changed, 136 insertions(+), 136 deletions(-) diff --git a/include/bag.h b/include/bag.h index ff81357de..a9dee737f 100644 --- a/include/bag.h +++ b/include/bag.h @@ -13,8 +13,8 @@ */ typedef enum RegisterItemResult { REG_ITEM_FAIL, - REG_ITEM_SLOT1, - REG_ITEM_SLOT2, + REG_BagPocket1, + REG_BagPocket2, } RegisterItemResult; /* @@ -23,101 +23,101 @@ typedef enum RegisterItemResult { * buttons. This is saved to flash. */ typedef struct BagData { - ITEM_SLOT items[NUM_BAG_ITEMS]; // General items - ITEM_SLOT keyItems[NUM_BAG_KEY_ITEMS]; // Key items - ITEM_SLOT TMsHMs[NUM_BAG_TMS_HMS]; // Move machines - ITEM_SLOT mail[NUM_BAG_MAIL]; // Mail items - ITEM_SLOT medicine[NUM_BAG_MEDICINE]; // Healing items - ITEM_SLOT berries[NUM_BAG_BERRIES]; // Berries - ITEM_SLOT balls[NUM_BAG_BALLS]; // Balls - ITEM_SLOT battleItems[NUM_BAG_BATTLE_ITEMS]; // Battle-only items + BagPocket items[NUM_BAG_ITEMS]; // General items + BagPocket keyItems[NUM_BAG_KEY_ITEMS]; // Key items + BagPocket TMsHMs[NUM_BAG_TMS_HMS]; // Move machines + BagPocket mail[NUM_BAG_MAIL]; // Mail items + BagPocket medicine[NUM_BAG_MEDICINE]; // Healing items + BagPocket berries[NUM_BAG_BERRIES]; // Berries + BagPocket balls[NUM_BAG_BALLS]; // Balls + BagPocket battleItems[NUM_BAG_BATTLE_ITEMS]; // Battle-only items u16 registeredItems[2]; // IDs of registered key items -} BAG_DATA; +} Bag; /* * u32 Sav2_Bag_sizeof(void) * * Returns the size of the player's inventory in save memory * - * @returns: The size of BAG_DATA + * @returns: The size of Bag */ u32 Sav2_Bag_sizeof(void); /* - * BAG_DATA *Sav2_Bag_new(HeapID heap_id) + * Bag *Sav2_Bag_new(HeapID heap_id) * - * Allocates a new BAG_DATA + * Allocates a new Bag * * @param heap_id: ID of the heap to alloc from * - * @returns: Pointer to the BAG_DATA instance + * @returns: Pointer to the Bag instance */ -BAG_DATA *Sav2_Bag_new(HeapID heap_id); +Bag *Sav2_Bag_new(HeapID heap_id); /* - * void Sav2_Bag_init(BAG_DATA *bagData) + * void Sav2_Bag_init(Bag *bagData) * - * Initializes an existing BAG_DATA instance. This is also + * Initializes an existing Bag instance. This is also * called by Sav2_Bag_new. * - * @param bagData: The BAG_DATA instance + * @param bagData: The Bag instance */ -void Sav2_Bag_init(BAG_DATA *bagData); +void Sav2_Bag_init(Bag *bagData); /* - * void Sav2_Bag_copy(const BAG_DATA *src, BAG_DATA *dst) + * void Sav2_Bag_copy(const Bag *src, Bag *dst) * - * Copies BAG_DATA from src to dst + * Copies Bag from src to dst * - * @param src: Origin BAG_DATA - * @param dst: Destination BAG_DATA + * @param src: Origin Bag + * @param dst: Destination Bag */ -void Sav2_Bag_copy(const BAG_DATA *src, BAG_DATA *dst); +void Sav2_Bag_copy(const Bag *src, Bag *dst); /* - * u16 Bag_GetRegisteredItemSlot1(BAG_DATA *bag) - * u16 Bag_GetRegisteredItemSlot2(BAG_DATA *bag) + * u16 Bag_GetRegisteredItemSlot1(Bag *bag) + * u16 Bag_GetRegisteredItemSlot2(Bag *bag) * * Returns the item ID registered to touch screen button 1 or 2 * - * @param bag: Pointer to BAG_DATA + * @param bag: Pointer to Bag * * @returns: Registered item ID in that slot */ -u16 Bag_GetRegisteredItemSlot1(BAG_DATA *bag); -u16 Bag_GetRegisteredItemSlot2(BAG_DATA *bag); +u16 Bag_GetRegisteredItemSlot1(Bag *bag); +u16 Bag_GetRegisteredItemSlot2(Bag *bag); /* - * RegisterItemResult Bag_TryRegisterItem(BAG_DATA *bag, u16 itemId) + * RegisterItemResult Bag_TryRegisterItem(Bag *bag, u16 itemId) * * Registers the item to the first available quick-access slot. * If none available, returns REG_ITEM_FAIL. Otherwise, returns - * REG_ITEM_SLOT1 or REG_ITEM_SLOT2. + * REG_BagPocket1 or REG_BagPocket2. * - * @param bag: Pointer to BAG_DATA + * @param bag: Pointer to Bag * @param itemId: Item to attempt registry * * @returns: Which slot the item was registered to, or 0 if failed */ -RegisterItemResult Bag_TryRegisterItem(BAG_DATA *bag, u16 itemId); +RegisterItemResult Bag_TryRegisterItem(Bag *bag, u16 itemId); /* - * void Bag_UnregisterItem(BAG_DATA *bag, u16 itemId) + * void Bag_UnregisterItem(Bag *bag, u16 itemId) * * Removes the specified item from the registered items slots. * If the item was in slot 1, and slot 2 is not empty, moves * slot 2 to slot 1. * - * @param bag: Pointer to BAG_DATA + * @param bag: Pointer to Bag * @param itemId: Item to attempt unregistry */ -void Bag_UnregisterItem(BAG_DATA *bag, u16 itemId); +void Bag_UnregisterItem(Bag *bag, u16 itemId); /* - * BOOL Bag_HasSpaceForItem(BAG_DATA *bag, u16 itemId, u16 quantity, HeapID heap_id) - * BOOL Bag_AddItem(BAG_DATA *bag, u16 itemId, u16 quantity, HeapID heap_id) - * BOOL Bag_TakeItem(BAG_DATA *bag, u16 itemId, u16 quantity, HeapID heap_id) - * BOOL Bag_HasItem(BAG_DATA *bag, u16 itemId, u16 quantity, HeapID heap_id) + * BOOL Bag_HasSpaceForItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) + * BOOL Bag_AddItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) + * BOOL Bag_TakeItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) + * BOOL Bag_HasItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) * * Inventory checkers and modifiers. * HasSpaceForItem checks whether there is an empty slot @@ -135,7 +135,7 @@ void Bag_UnregisterItem(BAG_DATA *bag, u16 itemId); * HasItem follows the same logic as TakeItem but, instead of * removing the item, simply returns whether it can or not. * - * @param bag: Pointer to BAG_DATA + * @param bag: Pointer to Bag * @param itemId: ID of item to act upon * @param quantity: Amount to add, remove, or check * @param heap_id: Heap to allocate temp buffers from @@ -143,94 +143,94 @@ void Bag_UnregisterItem(BAG_DATA *bag, u16 itemId); * @returns: TRUE if the action succeeded or would succeed, * otherwise FALSE. */ -BOOL Bag_HasSpaceForItem(BAG_DATA *bag, u16 itemId, u16 quantity, HeapID heap_id); -BOOL Bag_AddItem(BAG_DATA *bag, u16 itemId, u16 quantity, HeapID heap_id); -BOOL Bag_TakeItem(BAG_DATA *bag, u16 itemId, u16 quantity, HeapID heap_id); -BOOL Bag_HasItem(BAG_DATA *bag, u16 itemId, u16 quantity, HeapID heap_id); +BOOL Bag_HasSpaceForItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id); +BOOL Bag_AddItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id); +BOOL Bag_TakeItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id); +BOOL Bag_HasItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id); /* - * BOOL Pocket_TakeItem(ITEM_SLOT *slots, u32 count, u16 itemId, u16 quantity) + * BOOL Pocket_TakeItem(BagPocket *slots, u32 count, u16 itemId, u16 quantity) * * Like BAG_TakeItem, but acts directly on an array of item slots. * - * @param slots: Pointer to ITEM_SLOT array - * @param count: Number of ITEM_SLOT in slots + * @param slots: Pointer to BagPocket array + * @param count: Number of BagPocket in slots * @param itemId: ID of item to act upon * @param quantity: Amount to add, remove, or check * * @returns: TRUE if the action succeeded, otherwise FALSE. */ -BOOL Pocket_TakeItem(ITEM_SLOT *slots, u32 count, u16 itemId, u16 quantity); +BOOL Pocket_TakeItem(BagPocket *slots, u32 count, u16 itemId, u16 quantity); /* - * BOOL Bag_PocketNotEmpty(BAG_DATA *bag, int pocket) + * BOOL Bag_PocketNotEmpty(Bag *bag, int pocket) * * Checks whether the indicated pocket has any items in it. * - * @param bag: Pointer to BAG_DATA + * @param bag: Pointer to Bag * @param pocket: POCKET_XXX constant * * @returns: TRUE if there is at least one item in the pocket, * otherwise FALSE. */ -BOOL Bag_PocketNotEmpty(BAG_DATA *bag, int pocket); +BOOL Bag_PocketNotEmpty(Bag *bag, int pocket); /* - * u16 Bag_GetQuantity(BAG_DATA *bag, u16 itemId, HeapID heap_id) - * u16 Pocket_GetQuantity(ITEM_SLOT *slots, u32 count, u16 itemId) + * u16 Bag_GetQuantity(Bag *bag, u16 itemId, HeapID heap_id) + * u16 Pocket_GetQuantity(BagPocket *slots, u32 count, u16 itemId) * - * Looks up the item in its pocket or the specified ITEM_SLOT + * Looks up the item in its pocket or the specified BagPocket * array. If found, returns its quantity. Otherwise, * returns 0. * - * @param bag: (Bag_*) Pointer to BAG_DATA - * @param slots: (Pocket_*) Pointer to ITEM_SLOT array - * @param count: (Pocket_*) Number of ITEM_SLOT in slots + * @param bag: (Bag_*) Pointer to Bag + * @param slots: (Pocket_*) Pointer to BagPocket array + * @param count: (Pocket_*) Number of BagPocket in slots * @param itemId: Item to look up * @param heap_id: (Bag_*) Heap to allocate temp buffers from * * @returns: Quantity of that item in the bag or array. */ -u16 Bag_GetQuantity(BAG_DATA *bag, u16 itemId, HeapID heap_id); -u16 Pocket_GetQuantity(ITEM_SLOT *slots, u32 count, u16 itemId); +u16 Bag_GetQuantity(Bag *bag, u16 itemId, HeapID heap_id); +u16 Pocket_GetQuantity(BagPocket *slots, u32 count, u16 itemId); /* - * BAG_VIEW *CreateBagView(BAG_DATA *bag, const u8 *pockets, HeapID heap_id) + * BAG_VIEW *CreateBagView(Bag *bag, const u8 *pockets, HeapID heap_id) * * Creates a BAG_VIEW with a specified subset of pockets. * - * @param bag: Pointer to BAG_DATA + * @param bag: Pointer to Bag * @param pockets: Char array of POCKET_XXX IDs, terminated * with POCKET_BAG_VIEW_END * @param heap_id: Heap to allocate from * * @returns: Pointer to newly-allocated BAG_VIEW */ -BAG_VIEW *CreateBagView(BAG_DATA *bag, const u8 *pockets, HeapID heap_id); +BAG_VIEW *CreateBagView(Bag *bag, const u8 *pockets, HeapID heap_id); /* - * ITEM_SLOT *Bag_GetPocketSlotN(BAG_DATA *bag, u8 pocket, int n) + * BagPocket *Bag_GetPocketSlotN(Bag *bag, u8 pocket, int n) * - * Gets a pointer to the nth ITEM_SLOT in the given pocket. + * Gets a pointer to the nth BagPocket in the given pocket. * - * @param bag: Pointer to BAG_DATA + * @param bag: Pointer to Bag * @param pocket: POCKET_XXX index of the pocket to search * @param n: Index of slot within pocket * - * @returns: Pointer to the requested ITEM_SLOT, or NULL if + * @returns: Pointer to the requested BagPocket, or NULL if * out-of-bounds */ -ITEM_SLOT *Bag_GetPocketSlotN(BAG_DATA *bag, u8 pocket, int n); +BagPocket *Bag_GetPocketSlotN(Bag *bag, u8 pocket, int n); /* - * BAG_DATA *Sav2_Bag_get(SAVEDATA *saveData) + * Bag *Sav2_Bag_get(SAVEDATA *saveData) * - * Gets the pointer to BAG_DATA loaded from the save file. + * Gets the pointer to Bag loaded from the save file. * * @param saveData: Pointer to SAVEDATA * - * @returns: Pointer to BAG_DATA + * @returns: Pointer to Bag */ -BAG_DATA *Sav2_Bag_get(SAVEDATA *saveData); +Bag *Sav2_Bag_get(SAVEDATA *saveData); #endif //POKEHEARTGOLD_BAG_H diff --git a/include/bag_view.h b/include/bag_view.h index 64088f7d4..40efa937d 100644 --- a/include/bag_view.h +++ b/include/bag_view.h @@ -20,7 +20,7 @@ enum ItemUseError { * Item slot access for bag view */ typedef struct BAG_VIEW_POCKET { - ITEM_SLOT *slots; // Points into BAG_DATA + BagPocket *slots; // Points into Bag u8 padding[4]; u8 pocketId; // POCKET_XXX constant u8 padding2[3]; @@ -69,7 +69,7 @@ void sub_02077894(BAG_VIEW *a0, u8 a1); void sub_0207789C(BAG_VIEW *a0, SAVEDATA *a1, u8 a2, BAG_CURSOR *a3, u32 a4); /* - * void BagView_SetItem(BAG_VIEW *bagView, ITEM_SLOT *slots, u8 pocketId, u8 position) + * void BagView_SetItem(BAG_VIEW *bagView, BagPocket *slots, u8 pocketId, u8 position) * * Sets pocket view #pocketId to slots. * Called by CreateBagView in bag.c @@ -77,11 +77,11 @@ void sub_0207789C(BAG_VIEW *a0, SAVEDATA *a1, u8 a2, BAG_CURSOR *a3, u32 a4); * See note in bag_view.c * * @param bagView: The BAG_VIEW instance - * @param slots: ITEM_SLOT array of pocket + * @param slots: BagPocket array of pocket * @param pocketId: Which pocket it is * @param position: Unused */ -void BagView_SetItem(BAG_VIEW *bagView, ITEM_SLOT *slots, u8 pocketId, u8 position); +void BagView_SetItem(BAG_VIEW *bagView, BagPocket *slots, u8 pocketId, u8 position); void sub_020778C8(BAG_VIEW *bagView); void sub_020778DC(BAG_VIEW *bagView, void *a1); void sub_020778E0(BAG_VIEW *bagView, u8 a1); diff --git a/include/field_use_item.h b/include/field_use_item.h index 6559fe983..6c2412afa 100644 --- a/include/field_use_item.h +++ b/include/field_use_item.h @@ -55,7 +55,7 @@ typedef u32 (*ItemCheckUseFunc)(const struct ItemCheckUseData *data); struct UseItemInPartyTaskEnv { PARTY *party; - BAG_DATA *bag; + Bag *bag; MAILBOX *mailbox; OPTIONS *options; struct UnkStruct_0202E474 *unk10; diff --git a/include/item.h b/include/item.h index 3f3aace9b..9adc60d40 100644 --- a/include/item.h +++ b/include/item.h @@ -13,7 +13,7 @@ typedef struct ItemSlot { u16 id; // from constants/items.h u16 quantity; // quantity of that item -} ITEM_SLOT; +} BagPocket; /* * Bit array describing the effects of using the item on a @@ -97,7 +97,7 @@ typedef struct ItemData } ITEMDATA; /* - * void MoveItemSlotInList(ITEM_SLOT *slots, int from, int to, int pocket, HeapID heap_id) + * void MoveItemSlotInList(BagPocket *slots, int from, int to, int pocket, HeapID heap_id) * * Move item slot within an array, shifting the intermediate slots. * Performs the operation out-of-place using a temporary array from the heap. @@ -108,7 +108,7 @@ typedef struct ItemData * @param pocket: Pocket ID * @param heap_id: Heap ID to allocate the temporary array from */ -void MoveItemSlotInList(ITEM_SLOT *slots, int from, int to, int pocket, HeapID heap_id); +void MoveItemSlotInList(BagPocket *slots, int from, int to, int pocket, HeapID heap_id); /* diff --git a/include/unk_0203E348.h b/include/unk_0203E348.h index 9d5f7d39d..cb284650e 100644 --- a/include/unk_0203E348.h +++ b/include/unk_0203E348.h @@ -20,7 +20,7 @@ struct GracideaWork; struct PartyMenuAppData { PARTY *party; - BAG_DATA *bag; + Bag *bag; MAILBOX *mailbox; OPTIONS *options; u8 filler_10[0xC]; diff --git a/src/bag.c b/src/bag.c index 520661c2d..e636484cc 100644 --- a/src/bag.c +++ b/src/bag.c @@ -3,49 +3,49 @@ #include "bag.h" #include "heap.h" -void SortPocket(ITEM_SLOT *slots, u32 count); -void PocketCompaction(ITEM_SLOT *slots, u32 count); +void SortPocket(BagPocket *slots, u32 count); +void PocketCompaction(BagPocket *slots, u32 count); u32 Sav2_Bag_sizeof(void) { - return sizeof(BAG_DATA); + return sizeof(Bag); } -BAG_DATA *Sav2_Bag_new(HeapID heap_id) { - BAG_DATA *bag = (BAG_DATA *) AllocFromHeap(heap_id, sizeof(BAG_DATA)); +Bag *Sav2_Bag_new(HeapID heap_id) { + Bag *bag = (Bag *) AllocFromHeap(heap_id, sizeof(Bag)); Sav2_Bag_init(bag); return bag; } -void Sav2_Bag_init(BAG_DATA *bag) { - MI_CpuClear16(bag, sizeof(BAG_DATA)); +void Sav2_Bag_init(Bag *bag) { + MI_CpuClear16(bag, sizeof(Bag)); } -void Sav2_Bag_copy(const BAG_DATA *src, BAG_DATA *dst) { - MI_CpuCopy8(src, dst, sizeof(BAG_DATA)); +void Sav2_Bag_copy(const Bag *src, Bag *dst) { + MI_CpuCopy8(src, dst, sizeof(Bag)); } -u16 Bag_GetRegisteredItemSlot1(BAG_DATA *bag) { +u16 Bag_GetRegisteredItemSlot1(Bag *bag) { return bag->registeredItems[0]; } -u16 Bag_GetRegisteredItemSlot2(BAG_DATA *bag) { +u16 Bag_GetRegisteredItemSlot2(Bag *bag) { return bag->registeredItems[1]; } -RegisterItemResult Bag_TryRegisterItem(BAG_DATA *bag, u16 itemId) { +RegisterItemResult Bag_TryRegisterItem(Bag *bag, u16 itemId) { RegisterItemResult result = REG_ITEM_FAIL; if (bag->registeredItems[0] == ITEM_NONE) { bag->registeredItems[0] = itemId; - result = REG_ITEM_SLOT1; + result = REG_BagPocket1; } else if (bag->registeredItems[1] == ITEM_NONE) { bag->registeredItems[1] = itemId; - result = REG_ITEM_SLOT2; + result = REG_BagPocket2; } return result; } -void Bag_UnregisterItem(BAG_DATA *bag, u16 itemId) { +void Bag_UnregisterItem(Bag *bag, u16 itemId) { if (bag->registeredItems[1] == itemId) { bag->registeredItems[1] = ITEM_NONE; } else if (bag->registeredItems[0] == itemId) { @@ -58,7 +58,7 @@ void Bag_UnregisterItem(BAG_DATA *bag, u16 itemId) { } } -static u32 Bag_GetItemPocket(BAG_DATA *bag, u16 itemId, ITEM_SLOT **ppSlots, u32 *pCount, HeapID heap_id) { +static u32 Bag_GetItemPocket(Bag *bag, u16 itemId, BagPocket **ppSlots, u32 *pCount, HeapID heap_id) { u32 pocket = GetItemAttr(itemId, ITEMATTR_FIELD_POCKET, heap_id); switch (pocket) { case POCKET_KEY_ITEMS: @@ -97,7 +97,7 @@ static u32 Bag_GetItemPocket(BAG_DATA *bag, u16 itemId, ITEM_SLOT **ppSlots, u32 return pocket; } -static ITEM_SLOT *Pocket_GetItemSlotForAdd(ITEM_SLOT *slots, u32 count, u16 itemId, u16 quantity, u16 maxQuantity) { +static BagPocket *Pocket_GetItemSlotForAdd(BagPocket *slots, u32 count, u16 itemId, u16 quantity, u16 maxQuantity) { int i; int found = -1; @@ -121,8 +121,8 @@ static ITEM_SLOT *Pocket_GetItemSlotForAdd(ITEM_SLOT *slots, u32 count, u16 item return &slots[found]; } -static ITEM_SLOT *Bag_GetItemSlotForAdd(BAG_DATA *bag, u16 itemId, u16 quantity, HeapID heap_id) { - ITEM_SLOT *slots; +static BagPocket *Bag_GetItemSlotForAdd(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { + BagPocket *slots; u32 count; u32 pocket_id; @@ -134,12 +134,12 @@ static ITEM_SLOT *Bag_GetItemSlotForAdd(BAG_DATA *bag, u16 itemId, u16 quantity, } } -BOOL Bag_HasSpaceForItem(BAG_DATA *bag, u16 itemId, u16 quantity, HeapID heap_id) { +BOOL Bag_HasSpaceForItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { return Bag_GetItemSlotForAdd(bag, itemId, quantity, heap_id) != NULL; } -BOOL Bag_AddItem(BAG_DATA *bag, u16 itemId, u16 quantity, HeapID heap_id) { - ITEM_SLOT *slot = Bag_GetItemSlotForAdd(bag, itemId, quantity, heap_id); +BOOL Bag_AddItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { + BagPocket *slot = Bag_GetItemSlotForAdd(bag, itemId, quantity, heap_id); if (slot == NULL) { return FALSE; } @@ -157,7 +157,7 @@ BOOL Bag_AddItem(BAG_DATA *bag, u16 itemId, u16 quantity, HeapID heap_id) { return TRUE; } -static ITEM_SLOT *Pocket_GetItemSlotForRemove(ITEM_SLOT *slots, u32 count, u16 itemId, u16 quantity) { +static BagPocket *Pocket_GetItemSlotForRemove(BagPocket *slots, u32 count, u16 itemId, u16 quantity) { int i; for (i = 0; i < count; i++) { @@ -171,8 +171,8 @@ static ITEM_SLOT *Pocket_GetItemSlotForRemove(ITEM_SLOT *slots, u32 count, u16 i return NULL; } -static ITEM_SLOT *Bag_GetItemSlotForRemove(BAG_DATA *bag, u16 itemId, u16 quantity, HeapID heap_id) { - ITEM_SLOT *slots; +static BagPocket *Bag_GetItemSlotForRemove(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { + BagPocket *slots; u32 count; u32 pocket_id; @@ -180,8 +180,8 @@ static ITEM_SLOT *Bag_GetItemSlotForRemove(BAG_DATA *bag, u16 itemId, u16 quanti return Pocket_GetItemSlotForRemove(slots, count, itemId, quantity); } -BOOL Bag_TakeItem(BAG_DATA *bag, u16 itemId, u16 quantity, HeapID heap_id) { - ITEM_SLOT *slot = Bag_GetItemSlotForRemove(bag, itemId, quantity, heap_id); +BOOL Bag_TakeItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { + BagPocket *slot = Bag_GetItemSlotForRemove(bag, itemId, quantity, heap_id); if (slot == NULL) { return FALSE; } @@ -199,8 +199,8 @@ BOOL Bag_TakeItem(BAG_DATA *bag, u16 itemId, u16 quantity, HeapID heap_id) { return TRUE; } -BOOL Pocket_TakeItem(ITEM_SLOT *slots, u32 count, u16 itemId, u16 quantity) { - ITEM_SLOT *slot = Pocket_GetItemSlotForRemove(slots, count, itemId, quantity); +BOOL Pocket_TakeItem(BagPocket *slots, u32 count, u16 itemId, u16 quantity) { + BagPocket *slot = Pocket_GetItemSlotForRemove(slots, count, itemId, quantity); if (slot == NULL) { return FALSE; } @@ -212,12 +212,12 @@ BOOL Pocket_TakeItem(ITEM_SLOT *slots, u32 count, u16 itemId, u16 quantity) { return TRUE; } -BOOL Bag_HasItem(BAG_DATA *bag, u16 itemId, u16 quantity, HeapID heap_id) { +BOOL Bag_HasItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { return Bag_GetItemSlotForRemove(bag, itemId, quantity, heap_id) != NULL; } -BOOL Bag_PocketNotEmpty(BAG_DATA *bag, int pocket) { - ITEM_SLOT *slots; +BOOL Bag_PocketNotEmpty(Bag *bag, int pocket) { + BagPocket *slots; u32 count; int i; @@ -266,29 +266,29 @@ BOOL Bag_PocketNotEmpty(BAG_DATA *bag, int pocket) { return FALSE; } -u16 Bag_GetQuantity(BAG_DATA *bag, u16 itemId, HeapID heap_id) { - ITEM_SLOT *slot = Bag_GetItemSlotForRemove(bag, itemId, 1, heap_id); +u16 Bag_GetQuantity(Bag *bag, u16 itemId, HeapID heap_id) { + BagPocket *slot = Bag_GetItemSlotForRemove(bag, itemId, 1, heap_id); if (slot == NULL) { return 0; } return slot->quantity; } -u16 Pocket_GetQuantity(ITEM_SLOT *slots, u32 count, u16 itemId) { - ITEM_SLOT *slot = Pocket_GetItemSlotForRemove(slots, count, itemId, 1); +u16 Pocket_GetQuantity(BagPocket *slots, u32 count, u16 itemId) { + BagPocket *slot = Pocket_GetItemSlotForRemove(slots, count, itemId, 1); if (slot == NULL) { return 0; } return slot->quantity; } -static void SwapItemSlots(ITEM_SLOT *a, ITEM_SLOT *b) { - ITEM_SLOT c = *a; +static void SwapItemSlots(BagPocket *a, BagPocket *b) { + BagPocket c = *a; *a = *b; *b = c; } -static void PocketCompaction(ITEM_SLOT *slots, u32 count) { +static void PocketCompaction(BagPocket *slots, u32 count) { int i, j; for (i = 0; i < count - 1; i++) { for (j = i + 1; j < count; j++) { @@ -299,7 +299,7 @@ static void PocketCompaction(ITEM_SLOT *slots, u32 count) { } } -static void SortPocket(ITEM_SLOT *slots, u32 count) { +static void SortPocket(BagPocket *slots, u32 count) { int i, j; for (i = 0; i < count - 1; i++) { for (j = i + 1; j < count; j++) { @@ -310,7 +310,7 @@ static void SortPocket(ITEM_SLOT *slots, u32 count) { } } -BAG_VIEW *CreateBagView(BAG_DATA *bag, const u8 *pockets, HeapID heap_id) { +BAG_VIEW *CreateBagView(Bag *bag, const u8 *pockets, HeapID heap_id) { int i; BAG_VIEW *ret = BagView_New(heap_id); for (i = 0; pockets[i] != POCKET_BAG_VIEW_END; i++) { @@ -344,8 +344,8 @@ BAG_VIEW *CreateBagView(BAG_DATA *bag, const u8 *pockets, HeapID heap_id) { return ret; } -ITEM_SLOT *Bag_GetPocketSlotN(BAG_DATA *bag, u8 pocket, int n) { - ITEM_SLOT *slots; +BagPocket *Bag_GetPocketSlotN(Bag *bag, u8 pocket, int n) { + BagPocket *slots; u32 count; switch (pocket) { @@ -389,7 +389,7 @@ ITEM_SLOT *Bag_GetPocketSlotN(BAG_DATA *bag, u8 pocket, int n) { return &slots[n]; } -BAG_DATA *Sav2_Bag_get(SAVEDATA *saveData) { +Bag *Sav2_Bag_get(SAVEDATA *saveData) { return SavArray_get(saveData, SAVE_BAG); } diff --git a/src/bag_view.c b/src/bag_view.c index 63c30e942..9ad694d5d 100644 --- a/src/bag_view.c +++ b/src/bag_view.c @@ -35,7 +35,7 @@ void sub_0207789C(BAG_VIEW *a0, SAVEDATA *a1, u8 a2, BAG_CURSOR *a3, u32 a4) { a0->unk_66 = 0; } -void BagView_SetItem(BAG_VIEW *bagView, ITEM_SLOT *slots, u8 pocketId, u8 position) { +void BagView_SetItem(BAG_VIEW *bagView, BagPocket *slots, u8 pocketId, u8 position) { // Bug: position was likely intended to force a particular display order. // Likely intended as an index to bagView->pockets. // However, this variable is unused. diff --git a/src/item.c b/src/item.c index 1defc2dfa..ab5df884b 100644 --- a/src/item.c +++ b/src/item.c @@ -665,14 +665,14 @@ static const u16 sItemNarcIds[][4] = { { NARC_item_data_0513_bin, NARC_item_icon_item_icon_757_NCGR, NARC_item_icon_item_icon_758_NCLR, AGB_ITEM_NONE }, // ITEM_ENIGMA_STONE }; -void MoveItemSlotInList(ITEM_SLOT *slots, int from, int to, int pocket, HeapID heap_id) { - ITEM_SLOT *buf; +void MoveItemSlotInList(BagPocket *slots, int from, int to, int pocket, HeapID heap_id) { + BagPocket *buf; int i, j; if (from == to) { return; } - buf = AllocFromHeap(heap_id, sPocketCounts[pocket] * sizeof(ITEM_SLOT)); + buf = AllocFromHeap(heap_id, sPocketCounts[pocket] * sizeof(BagPocket)); j = 0; for (i = 0; i < sPocketCounts[pocket]; i++) { diff --git a/src/scrcmd_daycare.c b/src/scrcmd_daycare.c index a7374842c..b3a8c9360 100644 --- a/src/scrcmd_daycare.c +++ b/src/scrcmd_daycare.c @@ -216,7 +216,7 @@ BOOL ScrCmd_DayCareSanitizeMon(SCRIPTCONTEXT* ctx) { u32 held_item = GetMonData(party_mon, MON_DATA_HELD_ITEM, NULL); if (held_item == ITEM_GRISEOUS_ORB) { - BAG_DATA* bag = Sav2_Bag_get(fsys->savedata); + Bag* bag = Sav2_Bag_get(fsys->savedata); if (!Bag_AddItem(bag, ITEM_GRISEOUS_ORB, 1, 11)) { *ret_ptr = 0xFF; return FALSE; diff --git a/src/scrcmd_items.c b/src/scrcmd_items.c index bbfd22741..2381a13dd 100644 --- a/src/scrcmd_items.c +++ b/src/scrcmd_items.c @@ -10,7 +10,7 @@ BOOL ScrCmd_GiveItem(SCRIPTCONTEXT* ctx) { u16 quantity = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); u16* ret_ptr = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); - BAG_DATA* bag = Sav2_Bag_get(sav_ptr->savedata); + Bag* bag = Sav2_Bag_get(sav_ptr->savedata); *ret_ptr = Bag_AddItem(bag, item_id, quantity, 4); return FALSE; @@ -22,7 +22,7 @@ BOOL ScrCmd_TakeItem(SCRIPTCONTEXT* ctx) { u16 quantity = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); u16* ret_ptr = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); - BAG_DATA* bag = Sav2_Bag_get(sav_ptr->savedata); + Bag* bag = Sav2_Bag_get(sav_ptr->savedata); *ret_ptr = Bag_TakeItem(bag, item_id, quantity, 4); return FALSE; @@ -34,7 +34,7 @@ BOOL ScrCmd_HasSpaceForItem(SCRIPTCONTEXT* ctx) { u16 quantity = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); u16* ret_ptr = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); - BAG_DATA* bag = Sav2_Bag_get(sav_ptr->savedata); + Bag* bag = Sav2_Bag_get(sav_ptr->savedata); *ret_ptr = Bag_HasSpaceForItem(bag, item_id, quantity, 4); return FALSE; @@ -46,7 +46,7 @@ BOOL ScrCmd_HasItem(SCRIPTCONTEXT* ctx) { u16 quantity = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); u16* ret_ptr = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); - BAG_DATA* bag = Sav2_Bag_get(sav_ptr->savedata); + Bag* bag = Sav2_Bag_get(sav_ptr->savedata); *ret_ptr = Bag_HasItem(bag, item_id, quantity, 11); return FALSE; @@ -57,7 +57,7 @@ BOOL ScrCmd_GetItemQuantity(SCRIPTCONTEXT* ctx) { u16 item_id = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); u16* ret_ptr = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); - BAG_DATA* bag = Sav2_Bag_get(sav_ptr->savedata); + Bag* bag = Sav2_Bag_get(sav_ptr->savedata); *ret_ptr = Bag_GetQuantity(bag, item_id, 11); return FALSE; From 4ba5f06443477fca2dee55843c1a3ad0d58af1d3 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Sat, 20 May 2023 00:33:50 -0500 Subject: [PATCH 3/4] Bag names, field_player_avatar,h match style, added Korean --- include/bag.h | 12 +-- include/config.h | 1 + include/field_player_avatar.h | 166 +++++++++++++++++----------------- include/item.h | 2 +- src/bag.c | 6 +- 5 files changed, 94 insertions(+), 93 deletions(-) diff --git a/include/bag.h b/include/bag.h index a9dee737f..1db59ea7c 100644 --- a/include/bag.h +++ b/include/bag.h @@ -12,9 +12,9 @@ * Return value of Bag_TryRegisterItem */ typedef enum RegisterItemResult { - REG_ITEM_FAIL, - REG_BagPocket1, - REG_BagPocket2, + REG_BAG_FAIL, + REG_BAG_POCKET1, + REG_BAG_POCKET2, } RegisterItemResult; /* @@ -22,7 +22,7 @@ typedef enum RegisterItemResult { * and the two items registered to the touchscreen * buttons. This is saved to flash. */ -typedef struct BagData { +typedef struct Bag { BagPocket items[NUM_BAG_ITEMS]; // General items BagPocket keyItems[NUM_BAG_KEY_ITEMS]; // Key items BagPocket TMsHMs[NUM_BAG_TMS_HMS]; // Move machines @@ -91,8 +91,8 @@ u16 Bag_GetRegisteredItemSlot2(Bag *bag); * RegisterItemResult Bag_TryRegisterItem(Bag *bag, u16 itemId) * * Registers the item to the first available quick-access slot. - * If none available, returns REG_ITEM_FAIL. Otherwise, returns - * REG_BagPocket1 or REG_BagPocket2. + * If none available, returns REG_BAG_FAIL. Otherwise, returns + * REG_BAG_POCKET1 or REG_BAG_POCKET2. * * @param bag: Pointer to Bag * @param itemId: Item to attempt registry diff --git a/include/config.h b/include/config.h index 53cf157d2..78e45a719 100644 --- a/include/config.h +++ b/include/config.h @@ -19,6 +19,7 @@ #define LANGUAGE_ITALIAN 4 #define LANGUAGE_GERMAN 5 #define LANGUAGE_SPANISH 7 +#define LANGUAGE_KOREAN 8 #undef GAME_VERSION #if defined(HEARTGOLD) diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 353e846ad..a3e9cfcfe 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -26,100 +26,100 @@ typedef struct PlayerAvatar { u32 unk24; int unk28; int unk2c; - LocalMapObject* mapObject; + LocalMapObject *mapObject; u32 unk34; - PlayerAvatar_SUB* unk38; + PlayerAvatar_SUB *unk38; u32 unk3c; } PlayerAvatar; //size: 0x40 int sub_0205C268(u32 unkA); u8 sub_0205C278(void); -u8 sub_0205C298(SAVEDATA* savedata); +u8 sub_0205C298(SAVEDATA *savedata); u8 sub_0205C2C0(u32 unkA); u8 sub_0205C2E8(u32 unkA); u8 sub_0205C310(u32 unkA); u8 sub_0205C350(u32 unkA); -PlayerAvatar* sub_0205C390(MapObjectMan *man, int x, int y, int direction, int a4, int gender, int a6, struct FlypointsPlayerSub *a7); -PlayerAvatar* sub_0205C408(MapObjectMan* man, PlayerAvatar_SUB* avatar_sub, int gender); -void PlayerAvatar_FreeToHeap(PlayerAvatar* avatar); -void PlayerAvatar_DeleteFromMap(PlayerAvatar* avatar); -PlayerAvatar* sub_0205C4E0(); -void sub_0205C500(PlayerAvatar* avatar, int state, u32 gender, PlayerAvatar_SUB* unkD); -void CreatePlayerAvatarMapObject(PlayerAvatar* avatar, MapObjectMan* man, u32 sprite, u32 direction, u32 x, u32 y); -LocalMapObject* sub_0205C600(MapObjectMan* man); -LocalMapObject* sub_0205C640(MapObjectMan* man); -int PlayerAvatar_GetFacingDirection(PlayerAvatar* avatar); -void PlayerAvatar_SetFacingDirection(PlayerAvatar* avatar, int direction); -u32 PlayerAvatar_GetNextFacing(PlayerAvatar* avatar); -int GetPlayerXCoord(PlayerAvatar* avatar); -int GetPlayerYCoord(PlayerAvatar* avatar); -int GetPlayerLastXCoord(PlayerAvatar* avatar); -int GetPlayerLastYCoord(PlayerAvatar* avatar); -void PlayerAvatar_GetPositionVec(PlayerAvatar* avatar, VecFx32* vec); -VecFx32* PlayerAvatar_GetPositionVecConst(PlayerAvatar* avatar); -void sub_0205C6C8(PlayerAvatar* avatar, u32 unkA); -u32 sub_0205C6CC(PlayerAvatar* avatar); -void sub_0205C6D0(PlayerAvatar* avatar, u32 unkA); -u32 sub_0205C6D4(PlayerAvatar* avatar); -void sub_0205C6D8(PlayerAvatar* avatar, LocalMapObject* obj); -LocalMapObject* PlayerAvatar_GetMapObject(PlayerAvatar* avatar); -LocalMapObject* PlayerAvatar_GetMapObjectConst(PlayerAvatar* avatar); -void PlayerAvatar_SetState(PlayerAvatar* avatar, int state); -int PlayerAvatar_GetState(PlayerAvatar* avatar); -void PlayerAvatar_OrrTransitionFlags(PlayerAvatar* avatar, u32 flag); -void PlayerAvatar_SetTransitionFlags(PlayerAvatar* avatar, u32 flag); -u32 PlayerAvatar_GetTransitionFlags(PlayerAvatar* avatar); -void PlayerAvatar_SetGender(PlayerAvatar* avatar, u32 gender); -int PlayerAvatar_GetGender(PlayerAvatar* avatar); -void sub_0205C728(PlayerAvatar* avatar, u32 unkA); -void sub_0205C730(PlayerAvatar* avatar, u32 unkA); -u32 sub_0205C73C(PlayerAvatar* avatar, u32 unkA); -u32 sub_0205C744(PlayerAvatar* avatar); -void sub_0205C748(PlayerAvatar* avatar, u32 unkA); -void sub_0205C74C(PlayerAvatar* avatar); -int sub_0205C758(PlayerAvatar* avatar, int unkB, int unkC); -void sub_0205C768(PlayerAvatar* avatar, int unkA); -int sub_0205C76C(PlayerAvatar* avatar); -void sub_0205C770(PlayerAvatar* avatar, int unkA); -int sub_0205C774(PlayerAvatar* avatar); -void sub_0205C778(PlayerAvatar* avatar, int unkB, int unkC); -void sub_0205C78C(PlayerAvatar* avatar, u32 unkA); -u32 sub_0205C790(PlayerAvatar* avatar); -void sub_0205C794(PlayerAvatar* avatar, PlayerAvatar_SUB* unkA); -PlayerAvatar_SUB* sub_0205C798(PlayerAvatar* avatar); -void sub_0205C79C(PlayerAvatar* avatar, u32 unkA); -u32 sub_0205C7A0(PlayerAvatar* avatar); -u32 sub_0205C7A4(PlayerAvatar* avatar); -void sub_0205C7A8(PlayerAvatar* avatar); -void sub_0205C7B4(PlayerAvatar* avatar); -void FlypointsPlayerSub_init(struct FlypointsPlayerSub* fpsub); -BOOL FlypointsPlayerSub_CheckRunningShoes(struct FlypointsPlayerSub* fpsub); -void FlypointsPlayerSub_SetRunningShoesFlag(struct FlypointsPlayerSub* fpsub, BOOL unkB); -int sub_0205C7EC(PlayerAvatar_SUB* avatar); -void sub_0205C7F8(PlayerAvatar_SUB* unkPtr, int state); -void sub_0205C800(PlayerAvatar* avatar, int state); -void sub_0205C810(PlayerAvatar* avatar, u32 unkA, u32 unkB); -void sub_0205C838(PlayerAvatar* avatar, int unkA); -void PlayerAvatar_ToggleAutomaticHeightUpdating(PlayerAvatar* avatar, u8 unkA); -void PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply(PlayerAvatar* avatar, BOOL unkA); +PlayerAvatar *sub_0205C390(MapObjectMan *man, int x, int y, int direction, int a4, int gender, int a6, struct FlypointsPlayerSub *a7); +PlayerAvatar *sub_0205C408(MapObjectMan *man, PlayerAvatar_SUB *avatar_sub, int gender); +void PlayerAvatar_FreeToHeap(PlayerAvatar *avatar); +void PlayerAvatar_DeleteFromMap(PlayerAvatar *avatar); +PlayerAvatar *sub_0205C4E0(); +void sub_0205C500(PlayerAvatar *avatar, int state, u32 gender, PlayerAvatar_SUB *unkD); +void CreatePlayerAvatarMapObject(PlayerAvatar *avatar, MapObjectMan *man, u32 sprite, u32 direction, u32 x, u32 y); +LocalMapObject *sub_0205C600(MapObjectMan *man); +LocalMapObject *sub_0205C640(MapObjectMan *man); +int PlayerAvatar_GetFacingDirection(PlayerAvatar *avatar); +void PlayerAvatar_SetFacingDirection(PlayerAvatar *avatar, int direction); +u32 PlayerAvatar_GetNextFacing(PlayerAvatar *avatar); +int GetPlayerXCoord(PlayerAvatar *avatar); +int GetPlayerYCoord(PlayerAvatar *avatar); +int GetPlayerLastXCoord(PlayerAvatar *avatar); +int GetPlayerLastYCoord(PlayerAvatar *avatar); +void PlayerAvatar_GetPositionVec(PlayerAvatar *avatar, VecFx32 *vec); +VecFx32 *PlayerAvatar_GetPositionVecConst(PlayerAvatar *avatar); +void sub_0205C6C8(PlayerAvatar *avatar, u32 unkA); +u32 sub_0205C6CC(PlayerAvatar *avatar); +void sub_0205C6D0(PlayerAvatar *avatar, u32 unkA); +u32 sub_0205C6D4(PlayerAvatar *avatar); +void sub_0205C6D8(PlayerAvatar *avatar, LocalMapObject *obj); +LocalMapObject *PlayerAvatar_GetMapObject(PlayerAvatar *avatar); +LocalMapObject *PlayerAvatar_GetMapObjectConst(PlayerAvatar *avatar); +void PlayerAvatar_SetState(PlayerAvatar *avatar, int state); +int PlayerAvatar_GetState(PlayerAvatar *avatar); +void PlayerAvatar_OrrTransitionFlags(PlayerAvatar *avatar, u32 flag); +void PlayerAvatar_SetTransitionFlags(PlayerAvatar *avatar, u32 flag); +u32 PlayerAvatar_GetTransitionFlags(PlayerAvatar *avatar); +void PlayerAvatar_SetGender(PlayerAvatar *avatar, u32 gender); +int PlayerAvatar_GetGender(PlayerAvatar *avatar); +void sub_0205C728(PlayerAvatar *avatar, u32 unkA); +void sub_0205C730(PlayerAvatar *avatar, u32 unkA); +u32 sub_0205C73C(PlayerAvatar *avatar, u32 unkA); +u32 sub_0205C744(PlayerAvatar *avatar); +void sub_0205C748(PlayerAvatar *avatar, u32 unkA); +void sub_0205C74C(PlayerAvatar *avatar); +int sub_0205C758(PlayerAvatar *avatar, int unkB, int unkC); +void sub_0205C768(PlayerAvatar *avatar, int unkA); +int sub_0205C76C(PlayerAvatar *avatar); +void sub_0205C770(PlayerAvatar *avatar, int unkA); +int sub_0205C774(PlayerAvatar *avatar); +void sub_0205C778(PlayerAvatar *avatar, int unkB, int unkC); +void sub_0205C78C(PlayerAvatar *avatar, u32 unkA); +u32 sub_0205C790(PlayerAvatar *avatar); +void sub_0205C794(PlayerAvatar *avatar, PlayerAvatar_SUB *unkA); +PlayerAvatar_SUB *sub_0205C798(PlayerAvatar *avatar); +void sub_0205C79C(PlayerAvatar *avatar, u32 unkA); +u32 sub_0205C7A0(PlayerAvatar *avatar); +u32 sub_0205C7A4(PlayerAvatar *avatar); +void sub_0205C7A8(PlayerAvatar *avatar); +void sub_0205C7B4(PlayerAvatar *avatar); +void FlypointsPlayerSub_init(struct FlypointsPlayerSub *fpsub); +BOOL FlypointsPlayerSub_CheckRunningShoes(struct FlypointsPlayerSub *fpsub); +void FlypointsPlayerSub_SetRunningShoesFlag(struct FlypointsPlayerSub *fpsub, BOOL unkB); +int sub_0205C7EC(PlayerAvatar_SUB *avatar); +void sub_0205C7F8(PlayerAvatar_SUB *unkPtr, int state); +void sub_0205C800(PlayerAvatar *avatar, int state); +void sub_0205C810(PlayerAvatar *avatar, u32 unkA, u32 unkB); +void sub_0205C838(PlayerAvatar *avatar, int unkA); +void PlayerAvatar_ToggleAutomaticHeightUpdating(PlayerAvatar *avatar, u8 unkA); +void PlayerAvatar_ToggleAutomaticHeightUpdating_NowApply(PlayerAvatar *avatar, BOOL unkA); u32 PlayerAvatar_GetSpriteByStateAndGender(u32 unkA, BOOL unkB); u32 PlayerAvatar_GetTransitionBits(u32 unkA); -PlayerAvatar* FieldSys_GetPlayerAvatar(FieldSystem* fsys); -void sub_0205CA20(PlayerAvatar* avatar, BOOL unkA); -BOOL sub_0205CA38(PlayerAvatar* avatar); -void sub_0205CA4C(PlayerAvatar* avatar, BOOL unkA); -BOOL sub_0205CA64(PlayerAvatar* avatar); -void sub_0205CA78(PlayerAvatar* avatar, BOOL unkB); -BOOL sub_0205CA90(PlayerAvatar* avatar); -void sub_0205CAA4(PlayerAvatar* avatar, u8 unkA); -BOOL sub_0205CABC(PlayerAvatar* avatar); -void sub_0205CAD0(PlayerAvatar* avatar, BOOL unkA); -void sub_0205CAE8(PlayerAvatar* avatar); -void sub_0205CAF4(PlayerAvatar* avatar); -BOOL sub_0205CB00(PlayerAvatar* avatar); -void sub_0205CB14(PlayerAvatar* avatar, BOOL unkA); -u32 sub_0205CB2C(PlayerAvatar* avatar); -u16 sub_0205CB38(PlayerAvatar* avatar); -void sub_0205CB40(PlayerAvatar* avatar, u16 unkA); +PlayerAvatar *FieldSys_GetPlayerAvatar(FieldSystem *fsys); +void sub_0205CA20(PlayerAvatar *avatar, BOOL unkA); +BOOL sub_0205CA38(PlayerAvatar *avatar); +void sub_0205CA4C(PlayerAvatar *avatar, BOOL unkA); +BOOL sub_0205CA64(PlayerAvatar *avatar); +void sub_0205CA78(PlayerAvatar *avatar, BOOL unkB); +BOOL sub_0205CA90(PlayerAvatar *avatar); +void sub_0205CAA4(PlayerAvatar *avatar, u8 unkA); +BOOL sub_0205CABC(PlayerAvatar *avatar); +void sub_0205CAD0(PlayerAvatar *avatar, BOOL unkA); +void sub_0205CAE8(PlayerAvatar *avatar); +void sub_0205CAF4(PlayerAvatar *avatar); +BOOL sub_0205CB00(PlayerAvatar *avatar); +void sub_0205CB14(PlayerAvatar *avatar, BOOL unkA); +u32 sub_0205CB2C(PlayerAvatar *avatar); +u16 sub_0205CB38(PlayerAvatar *avatar); +void sub_0205CB40(PlayerAvatar *avatar, u16 unkA); #endif //POKEHEARTGOLD_PlayerAvatar_H diff --git a/include/item.h b/include/item.h index 9adc60d40..d4100ceee 100644 --- a/include/item.h +++ b/include/item.h @@ -10,7 +10,7 @@ * Item ID must be unsigned less than ITEMS_COUNT. * Quantity must be no more than 99 for a TM/HM, or 999 in general. */ -typedef struct ItemSlot { +typedef struct BagPocket { u16 id; // from constants/items.h u16 quantity; // quantity of that item } BagPocket; diff --git a/src/bag.c b/src/bag.c index e636484cc..f6810f31b 100644 --- a/src/bag.c +++ b/src/bag.c @@ -33,14 +33,14 @@ u16 Bag_GetRegisteredItemSlot2(Bag *bag) { } RegisterItemResult Bag_TryRegisterItem(Bag *bag, u16 itemId) { - RegisterItemResult result = REG_ITEM_FAIL; + RegisterItemResult result = REG_BAG_FAIL; if (bag->registeredItems[0] == ITEM_NONE) { bag->registeredItems[0] = itemId; - result = REG_BagPocket1; + result = REG_BAG_POCKET1; } else if (bag->registeredItems[1] == ITEM_NONE) { bag->registeredItems[1] = itemId; - result = REG_BagPocket2; + result = REG_BAG_POCKET2; } return result; } From a99e066b76bbcd30d2e228c8e7808d817beb8832 Mon Sep 17 00:00:00 2001 From: Adrienn Tindall <33725376+adrienntindall@users.noreply.github.com> Date: Sat, 20 May 2023 01:04:33 -0500 Subject: [PATCH 4/4] Clean up bag.h --- asm/battle_setup.s | 22 ++-- asm/include/battle_setup.inc | 8 +- asm/include/overlay_01_021F6CFC.inc | 4 +- asm/include/overlay_03.inc | 10 +- asm/include/overlay_05.inc | 4 +- asm/include/overlay_08.inc | 6 +- asm/include/overlay_101.inc | 4 +- asm/include/overlay_103.inc | 6 +- asm/include/overlay_112.inc | 4 +- asm/include/overlay_12_022378C0.inc | 4 +- .../overlay_12_battle_controller_player.inc | 2 +- asm/include/overlay_14.inc | 8 +- asm/include/overlay_15.inc | 14 +- asm/include/overlay_16.inc | 6 +- asm/include/overlay_17.inc | 8 +- asm/include/overlay_27.inc | 6 +- asm/include/overlay_58.inc | 2 +- asm/include/overlay_65.inc | 4 +- asm/include/overlay_80_02235FC8.inc | 2 +- asm/include/overlay_85.inc | 4 +- asm/include/scrcmd_11.inc | 8 +- asm/include/scrcmd_20.inc | 2 +- asm/include/unk_0203BC10.inc | 6 +- asm/include/unk_0203E348.inc | 4 +- asm/include/unk_0204F500.inc | 2 +- asm/include/unk_02058AEC.inc | 2 +- asm/include/unk_02066EDC.inc | 2 +- asm/include/unk_0206B910.inc | 2 +- asm/include/unk_020755E8.inc | 4 +- asm/include/unk_02078E30.inc | 4 +- asm/include/unk_0207F42C.inc | 2 +- asm/include/unk_02080BB4.inc | 2 +- asm/overlay_01_021F6CFC.s | 4 +- asm/overlay_03.s | 18 +-- asm/overlay_05.s | 4 +- asm/overlay_08.s | 8 +- asm/overlay_101.s | 8 +- asm/overlay_103.s | 10 +- asm/overlay_112.s | 10 +- asm/overlay_12_022378C0.s | 6 +- asm/overlay_12_battle_controller_player.s | 2 +- asm/overlay_14.s | 14 +- asm/overlay_15.s | 24 ++-- asm/overlay_16.s | 10 +- asm/overlay_17.s | 8 +- asm/overlay_27.s | 22 ++-- asm/overlay_58.s | 2 +- asm/overlay_65.s | 4 +- asm/overlay_80_02235FC8.s | 2 +- asm/overlay_85.s | 4 +- asm/scrcmd_11.s | 16 +-- asm/scrcmd_20.s | 2 +- asm/unk_0203BC10.s | 14 +- asm/unk_0203E348.s | 16 +-- asm/unk_0204F500.s | 4 +- asm/unk_02058AEC.s | 2 +- asm/unk_02066EDC.s | 2 +- asm/unk_0206B910.s | 2 +- asm/unk_020755E8.s | 4 +- asm/unk_02078E30.s | 12 +- asm/unk_0207F42C.s | 4 +- asm/unk_02080BB4.s | 6 +- include/bag.h | 120 +++++++++--------- include/bag_view.h | 10 +- include/item.h | 8 +- src/bag.c | 86 ++++++------- src/bag_view.c | 2 +- src/field_use_item.c | 14 +- src/item.c | 6 +- src/save_arrays.c | 4 +- src/scrcmd_c.c | 2 +- src/scrcmd_daycare.c | 4 +- src/scrcmd_fossils.c | 4 +- src/scrcmd_items.c | 20 +-- src/scrcmd_pokemon_misc.c | 2 +- 75 files changed, 347 insertions(+), 347 deletions(-) diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 969c54d85..d70e48fee 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -113,7 +113,7 @@ _0205193C: cmp r7, #4 blt _0205193C add r0, r6, #0 - bl Sav2_Bag_new + bl BagNew mov r1, #0x42 lsl r1, r1, #2 str r0, [r4, r1] @@ -340,7 +340,7 @@ sub_02051AAC: ; 0x02051AAC mov r1, #4 mov r2, #0x14 add r3, r6, #0 - bl Bag_AddItem + bl BagAddItem add r0, r6, #0 bl AllocMonZeroed mov r2, #0 @@ -576,7 +576,7 @@ sub_02051D18: ; 0x02051D18 bl SavArray_PlayerParty_get str r0, [sp, #0x18] add r0, r4, #0 - bl Sav2_Bag_get + bl SaveGetBag str r0, [sp, #0x14] add r0, r4, #0 bl Sav2_Pokedex_get @@ -678,7 +678,7 @@ _02051E14: lsl r1, r1, #2 ldr r0, [sp, #0x14] ldr r1, [r5, r1] - bl Sav2_Bag_copy + bl BagCopy mov r1, #0x11 lsl r1, r1, #4 ldr r0, [sp, #0x10] @@ -819,7 +819,7 @@ sub_02051F2C: ; 0x02051F2C str r0, [sp, #0x14] ldr r0, [sp] ldr r0, [r0, #0xc] - bl Sav2_Bag_get + bl SaveGetBag str r0, [sp, #0x10] ldr r0, [sp] ldr r0, [r0, #0xc] @@ -901,7 +901,7 @@ _02052004: lsl r1, r1, #2 ldr r0, [sp, #0x10] ldr r1, [r5, r1] - bl Sav2_Bag_copy + bl BagCopy mov r1, #0x11 lsl r1, r1, #4 ldr r0, [sp, #0xc] @@ -986,7 +986,7 @@ sub_020520B0: ; 0x020520B0 str r0, [sp, #0x20] ldr r0, [sp] ldr r0, [r0, #0xc] - bl Sav2_Bag_get + bl SaveGetBag str r0, [sp, #0x1c] ldr r0, [sp] ldr r0, [r0, #0xc] @@ -1129,7 +1129,7 @@ _020521F6: lsl r1, r1, #2 ldr r0, [sp, #0x1c] ldr r1, [r5, r1] - bl Sav2_Bag_copy + bl BagCopy mov r1, #0x11 lsl r1, r1, #4 ldr r0, [sp, #0x18] @@ -1335,7 +1335,7 @@ sub_0205239C: ; 0x0205239C bl SavArray_PlayerParty_get add r7, r0, #0 ldr r0, [r4, #0xc] - bl Sav2_Bag_get + bl SaveGetBag str r0, [sp] ldr r0, [r4, #0xc] bl Sav2_Pokedex_get @@ -1358,7 +1358,7 @@ sub_0205239C: ; 0x0205239C lsl r0, r0, #2 ldr r0, [r5, r0] ldr r1, [sp] - bl Sav2_Bag_copy + bl BagCopy mov r0, #0x11 lsl r0, r0, #4 ldr r0, [r5, r0] @@ -1407,7 +1407,7 @@ sub_02052444: ; 0x02052444 ldr r0, [r5, #0xc] bl SavArray_PlayerParty_get ldr r0, [r5, #0xc] - bl Sav2_Bag_get + bl SaveGetBag ldr r0, [r5, #0xc] bl Sav2_Pokedex_get add r1, r0, #0 diff --git a/asm/include/battle_setup.inc b/asm/include/battle_setup.inc index 559b887d5..25af15128 100644 --- a/asm/include/battle_setup.inc +++ b/asm/include/battle_setup.inc @@ -108,10 +108,10 @@ .public GetPartyMonByIndex .public Party_copy .public SavArray_PlayerParty_get -.public Sav2_Bag_new -.public Sav2_Bag_copy -.public Bag_AddItem -.public Sav2_Bag_get +.public BagNew +.public BagCopy +.public BagAddItem +.public SaveGetBag .public sub_02088288 .public Fsys_GetGearPhoneRingManager .public sub_02092E14 diff --git a/asm/include/overlay_01_021F6CFC.inc b/asm/include/overlay_01_021F6CFC.inc index 46ec609fd..8e0f392d9 100644 --- a/asm/include/overlay_01_021F6CFC.inc +++ b/asm/include/overlay_01_021F6CFC.inc @@ -39,8 +39,8 @@ .public sub_0205B514 .public sub_0205B564 .public sub_0205B5B4 -.public Bag_HasItem -.public Sav2_Bag_get +.public BagHasItem +.public SaveGetBag .public MI_CpuFill8 .public ov01_021F6A9C .public ov01_021F6C28 diff --git a/asm/include/overlay_03.inc b/asm/include/overlay_03.inc index e1f10467a..bc4166791 100644 --- a/asm/include/overlay_03.inc +++ b/asm/include/overlay_03.inc @@ -206,11 +206,11 @@ .public GetItemIndexMapping .public GetItemDescIntoString .public GetItemAttr -.public Bag_HasSpaceForItem -.public Bag_AddItem -.public Bag_GetQuantity -.public CreateBagView -.public Sav2_Bag_get +.public BagHasSpaceForItem +.public BagAddItem +.public BagGetQuantity +.public BagViewCreate +.public SaveGetBag .public sub_020881C0 .public sub_020910B8 .public sub_02092B04 diff --git a/asm/include/overlay_05.inc b/asm/include/overlay_05.inc index 5bc48f1c7..f5d523241 100644 --- a/asm/include/overlay_05.inc +++ b/asm/include/overlay_05.inc @@ -152,8 +152,8 @@ .public GetPartyCount .public GetPartyMonByIndex .public ItemIdIsMail -.public Bag_HasItem -.public Sav2_Bag_get +.public BagHasItem +.public SaveGetBag .public sub_0207CAAC .public RatioToInt .public sub_020880B0 diff --git a/asm/include/overlay_08.inc b/asm/include/overlay_08.inc index bfc6fd1a4..473c4db5f 100644 --- a/asm/include/overlay_08.inc +++ b/asm/include/overlay_08.inc @@ -136,9 +136,9 @@ .public GetItemAttr_PreloadedItemData .public MoveIsHM .public ItemIdIsMail -.public Bag_TakeItem -.public Bag_HasItem -.public Bag_GetPocketSlotN +.public BagTakeItem +.public BagHasItem +.public BagGetNthPocket .public BagCursor_Battle_PocketGetPosition .public BagCursor_Battle_GetLastUsedItem .public BagCursor_Battle_GetLastUsedPocket diff --git a/asm/include/overlay_101.inc b/asm/include/overlay_101.inc index 9dbda0e8b..5408c5893 100644 --- a/asm/include/overlay_101.inc +++ b/asm/include/overlay_101.inc @@ -273,8 +273,8 @@ .public PCStorage_GetActiveBox .public PCStorage_CountEmptySpotsInAllBoxes .public PCStorage_GetBoxName -.public Bag_HasItem -.public Sav2_Bag_get +.public BagHasItem +.public SaveGetBag .public sub_0208820C .public PhoneBookTrainerGetRematchInfo .public AllocAndReadPhoneBook diff --git a/asm/include/overlay_103.inc b/asm/include/overlay_103.inc index bb4ab1418..2c9e6456d 100644 --- a/asm/include/overlay_103.inc +++ b/asm/include/overlay_103.inc @@ -151,9 +151,9 @@ .public SavArray_PlayerParty_get .public ItemToMailId .public MailToItemId -.public Bag_AddItem -.public Bag_TakeItem -.public Sav2_Bag_get +.public BagAddItem +.public BagTakeItem +.public SaveGetBag .public sub_02090E68 .public sub_02090F6C .public sub_02090F70 diff --git a/asm/include/overlay_112.inc b/asm/include/overlay_112.inc index 12d8fddee..2676fe6ac 100644 --- a/asm/include/overlay_112.inc +++ b/asm/include/overlay_112.inc @@ -291,8 +291,8 @@ .public GetPartyMonByIndex .public SavArray_PlayerParty_get .public GetItemNameIntoString -.public Bag_AddItem -.public Sav2_Bag_get +.public BagAddItem +.public SaveGetBag .public sub_0208F270 .public sub_020932E0 .public sub_02093354 diff --git a/asm/include/overlay_12_022378C0.inc b/asm/include/overlay_12_022378C0.inc index 48b79157e..14df866c6 100644 --- a/asm/include/overlay_12_022378C0.inc +++ b/asm/include/overlay_12_022378C0.inc @@ -170,8 +170,8 @@ .public sub_02075A7C .public sub_02075D3C .public sub_02075D4C -.public Sav2_Bag_new -.public Sav2_Bag_copy +.public BagNew +.public BagCopy .public BagCursor_Battle_Init .public sub_020880B0 .public ApplyMonMoodModifier diff --git a/asm/include/overlay_12_battle_controller_player.inc b/asm/include/overlay_12_battle_controller_player.inc index 806606632..a65a0dfa5 100644 --- a/asm/include/overlay_12_battle_controller_player.inc +++ b/asm/include/overlay_12_battle_controller_player.inc @@ -17,7 +17,7 @@ .public GetPartyCount .public GetPartyMonByIndex .public LoadAllItemData -.public Bag_TakeItem +.public BagTakeItem .public BagCursor_Battle_SetLastUsedItem .public MIi_CpuClear32 .public MIi_CpuClearFast diff --git a/asm/include/overlay_14.inc b/asm/include/overlay_14.inc index 6f61d23e5..4e1d81357 100644 --- a/asm/include/overlay_14.inc +++ b/asm/include/overlay_14.inc @@ -267,10 +267,10 @@ .public GetItemNameIntoString .public GetItemDescIntoString .public ItemIdIsMail -.public Bag_AddItem -.public Bag_TakeItem -.public CreateBagView -.public Sav2_Bag_get +.public BagAddItem +.public BagTakeItem +.public BagViewCreate +.public SaveGetBag .public sub_020830D8 .public sub_0208311C .public sub_02088288 diff --git a/asm/include/overlay_15.inc b/asm/include/overlay_15.inc index 2dc8e4251..c00b37161 100644 --- a/asm/include/overlay_15.inc +++ b/asm/include/overlay_15.inc @@ -184,13 +184,13 @@ .public TMHMGetMove .public MoveIsHM .public ItemIdIsNotJohtoBall -.public Bag_GetRegisteredItemSlot1 -.public Bag_GetRegisteredItemSlot2 -.public Bag_TryRegisterItem -.public Bag_UnregisterItem -.public Pocket_TakeItem -.public Pocket_GetQuantity -.public Sav2_Bag_get +.public BagGetRegisteredItem1 +.public BagGetRegisteredItem2 +.public BagTryRegisterItem +.public BagUnregisterItem +.public BagPocketTakeItem +.public BagPocketGetQuantity +.public SaveGetBag .public BagCursor_Field_PocketGetPosition .public BagCursor_Field_GetPocket .public BagCursor_Field_PocketSetPosition diff --git a/asm/include/overlay_16.inc b/asm/include/overlay_16.inc index e0001f408..fd3e500e9 100644 --- a/asm/include/overlay_16.inc +++ b/asm/include/overlay_16.inc @@ -20,9 +20,9 @@ .public sub_0207789C .public sub_02077904 .public sub_0207790C -.public Bag_GetQuantity -.public CreateBagView -.public Sav2_Bag_get +.public BagGetQuantity +.public BagViewCreate +.public SaveGetBag .public BagCursor_new .public MI_CpuFill8 .public _s32_div_f diff --git a/asm/include/overlay_17.inc b/asm/include/overlay_17.inc index 5b80d0459..2769b9aef 100644 --- a/asm/include/overlay_17.inc +++ b/asm/include/overlay_17.inc @@ -131,10 +131,10 @@ .public GetItemIconAnim .public ItemIdIsBerry .public GetNutName -.public Bag_HasSpaceForItem -.public Bag_AddItem -.public Bag_TakeItem -.public Sav2_Bag_get +.public BagHasSpaceForItem +.public BagAddItem +.public BagTakeItem +.public SaveGetBag .public NNS_GfdDoVramTransfer .public MI_CpuFill8 .public MI_CpuCopy8 diff --git a/asm/include/overlay_27.inc b/asm/include/overlay_27.inc index 00102d104..edc11b80f 100644 --- a/asm/include/overlay_27.inc +++ b/asm/include/overlay_27.inc @@ -128,9 +128,9 @@ .public Pokemon_GetIconPalette .public sub_02074490 .public GetItemIndexMapping -.public Bag_GetRegisteredItemSlot1 -.public Bag_GetRegisteredItemSlot2 -.public Sav2_Bag_get +.public BagGetRegisteredItem1 +.public BagGetRegisteredItem2 +.public SaveGetBag .public Fsys_GetGearPhoneRingManager .public sub_02092E08 .public GXS_SetGraphicsMode diff --git a/asm/include/overlay_58.inc b/asm/include/overlay_58.inc index f824d6957..6f85062f4 100644 --- a/asm/include/overlay_58.inc +++ b/asm/include/overlay_58.inc @@ -24,7 +24,7 @@ .public Party_GetUnkSubSlot .public Party_SetUnkSubSlot .public SavArray_PlayerParty_get -.public Sav2_Bag_get +.public SaveGetBag .public ApplyMonMoodModifier .public MI_CpuFill8 .public _ffixu diff --git a/asm/include/overlay_65.inc b/asm/include/overlay_65.inc index df112a8b5..785fabf15 100644 --- a/asm/include/overlay_65.inc +++ b/asm/include/overlay_65.inc @@ -209,8 +209,8 @@ .public PartyHasMon .public GetItemNameIntoString .public ItemIdIsMail -.public Bag_HasItem -.public Sav2_Bag_get +.public BagHasItem +.public SaveGetBag .public sub_02088288 .public sub_02089D40 .public sub_0208AD34 diff --git a/asm/include/overlay_80_02235FC8.inc b/asm/include/overlay_80_02235FC8.inc index f8c4b715a..e034f30cb 100644 --- a/asm/include/overlay_80_02235FC8.inc +++ b/asm/include/overlay_80_02235FC8.inc @@ -11,7 +11,7 @@ .public GetPartyCount .public SavArray_PlayerParty_get .public SavArray_IsNatDexEnabled -.public Sav2_Bag_get +.public SaveGetBag .public sub_02088288 .public sub_0208828C .public sub_02089D40 diff --git a/asm/include/overlay_85.inc b/asm/include/overlay_85.inc index 384902e7f..854af9392 100644 --- a/asm/include/overlay_85.inc +++ b/asm/include/overlay_85.inc @@ -213,8 +213,8 @@ .public GetPartyCount .public GetPartyMonByIndex .public SavArray_PlayerParty_get -.public Bag_AddItem -.public Sav2_Bag_get +.public BagAddItem +.public SaveGetBag .public MonSetTrainerMemo .public sub_02096CE0 .public sub_02096D4C diff --git a/asm/include/scrcmd_11.inc b/asm/include/scrcmd_11.inc index b19b7bc2d..97f086572 100644 --- a/asm/include/scrcmd_11.inc +++ b/asm/include/scrcmd_11.inc @@ -65,10 +65,10 @@ .public AddMonToParty .public GetPartyCount .public SavArray_PlayerParty_get -.public Bag_HasSpaceForItem -.public Bag_AddItem -.public Bag_HasItem -.public Sav2_Bag_get +.public BagHasSpaceForItem +.public BagAddItem +.public BagHasItem +.public SaveGetBag .public GetSpecialRibbonNo .public MonSetTrainerMemo .public OS_GetTick diff --git a/asm/include/scrcmd_20.inc b/asm/include/scrcmd_20.inc index 45085c843..faf002baa 100644 --- a/asm/include/scrcmd_20.inc +++ b/asm/include/scrcmd_20.inc @@ -37,7 +37,7 @@ .public GetPartyMonByIndex .public SavArray_PlayerParty_get .public SavArray_IsNatDexEnabled -.public Sav2_Bag_get +.public SaveGetBag .public sub_02088288 .public sub_0208828C .public sub_02089D40 diff --git a/asm/include/unk_0203BC10.inc b/asm/include/unk_0203BC10.inc index 0a7753295..ede4c2f4a 100644 --- a/asm/include/unk_0203BC10.inc +++ b/asm/include/unk_0203BC10.inc @@ -138,9 +138,9 @@ .public ItemIdIsMail .public ItemToMailId .public BerryToItemId -.public Bag_HasItem -.public CreateBagView -.public Sav2_Bag_get +.public BagHasItem +.public BagViewCreate +.public SaveGetBag .public BagCursor_Field_PocketGetPosition .public BagCursor_Field_PocketSetPosition .public sub_02088288 diff --git a/asm/include/unk_0203E348.inc b/asm/include/unk_0203E348.inc index 481cdd942..812771f2e 100644 --- a/asm/include/unk_0203E348.inc +++ b/asm/include/unk_0203E348.inc @@ -176,8 +176,8 @@ .public sub_020778E8 .public sub_02077904 .public sub_0207790C -.public CreateBagView -.public Sav2_Bag_get +.public BagViewCreate +.public SaveGetBag .public sub_020830D8 .public sub_0208311C .public sub_02088288 diff --git a/asm/include/unk_0204F500.inc b/asm/include/unk_0204F500.inc index 2bf351b03..055cd304a 100644 --- a/asm/include/unk_0204F500.inc +++ b/asm/include/unk_0204F500.inc @@ -55,7 +55,7 @@ .public GetPartyCount .public SavArray_PlayerParty_get .public SavArray_IsNatDexEnabled -.public Sav2_Bag_get +.public SaveGetBag .public sub_02088288 .public sub_0208828C .public sub_02089D40 diff --git a/asm/include/unk_02058AEC.inc b/asm/include/unk_02058AEC.inc index dbb38a278..d1a98a43e 100644 --- a/asm/include/unk_02058AEC.inc +++ b/asm/include/unk_02058AEC.inc @@ -136,7 +136,7 @@ .public GetPartyMonByIndex .public SavArray_PlayerParty_get .public SavArray_IsNatDexEnabled -.public Sav2_Bag_get +.public SaveGetBag .public sub_02088288 .public sub_0208828C .public sub_02089D40 diff --git a/asm/include/unk_02066EDC.inc b/asm/include/unk_02066EDC.inc index f05299a60..347677e7b 100644 --- a/asm/include/unk_02066EDC.inc +++ b/asm/include/unk_02066EDC.inc @@ -52,7 +52,7 @@ .public GetPartyCount .public SavArray_PlayerParty_get .public SavArray_IsNatDexEnabled -.public Sav2_Bag_get +.public SaveGetBag .public sub_02088288 .public sub_0208828C .public sub_02089D40 diff --git a/asm/include/unk_0206B910.inc b/asm/include/unk_0206B910.inc index 0577ebbcf..35afbe630 100644 --- a/asm/include/unk_0206B910.inc +++ b/asm/include/unk_0206B910.inc @@ -33,7 +33,7 @@ .public GetPartyCount .public GetPartyMonByIndex .public SavArray_PlayerParty_get -.public Sav2_Bag_get +.public SaveGetBag .public sub_0209106C .public MI_CpuFill8 .public memset diff --git a/asm/include/unk_020755E8.inc b/asm/include/unk_020755E8.inc index 520eaa799..b5d603314 100644 --- a/asm/include/unk_020755E8.inc +++ b/asm/include/unk_020755E8.inc @@ -162,8 +162,8 @@ .public sub_02077634 .public sub_02077650 .public sub_02077664 -.public Bag_TakeItem -.public Bag_GetQuantity +.public BagTakeItem +.public BagGetQuantity .public sub_02089D40 .public MIi_CpuClear16 .public MIi_CpuClear32 diff --git a/asm/include/unk_02078E30.inc b/asm/include/unk_02078E30.inc index 0e90a17d7..3ff62ec62 100644 --- a/asm/include/unk_02078E30.inc +++ b/asm/include/unk_02078E30.inc @@ -118,8 +118,8 @@ .public LoadItemDataOrGfx .public GetItemAttr_PreloadedItemData .public ItemIdIsMail -.public Bag_AddItem -.public Bag_TakeItem +.public BagAddItem +.public BagTakeItem .public sub_02079224 .public sub_0207991C .public sub_02079E38 diff --git a/asm/include/unk_0207F42C.inc b/asm/include/unk_0207F42C.inc index f7c516b1c..96e7c0384 100644 --- a/asm/include/unk_0207F42C.inc +++ b/asm/include/unk_0207F42C.inc @@ -32,7 +32,7 @@ .public Pokemon_RemoveCapsule .public GetPartyMonByIndex .public Party_SwapSlots -.public Bag_AddItem +.public BagAddItem .public sub_02079224 .public sub_0207A16C .public sub_0207A7F4 diff --git a/asm/include/unk_02080BB4.inc b/asm/include/unk_02080BB4.inc index 3a0cba00a..17c614dec 100644 --- a/asm/include/unk_02080BB4.inc +++ b/asm/include/unk_02080BB4.inc @@ -34,7 +34,7 @@ .public GetItemAttr_PreloadedItemData .public MoveIsHM .public ItemToTMHMId -.public Bag_TakeItem +.public BagTakeItem .public sub_02079E38 .public sub_0207A7F4 .public sub_0207CB20 diff --git a/asm/overlay_01_021F6CFC.s b/asm/overlay_01_021F6CFC.s index 834b1ee05..a9019fddb 100644 --- a/asm/overlay_01_021F6CFC.s +++ b/asm/overlay_01_021F6CFC.s @@ -117,11 +117,11 @@ _021F6DB4: pop {r3, r4, r5, r6, pc} _021F6DC8: ldr r0, [r6, #0x34] - bl Sav2_Bag_get + bl SaveGetBag ldr r1, _021F6E40 ; =0x000001B5 mov r2, #1 mov r3, #4 - bl Bag_HasItem + bl BagHasItem cmp r0, #1 bne _021F6E02 add r0, r6, #0 diff --git a/asm/overlay_03.s b/asm/overlay_03.s index 56c55cfc9..5c59e1c4c 100644 --- a/asm/overlay_03.s +++ b/asm/overlay_03.s @@ -5958,7 +5958,7 @@ InitMartUI: ; 0x02256D34 bhi _02256DF8 _02256DEA: ldr r0, [r5, #0xc] - bl Sav2_Bag_get + bl SaveGetBag mov r1, #0x93 lsl r1, r1, #2 str r0, [r4, r1] @@ -7467,7 +7467,7 @@ _022579AE: add r1, #0x38 ldrh r1, [r2, r1] mov r2, #0xb - bl Bag_GetQuantity + bl BagGetQuantity pop {r4, pc} _022579C0: cmp r4, #2 @@ -7832,7 +7832,7 @@ ov03_02257CA0: ; 0x02257CA0 ldrh r2, [r4, r2] ldr r0, [r4, r0] mov r3, #0xb - bl Bag_HasSpaceForItem + bl BagHasSpaceForItem b _02257D4C _02257CC2: cmp r0, #1 @@ -7876,7 +7876,7 @@ _02257D06: add r2, #0x3a ldrh r2, [r4, r2] mov r3, #0xb - bl Bag_HasSpaceForItem + bl BagHasSpaceForItem cmp r0, #0 bne _02257D26 mov r0, #0xa6 @@ -8056,7 +8056,7 @@ _02257E54: ldrh r1, [r3, r1] mov r2, #1 mov r3, #0xb - bl Bag_AddItem + bl BagAddItem pop {r3, pc} .balign 4, 0 _02257E68: .word 0x000001E5 @@ -8087,7 +8087,7 @@ _02257E82: ldrh r2, [r4, r2] ldr r0, [r4, r0] mov r3, #0xb - bl Bag_AddItem + bl BagAddItem b _02257EF0 _02257EA0: cmp r0, #3 @@ -8203,7 +8203,7 @@ _02257F5E: mov r1, #0xc mov r2, #1 mov r3, #0xb - bl Bag_AddItem + bl BagAddItem cmp r0, #1 bne _02257F9E mov r0, #0xa6 @@ -9235,10 +9235,10 @@ ov03_02258764: ; 0x02258764 bl TaskManager_GetEnv add r4, r0, #0 ldr r0, [r5, #0xc] - bl Sav2_Bag_get + bl SaveGetBag ldr r1, _022587C8 ; =ov03_022597F0 mov r2, #0xb - bl CreateBagView + bl BagViewCreate str r0, [r4, #4] mov r0, #0x43 lsl r0, r0, #2 diff --git a/asm/overlay_05.s b/asm/overlay_05.s index 85395fce4..2f6fe5693 100644 --- a/asm/overlay_05.s +++ b/asm/overlay_05.s @@ -37,11 +37,11 @@ ov05_0221BA00: ; 0x0221BA00 ldr r0, [r1, r0] cmp r0, #0 beq _0221BA58 - bl Sav2_Bag_get + bl SaveGetBag ldr r1, _0221BA6C ; =0x000001D1 ldr r3, [r5, #0x24] mov r2, #1 - bl Bag_HasItem + bl BagHasItem ldr r1, _0221BA68 ; =0x00000BC8 str r0, [r4, r1] _0221BA58: diff --git a/asm/overlay_08.s b/asm/overlay_08.s index 7c5e60bf4..0487a40f6 100644 --- a/asm/overlay_08.s +++ b/asm/overlay_08.s @@ -3802,7 +3802,7 @@ ov08_0221DBCC: ; 0x0221DBCC add r1, r4, #0 mov r2, #1 add r3, r7, #0 - bl Bag_TakeItem + bl BagTakeItem _0221DBF0: add r0, r5, #0 bl ov12_0223AA84 @@ -14433,7 +14433,7 @@ ov08_02223390: ; 0x02223390 add r1, r5, #0 mov r2, #1 add r3, r4, #0 - bl Bag_TakeItem + bl BagTakeItem add r0, r6, #0 bl ov12_0223AA84 add r1, r5, #0 @@ -15432,7 +15432,7 @@ _02223B88: ldr r0, [r3, #8] ldr r3, [r3, #0xc] mov r2, #1 - bl Bag_HasItem + bl BagHasItem cmp r0, #0 bne _02223BA2 ldr r1, [r4] @@ -15510,7 +15510,7 @@ _02223C0A: lsl r2, r2, #0x10 ldr r1, [sp, #8] lsr r2, r2, #0x10 - bl Bag_GetPocketSlotN + bl BagGetNthPocket add r5, r0, #0 beq _02223C7C ldrh r0, [r5] diff --git a/asm/overlay_101.s b/asm/overlay_101.s index 2313ed565..2c0c4fee8 100644 --- a/asm/overlay_101.s +++ b/asm/overlay_101.s @@ -30190,11 +30190,11 @@ _021F5F9A: ; jump table .short _021F5FEA - _021F5F9A - 2 ; case 6 _021F5FA8: ldr r0, [r5, #4] - bl Sav2_Bag_get + bl SaveGetBag ldr r1, _021F603C ; =ITEM_GB_SOUNDS ldr r3, [r4] mov r2, #1 - bl Bag_HasItem + bl BagHasItem cmp r0, #0 beq _021F5FC2 mov r0, #4 @@ -31441,12 +31441,12 @@ RadioShow_BuenasPassword_init: ; 0x021F6904 mov r1, #msg_0411_00001 bl ReadMsgDataIntoString ldr r0, [r5, #4] - bl Sav2_Bag_get + bl SaveGetBag mov r1, #ITEM_BLUE_CARD>>2 ldr r3, [r5] lsl r1, r1, #2 mov r2, #1 - bl Bag_HasItem + bl BagHasItem cmp r0, #0 beq _021F6946 mov r0, #msg_0411_00004 diff --git a/asm/overlay_103.s b/asm/overlay_103.s index 829a92035..0f0a7cbed 100644 --- a/asm/overlay_103.s +++ b/asm/overlay_103.s @@ -2434,7 +2434,7 @@ ov103_021EDC00: ; 0x021EDC00 add r5, r0, #0 ldr r0, [r5, #8] ldr r0, [r0] - bl Sav2_Bag_get + bl SaveGetBag add r4, r0, #0 ldrb r0, [r5, #0x1f] ldr r1, [r5, #0xc] @@ -2450,7 +2450,7 @@ ov103_021EDC00: ; 0x021EDC00 add r0, r4, #0 mov r2, #1 mov r3, #0x9d - bl Bag_AddItem + bl BagAddItem cmp r0, #1 bne _021EDC46 add r0, r5, #0 @@ -2505,7 +2505,7 @@ ov103_021EDC68: ; 0x021EDC68 str r0, [r4] ldr r0, [r5, #8] ldr r0, [r0] - bl Sav2_Bag_get + bl SaveGetBag str r0, [r4, #4] ldr r0, [r5] mov r1, #0 @@ -2671,11 +2671,11 @@ ov103_021EDD98: ; 0x021EDD98 bl sub_02090F70 ldr r0, [r4, #8] ldr r0, [r0] - bl Sav2_Bag_get + bl SaveGetBag ldrh r1, [r4, #0x22] mov r2, #1 mov r3, #0x9c - bl Bag_TakeItem + bl BagTakeItem _021EDDD8: ldr r0, [r4, #0x14] bl sub_02090F90 diff --git a/asm/overlay_112.s b/asm/overlay_112.s index 4d811a21e..50486e6c3 100644 --- a/asm/overlay_112.s +++ b/asm/overlay_112.s @@ -4199,7 +4199,7 @@ ov112_021E795C: ; 0x021E795C push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0x20] - bl Sav2_Bag_get + bl SaveGetBag ldr r1, _021E7994 ; =0x0001E434 str r0, [r4, r1] ldr r0, [r4, #0x20] @@ -17865,7 +17865,7 @@ ov112_021EE920: ; 0x021EE920 ldr r0, [r4, r0] mov r2, #1 mov r3, #0x9a - bl Bag_AddItem + bl BagAddItem ldr r0, _021EE960 ; =0x0001F376 mov r1, #1 strh r1, [r4, r0] @@ -18026,7 +18026,7 @@ _021EEA86: mov r2, #1 ldr r0, [r5, r0] mov r3, #0x9a - bl Bag_AddItem + bl BagAddItem _021EEA98: add r6, r6, #1 add r4, r4, #4 @@ -18043,7 +18043,7 @@ _021EEAA6: mov r2, #1 ldr r0, [r5, r0] mov r3, #0x9a - bl Bag_AddItem + bl BagAddItem _021EEAB8: add r6, r6, #1 add r4, r4, #4 @@ -18060,7 +18060,7 @@ _021EEAB8: ldr r0, [r5, r0] mov r2, #1 mov r3, #0x9a - bl Bag_AddItem + bl BagAddItem _021EEADA: pop {r3, r4, r5, r6, r7, pc} .balign 4, 0 diff --git a/asm/overlay_12_022378C0.s b/asm/overlay_12_022378C0.s index 3f428ef23..86fb1d712 100644 --- a/asm/overlay_12_022378C0.s +++ b/asm/overlay_12_022378C0.s @@ -1419,7 +1419,7 @@ _022384D6: lsl r1, r1, #2 ldr r0, [r4, #0x58] ldr r1, [r7, r1] - bl Sav2_Bag_copy + bl BagCopy ldr r0, [r4, #0x58] bl FreeToHeap mov r1, #0x11 @@ -2083,14 +2083,14 @@ _02238AB8: sub r1, #0x28 str r0, [r4, r1] mov r0, #5 - bl Sav2_Bag_new + bl BagNew str r0, [r4, #0x58] mov r1, #0x42 ldr r0, [sp, #4] lsl r1, r1, #2 ldr r0, [r0, r1] ldr r1, [r4, #0x58] - bl Sav2_Bag_copy + bl BagCopy mov r0, #5 bl Pokedex_new str r0, [r4, #0x60] diff --git a/asm/overlay_12_battle_controller_player.s b/asm/overlay_12_battle_controller_player.s index 383008995..416e084a1 100644 --- a/asm/overlay_12_battle_controller_player.s +++ b/asm/overlay_12_battle_controller_player.s @@ -4926,7 +4926,7 @@ _0224ABC8: ldrh r1, [r6] mov r2, #1 mov r3, #5 - bl Bag_TakeItem + bl BagTakeItem add r0, r7, #0 bl ov12_0223AA84 ldrh r1, [r6] diff --git a/asm/overlay_14.s b/asm/overlay_14.s index b627eca1b..715e27476 100644 --- a/asm/overlay_14.s +++ b/asm/overlay_14.s @@ -36,7 +36,7 @@ ov14_021E5900: ; 0x021E5900 str r0, [r4, #8] ldr r0, [r4] ldr r0, [r0] - bl Sav2_Bag_get + bl SaveGetBag str r0, [r4, #0xc] ldr r0, [r4] ldr r0, [r0] @@ -6647,10 +6647,10 @@ ov14_021E8ACC: ; 0x021E8ACC add r4, r0, #0 ldr r0, [r4] ldr r0, [r0] - bl Sav2_Bag_get + bl SaveGetBag ldr r1, _021E8B10 ; =ov14_021F7D14 mov r2, #9 - bl CreateBagView + bl BagViewCreate str r0, [r4, #0x18] ldr r1, [r4] mov r2, #1 @@ -12907,7 +12907,7 @@ _021EBC66: ldr r0, [r5, #0xc] mov r2, #1 mov r3, #0xa - bl Bag_TakeItem + bl BagTakeItem _021EBC72: add r0, r5, #0 add r0, #0x21 @@ -25020,7 +25020,7 @@ ov14_021F2020: ; 0x021F2020 lsr r1, r1, #0x10 mov r2, #1 mov r3, #0xa - bl Bag_AddItem + bl BagAddItem cmp r0, #1 bne _021F20A4 add r2, r5, #0 @@ -25108,13 +25108,13 @@ ov14_021F20F4: ; 0x021F20F4 add r4, r0, #0 ldr r0, [r4] ldr r0, [r0] - bl Sav2_Bag_get + bl SaveGetBag ldr r2, [r4, #0x34] ldr r1, _021F21A8 ; =0x000088C8 mov r3, #0xa ldrh r1, [r2, r1] mov r2, #1 - bl Bag_AddItem + bl BagAddItem cmp r0, #0 bne _021F212A ldr r0, _021F21AC ; =0x000005F3 diff --git a/asm/overlay_15.s b/asm/overlay_15.s index 80be03339..ff2f83e7e 100644 --- a/asm/overlay_15.s +++ b/asm/overlay_15.s @@ -648,7 +648,7 @@ BagApp_GetSaveStructPtrs: ; 0x021F98F4 lsl r0, r0, #2 ldr r0, [r4, r0] ldr r0, [r0] - bl Sav2_Bag_get + bl SaveGetBag mov r1, #0x8e lsl r1, r1, #2 str r0, [r4, r1] @@ -4003,7 +4003,7 @@ _021FB2AE: mov r0, #0x8e lsl r0, r0, #2 ldr r0, [r4, r0] - bl Bag_GetRegisteredItemSlot1 + bl BagGetRegisteredItem1 mov r1, #0x8d lsl r1, r1, #2 ldr r2, [r4, r1] @@ -4013,7 +4013,7 @@ _021FB2AE: beq _021FB2E8 add r0, r1, #4 ldr r0, [r4, r0] - bl Bag_GetRegisteredItemSlot2 + bl BagGetRegisteredItem2 mov r1, #0x8d lsl r1, r1, #2 ldr r1, [r4, r1] @@ -5065,7 +5065,7 @@ ov15_021FBB28: ; 0x021FBB28 ldrb r1, [r1, #0xd] ldrh r2, [r2] ldrh r3, [r4, r3] - bl Pocket_TakeItem + bl BagPocketTakeItem add r0, r4, #0 bl ov15_021F9F08 mov r0, #0x8d @@ -5254,7 +5254,7 @@ ov15_021FBCAC: ; 0x021FBCAC ldr r0, [r1, #4] ldrb r1, [r1, #0xd] ldrh r2, [r2] - bl Pocket_GetQuantity + bl BagPocketGetQuantity cmp r0, #1 bne _021FBCF2 add r0, r4, #0 @@ -5873,7 +5873,7 @@ _021FC186: ldrb r1, [r1, #0xd] ldrh r2, [r2] ldrh r3, [r5, r3] - bl Pocket_TakeItem + bl BagPocketTakeItem add r0, r5, #0 bl ov15_021F9F08 mov r0, #0x8d @@ -5924,7 +5924,7 @@ ov15_021FC224: ; 0x021FC224 ldr r1, [r5, r1] add r1, #0x66 ldrh r1, [r1] - bl Bag_TryRegisterItem + bl BagTryRegisterItem cmp r0, #0 bne _021FC28C mov r0, #0x2f @@ -6074,7 +6074,7 @@ ov15_021FC37C: ; 0x021FC37C ldr r1, [r5, r1] add r1, #0x66 ldrh r1, [r1] - bl Bag_UnregisterItem + bl BagUnregisterItem add r0, r5, #0 bl ov15_02200294 add r0, r5, #0 @@ -7207,7 +7207,7 @@ _021FCC7C: ldr r0, [r1, #4] ldrb r1, [r1, #0xd] ldrh r2, [r2] - bl Pocket_GetQuantity + bl BagPocketGetQuantity cmp r0, #1 bne _021FCD0C mov r0, #0x2f @@ -7948,7 +7948,7 @@ _021FD2B4: ldrb r1, [r1, #0xd] ldrh r2, [r2] ldrh r3, [r4, r3] - bl Pocket_TakeItem + bl BagPocketTakeItem add r0, r4, #0 bl ov15_021F9F08 add r4, #0x34 @@ -12330,7 +12330,7 @@ _021FF5D8: mov r0, #0x8e lsl r0, r0, #2 ldr r0, [r5, r0] - bl Bag_GetRegisteredItemSlot1 + bl BagGetRegisteredItem1 ldr r1, [r4] ldrh r1, [r1, r7] cmp r1, r0 @@ -12344,7 +12344,7 @@ _021FF610: mov r0, #0x8e lsl r0, r0, #2 ldr r0, [r5, r0] - bl Bag_GetRegisteredItemSlot2 + bl BagGetRegisteredItem2 ldr r1, [r4] ldrh r1, [r1, r7] cmp r1, r0 diff --git a/asm/overlay_16.s b/asm/overlay_16.s index 64e605a9d..ac81ad0e1 100644 --- a/asm/overlay_16.s +++ b/asm/overlay_16.s @@ -721,7 +721,7 @@ _022018FA: add r0, r6, #0 lsr r1, r1, #0x10 add r2, r7, #0 - bl Bag_GetQuantity + bl BagGetQuantity add r0, r5, r0 lsl r0, r0, #0x10 add r4, r4, #1 @@ -747,7 +747,7 @@ _02201926: add r0, r6, #0 lsr r1, r1, #0x10 add r2, r7, #0 - bl Bag_GetQuantity + bl BagGetQuantity add r0, r5, r0 lsl r0, r0, #0x10 add r4, r4, #1 @@ -952,7 +952,7 @@ ov16_02201AA0: ; 0x02201AA0 add r4, r0, #0 ldr r0, [r4, #4] ldr r0, [r0, #0xc] - bl Sav2_Bag_get + bl SaveGetBag ldrb r1, [r4, #0x14] cmp r1, #1 beq _02201ABA @@ -964,7 +964,7 @@ _02201ABA: ldr r2, _02201B18 ; =_02201BA0 str r1, [r2] ldr r2, [r4] - bl CreateBagView + bl BagViewCreate str r0, [r4, #0x10] ldr r1, [r4, #4] mov r2, #6 @@ -980,7 +980,7 @@ _02201ADC: ldr r2, _02201B18 ; =_02201BA0 str r1, [r2] ldr r2, [r4] - bl CreateBagView + bl BagViewCreate str r0, [r4, #0x10] ldr r1, [r4, #4] mov r2, #6 diff --git a/asm/overlay_17.s b/asm/overlay_17.s index d954f342b..812a43012 100644 --- a/asm/overlay_17.s +++ b/asm/overlay_17.s @@ -213,7 +213,7 @@ ov17_02201D30: ; 0x02201D30 ldr r0, [r5, #4] ldr r0, [r0, #4] ldr r0, [r0, #0xc] - bl Sav2_Bag_get + bl SaveGetBag str r0, [r5, #0xc] ldr r0, [r5, #4] ldr r0, [r0, #4] @@ -843,7 +843,7 @@ _0220220C: ldrb r2, [r5, #5] ldr r0, [r4, #0xc] ldr r3, [r4] - bl Bag_HasSpaceForItem + bl BagHasSpaceForItem cmp r0, #0 beq _02202244 add r0, r4, #0 @@ -1101,7 +1101,7 @@ _0220242A: ldrh r1, [r1, #0x16] ldr r3, [r4] mov r2, #1 - bl Bag_TakeItem + bl BagTakeItem _02202438: pop {r4, pc} nop @@ -2086,7 +2086,7 @@ ov17_02202B98: ; 0x02202B98 ldrb r2, [r4, #5] ldr r0, [r5, #0xc] ldr r3, [r5] - bl Bag_AddItem + bl BagAddItem add r0, r5, #0 bl ov17_0220387C ldr r0, [r4, #0x10] diff --git a/asm/overlay_27.s b/asm/overlay_27.s index 6899bd740..36a8efd50 100644 --- a/asm/overlay_27.s +++ b/asm/overlay_27.s @@ -1286,9 +1286,9 @@ _0225A9D0: beq _0225AA2E ldr r0, [r5, #0x10] ldr r0, [r0, #0xc] - bl Sav2_Bag_get + bl SaveGetBag add r4, r0, #0 - bl Bag_GetRegisteredItemSlot1 + bl BagGetRegisteredItem1 cmp r0, #0 beq _0225A9EA mov r6, #1 @@ -1297,7 +1297,7 @@ _0225A9EA: mov r6, #0 _0225A9EC: add r0, r4, #0 - bl Bag_GetRegisteredItemSlot2 + bl BagGetRegisteredItem2 cmp r0, #0 beq _0225A9FA mov r4, #1 @@ -1727,7 +1727,7 @@ _0225AD52: add r7, r0, #0 ldr r0, [r5, #0x10] ldr r0, [r0, #0xc] - bl Sav2_Bag_get + bl SaveGetBag add r1, r4, #0 add r1, #0x64 str r1, [sp] @@ -1952,12 +1952,12 @@ _0225AF22: str r0, [sp, #0x1c] add r0, r7, #0 mov r6, #0x12 ; NARC_itemtool_itemdata_item_icon - bl Bag_GetRegisteredItemSlot1 + bl BagGetRegisteredItem1 mov r1, #2 bl GetItemIndexMapping str r0, [sp, #0x20] add r0, r7, #0 - bl Bag_GetRegisteredItemSlot1 + bl BagGetRegisteredItem1 mov r1, #1 bl GetItemIndexMapping add r2, r0, #0 @@ -1969,12 +1969,12 @@ _0225AF4A: str r0, [sp, #0x1c] add r0, r7, #0 mov r6, #0x12 ; NARC_itemtool_itemdata_item_icon - bl Bag_GetRegisteredItemSlot2 + bl BagGetRegisteredItem2 mov r1, #2 bl GetItemIndexMapping str r0, [sp, #0x20] add r0, r7, #0 - bl Bag_GetRegisteredItemSlot2 + bl BagGetRegisteredItem2 mov r1, #1 bl GetItemIndexMapping add r2, r0, #0 @@ -2727,7 +2727,7 @@ _0225B55A: _0225B57E: ldr r0, [r5, #0x10] ldr r0, [r0, #0xc] - bl Sav2_Bag_get + bl SaveGetBag add r6, r0, #0 add r0, r4, #0 sub r0, #8 @@ -2751,7 +2751,7 @@ _0225B5AC: cmp r4, #8 bne _0225B5BE add r0, r6, #0 - bl Bag_GetRegisteredItemSlot1 + bl BagGetRegisteredItem1 cmp r0, #0 bne _0225B5D0 mov r0, #1 @@ -2760,7 +2760,7 @@ _0225B5BE: cmp r4, #9 bne _0225B5D0 add r0, r6, #0 - bl Bag_GetRegisteredItemSlot2 + bl BagGetRegisteredItem2 cmp r0, #0 bne _0225B5D0 mov r0, #1 diff --git a/asm/overlay_58.s b/asm/overlay_58.s index 83a2bfa62..e77bb3a4b 100644 --- a/asm/overlay_58.s +++ b/asm/overlay_58.s @@ -435,7 +435,7 @@ ov58_02237BD4: ; 0x02237BD4 str r0, [r4] ldr r0, [r5, #4] ldr r0, [r0, #0x18] - bl Sav2_Bag_get + bl SaveGetBag str r0, [r4, #4] add r0, r4, #0 mov r1, #0 diff --git a/asm/overlay_65.s b/asm/overlay_65.s index 829e8890a..e075d10b5 100644 --- a/asm/overlay_65.s +++ b/asm/overlay_65.s @@ -5033,11 +5033,11 @@ _0221E77C: pop {r3, r4, r5, r6, r7, pc} _0221E7C2: ldr r0, [r5, #4] - bl Sav2_Bag_get + bl SaveGetBag ldr r1, _0221E84C ; =0x000001B5 mov r2, #1 mov r3, #0x1a - bl Bag_HasItem + bl BagHasItem cmp r0, #1 bne _0221E7FE ldr r0, _0221E838 ; =0x00003678 diff --git a/asm/overlay_80_02235FC8.s b/asm/overlay_80_02235FC8.s index 4b8d969d6..2c82424dc 100644 --- a/asm/overlay_80_02235FC8.s +++ b/asm/overlay_80_02235FC8.s @@ -146,7 +146,7 @@ ov80_0223608C: ; 0x0223608C ldr r1, [r1] str r0, [r1] ldr r0, [r5] - bl Sav2_Bag_get + bl SaveGetBag add r1, r5, #0 add r1, #0xa8 ldr r1, [r1] diff --git a/asm/overlay_85.s b/asm/overlay_85.s index bddc8e225..c3525f92d 100644 --- a/asm/overlay_85.s +++ b/asm/overlay_85.s @@ -1644,12 +1644,12 @@ _021E64E4: add r0, #0xcc ldr r0, [r0] ldr r0, [r0, #0x1c] - bl Sav2_Bag_get + bl SaveGetBag lsl r1, r4, #0x10 lsr r1, r1, #0x10 mov r2, #1 mov r3, #0x66 - bl Bag_AddItem + bl BagAddItem add r4, r0, #0 ldr r0, _021E6528 ; =0x000004A1 bl PlayFanfare diff --git a/asm/scrcmd_11.s b/asm/scrcmd_11.s index 6f92d77e6..063f4ddf4 100644 --- a/asm/scrcmd_11.s +++ b/asm/scrcmd_11.s @@ -801,7 +801,7 @@ MGCheck_Item: ; 0x0204C3BC push {r3, r4, r5, lr} add r5, r0, #0 ldr r0, [r5, #0xc] - bl Sav2_Bag_get + bl SaveGetBag add r4, r0, #0 add r0, r5, #0 bl FieldSys_GetDataOfNextMG @@ -812,7 +812,7 @@ MGCheck_Item: ; 0x0204C3BC lsr r1, r1, #0x10 mov r2, #1 mov r3, #0x20 - bl Bag_HasSpaceForItem + bl BagHasSpaceForItem pop {r3, r4, r5, pc} .balign 4, 0 thumb_func_end MGCheck_Item @@ -822,7 +822,7 @@ MGGive_Item: ; 0x0204C3E4 push {r4, r5, r6, lr} add r5, r0, #0 ldr r0, [r5, #0xc] - bl Sav2_Bag_get + bl SaveGetBag add r6, r0, #0 add r0, r5, #0 bl FieldSys_GetDataOfNextMG @@ -842,7 +842,7 @@ _0204C410: add r1, r4, #0 mov r2, #1 mov r3, #0x20 - bl Bag_AddItem + bl BagAddItem pop {r4, r5, r6, pc} .balign 4, 0 thumb_func_end MGGive_Item @@ -885,7 +885,7 @@ MGMessageFailure_Item: ; 0x0204C45C add r4, r1, #0 ldr r0, [r0, #0xc] add r6, r2, #0 - bl Sav2_Bag_get + bl SaveGetBag ldr r0, [r5] bl FieldSys_GetDataOfNextMG ldr r0, [r0] @@ -1394,7 +1394,7 @@ MGCheck_MemorialPhoto: ; 0x0204C778 push {r4, lr} add r4, r0, #0 ldr r0, [r4, #0xc] - bl Sav2_Bag_get + bl SaveGetBag ldr r0, [r4, #0xc] bl Save_PhotoAlbum_get bl PhotoAlbum_GetNumSaved @@ -1463,13 +1463,13 @@ MGMessageFailure_MemorialPhoto: ; 0x0204C7F4 bl FieldSys_GetDataOfNextMG ldr r0, [r5] ldr r0, [r0, #0xc] - bl Sav2_Bag_get + bl SaveGetBag mov r1, #0xd1 strh r1, [r6] ldr r1, _0204C838 ; =0x000001F5 mov r2, #1 mov r3, #0xb - bl Bag_HasItem + bl BagHasItem cmp r0, #0 bne _0204C820 mov r0, #0x18 diff --git a/asm/scrcmd_20.s b/asm/scrcmd_20.s index 01fa0ee8d..9eb1dbdbf 100644 --- a/asm/scrcmd_20.s +++ b/asm/scrcmd_20.s @@ -673,7 +673,7 @@ sub_0204F320: ; 0x0204F320 bl SavArray_PlayerParty_get str r0, [r4] ldr r0, [r6, #0xc] - bl Sav2_Bag_get + bl SaveGetBag str r0, [r4, #4] ldr r0, [r6, #0xc] bl Sav2_Mailbox_get diff --git a/asm/unk_0203BC10.s b/asm/unk_0203BC10.s index ff489a88c..987e88bfc 100644 --- a/asm/unk_0203BC10.s +++ b/asm/unk_0203BC10.s @@ -2232,14 +2232,14 @@ _0203CD68: lsl r1, r1, #2 str r0, [r4, r1] ldr r0, [r5, #0xc] - bl Sav2_Bag_get + bl SaveGetBag add r7, r0, #0 ldr r0, [r5, #0xc] bl Sav2_PlayerData_GetProfileAddr ldr r1, _0203CEEC ; =_020FA0B8 add r0, r7, #0 mov r2, #0xb - bl CreateBagView + bl BagViewCreate mov r1, #0xe lsl r1, r1, #6 str r0, [r4, r1] @@ -2481,7 +2481,7 @@ sub_0203CF74: ; 0x0203CF74 bl SavArray_PlayerParty_get str r0, [r5] ldr r0, [r4, #0xc] - bl Sav2_Bag_get + bl SaveGetBag str r0, [r5, #4] ldr r0, [r4, #0xc] bl Sav2_Mailbox_get @@ -3342,7 +3342,7 @@ sub_0203D664: ; 0x0203D664 str r0, [sp] ldr r0, [sp, #4] ldr r0, [r0, #0xc] - bl Sav2_Bag_get + bl SaveGetBag add r4, r0, #0 mov r5, #0 mov r6, #1 @@ -3354,7 +3354,7 @@ _0203D688: add r0, r4, #0 add r2, r6, #0 add r3, r7, #0 - bl Bag_HasItem + bl BagHasItem add r0, r5, #1 lsl r0, r0, #0x18 lsr r5, r0, #0x18 @@ -3795,7 +3795,7 @@ sub_0203D9E8: ; 0x0203D9E8 bl Sav2_Pokedex_get str r0, [sp, #0x28] ldr r0, [r4, #0xc] - bl Sav2_Bag_get + bl SaveGetBag str r0, [sp, #0x2c] ldr r0, [r4, #0xc] bl Sav2_GameStats_get @@ -3827,7 +3827,7 @@ _0203DA72: bl Sav2_Pokedex_get str r0, [sp, #0x34] ldr r0, [r4, #0xc] - bl Sav2_Bag_get + bl SaveGetBag str r0, [sp, #0x38] ldr r0, [r4, #0xc] bl Sav2_GameStats_get diff --git a/asm/unk_0203E348.s b/asm/unk_0203E348.s index 55aa2be3b..ddcf1892a 100644 --- a/asm/unk_0203E348.s +++ b/asm/unk_0203E348.s @@ -238,10 +238,10 @@ sub_0203E3FC: ; 0x0203E3FC add r5, r0, #0 ldr r0, [r5, #0xc] add r6, r1, #0 - bl Sav2_Bag_get + bl SaveGetBag ldr r1, _0203E45C ; =_020FA1B8 mov r2, #0xb - bl CreateBagView + bl BagViewCreate mov r1, #0x43 lsl r1, r1, #2 add r1, r5, r1 @@ -285,7 +285,7 @@ sub_0203E460: ; 0x0203E460 add r5, r0, #0 ldr r0, [r5, #0xc] add r4, r1, #0 - bl Sav2_Bag_get + bl SaveGetBag add r6, r0, #0 cmp r4, #0 beq _0203E47A @@ -309,7 +309,7 @@ _0203E48E: add r0, r6, #0 ldr r1, [r1] mov r2, #0x20 - bl CreateBagView + bl BagViewCreate mov r1, #0x43 lsl r1, r1, #2 add r1, r5, r1 @@ -379,7 +379,7 @@ sub_0203E4FC: ; 0x0203E4FC bl SavArray_PlayerParty_get str r0, [r4] ldr r0, [r5, #0xc] - bl Sav2_Bag_get + bl SaveGetBag str r0, [r4, #4] ldr r0, [r5, #0xc] bl Sav2_Mailbox_get @@ -2323,7 +2323,7 @@ _0203F3C2: bl Sav2_Pokedex_get add r7, r0, #0 ldr r0, [r5, #0xc] - bl Sav2_Bag_get + bl SaveGetBag str r0, [sp, #0x24] ldr r0, [r5, #0xc] bl Sav2_GameStats_get @@ -2923,7 +2923,7 @@ sub_0203F844: ; 0x0203F844 bl sub_0203A040 str r0, [r4, #0x34] ldr r0, [r5, #0xc] - bl Sav2_Bag_get + bl SaveGetBag str r0, [r4, #0x2c] add r0, r5, #0 add r1, sp, #0 @@ -3210,7 +3210,7 @@ sub_0203FAE8: ; 0x0203FAE8 bl SavArray_PlayerParty_get str r0, [r4] ldr r0, [r5, #0xc] - bl Sav2_Bag_get + bl SaveGetBag str r0, [r4, #4] ldr r0, [r5, #0xc] bl Sav2_Mailbox_get diff --git a/asm/unk_0204F500.s b/asm/unk_0204F500.s index 51915ebef..e31b1b6cc 100644 --- a/asm/unk_0204F500.s +++ b/asm/unk_0204F500.s @@ -1025,7 +1025,7 @@ sub_0204FC78: ; 0x0204FC78 bl SavArray_PlayerParty_get str r0, [r4] ldr r0, [r6, #0xc] - bl Sav2_Bag_get + bl SaveGetBag str r0, [r4, #4] ldr r0, [r6, #0xc] bl Sav2_Mailbox_get @@ -1702,7 +1702,7 @@ sub_020501B8: ; 0x020501B8 bl SavArray_PlayerParty_get str r0, [r4] ldr r0, [r6, #0xc] - bl Sav2_Bag_get + bl SaveGetBag str r0, [r4, #4] ldr r0, [r6, #0xc] bl Sav2_Mailbox_get diff --git a/asm/unk_02058AEC.s b/asm/unk_02058AEC.s index 1ce4cc573..dba79f195 100644 --- a/asm/unk_02058AEC.s +++ b/asm/unk_02058AEC.s @@ -109,7 +109,7 @@ sub_02058B84: ; 0x02058B84 str r0, [r4] ldr r0, [r5, #0x24] ldr r0, [r0, #0xc] - bl Sav2_Bag_get + bl SaveGetBag str r0, [r4, #4] mov r0, #0x43 ldr r1, [r5, #0x24] diff --git a/asm/unk_02066EDC.s b/asm/unk_02066EDC.s index 7230d2965..3264f3985 100644 --- a/asm/unk_02066EDC.s +++ b/asm/unk_02066EDC.s @@ -34,7 +34,7 @@ sub_02066EDC: ; 0x02066EDC bl SavArray_PlayerParty_get str r0, [r4] add r0, r7, #0 - bl Sav2_Bag_get + bl SaveGetBag str r0, [r4, #4] add r0, r4, #0 mov r2, #0 diff --git a/asm/unk_0206B910.s b/asm/unk_0206B910.s index 2db35d34a..622bf494c 100644 --- a/asm/unk_0206B910.s +++ b/asm/unk_0206B910.s @@ -175,7 +175,7 @@ _0206BA4E: ldr r0, [r6, #0x1c] str r0, [r4] ldr r0, [r7, #0xc] - bl Sav2_Bag_get + bl SaveGetBag str r0, [r4, #4] ldr r0, [r7, #0xc] bl Sav2_Mailbox_get diff --git a/asm/unk_020755E8.s b/asm/unk_020755E8.s index c1c42df77..617bb4210 100644 --- a/asm/unk_020755E8.s +++ b/asm/unk_020755E8.s @@ -2793,7 +2793,7 @@ _02076CC4: ldr r0, [r4, #0x4c] ldr r2, [r4, #0x5c] mov r1, #4 - bl Bag_GetQuantity + bl BagGetQuantity cmp r0, #0 beq _02076CE4 ldr r0, [r4, #0x24] @@ -2954,7 +2954,7 @@ _02076D62: ldr r3, [r4, #0x5c] mov r1, #4 mov r2, #1 - bl Bag_TakeItem + bl BagTakeItem add sp, #0x20 pop {r4, r5, r6, pc} _02076E50: diff --git a/asm/unk_02078E30.s b/asm/unk_02078E30.s index afacb9d8f..72e84a301 100644 --- a/asm/unk_02078E30.s +++ b/asm/unk_02078E30.s @@ -6706,7 +6706,7 @@ _0207C326: mov r3, #0xc ldr r0, [r1, #4] ldrh r1, [r1, #0x28] - bl Bag_TakeItem + bl BagTakeItem add r0, r4, #0 mov r1, #0x1a bl GetItemAttr_PreloadedItemData @@ -7025,7 +7025,7 @@ sub_0207C5D4: ; 0x0207C5D4 ldr r1, [r5, r0] ldr r0, [r1, #4] ldrh r1, [r1, #0x28] - bl Bag_TakeItem + bl BagTakeItem add r0, r6, #0 mov r1, #MON_DATA_HELD_ITEM add r2, sp, #0 @@ -7086,7 +7086,7 @@ sub_0207C658: ; 0x0207C658 lsr r1, r1, #0x10 mov r2, #1 mov r3, #0xc - bl Bag_AddItem + bl BagAddItem add r0, r5, #0 mov r1, #MON_DATA_HELD_ITEM add r2, sp, #0x1c @@ -7249,7 +7249,7 @@ _0207C766: mov r2, #1 ldr r0, [r0, #4] mov r3, #0xc - bl Bag_AddItem + bl BagAddItem cmp r0, #0 bne _0207C7D6 ldr r1, [sp] @@ -7280,7 +7280,7 @@ _0207C7D6: ldr r0, [r0, #4] mov r2, #1 mov r3, #0xc - bl Bag_TakeItem + bl BagTakeItem ldr r1, [sp] add r0, r5, #0 add r2, r6, #0 @@ -7486,7 +7486,7 @@ _0207C998: ldr r0, [r0, #4] mov r2, #1 mov r3, #0xc - bl Bag_AddItem + bl BagAddItem mov r2, #0x1f lsl r2, r2, #6 ldr r0, [r5, r2] diff --git a/asm/unk_0207F42C.s b/asm/unk_0207F42C.s index a609a9dd7..823139947 100644 --- a/asm/unk_0207F42C.s +++ b/asm/unk_0207F42C.s @@ -194,7 +194,7 @@ _0207F590: ldr r0, [r0, #4] mov r2, #1 mov r3, #0xc - bl Bag_AddItem + bl BagAddItem cmp r0, #1 bne _0207F64E ldr r0, _0207F68C ; =0x00000654 @@ -640,7 +640,7 @@ sub_0207F924: ; 0x0207F924 ldrh r1, [r2, r1] mov r2, #1 mov r3, #0xc - bl Bag_AddItem + bl BagAddItem cmp r0, #1 bne _0207F9A2 ldr r0, _0207F9C0 ; =0x00000654 diff --git a/asm/unk_02080BB4.s b/asm/unk_02080BB4.s index 48fcf0dcc..0c8d01721 100644 --- a/asm/unk_02080BB4.s +++ b/asm/unk_02080BB4.s @@ -1732,7 +1732,7 @@ _02081A22: mov r3, #0xc ldr r0, [r1, #4] ldrh r1, [r1, #0x28] - bl Bag_TakeItem + bl BagTakeItem ldr r0, _02081A5C ; =0x00000654 mov r1, #0 ldr r0, [r4, r0] @@ -3082,7 +3082,7 @@ sub_0208254C: ; 0x0208254C mov r3, #0xc ldr r0, [r1, #4] ldrh r1, [r1, #0x28] - bl Bag_TakeItem + bl BagTakeItem _020825B8: add r0, r5, #0 bl sub_020828EC @@ -3359,7 +3359,7 @@ _02082794: mov r3, #0xc ldr r0, [r1, #4] ldrh r1, [r1, #0x28] - bl Bag_TakeItem + bl BagTakeItem ldr r0, _02082860 ; =0x000005EC bl PlaySE b _02082828 diff --git a/include/bag.h b/include/bag.h index 1db59ea7c..0618efc70 100644 --- a/include/bag.h +++ b/include/bag.h @@ -9,12 +9,12 @@ #include "bag_cursor.h" /* - * Return value of Bag_TryRegisterItem + * Return value of BagTryRegisterItem */ typedef enum RegisterItemResult { - REG_BAG_FAIL, - REG_BAG_POCKET1, - REG_BAG_POCKET2, + REG_ITEM_FAIL, + REG_ITEM_SLOT1, + REG_ITEM_SLOT2, } RegisterItemResult; /* @@ -23,28 +23,28 @@ typedef enum RegisterItemResult { * buttons. This is saved to flash. */ typedef struct Bag { - BagPocket items[NUM_BAG_ITEMS]; // General items - BagPocket keyItems[NUM_BAG_KEY_ITEMS]; // Key items - BagPocket TMsHMs[NUM_BAG_TMS_HMS]; // Move machines - BagPocket mail[NUM_BAG_MAIL]; // Mail items - BagPocket medicine[NUM_BAG_MEDICINE]; // Healing items - BagPocket berries[NUM_BAG_BERRIES]; // Berries - BagPocket balls[NUM_BAG_BALLS]; // Balls - BagPocket battleItems[NUM_BAG_BATTLE_ITEMS]; // Battle-only items + ItemSlot items[NUM_BAG_ITEMS]; // General items + ItemSlot keyItems[NUM_BAG_KEY_ITEMS]; // Key items + ItemSlot TMsHMs[NUM_BAG_TMS_HMS]; // Move machines + ItemSlot mail[NUM_BAG_MAIL]; // Mail items + ItemSlot medicine[NUM_BAG_MEDICINE]; // Healing items + ItemSlot berries[NUM_BAG_BERRIES]; // Berries + ItemSlot balls[NUM_BAG_BALLS]; // Balls + ItemSlot battleItems[NUM_BAG_BATTLE_ITEMS]; // Battle-only items u16 registeredItems[2]; // IDs of registered key items } Bag; /* - * u32 Sav2_Bag_sizeof(void) + * u32 BagSizeof(void) * * Returns the size of the player's inventory in save memory * * @returns: The size of Bag */ -u32 Sav2_Bag_sizeof(void); +u32 BagSizeof(void); /* - * Bag *Sav2_Bag_new(HeapID heap_id) + * Bag *BagNew(HeapID heap_id) * * Allocates a new Bag * @@ -52,31 +52,31 @@ u32 Sav2_Bag_sizeof(void); * * @returns: Pointer to the Bag instance */ -Bag *Sav2_Bag_new(HeapID heap_id); +Bag *BagNew(HeapID heap_id); /* - * void Sav2_Bag_init(Bag *bagData) + * void BagInit(Bag *bagData) * * Initializes an existing Bag instance. This is also - * called by Sav2_Bag_new. + * called by BagNew. * * @param bagData: The Bag instance */ -void Sav2_Bag_init(Bag *bagData); +void BagInit(Bag *bagData); /* - * void Sav2_Bag_copy(const Bag *src, Bag *dst) + * void BagCopy(const Bag *src, Bag *dst) * * Copies Bag from src to dst * * @param src: Origin Bag * @param dst: Destination Bag */ -void Sav2_Bag_copy(const Bag *src, Bag *dst); +void BagCopy(const Bag *src, Bag *dst); /* - * u16 Bag_GetRegisteredItemSlot1(Bag *bag) - * u16 Bag_GetRegisteredItemSlot2(Bag *bag) + * u16 BagGetRegisteredItem1(Bag *bag) + * u16 BagGetRegisteredItem2(Bag *bag) * * Returns the item ID registered to touch screen button 1 or 2 * @@ -84,25 +84,25 @@ void Sav2_Bag_copy(const Bag *src, Bag *dst); * * @returns: Registered item ID in that slot */ -u16 Bag_GetRegisteredItemSlot1(Bag *bag); -u16 Bag_GetRegisteredItemSlot2(Bag *bag); +u16 BagGetRegisteredItem1(Bag *bag); +u16 BagGetRegisteredItem2(Bag *bag); /* - * RegisterItemResult Bag_TryRegisterItem(Bag *bag, u16 itemId) + * RegisterItemResult BagTryRegisterItem(Bag *bag, u16 itemId) * * Registers the item to the first available quick-access slot. - * If none available, returns REG_BAG_FAIL. Otherwise, returns - * REG_BAG_POCKET1 or REG_BAG_POCKET2. + * If none available, returns REG_ITEM_FAIL. Otherwise, returns + * REG_ITEM_SLOT1 or REG_ITEM_SLOT2. * * @param bag: Pointer to Bag * @param itemId: Item to attempt registry * * @returns: Which slot the item was registered to, or 0 if failed */ -RegisterItemResult Bag_TryRegisterItem(Bag *bag, u16 itemId); +RegisterItemResult BagTryRegisterItem(Bag *bag, u16 itemId); /* - * void Bag_UnregisterItem(Bag *bag, u16 itemId) + * void BagUnregisterItem(Bag *bag, u16 itemId) * * Removes the specified item from the registered items slots. * If the item was in slot 1, and slot 2 is not empty, moves @@ -111,13 +111,13 @@ RegisterItemResult Bag_TryRegisterItem(Bag *bag, u16 itemId); * @param bag: Pointer to Bag * @param itemId: Item to attempt unregistry */ -void Bag_UnregisterItem(Bag *bag, u16 itemId); +void BagUnregisterItem(Bag *bag, u16 itemId); /* - * BOOL Bag_HasSpaceForItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) - * BOOL Bag_AddItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) - * BOOL Bag_TakeItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) - * BOOL Bag_HasItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) + * BOOL BagHasSpaceForItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) + * BOOL BagAddItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) + * BOOL BagTakeItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) + * BOOL BagHasItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) * * Inventory checkers and modifiers. * HasSpaceForItem checks whether there is an empty slot @@ -143,27 +143,27 @@ void Bag_UnregisterItem(Bag *bag, u16 itemId); * @returns: TRUE if the action succeeded or would succeed, * otherwise FALSE. */ -BOOL Bag_HasSpaceForItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id); -BOOL Bag_AddItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id); -BOOL Bag_TakeItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id); -BOOL Bag_HasItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id); +BOOL BagHasSpaceForItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id); +BOOL BagAddItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id); +BOOL BagTakeItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id); +BOOL BagHasItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id); /* - * BOOL Pocket_TakeItem(BagPocket *slots, u32 count, u16 itemId, u16 quantity) + * BOOL BagPocketTakeItem(ItemSlot *slots, u32 count, u16 itemId, u16 quantity) * * Like BAG_TakeItem, but acts directly on an array of item slots. * - * @param slots: Pointer to BagPocket array - * @param count: Number of BagPocket in slots + * @param slots: Pointer to ItemSlot array + * @param count: Number of ItemSlot in slots * @param itemId: ID of item to act upon * @param quantity: Amount to add, remove, or check * * @returns: TRUE if the action succeeded, otherwise FALSE. */ -BOOL Pocket_TakeItem(BagPocket *slots, u32 count, u16 itemId, u16 quantity); +BOOL BagPocketTakeItem(ItemSlot *slots, u32 count, u16 itemId, u16 quantity); /* - * BOOL Bag_PocketNotEmpty(Bag *bag, int pocket) + * BOOL BagPocketNotEmpty(Bag *bag, int pocket) * * Checks whether the indicated pocket has any items in it. * @@ -173,29 +173,29 @@ BOOL Pocket_TakeItem(BagPocket *slots, u32 count, u16 itemId, u16 quantity); * @returns: TRUE if there is at least one item in the pocket, * otherwise FALSE. */ -BOOL Bag_PocketNotEmpty(Bag *bag, int pocket); +BOOL BagPocketNotEmpty(Bag *bag, int pocket); /* - * u16 Bag_GetQuantity(Bag *bag, u16 itemId, HeapID heap_id) - * u16 Pocket_GetQuantity(BagPocket *slots, u32 count, u16 itemId) + * u16 BagGetQuantity(Bag *bag, u16 itemId, HeapID heap_id) + * u16 BagPocketGetQuantity(ItemSlot *slots, u32 count, u16 itemId) * - * Looks up the item in its pocket or the specified BagPocket + * Looks up the item in its pocket or the specified ItemSlot * array. If found, returns its quantity. Otherwise, * returns 0. * * @param bag: (Bag_*) Pointer to Bag - * @param slots: (Pocket_*) Pointer to BagPocket array - * @param count: (Pocket_*) Number of BagPocket in slots + * @param slots: (Pocket_*) Pointer to ItemSlot array + * @param count: (Pocket_*) Number of ItemSlot in slots * @param itemId: Item to look up * @param heap_id: (Bag_*) Heap to allocate temp buffers from * * @returns: Quantity of that item in the bag or array. */ -u16 Bag_GetQuantity(Bag *bag, u16 itemId, HeapID heap_id); -u16 Pocket_GetQuantity(BagPocket *slots, u32 count, u16 itemId); +u16 BagGetQuantity(Bag *bag, u16 itemId, HeapID heap_id); +u16 BagPocketGetQuantity(ItemSlot *slots, u32 count, u16 itemId); /* - * BAG_VIEW *CreateBagView(Bag *bag, const u8 *pockets, HeapID heap_id) + * BAG_VIEW *BagViewCreate(Bag *bag, const u8 *pockets, HeapID heap_id) * * Creates a BAG_VIEW with a specified subset of pockets. * @@ -206,24 +206,24 @@ u16 Pocket_GetQuantity(BagPocket *slots, u32 count, u16 itemId); * * @returns: Pointer to newly-allocated BAG_VIEW */ -BAG_VIEW *CreateBagView(Bag *bag, const u8 *pockets, HeapID heap_id); +BAG_VIEW *BagViewCreate(Bag *bag, const u8 *pockets, HeapID heap_id); /* - * BagPocket *Bag_GetPocketSlotN(Bag *bag, u8 pocket, int n) + * ItemSlot *BagGetNthPocket(Bag *bag, u8 pocket, int n) * - * Gets a pointer to the nth BagPocket in the given pocket. + * Gets a pointer to the nth ItemSlot in the given pocket. * * @param bag: Pointer to Bag * @param pocket: POCKET_XXX index of the pocket to search * @param n: Index of slot within pocket * - * @returns: Pointer to the requested BagPocket, or NULL if + * @returns: Pointer to the requested ItemSlot, or NULL if * out-of-bounds */ -BagPocket *Bag_GetPocketSlotN(Bag *bag, u8 pocket, int n); +ItemSlot *BagGetNthPocket(Bag *bag, u8 pocket, int n); /* - * Bag *Sav2_Bag_get(SAVEDATA *saveData) + * Bag *SaveGetBag(SAVEDATA *saveData) * * Gets the pointer to Bag loaded from the save file. * @@ -231,6 +231,6 @@ BagPocket *Bag_GetPocketSlotN(Bag *bag, u8 pocket, int n); * * @returns: Pointer to Bag */ -Bag *Sav2_Bag_get(SAVEDATA *saveData); +Bag *SaveGetBag(SAVEDATA *saveData); #endif //POKEHEARTGOLD_BAG_H diff --git a/include/bag_view.h b/include/bag_view.h index 40efa937d..1a7893cb8 100644 --- a/include/bag_view.h +++ b/include/bag_view.h @@ -20,7 +20,7 @@ enum ItemUseError { * Item slot access for bag view */ typedef struct BAG_VIEW_POCKET { - BagPocket *slots; // Points into Bag + ItemSlot *slots; // Points into Bag u8 padding[4]; u8 pocketId; // POCKET_XXX constant u8 padding2[3]; @@ -69,19 +69,19 @@ void sub_02077894(BAG_VIEW *a0, u8 a1); void sub_0207789C(BAG_VIEW *a0, SAVEDATA *a1, u8 a2, BAG_CURSOR *a3, u32 a4); /* - * void BagView_SetItem(BAG_VIEW *bagView, BagPocket *slots, u8 pocketId, u8 position) + * void BagView_SetItem(BAG_VIEW *bagView, ItemSlot *slots, u8 pocketId, u8 position) * * Sets pocket view #pocketId to slots. - * Called by CreateBagView in bag.c + * Called by BagViewCreate in bag.c * BUG: Meant to set pocket view #position. * See note in bag_view.c * * @param bagView: The BAG_VIEW instance - * @param slots: BagPocket array of pocket + * @param slots: ItemSlot array of pocket * @param pocketId: Which pocket it is * @param position: Unused */ -void BagView_SetItem(BAG_VIEW *bagView, BagPocket *slots, u8 pocketId, u8 position); +void BagView_SetItem(BAG_VIEW *bagView, ItemSlot *slots, u8 pocketId, u8 position); void sub_020778C8(BAG_VIEW *bagView); void sub_020778DC(BAG_VIEW *bagView, void *a1); void sub_020778E0(BAG_VIEW *bagView, u8 a1); diff --git a/include/item.h b/include/item.h index d4100ceee..64bc3d701 100644 --- a/include/item.h +++ b/include/item.h @@ -10,10 +10,10 @@ * Item ID must be unsigned less than ITEMS_COUNT. * Quantity must be no more than 99 for a TM/HM, or 999 in general. */ -typedef struct BagPocket { +typedef struct ItemSlot { u16 id; // from constants/items.h u16 quantity; // quantity of that item -} BagPocket; +} ItemSlot; /* * Bit array describing the effects of using the item on a @@ -97,7 +97,7 @@ typedef struct ItemData } ITEMDATA; /* - * void MoveItemSlotInList(BagPocket *slots, int from, int to, int pocket, HeapID heap_id) + * void MoveItemSlotInList(ItemSlot *slots, int from, int to, int pocket, HeapID heap_id) * * Move item slot within an array, shifting the intermediate slots. * Performs the operation out-of-place using a temporary array from the heap. @@ -108,7 +108,7 @@ typedef struct ItemData * @param pocket: Pocket ID * @param heap_id: Heap ID to allocate the temporary array from */ -void MoveItemSlotInList(BagPocket *slots, int from, int to, int pocket, HeapID heap_id); +void MoveItemSlotInList(ItemSlot *slots, int from, int to, int pocket, HeapID heap_id); /* diff --git a/src/bag.c b/src/bag.c index f6810f31b..fb845304f 100644 --- a/src/bag.c +++ b/src/bag.c @@ -3,49 +3,49 @@ #include "bag.h" #include "heap.h" -void SortPocket(BagPocket *slots, u32 count); -void PocketCompaction(BagPocket *slots, u32 count); +void SortPocket(ItemSlot *slots, u32 count); +void PocketCompaction(ItemSlot *slots, u32 count); -u32 Sav2_Bag_sizeof(void) { +u32 BagSizeof(void) { return sizeof(Bag); } -Bag *Sav2_Bag_new(HeapID heap_id) { +Bag *BagNew(HeapID heap_id) { Bag *bag = (Bag *) AllocFromHeap(heap_id, sizeof(Bag)); - Sav2_Bag_init(bag); + BagInit(bag); return bag; } -void Sav2_Bag_init(Bag *bag) { +void BagInit(Bag *bag) { MI_CpuClear16(bag, sizeof(Bag)); } -void Sav2_Bag_copy(const Bag *src, Bag *dst) { +void BagCopy(const Bag *src, Bag *dst) { MI_CpuCopy8(src, dst, sizeof(Bag)); } -u16 Bag_GetRegisteredItemSlot1(Bag *bag) { +u16 BagGetRegisteredItem1(Bag *bag) { return bag->registeredItems[0]; } -u16 Bag_GetRegisteredItemSlot2(Bag *bag) { +u16 BagGetRegisteredItem2(Bag *bag) { return bag->registeredItems[1]; } -RegisterItemResult Bag_TryRegisterItem(Bag *bag, u16 itemId) { - RegisterItemResult result = REG_BAG_FAIL; +RegisterItemResult BagTryRegisterItem(Bag *bag, u16 itemId) { + RegisterItemResult result = REG_ITEM_FAIL; if (bag->registeredItems[0] == ITEM_NONE) { bag->registeredItems[0] = itemId; - result = REG_BAG_POCKET1; + result = REG_ITEM_SLOT1; } else if (bag->registeredItems[1] == ITEM_NONE) { bag->registeredItems[1] = itemId; - result = REG_BAG_POCKET2; + result = REG_ITEM_SLOT2; } return result; } -void Bag_UnregisterItem(Bag *bag, u16 itemId) { +void BagUnregisterItem(Bag *bag, u16 itemId) { if (bag->registeredItems[1] == itemId) { bag->registeredItems[1] = ITEM_NONE; } else if (bag->registeredItems[0] == itemId) { @@ -58,7 +58,7 @@ void Bag_UnregisterItem(Bag *bag, u16 itemId) { } } -static u32 Bag_GetItemPocket(Bag *bag, u16 itemId, BagPocket **ppSlots, u32 *pCount, HeapID heap_id) { +static u32 Bag_GetItemPocket(Bag *bag, u16 itemId, ItemSlot **ppSlots, u32 *pCount, HeapID heap_id) { u32 pocket = GetItemAttr(itemId, ITEMATTR_FIELD_POCKET, heap_id); switch (pocket) { case POCKET_KEY_ITEMS: @@ -97,7 +97,7 @@ static u32 Bag_GetItemPocket(Bag *bag, u16 itemId, BagPocket **ppSlots, u32 *pCo return pocket; } -static BagPocket *Pocket_GetItemSlotForAdd(BagPocket *slots, u32 count, u16 itemId, u16 quantity, u16 maxQuantity) { +static ItemSlot *Pocket_GetItemSlotForAdd(ItemSlot *slots, u32 count, u16 itemId, u16 quantity, u16 maxQuantity) { int i; int found = -1; @@ -121,8 +121,8 @@ static BagPocket *Pocket_GetItemSlotForAdd(BagPocket *slots, u32 count, u16 item return &slots[found]; } -static BagPocket *Bag_GetItemSlotForAdd(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { - BagPocket *slots; +static ItemSlot *Bag_GetItemSlotForAdd(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { + ItemSlot *slots; u32 count; u32 pocket_id; @@ -134,12 +134,12 @@ static BagPocket *Bag_GetItemSlotForAdd(Bag *bag, u16 itemId, u16 quantity, Heap } } -BOOL Bag_HasSpaceForItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { +BOOL BagHasSpaceForItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { return Bag_GetItemSlotForAdd(bag, itemId, quantity, heap_id) != NULL; } -BOOL Bag_AddItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { - BagPocket *slot = Bag_GetItemSlotForAdd(bag, itemId, quantity, heap_id); +BOOL BagAddItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { + ItemSlot *slot = Bag_GetItemSlotForAdd(bag, itemId, quantity, heap_id); if (slot == NULL) { return FALSE; } @@ -157,7 +157,7 @@ BOOL Bag_AddItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { return TRUE; } -static BagPocket *Pocket_GetItemSlotForRemove(BagPocket *slots, u32 count, u16 itemId, u16 quantity) { +static ItemSlot *Pocket_GetItemSlotForRemove(ItemSlot *slots, u32 count, u16 itemId, u16 quantity) { int i; for (i = 0; i < count; i++) { @@ -171,8 +171,8 @@ static BagPocket *Pocket_GetItemSlotForRemove(BagPocket *slots, u32 count, u16 i return NULL; } -static BagPocket *Bag_GetItemSlotForRemove(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { - BagPocket *slots; +static ItemSlot *Bag_GetItemSlotForRemove(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { + ItemSlot *slots; u32 count; u32 pocket_id; @@ -180,8 +180,8 @@ static BagPocket *Bag_GetItemSlotForRemove(Bag *bag, u16 itemId, u16 quantity, H return Pocket_GetItemSlotForRemove(slots, count, itemId, quantity); } -BOOL Bag_TakeItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { - BagPocket *slot = Bag_GetItemSlotForRemove(bag, itemId, quantity, heap_id); +BOOL BagTakeItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { + ItemSlot *slot = Bag_GetItemSlotForRemove(bag, itemId, quantity, heap_id); if (slot == NULL) { return FALSE; } @@ -199,8 +199,8 @@ BOOL Bag_TakeItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { return TRUE; } -BOOL Pocket_TakeItem(BagPocket *slots, u32 count, u16 itemId, u16 quantity) { - BagPocket *slot = Pocket_GetItemSlotForRemove(slots, count, itemId, quantity); +BOOL BagPocketTakeItem(ItemSlot *slots, u32 count, u16 itemId, u16 quantity) { + ItemSlot *slot = Pocket_GetItemSlotForRemove(slots, count, itemId, quantity); if (slot == NULL) { return FALSE; } @@ -212,12 +212,12 @@ BOOL Pocket_TakeItem(BagPocket *slots, u32 count, u16 itemId, u16 quantity) { return TRUE; } -BOOL Bag_HasItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { +BOOL BagHasItem(Bag *bag, u16 itemId, u16 quantity, HeapID heap_id) { return Bag_GetItemSlotForRemove(bag, itemId, quantity, heap_id) != NULL; } -BOOL Bag_PocketNotEmpty(Bag *bag, int pocket) { - BagPocket *slots; +BOOL BagPocketNotEmpty(Bag *bag, int pocket) { + ItemSlot *slots; u32 count; int i; @@ -266,29 +266,29 @@ BOOL Bag_PocketNotEmpty(Bag *bag, int pocket) { return FALSE; } -u16 Bag_GetQuantity(Bag *bag, u16 itemId, HeapID heap_id) { - BagPocket *slot = Bag_GetItemSlotForRemove(bag, itemId, 1, heap_id); +u16 BagGetQuantity(Bag *bag, u16 itemId, HeapID heap_id) { + ItemSlot *slot = Bag_GetItemSlotForRemove(bag, itemId, 1, heap_id); if (slot == NULL) { return 0; } return slot->quantity; } -u16 Pocket_GetQuantity(BagPocket *slots, u32 count, u16 itemId) { - BagPocket *slot = Pocket_GetItemSlotForRemove(slots, count, itemId, 1); +u16 BagPocketGetQuantity(ItemSlot *slots, u32 count, u16 itemId) { + ItemSlot *slot = Pocket_GetItemSlotForRemove(slots, count, itemId, 1); if (slot == NULL) { return 0; } return slot->quantity; } -static void SwapItemSlots(BagPocket *a, BagPocket *b) { - BagPocket c = *a; +static void SwapItemSlots(ItemSlot *a, ItemSlot *b) { + ItemSlot c = *a; *a = *b; *b = c; } -static void PocketCompaction(BagPocket *slots, u32 count) { +static void PocketCompaction(ItemSlot *slots, u32 count) { int i, j; for (i = 0; i < count - 1; i++) { for (j = i + 1; j < count; j++) { @@ -299,7 +299,7 @@ static void PocketCompaction(BagPocket *slots, u32 count) { } } -static void SortPocket(BagPocket *slots, u32 count) { +static void SortPocket(ItemSlot *slots, u32 count) { int i, j; for (i = 0; i < count - 1; i++) { for (j = i + 1; j < count; j++) { @@ -310,7 +310,7 @@ static void SortPocket(BagPocket *slots, u32 count) { } } -BAG_VIEW *CreateBagView(Bag *bag, const u8 *pockets, HeapID heap_id) { +BAG_VIEW *BagViewCreate(Bag *bag, const u8 *pockets, HeapID heap_id) { int i; BAG_VIEW *ret = BagView_New(heap_id); for (i = 0; pockets[i] != POCKET_BAG_VIEW_END; i++) { @@ -344,8 +344,8 @@ BAG_VIEW *CreateBagView(Bag *bag, const u8 *pockets, HeapID heap_id) { return ret; } -BagPocket *Bag_GetPocketSlotN(Bag *bag, u8 pocket, int n) { - BagPocket *slots; +ItemSlot *BagGetNthPocket(Bag *bag, u8 pocket, int n) { + ItemSlot *slots; u32 count; switch (pocket) { @@ -389,7 +389,7 @@ BagPocket *Bag_GetPocketSlotN(Bag *bag, u8 pocket, int n) { return &slots[n]; } -Bag *Sav2_Bag_get(SAVEDATA *saveData) { +Bag *SaveGetBag(SAVEDATA *saveData) { return SavArray_get(saveData, SAVE_BAG); } diff --git a/src/bag_view.c b/src/bag_view.c index 2a12dd8b8..708175761 100644 --- a/src/bag_view.c +++ b/src/bag_view.c @@ -35,7 +35,7 @@ void sub_0207789C(BAG_VIEW *a0, SAVEDATA *a1, u8 a2, BAG_CURSOR *a3, u32 a4) { a0->unk_66 = 0; } -void BagView_SetItem(BAG_VIEW *bagView, BagPocket *slots, u8 pocketId, u8 position) { +void BagView_SetItem(BAG_VIEW *bagView, ItemSlot *slots, u8 pocketId, u8 position) { // Bug: position was likely intended to force a particular display order. // Likely intended as an index to bagView->pockets. // However, this variable is unused. diff --git a/src/field_use_item.c b/src/field_use_item.c index d31b42d49..f43b41d6a 100644 --- a/src/field_use_item.c +++ b/src/field_use_item.c @@ -217,7 +217,7 @@ static void ItemMenuUseFunc_HealingItem(struct ItemMenuUseData *data, const stru struct UseItemInPartyTaskEnv *usedat = AllocFromHeap(11, sizeof(struct UseItemInPartyTaskEnv)); memset(usedat, 0, sizeof(struct UseItemInPartyTaskEnv)); usedat->party = SavArray_PlayerParty_get(fsys->savedata); - usedat->bag = Sav2_Bag_get(fsys->savedata); + usedat->bag = SaveGetBag(fsys->savedata); usedat->mailbox = Sav2_Mailbox_get(fsys->savedata); usedat->options = Sav2_PlayerData_GetOptionsAddr(fsys->savedata); usedat->unk10 = sub_020270C4(fsys->savedata); @@ -340,7 +340,7 @@ static void ItemMenuUseFunc_TMHM(struct ItemMenuUseData *data, const struct Item struct UseItemInPartyTaskEnv *usedat = AllocFromHeap(11, sizeof(struct UseItemInPartyTaskEnv)); memset(usedat, 0, sizeof(struct UseItemInPartyTaskEnv)); usedat->party = SavArray_PlayerParty_get(fsys->savedata); - usedat->bag = Sav2_Bag_get(fsys->savedata); + usedat->bag = SaveGetBag(fsys->savedata); usedat->mailbox = Sav2_Mailbox_get(fsys->savedata); usedat->options = Sav2_PlayerData_GetOptionsAddr(fsys->savedata); usedat->unk18 = &env->unk_0370; @@ -409,7 +409,7 @@ static void ItemMenuUseFunc_Honey(struct ItemMenuUseData *data, const struct Ite env->atexit_TaskFunc = Task_HoneyOrSweetScent; env->atexit_TaskEnv = honey_work; env->state = 12; - Bag_TakeItem(Sav2_Bag_get(fsys->savedata), data->itemId, 1, 11); + BagTakeItem(SaveGetBag(fsys->savedata), data->itemId, 1, 11); } static void ItemMenuUseFunc_OldRod(struct ItemMenuUseData *data, const struct ItemCheckUseData *dat2) { @@ -530,7 +530,7 @@ static void ItemMenuUseFunc_EvoStone(struct ItemMenuUseData *data, const struct usedat = AllocFromHeap(11, sizeof(struct UseItemInPartyTaskEnv)); memset(usedat, 0, sizeof(struct UseItemInPartyTaskEnv)); usedat->party = SavArray_PlayerParty_get(fsys->savedata); - usedat->bag = Sav2_Bag_get(fsys->savedata); + usedat->bag = SaveGetBag(fsys->savedata); usedat->mailbox = Sav2_Mailbox_get(fsys->savedata); usedat->options = Sav2_PlayerData_GetOptionsAddr(fsys->savedata); usedat->unk10 = sub_020270C4(fsys->savedata); @@ -561,7 +561,7 @@ static void ItemMenuUseFunc_EscapeRope(struct ItemMenuUseData *data, const struc env->atexit_TaskFunc = Task_JumpToFieldEscapeRope; env->atexit_TaskEnv = NULL; env->state = 12; - Bag_TakeItem(Sav2_Bag_get(fsys->savedata), data->itemId, 1, 11); + BagTakeItem(SaveGetBag(fsys->savedata), data->itemId, 1, 11); } static u32 ItemCheckUseFunc_EscapeRope(const struct ItemCheckUseData *data) { @@ -764,9 +764,9 @@ int UseRegisteredItemButtonInField(FieldSystem *fsys, u8 slot) { return 0; } if (slot == 1) { - itemId = Bag_GetRegisteredItemSlot1(Sav2_Bag_get(fsys->savedata)); + itemId = BagGetRegisteredItem1(SaveGetBag(fsys->savedata)); } else { - itemId = Bag_GetRegisteredItemSlot2(Sav2_Bag_get(fsys->savedata)); + itemId = BagGetRegisteredItem2(SaveGetBag(fsys->savedata)); } if (itemId == ITEM_DOWSING_MCHN && ov01_021F6B00(fsys) == 4) { return 0; diff --git a/src/item.c b/src/item.c index ab5df884b..00639cb13 100644 --- a/src/item.c +++ b/src/item.c @@ -665,14 +665,14 @@ static const u16 sItemNarcIds[][4] = { { NARC_item_data_0513_bin, NARC_item_icon_item_icon_757_NCGR, NARC_item_icon_item_icon_758_NCLR, AGB_ITEM_NONE }, // ITEM_ENIGMA_STONE }; -void MoveItemSlotInList(BagPocket *slots, int from, int to, int pocket, HeapID heap_id) { - BagPocket *buf; +void MoveItemSlotInList(ItemSlot *slots, int from, int to, int pocket, HeapID heap_id) { + ItemSlot *buf; int i, j; if (from == to) { return; } - buf = AllocFromHeap(heap_id, sPocketCounts[pocket] * sizeof(BagPocket)); + buf = AllocFromHeap(heap_id, sPocketCounts[pocket] * sizeof(ItemSlot)); j = 0; for (i = 0; i < sPocketCounts[pocket]; i++) { diff --git a/src/save_arrays.c b/src/save_arrays.c index 148bed38e..65e11bd39 100644 --- a/src/save_arrays.c +++ b/src/save_arrays.c @@ -65,8 +65,8 @@ const struct SaveChunkHeader gSaveChunkHeaders[] = { }, { SAVE_BAG, 0, - (SAVESIZEFN)Sav2_Bag_sizeof, - (SAVEINITFN)Sav2_Bag_init + (SAVESIZEFN)BagSizeof, + (SAVEINITFN)BagInit }, { SAVE_FLAGS, 0, diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 91dcfc606..383587601 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -2958,7 +2958,7 @@ BOOL ScrCmd_285(SCRIPTCONTEXT *ctx) { BOOL ScrCmd_335(SCRIPTCONTEXT *ctx) { u16 pocket = ScriptGetVar(ctx); u16 *p_ret = ScriptGetVarPointer(ctx); - *p_ret = Bag_PocketNotEmpty(Sav2_Bag_get(ctx->fsys->savedata), pocket); + *p_ret = BagPocketNotEmpty(SaveGetBag(ctx->fsys->savedata), pocket); return FALSE; } diff --git a/src/scrcmd_daycare.c b/src/scrcmd_daycare.c index 09ee9f671..c8c8b462a 100644 --- a/src/scrcmd_daycare.c +++ b/src/scrcmd_daycare.c @@ -216,8 +216,8 @@ BOOL ScrCmd_DayCareSanitizeMon(SCRIPTCONTEXT* ctx) { u32 held_item = GetMonData(party_mon, MON_DATA_HELD_ITEM, NULL); if (held_item == ITEM_GRISEOUS_ORB) { - Bag* bag = Sav2_Bag_get(fsys->savedata); - if (!Bag_AddItem(bag, ITEM_GRISEOUS_ORB, 1, 11)) { + Bag* bag = SaveGetBag(fsys->savedata); + if (!BagAddItem(bag, ITEM_GRISEOUS_ORB, 1, 11)) { *ret_ptr = 0xFF; return FALSE; } diff --git a/src/scrcmd_fossils.c b/src/scrcmd_fossils.c index c2baeef26..ad849f047 100644 --- a/src/scrcmd_fossils.c +++ b/src/scrcmd_fossils.c @@ -20,7 +20,7 @@ BOOL ScrCmd_CountFossils(SCRIPTCONTEXT* ctx) { u8 i; u16 total; for (i = 0, total = 0; i < NELEMS(sFossilPokemonMap); i++) { - total += Bag_GetQuantity(Sav2_Bag_get(sav_ptr->savedata), sFossilPokemonMap[i][0], 4); + total += BagGetQuantity(SaveGetBag(sav_ptr->savedata), sFossilPokemonMap[i][0], 4); } *ret_ptr = total; @@ -54,7 +54,7 @@ BOOL ScrCmd_GetFossilMinimumAmount(SCRIPTCONTEXT* ctx) { u8 i; u16 total; for (i = 0, total = 0; i < NELEMS(sFossilPokemonMap); i++) { - total += Bag_GetQuantity(Sav2_Bag_get(sav_ptr->savedata), sFossilPokemonMap[i][0], 4); + total += BagGetQuantity(SaveGetBag(sav_ptr->savedata), sFossilPokemonMap[i][0], 4); if (total >= needed_amount) { *ret_ptr1 = sFossilPokemonMap[i][0]; *ret_ptr2 = i; diff --git a/src/scrcmd_items.c b/src/scrcmd_items.c index 2381a13dd..854c91d3d 100644 --- a/src/scrcmd_items.c +++ b/src/scrcmd_items.c @@ -10,8 +10,8 @@ BOOL ScrCmd_GiveItem(SCRIPTCONTEXT* ctx) { u16 quantity = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); u16* ret_ptr = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); - Bag* bag = Sav2_Bag_get(sav_ptr->savedata); - *ret_ptr = Bag_AddItem(bag, item_id, quantity, 4); + Bag* bag = SaveGetBag(sav_ptr->savedata); + *ret_ptr = BagAddItem(bag, item_id, quantity, 4); return FALSE; } @@ -22,8 +22,8 @@ BOOL ScrCmd_TakeItem(SCRIPTCONTEXT* ctx) { u16 quantity = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); u16* ret_ptr = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); - Bag* bag = Sav2_Bag_get(sav_ptr->savedata); - *ret_ptr = Bag_TakeItem(bag, item_id, quantity, 4); + Bag* bag = SaveGetBag(sav_ptr->savedata); + *ret_ptr = BagTakeItem(bag, item_id, quantity, 4); return FALSE; } @@ -34,8 +34,8 @@ BOOL ScrCmd_HasSpaceForItem(SCRIPTCONTEXT* ctx) { u16 quantity = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); u16* ret_ptr = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); - Bag* bag = Sav2_Bag_get(sav_ptr->savedata); - *ret_ptr = Bag_HasSpaceForItem(bag, item_id, quantity, 4); + Bag* bag = SaveGetBag(sav_ptr->savedata); + *ret_ptr = BagHasSpaceForItem(bag, item_id, quantity, 4); return FALSE; } @@ -46,8 +46,8 @@ BOOL ScrCmd_HasItem(SCRIPTCONTEXT* ctx) { u16 quantity = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); u16* ret_ptr = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); - Bag* bag = Sav2_Bag_get(sav_ptr->savedata); - *ret_ptr = Bag_HasItem(bag, item_id, quantity, 11); + Bag* bag = SaveGetBag(sav_ptr->savedata); + *ret_ptr = BagHasItem(bag, item_id, quantity, 11); return FALSE; } @@ -57,8 +57,8 @@ BOOL ScrCmd_GetItemQuantity(SCRIPTCONTEXT* ctx) { u16 item_id = VarGet(ctx->fsys, ScriptReadHalfword(ctx)); u16* ret_ptr = GetVarPointer(ctx->fsys, ScriptReadHalfword(ctx)); - Bag* bag = Sav2_Bag_get(sav_ptr->savedata); - *ret_ptr = Bag_GetQuantity(bag, item_id, 11); + Bag* bag = SaveGetBag(sav_ptr->savedata); + *ret_ptr = BagGetQuantity(bag, item_id, 11); return FALSE; } diff --git a/src/scrcmd_pokemon_misc.c b/src/scrcmd_pokemon_misc.c index adeb5ef04..6f66469b2 100644 --- a/src/scrcmd_pokemon_misc.c +++ b/src/scrcmd_pokemon_misc.c @@ -409,7 +409,7 @@ BOOL ScrCmd_CommSanitizeParty(SCRIPTCONTEXT *ctx) { } } if (count > 0) { - if (Bag_AddItem(Sav2_Bag_get(fsys->savedata), ITEM_GRISEOUS_ORB, count, 4) == FALSE) { + if (BagAddItem(SaveGetBag(fsys->savedata), ITEM_GRISEOUS_ORB, count, 4) == FALSE) { *success = 255; return FALSE; }