mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-09-01 09:43:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompiled ovl_En_Ma1 (#83)

Browse Source 
* first steps

* some more

* fixing merge

* more progress

* progs

* Decompiled ovl_En_Ma1

* newline

* Pr suggestion

* Fixing some small things

* Update src/overlays/actors/ovl_En_Ma1/z_en_ma1.c

Co-Authored-By: Roman971 <32455037+Roman971@users.noreply.github.com>

* Removing padding

* Fixing script

* Fixing some things

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Ethan Roseman
2020-04-27 01:47:35 -04:00
committed by GitHub
parent e126e37084
commit d58983494c
34 changed files with 585 additions and 1379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+2
View File
@@ -400,6 +400,7 @@ Hilite* func_8003435C(Vec3f* object, GlobalContext* globalCtx);
s32 func_800343CC(GlobalContext* globalCtx, Actor* actor, s16* arg2, f32 arg3, u16 (*unkFunc1)(GlobalContext*, Actor*),
s16 (*unkFunc2)(GlobalContext*, Actor*));
s16 func_800347E8(s16 arg0);
void func_80034A14(Actor* actor, struct_80034A14_arg1* arg1, s16 arg2, s16 arg3);
void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbDraw2 overrideLimbDraw,
PostLimbDraw2 postLimbDraw, Actor* actor, s16 alpha);
void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbDraw2 overrideLimbDraw,
@@ -2154,6 +2155,7 @@ void func_800F59E8(u16);
// ? func_800F5CF8(?);
// ? func_800F5E18(?);
// ? func_800F5E90(?);
void func_800F6268(f32, UNK_TYPE);
// ? func_800F64E0(?);
// ? func_800F66C0(?);
// ? func_800F6700(?);
include/z64.h
+14 -3
View File
@@ -604,9 +604,11 @@ typedef struct {
/* 0xE3E2 */ u16 unk_E3E2;
/* 0xE3E4 */ u8 unk_E3E4;
/* 0xE3E5 */ u8 choiceIndex;
/* 0xE3E6 */ char unk_E3E6[0x08];
/* 0xE3E6 */ char unk_E3E6[0x01];
/* 0xE3E7 */ u8 unk_E3E7;
/* 0xE3E8 */ char unk_E3E8[0x6];
/* 0xE3EE */ u16 unk_E3EE;
/* 0xE3EE */ u16 unk_E3F0;
/* 0xE3F0 */ u16 unk_E3F0;
/* 0xE3F2 */ char unk_E3F2[0x02];
/* 0xE3F4 */ u16 unk_E3F4;
/* 0xE3F6 */ char unk_E3F6[0x16];
@@ -1129,6 +1131,14 @@ typedef struct {
/* 0x14 */ f32 transitionRate;
} struct_80034EC0_Entry; // size = 0x18
// Another animation related structure
typedef struct {
/* 0x00 */ AnimationHeader* animation;
/* 0x04 */ f32 frameCount;
/* 0x08 */ u8 unk_08;
/* 0x0C */ f32 transitionRate;
} struct_D_80AA1678; // size = 0x10
typedef struct {
/* 0x00 */ s16 unk_00;
/* 0x02 */ s16 unk_02;
@@ -1138,6 +1148,7 @@ typedef struct {
/* 0x0E */ Vec3s unk_0E;
/* 0x14 */ f32 unk_14;
/* 0x18 */ Vec3f unk_18;
/* 0x24 */ char unk_24[0x4];
} struct_80034A14_arg1;
typedef struct {
@@ -1577,7 +1588,7 @@ typedef struct {
/* 0xB4 */ JpegWork* workBuf;
} JpegContext; // size = 0xB8
typedef struct {
typedef struct {
/* 0x00 */ char unk_00[0x08];
/* 0x08 */ Color_RGBA8 color;
/* 0x0C */ char unk_0C[0x0C];
include/z64actor.h
+2 -1
View File
@@ -250,7 +250,8 @@ typedef struct {
/* 0x0698 */ f32 unk_698;
/* 0x069C */ char unk_69C[0x008];
/* 0x06A4 */ f32 unk_6A4;
/* 0x06A8 */ char unk_6A8[0x5];
/* 0x06A8 */ Actor* unk_6A8;
/* 0x06AC */ char unk_6AC[0x001];
/* 0x06AD */ u8 unk_6AD;
/* 0x06AE */ char unk_6AE[0x1A];
/* 0x06C8 */ SkelAnime skelAnime2;