izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename ActionParam to ItemAction (#1069)

Browse Source 
* Rename `ActionParam` to `ItemParam`

* namefixer

* ItemAction

* merge issues

* merge

* fixes

* format

* renames

* format

* <= PLAYER_IA_MINUS1

* fixes

* more fixes

* e

* revew

* simple replace in namefixer

* fixes

* merge fixes

* merge fixes
This commit is contained in:
Anghelo Carvajal
2022-11-06 21:31:55 -03:00
committed by GitHub
parent a8c7a5bb89
commit 65cf949bc0
73 changed files with 548 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+11 -11
View File
@@ -677,13 +677,13 @@ PosRot* Actor_GetWorldPosShapeRot(PosRot* dest, Actor* actor);
s32 func_800B83F8(Actor* actor, Player* player, s32 flag);
s32 Actor_ProcessTalkRequest(Actor* actor, GameState* gameState);
s32 func_800B8500(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, PlayerActionParam exchangeItemId);
s32 func_800B85E0(Actor* actor, PlayState* play, f32 radius, PlayerActionParam exchangeItemId);
s32 func_800B8500(Actor* actor, PlayState* play, f32 xzRange, f32 yRange, PlayerItemAction exchangeItemId);
s32 func_800B85E0(Actor* actor, PlayState* play, f32 radius, PlayerItemAction exchangeItemId);
s32 func_800B8614(Actor* actor, PlayState* play, f32 radius);
s32 func_800B863C(Actor* actor, PlayState* play);
s32 Actor_TextboxIsClosing(Actor* actor, PlayState* play);
s32 Actor_ChangeFocus(Actor* actor1, PlayState* play, Actor* actor2);
PlayerActionParam Player_GetExchangeItemId(PlayState* play);
PlayerItemAction Player_GetExchangeItemId(PlayState* play);
s32 func_800B8718(Actor* actor, GameState* gameState);
s32 func_800B874C(Actor* actor, PlayState* play, f32 xzRange, f32 yRange);
s32 func_800B8804(Actor* actor, PlayState* play, f32 xzRange);
@@ -1801,14 +1801,14 @@ s32 Player_IsGoronOrDeku(Player* player);
s32 func_801234D4(PlayState* play);
s32 func_80123590(PlayState* play, Actor* actor);
ItemId func_8012364C(PlayState* play, Player* player, s32 arg2);
PlayerActionParam func_80123810(PlayState* play);
PlayerModelGroup Player_ActionToModelGroup(Player* player, PlayerActionParam actionParam);
PlayerItemAction func_80123810(PlayState* play);
PlayerModelGroup Player_ActionToModelGroup(Player* player, PlayerItemAction itemAction);
void Player_SetModelsForHoldingShield(Player* player);
void Player_SetModels(Player* player, PlayerModelGroup modelGroup);
void Player_SetModelGroup(Player* player, PlayerModelGroup modelGroup);
void func_80123C58(Player* player);
void Player_SetEquipmentData(PlayState* play, Player* player);
void Player_UpdateBottleHeld(PlayState* play, Player* player, ItemId itemId, PlayerActionParam actionParam);
void Player_UpdateBottleHeld(PlayState* play, Player* player, ItemId itemId, PlayerItemAction itemAction);
void func_80123DA4(Player* player);
void func_80123DC0(Player* player);
void func_80123E90(PlayState* play, Actor* actor);
@@ -1821,16 +1821,16 @@ s32 Player_HasMirrorShieldEquipped(PlayState* play);
s32 Player_IsHoldingMirrorShield(PlayState* play);
s32 Player_IsHoldingHookshot(Player* player);
s32 func_801240DC(Player* player);
s32 func_80124110(Player* player, PlayerActionParam actionParam);
s32 func_80124110(Player* player, PlayerItemAction itemAction);
s32 func_80124148(Player* player);
s32 Player_ActionToMeleeWeapon(PlayerActionParam actionParam);
s32 Player_ActionToMeleeWeapon(PlayerItemAction itemAction);
s32 Player_GetMeleeWeaponHeld(Player* player);
s32 Player_IsHoldingTwoHandedWeapon(Player* player);
s32 Player_ActionToBottle(Player* player, PlayerActionParam actionParam);
s32 Player_ActionToBottle(Player* player, PlayerItemAction itemAction);
s32 Player_GetBottleHeld(Player* Player);
s32 Player_ActionToExplosive(Player* player, PlayerActionParam actionParam);
s32 Player_ActionToExplosive(Player* player, PlayerItemAction itemAction);
s32 Player_GetExplosiveHeld(Player* player);
s32 Player_ActionToSword(Actor* actor, PlayerActionParam actionParam);
s32 Player_ActionToSword(Actor* actor, PlayerItemAction itemAction);
s32 func_801242B4(Player* player);
s32 Player_GetEnvTimerType(PlayState* play);
void func_80124420(Player* player);
include/z64.h
+1 -1
View File
@@ -1048,7 +1048,7 @@ struct PlayState {
/* 0x18788 */ void (*talkWithPlayer)(struct PlayState* play, Actor* actor);
/* 0x1878C */ void (*unk_1878C)(struct PlayState* play);
/* 0x18790 */ void (*unk_18790)(struct PlayState* play, s16 arg1);
/* 0x18794 */ PlayerActionParam (*unk_18794)(struct PlayState* play, Player* player, ItemId itemId);
/* 0x18794 */ PlayerItemAction (*unk_18794)(struct PlayState* play, Player* player, ItemId itemId);
/* 0x18798 */ s32 (*setPlayerTalkAnim)(struct PlayState* play, LinkAnimationHeader* talkAnim, s32 animMode);
/* 0x1879C */ s16 playerActorCsIds[10];
/* 0x187B0 */ MtxF viewProjectionMtxF;
include/z64player.h
+90 -90
View File
@@ -79,93 +79,93 @@ typedef enum {
/* 4 */ PLAYER_ENV_TIMER_UNDERWATER_FREE
} PlayerEnvTimerType;
typedef enum PlayerActionParam {
/* -1 */ PLAYER_AP_MINUS1 = -1,
/* 0x00 */ PLAYER_AP_NONE,
/* 0x01 */ PLAYER_AP_LAST_USED,
/* 0x02 */ PLAYER_AP_FISHING_ROD,
/* 0x03 */ PLAYER_AP_SWORD_KOKIRI,
/* 0x04 */ PLAYER_AP_SWORD_RAZOR,
/* 0x05 */ PLAYER_AP_SWORD_GILDED,
/* 0x06 */ PLAYER_AP_SWORD_GREAT_FAIRY,
/* 0x07 */ PLAYER_AP_STICK,
/* 0x08 */ PLAYER_AP_ZORA_FINS,
/* 0x09 */ PLAYER_AP_BOW,
/* 0x0A */ PLAYER_AP_BOW_FIRE,
/* 0x0B */ PLAYER_AP_BOW_ICE,
/* 0x0C */ PLAYER_AP_BOW_LIGHT,
/* 0x0D */ PLAYER_AP_HOOKSHOT,
/* 0x0E */ PLAYER_AP_BOMB,
/* 0x0F */ PLAYER_AP_POWDER_KEG,
/* 0x10 */ PLAYER_AP_BOMBCHU,
/* 0x11 */ PLAYER_AP_11,
/* 0x12 */ PLAYER_AP_NUT,
/* 0x13 */ PLAYER_AP_PICTO_BOX,
/* 0x14 */ PLAYER_AP_OCARINA,
/* 0x15 */ PLAYER_AP_BOTTLE,
/* 0x16 */ PLAYER_AP_BOTTLE_FISH,
/* 0x17 */ PLAYER_AP_BOTTLE_SPRING_WATER,
/* 0x18 */ PLAYER_AP_BOTTLE_HOT_SPRING_WATER,
/* 0x19 */ PLAYER_AP_BOTTLE_ZORA_EGG,
/* 0x1A */ PLAYER_AP_BOTTLE_DEKU_PRINCESS,
/* 0x1B */ PLAYER_AP_BOTTLE_GOLD_DUST,
/* 0x1C */ PLAYER_AP_BOTTLE_1C,
/* 0x1D */ PLAYER_AP_BOTTLE_SEAHORSE,
/* 0x1E */ PLAYER_AP_BOTTLE_MUSHROOM,
/* 0x1F */ PLAYER_AP_BOTTLE_HYLIAN_LOACH,
/* 0x20 */ PLAYER_AP_BOTTLE_BUG,
/* 0x21 */ PLAYER_AP_BOTTLE_POE,
/* 0x22 */ PLAYER_AP_BOTTLE_BIG_POE,
/* 0x23 */ PLAYER_AP_BOTTLE_POTION_RED,
/* 0x24 */ PLAYER_AP_BOTTLE_POTION_BLUE,
/* 0x25 */ PLAYER_AP_BOTTLE_POTION_GREEN,
/* 0x26 */ PLAYER_AP_BOTTLE_MILK,
/* 0x27 */ PLAYER_AP_BOTTLE_MILK_HALF,
/* 0x28 */ PLAYER_AP_BOTTLE_CHATEAU,
/* 0x29 */ PLAYER_AP_BOTTLE_FAIRY,
/* 0x2A */ PLAYER_AP_MOON_TEAR,
/* 0x2B */ PLAYER_AP_DEED_LAND,
/* 0x2C */ PLAYER_AP_ROOM_KEY,
/* 0x2D */ PLAYER_AP_LETTER_TO_KAFEI,
/* 0x2E */ PLAYER_AP_MAGIC_BEANS,
/* 0x2F */ PLAYER_AP_DEED_SWAMP,
/* 0x30 */ PLAYER_AP_DEED_MOUNTAIN,
/* 0x31 */ PLAYER_AP_DEED_OCEAN,
/* 0x32 */ PLAYER_AP_32,
/* 0x33 */ PLAYER_AP_LETTER_MAMA,
/* 0x34 */ PLAYER_AP_34,
/* 0x35 */ PLAYER_AP_35,
/* 0x36 */ PLAYER_AP_PENDANT_OF_MEMORIES,
/* 0x37 */ PLAYER_AP_37,
/* 0x38 */ PLAYER_AP_38,
/* 0x39 */ PLAYER_AP_39,
/* 0x3A */ PLAYER_AP_MASK_TRUTH,
/* 0x3B */ PLAYER_AP_MASK_KAFEIS_MASK,
/* 0x3C */ PLAYER_AP_MASK_ALL_NIGHT,
/* 0x3D */ PLAYER_AP_MASK_BUNNY,
/* 0x3E */ PLAYER_AP_MASK_KEATON,
/* 0x3F */ PLAYER_AP_MASK_GARO,
/* 0x40 */ PLAYER_AP_MASK_ROMANI,
/* 0x41 */ PLAYER_AP_MASK_CIRCUS_LEADER,
/* 0x42 */ PLAYER_AP_MASK_POSTMAN,
/* 0x43 */ PLAYER_AP_MASK_COUPLE,
/* 0x44 */ PLAYER_AP_MASK_GREAT_FAIRY,
/* 0x45 */ PLAYER_AP_MASK_GIBDO,
/* 0x46 */ PLAYER_AP_MASK_DON_GERO,
/* 0x47 */ PLAYER_AP_MASK_KAMARO,
/* 0x48 */ PLAYER_AP_MASK_CAPTAIN,
/* 0x49 */ PLAYER_AP_MASK_STONE,
/* 0x4A */ PLAYER_AP_MASK_BREMEN,
/* 0x4B */ PLAYER_AP_MASK_BLAST,
/* 0x4C */ PLAYER_AP_MASK_SCENTS,
/* 0x4D */ PLAYER_AP_MASK_GIANT,
/* 0x4E */ PLAYER_AP_MASK_FIERCE_DEITY,
/* 0x4F */ PLAYER_AP_MASK_GORON,
/* 0x50 */ PLAYER_AP_MASK_ZORA,
/* 0x51 */ PLAYER_AP_MASK_DEKU,
/* 0x52 */ PLAYER_AP_LENS,
/* 0x53 */ PLAYER_AP_MAX
} PlayerActionParam;
typedef enum PlayerItemAction {
/* -1 */ PLAYER_IA_MINUS1 = -1,
/* 0x00 */ PLAYER_IA_NONE,
/* 0x01 */ PLAYER_IA_LAST_USED,
/* 0x02 */ PLAYER_IA_FISHING_ROD,
/* 0x03 */ PLAYER_IA_SWORD_KOKIRI,
/* 0x04 */ PLAYER_IA_SWORD_RAZOR,
/* 0x05 */ PLAYER_IA_SWORD_GILDED,
/* 0x06 */ PLAYER_IA_SWORD_GREAT_FAIRY,
/* 0x07 */ PLAYER_IA_STICK,
/* 0x08 */ PLAYER_IA_ZORA_FINS,
/* 0x09 */ PLAYER_IA_BOW,
/* 0x0A */ PLAYER_IA_BOW_FIRE,
/* 0x0B */ PLAYER_IA_BOW_ICE,
/* 0x0C */ PLAYER_IA_BOW_LIGHT,
/* 0x0D */ PLAYER_IA_HOOKSHOT,
/* 0x0E */ PLAYER_IA_BOMB,
/* 0x0F */ PLAYER_IA_POWDER_KEG,
/* 0x10 */ PLAYER_IA_BOMBCHU,
/* 0x11 */ PLAYER_IA_11,
/* 0x12 */ PLAYER_IA_NUT,
/* 0x13 */ PLAYER_IA_PICTO_BOX,
/* 0x14 */ PLAYER_IA_OCARINA,
/* 0x15 */ PLAYER_IA_BOTTLE,
/* 0x16 */ PLAYER_IA_BOTTLE_FISH,
/* 0x17 */ PLAYER_IA_BOTTLE_SPRING_WATER,
/* 0x18 */ PLAYER_IA_BOTTLE_HOT_SPRING_WATER,
/* 0x19 */ PLAYER_IA_BOTTLE_ZORA_EGG,
/* 0x1A */ PLAYER_IA_BOTTLE_DEKU_PRINCESS,
/* 0x1B */ PLAYER_IA_BOTTLE_GOLD_DUST,
/* 0x1C */ PLAYER_IA_BOTTLE_1C,
/* 0x1D */ PLAYER_IA_BOTTLE_SEAHORSE,
/* 0x1E */ PLAYER_IA_BOTTLE_MUSHROOM,
/* 0x1F */ PLAYER_IA_BOTTLE_HYLIAN_LOACH,
/* 0x20 */ PLAYER_IA_BOTTLE_BUG,
/* 0x21 */ PLAYER_IA_BOTTLE_POE,
/* 0x22 */ PLAYER_IA_BOTTLE_BIG_POE,
/* 0x23 */ PLAYER_IA_BOTTLE_POTION_RED,
/* 0x24 */ PLAYER_IA_BOTTLE_POTION_BLUE,
/* 0x25 */ PLAYER_IA_BOTTLE_POTION_GREEN,
/* 0x26 */ PLAYER_IA_BOTTLE_MILK,
/* 0x27 */ PLAYER_IA_BOTTLE_MILK_HALF,
/* 0x28 */ PLAYER_IA_BOTTLE_CHATEAU,
/* 0x29 */ PLAYER_IA_BOTTLE_FAIRY,
/* 0x2A */ PLAYER_IA_MOON_TEAR,
/* 0x2B */ PLAYER_IA_DEED_LAND,
/* 0x2C */ PLAYER_IA_ROOM_KEY,
/* 0x2D */ PLAYER_IA_LETTER_TO_KAFEI,
/* 0x2E */ PLAYER_IA_MAGIC_BEANS,
/* 0x2F */ PLAYER_IA_DEED_SWAMP,
/* 0x30 */ PLAYER_IA_DEED_MOUNTAIN,
/* 0x31 */ PLAYER_IA_DEED_OCEAN,
/* 0x32 */ PLAYER_IA_32,
/* 0x33 */ PLAYER_IA_LETTER_MAMA,
/* 0x34 */ PLAYER_IA_34,
/* 0x35 */ PLAYER_IA_35,
/* 0x36 */ PLAYER_IA_PENDANT_OF_MEMORIES,
/* 0x37 */ PLAYER_IA_37,
/* 0x38 */ PLAYER_IA_38,
/* 0x39 */ PLAYER_IA_39,
/* 0x3A */ PLAYER_IA_MASK_TRUTH,
/* 0x3B */ PLAYER_IA_MASK_KAFEIS_MASK,
/* 0x3C */ PLAYER_IA_MASK_ALL_NIGHT,
/* 0x3D */ PLAYER_IA_MASK_BUNNY,
/* 0x3E */ PLAYER_IA_MASK_KEATON,
/* 0x3F */ PLAYER_IA_MASK_GARO,
/* 0x40 */ PLAYER_IA_MASK_ROMANI,
/* 0x41 */ PLAYER_IA_MASK_CIRCUS_LEADER,
/* 0x42 */ PLAYER_IA_MASK_POSTMAN,
/* 0x43 */ PLAYER_IA_MASK_COUPLE,
/* 0x44 */ PLAYER_IA_MASK_GREAT_FAIRY,
/* 0x45 */ PLAYER_IA_MASK_GIBDO,
/* 0x46 */ PLAYER_IA_MASK_DON_GERO,
/* 0x47 */ PLAYER_IA_MASK_KAMARO,
/* 0x48 */ PLAYER_IA_MASK_CAPTAIN,
/* 0x49 */ PLAYER_IA_MASK_STONE,
/* 0x4A */ PLAYER_IA_MASK_BREMEN,
/* 0x4B */ PLAYER_IA_MASK_BLAST,
/* 0x4C */ PLAYER_IA_MASK_SCENTS,
/* 0x4D */ PLAYER_IA_MASK_GIANT,
/* 0x4E */ PLAYER_IA_MASK_FIERCE_DEITY,
/* 0x4F */ PLAYER_IA_MASK_GORON,
/* 0x50 */ PLAYER_IA_MASK_ZORA,
/* 0x51 */ PLAYER_IA_MASK_DEKU,
/* 0x52 */ PLAYER_IA_LENS,
/* 0x53 */ PLAYER_IA_MAX
} PlayerItemAction;
typedef enum PlayerMeleeWeaponAnimation {
/* 0 */ PLAYER_MWA_FORWARD_SLASH_1H, // Vertical one-handed slash
@@ -814,10 +814,10 @@ typedef struct Player {
/* 0x144 */ s8 currentShield;
/* 0x145 */ s8 currentBoots;
/* 0x146 */ s8 heldItemButton;
/* 0x147 */ s8 itemActionParam; // PlayerActionParam enum
/* 0x147 */ s8 heldItemAction; // PlayerItemAction enum
/* 0x148 */ u8 heldItemId; // ItemId enum
/* 0x149 */ s8 prevBoots;
/* 0x14A */ s8 heldItemActionParam; // PlayerActionParam enum
/* 0x14A */ s8 itemAction; // PlayerItemAction enum
/* 0x14B */ u8 transformation; // PlayerTransformation enum
/* 0x14C */ u8 modelGroup; // PlayerModelGroup enum
/* 0x14D */ u8 nextModelGroup;
@@ -929,7 +929,7 @@ typedef struct Player {
/* 0xA80 */ Actor* tatlActor;
/* 0xA84 */ s16 tatlTextId;
/* 0xA86 */ s8 unk_A86; // actorCutsceneIndex?
/* 0xA87 */ s8 exchangeItemId; // PlayerActionParam enum
/* 0xA87 */ s8 exchangeItemId; // PlayerItemAction enum
/* 0xA88 */ Actor* talkActor;
/* 0xA8C */ f32 talkActorDistance;
/* 0xA90 */ Actor* unk_A90;