mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-26 09:44:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Debug display mostly OK (#399)

Browse Source 
* WIP

* done?

* remove something from variables.h

* missed a warning

* PR fixes (AngheloAlf)

* fix lights

* restore ZAPD makefile

* format

* format again

* fix a graph alloc

* Missed one in skin
This commit is contained in:
louist103
2021-11-03 10:52:01 -04:00
committed by GitHub
parent 11487db1ca
commit fcbd524b5d
10 changed files with 170 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1 -6
View File
@@ -1545,12 +1545,7 @@ s32 func_800E9250(GlobalContext* globalCtx, Actor* actor, Vec3s* param_3, Vec3s*
void SaveContext_Init(void);
void GameInfo_Init(void);
// void func_800E9470(void);
void DebugDisplay_AddObject(f32 posX, f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, f32 scaleX, f32 scaleY, f32 scaleZ, u8 red, u8 green, u8 blue, u8 alpha, s16 type, GraphicsContext* gfxCtx);
void DebugDisplay_DrawObjects(GlobalContext* globalCtx);
// void func_800E95F4(void);
// void func_800E97D8(void);
// void func_800E992C(void);
// void func_800E99B0(void);
DebugDispObject* DebugDisplay_AddObject(f32 posX, f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, f32 scaleX, f32 scaleY, f32 scaleZ, u8 red, u8 green, u8 blue, u8 alpha, s16 type, GraphicsContext* gfxCtx);
// void func_800E9C90(void);
// void func_800E9CA0(s32 param_1, UNK_TYPE1 param_2, s8* param_3);
// void func_800E9CFC(void);
include/variables.h
-21
View File
@@ -882,26 +882,6 @@ extern ColChkApplyFunc sApplyDamageFuncs[COLSHAPE_MAX];
extern ColChkLineFunc sOCLineCheckFuncs[COLSHAPE_MAX];
extern EffShieldParticleInit shieldParticleInitMetal;
extern EffShieldParticleInit shieldParticleInitWood;
extern UNK_TYPE1 D_801BA550;
// extern UNK_TYPE1 D_801BA750;
// extern UNK_TYPE1 D_801BA790;
// extern UNK_TYPE1 D_801BA7F0;
// extern UNK_TYPE1 D_801BA870;
// extern UNK_TYPE1 D_801BA8C0;
// extern UNK_TYPE1 D_801BAAC0;
// extern UNK_TYPE1 D_801BAB40;
// extern UNK_TYPE1 D_801BABB8;
// extern UNK_TYPE1 D_801BACB8;
// extern UNK_TYPE1 D_801BADB8;
// extern UNK_TYPE1 D_801BAEB8;
// extern UNK_TYPE1 D_801BAFB8;
// extern UNK_TYPE1 D_801BAFF8;
// extern UNK_TYPE1 D_801BB010;
// extern UNK_TYPE1 D_801BB018;
// extern UNK_TYPE1 D_801BB050;
// extern UNK_TYPE1 D_801BB058;
// extern UNK_TYPE2 D_801BB068;
// extern UNK_TYPE1 D_801BB08C;
// extern UNK_TYPE4 D_801BB090;
// extern UNK_TYPE1 D_801BB094;
// extern UNK_TYPE1 D_801BB0DC;
@@ -3264,7 +3244,6 @@ extern SaveContext gSaveContext;
// extern UNK_TYPE1 D_801F3F4A;
// extern UNK_TYPE1 D_801F3F5A;
extern GameInfo* gGameInfo;
// extern UNK_TYPE1 D_801F3F70;
// extern UNK_TYPE1 D_801F3F80;
// extern UNK_TYPE1 D_801F3F83;
// extern UNK_TYPE1 D_801F48C8;
include/z64.h
+10
View File
@@ -1684,6 +1684,16 @@ typedef struct {
/* 0x20 */ u16 fracPart[4][4];
} MatrixInternal; // size = 0x40
typedef struct DebugDispObject {
/* 0x00 */ Vec3f pos;
/* 0x0C */ Vec3s rot;
/* 0x14 */ Vec3f scale;
/* 0x20 */ Color_RGBA8 color;
/* 0x24 */ s16 type;
/* 0x28 */ struct DebugDispObject* next;
/* 0x2C */ s32 pad; //Padding not in the OOT version
} DebugDispObject; // size = 0x30
typedef struct {
/* 0x00 */ u8* value;
/* 0x04 */ const char* name;