diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/src/JSystem/J2DGraph/J2DPrint.cpp index ed61cf52a..b99bdb4c2 100644 --- a/src/JSystem/J2DGraph/J2DPrint.cpp +++ b/src/JSystem/J2DGraph/J2DPrint.cpp @@ -560,6 +560,6 @@ f32 J2DPrint::getNumberF32(const u8** param_1, f32 param_2, f32 param_3, int bas return uVar2; } -void dummy2() { +static void dummy2() { OSReport("buff != 0"); } diff --git a/src/JSystem/JUtility/JUTXfb.cpp b/src/JSystem/JUtility/JUTXfb.cpp index 593f1a409..4ebba5849 100644 --- a/src/JSystem/JUtility/JUTXfb.cpp +++ b/src/JSystem/JUtility/JUTXfb.cpp @@ -108,7 +108,7 @@ void JUTXfb::initiate(u16 width, u16 height, JKRHeap* pHeap, JUTXfb::EXfbNumber } } -void dummy() { +static void dummy() { OSReport("JX:: disp = %d\n"); OSReport("JX:: drawing %d -> "); OSReport("%d\n"); diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp index 1e5bab710..876e49112 100644 --- a/src/d/actor/d_a_ghostship.cpp +++ b/src/d/actor/d_a_ghostship.cpp @@ -169,7 +169,7 @@ void daGhostship_c::modeProcCall() { } // probably unused/debug colors or something -const u32 dummy[] = { +static const u32 dummy[] = { 0x0000FF80, 0xFF000080, 0xFF000080, @@ -179,7 +179,7 @@ const u32 dummy[] = { 0x0000FF80, 0x0000FF80, }; -u32 dummyFunc() { +static u32 dummyFunc() { return dummy[0]; } diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index 2c1f010c0..f497225b2 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -1051,7 +1051,7 @@ void daNpc_kam_c::initialDescendEvent(int evtStaffId) { } // Needed for the .rodata section to match. -const f32 dummy5[] = {40.0f}; +static const f32 dummy5[] = {40.0f}; /* 00003730-00003864 .text actionDescendEvent__11daNpc_kam_cFi */ BOOL daNpc_kam_c::actionDescendEvent(int evtStaffId) { diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp index 6217bdb52..aa9f33622 100644 --- a/src/d/actor/d_a_obj_hole.cpp +++ b/src/d/actor/d_a_obj_hole.cpp @@ -119,7 +119,7 @@ void daObj_Hole_c::modeWait() { } // Required to make rodata match -const u8 dummy5[] = { 0x00, 0xFF, 0x00, 0x80}; +static const u8 dummy5[] = { 0x00, 0xFF, 0x00, 0x80}; /* 000004F0-000004F4 .text modeEventInit__12daObj_Hole_cFv */ void daObj_Hole_c::modeEventInit() { diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 251914bb1..48ef8bb9f 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -10,7 +10,7 @@ static f32 dummy1[3] = {1.0f, 1.0f, 1.0f}; static f32 dummy2[3] = {1.0f, 1.0f, 1.0f}; static u8 dummy3[4] = {0x02, 0x00, 0x02, 0x01}; static f64 dummy4[2] = {3.0, 0.5}; -u8 dummy5[0x4C]; +static u8 dummy5[0x4C]; #include "d/actor/d_a_obj_movebox.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp index 7072e5b51..c8139daad 100644 --- a/src/d/actor/d_a_obj_mtest.cpp +++ b/src/d/actor/d_a_obj_mtest.cpp @@ -15,7 +15,7 @@ static f32 dummy1[3] = {1.0f, 1.0f, 1.0f}; static f32 dummy2[3] = {1.0f, 1.0f, 1.0f}; static u8 dummy3[4] = {0x02, 0x00, 0x02, 0x01}; static f64 dummy4[2] = {3.0, 0.5}; -u8 dummy5[0x4C]; +static u8 dummy5[0x4C]; char* daObjMtest::Act_c::M_arcname[Type_Max] = { "Mtest", diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index bc3529e48..cc7ae5e82 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -38,7 +38,7 @@ void dStage_SetErrorRoom() {} /* 8004093C-80040940 .text dStage_SetErrorStage__Fv */ void dStage_SetErrorStage() {} -Vec dummy; +static Vec dummy; dStage_KeepTresureInfo TresureInfo; dStage_KeepDoorInfo DoorInfo; diff --git a/src/m_Do/m_Do_dvd_thread.cpp b/src/m_Do/m_Do_dvd_thread.cpp index 01b497089..6d9b2ebfb 100644 --- a/src/m_Do/m_Do_dvd_thread.cpp +++ b/src/m_Do/m_Do_dvd_thread.cpp @@ -13,7 +13,7 @@ #include "SSystem/SComponent/c_list.h" #include "dolphin/dvd/dvd.h" -u8 dummy[0x0c]; +static u8 dummy[0x0c]; OSThread mDoDvdThd::l_thread; mDoDvdThdStack mDoDvdThd::l_threadStack; mDoDvdThd_param_c mDoDvdThd::l_param;