From 9a21e23acdce87aa58b29c6ace09e26ca9237fba Mon Sep 17 00:00:00 2001 From: Garrett Cox Date: Sat, 13 Jan 2024 17:45:54 +0000 Subject: [PATCH] Fix getItem animation (#37) --- mm/src/overlays/actors/ovl_player_actor/z_player.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mm/src/overlays/actors/ovl_player_actor/z_player.c b/mm/src/overlays/actors/ovl_player_actor/z_player.c index a06efff90..15c7d7ef2 100644 --- a/mm/src/overlays/actors/ovl_player_actor/z_player.c +++ b/mm/src/overlays/actors/ovl_player_actor/z_player.c @@ -7310,11 +7310,13 @@ void func_80838830(Player* this, s16 objectId) { s32 pad[2]; if (objectId != OBJECT_UNSET_0) { - this->giObjectLoading = true; - osCreateMesgQueue(&this->giObjectLoadQueue, &this->giObjectLoadMsg, 1); - DmaMgr_SendRequestImpl(&this->giObjectDmaRequest, this->giObjectSegment, gObjectTable[objectId].vromStart, - gObjectTable[objectId].vromEnd - gObjectTable[objectId].vromStart, 0, - &this->giObjectLoadQueue, OS_MESG_PTR(NULL)); + // #region 2S2H [Port] We don't care to wait for the item to load, mark it as loaded immediately + this->giObjectLoading = false; + // osCreateMesgQueue(&this->giObjectLoadQueue, &this->giObjectLoadMsg, 1); + // DmaMgr_SendRequestImpl(&this->giObjectDmaRequest, this->giObjectSegment, gObjectTable[objectId].vromStart, + // gObjectTable[objectId].vromEnd - gObjectTable[objectId].vromStart, 0, + // &this->giObjectLoadQueue, OS_MESG_PTR(NULL)); + // #endregion } }