mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-08 18:43:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanp a bunch of stuff

Browse Source
This commit is contained in:
LagoLunatic
2025-03-28 20:44:06 -04:00
parent b72d243f9b
commit db2c5ef978
31 changed files with 181 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_API_controller_pad.h
+12 -12
View File
@@ -5,18 +5,18 @@
// made up name
struct controller_pad_buttons {
bool left : 1;
bool right : 1;
bool down : 1;
bool up : 1;
bool z : 1;
bool r : 1;
bool l : 1;
bool a : 1;
bool b : 1;
bool x : 1;
bool y : 1;
bool start : 1;
/* 0x00 (0x80 >> 7) */ bool left : 1;
/* 0x00 (0x40 >> 6) */ bool right : 1;
/* 0x00 (0x10 >> 5) */ bool down : 1;
/* 0x00 (0x10 >> 4) */ bool up : 1;
/* 0x00 (0x08 >> 3) */ bool z : 1;
/* 0x00 (0x04 >> 2) */ bool r : 1;
/* 0x00 (0x02 >> 1) */ bool l : 1;
/* 0x00 (0x01 >> 0) */ bool a : 1;
/* 0x01 (0x80 >> 7) */ bool b : 1;
/* 0x01 (0x40 >> 6) */ bool x : 1;
/* 0x01 (0x20 >> 5) */ bool y : 1;
/* 0x01 (0x10 >> 4) */ bool start : 1;
};
struct interface_of_controller_pad {
include/d/actor/d_a_rd.h
+2 -2
View File
@@ -120,8 +120,8 @@ public:
void modeProcInit(int newMode) { modeProc(PROC_INIT, newMode); }
fopAc_ac_c* _searchNearDeadRd(fopAc_ac_c*);
BOOL _nodeControl(J3DNode*, J3DModel*);
BOOL _nodeHeadControl(J3DNode*, J3DModel*);
void _nodeControl(J3DNode*, J3DModel*);
void _nodeHeadControl(J3DNode*, J3DModel*);
BOOL _createHeap();
bool createArrowHeap();
bool checkPlayerInAttack();
include/d/d_a_obj.h
+6 -6
View File
@@ -14,17 +14,17 @@ namespace daObj {
return ((1 << width) - 1) & (param >> shift);
}
void make_land_effect(fopAc_ac_c*, dBgS_GndChk*, float);
cXyz& get_wind_spd(fopAc_ac_c*, float);
cXyz& get_path_spd(cBgS_PolyInfo&, float);
void posMoveF_stream(fopAc_ac_c*, const cXyz*, const cXyz*, float, float);
void posMoveF_grade(fopAc_ac_c*, const cXyz*, const cXyz*, float, float, const cXyz*, float, float, const cXyz*);
void make_land_effect(fopAc_ac_c*, dBgS_GndChk*, f32);
cXyz& get_wind_spd(fopAc_ac_c*, f32);
cXyz& get_path_spd(cBgS_PolyInfo&, f32);
void posMoveF_stream(fopAc_ac_c*, const cXyz*, const cXyz*, f32, f32);
void posMoveF_grade(fopAc_ac_c*, const cXyz*, const cXyz*, f32, f32, const cXyz*, f32, f32, const cXyz*);
void quat_rotBaseY(Quaternion*, const cXyz&);
void quat_rotBaseY2(Quaternion*, const cXyz&);
void quat_rotBaseZ(Quaternion*, const cXyz&);
void quat_rotVec(Quaternion*, const cXyz&, const cXyz&);
void SetCurrentRoomNo(fopAc_ac_c*, dBgS_GndChk*);
void HitSeStart(const cXyz*, int, const dCcD_GObjInf*, unsigned long);
void HitSeStart(const cXyz*, int, const dCcD_GObjInf*, u32);
void HitEff_sub_kikuzu(const cXyz*, const cXyz*, const dKy_tevstr_c*);
void HitEff_kikuzu(const fopAc_ac_c*, const dCcD_Cyl*);
void HitEff_hibana(const cXyz*, const cXyz*);
include/d/d_bg_s_chk.h
+1 -1
View File
@@ -15,4 +15,4 @@ public:
STATIC_ASSERT(sizeof(dBgS_Chk) == 0x14);
#endif /* D_BG_D_BG_S_CHK_H */
#endif /* D_BG_D_BG_S_CHK_H */
include/d/d_particle_name.h
+1 -1
View File
@@ -209,7 +209,7 @@ namespace dPa_name {
};
// Particles that are scene-specific.
// These are not in common.jpc, and must be loaded by a scene's particle bank.
// These are not in common.jpc, and must be loaded by a scene's particle bank.
enum {
ID_SCENE_8058 = 0x8058,
ID_SCENE_8059 = 0x8059,
include/d/d_stage.h
-1
View File
@@ -274,7 +274,6 @@ public:
};
// PPNT / RPPN
struct dPnt;
struct dStage_dPnt_c {
/* 0x0 */ int num;
/* 0x4 */ u32 m_pnt_offset;
include/m_Do/m_Do_ext.h
+3 -3
View File
@@ -582,7 +582,7 @@ public:
mDoExt_3Dline_c();
~mDoExt_3Dline_c();
int init(u16, int, int);
BOOL init(u16 numSegments, BOOL hasSize, BOOL hasTex);
public:
/* 0x00 */ cXyz* mpSegments;
@@ -593,7 +593,7 @@ public:
class mDoExt_3DlineMat0_c : public mDoExt_3DlineMat_c {
public:
int init(u16, u16, int);
BOOL init(u16 numLines, u16 numSegments, BOOL hasSize);
void setMaterial();
void draw();
void update(u16, f32, GXColor&, u16, dKy_tevstr_c*);
@@ -615,7 +615,7 @@ public:
class mDoExt_3DlineMat1_c : public mDoExt_3DlineMat_c {
public:
int init(u16, u16, ResTIMG*, int);
BOOL init(u16 numLines, u16 numSegments, ResTIMG* i_img, BOOL hasSize);
void setMaterial();
void draw();
void update(u16, f32, GXColor&, u16, dKy_tevstr_c*);