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

Ovl en nutsball OK (#115)

Browse Source 
* EnNutsball Match but one function with sp issues

* Updated ActorPlayer

* Renamed unk144 to timer and added data as comment

* Got update matched but stack issues with two vars

* add back new line

* Fixed stack issue based on PR comments. Added data

* more descriptive variable names

* Use OPEN_DISPS/CLOSE_DISPS macros in draw

* Address PR comments
This commit is contained in:
Derek Hensley
2021-05-04 20:10:59 -07:00
committed by GitHub
parent fcc87b3ae2
commit e39141fb3d
7 changed files with 154 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/segment.h
+1
View File
@@ -6,6 +6,7 @@
extern Gfx D_040008D0[];
extern Gfx D_04029CB0[];
extern Gfx D_04029CF0[];
extern Gfx D_04058BA0[];
extern Gfx D_0405AAB0[];
extern UNK_TYPE D_0405BEF0;
extern UNK_TYPE D_0405B6F0;
include/z64actor.h
+5 -2
View File
@@ -214,7 +214,8 @@ typedef struct {
typedef struct {
/* 0x000 */ Actor base;
/* 0x144 */ UNK_TYPE1 pad144[0x3];
/* 0x144 */ UNK_TYPE1 unk144;
/* 0x145 */ UNK_TYPE1 pad145[0x2];
/* 0x147 */ s8 itemActionParam;
/* 0x148 */ UNK_TYPE1 pad148[0x2];
/* 0x14A */ s8 heldItemActionParam;
@@ -266,7 +267,9 @@ typedef struct {
/* 0xB9C */ Vec3f unkB9C;
/* 0xBA8 */ UNK_TYPE1 padBA8[0x44];
/* 0xBEC */ Vec3f bodyPartsPos[18];
/* 0xCC4 */ UNK_TYPE1 padCC4[0xB4];
/* 0xCC4 */ UNK_TYPE1 padCC4[0x40];
/* 0xD04 */ MtxF unkD04;
/* 0xD44 */ UNK_TYPE1 padD08[0x34];
} ActorPlayer; // size = 0xD78
typedef enum {