mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-10 19:16:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor Player Data Work

Browse Source 
Fix initialization/multiple definition errors, move some things to get sinit closer to matching
This commit is contained in:
SuperDude88
2024-05-18 21:10:24 -04:00
parent 4fe8a9bd46
commit 55ff1d4923
3 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_player_main.cpp
+6 -5
View File
@@ -31,11 +31,8 @@
#include "SSystem/SComponent/c_counter.h"
#include "m_Do/m_Do_graphic.h"
cXyz l_hammer_splash_particle_scale(0.00002f, 0.00002f, 0.00002f);
cXyz l_debug_keep_pos;
csXyz l_debug_current_angle;
csXyz l_debug_shape_angle;
static u8 dummy[0xC];
JGeometry::TVec3<f32> l_hammer_splash_particle_scale(0.67f, 0.67f, 0.67f);
#include "d/actor/d_a_player_main_data.inc"
@@ -193,6 +190,10 @@ static void dummydatafunc(f32* temp, f64* temp2) {
OSReport("data_size < l_sanm_buffer_size");
}
cXyz l_debug_keep_pos;
csXyz l_debug_current_angle;
csXyz l_debug_shape_angle;
GXColor l_freeze_fade_color = {0xFF, 0xFF, 0xFF, 0xFF};
u8 daPy_matAnm_c::m_maba_flg;
src/d/actor/d_a_player_main_data.inc
+4 -4
View File
@@ -73,7 +73,7 @@ static dCcD_SrcCyl l_cyl_src = {
},
};
static dCcD_SrcCyl l_wind_cyl_src = {
dCcD_SrcCyl l_wind_cyl_src = {
// dCcD_SrcGObjInf
{
/* Flags */ 0,
@@ -103,7 +103,7 @@ static dCcD_SrcCyl l_wind_cyl_src = {
},
};
static dCcD_SrcCyl l_at_cyl_src = {
dCcD_SrcCyl l_at_cyl_src = {
// dCcD_SrcGObjInf
{
/* Flags */ 0,
@@ -163,7 +163,7 @@ static dCcD_SrcCps l_at_cps_src = {
},
};
static dCcD_SrcCps l_fan_wind_cps_src = {
dCcD_SrcCps l_fan_wind_cps_src = {
// dCcD_SrcGObjInf
{
/* Flags */ 0,
@@ -193,7 +193,7 @@ static dCcD_SrcCps l_fan_wind_cps_src = {
},
};
static dCcD_SrcSph l_fan_wind_sph_src = {
dCcD_SrcSph l_fan_wind_sph_src = {
// dCcD_SrcGObjInf
{
/* Flags */ 0,