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

Merge pull request #372 from abnormalhare/main

Browse source 
Match m409dll
This commit is contained in:
Liam Coleman 2024-07-27 12:50:10 -04:00 • committed by GitHub
commit c793b9f403
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 1501 additions and 203 deletions
Download patch file Download diff file Expand all files Collapse all files

152
config/GMPE01_00/rels/m409Dll/symbols.txt
View file

@ -198,81 +198,81 @@ lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 scope:local data:
lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 scope:local data:float
lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x4 scope:local data:float
lbl_1_rodata_19C = .rodata:0x0000019C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x30 data:4byte
lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x100
lbl_1_rodata_2D0 = .rodata:0x000002D0; // type:object size:0x4 data:float
lbl_1_rodata_2D4 = .rodata:0x000002D4; // type:object size:0x4 data:float
lbl_1_rodata_2D8 = .rodata:0x000002D8; // type:object size:0x4 data:float
lbl_1_rodata_2DC = .rodata:0x000002DC; // type:object size:0x4 data:float
lbl_1_rodata_2E0 = .rodata:0x000002E0; // type:object size:0x4 data:float
lbl_1_rodata_2E4 = .rodata:0x000002E4; // type:object size:0x4 data:float
lbl_1_rodata_2E8 = .rodata:0x000002E8; // type:object size:0x4 data:float
lbl_1_rodata_2EC = .rodata:0x000002EC; // type:object size:0x4 data:float
lbl_1_rodata_2F0 = .rodata:0x000002F0; // type:object size:0x4 data:float
lbl_1_rodata_2F8 = .rodata:0x000002F8; // type:object size:0x8 data:double
lbl_1_rodata_300 = .rodata:0x00000300; // type:object size:0x4 data:float
lbl_1_rodata_304 = .rodata:0x00000304; // type:object size:0x4 data:float
lbl_1_rodata_308 = .rodata:0x00000308; // type:object size:0x4 data:float
lbl_1_rodata_30C = .rodata:0x0000030C; // type:object size:0x4 data:float
lbl_1_rodata_310 = .rodata:0x00000310; // type:object size:0x8 data:double
lbl_1_rodata_318 = .rodata:0x00000318; // type:object size:0x4 data:float
lbl_1_rodata_320 = .rodata:0x00000320; // type:object size:0x8 data:double
lbl_1_rodata_328 = .rodata:0x00000328; // type:object size:0x8 data:double
lbl_1_rodata_330 = .rodata:0x00000330; // type:object size:0x4 data:float
lbl_1_rodata_334 = .rodata:0x00000334; // type:object size:0x4 data:float
lbl_1_rodata_338 = .rodata:0x00000338; // type:object size:0x4 data:float
lbl_1_rodata_33C = .rodata:0x0000033C; // type:object size:0x4 data:float
lbl_1_rodata_340 = .rodata:0x00000340; // type:object size:0x4 data:float
lbl_1_rodata_344 = .rodata:0x00000344; // type:object size:0x4 data:float
lbl_1_rodata_348 = .rodata:0x00000348; // type:object size:0x4 data:float
lbl_1_rodata_34C = .rodata:0x0000034C; // type:object size:0x4 data:float
lbl_1_rodata_350 = .rodata:0x00000350; // type:object size:0x8 data:double
lbl_1_rodata_358 = .rodata:0x00000358; // type:object size:0x4 data:float
lbl_1_rodata_35C = .rodata:0x0000035C; // type:object size:0x4 data:float
lbl_1_rodata_360 = .rodata:0x00000360; // type:object size:0x4 data:float
lbl_1_rodata_364 = .rodata:0x00000364; // type:object size:0x4 data:float
lbl_1_rodata_368 = .rodata:0x00000368; // type:object size:0x4 data:float
lbl_1_rodata_36C = .rodata:0x0000036C; // type:object size:0x4 data:float
lbl_1_rodata_370 = .rodata:0x00000370; // type:object size:0x4 data:float
lbl_1_rodata_374 = .rodata:0x00000374; // type:object size:0x4 data:float
lbl_1_rodata_378 = .rodata:0x00000378; // type:object size:0x4 data:float
lbl_1_rodata_37C = .rodata:0x0000037C; // type:object size:0x4 data:float
lbl_1_rodata_380 = .rodata:0x00000380; // type:object size:0x4 data:float
lbl_1_rodata_384 = .rodata:0x00000384; // type:object size:0x4 data:float
lbl_1_rodata_388 = .rodata:0x00000388; // type:object size:0x4 data:float
lbl_1_rodata_38C = .rodata:0x0000038C; // type:object size:0x4 data:float
lbl_1_rodata_390 = .rodata:0x00000390; // type:object size:0x4 data:float
lbl_1_rodata_394 = .rodata:0x00000394; // type:object size:0x4 data:float
lbl_1_rodata_398 = .rodata:0x00000398; // type:object size:0x4 data:float
lbl_1_rodata_39C = .rodata:0x0000039C; // type:object size:0x4 data:float
lbl_1_rodata_3A0 = .rodata:0x000003A0; // type:object size:0x4 data:float
lbl_1_rodata_3A4 = .rodata:0x000003A4; // type:object size:0x4 data:float
lbl_1_rodata_3A8 = .rodata:0x000003A8; // type:object size:0x4 data:float
lbl_1_rodata_3AC = .rodata:0x000003AC; // type:object size:0x4 data:float
lbl_1_rodata_3B0 = .rodata:0x000003B0; // type:object size:0x4 data:float
lbl_1_rodata_3B4 = .rodata:0x000003B4; // type:object size:0x4 data:float
lbl_1_rodata_3B8 = .rodata:0x000003B8; // type:object size:0x4 data:float
lbl_1_rodata_3BC = .rodata:0x000003BC; // type:object size:0x4 data:float
lbl_1_rodata_3C0 = .rodata:0x000003C0; // type:object size:0x4 data:float
lbl_1_rodata_3C4 = .rodata:0x000003C4; // type:object size:0x4 data:float
lbl_1_rodata_3C8 = .rodata:0x000003C8; // type:object size:0x8 data:double
lbl_1_rodata_3D0 = .rodata:0x000003D0; // type:object size:0x4 data:float
lbl_1_rodata_3D4 = .rodata:0x000003D4; // type:object size:0x4 data:float
lbl_1_rodata_3D8 = .rodata:0x000003D8; // type:object size:0x4 data:float
lbl_1_rodata_3DC = .rodata:0x000003DC; // type:object size:0x4 data:float
lbl_1_rodata_3E0 = .rodata:0x000003E0; // type:object size:0x4 data:float
lbl_1_rodata_3E4 = .rodata:0x000003E4; // type:object size:0x4 data:float
lbl_1_rodata_3E8 = .rodata:0x000003E8; // type:object size:0x8 data:double
lbl_1_rodata_3F0 = .rodata:0x000003F0; // type:object size:0x8 data:double
lbl_1_rodata_3F8 = .rodata:0x000003F8; // type:object size:0x4 data:float
lbl_1_rodata_3FC = .rodata:0x000003FC; // type:object size:0x4 data:float
lbl_1_rodata_400 = .rodata:0x00000400; // type:object size:0x8 data:double
lbl_1_rodata_408 = .rodata:0x00000408; // type:object size:0x4 data:float
lbl_1_rodata_410 = .rodata:0x00000410; // type:object size:0x8 data:double
lbl_1_rodata_418 = .rodata:0x00000418; // type:object size:0x8 data:double
lbl_1_rodata_420 = .rodata:0x00000420; // type:object size:0x8 data:double
lbl_1_rodata_428 = .rodata:0x00000428; // type:object size:0x4 data:float
lbl_1_rodata_42C = .rodata:0x0000042C; // type:object size:0x4 data:float
lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x30 scope:local data:4byte
lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x100 scope:local
lbl_1_rodata_2D0 = .rodata:0x000002D0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2D4 = .rodata:0x000002D4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2D8 = .rodata:0x000002D8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2DC = .rodata:0x000002DC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2E0 = .rodata:0x000002E0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2E4 = .rodata:0x000002E4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2E8 = .rodata:0x000002E8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2EC = .rodata:0x000002EC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2F0 = .rodata:0x000002F0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2F8 = .rodata:0x000002F8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_300 = .rodata:0x00000300; // type:object size:0x4 scope:local data:float
lbl_1_rodata_304 = .rodata:0x00000304; // type:object size:0x4 scope:local data:float
lbl_1_rodata_308 = .rodata:0x00000308; // type:object size:0x4 scope:local data:float
lbl_1_rodata_30C = .rodata:0x0000030C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_310 = .rodata:0x00000310; // type:object size:0x8 scope:local data:double
lbl_1_rodata_318 = .rodata:0x00000318; // type:object size:0x4 scope:local data:float
lbl_1_rodata_320 = .rodata:0x00000320; // type:object size:0x8 scope:local data:double
lbl_1_rodata_328 = .rodata:0x00000328; // type:object size:0x8 scope:local data:double
lbl_1_rodata_330 = .rodata:0x00000330; // type:object size:0x4 scope:local data:float
lbl_1_rodata_334 = .rodata:0x00000334; // type:object size:0x4 scope:local data:float
lbl_1_rodata_338 = .rodata:0x00000338; // type:object size:0x4 scope:local data:float
lbl_1_rodata_33C = .rodata:0x0000033C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_340 = .rodata:0x00000340; // type:object size:0x4 scope:local data:float
lbl_1_rodata_344 = .rodata:0x00000344; // type:object size:0x4 scope:local data:float
lbl_1_rodata_348 = .rodata:0x00000348; // type:object size:0x4 scope:local data:float
lbl_1_rodata_34C = .rodata:0x0000034C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_350 = .rodata:0x00000350; // type:object size:0x8 scope:local data:double
lbl_1_rodata_358 = .rodata:0x00000358; // type:object size:0x4 scope:local data:float
lbl_1_rodata_35C = .rodata:0x0000035C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_360 = .rodata:0x00000360; // type:object size:0x4 scope:local data:float
lbl_1_rodata_364 = .rodata:0x00000364; // type:object size:0x4 scope:local data:float
lbl_1_rodata_368 = .rodata:0x00000368; // type:object size:0x4 scope:local data:float
lbl_1_rodata_36C = .rodata:0x0000036C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_370 = .rodata:0x00000370; // type:object size:0x4 scope:local data:float
lbl_1_rodata_374 = .rodata:0x00000374; // type:object size:0x4 scope:local data:float
lbl_1_rodata_378 = .rodata:0x00000378; // type:object size:0x4 scope:local data:float
lbl_1_rodata_37C = .rodata:0x0000037C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_380 = .rodata:0x00000380; // type:object size:0x4 scope:local data:float
lbl_1_rodata_384 = .rodata:0x00000384; // type:object size:0x4 scope:local data:float
lbl_1_rodata_388 = .rodata:0x00000388; // type:object size:0x4 scope:local data:float
lbl_1_rodata_38C = .rodata:0x0000038C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_390 = .rodata:0x00000390; // type:object size:0x4 scope:local data:float
lbl_1_rodata_394 = .rodata:0x00000394; // type:object size:0x4 scope:local data:float
lbl_1_rodata_398 = .rodata:0x00000398; // type:object size:0x4 scope:local data:float
lbl_1_rodata_39C = .rodata:0x0000039C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3A0 = .rodata:0x000003A0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3A4 = .rodata:0x000003A4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3A8 = .rodata:0x000003A8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3AC = .rodata:0x000003AC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3B0 = .rodata:0x000003B0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3B4 = .rodata:0x000003B4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3B8 = .rodata:0x000003B8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3BC = .rodata:0x000003BC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3C0 = .rodata:0x000003C0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3C4 = .rodata:0x000003C4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3C8 = .rodata:0x000003C8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_3D0 = .rodata:0x000003D0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3D4 = .rodata:0x000003D4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3D8 = .rodata:0x000003D8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3DC = .rodata:0x000003DC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3E0 = .rodata:0x000003E0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3E4 = .rodata:0x000003E4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3E8 = .rodata:0x000003E8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_3F0 = .rodata:0x000003F0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_3F8 = .rodata:0x000003F8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3FC = .rodata:0x000003FC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_400 = .rodata:0x00000400; // type:object size:0x8 scope:local data:double
lbl_1_rodata_408 = .rodata:0x00000408; // type:object size:0x4 scope:local data:float
lbl_1_rodata_410 = .rodata:0x00000410; // type:object size:0x8 scope:local data:double
lbl_1_rodata_418 = .rodata:0x00000418; // type:object size:0x8 scope:local data:double
lbl_1_rodata_420 = .rodata:0x00000420; // type:object size:0x8 scope:local data:double
lbl_1_rodata_428 = .rodata:0x00000428; // type:object size:0x4 scope:local data:float
lbl_1_rodata_42C = .rodata:0x0000042C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_430 = .rodata:0x00000430; // type:object size:0x4 data:float
lbl_1_rodata_434 = .rodata:0x00000434; // type:object size:0x4 data:float
lbl_1_rodata_438 = .rodata:0x00000438; // type:object size:0x4 data:float
@ -300,7 +300,7 @@ lbl_1_data_13C = .data:0x0000013C; // type:object size:0x1C
lbl_1_data_158 = .data:0x00000158; // type:object size:0x20
lbl_1_data_178 = .data:0x00000178; // type:object size:0x20
lbl_1_data_198 = .data:0x00000198; // type:object size:0x20
lbl_1_data_1B8 = .data:0x000001B8; // type:object size:0x14
lbl_1_data_1B8 = .data:0x000001B8; // type:object size:0x14 scope:local
jumptable_1_data_1CC = .data:0x000001CC; // type:object size:0x20 scope:local
lbl_1_data_1EC = .data:0x000001EC; // type:object size:0x4 data:4byte
lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte

2
configure.py
View file

@ -895,7 +895,7 @@ config.libs = [
Object(Matching, "REL/executor.c"),
Object(Matching, "REL/m409Dll/main.c"),
Object(Matching, "REL/m409Dll/player.c"),
Object(NonMatching, "REL/m409Dll/cursor.c"),
Object(Matching, "REL/m409Dll/cursor.c"),
},
),
Rel(

150
include/REL/m409Dll.h
View file

@ -136,45 +136,80 @@ typedef struct _unkStruct7 {
typedef struct _unkStruct8Sub {
Vec unk0;
char unkC[0xC];
f32 unk18;
f32 unk1C;
f32 unk20;
char unk24[0x10];
Vec unkC;
Vec unk18;
char unk24[0xC];
u8 unk30;
u8 unk31;
u8 unk32;
u32 unk34;
char unk38[0x20];
s16 unk38;
void* unk3C;
void* unk40;
void* unk44;
Vec* unk48;
GXColor unk4C;
GXColor unk50;
struct _unkStruct12* unk54;
Vec unk58;
Vec unk64;
s16 unk70;
s16 unk72;
union {
s16 unk70[0x10];
struct {
s16 unk74;
s16 unk76;
s16 unk70s;
f32 unk74;
f32 unk78;
f32 unk7C;
};
f32 unk74f;
};
f32 unk78;
f32 unk7C;
char unk80[0x10];
} unkStruct8Sub; // sizeof 0x90
typedef struct _unkStruct8 {
char unk0[0x30];
s16 unk0;
s16 unk2;
u8 unk4;
s16 unk6;
u32 unk8;
Vec unkC;
Vec unk18;
Vec unk24;
m409PlayerFunc8 unk30;
char unk34[0x8];
s16* unk34;
char unk38[0x4];
unkStruct8Sub* unk3C;
char unk40[0x60];
char unk40[0x8];
Vec unk48;
Vec unk54;
s16 unk60[0x20];
} unkStruct8; // sizeof 0xA0
typedef struct _unkStruct9Sub {
AnimData* unk0;
s16 unk4;
s16 unk6;
u32 unk8;
Vec unkC;
Mtx unk18;
GXColor unk48;
u8 unk4C;
s16 unk4E;
s16 unk50;
f32 unk54;
f32 unk58;
f32 unk5C;
f32 unk60;
} unkStruct9Sub; // sizeof 0x64
typedef struct _unkStruct9 {
char unk0[0x6];
s16 unk0;
s16 unk2;
s16 unk4;
s16 unk6;
s16 unk8;
s16 unkA;
char unkC[0x4];
unkStruct9Sub* unkC;
unkStruct8* unk10;
} unkStruct9;
} unkStruct9; // sizeof 0x14
typedef struct _unkStruct10 {
u8 unk0;
@ -194,6 +229,24 @@ typedef struct _unkStruct10 {
f32 unk4C;
} unkStruct10; // sizeof 0x50
typedef struct unkStruct11 {
Vec unk0;
Vec unkC;
Vec unk18;
Vec unk24;
} unkStruct11; // sizeof 0x30
typedef struct _unkStruct12 {
s8 unk0;
s8 unk1;
s16 unk2;
HsfVector2f* unk4;
u8 unk8;
s16 unkA;
f32 unkC;
f32 unk10;
} unkStruct12;
// bss
// player.c
extern omObjData* lbl_1_bss_3A0[4];
@ -306,28 +359,57 @@ extern void fn_1_B0A0(f32*, f32*, f32*, f32*, f32);
extern f32 fn_1_B378(Vec*);
extern f32 fn_1_B6A4(Vec*, Vec*, Vec*);
extern f32 fn_1_B9E0(Vec*, Vec*, Vec*, Vec*, Vec*);
// ...
extern f32 fn_1_BF38(s16);
// cursor.c
extern void fn_1_BF88(s32, s32);
extern void fn_1_BF88(s16, s16);
extern void fn_1_C0C0(void);
extern void fn_1_C164(unkStruct8*);
extern void fn_1_CB98(ModelData* model, Mtx matrix);
extern unkStruct8* fn_1_CCB0(s16 idx);
extern unkStruct8Sub* fn_1_CCCC(s16, s16);
extern s16 fn_1_DA48(s32, s32);
extern void fn_1_DEF4(s16, s32, s32);
extern void fn_1_DF20(s32, s32, s32);
extern void fn_1_E2A8(s16, s32, s32, s32, s32);
extern s32 fn_1_E7C8(s16, s32, s32);
extern void fn_1_E99C(s16, s16, f32, f32, f32);
extern void fn_1_CCF8(unkStruct11**, s16, f32, f32);
extern void fn_1_CE7C(Vec**, s16, Vec*);
extern void fn_1_CF1C(GXColor**, s16, GXColor*);
extern void fn_1_CFC4(Vec**, s16, Vec*);
extern void fn_1_D050(HsfVector2f**, s16, HsfVector2f*);
extern void fn_1_D0E8(unkStruct8Sub*);
extern void fn_1_D430(unkStruct8*);
extern s16 fn_1_DA48(u8, u8);
extern void fn_1_DDB8(s16);
extern void fn_1_DEF4(s16, s16, u8);
extern s16 fn_1_DF20(u32, s16, s16);
extern void fn_1_E228(s16);
extern s32 fn_1_E2A8(s16, u8, u32, s16, s16);
extern s32 fn_1_E7C8(s16, u8, u32);
extern void fn_1_E818(s16, f32, f32, f32);
extern void fn_1_E85C(s16, s16, f32, f32, f32);
extern void fn_1_E8CC(s16, f32, f32, f32);
extern void fn_1_E940(s16, f32, f32, f32);
extern void fn_1_E99C(s16, s16, f32, f32, f32);
extern void fn_1_E940(s16, f32, f32, f32);
extern void fn_1_EA24(s16, f32, f32, f32);
extern void fn_1_EAB0(s16, f32, f32, f32);
extern void fn_1_EAF4(s16, s16, f32, f32, f32);
extern void fn_1_EB64(s16, f32, f32, f32);
extern void fn_1_EBD8(s16, f32, f32, f32);
extern void fn_1_EC1C(s16, s16, f32, f32, f32);
extern void fn_1_ED00(u8, s32);
extern void fn_1_EC8C(s16, f32, f32, f32);
extern void fn_1_ED00(s16, s32);
extern void fn_1_ED44(s16, s16, s32);
extern void fn_1_EE24(u8, s32);
extern void fn_1_EE68(s16, s16, s32);
extern void fn_1_EDB4(s16, s32);
extern void fn_1_EE24(s16, u32);
extern void fn_1_EE68(s16, s16, u32);
extern void fn_1_EED8(s16, u32);
extern s32 fn_1_EF48(s16, s32);
extern s32 fn_1_EFA4(s16, s16, s32);
extern void fn_1_F024(s16, s16, u8, u8, u8, u8);
extern void fn_1_F098(s16, u8, u8, u8, u8);
extern void fn_1_F110(s16, s16, u8);
extern void fn_1_F17C(s16, s16, u8, u8);
extern void fn_1_F1F4(s16, u8);
extern void fn_1_F28C(s16, s16, f32);
extern void fn_1_F2F8(s16, s16, u8, f32);
extern void fn_1_F408(s16, s32, s32);
extern void fn_1_F2F8(s16, s16, u8, f32);
extern void fn_1_F478(s16, s16, u8, s32);
extern void fn_1_F370(s16, f32);
extern void fn_1_F408(s16, s16, u8);
extern void fn_1_F478(s16, s16, u8, u8);
extern void fn_1_F4F0(s16, u8);

1208
src/REL/m409Dll/cursor.c Normal file
View file

File diff suppressed because it is too large Load diff

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

@ -2,6 +2,7 @@
#include "rel_sqrt_consts.h"
#include "math.h"
#include "ext_math.h"
#include "game/hsfman.h"
#include "game/objsub.h"
#include "game/audio.h"
@ -154,15 +155,15 @@ s8 fn_1_524(void) {
if (var_f30 > 1.0f) {
var_f30 = 1.0f;
}
temp_f31 = cos((M_PI * (-45.0f + (135.0f * var_f30))) / 180.0);
temp_f31 = cosd(-45.0f + (135.0f * var_f30));
Hu3DTexScrollPosSet(lbl_1_bss_24.unk12, lbl_1_bss_24.unk14, 0.0f, 0.0f);
lbl_1_bss_24.unk14 -= 0.01f * temp_f31;
Hu3DTexScrollPosMoveSet(lbl_1_bss_24.unkC, -0.0001f - (0.005f * temp_f31), 0.0f, 0.0f);
Hu3DTexScrollPosMoveSet(lbl_1_bss_24.unkE, -0.0002f - (0.005f * temp_f31), 0.0f, 0.0f);
Hu3DTexScrollPosMoveSet(lbl_1_bss_24.unk10, -0.0003f - (0.005f * temp_f31), 0.0f, 0.0f);
sp8.x = -(sin((M_PI * CRot.y) / 180.0) * cos((M_PI * CRot.x) / 180.0));
sp8.x = -(sin((M_PI * CRot.y) / 180.0) * cosd(CRot.x));
sp8.y = sin((M_PI * CRot.x) / 180.0);
sp8.z = -(cos((M_PI * CRot.y) / 180.0) * cos((M_PI * CRot.x) / 180.0));
sp8.z = -(cosd(CRot.y) * cosd(CRot.x));
HuAudFXListnerUpdate(&Hu3DCamera->pos, &sp8);
return var_r30;
}
@ -916,7 +917,7 @@ void fn_1_44F0(s16 arg0, f32 arg8, f32 arg9, f32 argA, s8 arg1, s16 arg2) {
temp_f31 = (((rand8() << 8) | rand8()) % 361);
var_r31->unk0.x = (2.0 + (3.0 * sin((M_PI * temp_f31) / 180.0)));
var_r31->unk0.y = (0.1f * ((((rand8() << 8) | rand8()) % 31) + 40));
var_r31->unk0.z = (3.5 * cos((M_PI * temp_f31) / 180.0));
var_r31->unk0.z = (3.5 * cosd(temp_f31));
var_r31->unk28 = 0;
var_r31->unk2A = ((((rand8() << 8) | rand8()) % 3) + 2);
var_r31->unk18 = (f32)spA.r;
@ -973,7 +974,7 @@ void fn_1_4FFC(s16 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4) {
temp_r31->unk4C = -1;
temp_f31 = ((((rand8() << 8) | rand8()) % 81) - 40);
temp_r31->unk0.x = (13.0 * cos((M_PI * temp_f31) / 180.0));
temp_r31->unk0.x = (13.0 * cosd(temp_f31));
temp_r31->unk0.y = 0.1f * ((((rand8() << 8) | rand8()) % 21) + 20);
temp_r31->unk0.z = (9.0 * sin((M_PI * temp_f31) / 180.0));
temp_r31->unkC.x = (0.05f * temp_r31->unk0.x);

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

@ -2,6 +2,7 @@
#include "math.h"
#include "ext_math.h"
#include "ext_math.h"
#include "game/audio.h"
#include "game/chrman.h"
#include "game/gamework_data.h"
@ -152,8 +153,8 @@ void fn_1_6928(omObjData* arg0) {
var_r31->unk58 = var_r30;
lbl_1_bss_F0.unk10[var_r30].unk30 = &fn_1_8D6C;
fn_1_ED44(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 4);
lbl_1_bss_F0.unk10[lbl_1_bss_F0.unk6].unk3C[lbl_1_bss_F0.unk8].unk70 = var_r31->unk0;
lbl_1_bss_F0.unk10[lbl_1_bss_F0.unk6].unk3C[lbl_1_bss_F0.unk8].unk72 = -1;
lbl_1_bss_F0.unk10[lbl_1_bss_F0.unk6].unk3C[lbl_1_bss_F0.unk8].unk70[0] = var_r31->unk0;
lbl_1_bss_F0.unk10[lbl_1_bss_F0.unk6].unk3C[lbl_1_bss_F0.unk8].unk70[1] = -1;
fn_1_EC1C(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 0.5f, 0.5f, 1.0f);
var_r31->unk59 = 0;
var_r31->unk60 = 0;
@ -252,9 +253,9 @@ void fn_1_7344(omObjData* arg0) {
temp_r23 = fn_1_8D08(temp_r31->unk0);
fn_1_DEF4(temp_r31->unk58, 0, 0);
fn_1_EE68(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, 4);
lbl_1_bss_F0.unk10[lbl_1_bss_F0.unk6].unk3C[lbl_1_bss_F0.unk8].unk72 = temp_r23;
lbl_1_bss_F0.unk10[lbl_1_bss_F0.unk6].unk3C[lbl_1_bss_F0.unk8].unk74 = 0;
lbl_1_bss_F0.unk10[lbl_1_bss_F0.unk6].unk3C[lbl_1_bss_F0.unk8].unk76 = 0;
lbl_1_bss_F0.unk10[lbl_1_bss_F0.unk6].unk3C[lbl_1_bss_F0.unk8].unk70[1] = temp_r23;
lbl_1_bss_F0.unk10[lbl_1_bss_F0.unk6].unk3C[lbl_1_bss_F0.unk8].unk70[2] = 0;
lbl_1_bss_F0.unk10[lbl_1_bss_F0.unk6].unk3C[lbl_1_bss_F0.unk8].unk70[3] = 0;
fn_1_E85C(lbl_1_bss_F0.unk6, lbl_1_bss_F0.unk8, temp_r31->unk24.x, 100.0f + temp_r31->unk24.y, temp_r31->unk24.z);
if (temp_r23 == -1) {
lbl_1_bss_F0.unk10[temp_r31->unk58].unk3C[0].unk58.x = temp_r30->unk0.x;
@ -518,30 +519,30 @@ void fn_1_8838(unkStruct8* arg0) {
var_r28 = fn_1_A9C0(var_r26, &sp8);
temp_r31 = &arg0->unk3C[1];
if (var_r28 == -1) {
if (temp_r31->unk70 != -1) {
temp_r31->unk70 = -1;
temp_r31->unk74f = 0.0f;
if (temp_r31->unk70[0] != -1) {
temp_r31->unk70[0] = -1;
temp_r31->unk74 = 0.0f;
temp_r31->unk58.x = temp_r31->unk0.x;
temp_r31->unk58.y = temp_r31->unk0.y;
temp_r31->unk58.z = temp_r31->unk0.z;
temp_r31->unk78 = temp_r31->unk18;
temp_r31->unk78 = temp_r31->unk18.x;
}
if (temp_r31->unk74f < 90.0f) {
temp_r31->unk74f += 9.0f;
if (temp_r31->unk74f > 90.0f) {
temp_r31->unk74f = 90.0f;
if (temp_r31->unk74 < 90.0f) {
temp_r31->unk74 += 9.0f;
if (temp_r31->unk74 > 90.0f) {
temp_r31->unk74 = 90.0f;
}
temp_f31 = sin((M_PI * temp_r31->unk74f) / 180.0);
temp_f30 = cos((M_PI * temp_r31->unk74f) / 180.0);
temp_f31 = sin((M_PI * temp_r31->unk74) / 180.0);
temp_f30 = cosd(temp_r31->unk74);
sp18.x = temp_r30->unk0.x - temp_r31->unk58.x;
sp18.y = temp_r30->unk0.y - temp_r31->unk58.y;
sp18.z = temp_r30->unk0.z - temp_r31->unk58.z;
temp_r31->unk0.x = (temp_r31->unk58.x + (sp18.x * temp_f31));
temp_r31->unk0.y = (temp_r31->unk58.y + (sp18.y * temp_f31));
temp_r31->unk0.z = (temp_r31->unk58.z + (sp18.z * temp_f31));
temp_r31->unk18 = (0.001f + (temp_r31->unk78 * temp_f30));
temp_r31->unk1C = (0.001f + (temp_r31->unk78 * temp_f30));
temp_r31->unk20 = 1.0f;
temp_r31->unk18.x = (0.001f + (temp_r31->unk78 * temp_f30));
temp_r31->unk18.y = (0.001f + (temp_r31->unk78 * temp_f30));
temp_r31->unk18.z = 1.0f;
return;
}
temp_r31->unk34 |= 4;
@ -551,30 +552,30 @@ void fn_1_8838(unkStruct8* arg0) {
return;
}
temp_r29 = &lbl_1_bss_10C[var_r28];
if (temp_r31->unk70 != var_r28) {
temp_r31->unk70 = var_r28;
temp_r31->unk74f = 0.0f;
if (temp_r31->unk70[0] != var_r28) {
temp_r31->unk70[0] = var_r28;
temp_r31->unk74 = 0.0f;
temp_r31->unk58.x = temp_r31->unk0.x;
temp_r31->unk58.y = temp_r31->unk0.y;
temp_r31->unk58.z = temp_r31->unk0.z;
temp_r31->unk78 = temp_r31->unk18;
temp_r31->unk7C = (2.5f - temp_r31->unk18);
temp_r31->unk78 = temp_r31->unk18.x;
temp_r31->unk7C = (2.5f - temp_r31->unk18.x);
}
if (temp_r31->unk74f < 90.0f) {
temp_r31->unk74f += 9.0f;
if (temp_r31->unk74f > 90.0f) {
temp_r31->unk74f = 90.0f;
if (temp_r31->unk74 < 90.0f) {
temp_r31->unk74 += 9.0f;
if (temp_r31->unk74 > 90.0f) {
temp_r31->unk74 = 90.0f;
}
temp_f31 = sin((M_PI * temp_r31->unk74f) / 180.0);
temp_f31 = sin((M_PI * temp_r31->unk74) / 180.0);
sp18.x = temp_r29->unkC.x - temp_r31->unk58.x;
sp18.y = temp_r29->unkC.y - temp_r31->unk58.y;
sp18.z = temp_r29->unkC.z - temp_r31->unk58.z;
temp_r31->unk0.x = (temp_r31->unk58.x + (sp18.x * temp_f31));
temp_r31->unk0.y = (temp_r31->unk58.y + (sp18.y * temp_f31));
temp_r31->unk0.z = (temp_r31->unk58.z + (sp18.z * temp_f31));
temp_r31->unk18 = (temp_r31->unk78 + (temp_r31->unk7C * temp_f31));
temp_r31->unk1C = (temp_r31->unk78 + (temp_r31->unk7C * temp_f31));
temp_r31->unk20 = 1.0f;
temp_r31->unk18.x = (temp_r31->unk78 + (temp_r31->unk7C * temp_f31));
temp_r31->unk18.y = (temp_r31->unk78 + (temp_r31->unk7C * temp_f31));
temp_r31->unk18.z = 1.0f;
} else {
temp_r31->unk0.x = temp_r29->unkC.x;
temp_r31->unk0.y = temp_r29->unkC.y;
@ -589,7 +590,7 @@ s8 fn_1_8D08(u8 arg0) {
data = (unkStruct7*)lbl_1_bss_3A0[arg0]->data;
var_r30 = fn_1_CCCC(data->unk57, 1);
return var_r30->unk70;
return var_r30->unk70[0];
}
void fn_1_8D6C(unkStruct8* arg0) {
@ -605,8 +606,8 @@ void fn_1_8D6C(unkStruct8* arg0) {
temp_r31 = &arg0->unk3C[0];
if ((temp_r31->unk34 & 4) == 0) {
temp_r28 = temp_r31->unk72;
if (temp_r31->unk74 == 0) {
temp_r28 = temp_r31->unk70[1];
if (temp_r31->unk70[2] == 0) {
if (temp_r28 == -1) {
sp8.x = temp_r31->unk58.x - temp_r31->unk0.x;
sp8.y = temp_r31->unk58.y - temp_r31->unk0.y;
@ -616,9 +617,9 @@ void fn_1_8D6C(unkStruct8* arg0) {
temp_r31->unk64.y = sp8.y;
temp_r31->unk64.z = sp8.z;
}
temp_r31->unk74 = 0x10;
temp_r31->unk70[2] = 0x10;
}
if (temp_r31->unk76 == 0) {
if (temp_r31->unk70[3] == 0) {
if (temp_r28 != -1) {
var_r29 = &lbl_1_bss_10C[temp_r28];
if ((var_r29->unk2 != 0) && (var_r29->unk2 <= 4)) {
@ -640,7 +641,7 @@ void fn_1_8D6C(unkStruct8* arg0) {
if (!(var_f31 >= 2250.0f) && (var_r29->unk2 == 3)) {
var_r29->unk2 = 4;
temp_r31->unk34 |= 4;
temp_r30 = (unkStruct7*)lbl_1_bss_3A0[temp_r31->unk70]->data;
temp_r30 = (unkStruct7*)lbl_1_bss_3A0[temp_r31->unk70[0]]->data;
if (var_r29->unk48 == lbl_1_bss_106) {
espAttrSet(temp_r30->unk5A[temp_r30->unk59][0], 4);
espAttrReset(temp_r30->unk5A[temp_r30->unk59][1], 4);
@ -668,14 +669,14 @@ void fn_1_8D6C(unkStruct8* arg0) {
temp_r31->unk64.x = sp8.x;
temp_r31->unk64.y = sp8.y;
temp_r31->unk64.z = sp8.z;
temp_r31->unk76 = 1;
temp_r31->unk70[3] = 1;
return;
}
}
temp_r31->unk0.x = (temp_r31->unk0.x + (200.0f * temp_r31->unk64.x));
temp_r31->unk0.y = (temp_r31->unk0.y + (200.0f * temp_r31->unk64.y));
temp_r31->unk0.z = (temp_r31->unk0.z + (200.0f * temp_r31->unk64.z));
if (--temp_r31->unk74 == 0) {
if (--temp_r31->unk70[2] == 0) {
temp_r31->unk34 |= 4;
}
}
@ -861,8 +862,8 @@ void fn_1_962C(omObjData* arg0) {
if (var_r31->unkC.y >= 375.0f) {
var_r31->unk8 -= 0.000001f * var_r31->unkC.y;
}
var_r31->unkC.x += sin((M_PI * var_r31->unk18.z) / 180.0) * var_r31->unk8;
var_r31->unkC.y += cos((M_PI * var_r31->unk18.z) / 180.0) * var_r31->unk8;
var_r31->unkC.x += sind(var_r31->unk18.z) * var_r31->unk8;
var_r31->unkC.y += cosd(var_r31->unk18.z) * var_r31->unk8;
if (var_r31->unkC.y >= 200.0) {
Hu3DModelAttrReset(var_r31->unk0, 1);
}

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

@ -219,8 +219,8 @@ void fn_1_AE0(omObjData* arg0) {
if (temp_r31->unkA != 0) {
temp_r31->unkA++;
temp_f31 = (((rand8() << 8) | rand8()) % 361);
Center.x = (lbl_1_data_78[1].center.x + (10.0 * sin((M_PI * temp_f31) / 180.0)));
Center.y = (lbl_1_data_78[1].center.y + (10.0 * cos((M_PI * temp_f31) / 180.0)));
Center.x = (lbl_1_data_78[1].center.x + (10.0 * sind(temp_f31)));
Center.y = (lbl_1_data_78[1].center.y + (10.0 * cosd(temp_f31)));
if (temp_r31->unkA > 0x28) {
temp_r31->unkA = 0;
return;
@ -453,8 +453,8 @@ void fn_1_19B0(void) {
for (var_r31 = 1; var_r31 < 4; var_r31++, var_f30+=120.0f) {
temp_f31 = 0.01f * ((((rand8() << 8) | rand8()) % 51) + 50);
temp_f29 = (temp_f31 * (200.0 * sin((M_PI * var_f30) / 180.0)));
var_f28 = (temp_f31 * (200.0 * cos((M_PI * var_f30) / 180.0)));
temp_f29 = (temp_f31 * (200.0 * sind(var_f30)));
var_f28 = (temp_f31 * (200.0 * cosd(var_f30)));
var_f27 = 0.0f;
Hu3DModelPosSet(lbl_1_bss_10[var_r31], temp_f29, 300.0f + var_f28, var_f27);
temp_f31 = 0.1f * ((((rand8() << 8) | rand8()) % 11) + 25);
@ -486,8 +486,8 @@ void fn_1_1D54(f32 arg8, f32 arg9, f32 argA, s16 arg0, f32 argB, s16 arg1) {
for (var_r30 = 0; var_r30 < arg0; var_r30++) {
temp_f31 = argB + ((((rand8() << 8) | rand8()) % 11) - 5);
temp_f30 = sin((M_PI * temp_f31) / 180.0);
temp_f29 = cos((M_PI * temp_f31) / 180.0);
temp_f30 = sind(temp_f31);
temp_f29 = cosd(temp_f31);
sp30.x = arg8 + ((((rand8() << 8) | rand8()) % 21) - 10);
sp30.y = arg9 + ((((rand8() << 8) | rand8()) % 21) - 10);
sp30.z = argA;
@ -862,8 +862,8 @@ void fn_1_3DD8(omObjData* object) {
for (var_r29 = 1; var_r29 < 4; var_r29++, var_f30 += 120.0f) {
var_f31 = 0.01f * ((((rand8() << 8) | rand8()) % 51) + 0x32);
var_f27 = (var_f31 * (200.0 * sin((M_PI * var_f30) / 180.0)));
var_f28 = var_f31 * (200.0 * cos((M_PI * var_f30) / 180.0));
var_f27 = (var_f31 * (200.0 * sind(var_f30)));
var_f28 = (var_f31 * (200.0 * cosd(var_f30)));
var_f29 = 0.0f;
Hu3DModelPosSet(lbl_1_bss_10[var_r29], var_f27, 300.0f + var_f28, var_f29);
var_f31 = 0.1f * ((((rand8() << 8) | rand8()) % 11) + 0x19);

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

@ -244,8 +244,8 @@ void fn_1_B884(omObjData* arg0, unkObjStruct* arg1) {
lbl_1_bss_74++;
}
arg1->unk24 = arg1->unk18;
arg1->unk18.x = (700.0 * cos((M_PI * lbl_1_data_250) / 180.0));
arg1->unk18.z = (700.0 * sin((M_PI * lbl_1_data_250) / 180.0));
arg1->unk18.x = (700.0 * cosd(lbl_1_data_250));
arg1->unk18.z = (700.0 * sind(lbl_1_data_250));
var_f29 = (arg1->unk18.x - arg1->unk24.x);
var_f28 = (arg1->unk18.z - arg1->unk24.z);
var_f30 = (180.0 * (atan2(var_f29, var_f28) / M_PI));
@ -299,8 +299,8 @@ void fn_1_B884(omObjData* arg0, unkObjStruct* arg1) {
lbl_1_bss_74++;
}
arg1->unk24 = arg1->unk18;
arg1->unk18.x = (arg1->unk5C * cos((M_PI * lbl_1_data_250) / 180.0));
arg1->unk18.z = (arg1->unk5C * sin((M_PI * lbl_1_data_250) / 180.0));
arg1->unk18.x = (arg1->unk5C * cosd(lbl_1_data_250));
arg1->unk18.z = (arg1->unk5C * sind(lbl_1_data_250));
var_f29 = (arg1->unk18.x - arg1->unk24.x);
var_f28 = (arg1->unk18.z - arg1->unk24.z);
var_f30 = (180.0 * (atan2(var_f29, var_f28) / M_PI));
@ -528,8 +528,8 @@ void fn_1_C944(omObjData* arg0, unkObjStruct* arg1) {
}
}
arg1->unk24 = arg1->unk18;
arg1->unk18.x = (arg1->unk5C * cos((M_PI * arg1->unk68) / 180.0));
arg1->unk18.z = (arg1->unk5C * sin((M_PI * arg1->unk68) / 180.0));
arg1->unk18.x = (arg1->unk5C * cosd(arg1->unk68));
arg1->unk18.z = (arg1->unk5C * sind(arg1->unk68));
if ((arg1->unk48 & 3) != 0) {
arg1->unk48 = arg1->unk48 & ~4;
var_f26 = (arg1->unk18.x - arg1->unk24.x);
@ -704,8 +704,8 @@ void fn_1_D34C(omObjData* arg0, unkObjStruct* arg1) {
fn_1_4E00(arg1->unk4A, var_f31);
}
}
arg1->unk18.x = (410.0 * cos((M_PI * lbl_1_data_0[arg1->unk4A]) / 180.0));
arg1->unk18.z = (410.0 * sin((M_PI * lbl_1_data_0[arg1->unk4A]) / 180.0));
arg1->unk18.x = (410.0 * cosd(lbl_1_data_0[arg1->unk4A]));
arg1->unk18.z = (410.0 * sind(lbl_1_data_0[arg1->unk4A]));
}
}
@ -748,8 +748,8 @@ void fn_1_D7F8(omObjData* arg0, unkObjStruct* arg1) {
}
var_f31 = (temp_r29->unk_64 - temp_f29) / temp_f28;
fn_1_4E00(arg1->unk4A, var_f31);
arg1->unk18.x = (410.0 * cos((M_PI * lbl_1_data_0[arg1->unk4A]) / 180.0));
arg1->unk18.z = (410.0 * sin((M_PI * lbl_1_data_0[arg1->unk4A]) / 180.0));
arg1->unk18.x = (410.0 * cosd(lbl_1_data_0[arg1->unk4A]));
arg1->unk18.z = (410.0 * sind(lbl_1_data_0[arg1->unk4A]));
if (arg1->unk68 >= 150.0f) {
arg1->unk68 = 150.0f;
if (temp_r29->unk_64 == var_f30) {
@ -781,8 +781,8 @@ void fn_1_D7F8(omObjData* arg0, unkObjStruct* arg1) {
case 2:
arg1->unkC++;
var_f31 = arg1->unkC / 30.0f;
arg1->unk18.x = ((410.0f + (var_f31 * (arg1->unk5C - 410.0f))) * cos((M_PI * lbl_1_data_0[arg1->unk4A]) / 180.0));
arg1->unk18.z = ((410.0f + (var_f31 * (arg1->unk5C - 410.0f))) * sin((M_PI * lbl_1_data_0[arg1->unk4A]) / 180.0));
arg1->unk18.x = ((410.0f + (var_f31 * (arg1->unk5C - 410.0f))) * cosd(lbl_1_data_0[arg1->unk4A]));
arg1->unk18.z = ((410.0f + (var_f31 * (arg1->unk5C - 410.0f))) * sind(lbl_1_data_0[arg1->unk4A]));
if (var_f31 >= 1.0f) {
arg1->unkC = 0;
var_f31 = 1.0f;
@ -874,8 +874,8 @@ void fn_1_E034(omObjData* arg0, unkObjStruct* arg1) {
arg1->unk60++;
}
arg1->unk24 = arg1->unk18;
arg1->unk18.x = (arg1->unk5C * cos((M_PI * lbl_1_bss_84) / 180.0));
arg1->unk18.z = (arg1->unk5C * sin((M_PI * lbl_1_bss_84) / 180.0));
arg1->unk18.x = (arg1->unk5C * cosd(lbl_1_bss_84));
arg1->unk18.z = (arg1->unk5C * sind(lbl_1_bss_84));
var_f29 = (arg1->unk18.x - arg1->unk24.x);
var_f28 = (arg1->unk18.z - arg1->unk24.z);
var_f30 = (180.0 * (atan2(var_f29, var_f28) / M_PI));
@ -932,8 +932,8 @@ void fn_1_E034(omObjData* arg0, unkObjStruct* arg1) {
fn_1_F4D4(arg1, 15, 1);
}
arg1->unk24 = arg1->unk18;
arg1->unk18.x = (700.0 * cos((M_PI * lbl_1_bss_84) / 180.0));
arg1->unk18.z = (700.0 * sin((M_PI * lbl_1_bss_84) / 180.0));
arg1->unk18.x = (700.0 * cosd(lbl_1_bss_84));
arg1->unk18.z = (700.0 * sind(lbl_1_bss_84));
var_f29 = (arg1->unk18.x - arg1->unk24.x);
var_f28 = (arg1->unk18.z - arg1->unk24.z);
var_f30 = (180.0 * (atan2(var_f29, var_f28) / M_PI));
@ -972,13 +972,13 @@ u8 fn_1_E8AC(omObjData* arg0, unkObjStruct* arg1) {
var_f31 = lbl_1_data_0[arg1->unk4A];
lbl_1_bss_78 = arg1->unk18;
if ((arg1->unk4A == 4) || (arg1->unk4A == 3)) {
arg1->unk24.x = (840.0000610351563 * cos((M_PI * var_f31) / 180.0));
arg1->unk24.x = (840.0000610351563 * cosd(var_f31));
arg1->unk24.y = 0.0f;
arg1->unk24.z = (840.0000610351563 * sin((M_PI * var_f31) / 180.0));
arg1->unk24.z = (840.0000610351563 * sind(var_f31));
} else {
arg1->unk24.x = (1050.0 * cos((M_PI * var_f31) / 180.0));
arg1->unk24.x = (1050.0 * cosd(var_f31));
arg1->unk24.y = 0.0f;
arg1->unk24.z = (1050.0 * sin((M_PI * var_f31) / 180.0));
arg1->unk24.z = (1050.0 * sind(var_f31));
}
arg1->unk30.y = 0.0f;
PSMTXRotRad(temp_r29->unk_F0, 0x59, 0.017453292f * arg1->unk68);

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

@ -1,6 +1,7 @@
#include "REL/m446Dll.h"
#include "math.h"
#include "ext_math.h"
#include "game/hsfman.h"
#include "game/printfunc.h"
#include "game/pad.h"
@ -70,15 +71,15 @@ void fn_1_68DC(void) {
temp_f30 = lbl_1_bss_80.x;
temp_f29 = lbl_1_bss_80.y;
sp10 = lbl_1_bss_80.z;
sp2C.x = (lbl_1_bss_8C.x + (lbl_1_bss_7C * (sin((M_PI * temp_f29) / 180.0) * cos((M_PI * temp_f30) / 180.0))));
sp2C.y = (lbl_1_bss_8C.y + (lbl_1_bss_7C * -sin((M_PI * temp_f30) / 180.0)));
sp2C.z = (lbl_1_bss_8C.z + (lbl_1_bss_7C * (cos((M_PI * temp_f29) / 180.0) * cos((M_PI * temp_f30) / 180.0))));
sp2C.x = (lbl_1_bss_8C.x + (lbl_1_bss_7C * (sind(temp_f29) * cosd(temp_f30))));
sp2C.y = (lbl_1_bss_8C.y + (lbl_1_bss_7C * -sind(temp_f30)));
sp2C.z = (lbl_1_bss_8C.z + (lbl_1_bss_7C * (cosd(temp_f29) * cosd(temp_f30))));
sp20.x = lbl_1_bss_8C.x;
sp20.y = lbl_1_bss_8C.y;
sp20.z = lbl_1_bss_8C.z;
sp14.x = (sin((M_PI * temp_f29) / 180.0) * sin((M_PI * temp_f30) / 180.0));
sp14.y = cos((M_PI * temp_f30) / 180.0);
sp14.z = (cos((M_PI * temp_f29) / 180.0) * sin((M_PI * temp_f30) / 180.0));
sp14.x = (sind(temp_f29) * sind(temp_f30));
sp14.y = cosd(temp_f30);
sp14.z = (cosd(temp_f29) * sind(temp_f30));
Hu3DCameraPosSet(1, sp2C.x, sp2C.y, sp2C.z, sp14.x, sp14.y, sp14.z, sp20.x, sp20.y, sp20.z);
}

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

@ -1,6 +1,7 @@
#include "REL/m446Dll.h"
#include "math.h"
#include "ext_math.h"
// bss
u32 lbl_1_bss_20;
@ -69,8 +70,8 @@ void fn_1_31D8(unkStruct2** arg0, unkStruct4** arg1, s32* arg2, s32 arg3) {
while (fn_1_1D6C(*arg0, &spC) != 0) {
if (arg3 != 0) {
sp10 = spC->unk10;
sp10.x = ((25.0 * cos((M_PI * var_f31) / 180.0)) - (25.0 * sin((M_PI * var_f31) / 180.0)));
sp10.z = ((25.0 * cos((M_PI * var_f31) / 180.0)) + (25.0 * sin((M_PI * var_f31) / 180.0)));
sp10.x = ((25.0 * cosd(var_f31)) - (25.0 * sind(var_f31)));
sp10.z = ((25.0 * cosd(var_f31)) + (25.0 * sind(var_f31)));
sp10.y = 81.0f + (0.1f * var_r31);
fn_1_2890(spC, &sp10, 0x12, var_r29 += 3);
var_f31 += var_f30;

9
src/game/board/basic_space.c
View file

@ -9,6 +9,7 @@
#include "game/objsub.h"
#include "game/gamework_data.h"
#include "math.h"
#include "ext_math.h"
#include "stdlib.h"
typedef struct bit_copy {
@ -409,11 +410,11 @@ static void CoinChgDisappear(omObjData* object, coinChg* coin_chg) {
OSu16tof32(&angle, &rot);
if (angle <= 90.0f) {
object->scale.x = 0.5 * cos((M_PI * rot) / 180.0);
object->scale.y = 2.5 * sin((M_PI * rot) / 180.0);
object->scale.x = 0.5 * cosd(rot);
object->scale.y = 2.5 * sind(rot);
} else {
object->scale.x = 2.5 * sin((M_PI * rot) / 180.0);
object->scale.y = 0.5 * cos((M_PI * rot) / 180.0);
object->scale.x = 2.5 * sind(rot);
object->scale.y = 0.5 * cosd(rot);
}
if (0.0f == object->scale.x) {
object->scale.x = 0.0001f;

5
src/game/board/mushroom.c
View file

@ -10,6 +10,7 @@
#include "game/objsub.h"
#include "math.h"
#include "ext_math.h"
extern s32 boardTutorialData[4];
@ -277,7 +278,7 @@ static void ShowBox(ItemGiveWork2* arg0, omObjData* arg1) {
}
OSs16tof32(&arg0->unk_06, &arg1->rot.y);
arg1->trans.y = (sp8.y + (700.0f * cos((M_PI * (f64) arg0->unk_08) / 180.0)));
arg1->trans.y = (sp8.y + (700.0f * cosd(arg0->unk_08)));
arg0->unk_08 += 1.5f;
arg0->unk_06 += 30;
}
@ -298,7 +299,7 @@ static void ExitBox(ItemGiveWork2* arg0, omObjData* arg1) {
arg0->unk00_field2 = 1;
}
arg1->trans.y = spC.y + (700.0f * cos((M_PI * arg0->unk_08) / 180.0));
arg1->trans.y = spC.y + (700.0f * cosd(arg0->unk_08));
arg1->rot.y = sin((M_PI * temp) / 180.0);
arg0->unk_08 -= 1.5f;
arg0->unk_06 -= 30;

3
src/game/board/player.c
View file

@ -17,6 +17,7 @@
#include "game/pad.h"
#include "stdlib.h"
#include "math.h"
#include "ext_math.h"
static void InitJunction(s32, s32, f32);
static void UpdateJunctionGfx(omObjData*);
@ -1042,7 +1043,7 @@ static void InitJunction(s32 arg0, s32 arg1, f32 arg8) {
BoardModelLayerSet(temp_r29->unk_06[var_r27], 6);
sp5C.x = sp68.x + (100.0 * sin((M_PI * angle) / 180.0));
sp5C.y = 300.0f + sp68.y;
sp5C.z = (var_f29 + (sp68.z + (100.0 * cos((M_PI * angle) / 180.0))));
sp5C.z = (var_f29 + (sp68.z + (100.0 * cosd(angle))));
BoardModelPosSetV(temp_r29->unk_06[var_r27], &sp5C);
BoardModelScaleSet(temp_r29->unk_06[var_r27], var_r28->scale.x, var_r28->scale.y, var_r28->scale.z);
var_r27++;

7
src/game/hsfman.c
View file

@ -13,6 +13,7 @@
#include "dolphin/gx/GXVert.h"
#include "math.h"
#include "ext_math.h"
ModelData Hu3DData[0x200];
CameraData Hu3DCamera[0x10];
@ -1277,9 +1278,9 @@ BOOL Hu3DModelCameraInfoSet(s16 arg0, u16 arg1) {
PSVECSubtract((Point3d* ) &obj_copy->camera.target, (Point3d* ) &obj_copy->camera.pos, &sp8);
sp14.x = ((sp8.x * sp8.y * (1.0 - cos((M_PI * temp_f31) / 180.0))) - (sp8.z * sin((M_PI * temp_f31) / 180.0)));
sp14.y = ((sp8.y * sp8.y) + (1.0f - (sp8.y * sp8.y)) * cos((M_PI * temp_f31) / 180.0));
sp14.z = (((sp8.y * sp8.z) * (1.0 - cos((M_PI * (f64) temp_f31) / 180.0))) + (sp8.x * sin((M_PI * temp_f31) / 180.0)));
sp14.x = ((sp8.x * sp8.y * (1.0 - cosd(temp_f31))) - (sp8.z * sind(temp_f31)));
sp14.y = ((sp8.y * sp8.y) + (1.0f - (sp8.y * sp8.y)) * cosd(temp_f31));
sp14.z = (((sp8.y * sp8.z) * (1.0 - cosd(temp_f31))) + (sp8.x * sind(temp_f31)));
PSVECNormalize(&sp14, &sp8);
Hu3DCameraPosSet(arg1, obj_copy->camera.target.x, obj_copy->camera.target.y, obj_copy->camera.target.z,