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

Fix includes, hsfload, mess, update aurora (#584)

Browse source 
* Fix REL includes till mgmodedll

* hsfload fixes

* update aurora, fixups

* Minor tweaks

* update aurora

* Mess byteswapping and comment out 3D render code
This commit is contained in:
Dávid Balatoni 2025-04-16 06:04:54 +02:00 • committed by GitHub
parent 4b18de8528
commit af7c7a0064
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
135 changed files with 742 additions and 926 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -150,7 +150,7 @@ endif ()
add_library(dol SHARED ${DOLPHIN_FILES} ${GAME_FILES} ${PORT_FILES})
target_compile_definitions(dol PRIVATE TARGET_PC NON_MATCHING TARGET_DOL VERSION=${VERSION} MUSY_VERSION_MAJOR=1 MUSY_VERSION_MINOR=5 MUSY_VERSION_PATCH=4)
target_include_directories(dol PRIVATE include build/GMPE01_00/include)
target_link_libraries(dol PRIVATE aurora::core aurora::gx aurora::vi musyx)
target_link_libraries(dol PRIVATE aurora::core aurora::gx aurora::si aurora::vi aurora::pad musyx)
if (MSVC)
if (CMAKE_SIZEOF_VOID_P EQUAL 8)
enable_language(ASM_MASM)

2
extern/aurora vendored

@ -1 +1 @@
Subproject commit a18cdf3b599b482c850096994cef09ba3920851b
Subproject commit 357ecba0ae00246332447823fddd83b8da89357f

4
include/REL/m407dll.h
View file

@ -18,6 +18,9 @@ void fn_1_334(void);
void fn_1_388(u8, s32);
void fn_1_3C4(u8);
void fn_1_404(void);
#ifndef __MWERKS__
s32 fn_1_4C0(u8 arg0);
#endif
s32 fn_1_508(u8);
s32 fn_1_53C(u8);
void fn_1_568(s16, s16, s16);
@ -37,6 +40,7 @@ void fn_1_2564(void);
void fn_1_25C0(void);
s32 fn_1_2880(void);
#ifndef __MWERKS__
void fn_1_2770(u8 arg0);
s16 fn_1_28B8(u8 arg0);
s16 fn_1_28D4(void);
#endif

5
include/REL/m410Dll.h
View file

@ -205,6 +205,10 @@ void fn_1_28AC(s32 arg0);
s32 fn_1_28DC(void);
float fn_1_2FD4(float arg8, float arg9, float argA);
float fn_1_30F0(float arg8, float arg9);
void fn_1_31A4(Process *process);
void fn_1_31F8(void);
void fn_1_33A8(Process *objman);
void fn_1_3484(void);
s32 fn_1_76B8(Vec arg0, Vec arg1, u16 arg2);
void fn_1_77E8(void *arg0);
void fn_1_77F8(u16 arg0, Vec *arg1);
@ -213,5 +217,6 @@ void fn_1_7888(u16 arg0, u16 arg1, Vec *arg2);
s32 fn_1_79F8(s16 arg0, char *arg1, Mtx arg2);
void fn_1_7AC4(HsfObject *arg0, Mtx arg1, char *arg2, Mtx arg3);
void fn_1_7E30(Process *objman);
void fn_1_806C(void);
#endif

6
include/REL/m415Dll.h
View file

@ -257,6 +257,7 @@ float fn_1_7520(float, float *, float *, float *, s32);
void fn_1_7674(float *, Vec *, Vec *, s32);
void fn_1_7A54(float, Vec *, float *, Vec *, Vec *, s32);
// map.c
void fn_1_8780(s16 arg0, s16 arg1);
void fn_1_95C0(ModelData *, Mtx);
AnimData **fn_1_9734(s16);
void fn_1_9DC8(unkSubStruct2 *);
@ -266,11 +267,16 @@ s16 fn_1_A94C(u32, s16, s16);
void fn_1_ACF4(s16, s16, s16, s16, s16, s16);
void fn_1_AF48(s16);
u8 fn_1_AFC8(s16, u8, s32, s16, s16);
u8 fn_1_B038(s16 arg0, u8 arg1, s32 arg2);
s32 fn_1_B0B8(s16, u8, s16);
void fn_1_B634(void);
void fn_1_B864(s16, float, float, float);
void fn_1_B8D0(s16 arg0, s16 arg1, f32 arg8, f32 arg9, f32 argA);
void fn_1_BB4C(s16, float, float, float);
void fn_1_BC9C(s16, float, float, float);
void fn_1_BD08(s16, s16, float, float, float);
void fn_1_BE30(s16 arg0, s16 arg1, s32 arg2);
void fn_1_C110(s16 arg0, s16 arg1, u8 arg2, u8 arg3, u8 arg4, u8 arg5);
void fn_1_C264(s16, u8);
void fn_1_C2D0(s16, s16, u8);
void fn_1_C410(s16, s16, u8, u8);

8
include/REL/m424Dll.h
View file

@ -1,4 +1,5 @@
#include "dolphin.h"
#ifndef M424DLL_H
#define M424DLL_H
#include "game/object.h"
@ -31,6 +32,7 @@ extern M424DllBallStruct2 lbl_1_bss_60[9];
extern u8 lbl_1_bss_58;
extern s16 lbl_1_bss_24[4];
s32 fn_1_FE0(void);
float fn_1_1358(float, float);
float fn_1_1470(float, float, float);
omObjData *fn_1_1AB8(Process *);
@ -42,9 +44,13 @@ void fn_1_2720(Process *);
void fn_1_2880(void);
Vec *fn_1_8A00(u8);
s32 fn_1_8A2C(void);
s32 fn_1_907C(Vec *arg0, Vec *arg1);
omObjData *fn_1_93F0(Process *);
void fn_1_94A4(void);
s32 fn_1_B804(void);
s32 fn_1_B888(void);
s32 fn_1_B8AC(void);
s32 fn_1_B924(void);
void fn_1_C2E0(s32 arg0);
#endif

3
include/REL/m434Dll.h
View file

@ -6,6 +6,9 @@
void fn_1_1C44(s32 arg0, s32 arg1);
s32 fn_1_1C88(s32 arg0);
s32 fn_1_1CB8(void);
#ifndef __MWERKS__
s16 fn_1_1D44(void);
#endif
s32 fn_1_1D54(void);
void fn_1_1D64(s32 arg0);
s32 fn_1_1D74(s32 arg0);

1
include/REL/m440Dll.h
View file

@ -241,6 +241,7 @@ typedef struct _unkObjStruct {
float unk68;
float unk6C;
float unk70;
char unk74[0x4];
} unkObjStruct;
#if VERSION_NTSC

1
include/REL/m446Dll.h
View file

@ -235,6 +235,7 @@ void fn_1_34A0(unkStruct5 *, unkStruct4 **, s32, s32);
s32 m446DeckPushCard(unkStruct5 *, unkStruct4 *, s32);
s32 m446DeckPopCard(unkStruct2 **, unkStruct4 **);
void fn_1_38B0(unkStruct2 **);
// void fn_1_38E0(u32 arg0); // TODO
s32 fn_1_38F0(void);
// table.c
s32 fn_1_3924(void);

2
include/game/hsfdraw.h
View file

@ -70,7 +70,7 @@ void Hu3DModelObjMtxGet(s16 arg0, char *arg1, Mtx arg2);
void PGObjCall(ModelData *arg0, HsfObject *arg1);
void PGObjCalc(ModelData *arg0, HsfObject *arg1);
void PGObjReplica(ModelData *arg0, HsfObject *arg1);
HsfObject *Hu3DObjDuplicate(HsfData *arg0, u32 arg1);
HsfObject *Hu3DObjDuplicate(HsfData *arg0, uintptr_t arg1);
void Hu3DModelObjDrawInit(void);
void Hu3DModelObjDraw(s16 arg0, char *arg1, Mtx arg2);

3
include/game/hsfformat.h
View file

@ -277,7 +277,8 @@ typedef struct hsf_object_data {
HsfCluster **cluster;
u32 cenvCnt;
HsfCenv *cenv;
void *file[2];
HsfVector3f *vtxtop;
HsfVector3f *normtop;
} HsfObjectData;
typedef struct hsf_camera {

3
include/game/hsfman.h
View file

@ -284,6 +284,9 @@ void Hu3DLLightStaticSet(s16, s16, s32);
s32 Hu3DModelLightInfoSet(s16, s16);
s16 Hu3DLightSet(ModelData *, Mtx *, Mtx *, float);
void lightSet(LightData *arg0, s16 arg1, Mtx *arg2, Mtx *arg3, float arg8);
#ifndef __MWERKS__
void Hu3DReflectMapSet(AnimData* arg0);
#endif
void Hu3DReflectNoSet(s16 arg0);
void Hu3DFogSet(float, float, u8, u8, u8);
void Hu3DFogClear(void);

32
include/port/byteswap.h
View file

@ -156,6 +156,22 @@ typedef struct HsfShape32b {
u32 vertex;
} HsfShape32b;
typedef struct HsfCenvDual32b {
u32 target1;
u32 target2;
u32 weightCnt;
u32 weight;
} HsfCenvDual32b;
typedef struct HsfCenvMulti32b {
u32 weightCnt;
u16 pos;
u16 posCnt;
u16 normal;
u16 normalCnt;
u32 weight;
} HsfCenvMulti32b;
typedef struct HsfCenv32b {
u32 name;
u32 singleData;
@ -200,7 +216,8 @@ typedef struct HsfObjectData32b {
u32 cluster;
u32 cenvCnt;
u32 cenv;
u32 file[2];
u32 vtxtop;
u32 normtop;
} HsfObjectData32b;
typedef struct HsfObject32b {
@ -265,6 +282,12 @@ typedef struct HsfFace32b {
Vec nbt;
} HsfFace32b;
typedef struct HsfMatrix32b {
u32 base_idx;
u32 count;
u32 data;
} HsfMatrix32b;
void byteswap_u16(u16 *src);
void byteswap_s16(s16 *src);
void byteswap_u32(u32 *src);
@ -285,7 +308,7 @@ void byteswap_hsfattribute(HsfAttribute32b *src, HsfAttribute *dest);
void byteswap_hsfmaterial(HsfMaterial32b *src, HsfMaterial *dest);
void byteswap_hsfscene(HsfScene *src);
void byteswap_hsfbuffer(HsfBuffer32b *src, HsfBuffer *dest);
void byteswap_hsfmatrix(HsfMatrix *src);
void byteswap_hsfmatrix(HsfMatrix32b *src, HsfMatrix *dest);
void byteswap_hsfpalette(HsfPalette32b *src, HsfPalette *dest);
void byteswap_hsfpart(HsfPart32b *src, HsfPart *dest);
void byteswap_hsfbitmap(HsfBitmap32b *src, HsfBitmap *dest);
@ -304,7 +327,6 @@ void byteswap_hsfattribute(HsfAttribute32b *src, HsfAttribute *dest);
void byteswap_hsfmaterial(HsfMaterial32b *src, HsfMaterial *dest);
void byteswap_hsfscene(HsfScene *src);
void byteswap_hsfbuffer(HsfBuffer32b *src, HsfBuffer *dest);
void byteswap_hsfmatrix(HsfMatrix *src);
void byteswap_hsfpalette(HsfPalette32b *src, HsfPalette *dest);
void byteswap_hsfpart(HsfPart32b *src, HsfPart *dest);
void byteswap_hsfbitmap(HsfBitmap32b *src, HsfBitmap *dest);
@ -312,6 +334,10 @@ void byteswap_hsfmapattr(HsfMapAttr32b *src, HsfMapAttr *dest);
void byteswap_hsfskeleton(HsfSkeleton32b *src, HsfSkeleton *dest);
void byteswap_hsfshape(HsfShape32b *src, HsfShape *dest);
void byteswap_hsfcenv_single(HsfCenvSingle *src);
void byteswap_hsfcenv_dual_weight(HsfCenvDualWeight *src);
void byteswap_hsfcenv_dual(HsfCenvDual32b *src, HsfCenvDual *dest);
void byteswap_hsfcenv_multi_weight(HsfCenvMultiWeight *src);
void byteswap_hsfcenv_multi(HsfCenvMulti32b *src, HsfCenvMulti *dest);
void byteswap_hsfcenv(HsfCenv32b *src, HsfCenv *dest);
void byteswap_hsfobject(HsfObject32b *src, HsfObject *dest);
void byteswap_hsfbitmapkey(HsfBitmapKey32b *src, HsfBitmapKey *dest);

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

@ -14,6 +14,10 @@
#include "REL/E3SetupDLL.h"
#ifndef __MWERKS__
void HuSysVWaitSet(s16 vcount);
#endif
static struct {
s16 playerCnt;
s16 rumble;

7
src/REL/E3setupDLL/mgselect.c
View file

@ -1,4 +1,7 @@
#include "ext_math.h"
#include "game/audio.h"
#include "game/frand.h"
#include "game/gamework.h"
#include "game/gamework_data.h"
#include "game/hsfman.h"
#include "game/init.h"
@ -9,6 +12,10 @@
#include "REL/E3SetupDLL.h"
#ifndef __MWERKS__
void HuSysVWaitSet(s16 vcount);
#endif
static s16 mgDefault;
static omObjData *mgInterfaceObj;
static omObjData *mgSelectObj;

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

@ -24,6 +24,11 @@
#include "ext_math.h"
#include "version.h"
#ifndef __MWERKS__
#include "game/audio.h"
void HuSysVWaitSet(s16 vcount);
#endif
#undef ABS
#define ABS(x) ((0 > (x)) ? -(x) : (x))

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

@ -4,6 +4,7 @@
#include "game/gamework_data.h"
#include "game/hsfdraw.h"
#include "game/minigame_seq.h"
#include "game/objsub.h"
#include "game/wipe.h"
#include "REL/m406Dll.h"

5
src/REL/m406Dll/player.c
View file

@ -12,6 +12,11 @@
#include "REL/m406Dll.h"
#ifndef __MWERKS__
#include "game/frand.h"
#include "game/hsfex.h"
#endif
typedef struct UnkM406PlayerStruct {
/* 0x00 */ float unk_00;
/* 0x04 */ float unk_04;

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

@ -64,10 +64,6 @@ void fn_1_15D8(void)
void fn_1_162C(omObjData *arg0)
{
s32 var_r30;
s32 var_r30_2;
s32 var_r30_3;
s32 var_r30_4;
s32 i;
arg0->func = fn_1_1A8C;

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

@ -257,7 +257,6 @@ void fn_1_404(void)
{
omObjData *temp_r31;
unkDominationData *unkData;
s32 temp_r0;
u8 i;
for (i = 0; i < 4; i++) {
@ -330,7 +329,6 @@ void fn_1_628(omObjData *arg0, s32 arg1)
void fn_1_64C(omObjData *arg0)
{
u32 temp_r29;
unkDominationData *temp_r27;
unkDominationData *temp_r31;
u32 i;
@ -526,10 +524,7 @@ void fn_1_1074(omObjData *arg0)
void fn_1_11CC(omObjData *arg0)
{
unkDominationData *temp_r31;
s16 temp;
temp_r31 = arg0->data;
unkDominationData *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, HU3D_MOTATTR_NONE);
@ -543,6 +538,7 @@ void fn_1_11CC(omObjData *arg0)
temp_r31->unk_24 += 0.3f;
if (!(temp_r31->unk_14 > 300.0f)) {
s16 temp;
temp_r31->unk_14 = 300.0f;
CharModelVoiceEnableSet(temp_r31->unk_01, arg0->motion[4], 0);
CharModelMotionShiftSet(temp_r31->unk_01, arg0->motion[4], 0.0f, 10.0f, HU3D_MOTATTR_NONE);

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

@ -127,12 +127,9 @@ void fn_1_5FE4(omObjData *arg0)
void fn_1_61A0(void)
{
s32 i;
unkDominationData6 *temp_r31;
temp_r31 = lbl_1_bss_3988->data;
unkDominationData6 *temp_r31 = lbl_1_bss_3988->data;
if (temp_r31->unk_04 == 0) {
s32 i;
for (i = 0; i < ARRAY_COUNT(temp_r31->unk_0C); i++) {
espDispOff(temp_r31->unk_0C[i]);
}
@ -142,12 +139,9 @@ void fn_1_61A0(void)
void fn_1_6218(void)
{
s16 i;
unkDominationData6 *temp_r31;
temp_r31 = lbl_1_bss_3988->data;
unkDominationData6 *temp_r31 = lbl_1_bss_3988->data;
if (temp_r31->unk_04 == 0) {
s16 i;
for (i = 0; i < ARRAY_COUNT(temp_r31->unk_0C); i++) {
espDispOn(temp_r31->unk_0C[i]);
}

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

@ -155,7 +155,11 @@ void fn_1_26CC(u8 arg0)
}
}
#ifdef __MWERKS__
void fn_1_2770(u8 arg0, s16 arg2)
#else
void fn_1_2770(u8 arg0)
#endif
{
omObjData *temp_r30;
unkDominationData7 *temp_r31;
@ -199,15 +203,13 @@ void fn_1_290C(omObjData *arg0, s32 arg1)
void fn_1_2930(omObjData *arg0)
{
unkDominationData7 *temp_r28;
omObjData *temp_r29;
u32 i;
unkDominationData7 *temp_r31;
temp_r31 = arg0->data;
unkDominationData7 *temp_r31 = arg0->data;
lbl_1_data_258[temp_r31->unk_24](arg0);
if ((temp_r31->unk_08.z > (Center.z - 2000.0f)) && (temp_r31->unk_08.z < (2000.0f + Center.z)) && (temp_r31->unk_04 == 0)) {
for (i = 0; i < 8; i++) {
unkDominationData7 *temp_r28;
temp_r29 = lbl_1_bss_2DB0[(temp_r31->unk_00 % 80) + (i * 80)];
temp_r29->model[0] = -1;
temp_r28 = temp_r29->data;
@ -472,9 +474,7 @@ void fn_1_36D0(omObjData *arg0)
void fn_1_37B0(omObjData *arg0)
{
unkDominationData7 *temp_r31;
temp_r31 = arg0->data;
unkDominationData7 *temp_r31 = arg0->data;
if (temp_r31->unk_2C == 0) {
temp_r31->unk_14.x = 0.0f;
temp_r31->unk_08.y = 0.0f;

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

@ -1,4 +1,5 @@
#include "game/esprite.h"
#include "game/hsfex.h"
#include "game/gamework_data.h"
#include "game/object.h"
#include "game/process.h"
@ -16,7 +17,6 @@ typedef struct unkDominationData3 {
} unkDominationData3; // sizeof 0x24
// 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);
@ -58,17 +58,14 @@ void fn_1_3B68(void)
void fn_1_3BB8(s16 arg0, f32 arg8, f32 arg9)
{
omObjData *obj;
Vec sp14;
unkDominationData3 *temp_r31;
u32 i;
s16 temp;
for (i = 0; i < ARRAY_COUNT(lbl_1_bss_37C8); i++) {
obj = lbl_1_bss_37C8[i];
temp_r31 = obj->data;
omObjData *obj = lbl_1_bss_37C8[i];
unkDominationData3 *temp_r31 = obj->data;
if (temp_r31->unk_04 == 0) {
temp = arg0;
Vec sp14;
s16 temp = arg0;
espBankSet(temp_r31->unk_18[1], (temp / 100));
temp = (temp - ((temp / 100) * 100));
espBankSet(temp_r31->unk_18[2], (temp / 10));
@ -95,7 +92,6 @@ void fn_1_3D28(omObjData *arg0, s32 arg1)
void fn_1_3D4C(omObjData *arg0)
{
s32 temp_r5;
unkDominationData3 *temp_r31;
temp_r31 = arg0->data;

33
src/REL/m408Dll/camera.c
View file

@ -1,24 +1,22 @@
#include "game/audio.h"
#include "game/chrman.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/wipe.h"
#include "game/hsfanim.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/sprite.h"
#include "game/audio.h"
#include "game/gamework_data.h"
#include "REL/m408Dll.h"
#include "ext_math.h"
#include "math.h"
#ifndef __MWERKS__
#include "game/frand.h"
#endif
omObjData *lbl_1_bss_110;
u32 lbl_1_bss_10C;
Vec lbl_1_bss_100;
@ -266,7 +264,6 @@ void fn_1_A4E8(s32 arg0, Vec *arg1, u32 arg2);
void fn_1_99C8(omObjData *object)
{
float temp_f31;
float temp_f30;
Vec sp2C;
Vec sp20;
@ -282,7 +279,7 @@ void fn_1_99C8(omObjData *object)
switch (object->work[0]) {
case 0:
if (object->work[1] < 120.0f) {
temp_f30 = (1.0f / 60.0f) * (1.5f * (120.0f - object->work[1]));
float temp_f30 = (1.0f / 60.0f) * (1.5f * (120.0f - object->work[1]));
if (temp_f30 > 1.0f) {
temp_f30 = 1.0f;
}
@ -469,13 +466,11 @@ void fn_1_A37C(ModelData *model, ParticleData *particle, Mtx matrix)
void fn_1_A4E8(s32 arg0, Vec *arg1, u32 arg2)
{
float temp_f31;
HsfanimStruct01 *temp_r31;
ParticleData *temp_r30;
s32 temp_r29;
temp_r30 = Hu3DData[arg0].unk_120;
ParticleData *temp_r30 = Hu3DData[arg0].unk_120;
if (temp_r30->unk_00) {
temp_r31 = temp_r30->unk_48;
float temp_f31;
s32 temp_r29;
HsfanimStruct01 *temp_r31 = temp_r30->unk_48;
for (temp_r29 = 0; temp_r29 < temp_r30->unk_30; temp_r29++, temp_r31++) {
if (temp_r31->unk00 != 0) {
continue;
@ -514,7 +509,6 @@ void fn_1_A894(ModelData *model, ParticleData *particle, Mtx matrix)
{ 600, 1, 0.6, 0.9, 0.3, 0 },
{ 13, 1, 1, 1, 0.5, 0 },
};
Vec sp8;
if (particle->unk_00 == 0) {
particle->unk_00++;
temp_r31 = particle->unk_48;
@ -549,6 +543,7 @@ void fn_1_A894(ModelData *model, ParticleData *particle, Mtx matrix)
else {
temp_r31 = particle->unk_48;
for (temp_r29 = 0; temp_r29 < particle->unk_30; temp_r29++, temp_r31++) {
Vec sp8;
if (temp_r31->unk00 == 0) {
continue;
}
@ -598,9 +593,6 @@ void fn_1_AFF4(ModelData *model, ParticleData *particle, Mtx matrix)
float temp_f30;
HsfanimStruct01 *temp_r30;
s32 temp_r29;
Vec sp20;
Vec sp14;
Vec sp8;
if (particle->unk_00 == 0) {
particle->unk_00++;
temp_f31 = -70;
@ -635,6 +627,9 @@ void fn_1_AFF4(ModelData *model, ParticleData *particle, Mtx matrix)
}
}
else {
Vec sp20;
Vec sp14;
Vec sp8;
sp20.x = sind(CRot.y) * cosd(CRot.x);
sp20.y = -sind(CRot.x);
sp20.z = cosd(CRot.y) * cosd(CRot.x);

181
src/REL/m408Dll/main.c
View file

@ -1,18 +1,17 @@
#include "game/audio.h"
#include "game/chrman.h"
#include "game/hsfanim.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/gamework_data.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/wipe.h"
#include "game/hsfanim.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/sprite.h"
#include "game/audio.h"
#include "game/gamework_data.h"
#include "REL/m408Dll.h"
@ -20,6 +19,7 @@
#include "math.h"
#ifndef __MWERKS__
#include "game/frand.h"
#include "game/esprite.h"
#endif
@ -384,12 +384,12 @@ void fn_1_12A0(omObjData *object)
void fn_1_148C(omObjData *object)
{
Vec sp30;
Vec sp24;
Vec sp18;
Vec spC;
float temp_f29;
if (!WipeStatGet()) {
Vec sp30;
Vec sp24;
Vec sp18;
Vec spC;
float temp_f29;
lbl_1_bss_54 = 0;
sp30.x = 0;
sp30.y = 50;
@ -515,17 +515,14 @@ void fn_1_1E54(omObjData *object)
s32 fn_1_1EBC(omObjData *object)
{
float temp_f31;
float temp_f22;
float temp_f21;
Vec sp3C;
Vec sp30;
Vec sp24;
Work2FAC *temp_r31 = object->data;
temp_f31 = (temp_r31->unk1C.x * temp_r31->unk1C.x) + ((10.0f / 7.0f) * ((10.0f / 7.0f) * temp_r31->unk1C.z * temp_r31->unk1C.z));
float temp_f31 = (temp_r31->unk1C.x * temp_r31->unk1C.x) + ((10.0f / 7.0f) * ((10.0f / 7.0f) * temp_r31->unk1C.z * temp_r31->unk1C.z));
if (temp_f31 > 6400) {
temp_f22 = 80.0f / sqrtf(temp_f31);
Vec sp3C;
Vec sp30;
Vec sp24;
float temp_f21;
float temp_f22 = 80.0f / sqrtf(temp_f31);
sp3C.x = temp_r31->unk1C.x * temp_f22;
sp3C.z = temp_r31->unk1C.z * temp_f22;
temp_r31->unk34.x = sp3C.x - temp_r31->unk1C.x;
@ -551,9 +548,7 @@ s32 fn_1_1EBC(omObjData *object)
temp_r31->unk28.z += (sp30.z * 20.0f) + (sp30.z * 2.0f * temp_f22);
return 1;
}
else {
return 0;
}
return 0;
}
void fn_1_26E4(omObjData *object);
@ -747,12 +742,9 @@ void fn_1_2FAC(omObjData *object)
}
}
void fn_1_38D0(omObjData *arg0, s8 *arg1, s8 *arg2)
void fn_1_38D0(omObjData *object, s8 *arg1, s8 *arg2)
{
float temp_f31;
float temp_f30;
float temp_f29;
Work2FAC *temp_r31;
Work2FAC *temp_r30;
s8 temp_r29;
s32 temp_r28;
@ -761,79 +753,79 @@ void fn_1_38D0(omObjData *arg0, s8 *arg1, s8 *arg2)
Vec spC;
s8 sp8[4];
temp_r31 = arg0->data;
*arg1 = temp_r31->unk7C[0];
*arg2 = temp_r31->unk7C[1];
sp18.x = temp_r31->unk1C.x;
sp18.y = temp_r31->unk1C.y;
sp18.z = temp_r31->unk1C.z;
Work2FAC *work = object->data;
*arg1 = work->unk7C[0];
*arg2 = work->unk7C[1];
sp18.x = work->unk1C.x;
sp18.y = work->unk1C.y;
sp18.z = work->unk1C.z;
temp_r25 = fn_1_162CC(&sp18, &spC);
temp_r29 = 0;
sp8[0] = -1;
for (temp_r28 = 0; temp_r28 < 4; temp_r28++) {
if (temp_r28 != temp_r31->unk0) {
if (temp_r28 != work->unk0) {
temp_r30 = fn_1_68A8(temp_r28);
if ((temp_r30->unk4 & 0x12) == 0) {
sp8[temp_r29++] = temp_r28;
}
}
}
switch (temp_r31->unk8E) {
switch (work->unk8E) {
case 0:
if (temp_r29 > 0 || temp_r25) {
if (temp_r29 > 0) {
temp_r31->unk8C = sp8[frandmod(temp_r29)];
work->unk8C = sp8[frandmod(temp_r29)];
}
temp_r31->unk74 = frandmod(180) + 120.0f;
temp_r31->unk78 = 0;
temp_r31->unk8E = 1;
work->unk74 = frandmod(180) + 120.0f;
work->unk78 = 0;
work->unk8E = 1;
}
else {
temp_r31->unk78 = 0;
temp_r31->unk8E = 2;
work->unk78 = 0;
work->unk8E = 2;
}
break;
case 1:
if ((temp_r31->unk78 & 0x3) == 0) {
if ((work->unk78 & 0x3) == 0) {
if (temp_r25) {
temp_f31 = atan2d(spC.x - temp_r31->unk1C.x, spC.z - temp_r31->unk1C.z);
temp_f31 = atan2d(spC.x - work->unk1C.x, spC.z - work->unk1C.z);
}
else {
temp_r30 = fn_1_68A8(temp_r31->unk8C);
temp_f31 = atan2d(temp_r30->unk1C.x - temp_r31->unk1C.x, temp_r30->unk1C.z - temp_r31->unk1C.z);
temp_r30 = fn_1_68A8(work->unk8C);
temp_f31 = atan2d(temp_r30->unk1C.x - work->unk1C.x, temp_r30->unk1C.z - work->unk1C.z);
}
temp_r31->unk84[1] = fn_1_883C(temp_r31->unk84[0], temp_f31, (0.3f * temp_r31->unk90) + 0.15f);
work->unk84[1] = fn_1_883C(work->unk84[0], temp_f31, (0.3f * work->unk90) + 0.15f);
}
temp_r31->unk78++;
temp_r31->unk84[0] = fn_1_883C(temp_r31->unk84[0], temp_r31->unk84[1], 0.2f);
temp_r31->unk7C[0] = sind(temp_r31->unk84[0]) * 80.0;
temp_r31->unk7C[1] = -cosd(temp_r31->unk84[0]) * 80.0;
*arg1 = temp_r31->unk7C[0];
*arg2 = temp_r31->unk7C[1];
temp_r31->unk74--;
work->unk78++;
work->unk84[0] = fn_1_883C(work->unk84[0], work->unk84[1], 0.2f);
work->unk7C[0] = sind(work->unk84[0]) * 80.0;
work->unk7C[1] = -cosd(work->unk84[0]) * 80.0;
*arg1 = work->unk7C[0];
*arg2 = work->unk7C[1];
work->unk74--;
if (temp_r25 == 0 && (temp_r30->unk4 & 0x12)) {
temp_r31->unk74 = 0;
work->unk74 = 0;
}
if (temp_r31->unk74 == 0) {
temp_r31->unk8E = 0;
if (work->unk74 == 0) {
work->unk8E = 0;
}
break;
case 2:
if ((temp_r31->unk78 & 0xF) == 0) {
temp_f30 = (0.04f * frandmod(1000)) - 20.0f;
temp_f29 = (0.04f * frandmod(1000)) - 20.0f;
temp_r31->unk84[1] = temp_f31 = atan2d(temp_f30 - temp_r31->unk1C.x, temp_f29 - temp_r31->unk1C.z);
if ((work->unk78 & 0xF) == 0) {
float temp_f30 = (0.04f * frandmod(1000)) - 20.0f;
float temp_f29 = (0.04f * frandmod(1000)) - 20.0f;
work->unk84[1] = temp_f31 = atan2d(temp_f30 - work->unk1C.x, temp_f29 - work->unk1C.z);
}
temp_r31->unk78++;
temp_r31->unk84[0] = fn_1_883C(temp_r31->unk84[0], temp_r31->unk84[1], 0.2f);
temp_r31->unk7C[0] = sind(temp_r31->unk84[0]) * 80.0;
temp_r31->unk7C[1] = -cosd(temp_r31->unk84[0]) * 80.0;
*arg1 = temp_r31->unk7C[0];
*arg2 = temp_r31->unk7C[1];
work->unk78++;
work->unk84[0] = fn_1_883C(work->unk84[0], work->unk84[1], 0.2f);
work->unk7C[0] = sind(work->unk84[0]) * 80.0;
work->unk7C[1] = -cosd(work->unk84[0]) * 80.0;
*arg1 = work->unk7C[0];
*arg2 = work->unk7C[1];
if (temp_r29 > 0 || temp_r25) {
temp_r31->unk8E = 0;
work->unk8E = 0;
}
break;
}
@ -942,12 +934,10 @@ void fn_1_3E80(omObjData *object)
void fn_1_4A58(omObjData *object)
{
Work2FAC *temp_r31;
s32 temp_r28;
s32 temp_r26;
s32 sp8;
temp_r31 = object->data;
sp8 = temp_r31->unk0;
Work2FAC *temp_r31 = object->data;
s32 sp8 = temp_r31->unk0;
temp_r31->unk4 |= 2;
temp_r31->unk1C.y = lbl_1_bss_54;
fn_1_1EBC(object);
@ -1006,38 +996,36 @@ void fn_1_54E4(omObjData *object);
void fn_1_5098(omObjData *object)
{
Work2FAC *temp_r29;
s32 temp_r27;
temp_r29 = object->data;
Work2FAC *work = object->data;
object->trans.x = lbl_1_data_144[object->work[0]].x;
object->trans.z = lbl_1_data_144[object->work[0]].z;
if (object->work[1] == 0) {
if (lbl_1_bss_3C < temp_r29->unk8) {
lbl_1_bss_3C = temp_r29->unk8;
if (lbl_1_bss_3C < work->unk8) {
lbl_1_bss_3C = work->unk8;
}
}
else if (object->work[1] == 10 && lbl_1_bss_3C == temp_r29->unk8) {
else if (object->work[1] == 10 && lbl_1_bss_3C == work->unk8) {
s32 temp_r27;
for (temp_r27 = 0; lbl_1_bss_28[temp_r27] >= 0; temp_r27++)
;
lbl_1_bss_28[temp_r27] = temp_r29->unk2;
lbl_1_bss_28[temp_r27] = work->unk2;
}
object->work[1]++;
temp_r29->unk1C.y = lbl_1_bss_54;
temp_r29->unk58.y = 0;
temp_r29->unk58.x = 0;
work->unk1C.y = lbl_1_bss_54;
work->unk58.y = 0;
work->unk58.x = 0;
object->rot.x = object->rot.y = object->rot.z = 0;
object->trans.y = temp_r29->unk1C.y;
temp_r29->unk1C.x = object->trans.x;
temp_r29->unk1C.z = object->trans.z;
temp_r29->unk1C.y += lbl_1_data_A0[temp_r29->unk2];
object->trans.y = work->unk1C.y;
work->unk1C.x = object->trans.x;
work->unk1C.z = object->trans.z;
work->unk1C.y += lbl_1_data_A0[work->unk2];
if (object->trans.y < 0) {
object->trans.y = 0;
}
fn_1_1BE8(object, 1.0f);
if (fn_1_6878() == 5) {
object->func = fn_1_54E4;
if (temp_r29->unk14) {
if (work->unk14) {
lbl_1_bss_C = 1;
}
}
@ -1069,9 +1057,7 @@ void fn_1_5AA0(omObjData *object);
void fn_1_5684(omObjData *object)
{
Work2FAC *temp_r31;
s32 temp_r29;
temp_r31 = object->data;
Work2FAC *temp_r31 = object->data;
if (fabs(object->trans.x) < 160.0 || fabs(object->trans.z) < 160.0) {
temp_r31->unk1C.x += temp_r31->unk28.x * (1.0f / 60.0f);
temp_r31->unk1C.z += temp_r31->unk28.z * (1.0f / 60.0f);
@ -1088,6 +1074,7 @@ void fn_1_5684(omObjData *object)
omSetTra(object, temp_r31->unk1C.x + temp_r31->unk68.x, temp_r31->unk1C.y + temp_r31->unk68.y, temp_r31->unk1C.z + temp_r31->unk68.z);
}
if (fn_1_6878() >= 4) {
s32 temp_r29;
GWPlayerCoinCollectAdd(object->work[0], temp_r31->unk14);
if (lbl_1_bss_48) {
Hu3DModelAttrReset(object->model[0], HU3D_ATTR_DISPOFF);
@ -1157,15 +1144,13 @@ void fn_1_5AB4(ModelData *model, ParticleData *particle, Mtx matrix)
void fn_1_5DCC(s32 arg0, Vec *arg1, u32 arg2)
{
float temp_f31;
float temp_f30;
HsfanimStruct01 *temp_r31;
ParticleData *temp_r29;
s32 temp_r28;
temp_r29 = Hu3DData[arg0].unk_120;
ParticleData *temp_r29 = Hu3DData[arg0].unk_120;
if (temp_r29->unk_00 != 0) {
temp_r31 = temp_r29->unk_48;
float temp_f31;
float temp_f30;
HsfanimStruct01 *temp_r31 = temp_r29->unk_48;
s32 temp_r28;
for (temp_r28 = 0; temp_r28 < temp_r29->unk_30; temp_r28++, temp_r31++) {
if (temp_r31->unk00) {
continue;

22
src/REL/m408Dll/object.c
View file

@ -1,23 +1,19 @@
#include "game/audio.h"
#include "game/object.h"
#include "game/chrman.h"
#include "game/minigame_seq.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/wipe.h"
#include "game/hsfanim.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/sprite.h"
#include "game/audio.h"
#include "game/gamework_data.h"
#include "REL/m408Dll.h"
#include "ext_math.h"
#include "math.h"
#ifndef __MWERKS__
#include "game/frand.h"
#endif
s32 rand8(void);
typedef struct struct_data_20C {
s32 unk0;
@ -372,10 +368,9 @@ void fn_1_11E3C(StructBssDA4 *arg0, s32 arg1)
void fn_1_12354(omObjData *object)
{
s32 temp_r31;
u32 temp_r30;
temp_r30 = fn_1_6878();
u32 temp_r30 = fn_1_6878();
if (temp_r30 == 2) {
s32 temp_r31;
for (temp_r31 = 0; temp_r31 < lbl_1_bss_DA0; temp_r31++)
;
object->func = fn_1_123C8;
@ -522,7 +517,6 @@ void fn_1_127A0(StructBssDA4 *arg0)
void fn_1_12C6C(StructBssDA4 *arg0)
{
Work2FAC *temp_r30;
float temp_f31;
float temp_f30;
float temp_f26;

31
src/REL/m408Dll/stage.c
View file

@ -1,23 +1,20 @@
#include "game/audio.h"
#include "game/chrman.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/wipe.h"
#include "game/hsfanim.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/sprite.h"
#include "game/audio.h"
#include "game/gamework_data.h"
#include "game/wipe.h"
#include "ext_math.h"
#include "REL/m408Dll.h"
#include "ext_math.h"
#include "math.h"
#ifndef __MWERKS__
#include "game/frand.h"
#endif
s32 lbl_1_bss_160[2];
AnimData *lbl_1_bss_14C[5];
@ -262,18 +259,14 @@ void fn_1_D6F0(omObjData *object);
void fn_1_D004(omObjData *object)
{
float temp_f31;
float temp_f30;
float temp_f29;
float temp_f28;
u16 *temp_r30;
float *temp_r28;
s32 temp_r27;
s32 temp_r26;
CameraData *sp8;
temp_r30 = object->data;
sp8 = &Hu3DCamera[0];
temp_f30 = fn_1_6888();
temp_f28 = 7000;
u16 *temp_r30 = object->data;
CameraData *sp8 = &Hu3DCamera[0];
float temp_f30 = fn_1_6888();
float temp_f28 = 7000;
switch (temp_r30[0]) {
case 2:
Hu3DModelAttrReset(object->model[9], HU3D_ATTR_DISPOFF);

2
src/REL/m409Dll/cursor.c
View file

@ -767,7 +767,7 @@ s32 fn_1_E2A8(s16 arg0, u8 arg1, u32 arg2, s16 arg3, s16 arg4)
temp_r31->unkC = 1.0f;
temp_r31->unk10 = 0.0f;
if (temp_r31->unk4 == NULL) {
temp_r31->unk4 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x20, MEMORY_DEFAULT_NUM);
temp_r31->unk4 = HuMemDirectMallocNum(HEAP_SYSTEM, 4 * sizeof(HsfVector2f), MEMORY_DEFAULT_NUM);
}
temp_r31->unk4[0].x = temp_r31->unk0 * temp_r30->unk54;
temp_r31->unk4[0].y = temp_r31->unk0 * temp_r30->unk58;

7
src/REL/m409Dll/player.c
View file

@ -1,14 +1,15 @@
#include "REL/m409Dll.h"
#include "ext_math.h"
#include "game/audio.h"
#include "game/chrman.h"
#include "game/frand.h"
#include "game/gamework_data.h"
#include "game/hsfmotion.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/sprite.h"
#include "ext_math.h"
#include "REL/m409Dll.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#endif

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

@ -1,14 +1,15 @@
#include "ext_math.h"
#include <game/audio.h>
#include "game/gamework_data.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/wipe.h"
#include "ext_math.h"
#include "REL/m410Dll.h"
#include <game/audio.h>
Process *lbl_1_bss_28;
omObjData *lbl_1_bss_24;

4
src/REL/m410Dll/player.c
View file

@ -1,4 +1,4 @@
#include "ext_math.h"
#include "game/audio.h"
#include "game/chrman.h"
#include "game/gamework_data.h"
#include "game/hsfdraw.h"
@ -8,11 +8,13 @@
#include "game/object.h"
#include "game/pad.h"
#include "game/sprite.h"
#include "ext_math.h"
#include "REL/m410Dll.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#include "game/frand.h"
#endif
omObjData *lbl_1_bss_74;

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

@ -16,9 +16,12 @@
#include "game/sprite.h"
#include "game/wipe.h"
#include "dolphin.h"
#include "ext_math.h"
#ifndef __MWERKS__
#include "game/hsfex.h"
#endif
typedef struct {
/* 0x00 */ s16 unk00;
/* 0x02 */ s16 unk02[5];

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

@ -11,7 +11,6 @@
#include "game/pad.h"
#include "game/sprite.h"
#include "game/wipe.h"
#include "math.h"
// bss
s16 lbl_1_bss_7A0;

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

@ -10,6 +10,10 @@
#include "game/sprite.h"
#include "game/wipe.h"
#ifndef __MWERKS__
#include "game/hsfex.h"
#endif
typedef struct UnkM414Struct {
s32 unk00;
s32 unk04;

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

@ -14,7 +14,6 @@
#include "game/pad.h"
#include "game/sprite.h"
#include "game/wipe.h"
#include "math.h"
// bss
unkStruct5 lbl_1_bss_36C;

5
src/REL/m415Dll/map.c
View file

@ -1,3 +1,4 @@
#include "game/memory.h"
#define HUSPR_USE_OLD_DEFS
#include "REL/m415Dll.h"
@ -767,7 +768,7 @@ void fn_1_ACF4(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5)
HuSprAnimKill(var_r31->unk0);
var_r31->unk8 |= 0xFFFF0000;
var_r30 = HuSprAnimMake(arg2, arg3, arg1);
var_r30->bmp->data = HuMemDirectMallocNum(HEAP_SYSTEM, arg3 * (var_r30->bmp->pixSize * arg2), 0x10000000U);
var_r30->bmp->data = HuMemDirectMallocNum(HEAP_SYSTEM, arg3 * (var_r30->bmp->pixSize * arg2), MEMORY_DEFAULT_NUM);
var_f31 = arg4 / (f32)var_r30->bmp->sizeX;
var_f30 = arg5 / (f32)var_r30->bmp->sizeY;
var_r31->unk0 = var_r30;
@ -885,7 +886,7 @@ s32 fn_1_B0B8(s16 arg0, u8 arg1, s16 arg2)
return 1;
}
void fn_1_B634(s32 arg0)
void fn_1_B634(void)
{
s32 var_r28;
s32 var_r27;

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

@ -3,6 +3,7 @@
#include "game/frand.h"
#include "game/gamework_data.h"
#include "game/hsfanim.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/minigame_seq.h"
@ -13,7 +14,6 @@
#include "game/wipe.h"
#include "ext_math.h"
#include "math.h"
#include "REL/m416Dll.h"

4
src/REL/m416Dll/map.c
View file

@ -5,15 +5,11 @@
#include "game/hsfanim.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/sprite.h"
#include "game/wipe.h"
#include "ext_math.h"
#include "math.h"
#include "REL/m416Dll.h"

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

@ -1,11 +1,14 @@
#include "ext_math.h"
#include "game/audio.h"
#include "game/chrman.h"
#include "game/hsfdraw.h"
#include "game/minigame_seq.h"
#include "game/objsub.h"
#include "game/wipe.h"
#include "REL/m417Dll.h"
typedef struct UnkM417Struct {
/* 0x00 */ u32 unk_00;
/* 0x04 */ u32 unk_04;
@ -109,9 +112,9 @@ void fn_1_4D8(omObjData *object)
{
UnkM417Struct *var_r31;
object->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x68, 268435456);
object->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(UnkM417Struct), 268435456);
var_r31 = object->data;
memset(var_r31, 0, 0x68);
memset(var_r31, 0, sizeof(UnkM417Struct));
var_r31->unk_00 = 0;
var_r31->unk_04 = 0;
var_r31->unk_0C = 0;

6
src/REL/m417Dll/player.c
View file

@ -4,13 +4,15 @@
#include "game/gamework_data.h"
#include "game/hsfdraw.h"
#include "game/hsfmotion.h"
#include "game/minigame_seq.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/wipe.h"
#include "REL/m417Dll.h"
#ifndef __MWERKS__
#include "game/frand.h"
#endif
typedef struct UnkM417Struct8 {
/* 0x00 */ u16 unk_00;
/* 0x04 */ float unk_04;

18
src/REL/m417Dll/water.c
View file

@ -6,6 +6,10 @@
#include "REL/m417Dll.h"
#ifndef __MWERKS__
#include "game/frand.h"
#endif
typedef struct UnkM417Struct3 {
/* 0x00 */ s16 unk_00;
/* 0x02 */ char unk02[4];
@ -265,12 +269,10 @@ void fn_1_3D54(omObjData *object) { }
void fn_1_3D58(omObjData *object)
{
Vec spC;
float sp8;
float var_f31;
float var_f29;
float var_f28;
float var_f27;
s32 var_r31;
s32 var_r30;
@ -752,9 +754,6 @@ void fn_1_604C(ModelData *arg0, Mtx arg1)
Mtx sp38;
GXTexObj sp18;
GXColor *var_r30;
GXColor *var_r29;
GXColor sp14 = { 0xD8, 0xE2, 0xE5, 0x4C };
GXColor sp10 = { 0xE0, 0xD8, 0xF4, 0x40 };
DCStoreRangeNoSync(&sp14, 4);
@ -1004,14 +1003,7 @@ void fn_1_6D64(s32 arg0, u32 arg1, float arg8, float arg9, float argA)
void fn_1_7510(float arg8, float arg9, float argA, float argB)
{
float var_f31;
float var_f30;
float var_f28;
s32 var_r31;
s32 var_r30;
var_f31 = 180.0 + (atan2d(arg8, argA));
float var_f31 = 180.0 + (atan2d(arg8, argA));
if (var_f31 >= 360.0f) {
var_f31 -= 360.0f;
}

60
src/REL/m418Dll/main.c
View file

@ -1,5 +1,6 @@
#include "ext_math.h"
#include "game/chrman.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/minigame_seq.h"
#include "game/objsub.h"
@ -9,6 +10,12 @@
#include "REL/m418Dll.h"
#ifndef __MWERKS__
s32 rand8(void);
#include "game/audio.h"
#endif
// types
typedef struct M418DllUnkStruct2 {
omObjData *unk0;
@ -432,7 +439,7 @@ void fn_1_E74(omObjData *object)
}
if (object->work[1] != 0) {
const char *sp8[4] = { "doukasen-null_B", "doukasen-null_A", "doukasen-null_X", "doukasen-null_Y" };
Hu3DModelObjMtxGet(object->model[3], sp8[object->work[0]], sp18);
Hu3DModelObjMtxGet(object->model[3], (char*)sp8[object->work[0]], sp18);
Hu3DModelPosSet(object->model[4], sp18[0][3], sp18[1][3], sp18[2][3]);
}
temp_r27 = &lbl_1_bss_170[object->work[0]];
@ -494,7 +501,6 @@ s32 fn_1_18FC(omObjData *object, Vec arg1, f32 arg8, f32 arg9)
f32 var_f30;
f32 var_f27;
f32 var_f26;
f32 var_f24;
f32 var_f20;
var_r28 = 0;
@ -806,7 +812,6 @@ void fn_1_3240(omObjData *object)
Vec sp8;
M418DllUnkStruct3 *temp_r28;
ModelData *temp_r30;
M418DllWorkStruct *var_r29;
temp_r30 = &Hu3DData[object->model[11]];
temp_r28 = &lbl_1_bss_26C[object->work[0]];
@ -858,7 +863,6 @@ void fn_1_3444(omObjData *object, Vec arg1, f32 arg8, f32 arg9)
f32 temp_f28;
f32 var_f24;
f32 var_f23;
f32 var_f22;
s32 var_r27;
s32 var_r29;
@ -961,17 +965,14 @@ void fn_1_3444(omObjData *object, Vec arg1, f32 arg8, f32 arg9)
void fn_1_3EB0(omObjData *object, Vec arg1, f32 arg8, f32 arg9)
{
M418DllUnkStruct3 *temp_r30;
s32 sp10;
f32 var_f31;
f32 var_f30;
f32 var_f27;
f32 var_f26;
f32 var_f24;
f32 var_f20;
sp10 = 0;
temp_r30 = &lbl_1_bss_26C[object->work[0]];
s32 sp10 = 0;
M418DllUnkStruct3 *temp_r30 = &lbl_1_bss_26C[object->work[0]];
var_f31 = arg1.x - object->trans.x;
var_f30 = object->trans.z - arg1.z;
var_f26 = 90.0 + atan2d(var_f30, var_f31);
@ -1132,16 +1133,10 @@ void fn_1_4C84(omObjData *object)
Mtx sp14;
Vec sp8;
f32 var_f31;
M418DllUnkStruct3 *temp_r26;
M418DllWorkStruct *var_r27;
M418DllUnkStruct3 *temp_r30;
ModelData *temp_r28;
ModelData *temp_r29;
s32 temp_r0;
u32 temp_r3;
temp_r30 = &lbl_1_bss_26C[object->work[0]];
M418DllUnkStruct3 *temp_r30 = &lbl_1_bss_26C[object->work[0]];
if (temp_r30->unk8 == 0) {
ModelData *temp_r29;
var_f31 = (0.5f * temp_r30->unk3C) + ((CRot.x / 90.0f) * (0.5f * temp_r30->unk3C));
temp_r29 = &Hu3DData[object->model[12]];
if ((temp_r30->unk14 == 7) || (temp_r30->unk14 == 5)) {
@ -1261,11 +1256,9 @@ void fn_1_56AC(s32 arg0)
void fn_1_5768(s32 arg0)
{
s32 var_r31;
M418DllUnkStruct4 *var_r30;
M418DllUnkStruct *var_r26;
for (var_r31 = 0; var_r31 < 3; var_r31++) {
var_r30 = &lbl_1_bss_170[var_r31];
M418DllUnkStruct4 *var_r30 = &lbl_1_bss_170[var_r31];
var_r30->unkC = 0;
}
@ -1275,9 +1268,8 @@ void fn_1_5768(s32 arg0)
s32 fn_1_57E4(s32 arg0)
{
M418DllUnkStruct4 *temp_r31;
M418DllUnkStruct *var_r25;
s32 var_r29;
s32 var_r30;
s32 var_r29;
if (fn_1_B0C8(&lbl_1_bss_50, 0) >= 0x3C) {
for (var_r30 = 0; var_r30 < 3; var_r30++) {
@ -1359,7 +1351,6 @@ s32 fn_1_5A6C(s32 arg0)
s32 var_r26;
omObjData *temp_r25;
s32 var_r24;
M418DllUnkStruct *temp_r20;
temp_r27 = &lbl_1_bss_3EC;
for (var_r31 = 0; var_r31 < 3; var_r31++) {
@ -1651,7 +1642,6 @@ void fn_1_6808(s32 arg0)
M418DllUnkStruct6 *var_r30 = &lbl_1_bss_3EC;
M418DllUnkStruct3 *var_r29;
M418DllUnkStruct4 *var_r28;
M418DllUnkStruct *var_r23;
HuAudAUXVolSet(0x40, 0x40);
@ -1678,12 +1668,10 @@ s32 fn_1_6914(s32 arg0)
{
Vec sp14;
M418DllUnkStruct3 *temp_r31;
M418DllUnkStruct3 *temp_r30;
s32 var_r29;
s32 temp_r27;
M418DllUnkStruct6 *var_r26;
M418DllUnkStruct4 *var_r25;
M418DllUnkStruct *var_r18;
var_r26 = &lbl_1_bss_3EC;
@ -2006,7 +1994,6 @@ s32 fn_1_7B68(s32 arg0)
M418DllUnkStruct4 *temp_r28;
s32 var_r27;
s32 var_r26;
M418DllUnkStruct *temp_r21;
var_r26 = -1;
temp_r30 = &lbl_1_bss_3EC;
@ -2251,7 +2238,6 @@ void fn_1_8548(void)
void fn_1_8668(void)
{
M418DllUnkStruct sp8;
f32 temp_f1;
M418DllUnkStruct *var_r31 = &lbl_1_bss_1F4;
@ -2312,7 +2298,6 @@ s32 fn_1_88B4(s32 arg0)
s32 var_r29;
M418DllUnkStruct3 *var_r28;
M418DllUnkStruct3 *var_r27;
M418DllUnkStruct *var_r23;
var_r29 = 5;
var_r30 = &lbl_1_bss_3EC;
@ -2426,10 +2411,8 @@ void fn_1_8C84(s32 arg0)
s32 var_r30;
M418DllUnkStruct6 *temp_r29;
M418DllUnkStruct3 *temp_r28;
s32 var_r27;
s32 temp_r0;
var_r27 = 0;
s32 var_r27 = 0;
temp_r29 = &lbl_1_bss_3EC;
for (var_r30 = 0; var_r30 < 3; var_r30++) {
temp_r31 = &lbl_1_bss_26C[temp_r29->unk4[var_r30]];
@ -2452,17 +2435,12 @@ Vec lbl_1_data_3FC[6] = { { -200.0f, 0.0f, -450.0f }, { 0.0f, 0.0f, -400.0f }, {
s32 fn_1_8D70(s32 arg0)
{
s32 sp10;
s32 spC;
s32 sp8;
M418DllUnkStruct3 *temp_r31;
M418DllUnkStruct6 *temp_r30;
s32 var_r29;
M418DllUnkStruct3 *temp_r28;
M418DllUnkStruct3 *temp_r27;
omObjData *var_r26;
s32 temp_r3;
void *temp_r4;
temp_r30 = &lbl_1_bss_3EC;
@ -2493,9 +2471,7 @@ s32 fn_1_8D70(s32 arg0)
if (fn_1_B0C8(&lbl_1_bss_20, 1) != 0) {
return fn_1_AF38(&lbl_1_bss_20);
}
else {
return 0;
}
return 0;
}
void fn_1_8F74(s32 arg0)
@ -2669,10 +2645,8 @@ void fn_1_958C(void)
M418DllUnkStruct4 *temp_r27;
M418DllUnkStruct4 *temp_r26;
M418DllUnkStruct3 *temp_r25;
s32 temp_r0;
s32 var_r24;
var_r24 = 0;
s32 var_r24 = 0;
temp_r28 = &lbl_1_bss_1E0;
for (var_r30 = 1; var_r30 < 4; var_r30++) {
fn_1_ABC4(temp_r28->unk0, var_r30, var_r30, 0, 2);

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

@ -3,6 +3,7 @@
#include "game/data.h"
#include "game/frand.h"
#include "game/gamework_data.h"
#include "game/hsfex.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/minigame_seq.h"
@ -13,7 +14,6 @@
#include "game/sprite.h"
#include "game/wipe.h"
#include "dolphin.h"
#include "ext_math.h"
typedef struct {
@ -220,7 +220,7 @@ void fn_1_57C(s16 arg0)
temp_r30 = &Hu3DData[lbl_1_bss_5BE];
sp14 = temp_r30->pos;
sp14.y += 50.0f;
Hu3D3Dto2D(&sp14, 1, &sp8.x);
Hu3D3Dto2D(&sp14, 1, &sp8);
var_r31 = sp8.x - 96.0f;
var_r31 &= 0xFFF8;
sp8.x = var_r31;
@ -552,7 +552,6 @@ void fn_1_F58(void)
float fn_1_1F84(float arg0, float arg1)
{
float var_f31;
float var_f30;
if (arg0 > 600.0f - arg1) {
var_f31 = 600.0f + 200.0f * ((800.0f - (arg0 + arg1)) / 200.0f);

3
src/REL/m420dll/camera.c
View file

@ -1,12 +1,9 @@
#include "ext_math.h"
#include "game/audio.h"
#include "game/flag.h"
#include "game/hsfman.h"
#include "game/minigame_seq.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/wipe.h"
#include "REL/m420dll.h"

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

@ -1,10 +1,9 @@
#include "ext_math.h"
#include "game/flag.h"
#include "game/frand.h"
#include "game/hsfman.h"
#include "game/minigame_seq.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/wipe.h"
#include "REL/m420dll.h"

4
src/REL/m420dll/map.c
View file

@ -4,6 +4,10 @@
#include "REL/m420dll.h"
#ifndef __MWERKS__
#include "game/audio.h"
#endif
typedef struct M420DllUnkMapStruct2 {
/* 0x00 */ struct {
s8 unk_00_field0 : 1;

42
src/REL/m420dll/player.c
View file

@ -3,11 +3,11 @@
#include "game/chrman.h"
#include "game/esprite.h"
#include "game/hsfdraw.h"
#include "game/hsfex.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/wipe.h"
#include "REL/m420dll.h"
@ -386,10 +386,6 @@ void fn_1_22CC(M420DllPlayerStruct *arg0)
M420DllUnkStruct2 *var_r30;
s32 var_r29;
s32 var_r28;
s32 var_r26;
s32 var_r23;
s32 var_r21;
s32 var_r18;
var_r30 = &lbl_1_data_50[arg0->unk_08];
fn_1_3098(arg0);
@ -469,27 +465,11 @@ void fn_1_22CC(M420DllPlayerStruct *arg0)
void fn_1_276C(M420DllPlayerStruct *arg0)
{
s32 sp8[4];
float var_f31;
float var_f30;
s32 var_r30;
M420DllUnkStruct2 *var_r29;
s32 var_r28;
s32 var_r27;
s32 var_r26;
s32 var_r25;
s32 var_r24;
s32 var_r23;
s32 var_r22;
s32 var_r21;
s32 var_r20;
s32 var_r19;
s32 var_r18;
s32 var_r17;
var_r29 = &lbl_1_data_50[arg0->unk_08];
M420DllUnkStruct2 *var_r29 = &lbl_1_data_50[arg0->unk_08];
if (arg0->unk_4C == 1) {
HuAudFXPlay(0x5F1);
fn_1_669C(1);
@ -628,14 +608,6 @@ void fn_1_2D7C(M420DllPlayerStruct *arg0)
void fn_1_2EA8(M420DllPlayerStruct *arg0)
{
s16 var_r30;
s32 var_r29;
s32 var_r28;
s32 var_r27;
s32 var_r26;
s32 var_r25;
s32 var_r24;
s32 var_r23;
s32 var_r22;
fn_1_326C(arg0);
CharModelMotionShiftSet(arg0->unk_0A, arg0->unk_AE[3], 0.0f, 1.0f, 0);
@ -1012,22 +984,12 @@ void fn_1_4294(M420DllPlayerStruct *arg0)
void fn_1_4574(M420DllPlayerStruct *arg0)
{
float var_f31;
M420DllPlayerStruct *var_r31;
s32 var_r29;
s32 var_r28;
CharModelMotionShiftSet(arg0->unk_0A, arg0->unk_AE[1], 0.0f, 4.0f, 0);
fn_1_2260(arg0);
}
void fn_1_476C(M420DllPlayerStruct *arg0)
{
float var_f31;
M420DllPlayerStruct *var_r31;
s32 var_r29;
s32 var_r28;
CharModelMotionShiftSet(arg0->unk_0A, arg0->unk_AE[2], 0.0f, 4.0f, 0);
fn_1_2260(arg0);
}

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

@ -834,8 +834,6 @@ s32 fn_1_3FF8(void)
void fn_1_4030(Vec *sp8, Vec *var_r31)
{
Vec sp10;
float var_f30;
float var_f29;
VECSubtract(var_r31, sp8, &sp10);
Center = *var_r31;

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

@ -10,13 +10,16 @@
#include "game/hsfmotion.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/sprite.h"
#include "game/wipe.h"
#include "dolphin.h"
#include "ext_math.h"
#ifndef __MWERKS__
s32 rand8(void);
#endif
typedef struct {
/* 0x00 */ s32 unk00;

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

@ -9,14 +9,19 @@
#include "game/memory.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/process.h"
#include "game/sprite.h"
#include "game/wipe.h"
#include "dolphin.h"
#include "ext_math.h"
#ifndef __MWERKS__
#include "game/frand.h"
#endif
#define frand7() (frand() & 0x7F)
SHARED_SYM extern u32 GlobalCounter;
@ -4508,7 +4513,6 @@ s32 fn_1_F574(Vec arg0, float arg1, s32 arg2)
ModelData *var_r28;
StructM423_0B *var_r26;
StructM423_0A *var_r31;
s32 var_r27;
s32 i;
var_r29 = lbl_1_bss_9C;

4
src/REL/m424Dll/ball.c
View file

@ -4,10 +4,12 @@
#include "game/audio.h"
#include "game/chrman.h"
#include "game/data.h"
#include "game/frand.h"
#include "game/gamework_data.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/memory.h"
#include "game/pad.h"
#include "game/sprite.h"
#include "string.h"
@ -1084,7 +1086,7 @@ void *fn_1_6078(s32 arg0)
if (var_r31 == 0x20) {
return NULL;
}
lbl_1_bss_5BC[var_r31] = HuMemDirectMallocNum(HEAP_SYSTEM, arg0, 0x10000000);
lbl_1_bss_5BC[var_r31] = HuMemDirectMallocNum(HEAP_SYSTEM, arg0, MEMORY_DEFAULT_NUM);
return lbl_1_bss_5BC[var_r31];
}

13
src/REL/m424Dll/claw.c
View file

@ -1,13 +1,20 @@
#include "REL/m424Dll.h"
#include "math.h"
#include "ext_math.h"
#include "game/audio.h"
#include "game/chrman.h"
#include "game/EnvelopeExec.h"
#include "game/gamework_data.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/memory.h"
#include "game/pad.h"
#include "math.h"
#ifndef __MWERKS__
#include "game/frand.h"
#endif
// STRUCT
typedef struct _M424DllClawStruct {
@ -146,8 +153,8 @@ void fn_1_94D0(omObjData *arg0)
s32 var_r29;
M424DllClawStruct *var_r31;
var_r31 = arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x1B0, 0x10000000);
memset(var_r31, 0, 0x1B0);
var_r31 = arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(M424DllClawStruct), MEMORY_DEFAULT_NUM);
memset(var_r31, 0, sizeof(M424DllClawStruct));
var_r31->unk0 = lbl_1_bss_24[3];
var_r31->unk2 = GWPlayerCfg[var_r31->unk0].character;
var_r31->unk4 = GWPlayerCfg[var_r31->unk0].pad_idx;

4
src/REL/m424Dll/map.c
View file

@ -55,8 +55,8 @@ void fn_1_1BB8(omObjData *arg0)
{
M424DllMapStruct *var_r30;
var_r30 = arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x54, 0x10000000);
memset(var_r30, 0, 0x54);
var_r30 = arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(M424DllMapStruct), MEMORY_DEFAULT_NUM);
memset(var_r30, 0, sizeof(M424DllMapStruct));
var_r30->unk0 = 0.0f;
var_r30->unk4 = 0.0f;
var_r30->unk38 = -1;

18
src/REL/m425Dll/main.c
View file

@ -5,7 +5,6 @@
#include "ext_math.h"
#include "game/audio.h"
#include "game/chrman.h"
#include "game/esprite.h"
#include "game/flag.h"
#include "game/frand.h"
#include "game/gamework_data.h"
@ -18,9 +17,7 @@
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "math.h"
#include "string.h"
@ -342,8 +339,6 @@ void fn_1_8E4(omObjData *object)
s32 var_r30;
s32 var_r29;
s32 var_r28;
s16 var_r26;
s16 var_r25;
switch (lbl_1_bss_648) {
case 4:
@ -1455,7 +1450,7 @@ void fn_1_5608(GXColor **arg0, s16 arg1, GXColor *arg2)
s32 var_r29;
s32 var_r28;
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * (4 * sizeof(GXColor)), 0x10000000);
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * (4 * sizeof(GXColor)), MEMORY_DEFAULT_NUM);
for (var_r29 = 0; var_r29 < arg1; var_r29++) {
for (var_r28 = 0; var_r28 < 4; var_r31++, arg2++, var_r28++) {
var_r31->r = arg2->r;
@ -1678,18 +1673,7 @@ float fn_1_66BC(float arg8, float arg9, float argA, float argB)
void fn_1_6734(float *arg0, float *arg1, float *arg2, float *arg3, float arg8)
{
float spC[3];
float sp8;
float var_f31;
float var_f30;
float var_f29;
float var_f28;
float var_f27;
float var_f26;
float var_f25;
float var_f24;
float var_f23;
float var_f22;
float var_f21;
s32 var_r31;
for (var_r31 = 0; var_r31 < 3; var_r31++) {

8
src/REL/m425Dll/thwomp.c
View file

@ -4,9 +4,6 @@
#include "ext_math.h"
#include "game/animdata.h"
#include "game/audio.h"
#include "game/chrman.h"
#include "game/esprite.h"
#include "game/flag.h"
#include "game/frand.h"
#include "game/gamework_data.h"
#include "game/hsfanim.h"
@ -14,14 +11,9 @@
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/memory.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "string.h"
#include "REL/m425Dll.h"

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

@ -13,6 +13,10 @@
#include "string.h"
#include "version.h"
#ifndef __MWERKS__
#include "game/frand.h"
#endif
typedef struct UnkM426Struct {
/* 0x00 */ s32 unk_00;
/* 0x04 */ omObjData *unk_04[2];
@ -799,7 +803,6 @@ void fn_1_16F8(omObjData *object)
float var_f26;
float var_f25;
float var_f24;
float var_f23;
float var_f22;
float var_f21;
@ -1311,8 +1314,6 @@ void fn_1_2F5C(omObjData *object, float *arg1, float *arg2, s32 *arg3)
s32 spC[2];
UnkM426Struct *sp8;
float var_f31;
UnkM426Struct2 *var_r31;
s32 var_r30;
s32 var_r29;
@ -3122,7 +3123,6 @@ void fn_1_88B4(ModelData *arg0, Mtx arg1)
{
float var_f31;
float var_f30;
float var_f28;
float var_f27;
float var_f26;

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

@ -2,6 +2,8 @@
#include "ext_math.h"
#include "game/audio.h"
#include "game/chrman.h"
#include "game/frand.h"
#include "game/gamework.h"
#include "game/gamework_data.h"
#include "game/hsfformat.h"
@ -541,7 +543,7 @@ void fn_1_1954(void) {
s32 var_r31;
M427DllStruct2* var_r30;
var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, 0xA4, 0x10000000);
var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(M427DllStruct2), MEMORY_DEFAULT_NUM);
lbl_1_bss_40 = var_r30;
var_r30->unk9C = 0;
var_r30->unkA0 = 0;
@ -736,7 +738,6 @@ void fn_1_21E8(s32 arg0, s32 arg1) {
void fn_1_232C(s32 arg0) {
M427DllStruct2* temp_r29;
f32 temp_f0;
s32 var_r31;
temp_r29 = lbl_1_bss_40;
@ -785,7 +786,6 @@ void fn_1_232C(s32 arg0) {
void fn_1_2518(s32 arg0) {
M427DllStruct2* temp_r29;
f32 temp_f0;
s32 var_r31;
temp_r29 = lbl_1_bss_40;

20
src/REL/m427Dll/map.c
View file

@ -388,9 +388,9 @@ void fn_1_32F4(Process *arg0)
lbl_1_bss_158.unk0 = 0;
lbl_1_bss_548 = omAddObjEx(arg0, 0x7F, 0, 0, -1, fn_1_6760);
lbl_1_bss_F0 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x10 * sizeof(M427DllMapStruct), MEMORY_DEFAULT_NUM);
lbl_1_bss_F0 = HuMemDirectMallocNum(HEAP_SYSTEM, 16 * sizeof(M427DllMapStruct), MEMORY_DEFAULT_NUM);
for (var_r31 = 0; var_r31 < 0x10; var_r31++) {
for (var_r31 = 0; var_r31 < 16; var_r31++) {
lbl_1_bss_F0[var_r31].unk2 = -1;
}
temp_r30 = HuSprAnimRead(HuDataReadNum(0x3A0017, MEMORY_DEFAULT_NUM));
@ -613,8 +613,8 @@ void fn_1_3E58(omObjData *arg0)
var_r29->unk48[0] = 0;
var_r29->unk4A = 0;
var_r29->unk4 = 0;
lbl_1_bss_E4 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x10 * sizeof(M427DllMapStruct5), MEMORY_DEFAULT_NUM);
for (var_r28 = 0; var_r28 < 0x10; var_r28++) {
lbl_1_bss_E4 = HuMemDirectMallocNum(HEAP_SYSTEM, 16 * sizeof(M427DllMapStruct5), MEMORY_DEFAULT_NUM);
for (var_r28 = 0; var_r28 < 16; var_r28++) {
lbl_1_bss_E4[var_r28].unk10 = -1.0f;
}
fn_1_510C(0, 0x32, 0x32);
@ -629,7 +629,6 @@ void fn_1_4218(omObjData *arg0)
M427DllMapStruct5 *var_r31;
s16 var_r30;
M427DllMapStruct4 *var_r29;
s32 temp_r28;
var_r29 = &lbl_1_bss_98;
var_r31 = &lbl_1_bss_E4[0];
@ -798,12 +797,6 @@ void fn_1_50A0(ModelData *arg0, Mtx arg1)
void fn_1_510C(s32 arg0, s16 arg1, s16 arg2)
{
s16 sp12;
s16 sp10;
s16 spE;
s16 spC;
s16 spA;
s16 sp8;
M427DllMapStruct4 *var_r31;
M427DllMapSubstruct5 *var_r30;
s16 var_r29;
@ -895,11 +888,9 @@ void fn_1_558C(M427DllMapStruct4 *arg0)
Vec *var_r29;
Vec *var_r28;
s16 var_r27;
M427DllMapStruct5 *var_r26;
Vec2f *var_r25;
s16 var_r24;
CameraData *var_r23;
s16 var_r22;
var_r23 = &Hu3DCamera[0];
if (lbl_1_data_F8 == -1.0f) {
@ -1112,7 +1103,6 @@ void fn_1_6760(omObjData *object)
s16 var_r26;
M427DllMapSubstruct3Sub *var_r25;
M427DllMapStruct3 *var_r24;
u16 var_r23;
var_r24 = &lbl_1_bss_158;
Hu3DFogSet(3500.0f, 20000.0f, 0, 0, 0);
@ -2058,7 +2048,6 @@ s16 fn_1_A1F4(s32 arg0, s16 arg1, s16 arg2, s16 arg3, float arg8, Vec *arg4, Vec
Vec2f *var_r26;
void *var_r25;
M427DllMapStruct3 *var_r22;
u16 var_r21;
s16 var_r19;
void *var_r18;
@ -2799,7 +2788,6 @@ M427DllMapSubstruct6 *fn_1_D4FC(s16 arg0, Vec *arg1, Vec *arg2, float arg8, GXCo
s16 fn_1_D63C(AnimData *arg0, s16 arg1, float arg8, s16 arg2, s16 arg3)
{
float temp_f0;
M427DllMapStruct7 *var_r31;
s16 var_r30;
Vec2f *var_r29;

33
src/REL/m427Dll/player.c
View file

@ -6,18 +6,15 @@
#include "ext_math.h"
#include "game/audio.h"
#include "game/chrman.h"
#include "game/gamework.h"
#include "game/gamework_data.h"
#include "game/hsfdraw.h"
#include "game/hsfformat.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/memory.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/wipe.h"
#include "string.h"
#ifndef __MWERKS__
@ -1460,26 +1457,6 @@ void fn_1_12580(omObjData *var_r24)
void fn_1_12B08(void)
{
Vec sp20;
float sp1C;
float sp18;
float sp14;
float sp10;
float spC;
float sp8;
float var_f31;
float var_f30;
float var_f29;
float var_f28;
float var_f27;
float var_f26;
float var_f25;
float var_f24;
float var_f23;
float var_f22;
float var_f21;
float var_f20;
float var_f19;
float var_f18;
M427DllBss590Struct *var_r31;
s32 var_r30;
M427DllBss57CStruct *var_r29;
@ -1593,10 +1570,10 @@ void fn_1_12B08(void)
lbl_1_bss_558 = lbl_1_data_260;
lbl_1_bss_554 = lbl_1_data_3BC;
lbl_1_bss_550 = lbl_1_bss_584;
var_r29 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x40 * sizeof(M427DllBss57CStruct), MEMORY_DEFAULT_NUM);
var_r29 = HuMemDirectMallocNum(HEAP_SYSTEM, 64 * sizeof(M427DllBss57CStruct), MEMORY_DEFAULT_NUM);
lbl_1_bss_57C = var_r29;
memset(lbl_1_bss_57C, 0, 0x40 * sizeof(M427DllBss57CStruct));
for (var_r30 = 0; var_r30 < 0x40; var_r30++, var_r29++) {
memset(lbl_1_bss_57C, 0, 64 * sizeof(M427DllBss57CStruct));
for (var_r30 = 0; var_r30 < 64; var_r30++, var_r29++) {
var_r29->unk_00 = var_r30;
var_r29->unk_04 = -1;
var_r29->unk_08 = -1;
@ -1849,9 +1826,6 @@ s32 fn_1_154BC(float arg8, float arg9, float argA)
s32 fn_1_155E0(float arg8, float arg9, float argA, float *arg0)
{
float var_f31;
float var_f30;
double var_f29;
double var_f28;
M427DllBss590Struct *var_r31;
s32 var_r30;
M427DllBss590Struct *var_r29;
@ -2138,7 +2112,6 @@ float fn_1_166AC(float arg8, float arg9, float argA)
{
float var_f31;
float var_f30;
float var_f26;
if (arg8 >= 360.0) {
arg8 -= 360.0;

3
src/REL/m428Dll/main.c
View file

@ -4,7 +4,6 @@
#include "game/audio.h"
#include "game/chrman.h"
#include "game/gamework_data.h"
#include "game/hsfanim.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
@ -12,9 +11,7 @@
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "string.h"

13
src/REL/m428Dll/map.c
View file

@ -1,23 +1,13 @@
#include "dolphin/gx/GXEnum.h"
#include "dolphin/gx/GXVert.h"
#include "ext_math.h"
#include "game/audio.h"
#include "game/chrman.h"
#include "game/gamework_data.h"
#include "game/hsfanim.h"
#include "game/hsfdraw.h"
#include "game/hsfformat.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/init.h"
#include "game/memory.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "string.h"
#include "REL/m428Dll.h"
@ -565,8 +555,6 @@ void fn_1_5CCC(HsfData *var_r31, HsfObject *var_r23)
void fn_1_6280(ModelData *arg1, ParticleData *particle, Mtx matrix)
{
s32 sp3C;
s32 sp38;
Vec sp8;
float var_f31;
float var_f30;
@ -1131,7 +1119,6 @@ void fn_1_939C(float *arg0, float (*arg1)[3], float (*arg2)[3], s32 var_r28)
float spD4[16];
float sp94[16];
Vec sp8;
s32 var_r31;
s32 var_r30;
s32 var_r27;

6
src/REL/m428Dll/player.c
View file

@ -9,15 +9,11 @@
#include "game/hsfload.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/init.h"
#include "game/memory.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "string.h"
#include "REL/m428Dll.h"
@ -973,8 +969,6 @@ void fn_1_BBD0(omObjData *object)
float var_f31;
float var_f30;
float var_f27;
float var_f26;
float var_f25;
float var_f24;
float var_f23;
float var_f22;

34
src/REL/m429Dll/main.c
View file

@ -1,28 +1,33 @@
#include "REL/executor.h"
#include "game/chrman.h"
#include "game/frand.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/wipe.h"
#include "game/gamework_data.h"
#include "game/mapspace.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/esprite.h"
#include "game/hsfanim.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/esprite.h"
#include "game/gamework.h"
#include "game/gamework_data.h"
#include "game/mapspace.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/sprite.h"
#include "game/wipe.h"
#include "ext_math.h"
#include "version.h"
#ifndef __MWERKS__
#include "game/audio.h"
#include "game/hsfex.h"
#endif
void HuSysVWaitSet(s16 vcount);
#undef ABS
#define ABS(x) ((0 > (x)) ? -(x) : (x))
@ -1501,8 +1506,6 @@ void fn_1_50AC(Work8F68 *arg0, omObjData *arg1)
void fn_1_54BC(Work8F68 *arg0, omObjData *arg1)
{
float temp_f31;
float temp_f30;
float temp_f29;
Vec sp14;
Vec sp8;
omObjData *temp_r29;
@ -1618,7 +1621,6 @@ void fn_1_595C(Work8F68 *arg0, Work8F68 *arg1)
s32 fn_1_5CDC(Work8F68 *arg0)
{
s32 temp_r30;
s32 temp_r29;
s32 temp_r28;
Work3284 *temp_r27;

9
src/REL/m430Dll/main.c
View file

@ -2,20 +2,15 @@
#include "game/audio.h"
#include "game/chrman.h"
#include "game/flag.h"
#include "game/frand.h"
#include "game/gamework_data.h"
#include "game/hsfanim.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/memory.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "string.h"
@ -499,10 +494,6 @@ float fn_1_4130(void)
void fn_1_41F0(Vec *arg0, Vec *arg1)
{
Vec sp10;
float var_f29;
float var_f28;
float var_f27;
float var_f26;
sp10.x = arg1->x - arg0->x;
sp10.y = arg1->y - arg0->y;

34
src/REL/m430Dll/player.c
View file

@ -11,14 +11,10 @@
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/memory.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "string.h"
#include "REL/m430Dll.h"
@ -785,11 +781,6 @@ void fn_1_D828(omObjData *var_r30)
float var_f25;
float var_f24;
float var_f23;
float var_f22;
float var_f21;
float var_f20;
float var_f19;
float var_f18;
M430PlayerWork *var_r31;
M430PlayerBss174Struct *var_r29;
s32 var_r28;
@ -1262,12 +1253,6 @@ s32 fn_1_F62C(omObjData *object)
void fn_1_F6A0(omObjData *object)
{
Vec sp38;
float sp30;
float sp28;
float sp20;
float sp18;
float sp10;
float sp8;
float var_f31;
float var_f30;
float var_f29;
@ -1275,13 +1260,6 @@ void fn_1_F6A0(omObjData *object)
float var_f27;
float var_f26;
float var_f25;
float var_f24;
float var_f23;
float var_f22;
float var_f21;
float var_f20;
float var_f19;
float var_f18;
M430PlayerWork *work;
s32 var_r29;
s32 var_r28;
@ -1655,9 +1633,9 @@ void fn_1_10B88(void)
M430PlayerBss16CStruct *var_r31;
s32 var_r30;
var_r31 = lbl_1_bss_16C = HuMemDirectMallocNum(HEAP_SYSTEM, 0x10 * sizeof(M430PlayerBss16CStruct), MEMORY_DEFAULT_NUM);
memset(var_r31, 0, 0x10 * sizeof(M430PlayerBss16CStruct));
for (var_r30 = 0; var_r30 < 0x10; var_r30++, var_r31++) {
var_r31 = lbl_1_bss_16C = HuMemDirectMallocNum(HEAP_SYSTEM, 16 * sizeof(M430PlayerBss16CStruct), MEMORY_DEFAULT_NUM);
memset(var_r31, 0, 16 * sizeof(M430PlayerBss16CStruct));
for (var_r30 = 0; var_r30 < 16; var_r30++, var_r31++) {
var_r31->unk_00 = var_r30;
if (var_r30 == 0) {
var_r31->unk_04 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x23));
@ -1832,9 +1810,9 @@ void fn_1_113AC(void)
M430PlayerBss168Struct *var_r31;
s32 var_r30;
var_r31 = lbl_1_bss_168 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x20 * sizeof(M430PlayerBss168Struct), MEMORY_DEFAULT_NUM);
memset(var_r31, 0, 0x20 * sizeof(M430PlayerBss168Struct));
for (var_r30 = 0; var_r30 < 0x20; var_r31++) {
var_r31 = lbl_1_bss_168 = HuMemDirectMallocNum(HEAP_SYSTEM, 32 * sizeof(M430PlayerBss168Struct), MEMORY_DEFAULT_NUM);
memset(var_r31, 0, 32 * sizeof(M430PlayerBss168Struct));
for (var_r30 = 0; var_r30 < 32; var_r31++) {
var_r31->unk_00 = var_r30;
if (var_r30 == 0) {
var_r31->unk_04 = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M430, 0x22));

11
src/REL/m430Dll/water.c
View file

@ -4,27 +4,19 @@
#include "ext_math.h"
#include "game/audio.h"
#include "game/chrman.h"
#include "game/flag.h"
#include "game/gamework_data.h"
#include "game/hsfanim.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/memory.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "string.h"
#include "REL/m430Dll.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#include "game/frand.h"
void GXSetTevIndWarp(GXTevStageID tev_stage, GXIndTexStageID ind_stage, GXBool signed_offsets, GXBool replace_mode, GXIndTexMtxID matrix_sel);
@ -733,7 +725,6 @@ void fn_1_732C(omObjData *object, M430DllUnkStruct2 *arg1)
Vec sp8;
float var_f31;
float var_f30;
float var_f29;
s32 var_r30;
s32 var_r29;
s32 var_r28;
@ -1509,8 +1500,6 @@ void fn_1_A3A8(ModelData *model, Mtx matrix)
Mtx sp18;
float var_f31;
float var_f30;
u8 *var_r30;
u8 *var_r29;
GXColor sp14 = { 0xFF, 0xA5, 0x59, 0xB2 };
GXColor sp10 = { 0x99, 0x72, 0x59, 0xB2 };

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

@ -17,6 +17,8 @@
#include "REL/m431Dll.h"
#include "version.h"
s32 rand8(void);
typedef struct bss_5C_struct {
s16 unk0[6];
s16 unkC[2];

7
src/REL/m431Dll/object.c
View file

@ -1,20 +1,19 @@
#include "game/audio.h"
#include "game/chrman.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/audio.h"
#include "game/gamework_data.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/sprite.h"
#include "game/wipe.h"
#include "REL/m431Dll.h"
#include "ext_math.h"
#include "version.h"
s32 rand8(void);
typedef struct bss_struct_62C {
u8 unk0;
float unk4;

40
src/REL/m432Dll/main.c
View file

@ -1,5 +1,4 @@
#include "REL/executor.h"
#include "dolphin/types.h"
#include "game/chrman.h"
#include "game/frand.h"
#include "game/memory.h"
@ -1358,8 +1357,6 @@ void fn_1_5848(UnkM432DllStruct *var_r28, UnkM432DllBss0SubStruct *var_r31)
s32 sp20;
float var_f31;
float var_f30;
float var_f29;
float var_f28;
s32 var_r30;
s32 var_r27;
@ -2246,8 +2243,6 @@ void fn_1_B234(void)
{
UnkM432DllStruct *var_r31;
s32 var_r30;
u32 var_r29;
u32 var_r28;
if (HuPadBtn[0] & 2) {
lbl_1_bss_57C = 300 * REFRESH_RATE;
@ -2303,12 +2298,7 @@ void fn_1_B518(omObjData *object)
void fn_1_B7E4(omObjData *object)
{
UnkM432DllStruct2 *var_r30;
UnkBss5D0Struct *var_r29;
UnkBss5D0Struct *var_r28;
UnkBss5D0Struct *var_r27;
s16 var_r26;
s16 var_r25;
s16 var_r24;
var_r26 = fn_1_AC(0x1000);
if (var_r26 < 0) {
@ -2338,7 +2328,7 @@ void fn_1_B974(Vec *arg0, float arg8, float arg9)
if (lbl_1_bss_402 < 0xF0) {
lbl_1_bss_402++;
var_r30 = omAddObjEx(lbl_1_bss_5B4, 0x67, 1, 0, 3, fn_1_B7E4);
var_r30->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(UnkM432DllStruct2), 0x10000000);
var_r30->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(UnkM432DllStruct2), MEMORY_DEFAULT_NUM);
var_r31 = var_r30->data;
var_r31->unk_00 = *arg0;
var_r31->unk_00.x += 30.0f * arg9;
@ -2483,17 +2473,9 @@ void fn_1_C33C(UnkM432DllStruct *arg0)
void fn_1_C724(UnkM432DllStruct *var_r31, omObjData *var_r25, omObjData *var_r24)
{
Vec spC;
float var_f25;
UnkBss0Struct *var_r30;
UnkM432DllStruct *var_r29;
s32 var_r28;
void *var_r27;
s32 var_r26;
float var_f19;
var_r30 = &lbl_1_bss_0[var_r31->unk_184 >> 1];
UnkBss0Struct *var_r30 = &lbl_1_bss_0[var_r31->unk_184 >> 1];
fn_1_BF9C(var_r31);
if (fn_1_BF08(var_r31) == 0x7D4) {
var_r30->unk_1D4 += 1.0f - (2.0f * (var_r31->unk_14C / REFRESH_RATE));
@ -3057,11 +3039,7 @@ void fn_1_10CCC(omObjData *object)
UnkM432DllStruct *var_r31;
s32 var_r29;
s32 var_r28;
s32 var_r27;
UnkM432DllBss0SubStruct *var_r26;
s32 var_r24;
s32 var_r23;
var_r31 = object->data;
var_r26 = lbl_1_bss_0[var_r31->unk_184 >> 1].unk_10[var_r31->unk_184 & 1];
@ -3265,13 +3243,7 @@ void fn_1_128C8(omObjData *object)
s32 var_r31;
UnkM432DllStruct *var_r30;
UnkM432DllStruct *var_r29;
s32 var_r28;
s32 var_r27;
void *var_r26;
void *var_r25;
omObjData *var_r24;
void *var_r23;
void *var_r22;
if (lbl_1_bss_41C->work[0] >= 0x3EB) {
for (var_r31 = 0; var_r31 < 2; var_r31++) {
@ -3375,8 +3347,6 @@ void fn_1_131A8(omObjData *var_r28)
float var_f30;
float var_f27;
float var_f26;
float var_f22;
float var_f21;
UnkBss0Struct *var_r29;
s32 var_r26;
@ -3622,7 +3592,6 @@ void fn_1_131A8(omObjData *var_r28)
void fn_1_15320(omObjData *object)
{
s32 var_r31;
object->work[0] = 0x3E8;
fn_1_B4C(80.0f, DATA_MAKE_NUM(DATADIR_M432, 0x1E));
fn_1_9EC();
@ -3633,17 +3602,12 @@ void fn_1_15320(omObjData *object)
void ObjectSetup(void)
{
Vec sp8;
float var_f31;
float var_f30;
float var_f29;
UnkBss0Struct *var_r31;
s32 var_r30;
float *var_r29;
UnkM432DllStruct *var_r28;
omObjData *var_r27;
s32 var_r26;
s32 var_r24;
s32 var_r23;
s32 var_r22;
s32 var_r21;

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

@ -3,15 +3,11 @@
#include "game/chrman.h"
#include "game/gamework_data.h"
#include "game/hsfanim.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "string.h"

8
src/REL/m433Dll/map.c
View file

@ -2,23 +2,15 @@
#include "ext_math.h"
#include "game/audio.h"
#include "game/chrman.h"
#include "game/flag.h"
#include "game/frand.h"
#include "game/gamework_data.h"
#include "game/hsfanim.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/memory.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "string.h"
#include "REL/m433Dll.h"

7
src/REL/m433Dll/player.c
View file

@ -3,21 +3,16 @@
#include "ext_math.h"
#include "game/audio.h"
#include "game/chrman.h"
#include "game/flag.h"
#include "game/gamework_data.h"
#include "game/hsfanim.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/memory.h"
#include "game/minigame_seq.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/printfunc.h"
#include "game/sprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "string.h"
#include "REL/m433Dll.h"
@ -3456,9 +3451,7 @@ s32 fn_1_10D24(Vec *sp8)
Vec sp18;
Vec spC;
float var_f31;
float var_f30;
M433PlayerWork2 *var_r31;
M433PlayerWork2 *var_r30;
var_r31 = lbl_1_bss_7CC->data;
fn_1_10D24_inline(&spC);

8
src/REL/m434Dll/fish.c
View file

@ -3,16 +3,14 @@
#include "game/hsfmotion.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/wipe.h"
#include "REL/m434Dll.h"
#include "ext_math.h"
#include "game/gamework_data.h"
#include "game/minigame_seq.h"
#include "math.h"
#include "version.h"
#ifndef __MWERKS__
#include "game/frand.h"
#endif
typedef struct bss_7480_struct {
s32 unk0;

5
src/REL/m434Dll/map.c
View file

@ -3,17 +3,12 @@
#include "game/object.h"
#include "game/objsub.h"
#include "game/audio.h"
#include "game/frand.h"
#include "game/hsfmotion.h"
#include "game/sprite.h"
#include "game/wipe.h"
#include "REL/m434Dll.h"
#include "ext_math.h"
#include "game/gamework_data.h"
#include "game/minigame_seq.h"
#include "math.h"
#include "version.h"
typedef struct bss_2468_data {

13
src/REL/m434Dll/player.c
View file

@ -3,19 +3,18 @@
#include "game/hsfman.h"
#include "game/hsfdraw.h"
#include "game/hsfmotion.h"
#include "game/gamework_data.h"
#include "game/object.h"
#include "game/objsub.h"
#include "game/pad.h"
#include "game/wipe.h"
#include "REL/m434Dll.h"
#include "ext_math.h"
#include "game/gamework_data.h"
#include "game/minigame_seq.h"
#include "math.h"
#include "version.h"
#include "REL/m434Dll.h"
#ifndef __MWERKS__
#include "game/frand.h"
#endif
typedef struct data_224_struct {
u16 unk0;

7
src/REL/m435Dll/main.c
View file

@ -4,6 +4,8 @@
#include "game/esprite.h"
#include "game/gamework.h"
#include "game/gamework_data.h"
#include "game/hsfdraw.h"
#include "game/hsfex.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/minigame_seq.h"
@ -17,6 +19,11 @@
#include "ext_math.h"
s32 rand8(void);
#ifndef __MWERKS__
#include "game/audio.h"
#endif
typedef struct {
/* 0x00 */ omObjData* unk00;
/* 0x04 */ s32 unk04;

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

@ -1,6 +1,7 @@
#include "REL/m436Dll.h"
#include "game/chrman.h"
#include "game/data.h"
#include "game/gamework.h"
#include "game/gamework_data.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
@ -16,6 +17,11 @@
#include "ext_math.h"
#include "version.h"
s32 rand8(void);
#ifndef __MWERKS__
#include "game/audio.h"
#endif
typedef struct {
/* 0x00 */ omObjData *unk00;
/* 0x04 */ s32 unk04;

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

@ -15,11 +15,15 @@
#include "game/window.h"
#include "game/wipe.h"
#include "dolphin.h"
#include "math.h"
#include "string.h"
#include "version.h"
s32 rand8(void);
#ifndef __MWERKS__
#include "game/audio.h"
#endif
typedef struct {
/* 0x000 */ omObjData *unk00;
/* 0x004 */ s32 unk04;

35
src/REL/m438Dll/fire.c
View file

@ -1,6 +1,7 @@
#include "REL/m438Dll.h"
#include "game/hsfdraw.h"
#include "game/memory.h"
#define HUSPR_USE_OLD_DEFS
#include "game/sprite.h"
@ -25,10 +26,10 @@ void fn_1_E658(s16 arg0, s16 arg1)
lbl_1_bss_DE4.unk_34 = Hu3DHookFuncCreate(fn_1_F538);
Hu3DModelLayerSet(lbl_1_bss_DE4.unk_34, 6);
lbl_1_bss_DE4.unk_30 = arg0;
var_r29 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(M438UnkStruct2), 0x10000000);
var_r29 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(M438UnkStruct2), MEMORY_DEFAULT_NUM);
lbl_1_bss_DE4.unk_40 = var_r29;
lbl_1_bss_DE4.unk_32 = arg1;
var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(M438UnkStruct3), 0x10000000);
var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(M438UnkStruct3), MEMORY_DEFAULT_NUM);
lbl_1_bss_DE4.unk_3C = var_r30;
for (var_r31 = 0; var_r31 < arg0; var_r31++, var_r29++) {
@ -335,7 +336,7 @@ void fn_1_F6C8(M438FireStruct **arg0, s16 arg1, f32 arg8, f32 arg9)
s32 var_r30;
M438FireStruct *var_r31;
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(M438FireStruct), 0x10000000);
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(M438FireStruct), MEMORY_DEFAULT_NUM);
for (var_r30 = 0; var_r30 < arg1; var_r31++, var_r30++) {
var_r31->unk0.x = (-0.5f * arg8);
@ -359,7 +360,7 @@ void fn_1_F84C(M438FireStruct **arg0, s16 arg1, Vec *arg2)
s32 var_r29;
s32 var_r28;
var_r31 = (Vec *)*arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(M438FireStruct), 0x10000000);
var_r31 = (Vec *)*arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(M438FireStruct), MEMORY_DEFAULT_NUM);
for (var_r29 = 0; var_r29 < arg1; var_r29++) {
for (var_r28 = 0; var_r28 < 4; var_r31++, arg2++, var_r28++) {
@ -376,7 +377,7 @@ void fn_1_F8EC(M438FireStruct2 **arg0, s16 arg1, GXColor *arg2)
s32 var_r29;
s32 var_r28;
var_r31 = (GXColor *)*arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(M438FireStruct2), 0x10000000U);
var_r31 = (GXColor *)*arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(M438FireStruct2), MEMORY_DEFAULT_NUM);
for (var_r29 = 0; var_r29 < arg1; var_r29++) {
for (var_r28 = 0; var_r28 < 4; var_r31++, arg2++, var_r28++) {
@ -393,7 +394,7 @@ void fn_1_F994(Vec **arg0, s16 arg1, Vec *arg2)
s32 var_r29;
Vec *var_r31;
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(Vec), 0x10000000);
var_r31 = *arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(Vec), MEMORY_DEFAULT_NUM);
for (var_r29 = 0; var_r29 < arg1; var_r31++, arg2++, var_r29++) {
var_r31->x = arg2->x;
@ -408,7 +409,7 @@ void fn_1_FA20(M438FireStruct3 **arg0, s16 arg1, HsfVector2f *arg2)
s32 var_r29;
s32 var_r28;
var_r31 = (HsfVector2f *)*arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(M438FireStruct3), 0x10000000);
var_r31 = (HsfVector2f *)*arg0 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(M438FireStruct3), MEMORY_DEFAULT_NUM);
for (var_r29 = 0; var_r29 < arg1; var_r29++) {
for (var_r28 = 0; var_r28 < 4; var_r31++, arg2++, var_r28++) {
@ -595,15 +596,15 @@ s16 fn_1_10258(u8 arg0, u8 arg1)
var_r31->unk_30 = NULL;
var_r31->unk_02 = arg0;
var_r31->unk_04 = arg1;
var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * 0x98, MEMORY_DEFAULT_NUM);
var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(M438UnkStruct), MEMORY_DEFAULT_NUM);
var_r31->unk_3C = var_r30;
var_r31->unk_34 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * 2, MEMORY_DEFAULT_NUM);
var_r31->unk_34 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(s16), MEMORY_DEFAULT_NUM);
var_r31->unk_48 = 0;
var_r31->unk_4C = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 << 8, MEMORY_DEFAULT_NUM);
var_r31->unk_50 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * 0x30, MEMORY_DEFAULT_NUM);
var_r31->unk_54 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * 0x10, MEMORY_DEFAULT_NUM);
var_r31->unk_58 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * 0xC, MEMORY_DEFAULT_NUM);
var_r31->unk_5C = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * (arg0 * 0x30), MEMORY_DEFAULT_NUM);
var_r31->unk_50 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * (4 * sizeof(Vec)), MEMORY_DEFAULT_NUM);
var_r31->unk_54 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * (4 * sizeof(GXColor)), MEMORY_DEFAULT_NUM);
var_r31->unk_58 = HuMemDirectMallocNum(HEAP_SYSTEM, arg0 * sizeof(Vec), MEMORY_DEFAULT_NUM);
var_r31->unk_5C = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * (arg0 * sizeof(M438UnkSubStruct)), MEMORY_DEFAULT_NUM);
DCFlushRangeNoSync(var_r31->unk_4C, arg0 << 8);
var_r31->unk_0C.x = var_r31->unk_0C.y = var_r31->unk_0C.z = 0.0f;
var_r31->unk_18.x = var_r31->unk_18.y = var_r31->unk_18.z = 0.0f;
@ -657,7 +658,7 @@ s16 fn_1_10258(u8 arg0, u8 arg1)
var_r31->unk_48 += var_r30->unk_3C;
}
temp_r25 = var_r31->unk_4C;
var_r31->unk_4C = HuMemDirectMallocNum(HEAP_SYSTEM, var_r31->unk_48, 0x10000000);
var_r31->unk_4C = HuMemDirectMallocNum(HEAP_SYSTEM, var_r31->unk_48, MEMORY_DEFAULT_NUM);
memcpy(var_r31->unk_4C, temp_r25, var_r31->unk_48);
HuMemDirectFree(temp_r25);
DCFlushRangeNoSync(var_r31->unk_50, arg0 * 0x30);
@ -749,11 +750,11 @@ s16 fn_1_10910(u32 arg0, s16 arg1, s16 arg2)
var_r31->unk_06 = 1;
if (((arg0 & 0xFFFF0000) + 0x10000) == 0) {
var_r30 = HuSprAnimMake(arg1, arg2, 2);
var_r30->bmp->data = HuMemDirectMallocNum(HEAP_SYSTEM, arg2 * (arg1 * 2), 0x10000000);
var_r30->bmp->data = HuMemDirectMallocNum(HEAP_SYSTEM, arg2 * (arg1 * 2), MEMORY_DEFAULT_NUM);
arg1 = arg2 = 0;
}
else {
var_r30 = HuSprAnimRead(HuDataReadNum(arg0, 0x10000000));
var_r30 = HuSprAnimRead(HuDataReadNum(arg0, MEMORY_DEFAULT_NUM));
}
if ((arg1 == 0) || (arg2 == 0)) {
arg1 = var_r30->bmp->sizeX;
@ -798,7 +799,7 @@ void fn_1_10CB8(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5)
HuSprAnimKill(temp_r31->unk_00);
temp_r31->unk_08 |= 0xFFFF0000;
temp_r30 = HuSprAnimMake(arg2, arg3, arg1);
temp_r30->bmp->data = HuMemDirectMallocNum(HEAP_SYSTEM, arg3 * (temp_r30->bmp->pixSize * arg2), 0x10000000U);
temp_r30->bmp->data = HuMemDirectMallocNum(HEAP_SYSTEM, arg3 * (temp_r30->bmp->pixSize * arg2), MEMORY_DEFAULT_NUM);
var_f31 = arg4 / (f32)temp_r30->bmp->sizeX;
var_f30 = arg5 / (f32)temp_r30->bmp->sizeY;
temp_r31->unk_00 = temp_r30;

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

@ -1,6 +1,7 @@
#include "ext_math.h"
#include "game/audio.h"
#include "game/chrman.h"
#include "game/hsfex.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
@ -13,6 +14,10 @@
#include "REL/m438Dll.h"
#ifndef __MWERKS__
#include "game/frand.h"
#endif
#define BOARD_FABS(value) ((value < 0.0f) ? -(value) : (value))
typedef struct M438MainWork {
@ -1197,7 +1202,6 @@ void fn_1_35C0(omObjData *object)
s16 sp0A;
s16 sp8;
float var_f31;
float var_f30;
float var_f29;
@ -1497,7 +1501,6 @@ void fn_1_4984(omObjData *object)
Vec sp8;
float var_f31;
s32 var_r27;
M438MainWork3 *var_r28;
M438MainWork3 *var_r30;
M438MainWork3 *var_r31;
@ -1592,9 +1595,7 @@ void fn_1_4F50(omObjData *object)
float var_f29;
float var_f28;
float var_f27;
float var_f25;
s32 var_r26;
M438MainWork3 *var_r27;
s32 var_r28;
M438MainWork *var_r29;
M438MainWork3 *var_r31;
@ -2601,8 +2602,6 @@ void fn_1_9420(float arg8, float *arg0, float *arg1, float arg2[3][3], float arg
float sp48[16];
float sp8[16];
float var_f29;
s32 var_r30;
s32 var_r29;
@ -2672,8 +2671,6 @@ f32 fn_1_9960(Vec *arg0, Vec *arg1, Vec *arg2)
{
Vec sp44;
f32 var_f31;
f32 var_f30;
f32 temp_f29;
if (0.0f == ((arg2->z * arg2->z) + ((arg2->x * arg2->x) + (arg2->y * arg2->y)))) {
return ((arg0->z - arg1->z) * (arg0->z - arg1->z))
@ -2686,28 +2683,7 @@ f32 fn_1_9960(Vec *arg0, Vec *arg1, Vec *arg2)
f32 fn_1_9C9C(Vec *arg0, Vec *arg1, Vec *arg2, Vec *arg3, Vec *arg4)
{
f32 sp44;
f32 sp40;
f32 sp3C;
f32 sp38;
f32 sp34;
f32 sp30;
f32 sp2C;
f32 sp28;
f32 sp24;
Vec sp18;
f32 sp14;
f32 sp10;
f32 spC;
f32 sp8;
f32 temp_f25;
f32 temp_f26;
f32 temp_f28;
f32 var_f24;
f32 var_f27;
f64 temp_f31;
f64 temp_f31_2;
f64 temp_f31_3;
if (0.0f == ((arg2->z * arg2->z) + ((arg2->x * arg2->x) + (arg2->y * arg2->y)))) {
return ((arg0->z - arg1->z) * (arg0->z - arg1->z))

11
src/REL/m438Dll/map.c
View file

@ -1,12 +1,17 @@
#include "REL/m438Dll.h"
#include "ext_math.h"
#include "game/audio.h"
#include "game/hsfanim.h"
#include "game/hsfmotion.h"
#include "game/memory.h"
#include "game/sprite.h"
#include "game/wipe.h"
#include "string.h"
#ifndef __MWERKS__
#include "game/frand.h"
#endif
// STRUCT
typedef struct M438MapStruct {
@ -92,7 +97,7 @@ void fn_1_B54C(omObjData *arg0)
M438MapStruct *var_r24;
M438MapStruct3 *temp_r23;
arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x108C, 0x10000000);
arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x108C, MEMORY_DEFAULT_NUM);
temp_r23 = arg0->data;
memset(temp_r23, 0, 0x108C);
arg0->model[0] = Hu3DModelCreateFile(0x450000);
@ -372,7 +377,6 @@ void fn_1_C764(ModelData *model, ParticleData *particle, Mtx matrix)
{
HsfanimStruct01 *var_r31;
s32 var_r29;
u16 temp_r0;
var_r31 = particle->unk_48;
@ -399,7 +403,6 @@ void fn_1_C8E8(ModelData *model, ParticleData *particle, Mtx matrix)
{
HsfanimStruct01 *var_r31;
s32 var_r29;
u16 temp_r0;
var_r31 = particle->unk_48;
@ -508,7 +511,6 @@ void fn_1_D3FC(ModelData *model, ParticleData *particle, Mtx matrix)
{
HsfanimStruct01 *var_r31;
s32 var_r29;
u16 temp_r0;
lbl_1_bss_E2C = 0;
var_r31 = particle->unk_48;
@ -581,7 +583,6 @@ s32 fn_1_DA64(f32 arg8)
s32 var_r30;
M438MapStruct2 *var_r31;
float var_f31;
float var_f29;
var_r28 = lbl_1_bss_108C[0]->data;
var_r29 = 0;

7
src/REL/m439Dll/main.c
View file

@ -1,5 +1,6 @@
#include "game/hsfanim.h"
#include "game/hsfdraw.h"
#include "game/hsfex.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/object.h"
@ -23,6 +24,12 @@
#include "REL/m439data.h"
#include "version.h"
#ifndef __MWERKS__
#include "game/ClusterExec.h"
#include "game/EnvelopeExec.h"
#include "game/ShapeExec.h"
#endif
typedef struct camera_params {
float zoom;
Vec pos;

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

@ -600,7 +600,7 @@ void fn_1_2470(omObjData *arg0)
s16 var_r30;
unkStruct2 *temp_r27;
arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x34, MEMORY_DEFAULT_NUM);
arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkStruct2), MEMORY_DEFAULT_NUM);
temp_r27 = arg0->data;
arg0->stat |= 0x100;
arg0->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_M440, 0x08));
@ -1565,7 +1565,7 @@ void fn_1_6B58(unkStruct6 *arg0, HsfObject *arg1)
break;
}
}
arg0->unk24 = HuMemDirectMallocNum(HEAP_DATA, arg0->unk20 * 0xD0, var_r22->unk_48);
arg0->unk24 = HuMemDirectMallocNum(HEAP_DATA, arg0->unk20 * sizeof(unkStruct8), var_r22->unk_48);
var_r31 = arg0->unk24;
if (var_r24 != 0) {
var_r30 = arg1->data.vertex->count;
@ -2255,14 +2255,14 @@ s16 fn_1_956C(AnimData *arg0, s16 arg1, f32 arg2, s16 arg3, s16 arg4)
var_r20 = Hu3DHookFuncCreate(fn_1_9C04);
temp_r28 = &Hu3DData[var_r20];
var_r31 = HuMemDirectMallocNum(HEAP_DATA, 0x68, temp_r28->unk_48);
var_r31 = HuMemDirectMallocNum(HEAP_DATA, sizeof(unkStruct5), temp_r28->unk_48);
temp_r28->unk_120 = var_r31;
arg0->useNum += 1;
var_r31->unk10 = arg0;
var_r31->unk0 = arg1;
var_r31->unk8 = 0;
var_r31->unkC = NULL;
var_r24 = HuMemDirectMallocNum(HEAP_DATA, arg1 * 0x64, temp_r28->unk_48);
var_r24 = HuMemDirectMallocNum(HEAP_DATA, arg1 * sizeof(unkStruct4), temp_r28->unk_48);
var_r31->unk18 = var_r24;
for (var_r30 = 0; var_r30 < arg1; var_r30++, var_r24++) {

34
src/REL/m440Dll/object.c
View file

@ -1,6 +1,7 @@
#include "REL/m440Dll.h"
#include "ext_math.h"
#include "game/audio.h"
#include "game/chrman.h"
#include "game/flag.h"
#include "game/gamework_data.h"
@ -10,10 +11,6 @@
#include "string.h"
#include "version.h"
#ifdef __MWERKS__
#include "game/audio.h"
#endif
// bss
omObjData *lbl_1_bss_C0[4];
s16 lbl_1_bss_B8[4];
@ -56,9 +53,9 @@ void fn_1_AEE4(omObjData *arg0)
s16 var_r29;
unkObjStruct *temp_r31;
arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x78, MEMORY_DEFAULT_NUM);
arg0->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkObjStruct), MEMORY_DEFAULT_NUM);
temp_r31 = (unkObjStruct *)arg0->data;
memset(temp_r31, 0, 0x78);
memset(temp_r31, 0, sizeof(unkObjStruct));
arg0->stat |= 0x100;
temp_r31->unk4 = arg0->work[0];
temp_r31->unk6 = GWPlayerCfg[temp_r31->unk4].pad_idx;
@ -107,13 +104,9 @@ void fn_1_B180(omObjData *arg0)
{
s16 var_r29;
s16 var_r31;
s32 var_r28;
u32 temp_r0;
u32 temp_r3;
u32 temp_r3_2;
unkObjStruct *temp_r30;
var_r28 = GWSystem.player_curr;
s32 var_r28 = GWSystem.player_curr;
if (var_r28 < 0) {
var_r28 = 0;
}
@ -236,9 +229,6 @@ void fn_1_B884(omObjData *arg0, unkObjStruct *arg1)
f32 var_f28;
f32 var_f31;
f32 var_f30;
s16 temp_r0;
s16 temp_r0_2;
s16 temp_r3;
s16 var_r30;
switch (lbl_1_bss_74) {
@ -372,13 +362,8 @@ void fn_1_C1D4(omObjData *arg0, unkObjStruct *arg1)
{
s16 sp12[5];
s16 sp8[5];
f32 var_f28;
f32 var_f29;
f32 var_f30;
f32 var_f31;
s16 temp_r0;
s16 temp_r0_2;
s16 temp_r3;
s16 var_r29;
s16 var_r28;
s16 var_r30;
@ -490,7 +475,6 @@ void fn_1_C944(omObjData *arg0, unkObjStruct *arg1)
f32 var_f29;
f32 var_f30;
f32 var_f31;
s16 var_r28;
s16 var_r30;
s16 var_r29;
@ -658,10 +642,8 @@ s16 fn_1_CFAC(unkObjStruct *arg0, u8 arg1)
void fn_1_D24C(unkObjStruct *arg0, f32 arg1, f32 arg2)
{
f32 var_f28;
f32 var_f29;
f32 var_f30;
f32 var_f31;
f32 var_f28;
var_f28 = REFRESH_RATE_F / 6.0f;
arg0->unk6C = arg1;
@ -1129,14 +1111,8 @@ void fn_1_F168(void)
void fn_1_F228(void)
{
omObjData *temp_r30;
s16 temp_r0;
s16 var_r29;
s32 temp_r27;
s32 temp_r27_2;
s32 var_r28;
u32 temp_r0_2;
u32 temp_r3;
u32 temp_r3_2;
unkObjStruct *temp_r31;
for (var_r29 = 0; var_r29 < 4; var_r29++) {

7
src/REL/m441Dll/main.c
View file

@ -6,6 +6,7 @@
#include "game/objsub.h"
#include "game/wipe.h"
#include "game/gamework.h"
#include "game/gamework_data.h"
#include "game/mapspace.h"
@ -23,12 +24,13 @@
#include "ext_math.h"
#include "version.h"
#ifndef __MWERKS__
#include <game/hsfex.h>
#include <game/audio.h>
#endif
void HuSysVWaitSet(s16 vcount);
#undef ABS
#define ABS(x) ((0 > (x)) ? -(x) : (x))
@ -1780,9 +1782,6 @@ void fn_1_892C(s16 arg0, s16 arg1, Vec *arg2)
{
omObjData *object;
Work713C *work;
float x;
float y;
float z;
if (lbl_1_bss_1E >= 400) {
OSReport("over!!\n");
return;

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

@ -16,6 +16,11 @@
#include "REL/m442Dll.h"
#ifndef __MWERKS__
#include "game/esprite.h"
#include "game/frand.h"
#endif
typedef struct M442StructBss5C {
/* 0x00 */ float unk_00; // probably Vec
/* 0x04 */ float unk_04;
@ -818,7 +823,6 @@ void fn_1_2254(omObjData *object)
float var_f31;
float var_f30;
double var_f29;
float var_f28;
float var_f27;
float var_f26;
@ -1465,26 +1469,10 @@ void fn_1_485C(ModelData *model, Mtx mtx)
Vec sp10;
float var_f31;
float var_f30;
float var_f29;
float var_f28;
float var_f27;
float var_f26;
float var_f25;
float var_f24;
float var_f23;
float var_f22;
float var_f21;
float var_f20;
float var_f19;
M442StructBss5C *var_r31;
s32 var_r30;
CameraData *var_r29;
u16 var_r28;
u16 var_r27;
u16 var_r26;
u16 var_r25;
var_r29 = Hu3DCamera;
C_MTXOrtho(sp100, 0.0f, 480.0f, 0.0f, 640.0f, 0.0f, 100.0f);
@ -1667,15 +1655,6 @@ s32 fn_1_59C0(Vec *arg0)
void fn_1_5A48(ModelData *arg0, Mtx arg1)
{
float var_f31;
float var_f30;
float var_f29;
float var_f28;
float var_f27;
float var_f26;
float var_f25;
float var_f24;
M442StructBssC9F8 *var_r31;
s32 var_r30;
@ -1729,8 +1708,6 @@ GXColor lbl_1_data_218 = { 0xFF, 0xFF, 0xFF, 0x80 };
void fn_1_5EDC(ModelData *model, float (*mtx)[4])
{
float sp38;
float sp28;
Mtx spC;
M442MainWork *var_r31;
@ -2141,8 +2118,6 @@ void fn_1_7EBC(ModelData *model, ParticleData *particle, Mtx matrix)
{
s32 sp14;
float sp10;
float spC;
float sp8;
float var_f31;

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

@ -809,9 +809,6 @@ void fn_1_3770(omObjData *arg0)
s32 var_r26;
u32 var_r25;
s32 var_r24;
s32 var_r23;
u32 var_r22;
u32 var_r21;
var_r28 = arg0->data;
{

10
src/REL/m443Dll/player.c
View file

@ -10,6 +10,7 @@
#ifndef __MWERKS__
#include "game/esprite.h"
#include "game/frand.h"
#endif
#include "REL/m443Dll.h"
@ -212,7 +213,6 @@ void fn_1_5680(omObjData *object)
{
f32 spC[4] = { 0.25f, 0.5f, 0.75f, 1.0f };
s32 sp8;
f32 temp_f0;
s32 temp_r27;
s32 temp_r3;
s32 var_r29;
@ -220,7 +220,7 @@ void fn_1_5680(omObjData *object)
M443DllWorkStruct *temp_r31;
HsfanimStruct01 *var_r28;
object->data = HuMemDirectMallocNum(HEAP_SYSTEM, 0x134, MEMORY_DEFAULT_NUM);
object->data = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(M443DllWorkStruct), MEMORY_DEFAULT_NUM);
temp_r31 = object->data;
memset(temp_r31, 0, 0x134);
object->stat |= 0x100;
@ -403,7 +403,6 @@ void fn_1_6458(omObjData *object)
f32 var_f31;
s32 var_r29;
M443DllWorkStruct *temp_r31;
void *temp_r4;
temp_r31 = object->data;
var_r29 = 0;
@ -444,7 +443,6 @@ void fn_1_6458(omObjData *object)
void fn_1_6674(omObjData *object)
{
M443DllWorkStruct *temp_r31;
void *temp_r4;
temp_r31 = object->data;
temp_r31->unk10 = 0;
@ -567,9 +565,6 @@ void fn_1_6B90(omObjData *object)
{ 3, 2, 1, 0 },
};
f32 sp18[4] = { 0.0f, -700.0f, 600.0f, 1200.0f };
s32 sp14;
s32 sp10;
s32 spC;
s32 sp8[4] = { 2, 4, 8, 16 };
f32 var_f31;
s32 var_r28;
@ -978,7 +973,6 @@ void fn_1_8508(omObjData *object)
s32 var_r30;
M443DllWorkStruct *temp_r28;
M443DllUnkStruct *temp_r31;
f32 *temp_r4;
temp_r28 = object->data;
temp_r31 = &temp_r28->unk108s;

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

@ -1,3 +1,4 @@
#include "game/hsfex.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/object.h"
@ -17,7 +18,6 @@
#include "REL/m444dll.h"
#include "ext_math.h"
#include "math.h"
typedef struct camera_view_params {
Vec rot;

8
src/REL/m444dll/pinball.c
View file

@ -10,19 +10,17 @@
#include "game/audio.h"
#include "game/chrman.h"
#include "game/esprite.h"
#include "game/window.h"
#include "game/wipe.h"
#include "game/board/ui.h"
#include "game/gamework.h"
#include "game/gamework_data.h"
#include "REL/m444dll.h"
#include "ext_math.h"
#include "version.h"
#include "math.h"
#ifndef __MWERKS__
#include "game/frand.h"
#endif
s16 lbl_1_bss_198F0[5][2];
Vec lbl_1_bss_D8F0[4096];

2
src/REL/m444dll/shadow.c
View file

@ -1,8 +1,6 @@
#include "game/hsfman.h"
#include "game/object.h"
#include "game/window.h"
#include "ext_math.h"
void fn_1_D9F4(s16);

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

@ -2,6 +2,7 @@
#include "game/audio.h"
#include "game/chrman.h"
#include "game/data.h"
#include "game/frand.h"
#include "game/gamework_data.h"
#include "game/hsfanim.h"
#include "game/hsfman.h"
@ -16,7 +17,6 @@
#include "game/window.h"
#include "game/wipe.h"
#include "dolphin.h"
#include "ext_math.h"
typedef struct {

1
src/REL/m446Dll/camera.c
View file

@ -1,6 +1,5 @@
#include "REL/m446Dll.h"
#include "math.h"
#include "ext_math.h"
#include "game/hsfman.h"
#include "game/printfunc.h"

8
src/REL/m446Dll/card.c
View file

@ -15,7 +15,7 @@ unkStruct2 *fn_1_1C64(s32 arg0)
{
unkStruct2 *temp_r3;
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0xC, MEMORY_DEFAULT_NUM);
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkStruct2), MEMORY_DEFAULT_NUM);
if (!temp_r3) {
return NULL;
}
@ -86,7 +86,7 @@ unkStruct3 *fn_1_1DF4(void *arg0)
{
unkStruct3 *temp_r3;
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0xC, MEMORY_DEFAULT_NUM);
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkStruct3), MEMORY_DEFAULT_NUM);
if (!temp_r3) {
return NULL;
}
@ -211,9 +211,7 @@ void fn_1_207C(void)
void fn_1_20D4(void)
{
m446Func1 *temp_r4;
f32 temp_f31;
s32 temp_r5;
unkStruct4 *temp_r31;
unkStruct3 *var_r30;
@ -275,7 +273,7 @@ unkStruct4 *m446CardCreate(s32 arg0)
unkStruct4 *temp_r31;
unkStruct3 *temp_r30;
temp_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x98, MEMORY_DEFAULT_NUM);
temp_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkStruct4), MEMORY_DEFAULT_NUM);
if (!temp_r31) {
OSReport("[!] m446CardCreate ERROR...\n");
return NULL;

2
src/REL/m446Dll/cursor.c
View file

@ -70,7 +70,7 @@ unkStruct7 *m446CursorCreate(s32 arg0)
unkStruct7 *var_r31;
unkStruct3 *var_r29;
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x54, MEMORY_DEFAULT_NUM);
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkStruct7), MEMORY_DEFAULT_NUM);
if (!var_r31) {
return NULL;
}

4
src/REL/m446Dll/deck.c
View file

@ -1,6 +1,6 @@
#include "REL/m446Dll.h"
#include "math.h"
#include "game/audio.h"
#include "ext_math.h"
// bss
@ -18,7 +18,7 @@ unkStruct5* fn_1_3064(void) {
s32 var_r30;
unkStruct5* temp_r3;
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x10, MEMORY_DEFAULT_NUM);
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkStruct5), MEMORY_DEFAULT_NUM);
if (!temp_r3) {
return NULL;
}

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

@ -6,6 +6,7 @@
#include "game/gamework_data.h"
#include "game/hsfman.h"
#include "game/minigame_seq.h"
#include "game/objsub.h"
#include "game/window.h"
#include "game/wipe.h"
@ -93,7 +94,7 @@ unkStruct *m446FlowCreate(void)
s32 var_r30;
unkStruct *temp_r3;
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x9C, MEMORY_DEFAULT_NUM);
temp_r3 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkStruct), MEMORY_DEFAULT_NUM);
if (temp_r3 == 0) {
OSReport("[!] m446FlowCreate() ERROR...\n");
return NULL;
@ -287,9 +288,6 @@ void fn_1_53C(unkStruct *arg0)
void fn_1_958(unkStruct *arg0)
{
s32 temp_r3;
s32 temp_r3_2;
s32 temp_r3_3;
s32 var_r30;
switch (arg0->unk10) {
@ -680,7 +678,6 @@ void fn_1_19D4(void)
{
s16 temp_r3;
s16 var_r30;
s32 temp_r0;
s32 var_r29;
u32 temp_r27;

6
src/REL/m446Dll/player.c
View file

@ -1,5 +1,6 @@
#include "REL/m446Dll.h"
#include "game/audio.h"
#include "game/chrman.h"
#include "game/gamework_data.h"
#include "game/hsfman.h"
@ -166,7 +167,7 @@ unkStruct8 *m446PlayerCreate(s32 arg0, unkStruct6 *arg1)
s32 var_r30;
unkStruct8 *var_r31;
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0xCC, MEMORY_DEFAULT_NUM);
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkStruct8), MEMORY_DEFAULT_NUM);
if (!var_r31) {
return NULL;
}
@ -338,7 +339,6 @@ s32 m446PlayerAppendCard(unkStruct8 *arg0, unkStruct4 *arg1, s32 arg2)
{
Vec sp18;
Vec spC;
s32 temp_r0_2;
s32 temp_r28;
s32 temp_r27;
s32 var_r29;
@ -859,7 +859,7 @@ void fn_1_64BC(unkStruct8 *arg0, s32 arg1, s32 arg2)
}
}
static inline unkStruct8UnkC8(unkStruct8 *arg0)
static inline s32 unkStruct8UnkC8(unkStruct8 *arg0)
{
if (arg0->unkC8 == 0) {
return 0;

2
src/REL/m446Dll/stage.c
View file

@ -101,7 +101,7 @@ unkStruct9 *m446StageCreate(void)
unkStruct3 *temp_ret;
unkStruct9 *var_r31;
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x30, MEMORY_DEFAULT_NUM);
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkStruct9), MEMORY_DEFAULT_NUM);
if (!var_r31) {
return NULL;
}

3
src/REL/m446Dll/table.c
View file

@ -1,4 +1,5 @@
#include "REL/m446Dll.h"
#include "game/audio.h"
#include "game/hsfman.h"
#include "game/pad.h"
@ -46,7 +47,7 @@ unkStruct6 *fn_1_39D0(void)
unkStruct3 *var_r29;
unkStruct6 *var_r31;
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, 0x70, MEMORY_DEFAULT_NUM);
var_r31 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(unkStruct6), MEMORY_DEFAULT_NUM);
if (!var_r31) {
return NULL;
}

Some files were not shown because too many files have changed in this diff Show more