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

Applied wipe defines

Browse source
This commit is contained in:
dbalatoni13 2024-11-04 15:27:04 +01:00
parent bf6cab3cfa
commit cc68766f1d
22 changed files with 478 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/game/wipe.h
View file

@ -3,6 +3,7 @@
#include "dolphin.h" #include "dolphin.h"
#define WIPE_TYPE_PREV -1
#define WIPE_TYPE_NORMAL 0 #define WIPE_TYPE_NORMAL 0
#define WIPE_TYPE_CROSS 1 #define WIPE_TYPE_CROSS 1
#define WIPE_TYPE_DUMMY 2 #define WIPE_TYPE_DUMMY 2

53
src/REL/m406Dll/main.c
View file

@ -136,7 +136,7 @@ void ObjectSetup(void)
lbl_1_bss_10 = -1; lbl_1_bss_10 = -1;
lbl_1_bss_C = -1; lbl_1_bss_C = -1;
lbl_1_bss_8 = 0; lbl_1_bss_8 = 0;
WipeCreate(1, 0, 60); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
lbl_1_bss_8 = 0; lbl_1_bss_8 = 0;
} }
@ -185,7 +185,8 @@ void fn_1_40C(omObjData *object)
if (var_r31 & 16 && lbl_1_bss_C == -1) { if (var_r31 & 16 && lbl_1_bss_C == -1) {
lbl_1_bss_C = HuAudSeqPlay(74); lbl_1_bss_C = HuAudSeqPlay(74);
} }
} else { }
else {
var_r31 = 0; var_r31 = 0;
} }
if (lbl_1_bss_24 == -1 || !var_r31) { if (lbl_1_bss_24 == -1 || !var_r31) {
@ -209,8 +210,9 @@ void fn_1_40C(omObjData *object)
Hu3DBGColorSet(0x40, 0x40, 0xFF); Hu3DBGColorSet(0x40, 0x40, 0xFF);
lbl_1_bss_1C = 5; lbl_1_bss_1C = 5;
lbl_1_bss_18 = 0; lbl_1_bss_18 = 0;
} else { }
WipeCreate(2, 0, 30); else {
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30);
WipeColorSet(0xFF, 0xFF, 0xFF); WipeColorSet(0xFF, 0xFF, 0xFF);
lbl_1_bss_8 = 1; lbl_1_bss_8 = 1;
lbl_1_bss_1C = 9; lbl_1_bss_1C = 9;
@ -235,7 +237,7 @@ void fn_1_40C(omObjData *object)
var_f31 = 1.0f; var_f31 = 1.0f;
} }
fn_1_183C(var_f31); fn_1_183C(var_f31);
WipeCreate(2, 0, 30); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30);
WipeColorSet(0xFF, 0xFF, 0xFF); WipeColorSet(0xFF, 0xFF, 0xFF);
lbl_1_bss_8 = 1; lbl_1_bss_8 = 1;
lbl_1_bss_1C = 7; lbl_1_bss_1C = 7;
@ -250,7 +252,7 @@ void fn_1_40C(omObjData *object)
fn_1_183C(var_f31); fn_1_183C(var_f31);
if (!WipeStatGet() && (lbl_1_bss_24 == -1 || !MGSeqStatGet(lbl_1_bss_24))) { if (!WipeStatGet() && (lbl_1_bss_24 == -1 || !MGSeqStatGet(lbl_1_bss_24))) {
lbl_1_bss_24 = -1; lbl_1_bss_24 = -1;
WipeCreate(1, 0, 30); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30);
WipeColorSet(0xFF, 0xFF, 0xFF); WipeColorSet(0xFF, 0xFF, 0xFF);
lbl_1_bss_8 = 0; lbl_1_bss_8 = 0;
CRot.x = lbl_1_data_0.unk_54; CRot.x = lbl_1_data_0.unk_54;
@ -274,7 +276,7 @@ void fn_1_40C(omObjData *object)
case 9: case 9:
if (!WipeStatGet() && (lbl_1_bss_24 == -1 || !MGSeqStatGet(lbl_1_bss_24))) { if (!WipeStatGet() && (lbl_1_bss_24 == -1 || !MGSeqStatGet(lbl_1_bss_24))) {
lbl_1_bss_24 = -1; lbl_1_bss_24 = -1;
WipeCreate(1, 0, 30); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30);
WipeColorSet(0xFF, 0xFF, 0xFF); WipeColorSet(0xFF, 0xFF, 0xFF);
lbl_1_bss_8 = 0; lbl_1_bss_8 = 0;
CRot.x = lbl_1_data_0.unk_54; CRot.x = lbl_1_data_0.unk_54;
@ -311,7 +313,8 @@ void fn_1_40C(omObjData *object)
GWPlayerCoinWinAdd(lbl_1_bss_10, 10); GWPlayerCoinWinAdd(lbl_1_bss_10, 10);
lbl_1_bss_1C = 13; lbl_1_bss_1C = 13;
lbl_1_bss_18 = 0; lbl_1_bss_18 = 0;
} else { }
else {
lbl_1_bss_24 = MGSeqCreate(3, 2); lbl_1_bss_24 = MGSeqCreate(3, 2);
HuAudSStreamPlay(4); HuAudSStreamPlay(4);
lbl_1_bss_1C = 13; lbl_1_bss_1C = 13;
@ -321,7 +324,7 @@ void fn_1_40C(omObjData *object)
case 13: case 13:
if (++lbl_1_bss_18 >= 210.0f) { if (++lbl_1_bss_18 >= 210.0f) {
lbl_1_bss_24 = -1; lbl_1_bss_24 = -1;
WipeCreate(2, 0, 60); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
lbl_1_bss_8 = 1; lbl_1_bss_8 = 1;
lbl_1_bss_1C = 14; lbl_1_bss_1C = 14;
lbl_1_bss_18 = 0; lbl_1_bss_18 = 0;
@ -369,7 +372,7 @@ void fn_1_1168(omObjData *object)
} }
if (var_r30) { if (var_r30) {
if (!lbl_1_bss_8) { if (!lbl_1_bss_8) {
WipeCreate(2, 0, 60); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
} }
lbl_1_bss_8 = 1; lbl_1_bss_8 = 1;
HuAudStreamFadeOut(30); HuAudStreamFadeOut(30);
@ -410,7 +413,8 @@ void fn_1_12BC(void)
lbl_1_bss_1C = 12; lbl_1_bss_1C = 12;
lbl_1_bss_18 = 0; lbl_1_bss_18 = 0;
} }
} else if (lbl_1_bss_1C == 11) { }
else if (lbl_1_bss_1C == 11) {
lbl_1_bss_1C = 12; lbl_1_bss_1C = 12;
lbl_1_bss_18 = 0; lbl_1_bss_18 = 0;
} }
@ -498,18 +502,21 @@ float fn_1_1BA8(float arg8, float arg9)
if (arg8 >= 360.0f) { if (arg8 >= 360.0f) {
arg8 -= 360.0f; arg8 -= 360.0f;
} else if (arg8 < 0.0f) { }
else if (arg8 < 0.0f) {
arg8 += 360.0f; arg8 += 360.0f;
} }
if (arg9 >= 360.0f) { if (arg9 >= 360.0f) {
arg9 -= 360.0f; arg9 -= 360.0f;
} else if (arg9 < 0.0f) { }
else if (arg9 < 0.0f) {
arg9 += 360.0f; arg9 += 360.0f;
} }
var_f31 = arg8 - arg9; var_f31 = arg8 - arg9;
if (var_f31 <= -180.0f) { if (var_f31 <= -180.0f) {
var_f31 += 360.0f; var_f31 += 360.0f;
} else if (var_f31 >= 180.0f) { }
else if (var_f31 >= 180.0f) {
var_f31 -= 360.0f; var_f31 -= 360.0f;
} }
return var_f31; return var_f31;
@ -522,12 +529,14 @@ float fn_1_1CC0(float arg8, float arg9, float argA)
if (arg8 >= 360.0) { if (arg8 >= 360.0) {
arg8 -= 360.0; arg8 -= 360.0;
} else if (arg8 < 0.0) { }
else if (arg8 < 0.0) {
arg8 += 360.0; arg8 += 360.0;
} }
if (arg9 >= 360.0) { if (arg9 >= 360.0) {
arg9 -= 360.0; arg9 -= 360.0;
} else if (arg9 < 0.0) { }
else if (arg9 < 0.0) {
arg9 += 360.0; arg9 += 360.0;
} }
var_f30 = 360.0 + (arg8 - arg9); var_f30 = 360.0 + (arg8 - arg9);
@ -537,18 +546,22 @@ float fn_1_1CC0(float arg8, float arg9, float argA)
if (var_f30 < 180.0) { if (var_f30 < 180.0) {
if (var_f30 <= argA) { if (var_f30 <= argA) {
var_f31 = var_f30; var_f31 = var_f30;
} else { }
else {
var_f31 = argA; var_f31 = argA;
} }
} else if (360.0 - var_f30 <= argA) { }
else if (360.0 - var_f30 <= argA) {
var_f31 = -(360.0 - var_f30); var_f31 = -(360.0 - var_f30);
} else { }
else {
var_f31 = -argA; var_f31 = -argA;
} }
var_f31 += arg9; var_f31 += arg9;
if (var_f31 >= 360.0) { if (var_f31 >= 360.0) {
var_f31 -= 360.0; var_f31 -= 360.0;
} else if (var_f31 < 0.0) { }
else if (var_f31 < 0.0) {
var_f31 += 360.0; var_f31 += 360.0;
} }
return var_f31; return var_f31;

4
src/REL/m409Dll/main.c
View file

@ -103,7 +103,7 @@ void fn_1_434(omObjData *object)
HuAudFXListnerKill(); HuAudFXListnerKill();
fn_1_5F5C(lbl_1_bss_E0->model[0]); fn_1_5F5C(lbl_1_bss_E0->model[0]);
fn_1_5F5C(lbl_1_bss_E0->model[1]); fn_1_5F5C(lbl_1_bss_E0->model[1]);
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 0x3C);
MGSeqKillAll(); MGSeqKillAll();
object->func = fn_1_4DC; object->func = fn_1_4DC;
} }
@ -223,7 +223,7 @@ void fn_1_F70(omObjData *object)
case 1: case 1:
if (lbl_1_bss_6 == 0) { if (lbl_1_bss_6 == 0) {
lbl_1_bss_6 = 1; lbl_1_bss_6 = 1;
WipeCreate(1, 0, 0x3C); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 0x3C);
} }
if (WipeStatGet() == 0) { if (WipeStatGet() == 0) {
fn_1_2414(7, 2); fn_1_2414(7, 2);

6
src/REL/m412Dll/main.c
View file

@ -103,7 +103,7 @@ void ObjectSetup(void)
Hu3DBGColorSet(0U, 0U, 0U); Hu3DBGColorSet(0U, 0U, 0U);
fn_1_8BC(); fn_1_8BC();
HuPrcChildCreate(fn_1_B1C0, 0x1000U, 0x2000U, 0, HuPrcCurrentGet()); HuPrcChildCreate(fn_1_B1C0, 0x1000U, 0x2000U, 0, HuPrcCurrentGet());
WipeCreate(1, 0, 0x3C); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
} }
void *fn_1_6EC(f32 arg8, f32 arg9, f32 argA, s32 arg0) void *fn_1_6EC(f32 arg8, f32 arg9, f32 argA, s32 arg0)
@ -2081,7 +2081,7 @@ void fn_1_B160(void)
while (1) { while (1) {
if (omSysExitReq != 1) if (omSysExitReq != 1)
break; break;
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
HuAudFadeOut(0x3E8); HuAudFadeOut(0x3E8);
HuPrcSleep(0x3C); HuPrcSleep(0x3C);
MGSeqKillAll(); MGSeqKillAll();
@ -2178,7 +2178,7 @@ void fn_1_B1C0(void)
temp_r30 = MGSeqCreate(3, 2); temp_r30 = MGSeqCreate(3, 2);
} }
HuPrcSleep(0xD2); HuPrcSleep(0xD2);
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
HuPrcSleep(0x3C); HuPrcSleep(0x3C);
HuAudFadeOut(1); HuAudFadeOut(1);
MGSeqKillAll(); MGSeqKillAll();

8
src/REL/m414Dll/main.c
View file

@ -1799,7 +1799,8 @@ void fn_1_6644(void)
var_r30 = HuPrcChildCreate(fn_1_6134, 8192, 8192, 0, HuPrcCurrentGet()); var_r30 = HuPrcChildCreate(fn_1_6134, 8192, 8192, 0, HuPrcCurrentGet());
var_r30->user_data = var_r31; var_r30->user_data = var_r31;
if (lbl_1_bss_978 == lbl_1_bss_938[var_r29] && fn_1_65DC(var_r31, var_r29)) { if (lbl_1_bss_978 == lbl_1_bss_938[var_r29] && fn_1_65DC(var_r31, var_r29)) {
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV | HU3D_MOTATTR_SHAPE_PAUSE | HU3D_MOTATTR_SHAPE_REV); Hu3DModelAttrReset(
var_r31->unk_D4[var_r29], HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV | HU3D_MOTATTR_SHAPE_PAUSE | HU3D_MOTATTR_SHAPE_REV);
var_r30 = HuPrcChildCreate(fn_1_42AC, 8192, 8192, 0, HuPrcCurrentGet()); var_r30 = HuPrcChildCreate(fn_1_42AC, 8192, 8192, 0, HuPrcCurrentGet());
var_r30->user_data = &sp8C; var_r30->user_data = &sp8C;
sp8C.unk_00 = var_r31; sp8C.unk_00 = var_r31;
@ -1850,7 +1851,8 @@ void fn_1_6644(void)
var_r30 = HuPrcChildCreate(fn_1_6134, 8192, 8192, 0, HuPrcCurrentGet()); var_r30 = HuPrcChildCreate(fn_1_6134, 8192, 8192, 0, HuPrcCurrentGet());
var_r30->user_data = var_r31; var_r30->user_data = var_r31;
if (lbl_1_bss_978 == lbl_1_bss_938[var_r29] && fn_1_65DC(var_r31, var_r29)) { if (lbl_1_bss_978 == lbl_1_bss_938[var_r29] && fn_1_65DC(var_r31, var_r29)) {
Hu3DModelAttrReset(var_r31->unk_D4[var_r29], HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV | HU3D_MOTATTR_SHAPE_PAUSE | HU3D_MOTATTR_SHAPE_REV); Hu3DModelAttrReset(
var_r31->unk_D4[var_r29], HU3D_MOTATTR_PAUSE | HU3D_MOTATTR_REV | HU3D_MOTATTR_SHAPE_PAUSE | HU3D_MOTATTR_SHAPE_REV);
var_r30 = HuPrcChildCreate(fn_1_42AC, 8192, 8192, 0, HuPrcCurrentGet()); var_r30 = HuPrcChildCreate(fn_1_42AC, 8192, 8192, 0, HuPrcCurrentGet());
var_r30->user_data = &sp8C; var_r30->user_data = &sp8C;
sp8C.unk_00 = var_r31; sp8C.unk_00 = var_r31;
@ -2333,7 +2335,7 @@ void fn_1_8A70(void)
var_r28 = MGSeqCreate(3, 2); var_r28 = MGSeqCreate(3, 2);
} }
HuPrcSleep(210); HuPrcSleep(210);
WipeCreate(2, 0, 60); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
HuPrcSleep(60); HuPrcSleep(60);
HuAudFadeOut(1); HuAudFadeOut(1);
MGSeqKillAll(); MGSeqKillAll();

8
src/REL/m415Dll/main.c
View file

@ -106,7 +106,7 @@ void fn_1_43C(omObjData *object)
var_r31 = &Hu3DCamera[0]; var_r31 = &Hu3DCamera[0];
lbl_1_bss_34A = 0; lbl_1_bss_34A = 0;
WipeCreate(1, 0, 0x3C); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
var_r31->fov = 45.0f; var_r31->fov = 45.0f;
object->func = fn_1_4B0; object->func = fn_1_4B0;
} }
@ -163,7 +163,7 @@ void fn_1_4B0(omObjData *object)
break; break;
} }
if ((omSysExitReq != 0) && (WipeStatGet() == 0)) { if ((omSysExitReq != 0) && (WipeStatGet() == 0)) {
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_14C0; object->func = fn_1_14C0;
} }
} }
@ -317,13 +317,13 @@ void fn_1_7D8(omObjData *object)
break; break;
case 9: case 9:
if (--lbl_1_bss_342 == 0) { if (--lbl_1_bss_342 == 0) {
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_14C0; object->func = fn_1_14C0;
} }
break; break;
} }
if ((omSysExitReq != 0) && (WipeStatGet() == 0)) { if ((omSysExitReq != 0) && (WipeStatGet() == 0)) {
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_14C0; object->func = fn_1_14C0;
} }
} }

5
src/REL/m417Dll/main.c
View file

@ -212,7 +212,7 @@ void fn_1_EA8(omObjData *object)
fn_1_5B0(object); fn_1_5B0(object);
if (!WipeStatGet()) { if (!WipeStatGet()) {
WipeCreate(2, 0, 60); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
var_r27->unk_08 = 0; var_r27->unk_08 = 0;
fn_1_800(object); fn_1_800(object);
} }
@ -483,7 +483,8 @@ void fn_1_310C(float arg8, float arg9, float argA, float *arg0, float *arg1, flo
if (arg8 != 0.0f) { if (arg8 != 0.0f) {
PSMTXRotRad(sp38, 88, 0.017453292f * arg8); PSMTXRotRad(sp38, 88, 0.017453292f * arg8);
} else { }
else {
PSMTXIdentity(sp38); PSMTXIdentity(sp38);
} }
if (arg9 != 0.0f) { if (arg9 != 0.0f) {

6
src/REL/m420dll/main.c
View file

@ -52,7 +52,7 @@ void fn_1_118(void)
while (omSysExitReq == 0) { while (omSysExitReq == 0) {
HuPrcVSleep(); HuPrcVSleep();
} }
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
@ -83,7 +83,7 @@ s32 fn_1_198(void)
sp8[var_r31] = 0; sp8[var_r31] = 0;
} }
for (var_r31 = 0; var_r31 < 4; var_r31++) { for (var_r31 = 0; var_r31 < 4; var_r31++) {
switch(GWPlayerCfg[var_r31].group) { switch (GWPlayerCfg[var_r31].group) {
case 0: case 0:
lbl_1_bss_18[0] = fn_1_1B8C(var_r31, 0); lbl_1_bss_18[0] = fn_1_1B8C(var_r31, 0);
break; break;
@ -122,7 +122,7 @@ void fn_1_43C(void)
s32 var_r30; s32 var_r30;
lbl_1_bss_C = 0; lbl_1_bss_C = 0;
WipeCreate(1, 0, 0x3C); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 0x3C);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();

2
src/REL/m426Dll/main.c
View file

@ -606,7 +606,7 @@ void fn_1_E18(omObjData *object)
var_r30 = 1; var_r30 = 1;
} }
if (var_r30) { if (var_r30) {
WipeCreate(2, 0, 60); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
HuAudSeqAllFadeOut(100); HuAudSeqAllFadeOut(100);
object->func = fn_1_DB8; object->func = fn_1_DB8;
} }

8
src/REL/m438Dll/main.c
View file

@ -408,7 +408,7 @@ void ObjectSetup(void)
fn_1_B4D8(var_r31); fn_1_B4D8(var_r31);
omGameSysInit(var_r31); omGameSysInit(var_r31);
HuAudSndGrpSet(0x40); HuAudSndGrpSet(0x40);
WipeCreate(1, 0, 60); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
fn_1_7BBC(); fn_1_7BBC();
fn_1_E658(0x60, 0x40); fn_1_E658(0x60, 0x40);
} }
@ -478,7 +478,7 @@ void fn_1_4FC(omObjData *object)
break; break;
} }
if (omSysExitReq != 0 && WipeStatGet() == 0) { if (omSysExitReq != 0 && WipeStatGet() == 0) {
WipeCreate(2, 0, 60); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_1174; object->func = fn_1_1174;
} }
} }
@ -621,12 +621,12 @@ void fn_1_974(omObjData *object)
} }
break; break;
case 11: case 11:
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_1174; object->func = fn_1_1174;
break; break;
} }
if (omSysExitReq != 0 && WipeStatGet() == 0) { if (omSysExitReq != 0 && WipeStatGet() == 0) {
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_1174; object->func = fn_1_1174;
} }
} }

4
src/REL/m440Dll/main.c
View file

@ -92,7 +92,7 @@ void ObjectSetup(void)
void fn_1_3C4(omObjData *object) void fn_1_3C4(omObjData *object)
{ {
if ((omSysExitReq != 0) || (lbl_1_bss_0 != 0)) { if ((omSysExitReq != 0) || (lbl_1_bss_0 != 0)) {
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
object->func = &fn_1_434; object->func = &fn_1_434;
} }
} }
@ -201,7 +201,7 @@ void fn_1_AE0(omObjData *arg0)
switch (fn_1_23E4(7)) { switch (fn_1_23E4(7)) {
case 1: case 1:
if (lbl_1_bss_A == 0) { if (lbl_1_bss_A == 0) {
WipeCreate(1, 0, 0x3C); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
lbl_1_bss_A = 1; lbl_1_bss_A = 1;
} }
if (WipeStatGet() != 0) if (WipeStatGet() != 0)

6
src/REL/m442Dll/main.c
View file

@ -275,7 +275,7 @@ void fn_1_394(omObjData *object)
lbl_1_bss_11F18 = -1; lbl_1_bss_11F18 = -1;
lbl_1_bss_11F16 = 0; lbl_1_bss_11F16 = 0;
lbl_1_bss_11EE8 = 0; lbl_1_bss_11EE8 = 0;
WipeCreate(1, 0, 60); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_448; object->func = fn_1_448;
} }
@ -369,7 +369,7 @@ void fn_1_448(omObjData *object)
break; break;
case 11: case 11:
if (--lbl_1_bss_11F24 == 0) { if (--lbl_1_bss_11F24 == 0) {
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_A30; object->func = fn_1_A30;
} }
break; break;
@ -382,7 +382,7 @@ void fn_1_448(omObjData *object)
lbl_1_bss_11F16 = 0; lbl_1_bss_11F16 = 0;
} }
if ((omSysExitReq != 0) && (WipeStatGet() == 0)) { if ((omSysExitReq != 0) && (WipeStatGet() == 0)) {
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_A30; object->func = fn_1_A30;
} }
} }

8
src/REL/m443Dll/main.c
View file

@ -206,7 +206,7 @@ void fn_1_584(omObjData *object)
if (var_r31->unk_08 == 0) { if (var_r31->unk_08 == 0) {
switch (var_r31->unk_00) { switch (var_r31->unk_00) {
case 0: case 0:
WipeCreate(1, 0, 0x3C); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
lbl_1_bss_14.unk_00 = 1; lbl_1_bss_14.unk_00 = 1;
var_r31->unk_00 = 1; var_r31->unk_00 = 1;
var_r31->unk_10 = 0; var_r31->unk_10 = 0;
@ -252,7 +252,7 @@ void fn_1_9B0(omObjData *object)
fn_1_4E4(object); fn_1_4E4(object);
if (WipeStatGet() == 0) { if (WipeStatGet() == 0) {
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
if (lbl_1_bss_8 >= 0) { if (lbl_1_bss_8 >= 0) {
HuAudFXStop(lbl_1_bss_8); HuAudFXStop(lbl_1_bss_8);
lbl_1_bss_8 = -1; lbl_1_bss_8 = -1;
@ -432,7 +432,7 @@ void fn_1_17D8(omObjData *object)
} }
if ((MGSeqStatGet(lbl_1_bss_58) == 0) && (var_r27->unk_58 == 0x1111) && (var_r25 != 0)) { if ((MGSeqStatGet(lbl_1_bss_58) == 0) && (var_r27->unk_58 == 0x1111) && (var_r25 != 0)) {
if (var_r27->unk_08 == 0) { if (var_r27->unk_08 == 0) {
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
} }
var_r27->unk_14 = 4; var_r27->unk_14 = 4;
var_r27->unk_18 = 0; var_r27->unk_18 = 0;
@ -531,7 +531,7 @@ omObjFunc fn_1_2490(Process *process, omObjData *object)
M443DllWork *var_r30 = object->data; M443DllWork *var_r30 = object->data;
if (var_r30->unk_08 == 0) { if (var_r30->unk_08 == 0) {
WipeCreate(1, 0, 0x3C); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
} }
fn_1_3FE8(1); fn_1_3FE8(1);
var_r31 = fn_1_4148(0); var_r31 = fn_1_4148(0);

176
src/REL/m446Dll/main.c
View file

@ -1,22 +1,22 @@
#include "REL/m446Dll.h" #include "REL/m446Dll.h"
#include "rel_sqrt_consts.h" #include "rel_sqrt_consts.h"
#include "game/audio.h"
#include "game/frand.h"
#include "game/gamework_data.h" #include "game/gamework_data.h"
#include "game/hsfman.h" #include "game/hsfman.h"
#include "game/audio.h"
#include "game/jmp.h" #include "game/jmp.h"
#include "game/minigame_seq.h"
#include "game/window.h" #include "game/window.h"
#include "game/wipe.h" #include "game/wipe.h"
#include "game/frand.h"
#include "game/minigame_seq.h"
// bss // bss
s32 lbl_1_bss_14; s32 lbl_1_bss_14;
s32 lbl_1_bss_10; s32 lbl_1_bss_10;
Process* lbl_1_bss_C; Process *lbl_1_bss_C;
omObjData *lbl_1_bss_8; omObjData *lbl_1_bss_8;
s32 lbl_1_bss_4; s32 lbl_1_bss_4;
unkStruct* lbl_1_bss_0; unkStruct *lbl_1_bss_0;
// data // data
Vec lbl_1_data_0 = { 0.0f, 90.0f, 0.0f }; Vec lbl_1_data_0 = { 0.0f, 90.0f, 0.0f };
@ -25,18 +25,13 @@ f32 lbl_1_data_18 = 1260.0f;
Vec lbl_1_data_1C = { 0.0f, 90.0f, 0.0f }; Vec lbl_1_data_1C = { 0.0f, 90.0f, 0.0f };
Vec lbl_1_data_28 = { -90.0f, 0.0f, 0.0f }; Vec lbl_1_data_28 = { -90.0f, 0.0f, 0.0f };
f32 lbl_1_data_34 = 260.0f; f32 lbl_1_data_34 = 260.0f;
Vec lbl_1_data_38[2] = { Vec lbl_1_data_38[2] = { { 0.0f, 100.0f, 120.0f }, { 0.0f, 100.0f, 120.0f } };
{ 0.0f, 100.0f, 120.0f }, Vec lbl_1_data_50[2] = { { -30.0f, 0.0f, 0.0f }, { -30.0f, 0.0f, 0.0f } };
{ 0.0f, 100.0f, 120.0f }
};
Vec lbl_1_data_50[2] = {
{ -30.0f, 0.0f, 0.0f },
{ -30.0f, 0.0f, 0.0f }
};
f32 lbl_1_data_68[2] = { 600.0f, 600.0f }; f32 lbl_1_data_68[2] = { 600.0f, 600.0f };
s32 lbl_1_data_70[2][2] = { { 0x46, 0x1A4 }, { 0x1F4, 0x3C } }; s32 lbl_1_data_70[2][2] = { { 0x46, 0x1A4 }, { 0x1F4, 0x3C } };
void ObjectSetup(void) { void ObjectSetup(void)
{
lbl_1_bss_C = omInitObjMan(5, 0x2000); lbl_1_bss_C = omInitObjMan(5, 0x2000);
omGameSysInit(lbl_1_bss_C); omGameSysInit(lbl_1_bss_C);
lbl_1_bss_8 = omAddObjEx(lbl_1_bss_C, 0x3E8, 0x32U, 0x32U, 0, fn_1_13C); lbl_1_bss_8 = omAddObjEx(lbl_1_bss_C, 0x3E8, 0x32U, 0x32U, 0, fn_1_13C);
@ -44,7 +39,8 @@ void ObjectSetup(void) {
lbl_1_bss_4 = 0; lbl_1_bss_4 = 0;
} }
void fn_1_13C(omObjData* arg0) { void fn_1_13C(omObjData *arg0)
{
switch (lbl_1_bss_4) { switch (lbl_1_bss_4) {
case 0: case 0:
HuWinInit(1); HuWinInit(1);
@ -68,9 +64,10 @@ void fn_1_13C(omObjData* arg0) {
fn_1_7350(); fn_1_7350();
fn_1_20D4(); fn_1_20D4();
fn_1_68DC(); fn_1_68DC();
if (lbl_1_bss_0->unk0 != 5) break; if (lbl_1_bss_0->unk0 != 5)
break;
lbl_1_bss_4 = 3; lbl_1_bss_4 = 3;
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
case 2: case 2:
break; break;
case 3: case 3:
@ -92,9 +89,10 @@ void fn_1_13C(omObjData* arg0) {
} }
} }
unkStruct* m446FlowCreate(void) { unkStruct *m446FlowCreate(void)
{
s32 var_r30; s32 var_r30;
unkStruct* temp_r3; unkStruct *temp_r3;
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x9C, MEMORY_DEFAULT_NUM); temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x9C, MEMORY_DEFAULT_NUM);
if (temp_r3 == 0) { if (temp_r3 == 0) {
@ -123,11 +121,12 @@ unkStruct* m446FlowCreate(void) {
} }
} }
temp_r3->unk28 = fn_1_3064(); temp_r3->unk28 = fn_1_3064();
WipeCreate(1, 0, 0x3C); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
return temp_r3; return temp_r3;
} }
void fn_1_3FC(unkStruct* arg0) { void fn_1_3FC(unkStruct *arg0)
{
s32 var_r30; s32 var_r30;
if (arg0->unk98) { if (arg0->unk98) {
@ -149,9 +148,10 @@ void fn_1_3FC(unkStruct* arg0) {
HuMemDirectFree(arg0); HuMemDirectFree(arg0);
} }
m446Func1 lbl_1_data_A0[5] = {fn_1_53C, fn_1_B78, fn_1_CA0, fn_1_C0C, fn_1_958}; m446Func1 lbl_1_data_A0[5] = { fn_1_53C, fn_1_B78, fn_1_CA0, fn_1_C0C, fn_1_958 };
void fn_1_4B4(unkStruct* arg0) { void fn_1_4B4(unkStruct *arg0)
{
if (lbl_1_data_A0[arg0->unk0]) { if (lbl_1_data_A0[arg0->unk0]) {
lbl_1_data_A0[arg0->unk0](arg0); lbl_1_data_A0[arg0->unk0](arg0);
} }
@ -160,7 +160,8 @@ void fn_1_4B4(unkStruct* arg0) {
} }
} }
void fn_1_53C(unkStruct* arg0) { void fn_1_53C(unkStruct *arg0)
{
s32 var_r30; s32 var_r30;
s32 var_r29; s32 var_r29;
@ -177,11 +178,13 @@ void fn_1_53C(unkStruct* arg0) {
if (arg0->unk14 == 20) { if (arg0->unk14 == 20) {
fn_1_84AC(arg0->unk24); fn_1_84AC(arg0->unk24);
} }
if (arg0->unk14++ < 0xB4) break; if (arg0->unk14++ < 0xB4)
break;
arg0->unk18 = HuAudSeqPlay(0x3D); arg0->unk18 = HuAudSeqPlay(0x3D);
if (arg0->unk2C[1]->unk64 == 8) { if (arg0->unk2C[1]->unk64 == 8) {
arg0->unk10 = 2; arg0->unk10 = 2;
} else { }
else {
arg0->unk10 = 4; arg0->unk10 = 4;
} }
break; break;
@ -201,7 +204,8 @@ void fn_1_53C(unkStruct* arg0) {
arg0->unk10 = 5; arg0->unk10 = 5;
break; break;
case 5: case 5:
if (fn_1_708C()) break; if (fn_1_708C())
break;
fn_1_860C(arg0->unk24); fn_1_860C(arg0->unk24);
for (var_r30 = 0; var_r30 < 2; var_r30++) { for (var_r30 = 0; var_r30 < 2; var_r30++) {
fn_1_637C(arg0->unk2C[var_r30], 1); fn_1_637C(arg0->unk2C[var_r30], 1);
@ -214,13 +218,15 @@ void fn_1_53C(unkStruct* arg0) {
arg0->unk14 = 0; arg0->unk14 = 0;
break; break;
case 7: case 7:
if (arg0->unk14++ < 0x78) break; if (arg0->unk14++ < 0x78)
break;
fn_1_34A0(arg0->unk28, &arg0->unk38[0], arg0->unk94, 1); fn_1_34A0(arg0->unk28, &arg0->unk38[0], arg0->unk94, 1);
arg0->unk10 = 8; arg0->unk10 = 8;
arg0->unk14 = 0; arg0->unk14 = 0;
break; break;
case 8: case 8:
if (arg0->unk14++ < 0x78) break; if (arg0->unk14++ < 0x78)
break;
for (var_r29 = 0; var_r29 < 2; var_r29++) { for (var_r29 = 0; var_r29 < 2; var_r29++) {
for (var_r30 = 0; var_r30 < 3; var_r30++) { for (var_r30 = 0; var_r30 < 3; var_r30++) {
@ -233,10 +239,14 @@ void fn_1_53C(unkStruct* arg0) {
arg0->unk10 = 9; arg0->unk10 = 9;
break; break;
case 9: case 9:
if (arg0->unk34->unk70 != 0) break; if (arg0->unk34->unk70 != 0)
if (arg0->unk34->unk78 != 0) break; break;
if (arg0->unk34->unk74 != 0) break; if (arg0->unk34->unk78 != 0)
if (arg0->unk34->unk4 != 0) break; break;
if (arg0->unk34->unk74 != 0)
break;
if (arg0->unk34->unk4 != 0)
break;
for (var_r29 = 0; var_r29 < 2; var_r29++) { for (var_r29 = 0; var_r29 < 2; var_r29++) {
for (var_r30 = 0; var_r30 < 3; var_r30++) { for (var_r30 = 0; var_r30 < 3; var_r30++) {
@ -247,10 +257,14 @@ void fn_1_53C(unkStruct* arg0) {
arg0->unk10 = 10; arg0->unk10 = 10;
break; break;
case 10: case 10:
if (arg0->unk34->unk70 != 0) break; if (arg0->unk34->unk70 != 0)
if (arg0->unk34->unk78 != 0) break; break;
if (arg0->unk34->unk74 != 0) break; if (arg0->unk34->unk78 != 0)
if (arg0->unk34->unk4 != 0) break; break;
if (arg0->unk34->unk74 != 0)
break;
if (arg0->unk34->unk4 != 0)
break;
fn_1_46AC(arg0->unk20); fn_1_46AC(arg0->unk20);
while (m446DeckPopCard(&arg0->unk28->unk0, &arg0->unk34) != 0) { while (m446DeckPopCard(&arg0->unk28->unk0, &arg0->unk34) != 0) {
@ -264,14 +278,16 @@ void fn_1_53C(unkStruct* arg0) {
arg0->unk14 = 0; arg0->unk14 = 0;
break; break;
case 11: case 11:
if (arg0->unk14++ < 0x78) break; if (arg0->unk14++ < 0x78)
break;
arg0->unk0 = 1; arg0->unk0 = 1;
arg0->unk10 = 0; arg0->unk10 = 0;
break; break;
} }
} }
void fn_1_958(unkStruct* arg0) { void fn_1_958(unkStruct *arg0)
{
s32 temp_r3; s32 temp_r3;
s32 temp_r3_2; s32 temp_r3_2;
s32 temp_r3_3; s32 temp_r3_3;
@ -300,20 +316,24 @@ void fn_1_958(unkStruct* arg0) {
if (arg0->unk2C[1]->unk64 == 8) { if (arg0->unk2C[1]->unk64 == 8) {
fn_1_5B34(arg0->unk2C[1]); fn_1_5B34(arg0->unk2C[1]);
HuAudSStreamPlay(3); HuAudSStreamPlay(3);
} else { }
else {
fn_1_5C10(arg0->unk2C[1]); fn_1_5C10(arg0->unk2C[1]);
HuAudSStreamPlay(4); HuAudSStreamPlay(4);
} }
} else if (arg0->unk2C[0]->unk24 != 0) { }
else if (arg0->unk2C[0]->unk24 != 0) {
fn_1_5B34(arg0->unk2C[0]); fn_1_5B34(arg0->unk2C[0]);
fn_1_5C10(arg0->unk2C[1]); fn_1_5C10(arg0->unk2C[1]);
HuAudSStreamPlay(1); HuAudSStreamPlay(1);
} else if (arg0->unk2C[1]->unk24 != 0) { }
else if (arg0->unk2C[1]->unk24 != 0) {
fn_1_5B34(arg0->unk2C[1]); fn_1_5B34(arg0->unk2C[1]);
fn_1_5C10(arg0->unk2C[0]); fn_1_5C10(arg0->unk2C[0]);
if (arg0->unk2C[1]->unk64 == 8) { if (arg0->unk2C[1]->unk64 == 8) {
HuAudSStreamPlay(3); HuAudSStreamPlay(3);
} else { }
else {
HuAudSStreamPlay(1); HuAudSStreamPlay(1);
} }
} }
@ -330,7 +350,8 @@ void fn_1_958(unkStruct* arg0) {
} }
} }
void fn_1_B78(unkStruct* arg0) { void fn_1_B78(unkStruct *arg0)
{
switch (arg0->unk10) { switch (arg0->unk10) {
case 0: case 0:
arg0->unk18 = HuAudSeqPlay(0x3F); arg0->unk18 = HuAudSeqPlay(0x3F);
@ -348,7 +369,8 @@ void fn_1_B78(unkStruct* arg0) {
} }
} }
void fn_1_C0C(unkStruct* arg0) { void fn_1_C0C(unkStruct *arg0)
{
switch (arg0->unk10) { switch (arg0->unk10) {
case 0: case 0:
HuAudSeqFadeOut(arg0->unk18, 0x64); HuAudSeqFadeOut(arg0->unk18, 0x64);
@ -366,7 +388,8 @@ void fn_1_C0C(unkStruct* arg0) {
} }
} }
void fn_1_CA0(unkStruct* arg0) { void fn_1_CA0(unkStruct *arg0)
{
s32 var_r29; s32 var_r29;
unkStruct8 *var_r30; unkStruct8 *var_r30;
@ -390,7 +413,8 @@ void fn_1_CA0(unkStruct* arg0) {
arg0->unk10 = 3; arg0->unk10 = 3;
arg0->unk14 = 0; arg0->unk14 = 0;
} }
} else { }
else {
arg0->unk10 = 4; arg0->unk10 = 4;
} }
break; break;
@ -420,7 +444,9 @@ void fn_1_CA0(unkStruct* arg0) {
MGSeqPosSet(arg0->unk6, lbl_1_data_70[arg0->unk1C][0], lbl_1_data_70[arg0->unk1C][1]); MGSeqPosSet(arg0->unk6, lbl_1_data_70[arg0->unk1C][0], lbl_1_data_70[arg0->unk1C][1]);
fn_1_4000(arg0->unk20, arg0->unk1C == 1 >> 5); fn_1_4000(arg0->unk20, arg0->unk1C == 1 >> 5);
arg0->unk10 = 7; arg0->unk10 = 7;
} else break; }
else
break;
case 7: case 7:
if (fn_1_4088(arg0->unk20, var_r30->unk64, var_r30->unk66, arg0->unk1C == 1, &arg0->unk34, 0) == 0) { if (fn_1_4088(arg0->unk20, var_r30->unk64, var_r30->unk66, arg0->unk1C == 1, &arg0->unk34, 0) == 0) {
if ((--arg0->unkC % 60) == 0) { if ((--arg0->unkC % 60) == 0) {
@ -433,7 +459,9 @@ void fn_1_CA0(unkStruct* arg0) {
arg0->unk14 = 0; arg0->unk14 = 0;
break; break;
} }
} else break; }
else
break;
} }
arg0->unk10 = 9; arg0->unk10 = 9;
break; break;
@ -455,7 +483,8 @@ void fn_1_CA0(unkStruct* arg0) {
if (arg0->unk34->unk70 == 0 && arg0->unk34->unk78 == 0 && arg0->unk34->unk74 == 0 && arg0->unk34->unk4 == 0) { if (arg0->unk34->unk70 == 0 && arg0->unk34->unk78 == 0 && arg0->unk34->unk74 == 0 && arg0->unk34->unk4 == 0) {
if (arg0->unk34->unk0 == 4) { if (arg0->unk34->unk0 == 4) {
arg0->unk10 = 13; arg0->unk10 = 13;
} else { }
else {
m446PlayerAppendCard(var_r30, arg0->unk34, 4); m446PlayerAppendCard(var_r30, arg0->unk34, 4);
arg0->unk10 = 11; arg0->unk10 = 11;
} }
@ -465,7 +494,8 @@ void fn_1_CA0(unkStruct* arg0) {
if (arg0->unk34->unk70 == 0 && arg0->unk34->unk78 == 0 && arg0->unk34->unk74 == 0 && arg0->unk34->unk4 == 0) { if (arg0->unk34->unk70 == 0 && arg0->unk34->unk78 == 0 && arg0->unk34->unk74 == 0 && arg0->unk34->unk4 == 0) {
if (var_r30->unk24 != 0) { if (var_r30->unk24 != 0) {
arg0->unk10 = 24; arg0->unk10 = 24;
} else { }
else {
arg0->unk10 = 12; arg0->unk10 = 12;
} }
} }
@ -475,9 +505,11 @@ void fn_1_CA0(unkStruct* arg0) {
arg0->unk1C = 1; arg0->unk1C = 1;
arg0->unk10 = 25; arg0->unk10 = 25;
break; break;
} else if (arg0->unk1C == 0) { }
else if (arg0->unk1C == 0) {
arg0->unk1C = 1; arg0->unk1C = 1;
} else { }
else {
arg0->unk1C = 0; arg0->unk1C = 0;
} }
arg0->unk10 = 1; arg0->unk10 = 1;
@ -599,24 +631,29 @@ void fn_1_CA0(unkStruct* arg0) {
} }
} }
s32 fn_1_17FC(unkStruct* arg0) { s32 fn_1_17FC(unkStruct *arg0)
{
return MGSeqStatGet(arg0->unk4) != 0; return MGSeqStatGet(arg0->unk4) != 0;
} }
void fn_1_183C(unkStruct* arg0) { void fn_1_183C(unkStruct *arg0)
{
MGSeqKill(arg0->unk4); MGSeqKill(arg0->unk4);
arg0->unk4 = -1; arg0->unk4 = -1;
} }
void fn_1_1874(unkStruct* arg0) { void fn_1_1874(unkStruct *arg0)
{
arg0->unk4 = MGSeqCreate(3, 0); arg0->unk4 = MGSeqCreate(3, 0);
} }
void fn_1_18B0(unkStruct* arg0) { void fn_1_18B0(unkStruct *arg0)
{
arg0->unk4 = MGSeqCreate(3, 1); arg0->unk4 = MGSeqCreate(3, 1);
} }
void fn_1_18EC(s16 arg0, s32 arg1) { void fn_1_18EC(s16 arg0, s32 arg1)
{
HuWinComKeyReset(); HuWinComKeyReset();
if (lbl_1_bss_10 == 2) { if (lbl_1_bss_10 == 2) {
HuWinComKeyWait(0x100, 0x100, 0x100, 0x100, arg1); HuWinComKeyWait(0x100, 0x100, 0x100, 0x100, arg1);
@ -625,22 +662,23 @@ void fn_1_18EC(s16 arg0, s32 arg1) {
HuWinMesWait(arg0); HuWinMesWait(arg0);
} }
s32 fn_1_1970(s16 arg0, s32 arg1, s32 arg2, s32 arg3) { s32 fn_1_1970(s16 arg0, s32 arg1, s32 arg2, s32 arg3)
{
if (lbl_1_bss_10 == 2) { if (lbl_1_bss_10 == 2) {
HuPrcSleep(arg3); HuPrcSleep(arg3);
return arg2; return arg2;
} else { }
else {
return HuWinChoiceGet(arg0, arg1); return HuWinChoiceGet(arg0, arg1);
} }
} }
static const s32 lbl_1_rodata_18[12] = { static const s32 lbl_1_rodata_18[12] = { MAKE_MESSID(0x18, 0x03), MAKE_MESSID(0x18, 0x04), MAKE_MESSID(0x18, 0x05), MAKE_MESSID(0x18, 0x06),
MAKE_MESSID(0x18, 0x03), MAKE_MESSID(0x18, 0x04), MAKE_MESSID(0x18, 0x05), MAKE_MESSID(0x18, 0x06), MAKE_MESSID(0x18, 0x07), MAKE_MESSID(0x18, 0x08), MAKE_MESSID(0x18, 0x09), MAKE_MESSID(0x18, 0x0A), MAKE_MESSID(0x18, 0x0B),
MAKE_MESSID(0x18, 0x07), MAKE_MESSID(0x18, 0x08), MAKE_MESSID(0x18, 0x09), MAKE_MESSID(0x18, 0x0A), MAKE_MESSID(0x18, 0x0C), MAKE_MESSID(0x18, 0x0D), 0 };
MAKE_MESSID(0x18, 0x0B), MAKE_MESSID(0x18, 0x0C), MAKE_MESSID(0x18, 0x0D), 0
};
void fn_1_19D4(void) { void fn_1_19D4(void)
{
s16 temp_r3; s16 temp_r3;
s16 var_r30; s16 var_r30;
s32 temp_r0; s32 temp_r0;
@ -658,7 +696,8 @@ void fn_1_19D4(void) {
HuWinMesColSet(temp_r3, 0); HuWinMesColSet(temp_r3, 0);
HuWinMesSet(temp_r3, MAKE_MESSID(0x18, 0x02)); HuWinMesSet(temp_r3, MAKE_MESSID(0x18, 0x02));
var_r30 = fn_1_1970(temp_r3, 0, 1, 0x3C); var_r30 = fn_1_1970(temp_r3, 0, 1, 0x3C);
} else { }
else {
var_r30 = 1; var_r30 = 1;
} }
if (var_r30 == 0) { if (var_r30 == 0) {
@ -668,7 +707,8 @@ void fn_1_19D4(void) {
HuWinMesSet(temp_r3, temp_r27); HuWinMesSet(temp_r3, temp_r27);
fn_1_18EC(temp_r3, 0x3C); fn_1_18EC(temp_r3, 0x3C);
} }
} else { }
else {
HuWinMesColSet(temp_r3, 0); HuWinMesColSet(temp_r3, 0);
HuWinMesSet(temp_r3, MAKE_MESSID(0x18, 0x0D)); HuWinMesSet(temp_r3, MAKE_MESSID(0x18, 0x0D));
fn_1_18EC(temp_r3, 0x3C); fn_1_18EC(temp_r3, 0x3C);

8
src/REL/m450Dll/main.c
View file

@ -7278,7 +7278,7 @@ void fn_1_24620(omObjData *var_r31)
if (omSysExitReq != 0) { if (omSysExitReq != 0) {
fn_1_1F58(0x64); fn_1_1F58(0x64);
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
var_r31->func = fn_1_298EC; var_r31->func = fn_1_298EC;
} }
lbl_1_bss_308++; lbl_1_bss_308++;
@ -7306,7 +7306,7 @@ void fn_1_24620(omObjData *var_r31)
fn_1_1F58(0x64); fn_1_1F58(0x64);
lbl_1_bss_2FE = -1; lbl_1_bss_2FE = -1;
WipeColorSet(0, 0, 0); WipeColorSet(0, 0, 0);
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
var_r31->func = fn_1_298EC; var_r31->func = fn_1_298EC;
} }
} }
@ -7315,7 +7315,7 @@ void fn_1_24620(omObjData *var_r31)
lbl_1_bss_128 += 1.0f; lbl_1_bss_128 += 1.0f;
if (60.0f < lbl_1_bss_128) { if (60.0f < lbl_1_bss_128) {
var_r31->work[0] += 1; var_r31->work[0] += 1;
WipeCreate(1, 0, 0x3C); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
HuAudFXPlay(0x7B2); HuAudFXPlay(0x7B2);
} }
break; break;
@ -7644,7 +7644,7 @@ void fn_1_24620(omObjData *var_r31)
if ((sp11C != 0) || (1200.0f < lbl_1_bss_128)) { if ((sp11C != 0) || (1200.0f < lbl_1_bss_128)) {
fn_1_1F58(0x64); fn_1_1F58(0x64);
lbl_1_bss_2FE = -1; lbl_1_bss_2FE = -1;
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
var_r31->func = fn_1_298EC; var_r31->func = fn_1_298EC;
} }
break; break;

8
src/REL/m453Dll/main.c
View file

@ -202,7 +202,7 @@ void ObjectSetup(void)
var_r29->work[1] = var_r30; var_r29->work[1] = var_r30;
} }
omGameSysInit(var_r31); omGameSysInit(var_r31);
WipeCreate(1, 0, 0x3C); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
HuAudSndGrpSet(0x1C); HuAudSndGrpSet(0x1C);
lbl_1_bss_2[0] = 1; lbl_1_bss_2[0] = 1;
if (GWMGRecordGet(9) == 0) { if (GWMGRecordGet(9) == 0) {
@ -286,7 +286,7 @@ void fn_1_460(omObjData *object)
break; break;
} }
if ((omSysExitReq != 0) && (WipeStatGet() == 0)) { if ((omSysExitReq != 0) && (WipeStatGet() == 0)) {
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_FFC; object->func = fn_1_FFC;
} }
} }
@ -439,13 +439,13 @@ void fn_1_848(omObjData *object)
break; break;
case 11: case 11:
if (--lbl_1_bss_32 == 0) { if (--lbl_1_bss_32 == 0) {
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_FFC; object->func = fn_1_FFC;
} }
break; break;
} }
if ((omSysExitReq != 0) && (WipeStatGet() == 0)) { if ((omSysExitReq != 0) && (WipeStatGet() == 0)) {
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_FFC; object->func = fn_1_FFC;
} }
} }

405
src/REL/mentDll/common.c
View file

@ -1,23 +1,23 @@
#include "math.h"
#include "ext_math.h"
#include "game/object.h"
#include "game/window.h"
#include "game/hsfman.h"
#include "game/process.h"
#include "game/objsub.h"
#include "game/wipe.h"
#include "game/board/tutorial.h"
#include "game/pad.h"
#include "REL/mentDll.h" #include "REL/mentDll.h"
#include "game/printfunc.h" #include "ext_math.h"
#include "game/board/tutorial.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h" #include "game/hsfmotion.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/process.h"
#include "game/sprite.h" #include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "math.h"
#include "rel_sqrt_consts.h" #include "rel_sqrt_consts.h"
Process *lbl_1_bss_0;
Process* lbl_1_bss_0; // TODO: unknown type
//TODO: unknown type
extern s32 lbl_1_bss_A8[]; extern s32 lbl_1_bss_A8[];
s32 lbl_1_data_0[][4] = { s32 lbl_1_data_0[][4] = {
@ -45,22 +45,25 @@ typedef void (*VoidFunc)(void);
extern const VoidFunc _ctors[]; extern const VoidFunc _ctors[];
extern const VoidFunc _dtors[]; extern const VoidFunc _dtors[];
void fn_1_0(omObjData* arg0) { void fn_1_0(omObjData *arg0)
{
if (WipeStatGet() == 0) { if (WipeStatGet() == 0) {
arg0->func = NULL; arg0->func = NULL;
omOvlReturnEx(1, 1); omOvlReturnEx(1, 1);
} }
} }
void fn_1_4C(omObjData* object) { void fn_1_4C(omObjData *object)
{
if (omSysExitReq != 0) { if (omSysExitReq != 0) {
object->func = fn_1_0; object->func = fn_1_0;
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
} }
} }
s32 _prolog(void) { s32 _prolog(void)
const VoidFunc* ctors = _ctors; {
const VoidFunc *ctors = _ctors;
while (*ctors != 0) { while (*ctors != 0) {
(**ctors)(); (**ctors)();
ctors++; ctors++;
@ -69,15 +72,17 @@ s32 _prolog(void) {
return 0; return 0;
} }
void _epilog(void) { void _epilog(void)
const VoidFunc* dtors = _dtors; {
const VoidFunc *dtors = _dtors;
while (*dtors != 0) { while (*dtors != 0) {
(**dtors)(); (**dtors)();
dtors++; dtors++;
} }
} }
void fn_1_144(void) { void fn_1_144(void)
{
_ClearFlag(0x1000BU); _ClearFlag(0x1000BU);
boardTutorialF = 0; boardTutorialF = 0;
lbl_1_bss_0 = omInitObjMan(0x3E, 0x2000); lbl_1_bss_0 = omInitObjMan(0x3E, 0x2000);
@ -88,55 +93,64 @@ void fn_1_144(void) {
omAddObjEx(lbl_1_bss_0, 0x2000, 0U, 0U, -1, fn_1_4C); omAddObjEx(lbl_1_bss_0, 0x2000, 0U, 0U, -1, fn_1_4C);
} }
f32 fn_1_20C(f32 arg8, f32 arg9, f32 argA, f32 argB) { f32 fn_1_20C(f32 arg8, f32 arg9, f32 argA, f32 argB)
{
if (argB <= argA) { if (argB <= argA) {
return arg9; return arg9;
} }
return arg8 + ((argA / argB) * (arg9 - arg8)); return arg8 + ((argA / argB) * (arg9 - arg8));
} }
f32 fn_1_234(f32 arg8, f32 arg9, f32 argA) { f32 fn_1_234(f32 arg8, f32 arg9, f32 argA)
{
return (arg9 + (arg8 * (argA - 1.0f))) / argA; return (arg9 + (arg8 * (argA - 1.0f))) / argA;
} }
//fn_1_254 // fn_1_254
f32 fn_1_254(f32 arg8, f32 arg9, f32 argA, f32 argB) { f32 fn_1_254(f32 arg8, f32 arg9, f32 argA, f32 argB)
{
if (argA >= argB) { if (argA >= argB) {
return arg9; return arg9;
} }
return (arg8 + ((arg9 - arg8) * (1.0 - cos((M_PI * ((90.0f / argB) * argA)) / 180.0)))); return (arg8 + ((arg9 - arg8) * (1.0 - cos((M_PI * ((90.0f / argB) * argA)) / 180.0))));
} }
//fn_1_32C // fn_1_32C
f32 fn_1_32C(f32 arg8, f32 arg9, f32 argA, f32 argB) { f32 fn_1_32C(f32 arg8, f32 arg9, f32 argA, f32 argB)
{
if (argA >= argB) { if (argA >= argB) {
return arg9; return arg9;
} }
return (arg8 + ((arg9 - arg8) * sin((M_PI * ((90.0f / argB) * argA)) / 180.0))); return (arg8 + ((arg9 - arg8) * sin((M_PI * ((90.0f / argB) * argA)) / 180.0)));
} }
f32 fn_1_3F4(f32 arg8, f32 arg9, f32 argA, f32 argB) { f32 fn_1_3F4(f32 arg8, f32 arg9, f32 argA, f32 argB)
{
if (argA >= argB) { if (argA >= argB) {
return arg8; return arg8;
} }
return (arg8 + ((arg9 - arg8) * sin((M_PI * ((360.0f / argB) * argA)) / 180.0))); return (arg8 + ((arg9 - arg8) * sin((M_PI * ((360.0f / argB) * argA)) / 180.0)));
} }
void fn_1_4B0(s32 arg0) { void fn_1_4B0(s32 arg0)
{
HuPrcSleep(arg0); HuPrcSleep(arg0);
} }
void fn_1_4D8(void) { void fn_1_4D8(void)
{
HuPrcVSleep(); HuPrcVSleep();
} }
void fn_1_4F8(void) { void fn_1_4F8(void)
{
while (1) { while (1) {
HuPrcVSleep(); HuPrcVSleep();
} }
} }
void fn_1_50C(void) { void fn_1_50C(void)
{
s32 temp_r3 = 0; s32 temp_r3 = 0;
temp_r3 = Hu3DGLightCreate(0.0f, 700.0f, 1200.0f, 0.0f, -1.0f, 0.0f, 255, 255, 255); temp_r3 = Hu3DGLightCreate(0.0f, 700.0f, 1200.0f, 0.0f, -1.0f, 0.0f, 255, 255, 255);
@ -144,10 +158,11 @@ void fn_1_50C(void) {
Hu3DGLightInfinitytSet(temp_r3); Hu3DGLightInfinitytSet(temp_r3);
} }
void fn_1_5E8(s32 arg0) { void fn_1_5E8(s32 arg0)
Point3d sp24 = {0.0f, 3000.0f, 800.0f}; {
Point3d sp18 = {0.0f, 0.0f, 640.0f}; Point3d sp24 = { 0.0f, 3000.0f, 800.0f };
Point3d spC = {0.0f, 1.0f, 0.0f}; Point3d sp18 = { 0.0f, 0.0f, 640.0f };
Point3d spC = { 0.0f, 1.0f, 0.0f };
if (arg0 == 3) { if (arg0 == 3) {
sp24.x = sp18.x = 1200.0f; sp24.x = sp18.x = 1200.0f;
@ -157,13 +172,14 @@ void fn_1_5E8(s32 arg0) {
Hu3DShadowPosSet(&sp24, &spC, &sp18); Hu3DShadowPosSet(&sp24, &spC, &sp18);
} }
void fn_1_6D0(void) { void fn_1_6D0(void)
{
HuWinInit(1); HuWinInit(1);
} }
void fn_1_6F4(s32 window, f32 centerX, f32 centerY, s32 toSmallF) void fn_1_6F4(s32 window, f32 centerX, f32 centerY, s32 toSmallF)
{ {
WindowData* winPtr; WindowData *winPtr;
f32 smallPosX; f32 smallPosX;
f32 smallPosY; f32 smallPosY;
f32 winPosX; f32 winPosX;
@ -189,10 +205,12 @@ void fn_1_6F4(s32 window, f32 centerX, f32 centerY, s32 toSmallF)
// adjust horizontal position // adjust horizontal position
if (((4.0f + smallPosX) - (winPosX + width)) >= 0.0f) { if (((4.0f + smallPosX) - (winPosX + width)) >= 0.0f) {
smallPosX = (winPosX + width) - 4.0f; smallPosX = (winPosX + width) - 4.0f;
} else { }
else {
if ((winPosX - (smallPosX - 2.0f)) >= 0.0f) { if ((winPosX - (smallPosX - 2.0f)) >= 0.0f) {
smallPosX = winPosX; smallPosX = winPosX;
} else { }
else {
smallPosX = smallPosX - 2.0f; smallPosX = smallPosX - 2.0f;
} }
} }
@ -203,10 +221,12 @@ void fn_1_6F4(s32 window, f32 centerX, f32 centerY, s32 toSmallF)
// adjust vertical position // adjust vertical position
if (((4.0f + smallPosY) - (winPosY + height)) >= 0.0f) { if (((4.0f + smallPosY) - (winPosY + height)) >= 0.0f) {
smallPosY = (winPosY + height) - 4.0f; smallPosY = (winPosY + height) - 4.0f;
} else { }
else {
if ((winPosY - (smallPosY - 2.0f)) >= 0.0f) { if ((winPosY - (smallPosY - 2.0f)) >= 0.0f) {
smallPosY = winPosY; smallPosY = winPosY;
} else { }
else {
smallPosY = smallPosY - 2.0f; smallPosY = smallPosY - 2.0f;
} }
} }
@ -218,7 +238,8 @@ void fn_1_6F4(s32 window, f32 centerX, f32 centerY, s32 toSmallF)
scaleX = smallScaleX; scaleX = smallScaleX;
posY = smallPosY; posY = smallPosY;
scaleY = smallScaleY; scaleY = smallScaleY;
} else { }
else {
HuWinPosSet(window, winPosX, winPosY); HuWinPosSet(window, winPosX, winPosY);
HuWinScaleSet(window, 1.0f, 1.0f); HuWinScaleSet(window, 1.0f, 1.0f);
posX = winPosX; posX = winPosX;
@ -235,14 +256,17 @@ void fn_1_6F4(s32 window, f32 centerX, f32 centerY, s32 toSmallF)
if (time <= 0xA) { if (time <= 0xA) {
posX = (time >= 10.0f) ? winPosX : (f32)(smallPosX + ((winPosX - smallPosX) * sind(9.0f * time))); posX = (time >= 10.0f) ? winPosX : (f32)(smallPosX + ((winPosX - smallPosX) * sind(9.0f * time)));
scaleX = (time >= 10.0f) ? 1.0f : (f32)(smallScaleX + ((1.0f - smallScaleX) * sind(9.0f * time))); scaleX = (time >= 10.0f) ? 1.0f : (f32)(smallScaleX + ((1.0f - smallScaleX) * sind(9.0f * time)));
} else { }
else {
posY = ((time - 0xA) >= 5.0f) ? winPosY : (f32)(smallPosY + ((winPosY - smallPosY) * sind(18.0f * (time - 0xA)))); posY = ((time - 0xA) >= 5.0f) ? winPosY : (f32)(smallPosY + ((winPosY - smallPosY) * sind(18.0f * (time - 0xA))));
scaleY = ((time - 0xA) >= 5.0f) ? 1.0f : (f32)(smallScaleY + ((1.0f - smallScaleY) * sind(18.0f * (time - 0xA)))); scaleY = ((time - 0xA) >= 5.0f) ? 1.0f : (f32)(smallScaleY + ((1.0f - smallScaleY) * sind(18.0f * (time - 0xA))));
} }
} else if (time <= 0xA) { }
posY = (time >= 10.0f) ? smallPosY : (f32)(winPosY + ((smallPosY - winPosY) * sind(9.0f * time))); else if (time <= 0xA) {
scaleY = (time >= 10.0f) ? smallScaleY : (f32)(1.0 + ((smallScaleY - 1.0f) * sind(9.0f * time))); posY = (time >= 10.0f) ? smallPosY : (f32)(winPosY + ((smallPosY - winPosY) * sind(9.0f * time)));
} else { scaleY = (time >= 10.0f) ? smallScaleY : (f32)(1.0 + ((smallScaleY - 1.0f) * sind(9.0f * time)));
}
else {
posX = ((time - 0xA) >= 5.0f) ? smallPosX : (f32)(winPosX + ((smallPosX - winPosX) * sind(18.0f * (time - 0xA)))); posX = ((time - 0xA) >= 5.0f) ? smallPosX : (f32)(winPosX + ((smallPosX - winPosX) * sind(18.0f * (time - 0xA))));
scaleX = ((time - 0xA) >= 5.0f) ? smallScaleX : (f32)(1.0 + ((smallScaleX - 1.0f) * sind(18.0f * (time - 0xA)))); scaleX = ((time - 0xA) >= 5.0f) ? smallScaleX : (f32)(1.0 + ((smallScaleX - 1.0f) * sind(18.0f * (time - 0xA))));
} }
@ -253,14 +277,16 @@ void fn_1_6F4(s32 window, f32 centerX, f32 centerY, s32 toSmallF)
if (toSmallF != 0) { if (toSmallF != 0) {
HuWinPosSet(window, winPosX, winPosY); HuWinPosSet(window, winPosX, winPosY);
HuWinScaleSet(window, 1.0f, 1.0f); HuWinScaleSet(window, 1.0f, 1.0f);
} else { }
else {
HuWinPosSet(window, smallPosX, smallPosY); HuWinPosSet(window, smallPosX, smallPosY);
HuWinScaleSet(window, smallScaleX, smallScaleY); HuWinScaleSet(window, smallScaleX, smallScaleY);
} }
HuPrcVSleep(); HuPrcVSleep();
} }
s32 fn_1_113C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, f32 arg8, f32 arg9, s32 arg6, s32 arg4, s32 arg5) { s32 fn_1_113C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, f32 arg8, f32 arg9, s32 arg6, s32 arg4, s32 arg5)
{
f32 sp14[2]; f32 sp14[2];
s32 temp_r30; s32 temp_r30;
@ -269,17 +295,18 @@ s32 fn_1_113C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, f32 arg8, f32 arg9, s32 ar
arg3 = (arg3 * 0x1A) + 0x10; arg3 = (arg3 * 0x1A) + 0x10;
arg1 = (445.0f - arg3); arg1 = (445.0f - arg3);
switch (arg0) { switch (arg0) {
case -1: case -1:
arg0 = 0x10; arg0 = 0x10;
break; break;
case 0: case 0:
arg0 = (1.0f + ((576.0f - arg2) / 2)); arg0 = (1.0f + ((576.0f - arg2) / 2));
break; break;
case 1: case 1:
arg0 = (556.0f - arg2); arg0 = (556.0f - arg2);
break; break;
} }
} else { }
else {
HuWinMesMaxSizeGet(1, sp14, arg5); HuWinMesMaxSizeGet(1, sp14, arg5);
arg2 = sp14[0]; arg2 = sp14[0];
arg3 = sp14[1]; arg3 = sp14[1];
@ -296,25 +323,29 @@ s32 fn_1_113C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, f32 arg8, f32 arg9, s32 ar
return temp_r30; return temp_r30;
} }
s32 fn_1_1434(s32 arg0, s32 arg1, s32 arg2) { s32 fn_1_1434(s32 arg0, s32 arg1, s32 arg2)
{
return fn_1_113C(arg0, 0, 0x15, 2, 0.5f, 0.5f, 2, 0, 0); return fn_1_113C(arg0, 0, 0x15, 2, 0.5f, 0.5f, 2, 0, 0);
} }
void fn_1_164C(s32 arg0, f32 arg8, f32 arg9) { void fn_1_164C(s32 arg0, f32 arg8, f32 arg9)
{
HuWinMesSet(arg0, 0x250004); HuWinMesSet(arg0, 0x250004);
HuPrcVSleep(); HuPrcVSleep();
fn_1_6F4(arg0, arg8, arg9, 0); fn_1_6F4(arg0, arg8, arg9, 0);
HuWinExCleanup(arg0); HuWinExCleanup(arg0);
} }
void fn_1_16AC(s32 arg0) { void fn_1_16AC(s32 arg0)
{
HuWinMesSet(arg0, 0x250004); HuWinMesSet(arg0, 0x250004);
HuPrcVSleep(); HuPrcVSleep();
fn_1_6F4(arg0, 0.5f, 0.5f, 0); fn_1_6F4(arg0, 0.5f, 0.5f, 0);
HuWinExCleanup(arg0); HuWinExCleanup(arg0);
} }
void fn_1_1714(s32 arg0, s32 arg1) { void fn_1_1714(s32 arg0, s32 arg1)
{
if ((arg1 == -999) || (arg1 == 0)) { if ((arg1 == -999) || (arg1 == 0)) {
return; return;
} }
@ -333,7 +364,8 @@ void fn_1_1714(s32 arg0, s32 arg1) {
HuWinComKeyReset(); HuWinComKeyReset();
} }
void fn_1_17A4(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { void fn_1_17A4(s32 arg0, s32 arg1, s32 arg2, s32 arg3)
{
s32 i; s32 i;
s32 temp_r28 = 0; s32 temp_r28 = 0;
s32 var_r30 = 0; s32 var_r30 = 0;
@ -341,7 +373,7 @@ void fn_1_17A4(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
(void)arg0; (void)arg0;
temp_r28 = HuWinKeyWaitNumGet(arg1); temp_r28 = HuWinKeyWaitNumGet(arg1);
if ((arg2 == -1) || (arg2 >= (s32) (temp_r28 - 1))) { if ((arg2 == -1) || (arg2 >= (s32)(temp_r28 - 1))) {
arg2 = temp_r28 - 1; arg2 = temp_r28 - 1;
} }
HuWinComKeyReset(); HuWinComKeyReset();
@ -361,13 +393,15 @@ void fn_1_17A4(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
if (var_r30 != 0) { if (var_r30 != 0) {
if (var_r30 == 1 && HuWinStatGet(arg0) != 1) { if (var_r30 == 1 && HuWinStatGet(arg0) != 1) {
var_r30 = 2; var_r30 = 2;
} else if (var_r30 == 2) { }
else if (var_r30 == 2) {
HuPrcSleep(arg3); HuPrcSleep(arg3);
HuWinAttrReset(arg0, 0x400); HuWinAttrReset(arg0, 0x400);
HuWinKeyWaitEntry(arg0); HuWinKeyWaitEntry(arg0);
break; break;
} }
} else if (HuWinStatGet(arg0) != 1) { }
else if (HuWinStatGet(arg0) != 1) {
break; break;
} }
} }
@ -378,7 +412,8 @@ void fn_1_17A4(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
HuWinComKeyReset(); HuWinComKeyReset();
} }
s32 fn_1_18D8(s32 arg0, s32 arg1) { s32 fn_1_18D8(s32 arg0, s32 arg1)
{
s32 temp_r31; s32 temp_r31;
HuWinComKeyReset(); HuWinComKeyReset();
@ -387,14 +422,17 @@ s32 fn_1_18D8(s32 arg0, s32 arg1) {
return temp_r31; return temp_r31;
} }
void fn_1_1928(s32 arg0, s32 arg1, s32 arg2) { void fn_1_1928(s32 arg0, s32 arg1, s32 arg2)
{
HuWinInsertMesSet(arg0, arg1, arg2); HuWinInsertMesSet(arg0, arg1, arg2);
} }
void fn_1_1968(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { void fn_1_1968(s32 arg0, s32 arg1, s32 arg2, s32 arg3)
{
if (arg3 == -999) { if (arg3 == -999) {
HuWinMesSpeedSet(arg0, 0); HuWinMesSpeedSet(arg0, 0);
} else { }
else {
HuWinMesSpeedSet(arg0, 1); HuWinMesSpeedSet(arg0, 1);
} }
HuWinMesSet(arg0, arg1); HuWinMesSet(arg0, arg1);
@ -414,12 +452,14 @@ void fn_1_1968(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
HuWinMesWait(arg0); HuWinMesWait(arg0);
HuWinComKeyReset(); HuWinComKeyReset();
} }
} else { }
else {
fn_1_17A4(arg0, arg1, arg2, arg3); fn_1_17A4(arg0, arg1, arg2, arg3);
} }
} }
s32 fn_1_1A5C(s32 arg0, s32 arg1, s32 arg2) { s32 fn_1_1A5C(s32 arg0, s32 arg1, s32 arg2)
{
s32 var_r28; s32 var_r28;
s32 var_r25 = 0; s32 var_r25 = 0;
@ -430,7 +470,8 @@ s32 fn_1_1A5C(s32 arg0, s32 arg1, s32 arg2) {
return var_r25; return var_r25;
} }
s32 fn_1_1DD8(s32 arg0, s32 arg1, s32 arg2) { s32 fn_1_1DD8(s32 arg0, s32 arg1, s32 arg2)
{
s32 var_r28; s32 var_r28;
s32 var_r25 = 0; s32 var_r25 = 0;
@ -441,7 +482,8 @@ s32 fn_1_1DD8(s32 arg0, s32 arg1, s32 arg2) {
return var_r25; return var_r25;
} }
s32 fn_1_2154(s32 arg0) { s32 fn_1_2154(s32 arg0)
{
f32 sp8[2]; f32 sp8[2];
f32 temp_f29; f32 temp_f29;
f32 temp_f28; f32 temp_f28;
@ -456,7 +498,8 @@ s32 fn_1_2154(s32 arg0) {
temp_f28 = 385.0f - sizeY; temp_f28 = 385.0f - sizeY;
if (lbl_1_data_70 == -1) { if (lbl_1_data_70 == -1) {
lbl_1_data_70 = ret = HuWinExCreateStyled(temp_f29, temp_f28, sizeX, sizeY, -1, 1); lbl_1_data_70 = ret = HuWinExCreateStyled(temp_f29, temp_f28, sizeX, sizeY, -1, 1);
} else { }
else {
fn_1_2318(0); fn_1_2318(0);
lbl_1_data_70 = ret = HuWinExCreateStyled(temp_f29, temp_f28, sizeX, sizeY, -1, 1); lbl_1_data_70 = ret = HuWinExCreateStyled(temp_f29, temp_f28, sizeX, sizeY, -1, 1);
} }
@ -467,20 +510,23 @@ s32 fn_1_2154(s32 arg0) {
return lbl_1_data_70; return lbl_1_data_70;
} }
void fn_1_2318(s32 arg0) { void fn_1_2318(s32 arg0)
{
if (lbl_1_data_70 != -1) { if (lbl_1_data_70 != -1) {
HuWinExCleanup(lbl_1_data_70); HuWinExCleanup(lbl_1_data_70);
lbl_1_data_70 = -1; lbl_1_data_70 = -1;
} }
} }
void fn_1_236C(f32 arg9) { void fn_1_236C(f32 arg9)
MentDllUnkBss64Struct* temp = &lbl_1_bss_64; {
MentDllUnkBss64Struct *temp = &lbl_1_bss_64;
if ((HuPadBtn[0] & 0x200)) { if ((HuPadBtn[0] & 0x200)) {
if ((HuPadBtn[0] & 0x20)) { if ((HuPadBtn[0] & 0x20)) {
temp->center.z = temp->center.z - (HuPadStkY[0] / 10.0f); temp->center.z = temp->center.z - (HuPadStkY[0] / 10.0f);
} else { }
else {
temp->center.x += HuPadStkX[0] / 10.0f; temp->center.x += HuPadStkX[0] / 10.0f;
temp->center.y = temp->center.y + (HuPadStkY[0] / 10.0f); temp->center.y = temp->center.y + (HuPadStkY[0] / 10.0f);
} }
@ -511,8 +557,9 @@ void fn_1_236C(f32 arg9) {
print8(0x18, 0x46, 1.0f, "ZOOM : %.2f", temp->zoom); print8(0x18, 0x46, 1.0f, "ZOOM : %.2f", temp->zoom);
} }
void fn_1_2750(omObjData* obj) { void fn_1_2750(omObjData *obj)
MentDllUnkBss64Struct* temp = &lbl_1_bss_64; {
MentDllUnkBss64Struct *temp = &lbl_1_bss_64;
if (temp->func != NULL) { if (temp->func != NULL) {
temp->func(); temp->func();
} }
@ -525,12 +572,14 @@ void fn_1_2750(omObjData* obj) {
CZoom = temp->zoom; CZoom = temp->zoom;
} }
void fn_1_2808(void (*arg0)(void)) { void fn_1_2808(void (*arg0)(void))
{
fn_1_29A0(&lbl_1_bss_64); fn_1_29A0(&lbl_1_bss_64);
lbl_1_bss_64.func = arg0; lbl_1_bss_64.func = arg0;
} }
void fn_1_2844(Process* arg0, void (*arg1)(void)) { void fn_1_2844(Process *arg0, void (*arg1)(void))
{
Hu3DCameraCreate(1); Hu3DCameraCreate(1);
Hu3DCameraViewportSet(1, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); Hu3DCameraViewportSet(1, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f);
Hu3DCameraPerspectiveSet(1, 42.0f, 20.0f, 5000.0f, 1.2f); Hu3DCameraPerspectiveSet(1, 42.0f, 20.0f, 5000.0f, 1.2f);
@ -540,7 +589,8 @@ void fn_1_2844(Process* arg0, void (*arg1)(void)) {
omAddObjEx(arg0, 0x7FD9, 0U, 0U, -1, fn_1_2750); omAddObjEx(arg0, 0x7FD9, 0U, 0U, -1, fn_1_2750);
} }
void fn_1_2964(MentDllUnkBss64Struct* arg0) { void fn_1_2964(MentDllUnkBss64Struct *arg0)
{
arg0->center.x = arg0->prevCenter.x; arg0->center.x = arg0->prevCenter.x;
arg0->center.y = arg0->prevCenter.y; arg0->center.y = arg0->prevCenter.y;
arg0->center.z = arg0->prevCenter.z; arg0->center.z = arg0->prevCenter.z;
@ -550,7 +600,8 @@ void fn_1_2964(MentDllUnkBss64Struct* arg0) {
arg0->zoom = arg0->prevZoom; arg0->zoom = arg0->prevZoom;
} }
void fn_1_29A0(MentDllUnkBss64Struct* arg0) { void fn_1_29A0(MentDllUnkBss64Struct *arg0)
{
arg0->unk_40 = 0.0f; arg0->unk_40 = 0.0f;
arg0->prevCenter.x = arg0->center.x; arg0->prevCenter.x = arg0->center.x;
arg0->prevCenter.y = arg0->center.y; arg0->prevCenter.y = arg0->center.y;
@ -561,11 +612,13 @@ void fn_1_29A0(MentDllUnkBss64Struct* arg0) {
arg0->prevZoom = arg0->zoom; arg0->prevZoom = arg0->zoom;
} }
static inline f32 SmoothInterpolate(f32 arg0, f32 arg1, f32 arg2) { static inline f32 SmoothInterpolate(f32 arg0, f32 arg1, f32 arg2)
{
return (arg1 + arg0 * (arg2 - 1.0f)) / arg2; return (arg1 + arg0 * (arg2 - 1.0f)) / arg2;
} }
void fn_1_29E4(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg8) { void fn_1_29E4(MentDllUnkBss64Struct *arg0, MentDllUnkBss64Struct *arg1, f32 arg8)
{
arg0->center.x = SmoothInterpolate(arg0->center.x, arg1->prevCenter.x, arg8); arg0->center.x = SmoothInterpolate(arg0->center.x, arg1->prevCenter.x, arg8);
arg0->center.y = SmoothInterpolate(arg0->center.y, arg1->prevCenter.y, arg8); arg0->center.y = SmoothInterpolate(arg0->center.y, arg1->prevCenter.y, arg8);
arg0->center.z = SmoothInterpolate(arg0->center.z, arg1->prevCenter.z, arg8); arg0->center.z = SmoothInterpolate(arg0->center.z, arg1->prevCenter.z, arg8);
@ -575,7 +628,8 @@ void fn_1_29E4(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg
arg0->zoom = SmoothInterpolate(arg0->zoom, arg1->prevZoom, arg8); arg0->zoom = SmoothInterpolate(arg0->zoom, arg1->prevZoom, arg8);
} }
void fn_1_2C50(MentDllUnkBss64Struct* arg0, f32 arg8) { void fn_1_2C50(MentDllUnkBss64Struct *arg0, f32 arg8)
{
arg0->center.x = SmoothInterpolate(arg0->center.x, arg0->prevCenter.x, arg8); arg0->center.x = SmoothInterpolate(arg0->center.x, arg0->prevCenter.x, arg8);
arg0->center.y = SmoothInterpolate(arg0->center.y, arg0->prevCenter.y, arg8); arg0->center.y = SmoothInterpolate(arg0->center.y, arg0->prevCenter.y, arg8);
arg0->center.z = SmoothInterpolate(arg0->center.z, arg0->prevCenter.z, arg8); arg0->center.z = SmoothInterpolate(arg0->center.z, arg0->prevCenter.z, arg8);
@ -585,15 +639,18 @@ void fn_1_2C50(MentDllUnkBss64Struct* arg0, f32 arg8) {
arg0->zoom = SmoothInterpolate(arg0->zoom, arg0->prevZoom, arg8); arg0->zoom = SmoothInterpolate(arg0->zoom, arg0->prevZoom, arg8);
} }
inline f32 LinearInterpolation(f32 arg0, f32 arg1, f32 arg8, f32 arg9) { inline f32 LinearInterpolation(f32 arg0, f32 arg1, f32 arg8, f32 arg9)
{
if (arg9 <= arg8) { if (arg9 <= arg8) {
return arg1; return arg1;
} else { }
else {
return arg0 + ((arg8 / arg9) * (arg1 - arg0)); return arg0 + ((arg8 / arg9) * (arg1 - arg0));
} }
} }
void fn_1_2EBC(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg8, f32 arg9) { void fn_1_2EBC(MentDllUnkBss64Struct *arg0, MentDllUnkBss64Struct *arg1, f32 arg8, f32 arg9)
{
arg1->prevCenter.x = LinearInterpolation(arg0->prevCenter.x, arg1->center.x, arg8, arg9); arg1->prevCenter.x = LinearInterpolation(arg0->prevCenter.x, arg1->center.x, arg8, arg9);
arg1->prevCenter.y = LinearInterpolation(arg0->prevCenter.y, arg1->center.y, arg8, arg9); arg1->prevCenter.y = LinearInterpolation(arg0->prevCenter.y, arg1->center.y, arg8, arg9);
arg1->prevCenter.z = LinearInterpolation(arg0->prevCenter.z, arg1->center.z, arg8, arg9); arg1->prevCenter.z = LinearInterpolation(arg0->prevCenter.z, arg1->center.z, arg8, arg9);
@ -605,7 +662,8 @@ void fn_1_2EBC(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg
arg1->prevZoom = LinearInterpolation(arg0->prevZoom, arg1->zoom, arg8, arg9); arg1->prevZoom = LinearInterpolation(arg0->prevZoom, arg1->zoom, arg8, arg9);
} }
void fn_1_3138(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg8, f32 arg9) { void fn_1_3138(MentDllUnkBss64Struct *arg0, MentDllUnkBss64Struct *arg1, f32 arg8, f32 arg9)
{
arg1->prevCenter.x = LinearInterpolation(arg0->prevCenter.x, arg1->center.x, arg8, arg9); arg1->prevCenter.x = LinearInterpolation(arg0->prevCenter.x, arg1->center.x, arg8, arg9);
arg1->prevCenter.y = LinearInterpolation(arg0->prevCenter.y, arg1->center.y, arg8, arg9); arg1->prevCenter.y = LinearInterpolation(arg0->prevCenter.y, arg1->center.y, arg8, arg9);
arg1->prevCenter.z = LinearInterpolation(arg0->prevCenter.z, arg1->center.z, arg8, arg9); arg1->prevCenter.z = LinearInterpolation(arg0->prevCenter.z, arg1->center.z, arg8, arg9);
@ -625,7 +683,8 @@ void fn_1_3138(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg
arg0->zoom = arg1->prevZoom; arg0->zoom = arg1->prevZoom;
} }
void fn_1_33EC(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg8, f32 arg9, f32 argA) { void fn_1_33EC(MentDllUnkBss64Struct *arg0, MentDllUnkBss64Struct *arg1, f32 arg8, f32 arg9, f32 argA)
{
arg1->prevCenter.x = LinearInterpolation(arg0->prevCenter.x, arg1->center.x, arg8, arg9); arg1->prevCenter.x = LinearInterpolation(arg0->prevCenter.x, arg1->center.x, arg8, arg9);
arg1->prevCenter.y = LinearInterpolation(arg0->prevCenter.y, arg1->center.y, arg8, arg9); arg1->prevCenter.y = LinearInterpolation(arg0->prevCenter.y, arg1->center.y, arg8, arg9);
arg1->prevCenter.z = LinearInterpolation(arg0->prevCenter.z, arg1->center.z, arg8, arg9); arg1->prevCenter.z = LinearInterpolation(arg0->prevCenter.z, arg1->center.z, arg8, arg9);
@ -647,7 +706,8 @@ void fn_1_33EC(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg
arg0->zoom = SmoothInterpolate(arg0->zoom, arg1->prevZoom, argA); arg0->zoom = SmoothInterpolate(arg0->zoom, arg1->prevZoom, argA);
} }
void fn_1_3858(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg8, f32 arg9) { void fn_1_3858(MentDllUnkBss64Struct *arg0, MentDllUnkBss64Struct *arg1, f32 arg8, f32 arg9)
{
arg1->prevCenter.x = fn_1_32C(arg0->prevCenter.x, arg1->center.x, arg8, arg9); arg1->prevCenter.x = fn_1_32C(arg0->prevCenter.x, arg1->center.x, arg8, arg9);
arg1->prevCenter.y = fn_1_32C(arg0->prevCenter.y, arg1->center.y, arg8, arg9); arg1->prevCenter.y = fn_1_32C(arg0->prevCenter.y, arg1->center.y, arg8, arg9);
arg1->prevCenter.z = fn_1_32C(arg0->prevCenter.z, arg1->center.z, arg8, arg9); arg1->prevCenter.z = fn_1_32C(arg0->prevCenter.z, arg1->center.z, arg8, arg9);
@ -659,7 +719,8 @@ void fn_1_3858(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg
arg1->prevZoom = fn_1_32C(arg0->prevZoom, arg1->zoom, arg8, arg9); arg1->prevZoom = fn_1_32C(arg0->prevZoom, arg1->zoom, arg8, arg9);
} }
void fn_1_3CAC(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg8, f32 arg9) { void fn_1_3CAC(MentDllUnkBss64Struct *arg0, MentDllUnkBss64Struct *arg1, f32 arg8, f32 arg9)
{
arg1->prevCenter.x = fn_1_32C(arg0->prevCenter.x, arg1->center.x, arg8, arg9); arg1->prevCenter.x = fn_1_32C(arg0->prevCenter.x, arg1->center.x, arg8, arg9);
arg1->prevCenter.y = fn_1_32C(arg0->prevCenter.y, arg1->center.y, arg8, arg9); arg1->prevCenter.y = fn_1_32C(arg0->prevCenter.y, arg1->center.y, arg8, arg9);
arg1->prevCenter.z = fn_1_32C(arg0->prevCenter.z, arg1->center.z, arg8, arg9); arg1->prevCenter.z = fn_1_32C(arg0->prevCenter.z, arg1->center.z, arg8, arg9);
@ -681,7 +742,8 @@ void fn_1_3CAC(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg
arg0->zoom = arg1->prevZoom; arg0->zoom = arg1->prevZoom;
} }
void fn_1_4138(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg8, f32 arg9, f32 argA) { void fn_1_4138(MentDllUnkBss64Struct *arg0, MentDllUnkBss64Struct *arg1, f32 arg8, f32 arg9, f32 argA)
{
arg1->prevCenter.x = fn_1_32C(arg0->prevCenter.x, arg1->center.x, arg8, arg9); arg1->prevCenter.x = fn_1_32C(arg0->prevCenter.x, arg1->center.x, arg8, arg9);
arg1->prevCenter.y = fn_1_32C(arg0->prevCenter.y, arg1->center.y, arg8, arg9); arg1->prevCenter.y = fn_1_32C(arg0->prevCenter.y, arg1->center.y, arg8, arg9);
arg1->prevCenter.z = fn_1_32C(arg0->prevCenter.z, arg1->center.z, arg8, arg9); arg1->prevCenter.z = fn_1_32C(arg0->prevCenter.z, arg1->center.z, arg8, arg9);
@ -703,7 +765,8 @@ void fn_1_4138(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg
arg0->zoom = SmoothInterpolate(arg0->zoom, arg1->prevZoom, argA); arg0->zoom = SmoothInterpolate(arg0->zoom, arg1->prevZoom, argA);
} }
void fn_1_4790(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg8, f32 arg9) { void fn_1_4790(MentDllUnkBss64Struct *arg0, MentDllUnkBss64Struct *arg1, f32 arg8, f32 arg9)
{
arg1->prevCenter.x = fn_1_254(arg0->prevCenter.x, arg1->center.x, arg8, arg9); arg1->prevCenter.x = fn_1_254(arg0->prevCenter.x, arg1->center.x, arg8, arg9);
arg1->prevCenter.y = fn_1_254(arg0->prevCenter.y, arg1->center.y, arg8, arg9); arg1->prevCenter.y = fn_1_254(arg0->prevCenter.y, arg1->center.y, arg8, arg9);
arg1->prevCenter.z = fn_1_254(arg0->prevCenter.z, arg1->center.z, arg8, arg9); arg1->prevCenter.z = fn_1_254(arg0->prevCenter.z, arg1->center.z, arg8, arg9);
@ -715,7 +778,8 @@ void fn_1_4790(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg
arg1->prevZoom = fn_1_254(arg0->prevZoom, arg1->zoom, arg8, arg9); arg1->prevZoom = fn_1_254(arg0->prevZoom, arg1->zoom, arg8, arg9);
} }
void fn_1_4C54(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg8, f32 arg9) { void fn_1_4C54(MentDllUnkBss64Struct *arg0, MentDllUnkBss64Struct *arg1, f32 arg8, f32 arg9)
{
arg1->prevCenter.x = fn_1_254(arg0->prevCenter.x, arg1->center.x, arg8, arg9); arg1->prevCenter.x = fn_1_254(arg0->prevCenter.x, arg1->center.x, arg8, arg9);
arg1->prevCenter.y = fn_1_254(arg0->prevCenter.y, arg1->center.y, arg8, arg9); arg1->prevCenter.y = fn_1_254(arg0->prevCenter.y, arg1->center.y, arg8, arg9);
arg1->prevCenter.z = fn_1_254(arg0->prevCenter.z, arg1->center.z, arg8, arg9); arg1->prevCenter.z = fn_1_254(arg0->prevCenter.z, arg1->center.z, arg8, arg9);
@ -737,7 +801,8 @@ void fn_1_4C54(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg
arg0->zoom = arg1->prevZoom; arg0->zoom = arg1->prevZoom;
} }
void fn_1_5150(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg8, f32 arg9, f32 argA) { void fn_1_5150(MentDllUnkBss64Struct *arg0, MentDllUnkBss64Struct *arg1, f32 arg8, f32 arg9, f32 argA)
{
arg1->prevCenter.x = fn_1_254(arg0->prevCenter.x, arg1->center.x, arg8, arg9); arg1->prevCenter.x = fn_1_254(arg0->prevCenter.x, arg1->center.x, arg8, arg9);
arg1->prevCenter.y = fn_1_254(arg0->prevCenter.y, arg1->center.y, arg8, arg9); arg1->prevCenter.y = fn_1_254(arg0->prevCenter.y, arg1->center.y, arg8, arg9);
arg1->prevCenter.z = fn_1_254(arg0->prevCenter.z, arg1->center.z, arg8, arg9); arg1->prevCenter.z = fn_1_254(arg0->prevCenter.z, arg1->center.z, arg8, arg9);
@ -759,25 +824,9 @@ void fn_1_5150(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg
arg0->zoom = SmoothInterpolate(arg0->zoom, arg1->prevZoom, argA); arg0->zoom = SmoothInterpolate(arg0->zoom, arg1->prevZoom, argA);
} }
void fn_1_5818(omObjData* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { void fn_1_5818(omObjData *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4)
{
switch (arg4) { switch (arg4) {
case 0:
Hu3DMotionShiftSet(arg0->model[arg1], arg0->motion[arg2], 0.0f, arg3, 0);
break;
case 1:
Hu3DMotionShiftSet(arg0->model[arg1], arg0->motion[arg2], 0.0f, arg3, 0x40000001);
break;
case 2:
Hu3DMotionShiftSet(arg0->model[arg1], arg0->motion[arg2], 0.0f, arg3, 0x40000002);
break;
}
arg0->work[0] = arg0->work[1] = arg0->work[2] = 0;
}
void fn_1_59A0(omObjData* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
if (arg0->work[3] != arg0->motion[arg2]) {
arg0->work[3] = arg0->motion[arg2];
switch (arg4) {
case 0: case 0:
Hu3DMotionShiftSet(arg0->model[arg1], arg0->motion[arg2], 0.0f, arg3, 0); Hu3DMotionShiftSet(arg0->model[arg1], arg0->motion[arg2], 0.0f, arg3, 0);
break; break;
@ -787,12 +836,31 @@ void fn_1_59A0(omObjData* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) {
case 2: case 2:
Hu3DMotionShiftSet(arg0->model[arg1], arg0->motion[arg2], 0.0f, arg3, 0x40000002); Hu3DMotionShiftSet(arg0->model[arg1], arg0->motion[arg2], 0.0f, arg3, 0x40000002);
break; break;
}
arg0->work[0] = arg0->work[1] = arg0->work[2] = 0;
}
void fn_1_59A0(omObjData *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4)
{
if (arg0->work[3] != arg0->motion[arg2]) {
arg0->work[3] = arg0->motion[arg2];
switch (arg4) {
case 0:
Hu3DMotionShiftSet(arg0->model[arg1], arg0->motion[arg2], 0.0f, arg3, 0);
break;
case 1:
Hu3DMotionShiftSet(arg0->model[arg1], arg0->motion[arg2], 0.0f, arg3, 0x40000001);
break;
case 2:
Hu3DMotionShiftSet(arg0->model[arg1], arg0->motion[arg2], 0.0f, arg3, 0x40000002);
break;
} }
arg0->work[0] = arg0->work[1] = arg0->work[2] = 0; arg0->work[0] = arg0->work[1] = arg0->work[2] = 0;
} }
} }
void fn_1_5B50(omObjData* arg0, s32 arg1, s32 arg2, s32 arg3) { void fn_1_5B50(omObjData *arg0, s32 arg1, s32 arg2, s32 arg3)
{
(void)arg1; (void)arg1;
Hu3DMotionShiftSet(arg0->model[1], arg0->motion[arg1], 0.0f, arg3, 0); Hu3DMotionShiftSet(arg0->model[1], arg0->motion[arg1], 0.0f, arg3, 0);
arg0->work[0] = arg0->work[1] = arg0->work[2] = 0; arg0->work[0] = arg0->work[1] = arg0->work[2] = 0;
@ -801,7 +869,8 @@ void fn_1_5B50(omObjData* arg0, s32 arg1, s32 arg2, s32 arg3) {
arg0->work[2] = arg3 + 1; arg0->work[2] = arg3 + 1;
} }
void fn_1_5C08(omObjData* arg0) { void fn_1_5C08(omObjData *arg0)
{
s32 temp; s32 temp;
if (arg0->work[0] != 0) { if (arg0->work[0] != 0) {
@ -818,7 +887,8 @@ void fn_1_5C08(omObjData* arg0) {
} }
} }
void fn_1_5CDC(omObjData* arg0, s32 arg1, s32 arg2) { void fn_1_5CDC(omObjData *arg0, s32 arg1, s32 arg2)
{
HuPrcSleep(arg2 + 1); HuPrcSleep(arg2 + 1);
do { do {
HuPrcVSleep(); HuPrcVSleep();
@ -848,91 +918,98 @@ void fn_1_5D38(omObjData *arg0, s32 arg1, Vec arg2, float arg8, float arg9, floa
sp10.x = 0; sp10.x = 0;
sp10.y = arg8; sp10.y = arg8;
sp10.z = 0; sp10.z = 0;
if(sp34.x-sp40.x >= 0.0f) { if (sp34.x - sp40.x >= 0.0f) {
temp_r29 = 1; temp_r29 = 1;
} else { }
else {
temp_r29 = 0; temp_r29 = 0;
} }
if(sp34.z-sp40.z >= 0.0f) { if (sp34.z - sp40.z >= 0.0f) {
temp_r28 = 1; temp_r28 = 1;
} else { }
else {
temp_r28 = 0; temp_r28 = 0;
} }
while(arg3) { while (arg3) {
fn_1_4D8(); fn_1_4D8();
sp28.y = -(atan2d(sp34.z-sp40.z, sp34.x-sp40.x)-90); sp28.y = -(atan2d(sp34.z - sp40.z, sp34.x - sp40.x) - 90);
if(sp28.y < 0.0f) { if (sp28.y < 0.0f) {
sp28.y += 360.0f; sp28.y += 360.0f;
} else if(sp28.y >= 360.0f) { }
else if (sp28.y >= 360.0f) {
sp28.y -= 360.0f; sp28.y -= 360.0f;
} }
if(arg4) { if (arg4) {
if(sp28.y >= 180.0f) { if (sp28.y >= 180.0f) {
if(sp1C.y-sp28.y >= 180.0f) { if (sp1C.y - sp28.y >= 180.0f) {
sp1C.y -= 360.0f; sp1C.y -= 360.0f;
} }
if(sp1C.y-sp28.y < -180.0f) { if (sp1C.y - sp28.y < -180.0f) {
sp1C.y += 360.0f; sp1C.y += 360.0f;
} }
} else { }
if(sp1C.y-sp28.y > 180.0f) { else {
if (sp1C.y - sp28.y > 180.0f) {
sp1C.y -= 360.0f; sp1C.y -= 360.0f;
} }
if(sp1C.y-sp28.y <= -180.0f) { if (sp1C.y - sp28.y <= -180.0f) {
sp1C.y += 360.0f; sp1C.y += 360.0f;
} }
} }
} }
sp4C.x = sp40.x = sp40.x+(arg9*sind(sp28.y)); sp4C.x = sp40.x = sp40.x + (arg9 * sind(sp28.y));
sp4C.z = sp40.z = sp40.z+(arg9*cosd(sp28.y)); sp4C.z = sp40.z = sp40.z + (arg9 * cosd(sp28.y));
if(temp_r29 == 1) { if (temp_r29 == 1) {
if(sp40.x >= sp34.x) { if (sp40.x >= sp34.x) {
sp4C.x = sp40.x = sp34.x;
temp_r29 = 2;
}
} else if(temp_r29 == 0) {
if(sp40.x <= sp34.x) {
sp4C.x = sp40.x = sp34.x; sp4C.x = sp40.x = sp34.x;
temp_r29 = 2; temp_r29 = 2;
} }
} }
if(temp_r28 == 1) { else if (temp_r29 == 0) {
if(sp40.z >= sp34.z) { if (sp40.x <= sp34.x) {
sp4C.z = sp40.z = sp34.z; sp4C.x = sp40.x = sp34.x;
temp_r28 = 2; temp_r29 = 2;
} }
} else if(temp_r28 == 0) { }
if(sp40.z <= sp34.z) { if (temp_r28 == 1) {
if (sp40.z >= sp34.z) {
sp4C.z = sp40.z = sp34.z; sp4C.z = sp40.z = sp34.z;
temp_r28 = 2; temp_r28 = 2;
} }
} }
if(arg4) { else if (temp_r28 == 0) {
if (sp40.z <= sp34.z) {
sp4C.z = sp40.z = sp34.z;
temp_r28 = 2;
}
}
if (arg4) {
sp1C.y = fn_1_234(sp1C.y, sp28.y, argA); sp1C.y = fn_1_234(sp1C.y, sp28.y, argA);
} }
Hu3DModelPosSet(arg0->model[arg1], sp4C.x, sp40.y, sp4C.z); Hu3DModelPosSet(arg0->model[arg1], sp4C.x, sp40.y, sp4C.z);
Hu3DModelRotSet(arg0->model[arg1], sp1C.x, sp1C.y, sp1C.z); Hu3DModelRotSet(arg0->model[arg1], sp1C.x, sp1C.y, sp1C.z);
if(temp_r29 == 2 && temp_r28 == 2) { if (temp_r29 == 2 && temp_r28 == 2) {
break; break;
} }
} }
sp1C.y = Hu3DData[arg0->model[arg1]].rot.y; sp1C.y = Hu3DData[arg0->model[arg1]].rot.y;
if(arg4) { if (arg4) {
s32 temp_r27; s32 temp_r27;
for(temp_r27=0; temp_r27<=argA; temp_r27++) { for (temp_r27 = 0; temp_r27 <= argA; temp_r27++) {
fn_1_4D8(); fn_1_4D8();
if(sp10.y >= 180.0f) { if (sp10.y >= 180.0f) {
if(sp1C.y-sp10.y >= 180.0f) { if (sp1C.y - sp10.y >= 180.0f) {
sp1C.y -= 360.0f; sp1C.y -= 360.0f;
} }
if(sp1C.y-sp10.y < -180.0f) { if (sp1C.y - sp10.y < -180.0f) {
sp1C.y += 360.0f; sp1C.y += 360.0f;
} }
} else { }
if(sp1C.y-sp10.y > 180.0f) { else {
if (sp1C.y - sp10.y > 180.0f) {
sp1C.y -= 360.0f; sp1C.y -= 360.0f;
} }
if(sp1C.y-sp10.y <= -180.0f) { if (sp1C.y - sp10.y <= -180.0f) {
sp1C.y += 360.0f; sp1C.y += 360.0f;
} }
} }
@ -944,5 +1021,5 @@ void fn_1_5D38(omObjData *arg0, s32 arg1, Vec arg2, float arg8, float arg9, floa
void fn_1_6534(s32 grpId, s32 memberNo, float posX, float posY) void fn_1_6534(s32 grpId, s32 memberNo, float posX, float posY)
{ {
HuSprPosSet(grpId, memberNo, posX, posY+0.5f); HuSprPosSet(grpId, memberNo, posX, posY + 0.5f);
} }

24
src/REL/mentDll/main.c
View file

@ -482,7 +482,7 @@ void fn_1_7304(void)
void fn_1_7684(void) void fn_1_7684(void)
{ {
s32 spC[7] = { 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F }; s32 spC[7] = { 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F };
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
fn_1_4D8(); fn_1_4D8();
} }
@ -530,7 +530,7 @@ void fn_1_7858(void)
for (var_r31 = 0; var_r31 < 5; var_r31++) { for (var_r31 = 0; var_r31 < 5; var_r31++) {
Hu3DModelAttrReset(lbl_1_bss_33AC[var_r31].unk_00->model[1], HU3D_ATTR_DISPOFF); Hu3DModelAttrReset(lbl_1_bss_33AC[var_r31].unk_00->model[1], HU3D_ATTR_DISPOFF);
} }
WipeCreate(1, 0, -1); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
@ -690,7 +690,7 @@ void fn_1_81F0(void)
HuAudSStreamPlay(0xC); HuAudSStreamPlay(0xC);
OSReport("########### ME_MainProcFunc000\n"); OSReport("########### ME_MainProcFunc000\n");
WipeColorSet(0xFF, 0xFF, 0xFF); WipeColorSet(0xFF, 0xFF, 0xFF);
WipeCreate(1, 0, -1); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
} }
void fn_1_824C(void) void fn_1_824C(void)
@ -713,7 +713,7 @@ void fn_1_824C(void)
fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 2, 0, 2); fn_1_5818(lbl_1_bss_35BC[0].unk_00, 2, 2, 0, 2);
Hu3DModelAttrSet(lbl_1_bss_35BC[0].unk_00->model[2], HU3D_ATTR_DISPOFF); Hu3DModelAttrSet(lbl_1_bss_35BC[0].unk_00->model[2], HU3D_ATTR_DISPOFF);
OSReport("########### ME_MainProcFunc400\n"); OSReport("########### ME_MainProcFunc400\n");
WipeCreate(1, 0, -1); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
@ -1939,7 +1939,7 @@ void fn_1_C174(s32 arg0)
fn_1_4B0(0x3C); fn_1_4B0(0x3C);
HuAudSeqFadeOut(lbl_1_bss_14[0], 0x3E8); HuAudSeqFadeOut(lbl_1_bss_14[0], 0x3E8);
} }
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
fn_1_4D8(); fn_1_4D8();
@ -2580,7 +2580,7 @@ void fn_1_E244(void)
{ {
lbl_1_bss_14[0] = HuAudSeqPlay(0x30); lbl_1_bss_14[0] = HuAudSeqPlay(0x30);
OSReport("########### ME_MainProcFunc200\n"); OSReport("########### ME_MainProcFunc200\n");
WipeCreate(1, 0, -1); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
fn_1_4D8(); fn_1_4D8();
} }
@ -2604,7 +2604,7 @@ void fn_1_E3FC(void)
{ {
lbl_1_bss_14[0] = HuAudSeqPlay(6); lbl_1_bss_14[0] = HuAudSeqPlay(6);
OSReport("########### ME_MainProcFunc300\n"); OSReport("########### ME_MainProcFunc300\n");
WipeCreate(1, 0, -1); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
fn_1_4D8(); fn_1_4D8();
} }
@ -2647,7 +2647,7 @@ void fn_1_E654(s32 arg0)
{ {
fn_1_4B0(0x3C); fn_1_4B0(0x3C);
HuAudSeqFadeOut(lbl_1_bss_14[0], 0x3E8); HuAudSeqFadeOut(lbl_1_bss_14[0], 0x3E8);
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
fn_1_4D8(); fn_1_4D8();
} }
@ -2668,7 +2668,7 @@ void fn_1_E71C(s32 arg0)
s32 spC[7] = { 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F }; s32 spC[7] = { 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F };
fn_1_4B0(0x3C); fn_1_4B0(0x3C);
HuAudSeqFadeOut(lbl_1_bss_14[0], 0x3E8); HuAudSeqFadeOut(lbl_1_bss_14[0], 0x3E8);
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
fn_1_4D8(); fn_1_4D8();
} }
@ -2855,7 +2855,7 @@ void fn_1_1053C(void)
{ {
fn_1_4B0(0x6E); fn_1_4B0(0x6E);
WipeColorSet(0, 0, 0); WipeColorSet(0, 0, 0);
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
fn_1_4D8(); fn_1_4D8();
} }
@ -2913,7 +2913,7 @@ void fn_1_10C5C(void)
{ {
fn_1_4B0(0x6E); fn_1_4B0(0x6E);
WipeColorSet(0, 0, 0); WipeColorSet(0, 0, 0);
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
fn_1_4D8(); fn_1_4D8();
} }
@ -2989,7 +2989,7 @@ void fn_1_114A0(void)
{ {
fn_1_4B0(0x6E); fn_1_4B0(0x6E);
WipeColorSet(0, 0, 0); WipeColorSet(0, 0, 0);
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
fn_1_4D8(); fn_1_4D8();
} }

2
src/REL/mpexDll/main.c
View file

@ -56,7 +56,7 @@ void fn_1_1C0(omObjData *object)
if (omSysExitReq != 0) { if (omSysExitReq != 0) {
HuAudFadeOut(0x3E8); HuAudFadeOut(0x3E8);
WipeColorSet(0, 0, 0); WipeColorSet(0, 0, 0);
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
object->func = fn_1_188; object->func = fn_1_188;
} }
} }

14
src/REL/mpexDll/mpex.c
View file

@ -238,7 +238,7 @@ void fn_1_3384(void)
fn_1_1B7D0(0x1E); fn_1_1B7D0(0x1E);
HuAudFadeOut(0x3E8); HuAudFadeOut(0x3E8);
WipeColorSet(0, 0, 0); WipeColorSet(0, 0, 0);
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
fn_1_1B7D0(1); fn_1_1B7D0(1);
@ -265,7 +265,7 @@ void fn_1_33F8(void)
espPosSet(var_r31, 288.0f, 240.0f); espPosSet(var_r31, 288.0f, 240.0f);
espAttrReset(var_r31, HUSPR_ATTR_DISPOFF); espAttrReset(var_r31, HUSPR_ATTR_DISPOFF);
Hu3DBGColorSet(0, 0, 0); Hu3DBGColorSet(0, 0, 0);
WipeCreate(1, 0, 0xA); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
@ -274,7 +274,7 @@ void fn_1_33F8(void)
if (SLSave() == 0) { if (SLSave() == 0) {
GWSystem.save_mode = 1; GWSystem.save_mode = 1;
} }
WipeCreate(2, 0, 0x14); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
@ -289,7 +289,7 @@ void fn_1_3508(void)
fn_1_1B7D0(0x1E); fn_1_1B7D0(0x1E);
HuAudFadeOut(0x3E8); HuAudFadeOut(0x3E8);
WipeColorSet(0, 0, 0); WipeColorSet(0, 0, 0);
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
fn_1_1B7D0(1); fn_1_1B7D0(1);
@ -317,7 +317,7 @@ void fn_1_36A4(void)
fn_1_1B7D0(0x1E); fn_1_1B7D0(0x1E);
HuAudSStreamAllFadeOut(0x3E8); HuAudSStreamAllFadeOut(0x3E8);
WipeColorSet(0xFF, 0xFF, 0xFF); WipeColorSet(0xFF, 0xFF, 0xFF);
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
fn_1_1B7D0(1); fn_1_1B7D0(1);
} }
@ -353,7 +353,7 @@ void fn_1_3758(s32 arg0, s32 arg1)
HuAudSeqAllFadeOut(0x3E8); HuAudSeqAllFadeOut(0x3E8);
HuAudSStreamAllFadeOut(0x3E8); HuAudSStreamAllFadeOut(0x3E8);
WipeColorSet(0xFF, 0xFF, 0xFF); WipeColorSet(0xFF, 0xFF, 0xFF);
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
fn_1_1B7D0(1); fn_1_1B7D0(1);
} }
@ -397,7 +397,7 @@ void fn_1_397C(void)
if (omovlevtno != 2) { if (omovlevtno != 2) {
lbl_1_data_298 = HuAudSeqPlay(0x2E); lbl_1_data_298 = HuAudSeqPlay(0x2E);
} }
WipeCreate(1, 0, -1); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
fn_1_1B7D0(1); fn_1_1B7D0(1);
} }

2
src/REL/option/state.c
View file

@ -79,7 +79,7 @@ static void ExecState(omObjData *object)
object->unk10 = 1; object->unk10 = 1;
/* fallthrough */ /* fallthrough */
case 1: case 1:
WipeCreate(WIPE_MODE_IN, -1, 60); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_PREV, 60);
object->unk10 = 2; object->unk10 = 2;
break; break;
case 2: case 2:

24
src/REL/ztardll/main.c
View file

@ -146,7 +146,7 @@ block_7:
HuSprTPLvlSet(lbl_1_bss_4C[1], 2, 0.5f); HuSprTPLvlSet(lbl_1_bss_4C[1], 2, 0.5f);
} }
if (var_r26 == 0) { if (var_r26 == 0) {
WipeCreate(1, 0, 0x1E); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30);
HuPrcSleep(0xA); HuPrcSleep(0xA);
sp2C.x = 510.0f; sp2C.x = 510.0f;
sp2C.y = 80.0f; sp2C.y = 80.0f;
@ -185,7 +185,7 @@ block_7:
HuSprGrpPosSet(lbl_1_bss_50, 288.0f, 80.0f); HuSprGrpPosSet(lbl_1_bss_50, 288.0f, 80.0f);
HuSprGrpPosSet(lbl_1_bss_4C[0], 138.0f, 240.0f); HuSprGrpPosSet(lbl_1_bss_4C[0], 138.0f, 240.0f);
HuSprGrpPosSet(lbl_1_bss_4C[1], 438.0f, 240.0f); HuSprGrpPosSet(lbl_1_bss_4C[1], 438.0f, 240.0f);
WipeCreate(1, 0, 0x14); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 20);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }
@ -341,7 +341,7 @@ loop_19:
} }
fn_1_111E0(); fn_1_111E0();
fn_1_1190C(); fn_1_1190C();
WipeCreate(2, 0, 0x14); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }
@ -554,7 +554,7 @@ void fn_1_2350(void)
} }
HuSprBankSet(lbl_1_bss_50, 1, mgBattleStarMax); HuSprBankSet(lbl_1_bss_50, 1, mgBattleStarMax);
HuSprScaleSet(lbl_1_bss_50, 1, 1.0f, 1.0f); HuSprScaleSet(lbl_1_bss_50, 1, 1.0f, 1.0f);
WipeCreate(1, 0, 0x14); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 20);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }
@ -595,7 +595,7 @@ void fn_1_2350(void)
fn_1_11264(MAKE_MESSID(0x33, 0x29), 0, 0); fn_1_11264(MAKE_MESSID(0x33, 0x29), 0, 0);
} }
fn_1_111E0(); fn_1_111E0();
WipeCreate(2, 0, 0x1E); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }
@ -617,14 +617,14 @@ void fn_1_2350(void)
Hu3DMotionShiftSet(lbl_1_bss_36[1], lbl_1_bss_E[1][4], 0.0f, 10.0f, HU3D_MOTATTR_NONE); Hu3DMotionShiftSet(lbl_1_bss_36[1], lbl_1_bss_E[1][4], 0.0f, 10.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(0xB4); HuPrcSleep(0xB4);
WipeColorSet(0, 0, 0); WipeColorSet(0, 0, 0);
WipeCreate(2, 0, 0x1E); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }
} }
} }
else { else {
WipeCreate(1, 0, 0x14); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 20);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }
@ -688,7 +688,7 @@ void fn_1_2350(void)
HuAudFXPlay(3); HuAudFXPlay(3);
fn_1_1190C(); fn_1_1190C();
WipeColorSet(0, 0, 0); WipeColorSet(0, 0, 0);
WipeCreate(2, 0, 0x14); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }
@ -927,7 +927,7 @@ void fn_1_4374(void)
spC[sp8[GWPlayerCfg[var_r31].group]++] = var_r31; spC[sp8[GWPlayerCfg[var_r31].group]++] = var_r31;
} }
fn_1_4948(); fn_1_4948();
WipeCreate(1, 0, 0x14); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 20);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }
@ -980,7 +980,7 @@ void fn_1_4374(void)
HuAudFXPlay(3); HuAudFXPlay(3);
fn_1_1190C(); fn_1_1190C();
WipeColorSet(0, 0, 0); WipeColorSet(0, 0, 0);
WipeCreate(2, 0, 0x14); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }
@ -1100,7 +1100,7 @@ void fn_1_51BC(s16 arg0)
omOvlHisData *var_r31; omOvlHisData *var_r31;
WipeColorSet(0xFF, 0xFF, 0xFF); WipeColorSet(0xFF, 0xFF, 0xFF);
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
HuAudSeqAllFadeOut(0x3E8); HuAudSeqAllFadeOut(0x3E8);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
@ -1389,7 +1389,7 @@ void fn_1_66F8(void)
HuPrcVSleep(); HuPrcVSleep();
} }
WipeColorSet(0xFF, 0xFF, 0xFF); WipeColorSet(0xFF, 0xFF, 0xFF);
WipeCreate(2, 0, 60); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }