mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-09 05:43:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add most of ovl_Bg_Fu_Kaiten_0x80ACB400

Browse Source
This commit is contained in:
rozlette
2019-02-26 00:31:51 -06:00
parent c10a68cf07
commit 79c2ce743d
6 changed files with 164 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+5 -5
View File
@@ -1016,13 +1016,13 @@ void func_800BE03C(z_GlobalContext*, UNK_TYPE); // func_800BE03C
UNK_TYPE func_800C6024(UNK_TYPE); // func_800C6024
// UNK_RET func_800C6044(UNK_ARGS);
// UNK_RET func_800C6098(UNK_ARGS);
// UNK_RET func_800C6188(UNK_ARGS);
UNK_TYPE func_800C6188(z_GlobalContext*, UNK_PTR, z_Actor*, UNK_TYPE);
UNK_TYPE func_800C6248(UNK_TYPE, UNK_TYPE); // func_800C6248
// UNK_RET func_800C62BC(UNK_ARGS);
// UNK_RET func_800C6314(UNK_ARGS);
// UNK_RET func_800C636C(UNK_ARGS);
// UNK_RET func_800C641C(UNK_ARGS);
// UNK_RET func_800C64CC(UNK_ARGS);
UNK_RET func_800C64CC(z_GlobalContext*, UNK_PTR, UNK_TYPE);
// UNK_RET func_800C6554(UNK_ARGS);
// UNK_RET func_800C656C(UNK_ARGS);
// UNK_RET func_800C6838(UNK_ARGS);
@@ -1042,7 +1042,7 @@ UNK_TYPE func_800C6248(UNK_TYPE, UNK_TYPE); // func_800C6248
// UNK_RET func_800C921C(UNK_ARGS);
// UNK_RET func_800C9380(UNK_ARGS);
// UNK_RET func_800C94E0(UNK_ARGS);
// UNK_RET func_800C9564(UNK_ARGS);
UNK_RET func_800C9564(UNK_TYPE, UNK_PTR);
// UNK_RET func_800C9640(UNK_ARGS);
// UNK_RET func_800C9694(UNK_ARGS);
// UNK_RET func_800C9704(UNK_ARGS);
@@ -1080,7 +1080,7 @@ UNK_RET func_800CAAD0(UNK_TYPE, UNK_TYPE, UNK_TYPE); // func_800CAAD0
UNK_RET func_800CAC0C(UNK_TYPE, UNK_TYPE, UNK_TYPE); // func_800CAC0C
UNK_RET func_800CACA0(UNK_TYPE, UNK_TYPE, UNK_TYPE); // func_800CACA0
UNK_TYPE func_800CAD2C(UNK_TYPE, UNK_TYPE, UNK_TYPE); // func_800CAD2C
// UNK_RET func_800CAE10(UNK_ARGS);
UNK_RET func_800CAE10(z_Actor*, UNK_TYPE);
// UNK_RET func_800CAE34(UNK_ARGS);
// UNK_RET func_800CAE7C(UNK_ARGS);
UNK_RET func_800CAE88(UNK_TYPE); // func_800CAE88
@@ -4219,7 +4219,7 @@ UNK_RET func_8019F0C8(UNK_TYPE); // func_8019F0C8
// UNK_RET func_8019F88C(UNK_ARGS);
// UNK_RET func_8019F900(UNK_ARGS);
// UNK_RET func_8019FA18(UNK_ARGS);
// UNK_RET func_8019FAD8(UNK_ARGS);
UNK_RET func_8019FAD8(UNK_PTR, UNK_TYPE, f32);
// UNK_RET func_8019FB0C(UNK_ARGS);
// UNK_RET func_8019FC20(UNK_ARGS);
// UNK_RET func_8019FCB8(UNK_ARGS);
include/structs.h
+22 -15
View File
@@ -118,26 +118,31 @@ typedef void(*z_ActorFunc)(struct z_Actor*, void*);
typedef struct {
/* 0x000 */ u8 pad0[4];
/* 0x004 */ UNK_TYPE unk4;
/* 0x008 */ u8 pad1[0x14];
/* 0x008 */ z_Vector3D unk8; // Pos1?
/* 0x014 */ u8 pad1[0x8];
/* 0x01C */ s16 unk1C;
/* 0x01E */ u8 pad2[0x3A];
/* 0x01E */ u8 pad2[0x6];
/* 0x024 */ z_Vector3D unk24; // Pos2?
/* 0x030 */ u8 pad3[0x28];
/* 0x058 */ z_Vector3D unk58; // scale?
/* 0x064 */ u8 pad3[0x2E];
/* 0x064 */ u8 pad4[0x2E];
/* 0x092 */ s16 unk92;
/* 0x094 */ u8 pad4[0x22];
/* 0x094 */ u8 pad5[0x22];
/* 0x0B6 */ u8 unkB6;
/* 0x0B7 */ u8 pad5[5];
/* 0x0B7 */ u8 pad6[5];
/* 0x0BC */ u16 unkBC; // or char
/* 0x0BE */ s16 unkBE;
/* 0x0C0 */ u8 pad6[0x3C];
/* 0x0C0 */ u8 pad7[0x2C];
/* 0x0EC */ UNK_TYPE unkEC;
/* 0x0F0 */ u8 pad8[0xC];
/* 0x0FC */ f32 unkFC; // start of z_Vector3D?
/* 0x100 */ f32 unk100;
/* 0x104 */ f32 unk104;
/* 0x108 */ u8 pad7[0xE];
/* 0x108 */ u8 pad9[0xE];
/* 0x116 */ u16 unk116;
/* 0x118 */ u8 pad8[0x24];
/* 0x118 */ u8 pad10[0x24];
/* 0x13C */ z_ActorFunc drawFunc;
/* 0x140 */ u8 pad9[4];
/* 0x140 */ u8 pad11[4];
// TODO figure out what size this is
} z_Actor;
@@ -158,17 +163,19 @@ typedef struct {
typedef struct {
/* 0x00000 */ z_GraphicsContext* unk0;
/* 0x00004 */ u8 pad0[0x1C9C];
/* 0x00004 */ u8 pad0[0x87C];
/* 0x00880 */ UNK_TYPE unk880;
/* 0x00884 */ u8 pad1[0x141C];
/* 0x01CA0 */ UNK_TYPE unk1CA0;
/* 0x01CA4 */ u8 pad1[0x28];
/* 0x01CA4 */ u8 pad2[0x28];
/* 0x01CCC */ sGlobalContext1CCC* unk1CCC;
/* 0x01CD0 */ u8 pad2[0x15330];
/* 0x01CD0 */ u8 pad3[0x15330];
/* 0x17000 */ u16 unk17000;
/* 0x17002 */ u8 pad3[0xD86];
/* 0x17002 */ u8 pad4[0xD86];
/* 0x17D88 */ UNK_TYPE unk17D88;
/* 0x17D8C */ u8 pad4[0xAB4];
/* 0x17D8C */ u8 pad5[0xAB4];
/* 0x18840 */ UNK_TYPE unk18840;
/* 0x18844 */ u8 pad5[0x40];
/* 0x18844 */ u8 pad6[0x40];
/* 0x18884 */ UNK_TYPE unk18884;
} z_GlobalContext;
include/variables.h
+3 -3
View File
@@ -698,7 +698,7 @@ extern UNK_TYPE D_00C7A4E0; // D_00C7A4E0
//extern UNK_TYPE D_060005C0;
//extern UNK_TYPE D_060005C4;
//extern UNK_TYPE D_060005C8;
//extern UNK_TYPE D_060005D0;
extern UNK_TYPE D_060005D0;
//extern UNK_TYPE D_060005D4;
//extern UNK_TYPE D_060005F8;
//extern UNK_TYPE D_060005FC;
@@ -1058,7 +1058,7 @@ extern UNK_TYPE D_06001228; // D_06001228
//extern UNK_TYPE D_06002CD0;
//extern UNK_TYPE D_06002CE0;
//extern UNK_TYPE D_06002D28;
//extern UNK_TYPE D_06002D30;
extern UNK_TYPE D_06002D30;
//extern UNK_TYPE D_06002D84;
//extern UNK_TYPE D_06002DD4;
//extern UNK_TYPE D_06002DE8;
@@ -11194,7 +11194,7 @@ extern f32 D_808637D0; // D_808637D0
//extern UNK_TYPE D_80ACA9F0;
//extern UNK_TYPE D_80ACB140;
//extern UNK_TYPE D_80ACB3B0;
//extern UNK_TYPE D_80ACB650;
extern f32 D_80ACB650;
//extern UNK_TYPE D_80ACC2C0;
//extern UNK_TYPE D_80ACC2EC;
//extern UNK_TYPE D_80ACC308;