summaryrefslogtreecommitdiff
path: root/src/d/d_demo.cpp
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2022-06-29 13:19:09 -0700
committerGitHub <noreply@github.com>2022-06-29 22:19:09 +0200
commit046d178003035ea87d3042a61917c2d482c68c74 (patch)
tree4240e760d8d40201ca4ec96634da8abff211f6bb /src/d/d_demo.cpp
parentcd5b02450cf278cbeb2c8bb90be1ad22518938c7 (diff)
work on daalink, fop actor, mDo machine, msg_scrn, + various (#201)
* work on fop actor / actor mng, daalink, d_a_obj_item * d_a_title mostly decompiled * daalink / d_event / JMessage / dmsg_out_font work * msg_scrn_base / msg_scrn_boss * some work on mDo machine, d_menu_save, d_tresure, and various * remove asm * progress
Diffstat (limited to 'src/d/d_demo.cpp')
-rw-r--r--src/d/d_demo.cpp43
1 files changed, 2 insertions, 41 deletions
diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp
index 4ba75c4d93..c4b58509b7 100644
--- a/src/d/d_demo.cpp
+++ b/src/d/d_demo.cpp
@@ -168,19 +168,6 @@ struct dDemo_particle_c {
/* 80039F9C */ ~dDemo_particle_c();
};
-struct dDemo_object_c {
- /* 80038F54 */ dDemo_object_c();
- /* 80038F70 */ ~dDemo_object_c();
- /* 80038FC0 */ void appendActor(fopAc_ac_c*);
- /* 80039088 */ void getActor(u8);
- /* 800390AC */ void createCamera();
- /* 80039128 */ void getActiveCamera();
- /* 8003913C */ void createAmbient();
- /* 800391B8 */ void appendLight();
- /* 80039258 */ void createFog();
- /* 800392D4 */ void remove();
-};
-
struct dDemo_light_c {
/* 80038E20 */ void JSGSetLightType(JStage::TELight);
/* 80038E34 */ void JSGSetPosition(Vec const&);
@@ -226,32 +213,6 @@ struct dDemo_ambient_c {
/* 800394C8 */ ~dDemo_ambient_c();
};
-struct dDemo_actor_c {
- /* 80038020 */ dDemo_actor_c();
- /* 80038098 */ ~dDemo_actor_c();
- /* 80038128 */ void getActor();
- /* 8003815C */ void setActor(fopAc_ac_c*);
- /* 8003819C */ void getPrm_Morf();
- /* 80038338 */ void getDemoIDData(int*, int*, int*, u16*, u8*);
- /* 800387EC */ void JSGSetData(u32, void const*, u32);
- /* 80038920 */ void JSGSetTranslation(Vec const&);
- /* 80038980 */ void JSGSetScaling(Vec const&);
- /* 800389A8 */ void JSGSetRotation(Vec const&);
- /* 80038A0C */ void JSGSetShape(u32);
- /* 80038A20 */ void JSGSetAnimation(u32);
- /* 80038A40 */ void JSGSetAnimationFrame(f32);
- /* 80038A54 */ void JSGSetAnimationTransition(f32);
- /* 80038A68 */ void JSGSetTextureAnimation(u32);
- /* 80038A7C */ void JSGSetTextureAnimationFrame(f32);
- /* 8003A05C */ void JSGFindNodeID(char const*) const;
- /* 8003A088 */ void JSGGetNodeTransformation(u32, f32 (*)[4]) const;
- /* 8003A0C8 */ void JSGGetAnimationFrameMax() const;
- /* 8003A0D0 */ void JSGGetTextureAnimationFrameMax() const;
- /* 8003A0D8 */ void JSGGetTranslation(Vec*) const;
- /* 8003A0F4 */ void JSGGetScaling(Vec*) const;
- /* 8003A110 */ void JSGGetRotation(Vec*) const;
-};
-
struct JUTNameTab {
/* 802DEA58 */ void getIndex(char const*) const;
};
@@ -966,7 +927,7 @@ u8 dDemo_c::m_factory[4];
u8 dDemo_c::m_mesgControl[4];
/* 80450E20-80450E24 000320 0004+00 5/5 9/9 7/7 .sbss m_object__7dDemo_c */
-u8 dDemo_c::m_object[4];
+dDemo_object_c* dDemo_c::m_object;
/* 80450E24-80450E28 000324 0004+00 4/4 0/0 0/0 .sbss m_data__7dDemo_c */
u8 dDemo_c::m_data[4];
@@ -1529,7 +1490,7 @@ asm void dDemo_object_c::appendActor(fopAc_ac_c* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
-asm void dDemo_object_c::getActor(u8 param_0) {
+asm dDemo_actor_c* dDemo_object_c::getActor(u8 param_0) {
nofralloc
#include "asm/d/d_demo/getActor__14dDemo_object_cFUc.s"
}