ovl_En_Ma4 matched and mostly documented (#199)

* First pass

* limbdraw

* another one

* lots of stuff

* stuff

* big one

* func_80ABEB6C

* The NON_MATCHING that matches in reality

* "Fix" some cases

* Fix merge issues

* fix func_80ABF254

* match a pair

* func_80ABF7C8

* func_80ABE1C4

* func_80ABF354

* func_80ABF534

* Import data

* Limb fixes

* Minor renames

* Fix merge issues

* A few renames

* Rename half the functions

* More renames

* More renaming

* documentation finished

* Format

* fix typo

* whoops

* Fix merge issues

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* Update variables names

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
This commit is contained in:
Anghelo Carvajal
2021-07-13 21:49:05 -04:00
committed by GitHub
parent 5453731f4e
commit 5fcd494a7a
16 changed files with 1246 additions and 192 deletions
+5 -5
View File
@@ -1617,7 +1617,7 @@ void func_800EDE34(Actor* actor, GlobalContext* globalCtx, s32 param_3);
void func_800EDF24(Actor* actor, GlobalContext* globalCtx, u32 arg2);
void func_800EDF78(Actor* actor, GlobalContext* globalCtx, s32 iParm3);
void func_800EE0CC(Actor* actor, GlobalContext* globalCtx, s32 iParm3);
// void func_800EE1D8(void);
s32 func_800EE1D8(GlobalContext* globalCtx);
u32 func_800EE200(GlobalContext* globalCtx, u32 uParm2);
u32 func_800EE29C(GlobalContext* globalCtx, u32 uParm2);
u32 func_800EE2F4(GlobalContext* globalCtx);
@@ -2133,7 +2133,7 @@ f32 func_8010C36C(f32 a, f32 b);
// void func_8010DE38(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6);
// void func_8010E028(void);
// void func_8010E968(void);
// void func_8010E9F0(void);
void func_8010E9F0(s16 arg0, s16 arg1);
// void func_8010EA9C(void);
// void func_8010EB50(void);
// void func_8010EBA0(void);
@@ -2146,7 +2146,7 @@ void Interface_ChangeAlpha(u16 param_1);
// void func_80110038(void);
// void func_80111CB4(void);
// void func_801129E4(void);
// void func_80112AFC(void);
void func_80112AFC(GlobalContext* globalCtx);
// void func_80112B40(void);
// void func_80112BE4(void);
// void func_80112C0C(void);
@@ -3856,7 +3856,7 @@ void func_8019F128(u16 sfxId);
// void func_8019F170(void);
void func_8019F1C0(Vec3f* pos, u16 sfxId);
void func_8019F208(void);
void func_8019F230(void);
void func_8019F230(void); // Plays "No" sound
// void func_8019F258(void);
// void func_8019F300(void);
// void func_8019F420(void);
@@ -4027,7 +4027,7 @@ void func_801A7794(u32 param_1, u32 param_2, u32 param_3);
// void func_801A7B10(void);
// void func_801A7D04(void);
// void func_801A7D84(void);
// void func_801A89A8(UNK_TYPE arg0);
void func_801A89A8(s32 arg0);
// void func_801A89D0(void);
s32 func_801A8A50(s32 param1);
// void func_801A8ABC(void);
+1 -1
View File
@@ -1055,7 +1055,7 @@
#define NA_SE_EV_ZORA_KIDS_SWIM_2 0x29BC
#define NA_SE_EV_DARUMA_VANISH 0x29BD
#define NA_SE_EV_IKANA_SOUL_TRANSFORM 0x29BE
#define NA_SE_EV_ROMANY_BOW_FLICK 0x29BF
#define NA_SE_EV_ROMANI_BOW_FLICK 0x29BF
#define NA_SE_EV_WHITE_FAIRY_SHOT_DASH 0x29C0
#define NA_SE_EV_BLACK_FAIRY_SHOT_DASH 0x29C1
#define NA_SE_EV_SWORD_FORGE 0x29C2
+14 -6
View File
@@ -749,8 +749,8 @@ typedef struct {
/* 0x220 */ s16 unk_220;
/* 0x222 */ s16 unk_222;
/* 0x224 */ s16 unk_224;
/* 0x226 */ s16 unk_226;
/* 0x228 */ s16 unk_228;
/* 0x226 */ s16 lifeColorChange;
/* 0x228 */ s16 lifeColorChangeDirection;
/* 0x22A */ s16 beatingHeartPrim[3];
/* 0x230 */ s16 beatingHeartEnv[3];
/* 0x236 */ s16 heartsPrimR[2];
@@ -761,8 +761,8 @@ typedef struct {
/* 0x24A */ s16 heartsEnvB[2];
/* 0x24E */ s16 unk_24E;
/* 0x250 */ s16 unk_250;
/* 0x252 */ s16 unk_252;
/* 0x254 */ s16 beatingHeartState; // 1 means shrinking, 0 growing
/* 0x252 */ s16 lifeSizeChange;
/* 0x254 */ s16 lifeSizeChangeDirection; // 1 means shrinking, 0 growing
/* 0x256 */ s16 unk_256;
/* 0x258 */ s16 unk_258;
/* 0x25A */ u8 numHorseBoosts;
@@ -986,7 +986,11 @@ typedef struct {
/* 0x12070 */ UNK_TYPE1 pad12070[0x8];
/* 0x12078 */ s32 bankRupeesSelected;
/* 0x1207C */ s32 bankRupees;
/* 0x12080 */ UNK_TYPE1 pad12080[0x60];
/* 0x12080 */ UNK_TYPE1 pad12080[0x30];
/* 0x120B0 */ UNK_TYPE1 pad120B0[0x1];
/* 0x120B1 */ u8 unk_120B1;
/* 0x120B2 */ UNK_TYPE1 pad120B2[0x2];
/* 0x120B4 */ UNK_TYPE1 pad120B4[0x2C];
} MessageContext; // size = 0x120E0
typedef struct ActorBgMbarChair ActorBgMbarChair;
@@ -1576,7 +1580,11 @@ struct ActorContext {
/* 0x250 */ void* unk250; // allocation of 0x20f0 bytes?
/* 0x254 */ u32 unk254[5];
/* 0x268 */ u8 unk268;
/* 0x269 */ UNK_TYPE1 pad269[0x1B];
/* 0x269 */ UNK_TYPE1 pad269[0x3];
/* 0x26C */ UNK_TYPE1 pad26C[0xC];
/* 0x278 */ u16 unk278;
/* 0x27A */ UNK_TYPE1 pad27A[0x2];
/* 0x27C */ UNK_TYPE1 pad27C[0x8];
}; // size = 0x284
typedef struct {
+1 -1
View File
@@ -39,7 +39,7 @@ typedef struct {
/* 0x04 */ s16 cylHeight;
/* 0x06 */ s16 cylYShift;
/* 0x08 */ u8 mass;
} CollisionCheckInfoInit2;
} CollisionCheckInfoInit2; // size = 0xC
typedef struct {
/* 0x00 */ DamageTable* damageTable;