mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-22 06:19:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Another General Cleanup (#1651)

Browse Source 
* add z64player.h include to z_player.c

* NULL check in func_80AEE374

* Couple formating things

* parameter R_PICTO_PHOTO_STATE

* Remove COLPOLY_NORMAL_FRAC

* DynaPolyActor_Init transformFlags

* Float in ObjDriftice_Init

* aspMainStack

* Add gbi defines to m2ctx

* Add GBI_DEFINES to COMMON_DEFINES in makefile instead of duplicating it

* Add version to build include for m2ctx

* Invadepoh includes

* Sort calc_bss includes like makefile
This commit is contained in:
Derek Hensley
2024-07-13 11:15:12 -07:00
committed by GitHub
parent 1a003f9460
commit 803ff1fb15
16 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/variables.h
+2 -1
View File
@@ -3,6 +3,7 @@
#include "z64.h"
#include "segment_symbols.h"
#include "stack.h"
#include "macros.h"
// data
@@ -43,7 +44,7 @@ extern f32 gHeadsetPanVolume[];
extern f32 gStereoPanVolume[];
extern f32 gDefaultPanVolume[];
extern s32 gAudioCtxInitalized;
extern u8 D_801D6200[0x400];
extern STACK(aspMainStack, 0x400);
extern u8 gAudioSpecId;
extern u8 gAudioHeapResetState;
include/z64bgcheck.h
+1 -2
View File
@@ -11,9 +11,8 @@ struct DynaPolyActor;
#define SS_NULL 0xFFFF
#define COLPOLY_NORMAL_FRAC (1.0f / SHRT_MAX)
#define COLPOLY_SNORMAL(x) ((s16)((x) * SHRT_MAX))
#define COLPOLY_GET_NORMAL(n) ((n)*COLPOLY_NORMAL_FRAC)
#define COLPOLY_GET_NORMAL(n) ((n) * (1.0f / SHRT_MAX))
#define COLPOLY_VIA_FLAG_TEST(vIA, flags) ((vIA) & (((flags)&7) << 13))
#define COLPOLY_VTX_INDEX(vI) ((vI)&0x1FFF)