From 9bdfbb69d46e3997556f43d9787d9dde2f1bcf7c Mon Sep 17 00:00:00 2001 From: CovenEsme <84377742+CovenEsme@users.noreply.github.com> Date: Fri, 14 Mar 2025 13:39:59 +0000 Subject: [PATCH] d_a_obj_treasure_island ok --- config/SOUE01/rels/d_a_obj_treasure_islandNP/symbols.txt | 4 ++-- configure.py | 2 +- include/d/a/obj/d_a_obj_treasure_island.h | 3 +++ src/REL/d/a/obj/d_a_obj_treasure_island.cpp | 3 +++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/config/SOUE01/rels/d_a_obj_treasure_islandNP/symbols.txt b/config/SOUE01/rels/d_a_obj_treasure_islandNP/symbols.txt index b8455ede..92b23086 100644 --- a/config/SOUE01/rels/d_a_obj_treasure_islandNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_treasure_islandNP/symbols.txt @@ -10,8 +10,8 @@ draw__20dAcOtreasureIsland_cFv = .text:0x00000650; // type:function size:0x58 __dt__20dAcOtreasureIsland_cFv = .text:0x000006B0; // type:function size:0xBC _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_392_rodata_00 = .rodata:0x00000000; // type:object size:0x4 scope:local data:float -lbl_392_rodata_04 = .rodata:0x00000004; // type:object size:0x4 scope:local data:float +lbl_392_rodata_00 = .rodata:0x00000000; // type:object size:0x4 data:float +lbl_392_rodata_04 = .rodata:0x00000004; // type:object size:0x4 data:float lbl_392_rodata_08 = .rodata:0x00000008; // type:object size:0x20 scope:local lbl_392_rodata_28 = .rodata:0x00000028; // type:object size:0x20 scope:local lbl_392_rodata_48 = .rodata:0x00000048; // type:object size:0x20 scope:local diff --git a/configure.py b/configure.py index 3b2c0ed3..b006f4d1 100644 --- a/configure.py +++ b/configure.py @@ -1688,7 +1688,7 @@ config.libs = [ ), Rel(Matching, "d_a_obj_trap_rock_1", "REL/d/a/obj/d_a_obj_trap_rock_1.cpp"), Rel( - NonMatching, + Matching, "d_a_obj_treasure_island", "REL/d/a/obj/d_a_obj_treasure_island.cpp", ), diff --git a/include/d/a/obj/d_a_obj_treasure_island.h b/include/d/a/obj/d_a_obj_treasure_island.h index b26e0133..fe5711b0 100644 --- a/include/d/a/obj/d_a_obj_treasure_island.h +++ b/include/d/a/obj/d_a_obj_treasure_island.h @@ -17,6 +17,9 @@ public: virtual int actorExecute() override; private: + const static f32 unkFloat0; + const static f32 unkFloat1; + /* 0x330 */ UnkWithWater waterStuff; /* 0x348 */ m3d::smdl_c mModel; /* 0x364 */ m3d::smdl_c mWater00; diff --git a/src/REL/d/a/obj/d_a_obj_treasure_island.cpp b/src/REL/d/a/obj/d_a_obj_treasure_island.cpp index 2d7eda1a..ffc4623b 100644 --- a/src/REL/d/a/obj/d_a_obj_treasure_island.cpp +++ b/src/REL/d/a/obj/d_a_obj_treasure_island.cpp @@ -5,6 +5,9 @@ #include "d/d_stage.h" #include "d/d_stage_mgr.h" +const f32 dAcOtreasureIsland_c::unkFloat0 = 100000.0f; +const f32 dAcOtreasureIsland_c::unkFloat1 = 50000.0f; + static const char *const AcOtreasureIsland__OarcNames[] = { "IslTreA", "IslTreB", "IslTreC", "IslTreD", "IslTreE", "IslTreF", "IslTreG", "IslTreH", };