mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

Rename "ITEM_LAST_USED" (#1572)

Browse source 
* rename

* format

* remove formatter changes

* change model group comments
This commit is contained in:
fig02 2023-11-07 14:11:59 -05:00 • committed by GitHub
parent 042a5c5530
commit 836adb83ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 91 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_En_Torch2/z_en_torch2.c
View file

@ -97,7 +97,7 @@ void EnTorch2_Init(Actor* thisx, PlayState* play2) {
sInput.cur.stick_x = sInput.cur.stick_y = 0;
this->currentShield = PLAYER_SHIELD_HYLIAN;
this->heldItemAction = this->heldItemId = PLAYER_IA_SWORD_MASTER;
Player_SetModelGroup(this, PLAYER_MODELGROUP_SWORD);
Player_SetModelGroup(this, PLAYER_MODELGROUP_SWORD_AND_SHIELD);
play->playerInit(this, play, &gDarkLinkSkel);
this->actor.naviEnemyId = NAVI_ENEMY_DARK_LINK;
this->cylinder.base.acFlags = AC_ON | AC_TYPE_PLAYER;

16
src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -1245,7 +1245,7 @@ static s8 sItemActions[] = {
static s32 (*sItemActionUpdateFuncs[])(Player* this, PlayState* play) = {
func_8083485C, // PLAYER_IA_NONE
func_8083485C, // PLAYER_IA_LAST_USED
func_8083485C, // PLAYER_IA_SWORD_CS
func_8083485C, // PLAYER_IA_FISHING_POLE
func_808349DC, // PLAYER_IA_SWORD_MASTER
func_808349DC, // PLAYER_IA_SWORD_KOKIRI
@ -1315,7 +1315,7 @@ static s32 (*sItemActionUpdateFuncs[])(Player* this, PlayState* play) = {
static void (*sItemActionInitFuncs[])(PlayState* play, Player* this) = {
func_80833770, // PLAYER_IA_NONE
func_80833770, // PLAYER_IA_LAST_USED
func_80833770, // PLAYER_IA_SWORD_CS
func_80833770, // PLAYER_IA_FISHING_POLE
func_80833770, // PLAYER_IA_SWORD_MASTER
func_80833770, // PLAYER_IA_SWORD_KOKIRI
@ -2167,8 +2167,8 @@ void Player_InitItemActionWithAnim(PlayState* play, Player* this, s8 itemAction)
s8 Player_ItemToItemAction(s32 item) {
if (item >= ITEM_NONE_FE) {
return PLAYER_IA_NONE;
} else if (item == ITEM_LAST_USED) {
return PLAYER_IA_LAST_USED;
} else if (item == ITEM_SWORD_CS) {
return PLAYER_IA_SWORD_CS;
} else if (item == ITEM_FISHING_POLE) {
return PLAYER_IA_FISHING_POLE;
} else {
@ -3344,7 +3344,7 @@ void func_80836448(PlayState* play, Player* this, LinkAnimationHeader* anim) {
int Player_CanUpdateItems(Player* this) {
return (!(Player_Action_808458D0 == this->actionFunc) ||
((this->stateFlags1 & PLAYER_STATE1_START_CHANGING_HELD_ITEM) &&
((this->heldItemId == ITEM_LAST_USED) || (this->heldItemId == ITEM_NONE)))) &&
((this->heldItemId == ITEM_SWORD_CS) || (this->heldItemId == ITEM_NONE)))) &&
(!(Player_UpperAction_ChangeHeldItem == this->upperActionFunc) ||
(Player_ItemToItemAction(this->heldItemId) == this->heldItemAction));
}
@ -6789,10 +6789,10 @@ s32 Player_ActionChange_2(Player* this, PlayState* play) {
func_80836898(play, this, func_8083A0F4);
if (sp24 == PLAYER_IA_SWORD_MASTER) {
this->nextModelGroup = Player_ActionToModelGroup(this, PLAYER_IA_LAST_USED);
Player_InitItemAction(play, this, PLAYER_IA_LAST_USED);
this->nextModelGroup = Player_ActionToModelGroup(this, PLAYER_IA_SWORD_CS);
Player_InitItemAction(play, this, PLAYER_IA_SWORD_CS);
} else {
Player_UseItem(play, this, ITEM_LAST_USED);
Player_UseItem(play, this, ITEM_SWORD_CS);
}
} else {
s32 strength = Player_GetStrength();