isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-12-18 11:52:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Remove static storage specifier so vars can be found through datacmp (#1171)

Browse source
This commit is contained in:
Christian Semmler 2024-11-26 16:33:18 -07:00 committed by GitHub
parent 83b85f26a7
commit bd011c6724
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp
View file

@ -12,7 +12,7 @@ DECOMP_SIZE_ASSERT(LegoJetskiRaceActor, 0x1a8)
// GLOBAL: LEGO1 0x100da044 // GLOBAL: LEGO1 0x100da044
// GLOBAL: BETA10 0x101be9fc // GLOBAL: BETA10 0x101be9fc
const MxFloat g_eight = 8.0f; MxFloat g_unk0x100da044 = 8.0f;
// FUNCTION: LEGO1 0x10080ef0 // FUNCTION: LEGO1 0x10080ef0
// FUNCTION: BETA10 0x100a8990 // FUNCTION: BETA10 0x100a8990
@ -60,8 +60,8 @@ MxS32 LegoJetskiRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_
if (p_edge == LegoPathController::GetControlEdgeA(12)) { if (p_edge == LegoPathController::GetControlEdgeA(12)) {
m_state = 1; m_state = 1;
if (m_worldSpeed < g_eight) { if (m_worldSpeed < g_unk0x100da044) {
m_worldSpeed = g_eight; m_worldSpeed = g_unk0x100da044;
} }
m_destEdge = LegoPathController::GetControlEdgeA(13); m_destEdge = LegoPathController::GetControlEdgeA(13);
@ -70,8 +70,8 @@ MxS32 LegoJetskiRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_
else if (p_edge == LegoPathController::GetControlEdgeA(14)) { else if (p_edge == LegoPathController::GetControlEdgeA(14)) {
m_state = 1; m_state = 1;
if (m_worldSpeed < g_eight) { if (m_worldSpeed < g_unk0x100da044) {
m_worldSpeed = g_eight; m_worldSpeed = g_unk0x100da044;
} }
m_destEdge = LegoPathController::GetControlEdgeA(15); m_destEdge = LegoPathController::GetControlEdgeA(15);

6
LEGO1/lego/legoomni/src/race/carrace.cpp
View file

@ -66,13 +66,13 @@ LegoChar* g_strCRCFRNTY6 = "C_RCFRNTY6";
LegoChar* g_strCRCEDGEY0 = "C_RCEDGEY0"; LegoChar* g_strCRCEDGEY0 = "C_RCEDGEY0";
// GLOBAL: LEGO1 0x100f0c7c // GLOBAL: LEGO1 0x100f0c7c
static MxS32 g_unk0x100f0c7c = 2; MxS32 g_unk0x100f0c7c = 2;
// FUNCTION: LEGO1 0x10016a90 // FUNCTION: LEGO1 0x10016a90
CarRace::CarRace() CarRace::CarRace()
{ {
this->m_skeleton = NULL; m_skeleton = NULL;
this->m_unk0x130 = MxRect32(0x16c, 0x154, 0x1ec, 0x15e); m_unk0x130 = MxRect32(0x16c, 0x154, 0x1ec, 0x15e);
} }
// FUNCTION: LEGO1 0x10016ce0 // FUNCTION: LEGO1 0x10016ce0

12
LEGO1/lego/legoomni/src/worlds/legoact2.cpp
View file

@ -20,23 +20,23 @@ DECOMP_SIZE_ASSERT(LegoAct2, 0x1154)
DECOMP_SIZE_ASSERT(LegoAct2State, 0x10) DECOMP_SIZE_ASSERT(LegoAct2State, 0x10)
// GLOBAL: LEGO1 0x100f4474 // GLOBAL: LEGO1 0x100f4474
static undefined4 g_unk0x100f4474 = 0; undefined4 g_unk0x100f4474 = 0;
// GLOBAL: LEGO1 0x100f43f0 // GLOBAL: LEGO1 0x100f43f0
// GLOBAL: BETA10 0x101e14a8 // GLOBAL: BETA10 0x101e14a8
static MxS32 g_unk0x100f43f0[] = { MxS32 g_unk0x100f43f0[] = {
Act2mainScript::c_tns030bd_RunAnim, Act2mainScript::c_tns030bd_RunAnim,
Act2mainScript::c_tns030pg_RunAnim, Act2mainScript::c_tns030pg_RunAnim,
Act2mainScript::c_tns030rd_RunAnim, Act2mainScript::c_tns030rd_RunAnim,
Act2mainScript::c_tns030sy_RunAnim, Act2mainScript::c_tns030sy_RunAnim,
Act2mainScript::c_tns051in_RunAnim, Act2mainScript::c_snsx35ro_RunAnim,
Act2mainScript::c_tra045la_RunAnim, Act2mainScript::c_snsx36ro_RunAnim,
Act2mainScript::c_tns030bd_RunAnim, Act2mainScript::c_snsx37ro_RunAnim,
Act2mainScript::c_snsx48cl_RunAnim Act2mainScript::c_snsx48cl_RunAnim
}; };
// GLOBAL: LEGO1 0x100f4410 // GLOBAL: LEGO1 0x100f4410
static LegoChar* g_unk0x100f4410[] = {"bd", "pg", "rd", "sy", "ro", "cl"}; LegoChar* g_unk0x100f4410[] = {"bd", "pg", "rd", "sy", "ro", "cl"};
// FUNCTION: LEGO1 0x1004fce0 // FUNCTION: LEGO1 0x1004fce0
// FUNCTION: BETA10 0x1003a5a0 // FUNCTION: BETA10 0x1003a5a0