d_a_obj_bamboo_island OK (#38)

config/SOUE01/rels/d_a_obj_bamboo_islandNP/splits.txt

@@ -11,3 +11,5 @@ REL/executor.c:
 
 REL/d/a/obj/d_a_obj_bamboo_island.cpp:
 	.text       start:0x00000070 end:0x000004A0
+	.rodata     start:0x00000000 end:0x00000028
+	.data       start:0x00000000 end:0x000000F0

config/SOUE01/rels/d_a_obj_bamboo_islandNP/symbols.txt

@@ -1,20 +1,20 @@
 _prolog = .text:0x00000000; // type:function size:0x2C scope:global
 _epilog = .text:0x00000030; // type:function size:0x2C scope:global
 _unresolved = .text:0x00000060; // type:function size:0x4 scope:global
-fn_404_70 = .text:0x00000070; // type:function size:0x7C
-fn_404_F0 = .text:0x000000F0; // type:function size:0x7C
-fn_404_170 = .text:0x00000170; // type:function size:0x134
-fn_404_2B0 = .text:0x000002B0; // type:function size:0xE8
-fn_404_3A0 = .text:0x000003A0; // type:function size:0x8
-fn_404_3B0 = .text:0x000003B0; // type:function size:0x8
-fn_404_3C0 = .text:0x000003C0; // type:function size:0x60
-fn_404_420 = .text:0x00000420; // type:function size:0x80
+dAcObambooIsland_c_classInit__Fv = .text:0x00000070; // type:function size:0x7C
+interactCallback__18dAcObambooIsland_cFPvP9dAcBase_cP12dAcObjBase_c = .text:0x000000F0; // type:function size:0x7C
+createHeap__18dAcObambooIsland_cFv = .text:0x00000170; // type:function size:0x134
+create__18dAcObambooIsland_cFv = .text:0x000002B0; // type:function size:0xE8
+doDelete__18dAcObambooIsland_cFv = .text:0x000003A0; // type:function size:0x8
+actorExecute__18dAcObambooIsland_cFv = .text:0x000003B0; // type:function size:0x8
+draw__18dAcObambooIsland_cFv = .text:0x000003C0; // type:function size:0x60
+__dt__18dAcObambooIsland_cFv = .text:0x00000420; // type:function size:0x80
 _ctors = .ctors:0x00000000; // type:label scope:global
 _dtors = .dtors:0x00000000; // type:label scope:global
-lbl_404_rodata_0 = .rodata:0x00000000; // type:object size:0x8 data:float
-lbl_404_rodata_8 = .rodata:0x00000008; // type:object size:0x20 data:4byte
-lbl_404_data_0 = .data:0x00000000; // type:object size:0x8 data:string
-lbl_404_data_8 = .data:0x00000008; // type:object size:0x10
-lbl_404_data_18 = .data:0x00000018; // type:object size:0x38
-lbl_404_data_50 = .data:0x00000050; // type:object size:0x20 data:string
-lbl_404_data_70 = .data:0x00000070; // type:object size:0x80
+lbl_404_rodata_0 = .rodata:0x00000000; // type:object size:0x8 scope:local data:float
+lbl_404_rodata_8 = .rodata:0x00000008; // type:object size:0x20 scope:local data:4byte
+lbl_404_data_0 = .data:0x00000000; // type:object size:0x8 scope:local data:string
+lbl_404_data_8 = .data:0x00000008; // type:object size:0x10 scope:local
+g_profile_OBJ_BAMBOO_ISLAND = .data:0x00000018; // type:object size:0x10
+lbl_404_data_50 = .data:0x00000050; // type:object size:0x20 scope:local data:string
+__vt__18dAcObambooIsland_c = .data:0x00000070; // type:object size:0x80

config/SOUE01/symbols.txt

@@ -1103,7 +1103,7 @@ FUN_8002dd50__9dAcBase_cFv = .text:0x8002DD50; // type:function size:0x34
 FUN_8002dd90__9dAcBase_cFv = .text:0x8002DD90; // type:function size:0x3C
 FUN_8002ddd0__9dAcBase_cFv = .text:0x8002DDD0; // type:function size:0x54
 FUN_8002de30__9dAcBase_cFv = .text:0x8002DE30; // type:function size:0x4
-fn_8002DE40 = .text:0x8002DE40; // type:function size:0x14
+getOarcFile__12dAcObjBase_cFPCcPCc = .text:0x8002DE40; // type:function size:0x14
 fn_8002DE60 = .text:0x8002DE60; // type:function size:0x14
 getOarcResFile__12dAcObjBase_cFPCc = .text:0x8002DE80; // type:function size:0xC
 fn_8002DE90 = .text:0x8002DE90; // type:function size:0xC
@@ -19438,7 +19438,7 @@ fn_80344E00 = .text:0x80344E00; // type:function size:0x114
 fn_80344F20 = .text:0x80344F20; // type:function size:0x14C
 fn_80345070 = .text:0x80345070; // type:function size:0x220
 fn_80345290 = .text:0x80345290; // type:function size:0x244
-fn_803454E0 = .text:0x803454E0; // type:function size:0x38
+init__14ActorCollisionFv = .text:0x803454E0; // type:function size:0x38
 fn_80345520 = .text:0x80345520; // type:function size:0x4C
 fn_80345570 = .text:0x80345570; // type:function size:0x254
 fn_803457D0 = .text:0x803457D0; // type:function size:0x8

configure.py

@@ -963,7 +963,7 @@ def nw4rLib(lib_name, objects, extra_cflags=[]):
     Rel(NonMatching, "d_a_obj_ballista_f3", "REL/d/a/obj/d_a_obj_ballista_f3.cpp"),
     Rel(NonMatching, "d_a_obj_ballista_handle", "REL/d/a/obj/d_a_obj_ballista_handle.cpp"),
     Rel(NonMatching, "d_a_obj_bamboo", "REL/d/a/obj/d_a_obj_bamboo.cpp"),
-    Rel(NonMatching, "d_a_obj_bamboo_island", "REL/d/a/obj/d_a_obj_bamboo_island.cpp"),
+    Rel(Matching, "d_a_obj_bamboo_island", "REL/d/a/obj/d_a_obj_bamboo_island.cpp"),
     Rel(NonMatching, "d_a_obj_barrel", "REL/d/a/obj/d_a_obj_barrel.cpp"),
     Rel(NonMatching, "d_a_obj_bblargebomb", "REL/d/a/obj/d_a_obj_bblargebomb.cpp"),
     Rel(NonMatching, "d_a_obj_bbstone", "REL/d/a/obj/d_a_obj_bbstone.cpp"),

include/d/a/obj/d_a_obj_bamboo_island.h

@@ -0,0 +1,29 @@
+#ifndef D_A_OBJ_BAMBOO_ISLAND_H
+#define D_A_OBJ_BAMBOO_ISLAND_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <m/m3d/m_smdl.h>
+#include <toBeSorted/actor_collision.h>
+
+class dAcObambooIsland_c : public dAcObjBase_c {
+public:
+    dAcObambooIsland_c() {}
+    virtual ~dAcObambooIsland_c() {}
+    virtual bool createHeap() override;
+    virtual int create() override;
+    virtual int actorExecute() override;
+    virtual int draw() override;
+    virtual int doDelete() override;
+
+private:
+    static const f32 unusedFloat1;
+    static const f32 unusedFloat2;
+
+    static void interactCallback(void *unknown, dAcBase_c *actor, dAcObjBase_c *interactor);
+
+    m3d::smdl_c mModels[2];
+    nw4r::g3d::ResFile mBrres;
+    ActorCollision mCollision;
+};
+
+#endif

include/toBeSorted/actor_collision.h

@@ -16,6 +16,7 @@ class ActorCollision {
         multMatrix = callback;
         return result;
     }
+    void init();
     void execute();
 
     u8 field_0x00[0x1FC - 0x000];

src/REL/d/a/obj/d_a_obj_bamboo_island.cpp

@@ -0,0 +1,65 @@
+#include <d/a/obj/d_a_obj_bamboo_island.h>
+#include <toBeSorted/item_story_flag_manager.h>
+
+const f32 dAcObambooIsland_c::unusedFloat1 = 100000.0f;
+const f32 dAcObambooIsland_c::unusedFloat2 = 0.0f;
+
+static const char *const sBambooIslandNames[] = {
+        "IslBamb",
+        "IslBamb_s",
+};
+
+SPECIAL_ACTOR_PROFILE(OBJ_BAMBOO_ISLAND, dAcObambooIsland_c, fProfile::OBJ_BAMBOO_ISLAND, 0x01F9, 0, 3);
+
+void dAcObambooIsland_c::interactCallback(void *unknown, dAcBase_c *actor, dAcObjBase_c *interactor) {
+    if (dBase_c::isActorPlayer(*interactor) && actor != nullptr &&
+            StoryFlagManager::sInstance->getCounterOrFlag(284) == 0) {
+        StoryFlagManager::sInstance->setFlag(284);
+    }
+}
+
+bool dAcObambooIsland_c::createHeap() {
+    mBrres = getOarcResFile("IslBamb");
+    RoomManager::bindStageResToFile(&mBrres);
+    RoomManager::bindSkyCmnToResFile(&mBrres);
+    for (int i = 0; i < 2; i++) {
+        nw4r::g3d::ResMdl mdl = mBrres.GetResMdl(sBambooIslandNames[i]);
+        TRY_CREATE(mModels[i].create(mdl, &heap_allocator, 0x120));
+    }
+    void *dzb = getOarcFile("IslBamb", "dzb/IslBamb.dzb");
+    void *plc = getOarcFile("IslBamb", "dat/IslBamb.plc");
+    updateMatrix();
+    for (int i = 0; i < 2; i++) {
+        mModels[i].setLocalMtx(worldMatrix);
+    }
+    TRY_CREATE(mCollision.create(dzb, plc, true, worldMatrix, scale) == nullptr);
+    mCollision.init();
+    return true;
+}
+
+int dAcObambooIsland_c::create() {
+    CREATE_ALLOCATOR(dAcObambooIsland_c);
+
+    CollisionCheckContext::get()->registerActorBgCollision(mCollision, this);
+    mModels[0].setPriorityDraw(0x1C, 9);
+    mModels[1].setPriorityDraw(0x22, 9);
+    setBoundingBox(mVec3_c(-2400.0f, -1600.0f, -2300.0f), mVec3_c(2400.0f, 3900.0f, 2400.0f));
+    mCullingDistance = 500000.0f;
+    mCollision.interactFunc = interactCallback;
+    return SUCCEEDED;
+}
+
+int dAcObambooIsland_c::doDelete() {
+    return SUCCEEDED;
+}
+
+int dAcObambooIsland_c::actorExecute() {
+    return SUCCEEDED;
+}
+
+int dAcObambooIsland_c::draw() {
+    for (int i = 0; i < 2; i++) {
+        drawModelType1(&mModels[i]);
+    }
+    return SUCCEEDED;
+}