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

General Cleanup (#155)

Browse Source 
* minor fixes

* Consolidate into globalCtx

* fix error

* Fix Warnings

Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
This commit is contained in:
engineer124
2021-05-21 11:24:47 +10:00
committed by GitHub
parent 8c62c102cf
commit f4687fbbe7
37 changed files with 1198 additions and 1195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+524 -524
View File
File diff suppressed because it is too large Load Diff
include/initvars.h
+1
View File
@@ -279,6 +279,7 @@ extern ActorInit En_Invadepoh_InitVars;
extern ActorInit En_Invadepoh_Demo_InitVars;
extern ActorInit En_Invisible_Ruppe_InitVars;
extern ActorInit En_Ishi_InitVars;
extern ActorInit En_Item00_InitVars;
extern ActorInit En_Ja_InitVars;
extern ActorInit En_Jc_Mato_InitVars;
extern ActorInit En_Jg_InitVars;
include/variables.h
-3
View File
@@ -373,9 +373,6 @@ extern ActorInit En_A_Obj_InitVars;
extern ColliderCylinderInit enAObjCylinderInit;
extern InitChainEntry enAObjInitVar;
extern u32 enAObjDisplayLists[2];
extern ActorInit En_Item00_InitVars;
extern ColliderCylinderInit enItem00CylinderInit;
extern InitChainEntry enItem00InitVars[1];
extern Color_RGBA8 D_801ADF10;
extern Color_RGBA8 D_801ADF14;
extern Vec3f D_801ADF18;
include/z64.h
+7 -7
View File
@@ -1120,7 +1120,7 @@ typedef struct {
typedef struct FileChooseContext FileChooseContext;
typedef void(*filechoose_update_func)(FileChooseContext* ctxt);
typedef void(*filechoose_update_func)(FileChooseContext* globalCtx);
typedef struct FireObj FireObj;
@@ -1268,17 +1268,17 @@ typedef void (*ColChkVsFunc)(GlobalContext*, CollisionCheckContext*, Collider*,
typedef s32 (*ColChkLineFunc)(GlobalContext*, CollisionCheckContext*, Collider*, Vec3f*, Vec3f*);
typedef struct {
/* 0x0 */ GlobalContext* ctxt;
/* 0x0 */ GlobalContext* globalCtx;
/* 0x4 */ s32 type; // bitfield, highest set bit determines type
/* 0x8 */ s16 countdown;
/* 0xA */ s16 state; // 0 - stopped, 1 - active, 2 - setup
} Quake2Context; // size = 0xC
typedef void(*cutscene_update_func)(GlobalContext* ctxt, CutsceneContext* cCtxt);
typedef void(*cutscene_update_func)(GlobalContext* globalCtx, CutsceneContext* cCtxt);
typedef void(*draw_func)(GlobalContext* ctxt, s16 index);
typedef void(*draw_func)(GlobalContext* globalCtx, s16 index);
typedef void(*room_draw_func)(GlobalContext* ctxt, Room* room, u32 flags);
typedef void(*room_draw_func)(GlobalContext* globalCtx, Room* room, u32 flags);
typedef struct {
/* 0x00 */ draw_func unk0;
@@ -1450,7 +1450,7 @@ struct Camera {
/* 0x080 */ f32 unk80;
/* 0x084 */ f32 unk84;
/* 0x088 */ f32 unk88;
/* 0x08C */ GlobalContext* ctxt;
/* 0x08C */ GlobalContext* globalCtx;
/* 0x090 */ ActorPlayer* player;
/* 0x094 */ PosRot unk94;
/* 0x0A8 */ Actor* unkA8;
@@ -1554,7 +1554,7 @@ struct TargetContext {
}; // size = 0x98
struct s800B948C {
/* 0x00 */ GlobalContext* ctxt;
/* 0x00 */ GlobalContext* globalCtx;
/* 0x04 */ Actor* actor;
/* 0x08 */ u32 updateActorIfSet;
/* 0x0C */ u32 unkC;
include/z64actor.h
+2 -2
View File
@@ -15,7 +15,7 @@ struct GlobalContext;
struct Lights;
struct CollisionPoly;
typedef void(*ActorFunc)(struct Actor* this, struct GlobalContext* ctxt);
typedef void(*ActorFunc)(struct Actor* this, struct GlobalContext* globalCtx);
typedef struct {
/* 0x00 */ Vec3f pos;
@@ -107,7 +107,7 @@ typedef struct {
/* 0x1F */ UNK_TYPE1 pad1F[0x1];
} ActorOverlay; // size = 0x20
typedef void(*ActorShadowFunc)(struct Actor* actor, struct Lights* mapper, struct GlobalContext* ctxt);
typedef void(*ActorShadowFunc)(struct Actor* actor, struct Lights* mapper, struct GlobalContext* globalCtx);
typedef struct {
/* 0x00 */ Vec3s rot; // Current actor shape rotation
include/z64effect.h
+1 -1
View File
@@ -209,7 +209,7 @@ typedef struct {
} EffInfo; // size = 0x14
typedef struct {
/* 0x0000 */ struct GlobalContext* ctxt;
/* 0x0000 */ struct GlobalContext* globalCtx;
/* 0x0004 */ EffSpark sparks[3];
/* 0x0E5C */ EffBlure blures[25];
/* 0x388C */ EffShieldParticle shieldParticles[3];