mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-04 02:46:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_fruit_guts_leaf OK (#77)

Browse Source
This commit is contained in:
robojumper
2024-10-20 22:43:57 +02:00
committed by GitHub
parent 3b5a959d1b
commit 8723bc3186
7 changed files with 142 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/rels/d_a_obj_fruit_guts_leafNP/splits.txt
+3
View File
@@ -12,3 +12,6 @@ REL/executor.c:
REL/d/a/obj/d_a_obj_fruit_guts_leaf.cpp:
.text start:0x00000070 end:0x00000504
.ctors start:0x00000000 end:0x00000004
.rodata start:0x00000000 end:0x00000020
.data start:0x00000000 end:0x000000C8
.bss start:0x00000008 end:0x00000020
config/SOUE01/rels/d_a_obj_fruit_guts_leafNP/symbols.txt
+19 -19
View File
@@ -2,26 +2,26 @@ _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
dAcOFruitGutsLeaf_c_classInit__Fv = .text:0x00000070; // type:function size:0x54
fn_517_D0 = .text:0x000000D0; // type:function size:0xA8
fn_517_180 = .text:0x00000180; // type:function size:0xD8
fn_517_260 = .text:0x00000260; // type:function size:0x90
fn_517_2F0 = .text:0x000002F0; // type:function size:0xD4
fn_517_3D0 = .text:0x000003D0; // type:function size:0x28
fn_517_400 = .text:0x00000400; // type:function size:0x28
fn_517_430 = .text:0x00000430; // type:function size:0xC
fn_517_440 = .text:0x00000440; // type:function size:0xC
createHeap__19dAcOFruitGutsLeaf_cFv = .text:0x000000D0; // type:function size:0xA8
actorCreate__19dAcOFruitGutsLeaf_cFv = .text:0x00000180; // type:function size:0xD8
actorPostCreate__19dAcOFruitGutsLeaf_cFv = .text:0x00000260; // type:function size:0x90
actorExecute__19dAcOFruitGutsLeaf_cFv = .text:0x000002F0; // type:function size:0xD4
draw__19dAcOFruitGutsLeaf_cFv = .text:0x000003D0; // type:function size:0x28
hideInPast__19dAcOFruitGutsLeaf_cFv = .text:0x00000400; // type:function size:0x28
getType__19dAcOFruitGutsLeaf_cFv = .text:0x00000430; // type:function size:0xC
getPastBehavior__19dAcOFruitGutsLeaf_cFv = .text:0x00000440; // type:function size:0xC
__dt__19dAcOFruitGutsLeaf_cFv = .text:0x00000450; // type:function size:0x68
fn_517_4C0 = .text:0x000004C0; // type:function size:0x44
__sinit_\d_a_obj_fruit_guts_leaf_cpp = .text:0x000004C0; // type:function size:0x44 scope:local
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
lbl_517_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float
lbl_517_rodata_4 = .rodata:0x00000004; // type:object size:0x4 data:4byte
lbl_517_rodata_8 = .rodata:0x00000008; // type:object size:0x4 data:float
lbl_517_rodata_C = .rodata:0x0000000C; // type:object size:0x14 data:float
lbl_517_rodata_0 = .rodata:0x00000000; // type:object size:0x4 scope:local data:float
lbl_517_rodata_4 = .rodata:0x00000004; // type:object size:0x4 scope:local data:4byte
lbl_517_rodata_8 = .rodata:0x00000008; // type:object size:0x4 scope:local data:float
lbl_517_rodata_C = .rodata:0x0000000C; // type:object size:0x14 scope:local data:float
g_profile_OBJ_FRUIT_GUTS_LEAF = .data:0x00000000; // type:object size:0x10
lbl_517_data_10 = .data:0x00000010; // type:object size:0x8 data:string
lbl_517_data_18 = .data:0x00000018; // type:object size:0xC data:string
lbl_517_data_24 = .data:0x00000024; // type:object size:0x24
lbl_517_data_48 = .data:0x00000048; // type:object size:0x80
lbl_517_bss_8 = .bss:0x00000008; // type:object size:0xC data:float
lbl_517_bss_14 = .bss:0x00000014; // type:object size:0xC data:float
lbl_517_data_10 = .data:0x00000010; // type:object size:0x8 scope:local data:string
lbl_517_data_18 = .data:0x00000018; // type:object size:0xC scope:local data:string
lbl_517_data_24 = .data:0x00000024; // type:object size:0x24 scope:local
__vt__19dAcOFruitGutsLeaf_c = .data:0x00000048; // type:object size:0x80
lbl_517_bss_8 = .bss:0x00000008; // type:object size:0xC scope:local data:float
lbl_517_bss_14 = .bss:0x00000014; // type:object size:0xC scope:local data:float
config/SOUE01/symbols.txt
+1 -1
View File
@@ -3975,7 +3975,7 @@ fn_800B97F0 = .text:0x800B97F0; // type:function size:0x88
fn_800B9880 = .text:0x800B9880; // type:function size:0xFC
fn_800B9980 = .text:0x800B9980; // type:function size:0xCC
checkPositionIsInPastState__14dTimeAreaMgr_cFlRC7mVec3_cPff = .text:0x800B9A50; // type:function size:0x104
fn_800B9B60 = .text:0x800B9B60; // type:function size:0xB4
fn_800B9B60__14dTimeAreaMgr_cFlRC7mVec3_c = .text:0x800B9B60; // type:function size:0xB4
fn_800B9C20 = .text:0x800B9C20; // type:function size:0xB4
fn_800B9CE0 = .text:0x800B9CE0; // type:function size:0xA0
check__14TimeAreaStructFiRC7mVec3_cUlff = .text:0x800B9D80; // type:function size:0x214
configure.py
+1 -1
View File
@@ -1397,7 +1397,7 @@ config.libs = [
Rel(NonMatching, "d_a_obj_fruitB", "REL/d/a/obj/d_a_obj_fruitB.cpp"),
Rel(NonMatching, "d_a_obj_fruit", "REL/d/a/obj/d_a_obj_fruit.cpp"),
Rel(
NonMatching,
Matching,
"d_a_obj_fruit_guts_leaf",
"REL/d/a/obj/d_a_obj_fruit_guts_leaf.cpp",
),
include/d/a/obj/d_a_obj_fruit_guts_leaf.h
+13
View File
@@ -2,13 +2,26 @@
#define D_A_OBJ_FRUIT_GUTS_LEAF_H
#include "d/a/obj/d_a_obj_base.h"
#include "m/m3d/m_smdl.h"
class dAcOFruitGutsLeaf_c : public dAcObjBase_c {
public:
dAcOFruitGutsLeaf_c() {}
virtual ~dAcOFruitGutsLeaf_c() {}
virtual bool createHeap() override;
virtual int actorCreate() override;
virtual int actorPostCreate() override;
virtual int actorExecute() override;
virtual int draw() override;
private:
s32 getType();
bool hideInPast();
s32 getPastBehavior();
/* 0x330 */ m3d::smdl_c mMdl;
};
#endif
include/toBeSorted/time_area_mgr.h
+1
View File
@@ -51,6 +51,7 @@ public:
void draw();
f32 checkPositionIsInPastState(s32 roomId, const mVec3_c &position, float *, float);
bool fn_800B9B60(s32 roomId, const mVec3_c &position);
static dTimeAreaMgr_c *sInstance;
src/REL/d/a/obj/d_a_obj_fruit_guts_leaf.cpp
+104
View File
@@ -1,3 +1,107 @@
#include "d/a/obj/d_a_obj_fruit_guts_leaf.h"
#include "common.h"
#include "d/a/obj/d_a_obj_base.h"
#include "f/f_base.h"
#include "m/m_vec.h"
#include "nw4r/g3d/g3d_resfile.h"
#include "nw4r/g3d/g3d_resmdl.h"
#include "s/s_Math.h"
#include "toBeSorted/time_area_mgr.h"
SPECIAL_ACTOR_PROFILE(OBJ_FRUIT_GUTS_LEAF, dAcOFruitGutsLeaf_c, fProfile::OBJ_FRUIT_GUTS_LEAF, 0x2E, 0, 3);
static const char *const mdlFileName = "PutGuts";
static const char *const mdlName = "PutGutsLeaf";
const mVec3_c bbMin(-50.0f, 0.0f, -50.0f);
const mVec3_c bbMax(50.0f, 15.0f, 50.0f);
bool dAcOFruitGutsLeaf_c::createHeap() {
void *data = getOarcResFile(mdlFileName);
if (data == nullptr) {
return false;
}
nw4r::g3d::ResFile f = data;
if (!f.mFile.IsValid()) {
return false;
}
nw4r::g3d::ResMdl m = f.GetResMdl(mdlName);
if (!m.mMdl.IsValid()) {
return false;
}
TRY_CREATE(mMdl.create(m, &heap_allocator, 0x120));
return true;
}
int dAcOFruitGutsLeaf_c::actorCreate() {
CREATE_ALLOCATOR(dAcOFruitGutsLeaf_c);
updateMatrix();
mMdl.setLocalMtx(mWorldMtx);
if (getType() == 0) {
mMdl.setPriorityDraw(0x82, 0x7F);
} else {
mMdl.setPriorityDraw(0x7F, 0x7F);
}
boundingBox.Set(bbMin, bbMax);
return SUCCEEDED;
}
int dAcOFruitGutsLeaf_c::actorPostCreate() {
if (hideInPast() && !dTimeAreaMgr_c::sInstance->fn_800B9B60(roomid, position)) {
mScale.x = 0.0f;
mScale.y = 0.0f;
mScale.z = 0.0f;
} else {
mScale.x = 1.0f;
mScale.y = 1.0f;
mScale.z = 1.0f;
}
mMdl.setScale(mScale);
return SUCCEEDED;
}
int dAcOFruitGutsLeaf_c::actorExecute() {
if (hideInPast()) {
if (dTimeAreaMgr_c::sInstance->fn_800B9B60(roomid, position)) {
if (mScale.x != 1.0f) {
sLib::chase(&mScale.x, 1.0f, 0.05f);
mScale.z = mScale.x;
mScale.y = mScale.x;
mMdl.setScale(mScale);
}
} else {
if (mScale.y != 0.0f) {
sLib::chase(&mScale.x, 0.0f, 0.05f);
mScale.z = mScale.x;
mScale.y = mScale.x;
mMdl.setScale(mScale);
}
}
}
return SUCCEEDED;
}
int dAcOFruitGutsLeaf_c::draw() {
drawModelType1(&mMdl);
return SUCCEEDED;
}
bool dAcOFruitGutsLeaf_c::hideInPast() {
return getPastBehavior() == 0;
}
s32 dAcOFruitGutsLeaf_c::getType() {
return params & 0xFF;
}
s32 dAcOFruitGutsLeaf_c::getPastBehavior() {
return (params >> 8) & 1;
}