d_message OK (via dFlow_c)

This commit is contained in:
robojumper
2025-05-09 18:28:45 +02:00
parent 378c192697
commit 4c5dede891
39 changed files with 2038 additions and 219 deletions
+3 -3
View File
@@ -11,6 +11,7 @@
#include "d/col/c/c_bg_s_poly_info.h"
#include "d/col/cc/d_cc_d.h"
#include "d/col/cc/d_cc_s.h"
#include "d/d_pouch.h"
#include "d/d_room.h"
#include "d/d_stage.h"
#include "d/flag/sceneflag_manager.h"
@@ -1935,8 +1936,6 @@ void dAcTbox_c::finalizeState_LoadArchive() {}
extern "C" void fn_800298B0(u16 effectIndex, mVec3_c *, mAng3_c *, mVec3_c *, void *, void *, void *, void *);
extern "C" const u16 PARTICLE_RESOURCE_ID_MAPPING_209_;
extern "C" const bool isPouchItem(u16);
extern "C" u8 adventurePouchFindItemSlot(ITEM_ID item);
extern "C" u16 findItemInItemCheck(ITEM_ID item);
extern "C" dAcItem_c *giveItem3(u16 item, s32);
void dAcTbox_c::initializeState_Open() {
@@ -1962,7 +1961,8 @@ void dAcTbox_c::initializeState_Open() {
}
fn_8026D140();
ITEM_ID itemId = mItemId != 0 ? (ITEM_ID)mItemId : ITEM_GODDESS_HARP;
if (isPouchItem(itemId) && adventurePouchFindItemSlot(ITEM_NONE) == 8 && findItemInItemCheck(ITEM_NONE) == 0x3C) {
if (isPouchItem(itemId) && adventurePouchFindItemSlot(ITEM_NONE) == POUCH_SLOT_NONE &&
itemCheckFindItemSlot(ITEM_NONE) == ITEM_CHECK_SLOT_NONE) {
setShouldCloseFlag();
}
dAcItem_c *item = giveItem3(itemId, -1);