diff --git a/include/d/actor/d_a_player_main_data.h b/include/d/actor/d_a_player_main_data.h
index f805bea12..28c5dca77 100644
--- a/include/d/actor/d_a_player_main_data.h
+++ b/include/d/actor/d_a_player_main_data.h
@@ -1,46 +1,47 @@
 
 #include "d/d_cc_d.h"
 
-char l_arcName[];
+extern char l_arcName[];
 
-char l_tact_event_label[];
-char l_tact_night_event_label[];
-char l_tact_wind_change_event_label[];
-char l_tact_wind_change_event_label2[];
+extern char l_tact_event_label[];
+extern char l_tact_night_event_label[];
+extern char l_tact_wind_change_event_label[];
+extern char l_tact_wind_change_event_label2[];
 
-const Vec l_ship_offset;
-const Vec l_ship_offset2;
-const Vec l_ship_offset3;
-const Vec l_ship_redge;
-const Vec l_ship_ledge;
-const Vec l_heel_pos;
-const Vec l_toe_pos;
-const Vec l_eye_offset;
-const Vec l_head_center_offset;
-const Vec l_neck_front;
-const Vec l_neck_top;
-const Vec l_land_smoke_offset;
-const Vec l_ms_light_local_start;
-const Vec l_ms_light_local_vec;
-const Vec l_tact_top;
-const Vec l_crawl_start_front_offset;
-const Vec l_crawl_front_offset;
-const Vec l_crawl_back_offset;
-const Vec l_crawl_top_offset;
-const Vec l_crawl_front_up_offset;
-const Vec l_crawl_back_up_offset;
-const Vec l_crawl_stand_up_offset;
-const Vec l_crawl_top_up_offset;
-const Vec l_crawl_side_offset;
-const Vec l_crawl_lside_offset;
-const Vec l_crawl_rside_offset;
-const Vec l_crawl_lside_front_offset;
-const Vec l_crawl_rside_front_offset;
-const Vec l_crawl_min_side_offset;
+extern const Vec l_ship_offset;
+extern const Vec l_ship_offset2;
+extern const Vec l_ship_offset3;
+extern const Vec l_ship_redge;
+extern const Vec l_ship_ledge;
+extern const Vec l_heel_pos;
+extern const Vec l_toe_pos;
+extern const Vec l_eye_offset;
+extern const Vec l_head_center_offset;
+extern const Vec l_neck_front;
+extern const Vec l_neck_top;
+extern const Vec l_land_smoke_offset;
+extern const Vec l_ms_light_local_start;
+extern const Vec l_ms_light_local_vec;
+extern const Vec l_tact_top;
+extern const Vec l_crawl_start_front_offset;
+extern const Vec l_crawl_front_offset;
+extern const Vec l_crawl_back_offset;
+extern const Vec l_crawl_top_offset;
+extern const Vec l_crawl_front_up_offset;
+extern const Vec l_crawl_back_up_offset;
+extern const Vec l_crawl_stand_up_offset;
+extern const Vec l_crawl_top_up_offset;
+extern const Vec l_crawl_side_offset;
+extern const Vec l_crawl_lside_offset;
+extern const Vec l_crawl_rside_offset;
+extern const Vec l_crawl_lside_front_offset;
+extern const Vec l_crawl_rside_front_offset;
+extern const Vec l_crawl_min_side_offset;
 
-static dCcD_SrcCyl l_cyl_src;
-static dCcD_SrcCyl l_wind_cyl_src;
-static dCcD_SrcCyl l_at_cyl_src;
-static dCcD_SrcCps l_at_cps_src;
-static dCcD_SrcCps l_fan_wind_cps_src;
-static dCcD_SrcSph l_fan_wind_sph_src;
+// I believe these won't link properly with the static variables
+//extern dCcD_SrcCyl l_cyl_src;
+extern dCcD_SrcCyl l_wind_cyl_src;
+extern dCcD_SrcCyl l_at_cyl_src;
+//extern dCcD_SrcCps l_at_cps_src;
+extern dCcD_SrcCps l_fan_wind_cps_src;
+extern dCcD_SrcSph l_fan_wind_sph_src;
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index 4318ef85d..7b4bb24e5 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -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;
diff --git a/src/d/actor/d_a_player_main_data.inc b/src/d/actor/d_a_player_main_data.inc
index f20650121..2f33f3219 100644
--- a/src/d/actor/d_a_player_main_data.inc
+++ b/src/d/actor/d_a_player_main_data.inc
@@ -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,