mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-11 15:28:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_mg_rod debug improvements (#2993)

Browse Source
This commit is contained in:
Max Roncace
2025-12-23 19:11:09 -05:00
committed by GitHub
parent 877889c510
commit 8a478c5ebe
13 changed files with 937 additions and 867 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_mg_rod.h
+17 -16
View File
@@ -94,9 +94,9 @@ public:
/* 0x0574 */ u8 arg0;
/* 0x0575 */ u8 arg1;
/* 0x0576 */ u8 arg2;
/* 0x0578 */ s16 field_0x578;
/* 0x0578 */ s16 counter;
/* 0x057A */ s16 timers[10];
/* 0x0590 */ f32 field_0x590;
/* 0x0590 */ f32 water_surface_y;
/* 0x0594 */ f32 field_0x594;
/* 0x0598 */ f32 field_0x598;
/* 0x059C */ f32 field_0x59c;
@@ -106,12 +106,12 @@ public:
/* 0x06A0 */ f32 field_0x6a0;
/* 0x06A4 */ f32 field_0x6a4;
/* 0x06A8 */ u8 field_0x6a8;
/* 0x06AC */ cXyz field_0x6ac;
/* 0x06AC */ cXyz rod_tip_pos;
/* 0x06B8 */ cXyz field_0x6b8;
/* 0x06C4 */ s16 field_0x6c4;
/* 0x06C4 */ s16 rod_angle_y;
/* 0x06C8 */ cXyz field_0x6c8;
/* 0x06D4 */ cXyz field_0x6d4;
/* 0x06E0 */ f32 field_0x6e0;
/* 0x06E0 */ f32 cast_momentum;
/* 0x06E4 */ f32 field_0x6e4;
/* 0x06E8 */ s8 field_0x6e8;
/* 0x06EC */ cXyz field_0x6ec;
@@ -156,10 +156,10 @@ public:
/* 0x0FF2 */ s16 field_0xff2;
/* 0x0FF4 */ s16 field_0xff4;
/* 0x0FF8 */ f32 field_0xff8;
/* 0x0FFC */ s16 field_0xffc;
/* 0x0FFE */ s16 field_0xffe;
/* 0x1000 */ s16 field_0x1000;
/* 0x1002 */ s16 field_0x1002;
/* 0x0FFC */ s16 lure_yaw_offset;
/* 0x0FFE */ s16 lure_yaw_target;
/* 0x1000 */ s16 lure_pitch_offset;
/* 0x1002 */ s16 lure_pitch_target;
/* 0x1004 */ s16 field_0x1004;
/* 0x1006 */ s16 field_0x1006;
/* 0x1008 */ s8 field_0x1008;
@@ -167,7 +167,7 @@ public:
/* 0x100A */ s8 field_0x100a;
/* 0x100B */ u8 field_0x100b;
/* 0x100C */ u8 field_0x100c;
/* 0x100D */ s8 field_0x100d;
/* 0x100D */ s8 is_hook_in_water;
/* 0x100E */ s8 field_0x100e;
/* 0x100F */ s8 field_0x100f;
/* 0x1010 */ cXyz field_0x1010;
@@ -218,10 +218,11 @@ public:
/* 0x114E */ s16 field_0x114e;
/* 0x1150 */ s16 field_0x1150;
/* 0x1154 */ f32 field_0x1154;
/* 0x1158 */ u8 field_0x1158[0x1165 - 0x1158];
/* 0x1165 */ s8 field_0x1165;
/* 0x1158 */ cXyz field_0x1158;
/* 0x1164 */ u8 field_0x1164[0x1165 - 0x1164];
/* 0x1165 */ s8 cast_bob_timer;
/* 0x1168 */ u32 sibuki_eff[4];
/* 0x1178 */ u32 field_0x1178;
/* 0x1178 */ u32 emitter_id;
/* 0x117C */ u32 field_0x117c;
/* 0x1180 */ u32 field_0x1180[2];
/* 0x1188 */ f32 field_0x1188;
@@ -246,7 +247,7 @@ public:
/* 0x1407 */ u8 field_0x1407;
/* 0x1408 */ f32 play_cam_fovy;
/* 0x140C */ f32 field_0x140c;
/* 0x1410 */ f32 field_0x1410;
/* 0x1410 */ f32 camera_morf_rate;
/* 0x1414 */ f32 field_0x1414;
/* 0x1418 */ s16 field_0x1418;
/* 0x141A */ s16 field_0x141a;
@@ -262,8 +263,8 @@ public:
/* 0x1458 */ cXyz field_0x1458;
/* 0x1464 */ f32 field_0x1464;
/* 0x1468 */ u8 field_0x1468[0x146C - 0x1468];
/* 0x146C */ u8 field_0x146c;
/* 0x146D */ s8 field_0x146d;
/* 0x146C */ u8 input_cooldown;
/* 0x146D */ s8 msg_flow_state;
/* 0x146E */ u8 field_0x146E[0x1470 - 0x146E];
/* 0x1470 */ u8 field_0x1470;
/* 0x1472 */ s16 field_0x1472;
include/d/d_demo.h
+2
View File
@@ -1,6 +1,8 @@
#ifndef D_D_DEMO_H
#define D_D_DEMO_H
#include "m_Do/m_Do_ext.h"
#include "m_Do/m_Do_mtx.h"
#include "JSystem/JStudio/JStudio_JAudio2/control.h"
#include "JSystem/JStudio/JStudio_JParticle/object-particle.h"
#include "JSystem/JStudio/JStudio_JStage/object.h"
include/d/d_kankyo_tev_str.h
+3 -2
View File
@@ -1,8 +1,9 @@
#ifndef D_D_KANKYO_TEV_STR
#define D_D_KANKYO_TEV_STR
#include "JSystem/J3DGraphBase/J3DStruct.h"
#include "m_Do/m_Do_ext.h"
#include "JSystem/J3DGraphBase/J3DTevs.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
class dKy_tevstr_c {
public:
include/d/d_meter2_info.h
+1 -1
View File
@@ -117,7 +117,7 @@ public:
bool isUseButton(int i_buttonBit) { return i_buttonBit & mUseButton; }
void setMeterMapClass(dMeterMap_c* i_map) { mMeterMap = i_map; }
void resetGameStatus() { mGameStatus = 0; }
void onGameStatus(int i_status) { mGameStatus |= i_status; }
void onGameStatus(int i_status) { mGameStatus |= (u16)i_status; }
void setMapStatus(u8 i_status) { mMapStatus = i_status; }
u8 getMapStatus() { return mMapStatus; }
void setPauseStatus(u8 i_status) { mPauseStatus = i_status; }
include/d/dolzel_base.pch
+2
View File
@@ -15,6 +15,8 @@
#include "JSystem/JUtility/JUTGamePad.h" // IWYU pragma: export
#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" // IWYU pragma: export
#include "JSystem/JHostIO/JORReflexible.h" // IWYU pragma: export
#include "SSystem/SComponent/c_m3d_g_sph.h" // IWYU pragma: export
#include "SSystem/SComponent/c_m3d_g_aab.h" // IWYU pragma: export
#include "SSystem/SComponent/c_m3d_g_pla.h" // IWYU pragma: export
#include "SSystem/SComponent/c_bg_s_chk.h" // IWYU pragma: export
#include "f_op/f_op_actor.h" // IWYU pragma: export
include/f_op/f_op_actor.h
+4 -1
View File
@@ -3,13 +3,16 @@
#include "d/d_kankyo_tev_str.h"
#include "f_pc/f_pc_leaf.h"
#include "m_Do/m_Do_audio.h"
#include "JSystem/J3DGraphAnimator/J3DModel.h"
#include "SSystem/SComponent/c_sxyz.h"
#include "global.h"
struct actor_method_class {
/* 0x00 */ leafdraw_method_class base;
/* 0x14 */ u8 field_0x14[0xC]; // Likely padding
};
};
struct actor_process_profile_definition {
/* 0x00 */ leaf_process_profile_definition base;
/* 0x24 */ actor_method_class* sub_method;
include/f_op/f_op_actor_mng.h
+2 -2
View File
@@ -37,6 +37,8 @@ class J3DModelData; // placeholder
class JKRHeap;
class cM3dGPla;
s8 dComIfGp_getReverb(int roomNo);
struct fopAcM_prmBase_class {
/* 0x00 */ u32 parameters;
/* 0x04 */ cXyz position;
@@ -760,8 +762,6 @@ inline s16 fopAcM_toPlayerShapeAngleY(const fopAc_ac_c* i_actor) {
return fopAcM_toActorShapeAngleY(i_actor, dComIfGp_getPlayer(0));
}
s8 dComIfGp_getReverb(int roomNo);
inline void fopAcM_seStartCurrent(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
mDoAud_seStart(sfxID, &actor->current.pos, param_2,
dComIfGp_getReverb(fopAcM_GetRoomNo(actor)));