falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Boss_02 (3 non-matching) (#324) 

* Boss_02

* Fixups

* Warnings
This commit is contained in:
Maide 2021-11-05 12:04:10 +00:00 committed by GitHub
parent fcb09f5e28
commit 693c701025
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 2206 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/functions.h
View File

@ -979,7 +979,7 @@ CollisionHeader* BgCheck_GetActorMeshHeader(CollisionContext* colCtx, s32 index)
// void func_800C3C94(void);
f32 func_800C3D50(s32 arg0, CollisionContext* colCtx, s32 arg2, CollisionPoly** arg3, s32* arg4, Vec3f* pos, Actor* actor, s32 arg7, f32 arg8, s32 arg9);
// void func_800C3F40(void);
// void func_800C3FA0(void);
f32 func_800C3FA0(CollisionContext* colCtx, CollisionPoly** arg1, Vec3f* arg2);
f32 func_800C4000(GlobalContext* globalCtx, CollisionContext* colCtx, s32* arg2, Vec3f* arg3);
// void func_800C4058(void);
f32 func_800C40B4(CollisionContext* colCtx, CollisionPoly** arg1, s32* arg2, Vec3f* pos);
@ -2742,7 +2742,7 @@ s32 func_8013E5CC(Vec3f* param_1, Vec3s* param_2, Vec3f* param_3, Vec3f* param_4
// void func_8013E8F8(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7);
s32 func_8013E950(Vec3f* param_1, Vec3f* param_2, s16 param_3, Vec3f* param_4, Vec3f* param_5, s16* param_6, s16* param_7, s16* param_8, s16* param_9, u16 param_10, u16 param_11, u16 param_12, u16 param_13);
// void func_8013EC10(void);
// void func_8013EC44(void);
void func_8013EC44(f32 arg0, u8 arg1, u8 arg2, u8 arg3);
void func_8013ECE0(f32 xyzDistToPlayerSq, u8 arg1, u8 arg2, u8 arg3);
void func_8013ED9C(void);
void func_8013EDD0(void);
@ -3007,8 +3007,8 @@ void func_80165438(UNK_PTR param_1);
// void func_80165608(void);
// void func_80165630(void);
// void func_80165658(void);
// void func_8016566C(void);
// void func_80165690(void);
void func_8016566C(s32 arg0);
void func_80165690(void);
// void func_801656A4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8);
// void func_80165DCC(void);
// void func_80165DF0(void);
@ -3044,7 +3044,7 @@ void func_80169600(GlobalContext* globalCtx, s16 param_2);
// void func_80169668(void);
Camera* Play_GetCamera(GlobalContext* globalCtx, s16 index);
s32 Play_CameraSetAtEye(GlobalContext* globalCtx, s16 camId, Vec3f* at, Vec3f* eye);
// void func_8016981C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
void func_8016981C(GlobalContext* globalCtx, s16 arg1, Vec3f* arg2, Vec3f* arg3, Vec3f* arg4);
// void func_80169940(void);
// void func_80169988(void);
void func_801699D4(GlobalContext* globalCtx, s16 arg1, s16 arg2);

7
include/variables.h
View File

@ -3258,7 +3258,7 @@ extern u8 actorCutsceneWaiting[16];
// extern UNK_TYPE1 D_801F4E08;
extern u8 actorCutsceneNextCutscenes[16];
// extern UNK_TYPE1 D_801F4E20;
// extern UNK_TYPE1 D_801F4E30;
extern u8 D_801F4E30;
// extern UNK_TYPE1 D_801F4E31;
// extern UNK_TYPE1 D_801F4E32;
// extern UNK_TYPE1 D_801F4E38;
@ -3920,7 +3920,7 @@ extern UNK_TYPE D_04015FA0;
extern UNK_TYPE D_04016360;
extern UNK_TYPE D_0401A4D0;
extern UNK_TYPE D_0401A538;
extern UNK_TYPE D_0401A620;
extern Gfx D_0401A620[];
extern Gfx D_0401C430[];
extern UNK_TYPE D_0401F740;
extern UNK_TYPE D_0401F7C0;
@ -3932,7 +3932,8 @@ extern UNK_TYPE D_04023100;
extern UNK_TYPE D_04023130;
extern Gfx D_04023210[];
extern UNK_TYPE D_04023288;
extern UNK_TYPE D_04023348;
extern Gfx D_04023348[];
extern Gfx D_04023428[];
extern UNK_TYPE D_04025850;
extern UNK_TYPE D_04025DD0;
extern UNK_TYPE D_040281DC;

8
spec
View File

@ -2548,9 +2548,11 @@ beginseg
name "ovl_Boss_02"
compress
include "build/src/overlays/actors/ovl_Boss_02/z_boss_02.o"
include "build/data/ovl_Boss_02/ovl_Boss_02.data.o"
include "build/data/ovl_Boss_02/ovl_Boss_02.bss.o"
include "build/data/ovl_Boss_02/ovl_Boss_02.reloc.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_Boss_02/ovl_Boss_02_reloc.o"
#else
include "build/data/ovl_Boss_02/ovl_Boss_02.reloc.o"
#endif
endseg
beginseg

2160
src/overlays/actors/ovl_Boss_02/z_boss_02.c
View File

File diff suppressed because it is too large Load Diff

82
src/overlays/actors/ovl_Boss_02/z_boss_02.h
View File

@ -7,11 +7,89 @@ struct Boss02;
typedef void (*Boss02ActionFunc)(struct Boss02*, GlobalContext*);
typedef struct {
/* 0x00 */ Vec3f unk_00;
/* 0x0C */ Vec3f unk_0C;
/* 0x18 */ Vec3f unk_18;
/* 0x24 */ u8 unk_24;
/* 0x26 */ s16 unk_26;
/* 0x28 */ UNK_TYPE1 unk_28[0x4];
/* 0x2C */ s16 unk_2C;
/* 0x2E */ s16 unk_2E;
/* 0x30 */ s16 unk_30;
/* 0x34 */ f32 unk_34;
/* 0x38 */ f32 unk_38;
} Boss02Effects; // size = 0x3C
typedef struct Boss02 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x152C];
/* 0x0144 */ u8 unk_0144;
/* 0x0146 */ s16 unk_0146[3];
/* 0x014C */ s16 unk_014C;
/* 0x014E */ s16 unk_014E;
/* 0x0150 */ s16 unk_0150;
/* 0x0152 */ s16 unk_0152;
/* 0x0154 */ s16 unk_0154;
/* 0x0156 */ s16 unk_0156;
/* 0x0158 */ s16 unk_0158;
/* 0x015A */ s16 unk_015A;
/* 0x015C */ u8 unk_015C;
/* 0x015D */ UNK_TYPE1 unk015D[0x7];
/* 0x0164 */ f32 unk_0164;
/* 0x0168 */ f32 unk_0168;
/* 0x016C */ s16 unk_016C;
/* 0x0170 */ Vec3f unk_0170;
/* 0x017C */ Vec3f unk_017C;
/* 0x018C */ Vec3f unk_0188;
/* 0x0194 */ u8 unk_0194;
/* 0x0195 */ u8 unk_0195;
/* 0x0196 */ s16 unk_0196;
/* 0x0198 */ s16 unk_0198;
/* 0x019A */ s16 unk_019A;
/* 0x019C */ f32 unk_019C;
/* 0x01A0 */ f32 unk_01A0;
/* 0x01A4 */ s16 unk_01A4;
/* 0x01A8 */ f32 unk_01A8;
/* 0x01AC */ f32 unk_01AC;
/* 0x01B0 */ Vec3f unk_01B0;
/* 0x01BC */ Vec3f unk_01BC[200];
/* 0x0B1c */ Vec3f unk_0B1C[200];
/* 0x147C */ Vec3f unk_147C[23];
/* 0x1590 */ SkelAnime skelAnime;
/* 0x15D4 */ Vec3s jointTable[13];
/* 0x1622 */ Vec3s morphTable[13];
/* 0x1670 */ Boss02ActionFunc actionFunc;
/* 0x1674 */ char unk_1674[0x70C];
/* 0x1674 */ struct Boss02* unk_1674; // points to the other's instance
/* 0x1678 */ s32 unk_1678;
/* 0x167C */ Vec3f unk_167C;
/* 0x1688 */ ColliderJntSph colliderSphere1;
/* 0x16A8 */ ColliderJntSphElement colliderSphere1Elements[22];
/* 0x1C28 */ ColliderJntSph colliderSphere2;
/* 0x1C48 */ ColliderJntSphElement colliderSphere2Elements[2];
/* 0x1CC8 */ ColliderCylinder colliderCylinder;
/* 0x1D14 */ u32 unk_1D14;
/* 0x1D18 */ s16 unk_1D18;
/* 0x1D1A */ s16 unk_1D1A;
/* 0x1D1C */ u32 unk_1D1C;
/* 0x1D20 */ s16 unk_1D20;
/* 0x1D22 */ s16 unk_1D22;
/* 0x1D24 */ Vec3f unk_1D24;
/* 0x1D30 */ Vec3f unk_1D30;
/* 0x1D3C */ Vec3f unk_1D3C;
/* 0x1D48 */ Vec3f unk_1D48;
/* 0x1D54 */ f32 unk_1D54;
/* 0x1D58 */ f32 unk_1D58;
/* 0x1D5C */ f32 unk_1D5C;
/* 0x1D60 */ UNK_TYPE1 unk1D60[0x4];
/* 0x1D64 */ f32 unk_1D64;
/* 0x1D68 */ f32 unk_1D68;
/* 0x1D6C */ f32 unk_1D6C;
/* 0x1D70 */ f32 unk_1D70;
/* 0x1D74 */ f32 unk_1D74;
/* 0x1D78 */ u8 unk_1D78;
/* 0x1D7A */ s16 unk_1D7A;
/* 0x1D7C */ s16 unk_1D7C;
/* 0x1D7E */ s16 unk_1D7E;
} Boss02; // size = 0x1D80
extern const ActorInit Boss_02_InitVars;

5
src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h
View File

@ -11,7 +11,10 @@ typedef struct DoorWarp1 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x94];
/* 0x01D8 */ DoorWarp1ActionFunc actionFunc;
/* 0x01DC */ char unk_1DC[0x30];
/* 0x01DC */ char unk_1DC[0x27];
/* 0x0203 */ u8 unk_203;
/* 0x0204 */ f32 unk_204;
/* 0x0208 */ char unk_208[0x4];
} DoorWarp1; // size = 0x20C
extern const ActorInit Door_Warp1_InitVars;

1
tools/actorfixer.py
View File

@ -45,6 +45,7 @@ animdict = {
"SysMatrix_NormalizeXYZ": "Matrix_NormalizeXYZ",
"SysMatrix_InsertRotationAroundUnitVector_f": "Matrix_InsertRotationAroundUnitVector_f",
"SysMatrix_InsertRotationAroundUnitVector_s": "Matrix_InsertRotationAroundUnitVector_s",
"SysMatrix_GetStateAsRSPMatrix": "Matrix_GetStateAsRSPMatrix",
"func_800B78B8": "Actor_UpdateBgCheckInfo",
"func_8012403C": "Player_GetMask",
"func_8012404c": "Player_RemoveMask",

4
tools/disasm/variables.txt
View File

@ -10420,8 +10420,8 @@
0x809DF570:("D_809DF570","UNK_TYPE1","",0x1),
0x809DF590:("Boss_02_InitVars","UNK_TYPE1","",0x1),
0x809DF5B0:("D_809DF5B0","f32","",0x4),
0x809DF5B6:("D_809DF5B6","UNK_TYPE2","",0x2),
0x809DF5E6:("D_809DF5E6","UNK_TYPE2","",0x2),
0x809DF5B4:("D_809DF5B4","UNK_TYPE2","[24]",0x30),
0x809DF5E4:("D_809DF5E4","UNK_TYPE2","[24]",0x30),
0x809DF614:("D_809DF614","UNK_TYPE1","",0x1),
0x809DF92C:("D_809DF92C","UNK_TYPE1","",0x1),
0x809DF93C:("D_809DF93C","UNK_TYPE1","",0x1),

22
undefined_syms.txt
View File

@ -1017,6 +1017,28 @@ D_060041A0 = 0x060041A0;
D_06008650 = 0x06008650;
D_06009B10 = 0x06009B10;
D_06009C78 = 0x06009C78;
D_0600ECF0 = 0x0600ECF0;
D_0600EF90 = 0x0600EF90;
D_0600F310 = 0x0600F310;
D_0600F690 = 0x0600F690;
D_0600FA10 = 0x0600FA10;
D_0600FD90 = 0x0600FD90;
D_06010110 = 0x06010110;
D_06010490 = 0x06010490;
D_06010810 = 0x06010810;
D_06010B90 = 0x06010B90;
D_06010F10 = 0x06010F10;
D_06011290 = 0x06011290;
D_06011610 = 0x06011610;
D_06011990 = 0x06011990;
D_06011D10 = 0x06011D10;
D_06012090 = 0x06012090;
D_06012410 = 0x06012410;
D_06012790 = 0x06012790;
D_06012B10 = 0x06012B10;
D_06012E90 = 0x06012E90;
D_06013210 = 0x06013210;
D_06013590 = 0x06013590;
// ovl_Boss_03