mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-07 03:47:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Combine enums

Browse Source
This commit is contained in:
Derek Hensley
2022-10-09 11:09:43 -07:00
parent 92813146fd
commit 0da1ebcaed
6 changed files with 36 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64.h
+6 -13
View File
@@ -1067,19 +1067,12 @@ typedef struct {
} BombersNotebook; // size = 0xAC
typedef enum {
/* 0 */ PICTOGRAPH_PHOTO_STATE_OFF,
/* 1 */ PICTOGRAPH_PHOTO_STATE_SETUP,
/* 2 */ PICTOGRAPH_PHOTO_STATE_PROCESS,
/* 3 */ PICTOGRAPH_PHOTO_STATE_DONE
} PictographPhotoState;
typedef enum {
/* 0 */ PAUSE_BG_PRERENDER_OFF,
/* 1 */ PAUSE_BG_PRERENDER_SETUP,
/* 2 */ PAUSE_BG_PRERENDER_PROCESS,
/* 3 */ PAUSE_BG_PRERENDER_DONE,
/* 4 */ PAUSE_BG_PRERENDER_MAX
} PauseBgPreRenderState;
/* 0 */ PICTO_PRERENDER_OFF,
/* 1 */ PICTO_PRERENDER_SETUP,
/* 2 */ PICTO_PRERENDER_PROCESS,
/* 3 */ PICTO_PRERENDER_DONE,
/* 4 */ PICTO_PRERENDER_MAX
} PictoPreRenderState;
// OoT's TransitionUnk
typedef struct {
include/z64transition.h
+3 -3
View File
@@ -91,9 +91,9 @@ typedef enum {
/* 17 */ TRANS_MODE_CS_BLACK_FILL
} TransitionMode;
#define TRANS_TYPE_WIPE4 (1 << 6)
#define TRANS_TYPE_WIPE3 (1 << 7)
#define TRANS_TYPE_SET_PARAMS (1 << 8)
#define TRANS_TYPE_WIPE4 (1 << 5)
#define TRANS_TYPE_WIPE3 (1 << 6)
#define TRANS_TYPE_SET_PARAMS (1 << 7)
typedef enum {
/* 0 */ TRANS_TYPE_WIPE,