mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-10 18:46:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_wind_stone OK (#2066)

Browse Source 
* set up TU

* d_a_obj_wind_stone OK
This commit is contained in:
Trueffel
2024-02-08 13:35:24 +01:00
committed by GitHub
parent 94d599568e
commit 92a5ef653c
51 changed files with 413 additions and 1883 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_alink.cpp
+12 -34
View File
@@ -7,10 +7,12 @@
#include "JSystem/J2DGraph/J2DAnmLoader.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
#include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
#include "JSystem/JAudio2/JAISeq.h"
#include "JSystem/JKernel/JKRExpHeap.h"
#include "JSystem/JMath/JMath.h"
#include "SSystem/SComponent/c_math.h"
#include "d/a/d_a_npc.h"
#include "d/a/d_a_obj.h"
#include "d/d_item.h"
#include "d/d_procname.h"
#include "d/meter/d_meter2_draw.h"
@@ -28,34 +30,13 @@
#include "rel/d/a/d_a_tbox/d_a_tbox.h"
#include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h"
#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h"
#include "rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h"
#include "rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.h"
#include "rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.h"
#include "rel/d/a/tag/d_a_tag_kmsg/d_a_tag_kmsg.h"
#include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h"
#include "rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.h"
#include "rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.h"
#include "rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.h"
//
// Types:
//
struct daObjMovebox {
struct Act_c {
struct Prm_e {};
};
};
struct daObj {
template <typename A1>
void PrmAbstract(/* ... */);
/* 80141ACC */ /* daObj::PrmAbstract<daObjMovebox::Act_c::Prm_e> */
void func_80141ACC(void* _this, fopAc_ac_c const*, daObjMovebox::Act_c::Prm_e,
daObjMovebox::Act_c::Prm_e);
};
struct JAISeq {
/* 802A0A8C */ JAISeq(JAISeqMgr*, JAISoundStrategyMgr<JAISeq>*);
};
//
// Forward References:
@@ -4784,27 +4765,21 @@ COMPILER_STRIP_GATE(0x8038FAC0, &l_crawlTopUpOffset);
/* 8038FACC-8038FAD8 01C12C 000C+00 0/1 0/0 0/0 .rodata l_wolfLieTopUpOffset */
#pragma push
#pragma force_active on
SECTION_RODATA static Vec const l_wolfLieTopUpOffset = {
0.0f, 75.0f, 0.0f
};
SECTION_RODATA static Vec const l_wolfLieTopUpOffset = {0.0f, 75.0f, 0.0f};
COMPILER_STRIP_GATE(0x8038FACC, &l_wolfLieTopUpOffset);
#pragma pop
/* 8038FAD8-8038FAE4 01C138 000C+00 0/1 0/0 0/0 .rodata l_crawlSideOffset */
#pragma push
#pragma force_active on
SECTION_RODATA static Vec const l_crawlSideOffset = {
55.0f, 80.0f, 0.0f
};
SECTION_RODATA static Vec const l_crawlSideOffset = {55.0f, 80.0f, 0.0f};
COMPILER_STRIP_GATE(0x8038FAD8, &l_crawlSideOffset);
#pragma pop
/* 8038FAE4-8038FAF0 01C144 000C+00 0/1 0/0 0/0 .rodata l_wolfLieSideOffset */
#pragma push
#pragma force_active on
SECTION_RODATA static Vec const l_wolfLieSideOffset = {
55.0f, 75.0f, 0.0f
};
SECTION_RODATA static Vec const l_wolfLieSideOffset = {55.0f, 75.0f, 0.0f};
COMPILER_STRIP_GATE(0x8038FAE4, &l_wolfLieSideOffset);
#pragma pop
@@ -5815,7 +5790,9 @@ COMPILER_STRIP_GATE(0x80391A08, &hookRoot);
/* 80391A14-80391A20 01E074 000C+00 1/1 0/0 0/0 .rodata bottleTop$32160 */
SECTION_RODATA static Vec const bottleTop = {
0.0f, 25.0f, 0.0f,
0.0f,
25.0f,
0.0f,
};
COMPILER_STRIP_GATE(0x80391A14, &bottleTop);
@@ -18798,7 +18775,8 @@ asm int daAlink_c::changeItemTriggerKeepProc(u8 param_0, int param_1) {
/**
* Determines whether an item action can occur, and which action to use.
*
* @return a `daAlink_ItemProc` value corresponding to the `PROC` function to run in `changeItemTriggerKeepProc`
* @return a `daAlink_ItemProc` value corresponding to the `PROC` function to run in
* `changeItemTriggerKeepProc`
*/
// matches with literals
#ifdef NONMATCHING
src/d/a/d_a_npc.cpp
+1 -1
View File
@@ -1774,7 +1774,7 @@ int daNpcT_c::execute() {
setCollision();
if (!field_0xe2c) {
if ((field_0xe33 && i_dComIfGp_getEvent().i_isOrderOK()) || !i_dComIfGp_event_runCheck()) {
if ((field_0xe33 && i_dComIfGp_getEvent().i_isOrderOK()) || i_dComIfGp_event_runCheck() == 0) {
evtOrder();
}
}
src/d/a/d_a_obj.cpp
-18
View File
@@ -4,25 +4,7 @@
//
#include "d/a/d_a_obj.h"
#include "d/com/d_com_inf_game.h"
#include "dol2asm.h"
#include "f_op/f_op_actor_mng.h"
//
// Types:
//
namespace daObj {
/* 80037038 */ void eff_break_tsubo(fopAc_ac_c*, cXyz, int);
/* 80037180 */ void make_eff_break_kotubo(fopAc_ac_c*);
/* 80037210 */ void make_eff_break_kotubo2(fopAc_ac_c*);
/* 800372A0 */ void make_eff_break_gm_kotubo(fopAc_ac_c*);
/* 80037330 */ void make_eff_break_gm_ootubo(fopAc_ac_c*);
/* 800373C0 */ void posMoveF_stream(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32);
/* 80037620 */ void posMoveF_grade(fopAc_ac_c*, cXyz const*, cXyz const*, f32, f32, cXyz const*,
f32, f32, cXyz const*);
/* 80037788 */ void quat_rotBaseY(Quaternion*, cXyz const&);
/* 80037900 */ void HitSeStart(cXyz const*, int, dCcD_GObjInf const*, u32);
}; // namespace daObj
//
// Forward References:
src/d/com/d_com_static.cpp
+3 -12
View File
@@ -4,7 +4,6 @@
//
#include "d/com/d_com_static.h"
#include "stdio.h"
#include "d/d_demo.h"
#include "dol2asm.h"
#include "rel/d/a/d_a_dshutter/d_a_dshutter.h"
@@ -12,21 +11,13 @@
#include "rel/d/a/d_a_mirror/d_a_mirror.h"
#include "rel/d/a/d_a_movie_player/d_a_movie_player.h"
#include "rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h"
#include "rel/d/a/d_a_ykgr/d_a_ykgr.h"
#include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h"
#include "rel/d/a/obj/d_a_obj_movebox/d_a_obj_movebox.h"
#include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h"
#include "rel/d/a/tag/d_a_tag_mist/d_a_tag_mist.h"
#include "rel/d/a/tag/d_a_tag_stream/d_a_tag_stream.h"
#include "rel/d/a/d_a_ykgr/d_a_ykgr.h"
//
// Types:
//
struct daObjMovebox {
struct Act_c {
static void* M_dir_base[2];
};
};
#include "stdio.h"
//
// Forward References:
src/d/d_ev_camera.cpp
+3 -9
View File
@@ -10,14 +10,7 @@
#include "d/d_demo.h"
#include "dol2asm.h"
#include "m_Do/m_Do_controller_pad.h"
//
// Types:
//
struct daMidna_c {
/* 800977A8 */ void checkNoDraw() const;
};
#include "rel/d/a/d_a_midna/d_a_midna.h"
//
// Forward References:
@@ -1973,7 +1966,8 @@ asm void dCamera_c::eyePos(fopAc_ac_c* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daMidna_c::checkNoDraw() const {
// BOOL daMidna_c::checkNoDraw() const
extern "C" asm void checkNoDraw__9daMidna_cCFv() {
nofralloc
#include "asm/d/d_ev_camera/checkNoDraw__9daMidna_cCFv.s"
}
src/d/d_resorce.cpp
+3 -10
View File
@@ -11,8 +11,7 @@
#include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
#include "JSystem/JKernel/JKRMemArchive.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "stdio.h"
#include "string.h"
#include "d/bg/d_bg_w_kcol.h"
#include "d/com/d_com_inf_game.h"
#include "dol2asm.h"
#include "dolphin/mtx.h"
@@ -20,14 +19,8 @@
#include "dolphin/types.h"
#include "global.h"
#include "m_Do/m_Do_graphic.h"
//
// Types:
//
struct dBgWKCol {
/* 8007E7D0 */ static void* initKCollision(void*);
};
#include "stdio.h"
#include "string.h"
//
// Forward References: