mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-05-23 06:54:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Talk Exchange System Docs (#1312)

Browse Source 
* Fix typo

* PLAYER_IA_HELD

* Actor offer exchange item functions

* SubS_OfferExchangeItemCustom

* SubS_OfferItem + enum

* Actors that use Subs_OfferItem

* SubS_OfferExchangeItemFacing

* Comments

* Format

* Better comment

* EnRg

* function names and comments

* Split enum

* exchangeItemId -> exchangeItemAction

* namefixer

* PR comments

* Missed a comment

* Max -> Mask

* SubS_SetOfferMode

* Some more comments updating

* rg comment

* PLAYER_IA_CONTINUE

* Revert back to PLAYER_IA_MINUS1

* Comment typos/grammar

* Verify functions

* yawRange

* Actor_OfferTalkNearby

* Actor_OfferTalkExchangeEquiCylinder

* format

* Actor_OfferTalkNearColChkInfoCylinder

* OfferTalk comments

* Actor_OfferTalkExchange comment enum

* format
This commit is contained in:
Derek Hensley
2023-07-31 16:40:12 -07:00
committed by GitHub
parent 70a54256b7
commit 410d412d0a
146 changed files with 853 additions and 769 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_player_lib.c
+3 -3
View File
@@ -1286,7 +1286,7 @@ void Player_SetModelGroup(Player* player, PlayerModelGroup modelGroup) {
void func_80123C58(Player* player) {
player->itemAction = player->heldItemAction;
Player_SetModelGroup(player, Player_ActionToModelGroup(player, player->heldItemAction));
player->unk_AA5 = 0;
player->unk_AA5 = PLAYER_UNKAA5_0;
}
void Player_SetEquipmentData(PlayState* play, Player* player) {
@@ -2313,7 +2313,7 @@ s32 Player_OverrideLimbDrawGameplayFirstPerson(PlayState* play, s32 limbIndex, G
Player* player = (Player*)actor;
if (!Player_OverrideLimbDrawGameplayCommon(play, limbIndex, dList, pos, rot, actor)) {
if (player->unk_AA5 != 3) {
if (player->unk_AA5 != PLAYER_UNKAA5_3) {
*dList = NULL;
} else if (limbIndex == PLAYER_LIMB_LEFT_FOREARM) {
*dList = sPlayerFirstPersonLeftForearmDLs[player->transformation];
@@ -3526,7 +3526,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList1, G
if ((player->getItemDrawIdPlusOne != (GID_NONE + 1)) ||
((func_800B7118(player) == 0) && (heldActor != NULL))) {
if (!(player->stateFlags1 & PLAYER_STATE1_400) && (player->getItemDrawIdPlusOne != (GID_NONE + 1)) &&
(player->exchangeItemId != PLAYER_IA_NONE)) {
(player->exchangeItemAction != PLAYER_IA_NONE)) {
Math_Vec3f_Copy(&sPlayerGetItemRefPos, &player->leftHandWorld.pos);
} else {
sPlayerGetItemRefPos.x =