kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

present cleanups

Browse source
This commit is contained in:
kabiskac 2024-08-02 01:43:10 +02:00
parent 8589c3e6c9
commit 579e3dd2e2
5 changed files with 733 additions and 730 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/REL/present/camera.c
View file

@ -9,11 +9,8 @@ void fn_1_C20(omObjData *object);
omObjData *fn_1_6B4(void)
{
omObjData *var_r30;
UnkPresentCameraStruct *var_r31;
var_r30 = omAddObjEx(lbl_1_bss_4, 1001, 0, 0, 3, fn_1_BF8);
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 156, MEMORY_DEFAULT_NUM);
omObjData *var_r30 = omAddObjEx(lbl_1_bss_4, 1001, 0, 0, 3, fn_1_BF8);
UnkPresentCameraStruct *var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 156, MEMORY_DEFAULT_NUM);
var_r30->data = var_r31;
var_r31->pos.x = 0.0f;
@ -48,9 +45,8 @@ void fn_1_8F0(omObjData *object)
void fn_1_920(omObjData *object, float arg8, float arg9, float argA, s32 arg1)
{
UnkPresentCameraStruct *var_r31;
UnkPresentCameraStruct *var_r31 = object->data;
var_r31 = object->data;
var_r31->unk_58.x = arg8;
var_r31->unk_58.y = arg9;
var_r31->unk_58.z = argA;
@ -62,9 +58,8 @@ void fn_1_920(omObjData *object, float arg8, float arg9, float argA, s32 arg1)
void fn_1_9A4(omObjData *object, float arg8, float arg9, float argA, s32 arg1)
{
UnkPresentCameraStruct *var_r31;
UnkPresentCameraStruct *var_r31 = object->data;
var_r31 = object->data;
var_r31->unk_64.x = arg8;
var_r31->unk_64.y = arg9;
var_r31->unk_64.z = argA;
@ -76,9 +71,8 @@ void fn_1_9A4(omObjData *object, float arg8, float arg9, float argA, s32 arg1)
void fn_1_A28(omObjData *object, s32 arg1, float arg8, float arg9, float argA)
{
UnkPresentCameraStruct *var_r31;
UnkPresentCameraStruct *var_r31 = object->data;
var_r31 = object->data;
var_r31->unk_64.y = argA;
var_r31->unk_7C = arg8;
var_r31->unk_80 = arg9;
@ -92,29 +86,24 @@ void fn_1_A28(omObjData *object, s32 arg1, float arg8, float arg9, float argA)
float fn_1_AAC(omObjData *object)
{
UnkPresentCameraStruct *var_r31;
float var_f31;
UnkPresentCameraStruct *var_r31 = object->data;
var_r31 = object->data;
var_f31 = var_r31->unk_24;
float var_f31 = var_r31->unk_24;
return var_f31;
}
float fn_1_ADC(omObjData *object)
{
UnkPresentCameraStruct *var_r31;
float var_f31;
UnkPresentCameraStruct *var_r31 = object->data;
var_r31 = object->data;
var_f31 = var_r31->unk_28;
float var_f31 = var_r31->unk_28;
return var_f31;
}
void fn_1_B0C(omObjData *object, float *arg1, float *arg2, float *arg3)
{
UnkPresentCameraStruct *var_r31;
UnkPresentCameraStruct *var_r31 = object->data;
var_r31 = object->data;
*arg1 = var_r31->pos.x;
*arg2 = var_r31->pos.y;
*arg3 = var_r31->pos.z;
@ -122,9 +111,8 @@ void fn_1_B0C(omObjData *object, float *arg1, float *arg2, float *arg3)
void fn_1_B3C(omObjData *object, float *arg1, float *arg2, float *arg3)
{
UnkPresentCameraStruct *var_r31;
UnkPresentCameraStruct *var_r31 = object->data;
var_r31 = object->data;
*arg1 = var_r31->target.x;
*arg2 = var_r31->target.y;
*arg3 = var_r31->target.z;
@ -132,13 +120,11 @@ void fn_1_B3C(omObjData *object, float *arg1, float *arg2, float *arg3)
s32 fn_1_B6C(omObjData *object)
{
UnkPresentCameraStruct *var_r31;
s32 var_r30;
s32 var_r29;
UnkPresentCameraStruct *var_r31 = object->data;
s32 var_r30 = 1;
s32 var_r29 = 1;
var_r31 = object->data;
var_r30 = 1;
var_r29 = 1;
if (!(var_r31->unk_8C < 1.0f) && !(var_r31->unk_94 < 1.0f)) {
var_r29 = 0;
}
@ -155,14 +141,14 @@ void fn_1_BF8(omObjData *object)
void fn_1_C20(omObjData *object)
{
UnkPresentCameraStruct *var_r31;
float var_f31;
float var_f30;
float var_f29;
float var_f28;
float var_f27;
var_r31 = object->data;
UnkPresentCameraStruct *var_r31 = object->data;
if (var_r31->unk_84 < 1.0f) {
var_f28 = sind(90.0f * var_r31->unk_84);
var_r31->pos.x = var_r31->unk_2C.x + var_f28 * (var_r31->unk_58.x - var_r31->unk_2C.x);
@ -211,10 +197,9 @@ void fn_1_C20(omObjData *object)
void fn_1_1198(omObjData *object)
{
UnkPresentCameraStruct *var_r31;
if (HuPadBtn[0] & PAD_BUTTON_B) {
var_r31 = object->data;
UnkPresentCameraStruct *var_r31 = object->data;
var_r31->target.x = var_r31->target.x + (0.5f * HuPadStkX[0]);
var_r31->target.y = var_r31->target.y + (0.5f * HuPadStkY[0]);
var_r31->pos.z = var_r31->pos.z + (0.5f * HuPadTrigL[0]);
@ -226,9 +211,7 @@ void fn_1_1198(omObjData *object)
void fn_1_1398(omObjData *object)
{
UnkPresentCameraStruct *var_r31;
var_r31 = object->data;
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);
print8(32, 80, 1.5f, "EYE : x=%.2f y=%.2f z=%.2f", var_r31->pos.x, var_r31->pos.y, var_r31->pos.z);
print8(32, 96, 1.5f, "R : %.2f DEG: %.2f", var_r31->unk_24, var_r31->unk_28);

154
src/REL/present/common.c
View file

@ -6,8 +6,8 @@
#include "REL/present.h"
void fn_1_4620(omObjData *arg0);
void fn_1_4880(omObjData *arg0);
void fn_1_4620(omObjData *object);
void fn_1_4880(omObjData *object);
omObjFunc lbl_1_data_1A0[] = { NULL, fn_1_4620, fn_1_4880 };
@ -18,14 +18,12 @@ float fn_1_4CEC(float arg8, float arg9, float argA);
omObjData *fn_1_42F4(void)
{
omObjData *var_r31;
s32 var_lr;
s32 var_r29;
UnkPresentStruct5 *var_r30;
var_r31 = omAddObjEx(lbl_1_bss_4, 1002, 1, 3, 2, NULL);
var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, 88, MEMORY_DEFAULT_NUM);
omObjData *var_r31 = omAddObjEx(lbl_1_bss_4, 1002, 1, 3, 2, NULL);
UnkPresentStruct5 *var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, 88, MEMORY_DEFAULT_NUM);
var_r31->data = var_r30;
var_r30->x = 0.0f;
var_r30->z = 0.0f;
var_r30->y = 0.0f;
@ -56,10 +54,7 @@ omObjData *fn_1_42F4(void)
void fn_1_4534(omObjData *object)
{
s32 var_r31;
void *var_r29;
void *var_r30;
var_r29 = object->data;
void *var_r29 = object->data;
for (var_r31 = 0; var_r31 < 1; var_r31++) {
Hu3DModelKill(object->model[var_r31]);
@ -73,9 +68,8 @@ void fn_1_4534(omObjData *object)
void fn_1_45C0(omObjData *object, s32 arg1)
{
UnkPresentStruct5 *var_r31;
UnkPresentStruct5 *var_r31 = object->data;
var_r31 = object->data;
var_r31->unk_00 = arg1;
object->func = lbl_1_data_1A0[arg1];
object->unk10 = 0;
@ -84,56 +78,52 @@ void fn_1_45C0(omObjData *object, s32 arg1)
s32 fn_1_4604(omObjData *object)
{
s32 *var_r31;
UnkPresentStruct5 *var_r31 = object->data;
var_r31 = object->data;
return *var_r31;
return var_r31->unk_00;
}
void fn_1_4620(omObjData *object)
{
float var_f31;
omObjData *var_r30;
void *var_r29;
UnkPresentStruct5 *var_r31;
UnkPresentStruct5 *var_r31 = object->data;
var_r31 = object->data;
switch (object->unk10) {
case 0:
Hu3DModelAttrReset(object->model[0], 1);
var_r31->x = -300.0f;
var_r31->z = -180.0f;
var_r31->unk_48 = 0.0f;
var_r31->unk_4C = 0.025f;
object->unk10 = 1;
case 1:
var_f31 = sind(90.0f * var_r31->unk_48);
var_f31 *= var_f31;
var_r31->unk_14 = -300.0f + (300.0f * var_f31);
var_r31->unk_2C = var_r31->unk_14 - var_r31->x;
if ((var_r31->unk_48 = var_r31->unk_48 + var_r31->unk_4C) < 1.0f) {
case 0:
Hu3DModelAttrReset(object->model[0], 1);
var_r31->x = -300.0f;
var_r31->z = -180.0f;
var_r31->unk_48 = 0.0f;
var_r31->unk_4C = 0.025f;
object->unk10 = 1;
case 1:
var_f31 = sind(90.0f * var_r31->unk_48);
var_f31 *= var_f31;
var_r31->unk_14 = -300.0f + (300.0f * var_f31);
var_r31->unk_2C = var_r31->unk_14 - var_r31->x;
if ((var_r31->unk_48 = var_r31->unk_48 + var_r31->unk_4C) < 1.0f) {
break;
}
var_r31->x = 0.0f;
var_r31->unk_48 = 0.0f;
var_r31->unk_4C = 0.05f;
object->unk10 = 2;
case 2:
var_r31->unk_2C = 0.0f;
var_r31->unk_34 = 0.01f;
if ((var_r31->unk_48 = var_r31->unk_48 + var_r31->unk_4C) < 1.0f) {
break;
}
var_r31->unk_24 = 0.0f;
var_r31->unk_2C = 0.0f;
var_r31->unk_30 = 0.0f;
var_r31->unk_34 = 0.0f;
object->unk10 = 3;
case 3:
fn_1_45C0(object, 0);
break;
}
var_r31->x = 0.0f;
var_r31->unk_48 = 0.0f;
var_r31->unk_4C = 0.05f;
object->unk10 = 2;
case 2:
var_r31->unk_2C = 0.0f;
var_r31->unk_34 = 0.01f;
if ((var_r31->unk_48 = var_r31->unk_48 + var_r31->unk_4C) < 1.0f) {
default:
break;
}
var_r31->unk_24 = 0.0f;
var_r31->unk_2C = 0.0f;
var_r31->unk_30 = 0.0f;
var_r31->unk_34 = 0.0f;
object->unk10 = 3;
case 3:
fn_1_45C0(object, 0);
break;
default:
break;
}
fn_1_4A04(object);
}
@ -141,31 +131,29 @@ void fn_1_4620(omObjData *object)
void fn_1_4880(omObjData *object)
{
float var_f31;
UnkPresentStruct5 *var_r30;
void *var_r29;
var_r30 = object->data;
UnkPresentStruct5 *var_r30 = object->data;
switch (object->unk10) {
case 0:
var_r30->unk_48 = 0.0f;
var_r30->unk_4C = 0.025f;
Hu3DModelAttrReset(object->model[0], 1);
object->unk10 = 1;
case 1:
var_f31 = sind(90.0f * var_r30->unk_48);
var_f31 *= var_f31;
var_r30->unk_14 = -(300.0f * var_f31);
var_r30->unk_2C = var_r30->unk_14 - var_r30->x;
if ((var_r30->unk_48 = var_r30->unk_48 + var_r30->unk_4C) < 1.0f) {
case 0:
var_r30->unk_48 = 0.0f;
var_r30->unk_4C = 0.025f;
Hu3DModelAttrReset(object->model[0], 1);
object->unk10 = 1;
case 1:
var_f31 = sind(90.0f * var_r30->unk_48);
var_f31 *= var_f31;
var_r30->unk_14 = -(300.0f * var_f31);
var_r30->unk_2C = var_r30->unk_14 - var_r30->x;
if ((var_r30->unk_48 = var_r30->unk_48 + var_r30->unk_4C) < 1.0f) {
break;
}
object->unk10 = 2;
case 2:
Hu3DModelAttrSet(object->model[0], 1);
fn_1_45C0(object, 0);
break;
default:
break;
}
object->unk10 = 2;
case 2:
Hu3DModelAttrSet(object->model[0], 1);
fn_1_45C0(object, 0);
break;
default:
break;
}
fn_1_4A04(object);
(void)object;
@ -173,14 +161,10 @@ void fn_1_4880(omObjData *object)
void fn_1_4A04(omObjData *object)
{
float var_f29;
float var_f30;
s16 var_r29;
UnkPresentStruct5 *var_r31;
UnkPresentStruct5 *var_r31 = object->data;
s16 var_r29 = 0;
float var_f30 = var_r31->unk_2C * var_r31->unk_2C + var_r31->unk_34 * var_r31->unk_34;
var_r31 = object->data;
var_r29 = 0;
var_f30 = var_r31->unk_2C * var_r31->unk_2C + var_r31->unk_34 * var_r31->unk_34;
var_r31->unk_38 = sqrtf(var_f30);
if (0.001f <= var_r31->unk_38) {
if (12.0f <= var_r31->unk_38) {
@ -194,7 +178,8 @@ void fn_1_4A04(omObjData *object)
if (8.0f <= var_r31->unk_38) {
var_r29 = 2;
} else {
}
else {
var_r29 = 1;
}
}
@ -210,9 +195,8 @@ void fn_1_4A04(omObjData *object)
float fn_1_4CEC(float arg8, float arg9, float argA)
{
float var_f30;
float var_f31;
var_f31 = fmod(arg9 - arg8, 360.0f);
float var_f31 = fmod(arg9 - arg8, 360.0f);
if (0.0f > var_f31) {
var_f31 += 360.0f;
}

81
src/REL/present/init.c
View file

@ -33,15 +33,15 @@ void ObjectSetup(void)
void fn_1_144(s16 arg0, s32 arg1, s32 arg2)
{
Process *var_r30;
UnkPresentStruct6 *var_r31;
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(UnkPresentStruct6), MEMORY_DEFAULT_NUM);
UnkPresentStruct6 *var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(UnkPresentStruct6), MEMORY_DEFAULT_NUM);
var_r31->unk_00 = arg0;
var_r31->unk_08 = 1.0f / arg2;
if (arg1) {
var_r31->unk_08 = var_r31->unk_08;
var_r31->unk_04 = 0.0f;
} else {
}
else {
var_r31->unk_08 = -var_r31->unk_08;
var_r31->unk_04 = 1.0f;
}
@ -53,18 +53,19 @@ void fn_1_144(s16 arg0, s32 arg1, s32 arg2)
void fn_1_254(void)
{
UnkPresentStruct6 *var_r31;
UnkPresentStruct6 *var_r31 = HuPrcCurrentGet()->user_data;
var_r31 = HuPrcCurrentGet()->user_data;
while (TRUE) {
var_r31->unk_04 = var_r31->unk_04 + var_r31->unk_08;
if (var_r31->unk_04 > 1.0f) {
var_r31->unk_04 = 1.0f;
break;
} else if (var_r31->unk_04 < 0.0f) {
}
else if (var_r31->unk_04 < 0.0f) {
var_r31->unk_04 = 0.0f;
break;
} else {
}
else {
espTPLvlSet(var_r31->unk_00, var_r31->unk_04);
HuPrcVSleep();
}
@ -80,8 +81,8 @@ void fn_1_254(void)
void fn_1_334(s16 arg0, s32 arg1, float arg8, s32 arg2)
{
Process *var_r30;
UnkPresentStruct6Weird *var_r31; // TODO correct type? why are only 12 bytes allocated?
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 12, MEMORY_DEFAULT_NUM);
// TODO correct type? why are only 12 bytes allocated?
UnkPresentStruct6Weird *var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 12, MEMORY_DEFAULT_NUM);
var_r31->unk_00 = arg0;
var_r31->unk_0C = 1.0f / arg2;
var_r31->unk_04 = arg8;
@ -89,7 +90,8 @@ void fn_1_334(s16 arg0, s32 arg1, float arg8, s32 arg2)
if (arg1) {
var_r31->unk_0C = var_r31->unk_0C;
var_r31->unk_08 = 0.0f;
} else {
}
else {
var_r31->unk_0C = -var_r31->unk_0C;
var_r31->unk_08 = 1.0f;
}
@ -101,18 +103,19 @@ void fn_1_334(s16 arg0, s32 arg1, float arg8, s32 arg2)
void fn_1_45C(void)
{
UnkPresentStruct6Weird *var_r31; // TODO correct type? how is 0C possible?
UnkPresentStruct6Weird *var_r31 = HuPrcCurrentGet()->user_data;
var_r31 = HuPrcCurrentGet()->user_data;
while (TRUE) {
var_r31->unk_08 = var_r31->unk_08 + var_r31->unk_0C;
if (var_r31->unk_08 > 1.0f) {
var_r31->unk_08 = 1.0f;
break;
} else if (var_r31->unk_08 < 0.0f) {
}
else if (var_r31->unk_08 < 0.0f) {
var_r31->unk_08 = 0.0f;
break;
} else {
}
else {
Hu3DModelTPLvlSet(var_r31->unk_00, var_r31->unk_08 * var_r31->unk_04);
HuPrcVSleep();
}
@ -127,50 +130,44 @@ void fn_1_45C(void)
u32 fn_1_550(u16 arg0)
{
u32 var_r31;
var_r31 = HuPadBtnDown[0] & arg0;
u32 var_r31 = HuPadBtnDown[0] & arg0;
return var_r31 != 0;
}
u32 fn_1_584(u16 arg0)
{
u32 var_r31;
var_r31 = HuPadDStkRep[0] & arg0;
u32 var_r31 = HuPadDStkRep[0] & arg0;
return var_r31 != 0;
}
u32 fn_1_5B8(u16 arg0)
{
u32 var_r31;
var_r31 = HuPadDStk[0] & arg0;
u32 var_r31 = HuPadDStk[0] & arg0;
return var_r31 != 0;
}
void fn_1_5EC(omObjData *object)
{
switch (object->unk10) {
case 0:
object->unk10 = 1;
case 1:
if (!omSysExitReq) {
case 0:
object->unk10 = 1;
case 1:
if (!omSysExitReq) {
break;
}
object->unk10 = 2;
case 2:
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
HuAudFadeOut(1000);
object->unk10 = 3;
break;
case 3:
if (!WipeStatGet()) {
fn_1_3B18(lbl_1_bss_18);
omOvlReturnEx(1, 1);
}
break;
default:
break;
}
object->unk10 = 2;
case 2:
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
HuAudFadeOut(1000);
object->unk10 = 3;
break;
case 3:
if (!WipeStatGet()) {
fn_1_3B18(lbl_1_bss_18);
omOvlReturnEx(1, 1);
}
break;
default:
break;
}
}

267
src/REL/present/main.c
View file

@ -20,12 +20,10 @@ void fn_1_41BC(UnkWindowDataStruct *arg0, s32 arg1);
omObjData *fn_1_39A8(void)
{
omObjData *object;
UnkPresentStruct *var_r30;
object = omAddObjEx(lbl_1_bss_4, 1000, 0, 0, 4, NULL);
var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(UnkPresentStruct), MEMORY_DEFAULT_NUM);
omObjData *object = omAddObjEx(lbl_1_bss_4, 1000, 0, 0, 4, NULL);
UnkPresentStruct *var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(UnkPresentStruct), MEMORY_DEFAULT_NUM);
object->data = var_r30;
var_r30->unk_04 = 0;
lbl_1_bss_8 = fn_1_6B4();
lbl_1_bss_10 = fn_1_1458();
@ -38,7 +36,8 @@ omObjData *fn_1_39A8(void)
OSReport("*** PRESENTROOM ( PRESENT GET MODE ) ***\n");
object->func = fn_1_3DB8;
object->unk10 = 0;
} else {
}
else {
OSReport("*** PRESENTROOM ( PRESENT VIEW MODE ) ***\n");
object->func = fn_1_3B8C;
object->unk10 = 0;
@ -49,9 +48,8 @@ omObjData *fn_1_39A8(void)
void fn_1_3B18(omObjData *object)
{
UnkWindowDataStruct **var_r31;
UnkWindowDataStruct **var_r31 = object->data;
var_r31 = object->data;
fn_1_8F0(lbl_1_bss_8);
fn_1_1784(lbl_1_bss_10);
fn_1_4534(lbl_1_bss_20);
@ -61,121 +59,119 @@ void fn_1_3B18(omObjData *object)
void fn_1_3B8C(omObjData *object)
{
UnkPresentStruct *var_r30;
var_r30 = object->data;
UnkPresentStruct *var_r30 = object->data;
switch (object->unk10) {
case 0:
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
object->unk10 = 1;
case 1:
if (WipeStatGet()) {
case 0:
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
object->unk10 = 1;
case 1:
if (WipeStatGet()) {
return;
}
object->unk10 = 2;
case 2:
fn_1_180C(lbl_1_bss_10, 1);
object->unk10 = 3;
case 3:
if (fn_1_1850(lbl_1_bss_10)) {
return;
}
object->unk10 = 4;
case 4:
fn_1_45C0(lbl_1_bss_20, 1);
object->unk10 = 5;
case 5:
if (fn_1_4604(lbl_1_bss_20)) {
return;
}
object->unk10 = 6;
case 6:
HuAudFXPlay(66);
fn_1_4080(var_r30->unk_00);
fn_1_40B0(var_r30->unk_00, 0x320002);
object->unk10 = 7;
case 7:
if (var_r30->unk_00->unk_20) {
return;
}
fn_1_41BC(var_r30->unk_00, 1);
object->unk10 = 8;
case 8:
if (var_r30->unk_00->unk_20) {
return;
}
fn_1_4098(var_r30->unk_00);
if (!var_r30->unk_00->choice) {
var_r30->unk_04 = 0;
object->unk10 = 11;
return;
}
else {
object->unk10 = 9;
return;
}
case 9:
fn_1_45C0(lbl_1_bss_20, 2);
object->unk10 = 10;
return;
}
object->unk10 = 2;
case 2:
fn_1_180C(lbl_1_bss_10, 1);
object->unk10 = 3;
case 3:
if (fn_1_1850(lbl_1_bss_10)) {
case 10:
if (fn_1_4604(lbl_1_bss_20)) {
return;
}
object->unk10 = 2;
return;
}
object->unk10 = 4;
case 4:
fn_1_45C0(lbl_1_bss_20, 1);
object->unk10 = 5;
case 5:
if (fn_1_4604(lbl_1_bss_20)) {
return;
}
object->unk10 = 6;
case 6:
HuAudFXPlay(66);
fn_1_4080(var_r30->unk_00);
fn_1_40B0(var_r30->unk_00, 0x320002);
object->unk10 = 7;
case 7:
if (var_r30->unk_00->unk_20) {
return;
}
fn_1_41BC(var_r30->unk_00, 1);
object->unk10 = 8;
case 8:
if (var_r30->unk_00->unk_20) {
return;
}
fn_1_4098(var_r30->unk_00);
if (!var_r30->unk_00->choice) {
case 11:
object->unk10 = 12;
var_r30->unk_04 = 0;
object->unk10 = 11;
return;
} else {
object->unk10 = 9;
return;
}
case 9:
fn_1_45C0(lbl_1_bss_20, 2);
object->unk10 = 10;
return;
case 10:
if (fn_1_4604(lbl_1_bss_20)) {
return;
}
object->unk10 = 2;
return;
case 11:
object->unk10 = 12;
var_r30->unk_04 = 0;
case 12:
if (var_r30->unk_00->unk_20) {
return;
}
if (var_r30->unk_04++ >= 60) {
omSysExitReq = 1;
object->func = NULL;
object->unk10 = 0;
}
default:
break;
case 12:
if (var_r30->unk_00->unk_20) {
return;
}
if (var_r30->unk_04++ >= 60) {
omSysExitReq = 1;
object->func = NULL;
object->unk10 = 0;
}
default:
break;
}
}
void fn_1_3DB8(omObjData *arg0)
{
void *sp8;
void *sp8 = arg0->data;
sp8 = arg0->data;
switch (arg0->unk10) {
case 0:
fn_1_186C(lbl_1_bss_10, omovlevtno - 1);
arg0->unk10 = 1;
case 1:
fn_1_180C(lbl_1_bss_10, 3);
arg0->unk10 = 2;
case 2:
if (!fn_1_1850(lbl_1_bss_10)) {
arg0->unk10 = 3;
} else {
case 0:
fn_1_186C(lbl_1_bss_10, omovlevtno - 1);
arg0->unk10 = 1;
case 1:
fn_1_180C(lbl_1_bss_10, 3);
arg0->unk10 = 2;
case 2:
if (!fn_1_1850(lbl_1_bss_10)) {
arg0->unk10 = 3;
}
else {
break;
}
case 3:
arg0->unk10 = 4;
case 4:
omSysExitReq = 1;
arg0->func = NULL;
arg0->unk10 = 0;
break;
default:
break;
}
case 3:
arg0->unk10 = 4;
case 4:
omSysExitReq = 1;
arg0->func = NULL;
arg0->unk10 = 0;
break;
default:
break;
}
}
UnkWindowDataStruct *fn_1_3EA4(s32 arg0)
{
UnkWindowDataStruct *var_r31;
UnkWindowDataStruct *var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(UnkWindowDataStruct), MEMORY_DEFAULT_NUM);
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(UnkWindowDataStruct), MEMORY_DEFAULT_NUM);
var_r31->unk18 = 0;
var_r31->unk10 = 0;
var_r31->unk14 = 0;
@ -184,18 +180,18 @@ UnkWindowDataStruct *fn_1_3EA4(s32 arg0)
var_r31->process->user_data = var_r31;
var_r31->unk08 = arg0;
switch (arg0) {
case 0:
var_r31->window = HuWinExCreateStyled(-10000.0f, 360.0f, 480, 80, -1, 1);
HuWinBGTPLvlSet(var_r31->window, 0.8f);
HuWinMesSpeedSet(var_r31->window, 0);
HuWinMesPalSet(var_r31->window, 7, 0, 0, 0);
break;
case 1:
var_r31->window = HuWinExCreateStyled(-10000.0f, 326.0f, 500, 40, -1, 0);
HuWinAttrSet(var_r31->window, 2048);
HuWinBGTPLvlSet(var_r31->window, 0.0f);
HuWinMesSpeedSet(var_r31->window, 0);
break;
case 0:
var_r31->window = HuWinExCreateStyled(-10000.0f, 360.0f, 480, 80, -1, 1);
HuWinBGTPLvlSet(var_r31->window, 0.8f);
HuWinMesSpeedSet(var_r31->window, 0);
HuWinMesPalSet(var_r31->window, 7, 0, 0, 0);
break;
case 1:
var_r31->window = HuWinExCreateStyled(-10000.0f, 326.0f, 500, 40, -1, 0);
HuWinAttrSet(var_r31->window, 2048);
HuWinBGTPLvlSet(var_r31->window, 0.0f);
HuWinMesSpeedSet(var_r31->window, 0);
break;
}
HuWinDrawNoSet(var_r31->window, 63);
fn_1_4190(var_r31);
@ -272,28 +268,27 @@ void fn_1_41BC(UnkWindowDataStruct *windowData, s32 arg1)
void fn_1_41E0(void)
{
UnkWindowDataStruct *windowData;
windowData = HuPrcCurrentGet()->user_data;
UnkWindowDataStruct *windowData = HuPrcCurrentGet()->user_data;
while (TRUE) {
switch (windowData->unk_20) {
case 1:
windowData->unk0C = 1;
HuWinExAnimIn(windowData->window);
break;
case 2:
HuWinExAnimOut(windowData->window);
windowData->unk0C = 0;
break;
case 3:
winData[windowData->window].active_pad = 1;
HuWinMesWait(windowData->window);
windowData->unk10 = 0;
break;
case 4:
windowData->choice = HuWinChoiceGet(windowData->window, windowData->choice);
windowData->unk14 = 0;
break;
case 1:
windowData->unk0C = 1;
HuWinExAnimIn(windowData->window);
break;
case 2:
HuWinExAnimOut(windowData->window);
windowData->unk0C = 0;
break;
case 3:
winData[windowData->window].active_pad = 1;
HuWinMesWait(windowData->window);
windowData->unk10 = 0;
break;
case 4:
windowData->choice = HuWinChoiceGet(windowData->window, windowData->choice);
windowData->unk14 = 0;
break;
}
if (windowData->unk18 != 0) {
HuWinMesSet(windowData->window, windowData->unk18);

904
src/REL/present/present.c
View file

File diff suppressed because it is too large Load diff