mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-01 08:07:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

ovl_en_in OK (#173)

Browse Source 
* First pass, 5 still non matching

* data

* cleanup

* Progress on func_808F33B8

* func_808F33B8 is ugly but it matches

* func_808F5728 ugly but matches

* cleanup

* More cleanup/doc a possible inifite loop bug

* Cleanup of the switch

* Readd functions returns

* More progress on THE switch

* Everything matches but the MACROS

* OK

* Add new global Animaion struct

* fix arg name

* PR suggestions pt 1

* PR suggestions pt 2

* Fix up a few things

* Add comment about walking flag

* update functions.txt

* Update 7 to more explicit bits

* More PR cleanup
This commit is contained in:
Derek Hensley
2021-06-10 20:08:25 -07:00
committed by GitHub
parent 059c9075ca
commit 70b67402cb
12 changed files with 1692 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+17 -17
View File
@@ -807,11 +807,11 @@ f32* func_800B8248(PosRot* param_1, ActorPlayer* param_2);
// void func_800B83F8(void);
s32 func_800B84D0(Actor* actor, GlobalContext* globalCtx); // Actor_IsTalking
s32 func_800B8500(Actor* actor, GlobalContext* globalCtx, f32 fParm3, f32 fParm4, s32 param_5);
void func_800B85E0(Actor* actor, GlobalContext* globalCtx, f32 uParm3, s32 uParm4);
void func_800B8614(Actor* actor, GlobalContext* globalCtx, f32 uParm3);
void func_800B863C(Actor* actor, GlobalContext* globalCtx);
s32 func_800B85E0(Actor* actor, GlobalContext* globalCtx, f32 uParm3, s32 uParm4);
s32 func_800B8614(Actor* actor, GlobalContext* globalCtx, f32 uParm3);
s32 func_800B863C(Actor* actor, GlobalContext* globalCtx);
u32 func_800B867C(Actor* actor, GlobalContext* globalCtx);
// UNK_TYPE4 func_800B86C8(UNK_TYPE4 param_1, GlobalContext* globalCtx, UNK_TYPE4 param_3);
UNK_TYPE4 func_800B86C8(Actor* actor1, GlobalContext* globalCtx, Actor* actor2);
s32 func_800B8708(GlobalContext* globalCtx);
// void func_800B8718(void);
// void func_800B874C(void);
@@ -819,7 +819,7 @@ s32 func_800B8708(GlobalContext* globalCtx);
// void func_800B882C(void);
// void func_800B886C(void);
void func_800B8898(GlobalContext* globalCtx, Actor* actor, UNK_PTR param_3, UNK_PTR param_4);
// void func_800B8934(void);
s32 func_800B8934(GlobalContext* globalCtx, Actor* actor);
u32 Actor_HasParent(Actor* actor, GlobalContext* globalCtx);
UNK_TYPE4 func_800B8A1C(Actor* actor, GlobalContext* globalCtx, s32 iParm3, f32 fParm4, f32 param_5);
// void func_800B8B84(void);
@@ -1723,7 +1723,7 @@ void FireObj_Update(GlobalContext* globalCtx, FireObj* fire);
// void func_800F3ED4(void);
void func_800F40A0(GlobalContext* globalCtx, s32 param_2);
// void func_800F415C(void);
// void func_800F41E4(void);
UNK_TYPE func_800F41E4(GlobalContext* globalCtx, ActorContext* actorCtx);
// void func_800F42A0(void);
// void func_800F43BC(void);
// void func_800F44F4(void);
@@ -1789,7 +1789,7 @@ void func_800FD654(GlobalContext* globalCtx, Color_RGB8* pzParm2, f32 fParm3);
// u32 get_days_elapsed(void);
// void reset_days_elapsed(void);
// u32 get_current_day(void);
// void func_800FD750(void);
void func_800FD750(UNK_TYPE arg0);
// void func_800FD768(void);
void func_800FD78C(GlobalContext* globalCtx);
void func_800FD858(GlobalContext* globalCtx);
@@ -2149,7 +2149,7 @@ u32 Item_Give(GlobalContext* globalCtx, u8 param_2);
// void func_80114A9C(void);
// void func_80114B84(void);
// void func_80114CA0(void);
// void func_80114E90(void);
UNK_TYPE func_80114E90(void);
// void func_80114F2C(void);
// void func_80114FD0(void);
// void func_80115130(void);
@@ -2162,7 +2162,7 @@ u32 Item_Give(GlobalContext* globalCtx, u8 param_2);
void func_80115844(GlobalContext* globalCtx, s16 param_2);
void func_80115908(GlobalContext* globalCtx, u8 param_2);
void func_801159c0(s16 param_1);
// void func_801159EC(void);
void func_801159EC(s16 arg0);
// void func_80115A14(void);
// void Parameter_AddMagic(void);
// void func_80115D5C(void);
@@ -2709,18 +2709,18 @@ UNK_TYPE func_8013BC6C(SkelAnime* skelAnime, UNK_PTR arg1, s32 arg2);
// void func_8013CD64(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE1 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7);
// void func_8013CF04(void);
// void func_8013D0E0(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
// void func_8013D2E0(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);
// void func_8013D5E8(void);
// void func_8013D648(void);
// void func_8013D68C(void);
void func_8013D2E0(Vec3f* arg0, PosRot* arg1, ActorShape* arg2, s16* arg3, s16* arg4, s16* arg5, s16* arg6);
UNK_TYPE func_8013D5E8(s16 arg0, UNK_TYPE arg1, s16 arg2);
u8* func_8013D648(GlobalContext *globalCtx, s16 arg1, s32 arg2);
UNK_TYPE func_8013D68C(u8* arg0, s16 arg1, UNK_PTR arg2);
// void func_8013D720(void);
// void func_8013D768(void);
UNK_TYPE func_8013D768(Actor* actor, UNK_PTR arg1, s16 arg2);
// void func_8013D83C(void);
// void func_8013D8DC(void);
// void func_8013D924(void);
Actor* func_ActorCategoryIterateById(GlobalContext* globalCtx, struct Actor* actorListStart, s32 actorCategory, s32 actorId);
// void func_8013D9C8(void);
// void func_8013DB90(void);
void func_8013D9C8(GlobalContext* globalCtx, s16* arg1, s16* arg2, UNK_TYPE arg3);
u8 func_8013DB90(GlobalContext* globalCtx, UNK_PTR arg1, f32 arg2);
// void func_8013DC40(void);
// void func_8013DCE0(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, UNK_TYPE4 param_9, UNK_TYPE1 param_10);
// void func_8013DE04(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
@@ -3860,7 +3860,7 @@ void func_8019F230(void);
// void func_8019F780(void);
// void func_8019F7D8(void);
// void func_8019F830(void);
// void func_8019F88C(void);
void func_8019F88C(Vec3f* arg0, UNK_TYPE arg1, UNK_TYPE arg2);
// void func_8019F900(void);
// void func_8019FA18(void);
void func_8019FAD8(Vec3f* param_1, u16 param_2, f32 param_3);
include/variables.h
+1 -1
View File
@@ -957,7 +957,7 @@ extern GameStateOverlay daytelopGameStateInfo;
// extern UNK_TYPE2 D_801BDA78;
// extern UNK_TYPE2 D_801BDA7C;
// extern UNK_TYPE4 D_801BDA9C;
// extern UNK_TYPE4 D_801BDAA0;
extern UNK_TYPE4 D_801BDAA0;
// extern UNK_TYPE4 D_801BDAA4;
// extern UNK_TYPE2 D_801BDAA8;
// extern UNK_TYPE2 D_801BDAAA;
include/z64actor.h
+9
View File
@@ -358,6 +358,15 @@ typedef struct {
/* 0x14 */ f32 morphFrames;
} ActorAnimationEntry; // size = 0x18
typedef struct {
/* 0x00 */ AnimationHeader* animationSeg;
/* 0x04 */ f32 playbackSpeed;
/* 0x08 */ s16 frame;
/* 0x0A */ s16 frameCount;
/* 0x0C */ u8 mode;
/* 0x0E */ s16 transitionRate;
} ActorAnimationEntryS; // size = 0x10
typedef enum {
/* 0x000 */ ACTOR_PLAYER,
/* 0x001 */ ACTOR_EN_TEST,