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

Merge branch 'main' of https://github.com/abnormalhare/marioparty4

Browse source
This commit is contained in:
CreateSource 2024-05-25 20:48:51 -04:00
commit bfe01369b0
11 changed files with 4113 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config/GMPE01_00/rels/m401Dll/symbols.txt
View file

@ -511,10 +511,11 @@ lbl_2_bss_11C = .bss:0x0000011C; // type:object size:0x4 data:4byte
lbl_2_bss_120 = .bss:0x00000120; // type:object size:0x2 data:2byte
lbl_2_bss_124 = .bss:0x00000124; // type:object size:0x4 data:float
lbl_2_bss_128 = .bss:0x00000128; // type:object size:0x4 data:float
lbl_2_bss_12C = .bss:0x0000012C; // type:object size:0x8 data:float
lbl_2_bss_12C = .bss:0x0000012C; // type:object size:0x4 data:float
lbl_2_bss_130 = .bss:0x00000130; // type:object size:0x4 data:float
lbl_2_bss_134 = .bss:0x00000134; // type:object size:0x2 data:2byte
lbl_2_bss_136 = .bss:0x00000136; // type:object size:0x8
lbl_2_bss_13E = .bss:0x0000013E; // type:object size:0xE2
lbl_2_bss_13E = .bss:0x0000013E; // type:object size:0xE0
lbl_2_bss_220 = .bss:0x00000220; // type:object size:0x18 data:4byte
lbl_2_bss_238 = .bss:0x00000238; // type:object size:0x4 data:4byte
lbl_2_bss_23C = .bss:0x0000023C; // type:object size:0x4 data:4byte

16
config/GMPE01_00/rels/m444dll/symbols.txt
View file

@ -229,9 +229,10 @@ lbl_1_rodata_458 = .rodata:0x00000458; // type:object size:0x8 data:double
lbl_1_rodata_460 = .rodata:0x00000460; // type:object size:0x4 data:float
lbl_1_rodata_468 = .rodata:0x00000468; // type:object size:0x8 data:double
lbl_1_rodata_470 = .rodata:0x00000470; // type:object size:0x4 data:float
lbl_1_data_0 = .data:0x00000000; // type:object size:0x118
lbl_1_data_0 = .data:0x00000000; // type:object size:0x118 data:float
lbl_1_data_118 = .data:0x00000118; // type:object size:0x28
lbl_1_data_14C = .data:0x00000140; // type:object size:0x3C data:float
lbl_1_data_140 = .data:0x00000140; // type:object size:0xC data:float
lbl_1_data_14C = .data:0x0000014C; // type:object size:0x3C data:float
lbl_1_data_188 = .data:0x00000188; // type:object size:0xC
lbl_1_data_194 = .data:0x00000194; // type:object size:0x20
lbl_1_data_1B4 = .data:0x000001B4; // type:object size:0x24 data:string
@ -267,9 +268,9 @@ lbl_1_data_36E = .data:0x0000036E; // type:object size:0xD data:string
lbl_1_data_37B = .data:0x0000037B; // type:object size:0xD data:string
jumptable_1_data_388 = .data:0x00000388; // type:object size:0x1C scope:local
lbl_1_data_3A4 = .data:0x000003A4; // type:object size:0x8
lbl_1_data_3AC = .data:0x000003AC; // type:object size:0x30
lbl_1_data_3DC = .data:0x000003DC; // type:object size:0x24
lbl_1_data_400 = .data:0x00000400; // type:object size:0x54
lbl_1_data_3AC = .data:0x000003AC; // type:object size:0x30 data:float
lbl_1_data_3DC = .data:0x000003DC; // type:object size:0x24 data:float
lbl_1_data_400 = .data:0x00000400; // type:object size:0x54 data:float
lbl_1_data_454 = .data:0x00000454; // type:object size:0xC
lbl_1_data_460 = .data:0x00000460; // type:object size:0x10 data:string
lbl_1_data_470 = .data:0x00000470; // type:object size:0x127C
@ -291,7 +292,8 @@ lbl_1_bss_2DC = .bss:0x000002DC; // type:object size:0x2 data:2byte
lbl_1_bss_2E0 = .bss:0x000002E0; // type:object size:0x4 data:float
lbl_1_bss_2E4 = .bss:0x000002E4; // type:object size:0xC data:float
lbl_1_bss_2F0 = .bss:0x000002F0; // type:object size:0xC data:4byte
lbl_1_bss_2FC = .bss:0x000002FC; // type:object size:0xC data:4byte
lbl_1_bss_2FC = .bss:0x000002FC; // type:object size:0x4 data:4byte
lbl_1_bss_300 = .bss:0x00000300; // type:object size:0x8 data:4byte
lbl_1_bss_308 = .bss:0x00000308; // type:object size:0x4 data:4byte
lbl_1_bss_30C = .bss:0x0000030C; // type:object size:0x4 data:4byte
lbl_1_bss_310 = .bss:0x00000310; // type:object size:0x1 data:byte
@ -317,6 +319,6 @@ lbl_1_bss_18F0 = .bss:0x000018F0; // type:object size:0xC000
lbl_1_bss_D8F0 = .bss:0x0000D8F0; // type:object size:0xC000
lbl_1_bss_198F0 = .bss:0x000198F0; // type:object size:0x14
lbl_1_bss_19908 = .bss:0x00019908; // type:object size:0x2
lbl_1_bss_1990A = .bss:0x0001990A; // type:object size:0x2 data:2byte
lbl_1_bss_1990A = .bss:0x0001990A; // type:object size:0x4 data:2byte
lbl_1_bss_1990E = .bss:0x0001990E; // type:object size:0xB4 data:2byte
lbl_1_bss_199C2 = .bss:0x000199C2; // type:object size:0xB4 data:2byte

4
configure.py
View file

@ -1172,8 +1172,8 @@ config.libs = [
objects={
Object(Matching, "REL/executor.c"),
Object(NonMatching, "REL/m444dll/main.c"),
Object(NonMatching, "REL/m444dll/pinball.c"),
Object(NonMatching, "REL/m444dll/datalist.c"),
Object(Matching, "REL/m444dll/pinball.c"),
Object(Matching, "REL/m444dll/datalist.c"),
Object(NonMatching, "REL/m444dll/shadow.c"),
},
),

10
include/REL/m401Dll.h
View file

@ -8,6 +8,10 @@ extern float lbl_2_bss_12C;
extern float lbl_2_bss_128;
extern float lbl_2_bss_124;
extern s16 lbl_2_bss_120;
extern Vec lbl_2_bss_6C;
extern Vec lbl_2_bss_60;
extern float lbl_2_bss_50;
extern omObjData **lbl_2_bss_118;
typedef struct m401_work_player {
s16 unk0;
@ -59,6 +63,10 @@ typedef struct unkwork_10A88 {
float unk1C;
} UnkWork10A88;
void fn_2_169C(s16 arg0);
void fn_2_A8A4(omObjData *object, float x, float y, float z);
void fn_2_10240(Vec *arg0, Vec *arg1);
void fn_2_1041C(void);
void fn_2_10710(void);
@ -66,7 +74,7 @@ void fn_2_10710(void);
void fn_2_1079C(void);
omObjData *fn_2_10A88(Vec *arg0, s16 arg1);
void fn_2_141B0(void);
omObjData *fn_2_141B0(void);
omObjData *fn_2_14640(Process *objman);
#endif

73
include/REL/m444dll.h Normal file
View file

@ -0,0 +1,73 @@
#ifndef M444DLL_H
#define M444DLL_H
#include "game/data.h"
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/sprite.h"
typedef struct datalist_model {
s32 datanum;
u32 attr;
s16 type;
s16 link;
s16 mot_link;
Vec pos;
Vec rot;
Vec scale;
} DataListModel;
typedef struct datalist_sprite {
u32 datanum;
s16 attr;
s16 prio;
float x;
float y;
GXColor color;
} DataListSprite;
void fn_1_8180(s16 view);
void fn_1_8424(void);
void fn_1_861C(s16 arg0);
s16 fn_1_8DD0(s16 arg0);
void fn_1_9418(s16 arg0);
void fn_1_9CAC(s16 arg0, s16 arg1);
void fn_1_A060(void);
void fn_1_C214(void);
void fn_1_D1E0(s16 model);
void fn_1_D558(DataListModel *model_list);
void fn_1_D818(DataListSprite *sprite_list);
void fn_1_D950(void);
void fn_1_D9C8(void);
extern s16 lbl_1_bss_199C2[90];
extern s16 lbl_1_bss_1990E[90];
extern s16 lbl_1_bss_1990A[2];
extern s16 lbl_1_bss_19908;
extern Vec lbl_1_bss_34C[3];
extern Vec lbl_1_bss_328[3];
extern s16 lbl_1_bss_320[4];
extern Vec lbl_1_bss_2F0;
extern Vec lbl_1_bss_2E4;
extern float lbl_1_bss_2E0;
extern s16 lbl_1_bss_2DC;
extern s16 lbl_1_bss_2DA;
extern s16 lbl_1_bss_2D8;
extern s16 lbl_1_bss_2D6;
extern s16 lbl_1_bss_2D4;
extern s16 lbl_1_bss_2D2;
extern s16 lbl_1_bss_2D0;
extern s16 lbl_1_bss_2C0[8];
extern Vec lbl_1_bss_2A8[2];
extern Vec lbl_1_bss_290[2];
extern float lbl_1_bss_288[2];
extern DataListModel lbl_1_data_470[];
#endif

3
include/ext_math.h
View file

@ -11,11 +11,14 @@ typedef struct vec2f {
#define ABS(x) (((x) < 0) ? -(x) : (x))
#define VECDistanceXYZ(a, b) sqrtf((((a)->x-(b)->x)*((a)->x-(b)->x))+(((a)->y-(b)->y)*((a)->y-(b)->y))+(((a)->z-(b)->z)*((a)->z-(b)->z)))
#define VECDistanceXZ(a, b) sqrtf((((a)->x-(b)->x)*((a)->x-(b)->x))+(((a)->z-(b)->z)*((a)->z-(b)->z)))
#define VECDistanceZY(a, b) sqrtf((((a)->z-(b)->z)*((a)->z-(b)->z))+(((a)->y-(b)->y)*((a)->y-(b)->y)))
#define VECSumXZ(a, b) sqrtf((((a)->x+(b)->x)*((a)->x+(b)->x))+(((a)->z+(b)->z)*((a)->z+(b)->z)))
#define VECMagXZ(a) sqrtf(((a)->x*(a)->x)+((a)->z*(a)->z))
#define VECMag2Point(a) (((a)->x*(a)->x)+((a)->y*(a)->y)+((a)->z*(a)->z))
#define VECMagPoint(x, y, z) sqrtf(((x)*(x))+((y)*(y))+((z)*(z)))
#define sind(x) sin(M_PI*(x)/180.0)

1
include/game/hsfman.h
View file

@ -211,7 +211,6 @@ void Hu3DLLightStaticSet(s16, s16, s32);
s32 Hu3DModelLightInfoSet(s16, s16);
s16 Hu3DLightSet(ModelData*, Mtx*, Mtx*, f32);
void lightSet(LightData* arg0, s16 arg1, Mtx *arg2, Mtx *arg3, f32 arg8);
void Hu3DReflectMapSet(AnimData* arg0);
void Hu3DReflectNoSet(s16 arg0);
void Hu3DFogSet(f32, f32, u8, u8, u8);
void Hu3DFogClear(void);

1135
src/REL/m401Dll/main_ex.c Normal file
View file

File diff suppressed because it is too large Load diff

180
src/REL/m444dll/datalist.c Normal file
View file

@ -0,0 +1,180 @@
#include "REL/m444dll.h"
s16 lbl_1_bss_199C2[90];
s16 lbl_1_bss_1990E[90];
s16 lbl_1_bss_1990A[2];
s16 lbl_1_bss_19908;
DataListModel lbl_1_data_470[] = {
{ 0x4B0000, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0000, 0, 0, 0, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0000, 0, 0, 0, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0001, 0, 0, -1, -1, { 0, 150, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0002, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0003, 0, 0, -1, -1, { 0, 150, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0004, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0005, 0, 0, -1, -1, { 0, 150, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0006, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0007, 0x40000002, 0, -1, 10, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0008, 0, 1, -1, 9, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0015, 0x40000002, 0, -1, 12, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0016, 0, 1, -1, 11, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0017, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0018, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0014, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0020, 0x40000001, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B001F, 0x40000001, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B002C, 0x40000001, 0, -1, 19, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B002D, 0, 1, -1, 18, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B002E, 0, 1, -1, 18, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B002F, 0, 1, -1, 18, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0030, 0x40000001, 0, -1, 23, { 200, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0031, 0, 1, -1, 22, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0032, 0, 1, -1, 22, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0033, 0, 1, -1, 22, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0034, 0x40000001, 0, -1, 27, { 400, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0035, 0, 1, -1, 26, { -200, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0036, 0, 1, -1, 26, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0037, 0, 1, -1, 26, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0038, 0x40000001, 0, -1, 31, { -200, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0039, 0, 1, -1, 30, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B003A, 0, 1, -1, 30, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B003B, 0, 1, -1, 30, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B003C, 0x40000001, 0, -1, 35, { -400, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B003D, 0, 1, -1, 34, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B003E, 0, 1, -1, 34, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B003F, 0, 1, -1, 34, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0040, 0x40000001, 0, -1, 43, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0040, 0x40000001, 0, -1, 43, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0040, 0x40000001, 0, -1, 43, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0040, 0x40000001, 0, -1, 43, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0040, 0x40000001, 0, -1, 43, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0041, 0, 1, -1, 38, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0042, 0, 1, -1, 38, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0043, 0, 1, -1, 38, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0044, 0, 1, -1, 38, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0024, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0024, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0024, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0024, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0024, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0024, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0024, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0024, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0009, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0009, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0009, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0019, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0019, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B0019, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B001A, 0, 1, -1, 58, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B001B, 0, 1, -1, 58, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B001C, 0, 1, -1, 58, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B001E, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B001D, 0x40000002, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B001D, 0x40000002, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B001D, 0x40000002, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B000A, 0x40000002, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B000A, 0x40000002, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B000A, 0x40000002, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
{ 0x4B000B, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 0.15f, 0.15f, 0.15f } },
{ 0x4B000B, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 0.15f, 0.15f, 0.15f } },
{ 0x4B000B, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 0.15f, 0.15f, 0.15f } },
{ 0x4B0024, 0x1, 2, 47, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 0.4f, 0.4f, 0.4f } },
{ 0x4B0024, 0x1, 2, 48, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 0.4f, 0.4f, 0.4f } },
{ 0x4B0024, 0x1, 2, 49, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 0.4f, 0.4f, 0.4f } },
{ 0x4B0024, 0x1, 2, 50, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 0.4f, 0.4f, 0.4f } },
{ 0x4B000F, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 0.4f, 0.4f, 0.4f } },
{ 0x4B0011, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 0.4f, 0.4f, 0.4f } },
{ 0x4B000D, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 0.4f, 0.4f, 0.4f } },
{ 0x4B0010, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 0.4f, 0.4f, 0.4f } },
{ 0x4B000E, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 0.4f, 0.4f, 0.4f } },
{ 0x4B000C, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 0.4f, 0.4f, 0.4f } },
{ 0x4B000C, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 0.4f, 0.4f, 0.4f } },
{ 0x4B0021, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1.0f, 1.0f, 1.0f } },
{ 0x4B0021, 0, 2, 85, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1.0f, 1.0f, 1.0f } },
{ 0x4B0021, 0, 2, 85, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1.0f, 1.0f, 1.0f } },
{ 0x4B0021, 0, 2, 85, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1.0f, 1.0f, 1.0f } },
{ 0x4B0021, 0, 0, 85, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1.0f, 1.0f, 1.0f } },
{ -1, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1.0f, 1.0f, 1.0f } },
};
void fn_1_D588(DataListModel *model_list)
{
DataListModel *list;
s16 i;
s16 model;
s16 clear_i;
ModelData *model_ptr;
void *data;
list = model_list;
for(clear_i=0; clear_i<90; clear_i++) {
lbl_1_bss_199C2[clear_i] = lbl_1_bss_1990E[clear_i] = -1;
}
for(i=0; list->datanum != 0xFFFFFFFF; list++, i++) {
if(list->type == 0) {
data = HuDataSelHeapReadNum(list->datanum, MEMORY_DEFAULT_NUM, HEAP_DATA);
model = Hu3DModelCreate(data);
lbl_1_bss_199C2[i] = model;
Hu3DModelAttrSet(model, list->attr);
Hu3DModelPosSetV(model, &list->pos);
Hu3DModelRotSetV(model, &list->rot);
Hu3DModelScaleSetV(model, &list->scale);
model_ptr = &Hu3DData[model];
if(model_ptr->unk_08 != -1) {
lbl_1_bss_1990E[i] = model_ptr->unk_08;
}
} else if(list->type == 1) {
data = HuDataSelHeapReadNum(list->datanum, MEMORY_DEFAULT_NUM, HEAP_DATA);
lbl_1_bss_1990E[i] = Hu3DJointMotion(lbl_1_bss_199C2[list->mot_link], data);
}
(void)i;
}
list = model_list;
for(i=0; list->datanum != 0xFFFFFFFF; list++, i++) {
if(list->type == 2) {
model = Hu3DModelLink(lbl_1_bss_199C2[list->link]);
lbl_1_bss_199C2[i] = model;
Hu3DModelAttrSet(model, list->attr);
Hu3DModelPosSetV(model, &list->pos);
Hu3DModelRotSetV(model, &list->rot);
Hu3DModelScaleSetV(model, &list->scale);
}
if(list->type == 0 && list->mot_link != -1) {
Hu3DMotionSet(lbl_1_bss_199C2[i], lbl_1_bss_1990E[list->mot_link]);
}
(void)i;
}
}
void fn_1_D818(DataListSprite *sprite_list)
{
DataListSprite *list;
s16 sprite;
s16 clear_i;
s16 i;
list = sprite_list;
for(clear_i=0; clear_i<1; clear_i++) {
lbl_1_bss_1990A[clear_i] = -1;
}
for(i=0; list->datanum; i++, list++) {
sprite = espEntry(list->datanum, 100, 0);
lbl_1_bss_1990A[i] = sprite;
espPosSet(sprite, list->x, list->y);
espColorSet(sprite, list->color.r, list->color.g, list->color.b);
espTPLvlSet(sprite, list->color.a/255.0f);
espPriSet(sprite, list->prio);
espAttrSet(sprite, list->attr);
}
}
void fn_1_D950(void)
{
s16 i;
for(i=0; i<1; i++) {
if(lbl_1_bss_1990A[i] != -1) {
espKill(lbl_1_bss_1990A[i]);
}
}
}

1498
src/REL/m444dll/main.c Normal file
View file

File diff suppressed because it is too large Load diff

1201
src/REL/m444dll/pinball.c Normal file
View file

File diff suppressed because it is too large Load diff