izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup 3 (#778)

Browse Source 
* lights

* D_801D88A0 -> gScarecrowSpawnSongPtr

* Misc fixes

* CHECK_FLAG_ALL

* Trailing commas in enums

* matches

* Remove todo from lights bss

* Update src/overlays/actors/ovl_En_In/z_en_in.c

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* thisx -> this2

* fix

* Todos

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
This commit is contained in:
Derek Hensley
2022-04-07 20:39:11 +01:00
committed by GitHub
co-authored by Anghelo Carvajal
parent c2f4572d13
commit 06412c070f
24 changed files with 93 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/variables.h
+2 -2
View File
@@ -1736,7 +1736,7 @@ extern UNK_PTR D_801D84F0;
// extern UNK_TYPE2 D_801D853E;
// extern UNK_TYPE1 D_801D8544;
extern UNK_PTR D_801D889C;
extern UNK_PTR D_801D88A0;
extern u8* gScarecrowSpawnSongPtr;
extern UNK_PTR D_801D88A4;
// extern UNK_TYPE1 D_801D88A8;
// extern UNK_TYPE1 D_801D88B8;
@@ -3200,7 +3200,7 @@ extern s16 D_801F4E7A;
// extern UNK_TYPE1 D_801F4F66;
// extern UNK_TYPE1 D_801F4F68;
// extern UNK_TYPE1 D_801F4F6A;
extern LightsBuffer sLightsBuffer;
// extern LightsBuffer sLightsBuffer;
// extern UNK_TYPE1 D_801F5130;
// extern UNK_TYPE1 D_801F5270;
// extern UNK_TYPE1 D_801F528E;
include/z64.h
+1 -1
View File
@@ -1156,7 +1156,7 @@ typedef struct {
typedef enum {
/* 0 */ DISTORTION_INACTIVE,
/* 1 */ DISTORTION_ACTIVE,
/* 2 */ DISTORTION_SETUP,
/* 2 */ DISTORTION_SETUP
} DistortionState;
typedef struct {
include/z64audio.h
+1 -1
View File
@@ -32,7 +32,7 @@ typedef enum {
/* 1 */ AUDIO_MODE_HEADSET,
/* 2 */ AUDIO_MODE_UNK,
/* 3 */ AUDIO_MODE_MONO,
/* 4 */ AUDIO_MODE_SURROUND,
/* 4 */ AUDIO_MODE_SURROUND
} AudioSoundMode;
typedef enum {
include/z64item.h
+1 -1
View File
@@ -386,7 +386,7 @@ typedef enum {
/* 0x6A */ GID_6A = 0x6A,
/* 0x6B */ GID_6B,
/* 0x70 */ GID_70 = 0x70,
/* 0x71 */ GID_71,
/* 0x71 */ GID_71
} GetItemDrawID;
// TODO: fill
include/z64light.h
-1
View File
@@ -63,7 +63,6 @@ typedef struct LightNode {
/* 0x8 */ struct LightNode* next;
} LightNode; // size = 0xC
// TODO move LightsBuffer to .c file once .bss has been split
#define LIGHTS_BUFFER_SIZE 32
typedef struct LightsBuffer {
include/z64ocarina.h
+1 -1
View File
@@ -81,7 +81,7 @@ typedef enum {
/* 13 */ OCARINA_INSTRUMENT_PIANO,
/* 14 */ OCARINA_INSTRUMENT_BASS_GUITAR,
/* 15 */ OCARINA_INSTRUMENT_BABY_SINGING,
/* 16 */ OCARINA_INSTRUMENT_AMPLIFIED_GUITAR, // Related to (gSaveContext.weekEventReg[41] & 0x20)
/* 16 */ OCARINA_INSTRUMENT_AMPLIFIED_GUITAR // Related to (gSaveContext.weekEventReg[41] & 0x20)
} OcarinaInstrumentId;
typedef enum {