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

Applied DATA_MAKE_NUM and MAKE_MESSID macros

Browse source
This commit is contained in:
kabiskac 2024-08-09 01:37:36 +02:00
parent c1c506360c
commit a0ebc7588d
116 changed files with 38174 additions and 37156 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/REL/m407dll/effect.c
View file

@ -1,9 +1,10 @@
#include "src/REL/m407dll/m407dll.h"
#include "game/process.h"
#include "game/object.h"
#include "game/hsfmotion.h"
#include "game/hsfdraw.h"
#include "REL/m407dll.h"
typedef struct unkDominationData4 {
/* 0x00 */ u32 unk_00;
/* 0x04 */ u32 unk_04;
@ -28,11 +29,11 @@ omObjData* lbl_1_bss_37E0[100];
//data
s32 lbl_1_data_288[] = {
0x00260015,
0x00260016,
0x00260017,
0x00260018,
0x00260019
DATA_MAKE_NUM(DATADIR_M407, 0x15),
DATA_MAKE_NUM(DATADIR_M407, 0x16),
DATA_MAKE_NUM(DATADIR_M407, 0x17),
DATA_MAKE_NUM(DATADIR_M407, 0x18),
DATA_MAKE_NUM(DATADIR_M407, 0x19)
};
ObjFuncs lbl_1_data_29C[] = {
@ -143,7 +144,7 @@ void fn_1_46EC(omObjData* arg0) {
temp_r30->unk_00 = arg0->work[0];
temp_r30->unk_08 = arg0->work[1];
temp_r30->unk_1C = 0;
arg0->model[0] = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_data_288[temp_r30->unk_08], MEMORY_DEFAULT_NUM, HEAP_DATA));
arg0->model[0] = Hu3DModelCreateFile(lbl_1_data_288[temp_r30->unk_08]);
Hu3DModelAttrSet(arg0->model[0], 0x4000);
Hu3DModelAttrSet(arg0->model[0], 0x40000002);
Hu3DModelAttrSet(arg0->model[0], 1);

5
src/REL/m407dll/m407dll.h
View file

@ -1,5 +0,0 @@
#include "game/object.h"
#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
typedef void (*ObjFuncs)(omObjData*);

98
src/REL/m407dll/map.c
View file

@ -1,51 +1,47 @@
#include "game/process.h"
#include "game/object.h"
#include "game/gamework_data.h"
#include "game/hsfman.h"
#include "game/object.h"
#include "game/process.h"
#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
//function signatures
void fn_1_162C(omObjData*);
void fn_1_1A8C(omObjData*);
// function signatures
void fn_1_162C(omObjData *);
void fn_1_1A8C(omObjData *);
//bss
Process* lbl_1_bss_2C;
omObjData* lbl_1_bss_28;
// bss
Process *lbl_1_bss_2C;
omObjData *lbl_1_bss_28;
s16 lbl_1_bss_24;
s32 lbl_1_bss_20;
//data
// data
s32 lbl_1_data_198[] = {
0x00260000,
0x00260002,
0x00260003,
0x00260001,
0x00260005,
0x00260006,
0x00260007,
0x00260008,
0x00260009,
0x0026000A,
0x0026000B,
0x0026000C,
0x00260004,
DATA_MAKE_NUM(DATADIR_M407, 0x00),
DATA_MAKE_NUM(DATADIR_M407, 0x02),
DATA_MAKE_NUM(DATADIR_M407, 0x03),
DATA_MAKE_NUM(DATADIR_M407, 0x01),
DATA_MAKE_NUM(DATADIR_M407, 0x05),
DATA_MAKE_NUM(DATADIR_M407, 0x06),
DATA_MAKE_NUM(DATADIR_M407, 0x07),
DATA_MAKE_NUM(DATADIR_M407, 0x08),
DATA_MAKE_NUM(DATADIR_M407, 0x09),
DATA_MAKE_NUM(DATADIR_M407, 0x0A),
DATA_MAKE_NUM(DATADIR_M407, 0x0B),
DATA_MAKE_NUM(DATADIR_M407, 0x0C),
DATA_MAKE_NUM(DATADIR_M407, 0x04),
};
Vec lbl_1_data_1CC[] = {
{600.0f, 3.0f, -300.0f},
{200.0f, 3.0f, -300.0f},
{-200.0f, 3.0f, -300.0f},
{-600.0f, 3.0f, -300.0f}
};
Vec lbl_1_data_1CC[] = { { 600.0f, 3.0f, -300.0f }, { 200.0f, 3.0f, -300.0f }, { -200.0f, 3.0f, -300.0f }, { -600.0f, 3.0f, -300.0f } };
Point3d lbl_1_data_1FC = {2000.0f, 3000.0f, 2000.0f};
Point3d lbl_1_data_208 = {-0.5f, -0.5f, -0.5f};
GXColor lbl_1_data_214 = {255, 255, 255, 255};
Point3d lbl_1_data_218 = {0.0f, 1.0f, 0.0f};
Point3d lbl_1_data_1FC = { 2000.0f, 3000.0f, 2000.0f };
Point3d lbl_1_data_208 = { -0.5f, -0.5f, -0.5f };
GXColor lbl_1_data_214 = { 255, 255, 255, 255 };
Point3d lbl_1_data_218 = { 0.0f, 1.0f, 0.0f };
void fn_1_14F0(Process* arg0, s32 arg1) {
LightData* sp10;
void fn_1_14F0(Process *arg0, s32 arg1)
{
LightData *sp10;
lbl_1_bss_2C = arg0;
lbl_1_bss_20 = arg1;
@ -57,7 +53,8 @@ void fn_1_14F0(Process* arg0, s32 arg1) {
sp10 = &Hu3DGlobalLight[lbl_1_bss_24];
}
void fn_1_15D8(void) {
void fn_1_15D8(void)
{
s32 i;
for (i = 0; i < 13; i++) {
@ -65,7 +62,8 @@ void fn_1_15D8(void) {
}
}
void fn_1_162C(omObjData* arg0) {
void fn_1_162C(omObjData *arg0)
{
s32 var_r30;
s32 var_r30_2;
s32 var_r30_3;
@ -73,50 +71,52 @@ void fn_1_162C(omObjData* arg0) {
s32 i;
arg0->func = fn_1_1A8C;
arg0->model[0] = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_data_198[2], MEMORY_DEFAULT_NUM, HEAP_DATA));
arg0->model[0] = Hu3DModelCreateFile(lbl_1_data_198[2]);
Hu3DModelShadowMapSet(arg0->model[0]);
Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f);
arg0->model[1] = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_data_198[3], MEMORY_DEFAULT_NUM, HEAP_DATA));
arg0->model[1] = Hu3DModelCreateFile(lbl_1_data_198[3]);
Hu3DModelAmbSet(arg0->model[1], 1.0f, 1.0f, 1.0f);
Hu3DModelAttrSet(arg0->model[1], 1);
for (i = 0; i < ARRAY_COUNT(GWPlayerCfg); i++) {
arg0->model[i+2] = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_data_198[GWPlayerCfg[i].character + 4], MEMORY_DEFAULT_NUM, HEAP_DATA));
arg0->model[i + 2] = Hu3DModelCreateFile(lbl_1_data_198[GWPlayerCfg[i].character + 4]);
Hu3DModelAmbSet(arg0->model[i + 2], 1.0f, 1.0f, 1.0f);
Hu3DModelShadowMapSet(arg0->model[i + 2]);
}
for (i = 0; i < 5; i++) {
if (i == 0) {
arg0->model[i + 6] = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_data_198[0], MEMORY_DEFAULT_NUM, HEAP_DATA));
} else {
arg0->model[i + 6] = Hu3DModelCreateFile(lbl_1_data_198[0]);
}
else {
arg0->model[i + 6] = Hu3DModelLink(arg0->model[6]);
}
Hu3DModelAmbSet(arg0->model[i + 6], 1.0f, 1.0f, 1.0f);
Hu3DModelShadowMapSet(arg0->model[i + 6]);
}
arg0->model[11] = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_data_198[12], MEMORY_DEFAULT_NUM, HEAP_DATA));
arg0->model[12] = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_data_198[1], MEMORY_DEFAULT_NUM, HEAP_DATA));
arg0->model[11] = Hu3DModelCreateFile(lbl_1_data_198[12]);
arg0->model[12] = Hu3DModelCreateFile(lbl_1_data_198[1]);
for (i = 0; i < 4; i++) {
Hu3DModelPosSetV(arg0->model[i + 2], &lbl_1_data_1CC[i]);
}
for (i = 0; i < 5; i++) {
Hu3DModelPosSet(arg0->model[i + 6], 0.0f, 0.0f, -2000.0f + (8000.0f * (f32) i));
Hu3DModelPosSet(arg0->model[i + 6], 0.0f, 0.0f, -2000.0f + (8000.0f * (f32)i));
}
Hu3DModelPosSet(arg0->model[11], 0.0f, 0.0f, -3900.0f);
Hu3DModelPosSet(arg0->model[12], 0.0f, 0.0f, 0.0f);
Hu3DModelAttrSet(arg0->model[12], 0x40000001);
if (lbl_1_bss_20 > 0) {
Hu3DModelPosSet(arg0->model[1], 0.0f, 0.0f, 200.0f * (f32) lbl_1_bss_20);
Hu3DModelPosSet(arg0->model[1], 0.0f, 0.0f, 200.0f * (f32)lbl_1_bss_20);
Hu3DModelAttrReset(arg0->model[1], 1);
}
}
void fn_1_1A8C(omObjData* arg0) {
void fn_1_1A8C(omObjData *arg0)
{
Point3d sp8;
sp8.x = lbl_1_data_1FC.x;
@ -124,4 +124,4 @@ void fn_1_1A8C(omObjData* arg0) {
sp8.z = lbl_1_data_1FC.z + Center.z;
Hu3DGLightPosSetV(lbl_1_bss_24, &sp8, &lbl_1_data_208);
Hu3DShadowPosSet(&sp8, &lbl_1_data_218, &Center);
}
}

407
src/REL/m407dll/player.c
View file

@ -1,27 +1,27 @@
#include "game/process.h"
#include "game/object.h"
#include "game/gamework_data.h"
#include "game/pad.h"
#include "game/objsub.h"
#include "game/chrman.h"
#include "game/hsfman.h"
#include "game/frand.h"
#include "game/gamework_data.h"
#include "game/hsfman.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/process.h"
#include "math.h"
#include "rel_sqrt_consts.h"
#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
typedef void (*ObjFuncs)(omObjData*);
typedef void (*ObjFuncs)(omObjData *);
typedef struct unkDominationData {
u8 unk_00;
u8 unk_01;
u8 unk_02;
//padding unk_03
// padding unk_03
s32 unk_04;
s32 unk_08;
u8 unk_0C;
//padding unk_0D
// padding unk_0D
f32 unk_10;
f32 unk_14;
f32 unk_18;
@ -35,90 +35,150 @@ typedef struct unkDominationData {
s32 unk_38;
} unkDominationData;
//function signatures
void fn_1_628(omObjData*, s32);
void fn_1_64C(omObjData*);
void fn_1_99C(omObjData*);
void fn_1_A1C(omObjData* arg0);
// function signatures
void fn_1_628(omObjData *, s32);
void fn_1_64C(omObjData *);
void fn_1_99C(omObjData *);
void fn_1_A1C(omObjData *arg0);
void fn_1_26CC(u8);
void fn_1_4544(s32, s32, f32, f32, f32);
s16 fn_1_28B8(u8);
s16 fn_1_28E4(u8);
void fn_1_A88(omObjData* arg0);
void fn_1_A8C(omObjData* arg0);
void fn_1_C58(omObjData* arg0);
void fn_1_CF4(omObjData* arg0);
void fn_1_DB4(omObjData* arg0);
void fn_1_F8C(omObjData* arg0);
void fn_1_1074(omObjData* arg0);
void fn_1_11CC(omObjData* arg0);
void fn_1_13E4(omObjData* arg0);
void fn_1_1460(omObjData* arg0);
void fn_1_A88(omObjData *arg0);
void fn_1_A8C(omObjData *arg0);
void fn_1_C58(omObjData *arg0);
void fn_1_CF4(omObjData *arg0);
void fn_1_DB4(omObjData *arg0);
void fn_1_F8C(omObjData *arg0);
void fn_1_1074(omObjData *arg0);
void fn_1_11CC(omObjData *arg0);
void fn_1_13E4(omObjData *arg0);
void fn_1_1460(omObjData *arg0);
//bss
Process* lbl_1_bss_18;
omObjData* lbl_1_bss_8[4];
Process* lbl_1_bss_0[2];
// bss
Process *lbl_1_bss_18;
omObjData *lbl_1_bss_8[4];
Process *lbl_1_bss_0[2];
//data
// data
u32 lbl_1_data_0[8][8] = {
{0x005F0000, 0x005F0024, 0x005F0029, 0x005F0005, 0x005F0006, 0x005F004A, 0x005F004B, 0x005F0018},
{0x001A0000, 0x001A0024, 0x001A0029, 0x001A0005, 0x001A0006, 0x001A004A, 0x001A004B, 0x001A0018},
{0x006D0000, 0x006D0024, 0x006D0029, 0x006D0005, 0x006D0006, 0x006D004A, 0x006D004B, 0x006D0018},
{0x008A0000, 0x008A0024, 0x008A0029, 0x008A0005, 0x008A0006, 0x008A004A, 0x008A004B, 0x008A0018},
{0x00850000, 0x00850024, 0x00850029, 0x00850005, 0x00850006, 0x0085004A, 0x0085004B, 0x00850018},
{0x00110000, 0x00110024, 0x00110029, 0x00110005, 0x00110006, 0x0011004A, 0x0011004B, 0x00110018},
{0x000D0000, 0x000D0024, 0x000D0029, 0x000D0005, 0x000D0006, 0x000D004A, 0x000D004B, 0x000D0018},
{0x00810000, 0x00810024, 0x00810029, 0x00810005, 0x00810006, 0x0081004A, 0x0081004B, 0x00810018}
{
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x24),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x29),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x05),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x06),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x4A),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x4B),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18),
},
{
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x00),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x24),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x29),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x05),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x06),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x4A),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x4B),
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x18),
},
{
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x00),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x24),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x29),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x05),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x06),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x4A),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x4B),
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x18),
},
{
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x00),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x24),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x29),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x05),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x06),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x4A),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x4B),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x18),
},
{
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x00),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x24),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x29),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x05),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x06),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x4A),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x4B),
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x18),
},
{
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x00),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x24),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x29),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x05),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x06),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x4A),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x4B),
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x18),
},
{
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x00),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x24),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x29),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x05),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x06),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x4A),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x4B),
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x18),
},
{
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x00),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x24),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x29),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x05),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x06),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x4A),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x4B),
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x18),
},
};
s32 lbl_1_data_100[] = {0x0026000D, 0x0026000E, 0x0026000F, 0x00260010, 0x00260011, 0x00260012, 0x00260013, 0x00260014};
s32 lbl_1_data_100[] = {
DATA_MAKE_NUM(DATADIR_M407, 0x0D),
DATA_MAKE_NUM(DATADIR_M407, 0x0E),
DATA_MAKE_NUM(DATADIR_M407, 0x0F),
DATA_MAKE_NUM(DATADIR_M407, 0x10),
DATA_MAKE_NUM(DATADIR_M407, 0x11),
DATA_MAKE_NUM(DATADIR_M407, 0x12),
DATA_MAKE_NUM(DATADIR_M407, 0x13),
DATA_MAKE_NUM(DATADIR_M407, 0x14),
};
char lbl_1_data_120[] = "test11_tex_we-itemhook-r";
char* lbl_1_data_13C[] = {
lbl_1_data_120,
lbl_1_data_120,
lbl_1_data_120,
lbl_1_data_120,
lbl_1_data_120,
lbl_1_data_120,
lbl_1_data_120,
lbl_1_data_120
};
char *lbl_1_data_13C[]
= { lbl_1_data_120, lbl_1_data_120, lbl_1_data_120, lbl_1_data_120, lbl_1_data_120, lbl_1_data_120, lbl_1_data_120, lbl_1_data_120 };
ObjFuncs lbl_1_data_15C[] = {
fn_1_A88,
fn_1_A8C,
fn_1_C58,
fn_1_CF4,
fn_1_DB4,
fn_1_F8C,
fn_1_1074,
fn_1_11CC,
fn_1_13E4,
fn_1_1460
};
ObjFuncs lbl_1_data_15C[] = { fn_1_A88, fn_1_A8C, fn_1_C58, fn_1_CF4, fn_1_DB4, fn_1_F8C, fn_1_1074, fn_1_11CC, fn_1_13E4, fn_1_1460 };
u8 lbl_1_data_184[4][2] = {
{0x3C, 0x0F},
{0x50, 0x0F},
{0x64, 0x14},
{0x78, 0x14}
};
u8 lbl_1_data_184[4][2] = { { 0x3C, 0x0F }, { 0x50, 0x0F }, { 0x64, 0x14 }, { 0x78, 0x14 } };
inline void SetDominationDataStuff(omObjData* arg0, s32 val0, s32 val1) {
unkDominationData* temp_r29 = arg0->data;
inline void SetDominationDataStuff(omObjData *arg0, s32 val0, s32 val1)
{
unkDominationData *temp_r29 = arg0->data;
temp_r29->unk_1C = val0;
temp_r29->unk_20 = val1;
}
void ObjectSetup(void) {
void ObjectSetup(void)
{
lbl_1_bss_0[0] = omInitObjMan(0x2F8, 0x2000);
omGameSysInit(lbl_1_bss_0[0]);
fn_1_4980(lbl_1_bss_0[0]);
}
void fn_1_F4(Process* arg0) {
void fn_1_F4(Process *arg0)
{
u32 i;
lbl_1_bss_18 = arg0;
@ -128,7 +188,8 @@ void fn_1_F4(Process* arg0) {
}
}
void fn_1_194(void) {
void fn_1_194(void)
{
s32 i;
for (i = 0; i < 4; i++) {
@ -136,7 +197,8 @@ void fn_1_194(void) {
}
}
void fn_1_1E4(void) {
void fn_1_1E4(void)
{
s32 i;
for (i = 0; i < 4; i++) {
@ -144,7 +206,8 @@ void fn_1_1E4(void) {
}
}
void fn_1_238(void) {
void fn_1_238(void)
{
s32 i;
for (i = 0; i < 4; i++) {
@ -152,7 +215,8 @@ void fn_1_238(void) {
}
}
void fn_1_28C(void) {
void fn_1_28C(void)
{
s32 i;
for (i = 0; i < 4; i++) {
@ -160,7 +224,8 @@ void fn_1_28C(void) {
}
}
void fn_1_2E0(void) {
void fn_1_2E0(void)
{
s32 i;
for (i = 0; i < 4; i++) {
@ -168,7 +233,8 @@ void fn_1_2E0(void) {
}
}
void fn_1_334(void) {
void fn_1_334(void)
{
s32 i;
for (i = 0; i < 4; i++) {
@ -176,19 +242,22 @@ void fn_1_334(void) {
}
}
void fn_1_388(u8 arg0, s32 arg1) {
omObjData* obj = lbl_1_bss_8[arg0];
unkDominationData* unkData = obj->data;
void fn_1_388(u8 arg0, s32 arg1)
{
omObjData *obj = lbl_1_bss_8[arg0];
unkDominationData *unkData = obj->data;
unkData->unk_38 = arg1;
}
void fn_1_3C4(u8 arg0) {
void fn_1_3C4(u8 arg0)
{
fn_1_628(lbl_1_bss_8[arg0], 8);
}
void fn_1_404(void) {
omObjData* temp_r31;
unkDominationData* unkData;
void fn_1_404(void)
{
omObjData *temp_r31;
unkDominationData *unkData;
s32 temp_r0;
u8 i;
@ -196,68 +265,74 @@ void fn_1_404(void) {
temp_r31 = lbl_1_bss_8[i];
unkData = temp_r31->data;
switch (unkData->unk_38) {
case 0:
fn_1_628(temp_r31, 9);
break;
case 1:
fn_1_628(temp_r31, 6);
break;
case 2:
fn_1_628(temp_r31, 9);
break;
case 0:
fn_1_628(temp_r31, 9);
break;
case 1:
fn_1_628(temp_r31, 6);
break;
case 2:
fn_1_628(temp_r31, 9);
break;
}
}
}
s32 fn_1_4C0(u8 arg0) {
unkDominationData* unkData;
s32 fn_1_4C0(u8 arg0)
{
unkDominationData *unkData;
if (arg0 >= 4) {
return -1;
}
unkData = lbl_1_bss_8[arg0]->data;
return unkData->unk_01;
}
s32 fn_1_508(u8 arg0) {
unkDominationData* unkData = lbl_1_bss_8[arg0]->data;
s32 fn_1_508(u8 arg0)
{
unkDominationData *unkData = lbl_1_bss_8[arg0]->data;
return unkData->unk_04;
}
s32 fn_1_53C(u8 arg0) {
return ((unkDominationData*)(lbl_1_bss_8[arg0]->data))->unk_1C == 0;
s32 fn_1_53C(u8 arg0)
{
return ((unkDominationData *)(lbl_1_bss_8[arg0]->data))->unk_1C == 0;
}
void fn_1_568(s16 arg0, s16 arg1, s16 arg2) {
unkDominationData* unkData;
void fn_1_568(s16 arg0, s16 arg1, s16 arg2)
{
unkDominationData *unkData;
unkData = lbl_1_bss_8[arg0]->data;
switch (arg1) {
case 0:
omVibrate(unkData->unk_00, arg2, 6, 6);
break;
case 1:
omVibrate(unkData->unk_00, arg2, 4, 2);
break;
case 2:
omVibrate(unkData->unk_00, arg2, 0xC, 0);
break;
case 0:
omVibrate(unkData->unk_00, arg2, 6, 6);
break;
case 1:
omVibrate(unkData->unk_00, arg2, 4, 2);
break;
case 2:
omVibrate(unkData->unk_00, arg2, 0xC, 0);
break;
}
}
void fn_1_628(omObjData* arg0, s32 arg1) {
unkDominationData* temp_r31;
void fn_1_628(omObjData *arg0, s32 arg1)
{
unkDominationData *temp_r31;
temp_r31 = arg0->data;
temp_r31->unk_1C = arg1;
temp_r31->unk_20 = 0;
}
void fn_1_64C(omObjData* arg0) {
void fn_1_64C(omObjData *arg0)
{
u32 temp_r29;
unkDominationData* temp_r27;
unkDominationData* temp_r31;
unkDominationData *temp_r27;
unkDominationData *temp_r31;
u32 i;
arg0->func = fn_1_A1C;
@ -276,14 +351,14 @@ void fn_1_64C(omObjData* arg0) {
temp_r31->unk_30 = (600.0f / (lbl_1_data_184[temp_r31->unk_02][0] - frandmod31(lbl_1_data_184[temp_r31->unk_02][1])));
temp_r31->unk_2C = temp_r31->unk_30;
arg0->model[0] = CharModelCreate(temp_r31->unk_01, 8);
arg0->model[1] = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_data_100[temp_r31->unk_01], MEMORY_DEFAULT_NUM, HEAP_DATA));
arg0->model[1] = Hu3DModelCreateFile(lbl_1_data_100[temp_r31->unk_01]);
Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f);
Hu3DModelAmbSet(arg0->model[1], 1.0f, 1.0f, 1.0f);
for (i = 0; i < 8; i++) {
arg0->motion[i] = CharModelMotionCreate(temp_r31->unk_01, lbl_1_data_0[temp_r31->unk_01][i]);
}
Hu3DModelShadowSet(arg0->model[0]);
Hu3DModelShadowSet(arg0->model[1]);
CharModelMotionDataClose(temp_r31->unk_01);
@ -296,47 +371,49 @@ void fn_1_64C(omObjData* arg0) {
SetDominationDataStuff(arg0, 0, 0);
}
void fn_1_99C(omObjData* arg0) {
void fn_1_99C(omObjData *arg0)
{
s32 i;
for (i = 0; i < 8; i++) {
Hu3DMotionKill(arg0->motion[i]);
}
for (i = 0; i < 2; i++){
for (i = 0; i < 2; i++) {
Hu3DModelKill(arg0->model[i]);
}
HuMemDirectFree(arg0->data);
}
void fn_1_A1C(omObjData* arg0) {
unkDominationData* temp_r31;
void fn_1_A1C(omObjData *arg0)
{
unkDominationData *temp_r31;
temp_r31 = arg0->data;
lbl_1_data_15C[temp_r31->unk_1C](arg0);
omSetTra(arg0, temp_r31->unk_10, temp_r31->unk_14, temp_r31->unk_18);
}
void fn_1_A88(omObjData* arg0) {
void fn_1_A88(omObjData *arg0) { }
}
void fn_1_A8C(omObjData* arg0) {
void fn_1_A8C(omObjData *arg0)
{
s32 var_r29;
unkDominationData* temp_r31;
unkDominationData *temp_r31;
var_r29 = 0;
temp_r31 = arg0->data;
temp_r31->unk_28 += 1.0f;
if (temp_r31->unk_04 == 0) {
var_r29 = (HuPadBtnDown[temp_r31->unk_0C] & 0x100) ? 1 : 0;
} else if ((u32) temp_r31->unk_28 >= (u32) temp_r31->unk_2C) {
}
else if ((u32)temp_r31->unk_28 >= (u32)temp_r31->unk_2C) {
var_r29 = 1;
temp_r31->unk_2C += temp_r31->unk_30;
}
if (var_r29 != 0) {
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[2], 0.0f, 0.0f, 0);
fn_1_4544(4, 0x10, 600.0f - (400.0f * temp_r31->unk_00), -20.0f, -450.0f);
@ -344,15 +421,16 @@ void fn_1_A8C(omObjData* arg0) {
temp_r31->unk_34 = 1;
return;
}
if ((temp_r31->unk_34 != 0) && (Hu3DMotionEndCheck(arg0->model[0]) != 0)) {
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[1], 0.0f, 0.0f, 0x40000001);
temp_r31->unk_34 = 0;
}
}
void fn_1_C58(omObjData* arg0) {
unkDominationData* temp_r30;
void fn_1_C58(omObjData *arg0)
{
unkDominationData *temp_r30;
temp_r30 = arg0->data;
if (Hu3DMotionEndCheck(arg0->model[0]) != 0) {
@ -362,8 +440,9 @@ void fn_1_C58(omObjData* arg0) {
}
}
void fn_1_CF4(omObjData* arg0) {
unkDominationData* temp_r31;
void fn_1_CF4(omObjData *arg0)
{
unkDominationData *temp_r31;
temp_r31 = arg0->data;
if (temp_r31->unk_20 == 0) {
@ -375,56 +454,59 @@ void fn_1_CF4(omObjData* arg0) {
}
}
void fn_1_DB4(omObjData* arg0) {
void fn_1_DB4(omObjData *arg0)
{
f32 temp_f31;
f32 temp_f30;
unkDominationData* temp_r31;
unkDominationData *temp_r31;
temp_r31 = arg0->data;
if (temp_r31->unk_20 == 0) {
CharModelVoiceEnableSet(temp_r31->unk_01, arg0->motion[3], 0);
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[3], 0.0f, 10.0f, 0);
temp_r31->unk_24 = 0.0f;
temp_r31->unk_20++;
}
temp_f31 = (32.0f * sin(1.0471975511965976)) - (9.8f * temp_r31->unk_24);
temp_f30 = 22.0f * cos(1.0471975511965976);
temp_r31->unk_18 = temp_r31->unk_18 + temp_f30;
temp_r31->unk_14 = temp_r31->unk_14 + temp_f31;
temp_r31->unk_24 += 0.3f;
if (!(temp_f31 < 0.0f) || !(temp_r31->unk_14 <= 30.0f)) {
return;
}
temp_r31->unk_14 = 30.0f;
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[4], 0.0f, 10.0f, 0);
SetDominationDataStuff(arg0, 0, 0);
}
//can also be placed into fn_1_F8C as static const
const s32 lbl_1_rodata_70[] = {0x00000122, 0x00000162, 0x000001A2, 0x000001E2, 0x00000222, 0x00000262, 0x000002A2, 0x000002E2};
// can also be placed into fn_1_F8C as static const
const s32 lbl_1_rodata_70[] = { 0x00000122, 0x00000162, 0x000001A2, 0x000001E2, 0x00000222, 0x00000262, 0x000002A2, 0x000002E2 };
void fn_1_F8C(omObjData* arg0) {
unkDominationData* temp_r31;
void fn_1_F8C(omObjData *arg0)
{
unkDominationData *temp_r31;
temp_r31 = arg0->data;
if (temp_r31->unk_20 == 0) {
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[5], 0.0f, 10.0f, 0);
HuAudFXPlay(lbl_1_rodata_70[temp_r31->unk_01]);
}
if (temp_r31->unk_20++ >= 120) {
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[0], 0.0f, 10.0f, 0x40000001);
SetDominationDataStuff(arg0, 0, 0);
}
}
void fn_1_1074(omObjData* arg0) {
unkDominationData* temp_r31;
void fn_1_1074(omObjData *arg0)
{
unkDominationData *temp_r31;
temp_r31 = arg0->data;
if (temp_r31->unk_20 == 0) {
@ -433,18 +515,19 @@ void fn_1_1074(omObjData* arg0) {
temp_r31->unk_24 = 0.0f;
temp_r31->unk_20 = 1;
}
temp_r31->unk_14 = (temp_r31->unk_14 + ((80.0 * sin(1.5707963267948966)) - (9.8 * temp_r31->unk_24)));
temp_r31->unk_24 += 0.3f;
if (!(temp_r31->unk_14 < 1000.0f)) {
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[4], 0.0f, 10.0f, 0);
SetDominationDataStuff(arg0, 7, 0);
}
}
void fn_1_11CC(omObjData* arg0) {
unkDominationData* temp_r31;
void fn_1_11CC(omObjData *arg0)
{
unkDominationData *temp_r31;
s16 temp;
temp_r31 = arg0->data;
@ -456,10 +539,10 @@ void fn_1_11CC(omObjData* arg0) {
temp_r31->unk_24 = 0.0f;
temp_r31->unk_20 = 1;
}
temp_r31->unk_14 = (temp_r31->unk_14 - (2.0f + (9.8f * temp_r31->unk_24)));
temp_r31->unk_24 += 0.3f;
if (!(temp_r31->unk_14 > 300.0f)) {
temp_r31->unk_14 = 300.0f;
CharModelVoiceEnableSet(temp_r31->unk_01, arg0->motion[4], 0);
@ -473,16 +556,18 @@ void fn_1_11CC(omObjData* arg0) {
}
}
void fn_1_13E4(omObjData* arg0) {
unkDominationData* temp_r30;
void fn_1_13E4(omObjData *arg0)
{
unkDominationData *temp_r30;
temp_r30 = arg0->data;
CharModelMotionShiftSet(temp_r30->unk_01, arg0->motion[6], 0.0f, 10.0f, 0);
SetDominationDataStuff(arg0, 0, 0);
}
void fn_1_1460(omObjData* arg0) {
unkDominationData* temp_r30;
void fn_1_1460(omObjData *arg0)
{
unkDominationData *temp_r30;
temp_r30 = arg0->data;
CharModelVoiceEnableSet(temp_r30->unk_01, arg0->motion[7], 0);

111
src/REL/m407dll/score.c
View file

@ -1,42 +1,40 @@
#include "game/process.h"
#include "game/object.h"
#include "game/esprite.h"
#include "game/object.h"
#include "game/process.h"
#include "game/sprite.h"
#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
typedef void (*ObjFuncs)(void);
typedef struct unkDominationData6 {
/* 0x00 */ s32 unk_00;
/* 0x04 */ s32 unk_04;
/* 0x08 */ s16 unk_08;
/* 0x0A */ s16 unk_0A;
/* 0x0C */ s16 unk_0C[8]; //what size is this??
/* 0x1C */ s32 unk_1C;
/* 0x20 */ f32 unk_20;
} unkDominationData6; //sizeof 0x24
/* 0x00 */ s32 unk_00;
/* 0x04 */ s32 unk_04;
/* 0x08 */ s16 unk_08;
/* 0x0A */ s16 unk_0A;
/* 0x0C */ s16 unk_0C[8]; // what size is this??
/* 0x1C */ s32 unk_1C;
/* 0x20 */ f32 unk_20;
} unkDominationData6; // sizeof 0x24
//func signatures
// func signatures
void fn_1_61A0(void);
void fn_1_6218(void);
void fn_1_62A0(void);
void fn_1_5FE4(omObjData* arg0);
void fn_1_5FE4(omObjData *arg0);
void fn_1_5FB4(s32 arg0);
s16 fn_1_28D4(void);
//bss
Process* lbl_1_bss_398C;
omObjData* lbl_1_bss_3988;
// bss
Process *lbl_1_bss_398C;
omObjData *lbl_1_bss_3988;
//data
ObjFuncs lbl_1_data_360[] = {
fn_1_61A0,
fn_1_6218,
fn_1_62A0
};
// data
ObjFuncs lbl_1_data_360[] = { fn_1_61A0, fn_1_6218, fn_1_62A0 };
void fn_1_5C5C(Process* arg0, s16 arg1) {
unkDominationData6* temp_r31;
void fn_1_5C5C(Process *arg0, s16 arg1)
{
unkDominationData6 *temp_r31;
u32 i;
lbl_1_bss_398C = arg0;
@ -45,21 +43,21 @@ void fn_1_5C5C(Process* arg0, s16 arg1) {
temp_r31 = lbl_1_bss_3988->data;
temp_r31->unk_08 = arg1;
temp_r31->unk_0A = 0;
temp_r31->unk_0C[6] = espEntry(0x260025, 2, 0);
temp_r31->unk_0C[6] = espEntry(DATA_MAKE_NUM(DATADIR_M407, 0x25), 2, 0);
espTPLvlSet(temp_r31->unk_0C[6], 0.5f);
espPosSet(temp_r31->unk_0C[6], 508.0f, 64.0f);
temp_r31->unk_0C[7] = espEntry(0x260022, 1, 0);
temp_r31->unk_0C[7] = espEntry(DATA_MAKE_NUM(DATADIR_M407, 0x22), 1, 0);
espPosSet(temp_r31->unk_0C[7], 480.0f, 56.0f);
for (i = 0; i < 3; i++) {
temp_r31->unk_0C[i] = espEntry(0x26001F, 0, 0);
temp_r31->unk_0C[i] = espEntry(DATA_MAKE_NUM(DATADIR_M407, 0x1F), 0, 0);
espPosSet(temp_r31->unk_0C[i], i * 16 + 0x1F4, 56.0f);
espDispOff(temp_r31->unk_0C[i]);
}
for (i = 0; i < 3; i++) {
temp_r31->unk_0C[i+3] = espEntry(0x260020, 1, 0);
espPosSet(temp_r31->unk_0C[i+3], i * 16 + 0x1F4, 74.0f);
temp_r31->unk_0C[i + 3] = espEntry(DATA_MAKE_NUM(DATADIR_M407, 0x20), 1, 0);
espPosSet(temp_r31->unk_0C[i + 3], i * 16 + 0x1F4, 74.0f);
}
for (i = 0; i < 8; i++) {
@ -69,44 +67,49 @@ void fn_1_5C5C(Process* arg0, s16 arg1) {
fn_1_5FB4(0);
}
void fn_1_5ECC(void) {
void fn_1_5ECC(void)
{
s32 i;
unkDominationData6* temp_r30;
unkDominationData6 *temp_r30;
temp_r30 = lbl_1_bss_3988->data;
for (i = 0; i < 7; i++) {
espKill(temp_r30->unk_0C[i]);
}
HuMemDirectFree(lbl_1_bss_3988->data);
}
void fn_1_5F40(s32 arg0) {
void fn_1_5F40(s32 arg0)
{
switch (arg0) {
case 0:
fn_1_5FB4(1);
break;
case 1:
fn_1_5FB4(2);
break;
case 0:
fn_1_5FB4(1);
break;
case 1:
fn_1_5FB4(2);
break;
}
}
void fn_1_5F90(void) {
void fn_1_5F90(void)
{
fn_1_5FB4(0);
}
void fn_1_5FB4(s32 arg0) {
unkDominationData6* temp_r31;
void fn_1_5FB4(s32 arg0)
{
unkDominationData6 *temp_r31;
temp_r31 = lbl_1_bss_3988->data;
temp_r31->unk_00 = arg0;
temp_r31->unk_04 = 0;
}
void fn_1_5FE4(omObjData* arg0) {
void fn_1_5FE4(omObjData *arg0)
{
s16 temp_r31;
unkDominationData6* temp_r30;
unkDominationData6 *temp_r30;
temp_r30 = lbl_1_bss_3988->data;
lbl_1_data_360[temp_r30->unk_00]();
@ -114,19 +117,20 @@ void fn_1_5FE4(omObjData* arg0) {
espBankSet(temp_r30->unk_0C[0], temp_r31 / 100);
temp_r31 = (temp_r31 - ((temp_r31 / 100) * 100));
espBankSet(temp_r30->unk_0C[1], (temp_r31 / 10));
temp_r31 = (temp_r31 - ((temp_r31 / 10) * 10));
temp_r31 = (temp_r31 - ((temp_r31 / 10) * 10));
espBankSet(temp_r30->unk_0C[2], temp_r31);
temp_r31 = temp_r30->unk_0A;
espBankSet(temp_r30->unk_0C[3], (temp_r31 / 100));
temp_r31 = (temp_r31 - ((temp_r31 / 100) * 100));
espBankSet(temp_r30->unk_0C[4], (temp_r31 / 10));
espBankSet(temp_r30->unk_0C[4], (temp_r31 / 10));
temp_r31 = (temp_r31 - ((temp_r31 / 10) * 10));
espBankSet(temp_r30->unk_0C[5], temp_r31);
}
void fn_1_61A0(void) {
void fn_1_61A0(void)
{
s32 i;
unkDominationData6* temp_r31;
unkDominationData6 *temp_r31;
temp_r31 = lbl_1_bss_3988->data;
@ -138,9 +142,10 @@ void fn_1_61A0(void) {
}
}
void fn_1_6218(void) {
void fn_1_6218(void)
{
s16 i;
unkDominationData6* temp_r31;
unkDominationData6 *temp_r31;
temp_r31 = lbl_1_bss_3988->data;
@ -154,9 +159,10 @@ void fn_1_6218(void) {
temp_r31->unk_0A = fn_1_28D4();
}
void fn_1_62A0(void) {
void fn_1_62A0(void)
{
s32 i;
unkDominationData6* temp_r31;
unkDominationData6 *temp_r31;
temp_r31 = lbl_1_bss_3988->data;
@ -174,7 +180,8 @@ void fn_1_62A0(void) {
temp_r31->unk_20 = 1.2f;
temp_r31->unk_1C = 1;
}
} else {
}
else {
if ((temp_r31->unk_20 -= 0.04f) <= 1.0f) {
temp_r31->unk_20 = 1.0f;
temp_r31->unk_1C = 0;

420
src/REL/m407dll/whomp.c
View file

@ -1,45 +1,45 @@
#include "game/process.h"
#include "game/object.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/audio.h"
#include "game/gamework_data.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/object.h"
#include "game/process.h"
#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
#define MAX_WHOMPS_PLAYER 160
#define MAX_WHOMPS_ALL_PLAYERS MAX_WHOMPS_PLAYER * ARRAY_COUNT(GWPlayer)
#define MAX_WHOMPS (MAX_WHOMPS_PLAYER + 1) * ARRAY_COUNT(GWPlayer)
#define MAX_WHOMPS_PLAYER 160
#define MAX_WHOMPS_ALL_PLAYERS MAX_WHOMPS_PLAYER *ARRAY_COUNT(GWPlayer)
#define MAX_WHOMPS (MAX_WHOMPS_PLAYER + 1) * ARRAY_COUNT(GWPlayer)
typedef void (*ObjFuncs)(omObjData*);
typedef void (*ObjFuncs)(omObjData *);
typedef struct unkDominationData7 {
/* 0x00 */ u32 unk_00;
/* 0x04 */ s32 unk_04;
/* 0x08 */ Vec unk_08;
/* 0x14 */ Vec unk_14;
/* 0x20 */ char unk_20[4];
/* 0x24 */ s32 unk_24;
/* 0x28 */ s32 unk_28;
/* 0x2C */ s32 unk_2C;
} unkDominationData7; //sizeof 0x30
/* 0x00 */ u32 unk_00;
/* 0x04 */ s32 unk_04;
/* 0x08 */ Vec unk_08;
/* 0x14 */ Vec unk_14;
/* 0x20 */ char unk_20[4];
/* 0x24 */ s32 unk_24;
/* 0x28 */ s32 unk_28;
/* 0x2C */ s32 unk_2C;
} unkDominationData7; // sizeof 0x30
//function signatures
void fn_1_3360(omObjData*);
void fn_1_3364(omObjData*);
void fn_1_34A4(omObjData*);
void fn_1_37B0(omObjData*);
void fn_1_36D0(omObjData*);
void fn_1_2B7C(omObjData*);
void fn_1_290C(omObjData*, s32);
void fn_1_31F8(omObjData*);
// function signatures
void fn_1_3360(omObjData *);
void fn_1_3364(omObjData *);
void fn_1_34A4(omObjData *);
void fn_1_37B0(omObjData *);
void fn_1_36D0(omObjData *);
void fn_1_2B7C(omObjData *);
void fn_1_290C(omObjData *, s32);
void fn_1_31F8(omObjData *);
void fn_1_4544(s32, s32, f32, f32, f32);
void fn_1_3BB8(s16, f32, f32);
void fn_1_568(s16, s16, s16);
//bss
Process* lbl_1_bss_37C0;
omObjData* lbl_1_bss_2DB0[MAX_WHOMPS];
// bss
Process *lbl_1_bss_37C0;
omObjData *lbl_1_bss_2DB0[MAX_WHOMPS];
s16 lbl_1_bss_1E98[MAX_WHOMPS][3];
s16 lbl_1_bss_68[MAX_WHOMPS][6];
s16 lbl_1_bss_66;
@ -47,23 +47,23 @@ s16 lbl_1_bss_64;
s16 lbl_1_bss_3A[21];
s16 lbl_1_bss_38;
//data
// data
s32 lbl_1_data_228[] = {
0x0026001C,
0x0026001D,
0x0026001E,
0x0026001B
DATA_MAKE_NUM(DATADIR_M407, 0x1C),
DATA_MAKE_NUM(DATADIR_M407, 0x1D),
DATA_MAKE_NUM(DATADIR_M407, 0x1E),
DATA_MAKE_NUM(DATADIR_M407, 0x1B),
};
s32 lbl_1_data_238[] = {
0x0026002E,
0x0026002F,
0x0026002D,
0x0026002A,
0x0026002C,
0x00260027,
0x00260028,
0x00260029
DATA_MAKE_NUM(DATADIR_M407, 0x2E),
DATA_MAKE_NUM(DATADIR_M407, 0x2F),
DATA_MAKE_NUM(DATADIR_M407, 0x2D),
DATA_MAKE_NUM(DATADIR_M407, 0x2A),
DATA_MAKE_NUM(DATADIR_M407, 0x2C),
DATA_MAKE_NUM(DATADIR_M407, 0x27),
DATA_MAKE_NUM(DATADIR_M407, 0x28),
DATA_MAKE_NUM(DATADIR_M407, 0x29),
};
ObjFuncs lbl_1_data_258[] = {
@ -74,8 +74,9 @@ ObjFuncs lbl_1_data_258[] = {
fn_1_36D0,
};
void fn_1_2354(Process* arg0) {
Process* sp8;
void fn_1_2354(Process *arg0)
{
Process *sp8;
u32 i;
u32 j;
@ -84,7 +85,7 @@ void fn_1_2354(Process* arg0) {
for (j = 0, i = 0; i < MAX_WHOMPS_ALL_PLAYERS; i++) {
lbl_1_bss_2DB0[i] = omAddObjEx(lbl_1_bss_37C0, 0x200, 3, 6, 2, fn_1_2B7C);
lbl_1_bss_2DB0[i]->work[0] = i;
lbl_1_bss_2DB0[i]->work[1] = 0;
lbl_1_bss_2DB0[i]->work[1] = 0;
}
j = j + i;
@ -92,7 +93,7 @@ void fn_1_2354(Process* arg0) {
for (i = 0; i < 4; i++) {
lbl_1_bss_2DB0[j + i] = omAddObjEx(lbl_1_bss_37C0, 0x200, 3, 6, 2, fn_1_2B7C);
lbl_1_bss_2DB0[j + i]->work[0] = j + i;
lbl_1_bss_2DB0[j + i]->work[1] = 1;
lbl_1_bss_2DB0[j + i]->work[1] = 1;
}
for (i = 0; i < 4; i++) {
@ -102,7 +103,8 @@ void fn_1_2354(Process* arg0) {
lbl_1_bss_64 = 0;
}
void fn_1_24F0(void) {
void fn_1_24F0(void)
{
u32 i;
for (i = 0; i < MAX_WHOMPS; i++) {
@ -111,7 +113,8 @@ void fn_1_24F0(void) {
}
}
void fn_1_2564(void) {
void fn_1_2564(void)
{
u32 i;
HuAudFXPlay(0x542);
@ -120,30 +123,32 @@ void fn_1_2564(void) {
}
}
void fn_1_25C0(void) {
void fn_1_25C0(void)
{
u32 i, j;
lbl_1_bss_38 = 0;
for (i = 0; i < 4; i++) {
if (lbl_1_bss_38 < lbl_1_bss_3A[i]) {
lbl_1_bss_38 = lbl_1_bss_3A[i];
}
}
}
lbl_1_bss_66 = 0;
for (i = 0; i < 4; i++) {
if (lbl_1_bss_3A[i] > 0) {
fn_1_290C(lbl_1_bss_2DB0[i], 3);
lbl_1_bss_66 += 1;
}
}
}
}
void fn_1_26CC(u8 arg0) {
void fn_1_26CC(u8 arg0)
{
u32 i;
omObjData* temp;
omObjData *temp;
i = lbl_1_bss_3A[arg0];
if (i < MAX_WHOMPS_PLAYER) {
@ -153,9 +158,10 @@ void fn_1_26CC(u8 arg0) {
}
}
void fn_1_2770(u8 arg0, s16 arg2) {
omObjData* temp_r30;
unkDominationData7* temp_r31;
void fn_1_2770(u8 arg0, s16 arg2)
{
omObjData *temp_r30;
unkDominationData7 *temp_r31;
temp_r30 = lbl_1_bss_2DB0[arg0 + MAX_WHOMPS_ALL_PLAYERS];
temp_r31 = temp_r30->data;
@ -165,35 +171,41 @@ void fn_1_2770(u8 arg0, s16 arg2) {
fn_1_290C(temp_r30, 2);
}
s32 fn_1_2880(void) {
s32 fn_1_2880(void)
{
return (lbl_1_bss_66 == 0) ? 1 : 0;
}
s16 fn_1_28B8(u8 arg0) {
s16 fn_1_28B8(u8 arg0)
{
return lbl_1_bss_3A[arg0];
}
s16 fn_1_28D4(void) {
s16 fn_1_28D4(void)
{
return lbl_1_bss_64;
}
s16 fn_1_28E4(u8 arg0) {
s16 fn_1_28E4(u8 arg0)
{
return lbl_1_bss_2DB0[arg0 + MAX_WHOMPS_ALL_PLAYERS]->model[0];
}
void fn_1_290C(omObjData* arg0, s32 arg1) {
unkDominationData7* temp_r31;
void fn_1_290C(omObjData *arg0, s32 arg1)
{
unkDominationData7 *temp_r31;
temp_r31 = arg0->data;
temp_r31->unk_24 = arg1;
temp_r31->unk_2C = 0;
}
void fn_1_2930(omObjData* arg0) {
unkDominationData7* temp_r28;
omObjData* temp_r29;
void fn_1_2930(omObjData *arg0)
{
unkDominationData7 *temp_r28;
omObjData *temp_r29;
u32 i;
unkDominationData7* temp_r31;
unkDominationData7 *temp_r31;
temp_r31 = arg0->data;
lbl_1_data_258[temp_r31->unk_24](arg0);
@ -208,30 +220,33 @@ void fn_1_2930(omObjData* arg0) {
if (temp_r31->unk_08.y < 0.0f) {
Hu3DModelShadowDispOff(arg0->model[0]);
} else {
}
else {
Hu3DModelShadowDispOn(arg0->model[0]);
}
temp_r31->unk_04 = 1;
}
if ((temp_r31->unk_08.y < 0.0f) || (temp_r31->unk_08.z < (Center.z - 2000.0f))) {
Hu3DModelAttrSet(arg0->model[0], 1);
} else {
}
else {
Hu3DModelAttrReset(arg0->model[0], 1);
}
omSetTra(arg0, temp_r31->unk_08.x, temp_r31->unk_08.y, temp_r31->unk_08.z);
omSetRot(arg0, temp_r31->unk_14.x, temp_r31->unk_14.y, temp_r31->unk_14.z);
if (temp_r31->unk_28 == 1) {
Hu3DModelPosSet(arg0->model[2], temp_r31->unk_08.x, 1.0f + temp_r31->unk_08.y, temp_r31->unk_08.z);
}
}
void fn_1_2B7C(omObjData* arg0) {
void fn_1_2B7C(omObjData *arg0)
{
u32 i;
unkDominationData7* temp_r30;
unkDominationData7 *temp_r30;
arg0->func = fn_1_2930;
arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkDominationData7), MEMORY_DEFAULT_NUM);
@ -242,72 +257,74 @@ void fn_1_2B7C(omObjData* arg0) {
}
for (i = 0; i < 6; i++) {
arg0->motion[i] = -1;
arg0->motion[i] = -1;
}
temp_r30->unk_00 = (u32) arg0->work[0];
temp_r30->unk_28 = (u32) arg0->work[1];
temp_r30->unk_00 = (u32)arg0->work[0];
temp_r30->unk_28 = (u32)arg0->work[1];
temp_r30->unk_04 = 0;
temp_r30->unk_2C = 0;
switch (temp_r30->unk_28) {
case 0:
temp_r30->unk_14.x = 0.0f;
temp_r30->unk_14.y = 180.0f;
temp_r30->unk_14.z = 0.0f;
if (temp_r30->unk_00 < 80) {
arg0->model[0] = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_data_228[1], MEMORY_DEFAULT_NUM, HEAP_DATA));
Hu3DModelAttrSet(arg0->model[0], 0x4000);
Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f);
if (temp_r30->unk_00 == 0) {
arg0->motion[5] = Hu3DJointMotion(arg0->model[0], HuDataSelHeapReadNum(lbl_1_data_238[5], MEMORY_DEFAULT_NUM, HEAP_DATA));
arg0->motion[3] = Hu3DJointMotion(arg0->model[0], HuDataSelHeapReadNum(lbl_1_data_238[7], MEMORY_DEFAULT_NUM, HEAP_DATA));
arg0->motion[4] = Hu3DJointMotion(arg0->model[0], HuDataSelHeapReadNum(lbl_1_data_238[6], MEMORY_DEFAULT_NUM, HEAP_DATA));
} else {
arg0->motion[5] = lbl_1_bss_68[0][5];
arg0->motion[3] = lbl_1_bss_68[0][3];
arg0->motion[4] = lbl_1_bss_68[0][4];
}
Hu3DModelShadowSet(arg0->model[0]);
for (i = 0; i < 3; i++) {
lbl_1_bss_1E98[temp_r30->unk_00][i] = arg0->model[i];
}
case 0:
temp_r30->unk_14.x = 0.0f;
temp_r30->unk_14.y = 180.0f;
temp_r30->unk_14.z = 0.0f;
if (temp_r30->unk_00 < 80) {
arg0->model[0] = Hu3DModelCreateFile(lbl_1_data_228[1]);
Hu3DModelAttrSet(arg0->model[0], 0x4000);
Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f);
if (temp_r30->unk_00 == 0) {
arg0->motion[5] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_238[5]);
arg0->motion[3] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_238[7]);
arg0->motion[4] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_238[6]);
}
else {
arg0->motion[5] = lbl_1_bss_68[0][5];
arg0->motion[3] = lbl_1_bss_68[0][3];
arg0->motion[4] = lbl_1_bss_68[0][4];
}
Hu3DModelShadowSet(arg0->model[0]);
for (i = 0; i < 3; i++) {
lbl_1_bss_1E98[temp_r30->unk_00][i] = arg0->model[i];
}
for (i = 0; i < 6; i++) {
lbl_1_bss_68[temp_r30->unk_00][i] = arg0->motion[i];
for (i = 0; i < 6; i++) {
lbl_1_bss_68[temp_r30->unk_00][i] = arg0->motion[i];
}
Hu3DMotionSet(arg0->model[0], arg0->motion[5]);
Hu3DModelAttrSet(arg0->model[0], 0x40000001);
temp_r30->unk_04 = 1;
}
Hu3DMotionSet(arg0->model[0], arg0->motion[5]);
Hu3DModelAttrSet(arg0->model[0], 0x40000001);
else {
temp_r30->unk_04 = 0;
}
break;
case 1:
temp_r30->unk_14.x = 0.0f;
temp_r30->unk_14.y = 0.0f;
temp_r30->unk_14.z = 0.0f;
arg0->model[0] = Hu3DModelCreateFile(lbl_1_data_228[0]);
arg0->model[1] = Hu3DModelCreateFile(lbl_1_data_228[2]);
arg0->model[2] = Hu3DModelCreateFile(lbl_1_data_228[3]);
Hu3DModelAttrSet(arg0->model[0], 0x4000);
Hu3DModelAttrSet(arg0->model[1], 0x4000);
Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f);
Hu3DModelAmbSet(arg0->model[1], 1.0f, 1.0f, 1.0f);
arg0->motion[2] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_238[2]);
arg0->motion[3] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_238[4]);
arg0->motion[5] = Hu3DJointMotionFile(arg0->model[0], lbl_1_data_238[3]);
arg0->motion[0] = Hu3DJointMotionFile(arg0->model[1], lbl_1_data_238[0]);
arg0->motion[1] = Hu3DJointMotionFile(arg0->model[1], lbl_1_data_238[1]);
Hu3DModelHookSet(arg0->model[0], "itemhook_r", arg0->model[1]);
Hu3DModelShadowSet(arg0->model[0]);
Hu3DModelShadowSet(arg0->model[1]);
Hu3DModelAttrSet(arg0->model[0], 1);
Hu3DModelAttrSet(arg0->model[1], 1);
Hu3DModelAttrSet(arg0->model[2], 1);
Hu3DModelAttrSet(arg0->model[2], 0x40000002);
Hu3DModelAttrSet(arg0->model[2], 0x40000001);
temp_r30->unk_04 = 1;
} else {
temp_r30->unk_04 = 0;
}
break;
case 1:
temp_r30->unk_14.x = 0.0f;
temp_r30->unk_14.y = 0.0f;
temp_r30->unk_14.z = 0.0f;
arg0->model[0] = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_data_228[0], MEMORY_DEFAULT_NUM, HEAP_DATA));
arg0->model[1] = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_data_228[2], MEMORY_DEFAULT_NUM, HEAP_DATA));
arg0->model[2] = Hu3DModelCreate(HuDataSelHeapReadNum(lbl_1_data_228[3], MEMORY_DEFAULT_NUM, HEAP_DATA));
Hu3DModelAttrSet(arg0->model[0], 0x4000);
Hu3DModelAttrSet(arg0->model[1], 0x4000);
Hu3DModelAmbSet(arg0->model[0], 1.0f, 1.0f, 1.0f);
Hu3DModelAmbSet(arg0->model[1], 1.0f, 1.0f, 1.0f);
arg0->motion[2] = Hu3DJointMotion(arg0->model[0], HuDataSelHeapReadNum(lbl_1_data_238[2], MEMORY_DEFAULT_NUM, HEAP_DATA));
arg0->motion[3] = Hu3DJointMotion(arg0->model[0], HuDataSelHeapReadNum(lbl_1_data_238[4], MEMORY_DEFAULT_NUM, HEAP_DATA));
arg0->motion[5] = Hu3DJointMotion(arg0->model[0], HuDataSelHeapReadNum(lbl_1_data_238[3], MEMORY_DEFAULT_NUM, HEAP_DATA));
arg0->motion[0] = Hu3DJointMotion(arg0->model[1], HuDataSelHeapReadNum(lbl_1_data_238[0], MEMORY_DEFAULT_NUM, HEAP_DATA));
arg0->motion[1] = Hu3DJointMotion(arg0->model[1], HuDataSelHeapReadNum(lbl_1_data_238[1], MEMORY_DEFAULT_NUM, HEAP_DATA));
Hu3DModelHookSet(arg0->model[0], "itemhook_r", arg0->model[1]);
Hu3DModelShadowSet(arg0->model[0]);
Hu3DModelShadowSet(arg0->model[1]);
Hu3DModelAttrSet(arg0->model[0], 1);
Hu3DModelAttrSet(arg0->model[1], 1);
Hu3DModelAttrSet(arg0->model[2], 1);
Hu3DModelAttrSet(arg0->model[2], 0x40000002);
Hu3DModelAttrSet(arg0->model[2], 0x40000001);
temp_r30->unk_04 = 1;
break;
break;
}
temp_r30->unk_08.x = (600.0f - (400.0f * (temp_r30->unk_00 & 3)));
temp_r30->unk_08.y = 0.0f;
@ -315,133 +332,136 @@ void fn_1_2B7C(omObjData* arg0) {
fn_1_290C(arg0, 0);
}
void fn_1_31F8(omObjData* arg0) {
void fn_1_31F8(omObjData *arg0)
{
s32 i;
unkDominationData7* temp_r29;
unkDominationData7 *temp_r29;
temp_r29 = arg0->data;
switch (temp_r29->unk_28) { /* irregular */
case 0:
if (temp_r29->unk_00 == 0) {
switch (temp_r29->unk_28) { /* irregular */
case 0:
if (temp_r29->unk_00 == 0) {
for (i = 0; i < 6; i++) {
if (arg0->motion[i] != -1) {
Hu3DMotionKill(arg0->motion[i]);
}
}
}
if (temp_r29->unk_04 != 0) {
for (i = 0; i < 3; i++) {
if (arg0->model[i] != -1) {
Hu3DModelKill(arg0->model[i]);
}
}
}
break;
case 1:
for (i = 0; i < 6; i++) {
if (arg0->motion[i] != -1) {
Hu3DMotionKill(arg0->motion[i]);
}
}
}
if (temp_r29->unk_04 != 0) {
for (i = 0; i < 3; i++) {
if (arg0->model[i] != -1) {
Hu3DModelKill(arg0->model[i]);
}
}
}
}
break;
case 1:
for (i = 0; i < 6; i++) {
if (arg0->motion[i] != -1) {
Hu3DMotionKill(arg0->motion[i]);
}
}
for (i = 0; i < 3; i++) {
if (arg0->model[i] != -1) {
Hu3DModelKill(arg0->model[i]);
}
}
break;
break;
}
if (arg0->data) {
HuMemDirectFree(arg0->data);
}
}
void fn_1_3360(omObjData*) {
void fn_1_3360(omObjData *) { }
}
void fn_1_3364(omObjData* arg0) {
unkDominationData7* temp_r31;
void fn_1_3364(omObjData *arg0)
{
unkDominationData7 *temp_r31;
temp_r31 = arg0->data;
if (temp_r31->unk_2C == 0) {
Hu3DMotionSet(arg0->model[0], arg0->motion[4]);
Hu3DModelAttrReset(arg0->model[0], 0x40000001);
switch (temp_r31->unk_28) {
case 0:
fn_1_4544(0, 0, temp_r31->unk_08.x, 0.0f, temp_r31->unk_08.z);
break;
case 1:
fn_1_4544(1, 0, temp_r31->unk_08.x, 0.0f, temp_r31->unk_08.z);
break;
case 0:
fn_1_4544(0, 0, temp_r31->unk_08.x, 0.0f, temp_r31->unk_08.z);
break;
case 1:
fn_1_4544(1, 0, temp_r31->unk_08.x, 0.0f, temp_r31->unk_08.z);
break;
}
}
if (temp_r31->unk_2C == 0x2A) {
Hu3DModelShadowDispOff(arg0->model[0]);
}
if (Hu3DMotionEndCheck(*arg0->model) == 0) {
temp_r31->unk_2C++;
return;
}
temp_r31->unk_08.y = -300.0f;
Hu3DModelAttrSet(arg0->model[0], 1);
fn_1_290C(arg0, 0);
}
void fn_1_34A4(omObjData* arg0) {
unkDominationData7* temp_r30;
void fn_1_34A4(omObjData *arg0)
{
unkDominationData7 *temp_r30;
temp_r30 = arg0->data;
if (temp_r30->unk_2C == 0) {
if (temp_r30->unk_28 == 1) {
Hu3DModelAttrReset(arg0->model[0], 1);
Hu3DModelAttrReset(arg0->model[1], 1);
} else {
}
else {
Hu3DModelAttrReset(arg0->model[0], 1);
}
Hu3DMotionSet(arg0->model[0], arg0->motion[3]);
Hu3DModelAttrReset(arg0->model[0], 0x40000001);
switch (temp_r30->unk_28) { /* irregular */
case 0:
fn_1_4544(0, 0, temp_r30->unk_08.x, 0.0f, temp_r30->unk_08.z);
HuAudFXPlay(0x543);
break;
case 1:
HuAudFXPlay(0x544);
fn_1_4544(1, 0, temp_r30->unk_08.x, 0.0f, temp_r30->unk_08.z);
break;
switch (temp_r30->unk_28) { /* irregular */
case 0:
fn_1_4544(0, 0, temp_r30->unk_08.x, 0.0f, temp_r30->unk_08.z);
HuAudFXPlay(0x543);
break;
case 1:
HuAudFXPlay(0x544);
fn_1_4544(1, 0, temp_r30->unk_08.x, 0.0f, temp_r30->unk_08.z);
break;
}
temp_r30->unk_08.y = 0.0f;
}
if (temp_r30->unk_2C == 0xA) {
Hu3DModelShadowDispOn(arg0->model[0]);
}
if ((temp_r30->unk_2C == 0xA) && (temp_r30->unk_28 == 1)) {
Hu3DMotionSet(arg0->model[1], arg0->motion[1]);
Hu3DModelAttrReset(arg0->model[1], 0x40000001);
}
temp_r30->unk_2C++;
if (Hu3DMotionEndCheck(arg0->model[0]) != 0) {
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[5], 0.0f, 10.0f, 0x40000001);
switch (temp_r30->unk_28) {
case 0:
fn_1_290C(arg0, 0);
return;
case 1:
fn_1_290C(arg0, 4);
break;
case 0:
fn_1_290C(arg0, 0);
return;
case 1:
fn_1_290C(arg0, 4);
break;
}
}
}
void fn_1_36D0(omObjData* arg0) {
unkDominationData7* sp8;
void fn_1_36D0(omObjData *arg0)
{
unkDominationData7 *sp8;
sp8 = arg0->data;
Hu3DMotionShiftSet(arg0->model[0], arg0->motion[2], 0.0f, 10.0f, 0x40000001);
@ -453,8 +473,9 @@ void fn_1_36D0(omObjData* arg0) {
fn_1_290C(arg0, 0);
}
void fn_1_37B0(omObjData* arg0) {
unkDominationData7* temp_r31;
void fn_1_37B0(omObjData *arg0)
{
unkDominationData7 *temp_r31;
temp_r31 = arg0->data;
if (temp_r31->unk_2C == 0) {
@ -479,7 +500,7 @@ void fn_1_37B0(omObjData* arg0) {
}
temp_r31->unk_14.x = (temp_r31->unk_2C == 1) ? -90.0f : -68.0f;
if (temp_r31->unk_2C == 1) {
fn_1_4544(3, 0, temp_r31->unk_08.x, 0.0f, 200.0f + temp_r31->unk_08.z);
HuAudFXPlay(0x544);
@ -487,7 +508,8 @@ void fn_1_37B0(omObjData* arg0) {
fn_1_3BB8((temp_r31->unk_00 >> 2) + 1, temp_r31->unk_08.x, temp_r31->unk_08.z);
}
lbl_1_bss_66 -= 1;
} else {
}
else {
fn_1_4544(2, 0, temp_r31->unk_08.x, 0.0f, 200.0f + temp_r31->unk_08.z);
HuAudFXPlay(0x543);
}

110
src/REL/m407dll/whomp_score.c
View file

@ -1,39 +1,42 @@
#include "src/REL/m407dll/m407dll.h"
#include "game/process.h"
#include "game/object.h"
#include "game/gamework_data.h"
#include "game/esprite.h"
#include "game/gamework_data.h"
#include "game/object.h"
#include "game/process.h"
#include "game/sprite.h"
#include "REL/m407dll.h"
typedef struct unkDominationData3 {
/* 0x00 */ u32 unk_00;
/* 0x04 */ s32 unk_04;
/* 0x08 */ Vec unk_08;
/* 0x14 */ s32 unk_14;
/* 0x18 */ s16 unk_18[4];
/* 0x20 */ f32 unk_20;
} unkDominationData3; //sizeof 0x24
/* 0x00 */ u32 unk_00;
/* 0x04 */ s32 unk_04;
/* 0x08 */ Vec unk_08;
/* 0x14 */ s32 unk_14;
/* 0x18 */ s16 unk_18[4];
/* 0x20 */ f32 unk_20;
} unkDominationData3; // sizeof 0x24
//function signatures
// function signatures
void Hu3D3Dto2D(Vec *arg0, s16 arg1, Vec *arg2);
void fn_1_3D28(omObjData* arg0, s32 arg1);
void fn_1_3E34(omObjData*);
void fn_1_3F7C(omObjData* arg0);
void fn_1_3FF0(omObjData*);
void fn_1_3FF4(omObjData* arg0);
void fn_1_40F4(omObjData* arg0);
void fn_1_3D28(omObjData *arg0, s32 arg1);
void fn_1_3E34(omObjData *);
void fn_1_3F7C(omObjData *arg0);
void fn_1_3FF0(omObjData *);
void fn_1_3FF4(omObjData *arg0);
void fn_1_40F4(omObjData *arg0);
//bss
Process* lbl_1_bss_37D8;
omObjData* lbl_1_bss_37C8[4];
// bss
Process *lbl_1_bss_37D8;
omObjData *lbl_1_bss_37C8[4];
//data
// data
ObjFuncs lbl_1_data_278[] = {
fn_1_3FF0,
fn_1_3FF4,
fn_1_40F4,
};
void fn_1_3AC8(Process* arg0) {
void fn_1_3AC8(Process *arg0)
{
u32 i;
lbl_1_bss_37D8 = arg0;
@ -44,7 +47,8 @@ void fn_1_3AC8(Process* arg0) {
}
}
void fn_1_3B68(void) {
void fn_1_3B68(void)
{
u32 i;
for (i = 0; i < ARRAY_COUNT(lbl_1_bss_37C8); i++) {
@ -52,10 +56,11 @@ void fn_1_3B68(void) {
}
}
void fn_1_3BB8(s16 arg0, f32 arg8, f32 arg9) {
omObjData* obj;
void fn_1_3BB8(s16 arg0, f32 arg8, f32 arg9)
{
omObjData *obj;
Vec sp14;
unkDominationData3* temp_r31;
unkDominationData3 *temp_r31;
u32 i;
s16 temp;
@ -66,7 +71,7 @@ void fn_1_3BB8(s16 arg0, f32 arg8, f32 arg9) {
temp = arg0;
espBankSet(temp_r31->unk_18[1], (temp / 100));
temp = (temp - ((temp / 100) * 100));
espBankSet(temp_r31->unk_18[2],(temp / 10));
espBankSet(temp_r31->unk_18[2], (temp / 10));
temp = (temp - ((temp / 10) * 10));
espBankSet(temp_r31->unk_18[3], temp);
sp14.x = arg8;
@ -79,17 +84,19 @@ void fn_1_3BB8(s16 arg0, f32 arg8, f32 arg9) {
}
}
void fn_1_3D28(omObjData* arg0, s32 arg1) {
unkDominationData3* temp_r31;
void fn_1_3D28(omObjData *arg0, s32 arg1)
{
unkDominationData3 *temp_r31;
temp_r31 = arg0->data;
temp_r31->unk_04 = arg1;
temp_r31->unk_14 = 0;
}
void fn_1_3D4C(omObjData* arg0) {
void fn_1_3D4C(omObjData *arg0)
{
s32 temp_r5;
unkDominationData3* temp_r31;
unkDominationData3 *temp_r31;
temp_r31 = arg0->data;
lbl_1_data_278[temp_r31->unk_04](arg0);
@ -100,8 +107,9 @@ void fn_1_3D4C(omObjData* arg0) {
espPosSet(temp_r31->unk_18[3], 18.0f + temp_r31->unk_08.x, temp_r31->unk_08.y - 8.0f);
}
void fn_1_3E34(omObjData* arg0) {
unkDominationData3* temp_r31;
void fn_1_3E34(omObjData *arg0)
{
unkDominationData3 *temp_r31;
arg0->func = fn_1_3D4C;
arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkDominationData3), MEMORY_DEFAULT_NUM);
@ -109,24 +117,25 @@ void fn_1_3E34(omObjData* arg0) {
temp_r31->unk_00 = arg0->work[0];
temp_r31->unk_14 = 0;
temp_r31->unk_04 = 0;
temp_r31->unk_18[0] = espEntry(0x260026, 1, 0);
temp_r31->unk_18[1] = espEntry(0x260020, 0, 0);
temp_r31->unk_18[2] = espEntry(0x260020, 0, 0);
temp_r31->unk_18[3] = espEntry(0x260020, 0, 0);
temp_r31->unk_18[0] = espEntry(DATA_MAKE_NUM(DATADIR_M407, 0x26), 1, 0);
temp_r31->unk_18[1] = espEntry(DATA_MAKE_NUM(DATADIR_M407, 0x20), 0, 0);
temp_r31->unk_18[2] = espEntry(DATA_MAKE_NUM(DATADIR_M407, 0x20), 0, 0);
temp_r31->unk_18[3] = espEntry(DATA_MAKE_NUM(DATADIR_M407, 0x20), 0, 0);
espDispOff(temp_r31->unk_18[0]);
espDispOff(temp_r31->unk_18[1]);
espDispOff(temp_r31->unk_18[2]);
espDispOff(temp_r31->unk_18[3]);
espScaleSet(temp_r31->unk_18[0], 1.8f, 1.8f);
temp_r31->unk_08.x = (f32) 0.0f;
temp_r31->unk_08.y = (f32) 0.0f;
temp_r31->unk_08.x = (f32)0.0f;
temp_r31->unk_08.y = (f32)0.0f;
fn_1_3D28(arg0, 0);
}
void fn_1_3F7C(omObjData* arg0) {
void fn_1_3F7C(omObjData *arg0)
{
s32 i;
unkDominationData3* temp_r29;
unkDominationData3 *temp_r29;
temp_r29 = arg0->data;
for (i = 0; i < ARRAY_COUNT(temp_r29->unk_18); i++) {
@ -138,12 +147,11 @@ void fn_1_3F7C(omObjData* arg0) {
}
}
void fn_1_3FF0(omObjData* arg0) {
void fn_1_3FF0(omObjData *arg0) { }
}
void fn_1_3FF4(omObjData* arg0) {
unkDominationData3* temp_r31;
void fn_1_3FF4(omObjData *arg0)
{
unkDominationData3 *temp_r31;
temp_r31 = arg0->data;
if (temp_r31->unk_14 == 0) {
@ -166,8 +174,9 @@ void fn_1_3FF4(omObjData* arg0) {
}
}
void fn_1_40F4(omObjData* arg0) {
unkDominationData3* temp_r31;
void fn_1_40F4(omObjData *arg0)
{
unkDominationData3 *temp_r31;
temp_r31 = arg0->data;
@ -186,4 +195,3 @@ void fn_1_40F4(omObjData* arg0) {
espDispOff(temp_r31->unk_18[3]);
fn_1_3D28(arg0, 0);
}