Made local functions static in present dll
Added missing includes in present.h
This commit is contained in:
kabiskac
parent
004925d41c
commit
a7bde60c97
7 changed files with 114 additions and 104 deletions
|
|
@ -33,7 +33,7 @@ typedef struct UnkPresentCameraStruct {
|
|||
/* 0x98 */ float unk_98;
|
||||
} UnkPresentCameraStruct; /* size = 0x9C */
|
||||
|
||||
void fn_1_C20(omObjData *object);
|
||||
static void fn_1_C20(omObjData *object);
|
||||
|
||||
omObjData *fn_1_6B4(void)
|
||||
{
|
||||
|
|
@ -97,7 +97,7 @@ void fn_1_9A4(omObjData *object, float arg8, float arg9, float argA, s32 arg1)
|
|||
var_r31->unk_90 = 1.0f / arg1;
|
||||
}
|
||||
|
||||
void fn_1_A28(omObjData *object, s32 arg1, float arg8, float arg9, float argA)
|
||||
static void fn_1_A28(omObjData *object, s32 arg1, float arg8, float arg9, float argA)
|
||||
{
|
||||
UnkPresentCameraStruct *var_r31 = object->data;
|
||||
|
||||
|
|
@ -112,7 +112,7 @@ void fn_1_A28(omObjData *object, s32 arg1, float arg8, float arg9, float argA)
|
|||
var_r31->unk_98 = 1.0f / arg1;
|
||||
}
|
||||
|
||||
float fn_1_AAC(omObjData *object)
|
||||
static float fn_1_AAC(omObjData *object)
|
||||
{
|
||||
UnkPresentCameraStruct *var_r31 = object->data;
|
||||
|
||||
|
|
@ -120,7 +120,7 @@ float fn_1_AAC(omObjData *object)
|
|||
return var_f31;
|
||||
}
|
||||
|
||||
float fn_1_ADC(omObjData *object)
|
||||
static float fn_1_ADC(omObjData *object)
|
||||
{
|
||||
UnkPresentCameraStruct *var_r31 = object->data;
|
||||
|
||||
|
|
@ -128,7 +128,7 @@ float fn_1_ADC(omObjData *object)
|
|||
return var_f31;
|
||||
}
|
||||
|
||||
void fn_1_B0C(omObjData *object, float *arg1, float *arg2, float *arg3)
|
||||
static void fn_1_B0C(omObjData *object, float *arg1, float *arg2, float *arg3)
|
||||
{
|
||||
UnkPresentCameraStruct *var_r31 = object->data;
|
||||
|
||||
|
|
@ -137,7 +137,7 @@ void fn_1_B0C(omObjData *object, float *arg1, float *arg2, float *arg3)
|
|||
*arg3 = var_r31->pos.z;
|
||||
}
|
||||
|
||||
void fn_1_B3C(omObjData *object, float *arg1, float *arg2, float *arg3)
|
||||
static void fn_1_B3C(omObjData *object, float *arg1, float *arg2, float *arg3)
|
||||
{
|
||||
UnkPresentCameraStruct *var_r31 = object->data;
|
||||
|
||||
|
|
@ -167,7 +167,7 @@ void fn_1_BF8(omObjData *object)
|
|||
fn_1_C20(object);
|
||||
}
|
||||
|
||||
void fn_1_C20(omObjData *object)
|
||||
static void fn_1_C20(omObjData *object)
|
||||
{
|
||||
float var_f31;
|
||||
float var_f30;
|
||||
|
|
@ -223,7 +223,7 @@ void fn_1_C20(omObjData *object)
|
|||
var_r31->target.y, var_r31->target.z);
|
||||
}
|
||||
|
||||
void fn_1_1198(omObjData *object)
|
||||
static void fn_1_1198(omObjData *object)
|
||||
{
|
||||
if (HuPadBtn[0] & PAD_BUTTON_B) {
|
||||
UnkPresentCameraStruct *var_r31 = object->data;
|
||||
|
|
@ -237,7 +237,7 @@ void fn_1_1198(omObjData *object)
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_1398(omObjData *object)
|
||||
static void fn_1_1398(omObjData *object)
|
||||
{
|
||||
UnkPresentCameraStruct *var_r31 = object->data;
|
||||
print8(32, 64, 1.5f, "AT : x=%.2f y=%.2f z=%.2f", var_r31->target.x, var_r31->target.y, var_r31->target.z);
|
||||
|
|
|
|||
|
|
@ -28,15 +28,15 @@ typedef struct UnkPresentStruct5 {
|
|||
/* 0x54 */ s32 unk_54;
|
||||
} UnkPresentStruct5; /* size = 0x58 */
|
||||
|
||||
void fn_1_4620(omObjData *object);
|
||||
void fn_1_4880(omObjData *object);
|
||||
static void fn_1_4620(omObjData *object);
|
||||
static void fn_1_4880(omObjData *object);
|
||||
static void fn_1_4A04(omObjData *object);
|
||||
static float fn_1_4CEC(float arg8, float arg9, float argA);
|
||||
|
||||
omObjFunc lbl_1_data_1A0[] = { NULL, fn_1_4620, fn_1_4880 };
|
||||
|
||||
static const s32 lbl_1_rodata_BD8[] = { 0x006E0089, 0x006E008A, 0x006E008B };
|
||||
|
||||
void fn_1_4A04(omObjData *object);
|
||||
float fn_1_4CEC(float arg8, float arg9, float argA);
|
||||
|
||||
omObjData *fn_1_42F4(void)
|
||||
{
|
||||
|
|
@ -105,7 +105,7 @@ s32 fn_1_4604(omObjData *object)
|
|||
return var_r31->unk_00;
|
||||
}
|
||||
|
||||
void fn_1_4620(omObjData *object)
|
||||
static void fn_1_4620(omObjData *object)
|
||||
{
|
||||
float var_f31;
|
||||
UnkPresentStruct5 *var_r31 = object->data;
|
||||
|
|
@ -150,7 +150,7 @@ void fn_1_4620(omObjData *object)
|
|||
fn_1_4A04(object);
|
||||
}
|
||||
|
||||
void fn_1_4880(omObjData *object)
|
||||
static void fn_1_4880(omObjData *object)
|
||||
{
|
||||
float var_f31;
|
||||
|
||||
|
|
@ -181,7 +181,7 @@ void fn_1_4880(omObjData *object)
|
|||
(void)object;
|
||||
}
|
||||
|
||||
void fn_1_4A04(omObjData *object)
|
||||
static void fn_1_4A04(omObjData *object)
|
||||
{
|
||||
UnkPresentStruct5 *var_r31 = object->data;
|
||||
s16 var_r29 = 0;
|
||||
|
|
@ -214,7 +214,7 @@ void fn_1_4A04(omObjData *object)
|
|||
omSetRot(object, var_r31->unk_20, var_r31->unk_24, var_r31->unk_28);
|
||||
}
|
||||
|
||||
float fn_1_4CEC(float arg8, float arg9, float argA)
|
||||
static float fn_1_4CEC(float arg8, float arg9, float argA)
|
||||
{
|
||||
float var_f30;
|
||||
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@ omObjData *lbl_1_bss_8;
|
|||
Process *lbl_1_bss_4;
|
||||
omObjData *lbl_1_bss_0;
|
||||
|
||||
void fn_1_254(void);
|
||||
void fn_1_45C(void);
|
||||
void fn_1_5EC(omObjData *object);
|
||||
static void fn_1_254(void);
|
||||
static void fn_1_45C(void);
|
||||
static void fn_1_5EC(omObjData *object);
|
||||
|
||||
void ObjectSetup(void)
|
||||
{
|
||||
|
|
@ -64,7 +64,7 @@ void fn_1_144(s16 arg0, s32 arg1, s32 arg2)
|
|||
var_r30->user_data = var_r31;
|
||||
}
|
||||
|
||||
void fn_1_254(void)
|
||||
static void fn_1_254(void)
|
||||
{
|
||||
UnkPresentStruct6 *var_r31 = HuPrcCurrentGet()->user_data;
|
||||
|
||||
|
|
@ -114,7 +114,7 @@ void fn_1_334(s16 arg0, s32 arg1, float arg8, s32 arg2)
|
|||
var_r30->user_data = var_r31;
|
||||
}
|
||||
|
||||
void fn_1_45C(void)
|
||||
static void fn_1_45C(void)
|
||||
{
|
||||
UnkPresentStruct6Weird *var_r31 = HuPrcCurrentGet()->user_data;
|
||||
|
||||
|
|
@ -141,25 +141,25 @@ void fn_1_45C(void)
|
|||
HuPrcEnd();
|
||||
}
|
||||
|
||||
u32 fn_1_550(u16 arg0)
|
||||
s32 fn_1_550(u16 arg0)
|
||||
{
|
||||
u32 var_r31 = HuPadBtnDown[0] & arg0;
|
||||
return var_r31 != 0;
|
||||
}
|
||||
|
||||
u32 fn_1_584(u16 arg0)
|
||||
s32 fn_1_584(u16 arg0)
|
||||
{
|
||||
u32 var_r31 = HuPadDStkRep[0] & arg0;
|
||||
return var_r31 != 0;
|
||||
}
|
||||
|
||||
u32 fn_1_5B8(u16 arg0)
|
||||
s32 fn_1_5B8(u16 arg0)
|
||||
{
|
||||
u32 var_r31 = HuPadDStk[0] & arg0;
|
||||
return var_r31 != 0;
|
||||
}
|
||||
|
||||
void fn_1_5EC(omObjData *object)
|
||||
static void fn_1_5EC(omObjData *object)
|
||||
{
|
||||
switch (object->unk10) {
|
||||
case 0:
|
||||
|
|
|
|||
|
|
@ -22,12 +22,11 @@ omObjData *lbl_1_bss_20;
|
|||
|
||||
UnkPresentStruct4 lbl_1_data_F0 = { { 0.0f, 3000.0f, 1.0f }, { 0.0f, 1.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } };
|
||||
|
||||
void fn_1_3B8C(omObjData *object);
|
||||
void fn_1_3DB8(omObjData *object);
|
||||
void fn_1_4040(UnkWindowDataStruct *arg0);
|
||||
void fn_1_4190(UnkWindowDataStruct *arg0);
|
||||
void fn_1_41E0(void);
|
||||
void fn_1_41BC(UnkWindowDataStruct *arg0, s32 arg1);
|
||||
static void fn_1_3B8C(omObjData *object);
|
||||
static void fn_1_3DB8(omObjData *object);
|
||||
static void fn_1_4190(UnkWindowDataStruct *arg0);
|
||||
static void fn_1_41BC(UnkWindowDataStruct *arg0, s32 arg1);
|
||||
static void fn_1_41E0(void);
|
||||
|
||||
omObjData *fn_1_39A8(void)
|
||||
{
|
||||
|
|
@ -68,7 +67,7 @@ void fn_1_3B18(omObjData *object)
|
|||
HuMemDirectFree(var_r31);
|
||||
}
|
||||
|
||||
void fn_1_3B8C(omObjData *object)
|
||||
static void fn_1_3B8C(omObjData *object)
|
||||
{
|
||||
UnkPresentStruct *var_r30 = object->data;
|
||||
|
||||
|
|
@ -149,7 +148,7 @@ void fn_1_3B8C(omObjData *object)
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_3DB8(omObjData *arg0)
|
||||
static void fn_1_3DB8(omObjData *arg0)
|
||||
{
|
||||
void *sp8 = arg0->data;
|
||||
|
||||
|
|
@ -245,17 +244,17 @@ void fn_1_4104(UnkWindowDataStruct *windowData, u32 mess, s16 index)
|
|||
HuWinInsertMesSet(windowData->window, mess, index);
|
||||
}
|
||||
|
||||
void fn_1_4144(UnkWindowDataStruct *windowData, float x, float y)
|
||||
static void fn_1_4144(UnkWindowDataStruct *windowData, float x, float y)
|
||||
{
|
||||
HuWinPosSet(windowData->window, x, y);
|
||||
}
|
||||
|
||||
void fn_1_4184(UnkWindowDataStruct *windowData)
|
||||
static void fn_1_4184(UnkWindowDataStruct *windowData)
|
||||
{
|
||||
windowData->unk0C = 1;
|
||||
}
|
||||
|
||||
void fn_1_4190(UnkWindowDataStruct *windowData)
|
||||
static void fn_1_4190(UnkWindowDataStruct *windowData)
|
||||
{
|
||||
windowData->unk0C = 0;
|
||||
}
|
||||
|
|
@ -268,7 +267,7 @@ void fn_1_419C(UnkWindowDataStruct *windowData)
|
|||
windowData->unk10 = 1;
|
||||
}
|
||||
|
||||
void fn_1_41BC(UnkWindowDataStruct *windowData, s32 arg1)
|
||||
static void fn_1_41BC(UnkWindowDataStruct *windowData, s32 arg1)
|
||||
{
|
||||
if (!windowData->unk_20) {
|
||||
windowData->unk_20 = 4;
|
||||
|
|
@ -277,7 +276,7 @@ void fn_1_41BC(UnkWindowDataStruct *windowData, s32 arg1)
|
|||
windowData->choice = arg1;
|
||||
}
|
||||
|
||||
void fn_1_41E0(void)
|
||||
static void fn_1_41E0(void)
|
||||
{
|
||||
UnkWindowDataStruct *windowData = HuPrcCurrentGet()->user_data;
|
||||
|
||||
|
|
|
|||
|
|
@ -58,21 +58,20 @@ typedef struct UnkPresentStruct7 {
|
|||
/* 0x04 */ float unk_04;
|
||||
} UnkPresentStruct7; /* size = 0x08 */
|
||||
|
||||
void fn_1_180C(omObjData *object, s32 arg1);
|
||||
void fn_1_1928(omObjData *arg0);
|
||||
void fn_1_1FA8(omObjData *object, s32 arg1);
|
||||
void fn_1_20E8(omObjData *arg0);
|
||||
void fn_1_268C(omObjData *object, float *arg1, float *arg2, float *arg3);
|
||||
void fn_1_2708(omObjData *arg0, float arg8, s32 arg1);
|
||||
void fn_1_2774(omObjData *arg0);
|
||||
s32 fn_1_28F0(omObjData *object);
|
||||
void fn_1_2924(omObjData *object);
|
||||
s32 fn_1_2B84(omObjData *arg0, s32 arg1, s32 arg2);
|
||||
s32 fn_1_2BCC(omObjData *object, s32 arg1);
|
||||
s32 fn_1_2C5C(omObjData *object, s32 arg1);
|
||||
s32 fn_1_3394(s32 arg0);
|
||||
void fn_1_33AC(omObjData *arg0);
|
||||
s32 fn_1_393C(s32 arg0, s32 arg1);
|
||||
static void fn_1_1928(omObjData *arg0);
|
||||
static void fn_1_1FA8(omObjData *object, s32 arg1);
|
||||
static void fn_1_20E8(omObjData *arg0);
|
||||
static void fn_1_268C(omObjData *object, float *arg1, float *arg2, float *arg3);
|
||||
static void fn_1_2708(omObjData *arg0, float arg8, s32 arg1);
|
||||
static void fn_1_2774 (omObjData *arg0);
|
||||
static s32 fn_1_28F0 (omObjData *object);
|
||||
static void fn_1_2924(omObjData *object);
|
||||
static s32 fn_1_2B84(omObjData *arg0, s32 arg1, s32 arg2);
|
||||
static s32 fn_1_2BCC(omObjData *object, s32 arg1);
|
||||
static s32 fn_1_2C5C(omObjData *object, s32 arg1);
|
||||
static s32 fn_1_3394(s32 arg0);
|
||||
static void fn_1_33AC(omObjData *arg0);
|
||||
static s32 fn_1_393C(s32 arg0, s32 arg1);
|
||||
|
||||
UnkPresentStruct3 lbl_1_data_50 = { { 0.0f, 400.0f, 0.0f }, { 0.0f, -400.0f, -500.0f }, { 255, 255, 255, 255 } };
|
||||
omObjFunc lbl_1_data_6C[] = { NULL, fn_1_1928, fn_1_20E8, fn_1_33AC };
|
||||
|
|
@ -314,7 +313,7 @@ void fn_1_186C(omObjData *object, s32 arg1)
|
|||
var_r31->unk_238 = 0;
|
||||
}
|
||||
|
||||
void fn_1_1928(omObjData *object)
|
||||
static void fn_1_1928(omObjData *object)
|
||||
{
|
||||
Vec sp8;
|
||||
s32 var_r29;
|
||||
|
|
@ -477,7 +476,7 @@ void fn_1_1928(omObjData *object)
|
|||
fn_1_2774(object);
|
||||
}
|
||||
|
||||
void fn_1_1FA8(omObjData *object, s32 arg1)
|
||||
static void fn_1_1FA8(omObjData *object, s32 arg1)
|
||||
{
|
||||
float var_f31;
|
||||
float var_f30;
|
||||
|
|
@ -524,7 +523,7 @@ void fn_1_1FA8(omObjData *object, s32 arg1)
|
|||
fn_1_2708(object, var_f29, var_r28);
|
||||
}
|
||||
|
||||
void fn_1_20E8(omObjData *object)
|
||||
static void fn_1_20E8(omObjData *object)
|
||||
{
|
||||
float var_f31;
|
||||
float var_f30;
|
||||
|
|
@ -655,7 +654,7 @@ void fn_1_20E8(omObjData *object)
|
|||
}
|
||||
}
|
||||
|
||||
void fn_1_268C(omObjData *object, float *arg1, float *arg2, float *arg3)
|
||||
static void fn_1_268C(omObjData *object, float *arg1, float *arg2, float *arg3)
|
||||
{
|
||||
Mtx sp8;
|
||||
|
||||
|
|
@ -665,7 +664,7 @@ void fn_1_268C(omObjData *object, float *arg1, float *arg2, float *arg3)
|
|||
*arg3 = sp8[2][3];
|
||||
}
|
||||
|
||||
void fn_1_2708(omObjData *arg0, float arg8, s32 arg1)
|
||||
static void fn_1_2708(omObjData *arg0, float arg8, s32 arg1)
|
||||
{
|
||||
UnkPresentStruct2 *var_r31 = arg0->data;
|
||||
|
||||
|
|
@ -675,7 +674,7 @@ void fn_1_2708(omObjData *arg0, float arg8, s32 arg1)
|
|||
var_r31->unk_250 = 1.0f / arg1;
|
||||
}
|
||||
|
||||
void fn_1_2774(omObjData *object)
|
||||
static void fn_1_2774 (omObjData *object)
|
||||
{
|
||||
s32 var_r30;
|
||||
UnkPresentStruct2 *var_r31 = object->data;
|
||||
|
|
@ -700,7 +699,7 @@ void fn_1_2774(omObjData *object)
|
|||
}
|
||||
}
|
||||
|
||||
s32 fn_1_28F0(omObjData *object)
|
||||
static s32 fn_1_28F0 (omObjData *object)
|
||||
{
|
||||
UnkPresentStruct2 *var_r31 = object->data;
|
||||
return var_r31->unk_248 < 1.0f;
|
||||
|
|
@ -708,7 +707,7 @@ s32 fn_1_28F0(omObjData *object)
|
|||
|
||||
s32 lbl_1_data_84[] = { 0, 1, 2, 3, 4, 6, 7, 8 };
|
||||
|
||||
void fn_1_2924(omObjData *object)
|
||||
static void fn_1_2924(omObjData *object)
|
||||
{
|
||||
UnkPresentStruct2 *var_r31 = object->data;
|
||||
s32 var_r30;
|
||||
|
|
@ -753,13 +752,13 @@ void fn_1_2924(omObjData *object)
|
|||
|
||||
static const s32 lbl_1_rodata_A74[] = { 0, 6, 12, 18, 24, 59, 30, 36, 42, 48 };
|
||||
|
||||
s32 fn_1_2B84(omObjData *arg0, s32 arg1, s32 arg2)
|
||||
static s32 fn_1_2B84(omObjData *arg0, s32 arg1, s32 arg2)
|
||||
{
|
||||
UnkPresentStruct2 *var_r31 = arg0->data;
|
||||
return var_r31->unk_270[arg2 + lbl_1_rodata_A74[arg1]] != 0;
|
||||
}
|
||||
|
||||
s32 fn_1_2BCC(omObjData *object, s32 arg1)
|
||||
static s32 fn_1_2BCC(omObjData *object, s32 arg1)
|
||||
{
|
||||
s32 var_r31;
|
||||
s32 var_r30;
|
||||
|
|
@ -774,7 +773,7 @@ s32 fn_1_2BCC(omObjData *object, s32 arg1)
|
|||
return var_r30;
|
||||
}
|
||||
|
||||
s32 fn_1_2C5C(omObjData *object, s32 arg1)
|
||||
static s32 fn_1_2C5C(omObjData *object, s32 arg1)
|
||||
{
|
||||
UnkPresentStruct7 spA4[10];
|
||||
Vec sp38;
|
||||
|
|
@ -881,7 +880,7 @@ s32 fn_1_2C5C(omObjData *object, s32 arg1)
|
|||
|
||||
static const s32 lbl_1_rodata_AC8[] = { 6, 6, 6, 6, 6, 1, 6, 6, 6, 11 };
|
||||
|
||||
s32 fn_1_3394(s32 arg0)
|
||||
static s32 fn_1_3394(s32 arg0)
|
||||
{
|
||||
return lbl_1_rodata_AC8[arg0];
|
||||
}
|
||||
|
|
@ -891,7 +890,7 @@ static const s32 lbl_1_rodata_B18[] = { 8, 20, 32, 44, 56, 0, 68, 80, 92, 0 };
|
|||
static const s32 lbl_1_rodata_B40[] = { 126, 127, 128, 129, 130, 0, 131, 132, 133, 0 };
|
||||
static const s32 lbl_1_rodata_B68[] = { 118, 119, 120, 121, 122, 0, 123, 124, 125, 0 };
|
||||
|
||||
void fn_1_33AC(omObjData *object)
|
||||
static void fn_1_33AC(omObjData *object)
|
||||
{
|
||||
f32 var_f31;
|
||||
f32 var_f29;
|
||||
|
|
@ -949,7 +948,7 @@ void fn_1_33AC(omObjData *object)
|
|||
|
||||
static const s32 lbl_1_rodata_BA4[][2] = { { 7, 1 } };
|
||||
|
||||
s32 fn_1_393C(s32 arg0, s32 arg1)
|
||||
static s32 fn_1_393C(s32 arg0, s32 arg1)
|
||||
{
|
||||
s32 var_r31;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue