falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Combine enums

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/z64.h
View File

@ -1067,19 +1067,12 @@ typedef struct {
} BombersNotebook; // size = 0xAC } BombersNotebook; // size = 0xAC
typedef enum { typedef enum {
/* 0 */ PICTOGRAPH_PHOTO_STATE_OFF, /* 0 */ PICTO_PRERENDER_OFF,
/* 1 */ PICTOGRAPH_PHOTO_STATE_SETUP, /* 1 */ PICTO_PRERENDER_SETUP,
/* 2 */ PICTOGRAPH_PHOTO_STATE_PROCESS, /* 2 */ PICTO_PRERENDER_PROCESS,
/* 3 */ PICTOGRAPH_PHOTO_STATE_DONE /* 3 */ PICTO_PRERENDER_DONE,
} PictographPhotoState; /* 4 */ PICTO_PRERENDER_MAX
} PictoPreRenderState;
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;
// OoT's TransitionUnk // OoT's TransitionUnk
typedef struct { typedef struct {

6
include/z64transition.h
View File

@ -91,9 +91,9 @@ typedef enum {
/* 17 */ TRANS_MODE_CS_BLACK_FILL /* 17 */ TRANS_MODE_CS_BLACK_FILL
} TransitionMode; } TransitionMode;
#define TRANS_TYPE_WIPE4 (1 << 6) #define TRANS_TYPE_WIPE4 (1 << 5)
#define TRANS_TYPE_WIPE3 (1 << 7) #define TRANS_TYPE_WIPE3 (1 << 6)
#define TRANS_TYPE_SET_PARAMS (1 << 8) #define TRANS_TYPE_SET_PARAMS (1 << 7)
typedef enum { typedef enum {
/* 0 */ TRANS_TYPE_WIPE, /* 0 */ TRANS_TYPE_WIPE,

2
src/code/game.c
View File

@ -140,7 +140,7 @@ void Game_Update(GameState* gameState) {
gameState->main(gameState); gameState->main(gameState);
if (R_PAUSE_MENU_MODE != PAUSE_BG_PRERENDER_PROCESS) { if (R_PAUSE_MENU_MODE != PICTO_PRERENDER_PROCESS) {
GameState_Draw(gameState, gfxCtx); GameState_Draw(gameState, gfxCtx);
func_801736DC(gfxCtx); func_801736DC(gfxCtx);
} }

8
src/code/z_kaleido_scope_call.c
View File

@ -38,18 +38,18 @@ void KaleidoScopeCall_Update(PlayState* play) {
if ((play->pauseCtx.state != 0) || (play->pauseCtx.debugEditor != DEBUG_EDITOR_NONE)) { if ((play->pauseCtx.state != 0) || (play->pauseCtx.debugEditor != DEBUG_EDITOR_NONE)) {
if (pauseCtx->state == 1 || pauseCtx->state == 19) { if (pauseCtx->state == 1 || pauseCtx->state == 19) {
if (ShrinkWindow_Letterbox_GetSize() == 0) { if (ShrinkWindow_Letterbox_GetSize() == 0) {
R_PAUSE_MENU_MODE = PAUSE_BG_PRERENDER_SETUP; R_PAUSE_MENU_MODE = PICTO_PRERENDER_SETUP;
pauseCtx->unk_200 = 0; pauseCtx->unk_200 = 0;
pauseCtx->unk_208 = 0; pauseCtx->unk_208 = 0;
pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1; pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1;
} }
} else if (pauseCtx->state == 8) { } else if (pauseCtx->state == 8) {
R_PAUSE_MENU_MODE = PAUSE_BG_PRERENDER_SETUP; R_PAUSE_MENU_MODE = PICTO_PRERENDER_SETUP;
pauseCtx->unk_200 = 0; pauseCtx->unk_200 = 0;
pauseCtx->unk_208 = 0; pauseCtx->unk_208 = 0;
pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1; pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1;
} else if ((pauseCtx->state == 2) || (pauseCtx->state == 9) || (pauseCtx->state == 20)) { } else if ((pauseCtx->state == 2) || (pauseCtx->state == 9) || (pauseCtx->state == 20)) {
if (R_PAUSE_MENU_MODE == PAUSE_BG_PRERENDER_DONE) { if (R_PAUSE_MENU_MODE == PICTO_PRERENDER_DONE) {
pauseCtx->state++; pauseCtx->state++;
} }
} else if (pauseCtx->state != 0) { } else if (pauseCtx->state != 0) {
@ -76,7 +76,7 @@ void KaleidoScopeCall_Update(PlayState* play) {
void KaleidoScopeCall_Draw(PlayState* play) { void KaleidoScopeCall_Draw(PlayState* play) {
KaleidoMgrOverlay* kaleidoScopeOvl = &gKaleidoMgrOverlayTable[KALEIDO_OVL_KALEIDO_SCOPE]; KaleidoMgrOverlay* kaleidoScopeOvl = &gKaleidoMgrOverlayTable[KALEIDO_OVL_KALEIDO_SCOPE];
if (R_PAUSE_MENU_MODE == PAUSE_BG_PRERENDER_DONE) { if (R_PAUSE_MENU_MODE == PICTO_PRERENDER_DONE) {
if (((play->pauseCtx.state >= 4) && (play->pauseCtx.state <= 7)) || if (((play->pauseCtx.state >= 4) && (play->pauseCtx.state <= 7)) ||
((play->pauseCtx.state >= 11) && (play->pauseCtx.state <= 26))) { ((play->pauseCtx.state >= 11) && (play->pauseCtx.state <= 26))) {
if (gKaleidoMgrCurOvl == kaleidoScopeOvl) { if (gKaleidoMgrCurOvl == kaleidoScopeOvl) {

42
src/code/z_play.c
View File

@ -206,7 +206,7 @@ void Play_DisableMotionBlurPriority(void) {
// Will take the photograph, but doesn't compress and save it // Will take the photograph, but doesn't compress and save it
void Play_TriggerPictographPhoto(void) { void Play_TriggerPictographPhoto(void) {
R_PICTOGRAPH_PHOTO_STATE = PICTOGRAPH_PHOTO_STATE_SETUP; R_PICTOGRAPH_PHOTO_STATE = PICTO_PRERENDER_SETUP;
} }
void Play_TakePictographPhoto(PreRender* prerender) { void Play_TakePictographPhoto(PreRender* prerender) {
@ -360,12 +360,12 @@ void Play_Destroy(GameState* thisx) {
this->state.gfxCtx->callbackArg = 0; this->state.gfxCtx->callbackArg = 0;
Play_DestroyMotionBlur(); Play_DestroyMotionBlur();
if (R_PAUSE_MENU_MODE != PAUSE_BG_PRERENDER_OFF) { if (R_PAUSE_MENU_MODE != PICTO_PRERENDER_OFF) {
PreRender_ApplyFiltersSlowlyDestroy(&this->pauseBgPreRender); PreRender_ApplyFiltersSlowlyDestroy(&this->pauseBgPreRender);
R_PAUSE_MENU_MODE = PAUSE_BG_PRERENDER_OFF; R_PAUSE_MENU_MODE = PICTO_PRERENDER_OFF;
} }
R_PICTOGRAPH_PHOTO_STATE = PICTOGRAPH_PHOTO_STATE_OFF; R_PICTOGRAPH_PHOTO_STATE = PICTO_PRERENDER_OFF;
PreRender_Destroy(&this->pauseBgPreRender); PreRender_Destroy(&this->pauseBgPreRender);
this->unk_18E58 = NULL; this->unk_18E58 = NULL;
this->pictoPhotoI8 = NULL; this->pictoPhotoI8 = NULL;
@ -885,11 +885,11 @@ void Play_Update(PlayState* this) {
gSegments[5] = VIRTUAL_TO_PHYSICAL(this->objectCtx.status[this->objectCtx.subKeepIndex].segment); gSegments[5] = VIRTUAL_TO_PHYSICAL(this->objectCtx.status[this->objectCtx.subKeepIndex].segment);
gSegments[2] = VIRTUAL_TO_PHYSICAL(this->sceneSegment); gSegments[2] = VIRTUAL_TO_PHYSICAL(this->sceneSegment);
if (R_PICTOGRAPH_PHOTO_STATE == PICTOGRAPH_PHOTO_STATE_PROCESS) { if (R_PICTOGRAPH_PHOTO_STATE == PICTO_PRERENDER_SETUP) {
R_PICTOGRAPH_PHOTO_STATE = PICTOGRAPH_PHOTO_STATE_DONE; R_PICTOGRAPH_PHOTO_STATE = PICTO_PRERENDER_DONE;
MsgEvent_SendNullTask(); MsgEvent_SendNullTask();
Play_TakePictographPhoto(&this->pauseBgPreRender); Play_TakePictographPhoto(&this->pauseBgPreRender);
R_PICTOGRAPH_PHOTO_STATE = PICTOGRAPH_PHOTO_STATE_OFF; R_PICTOGRAPH_PHOTO_STATE = PICTO_PRERENDER_OFF;
} }
Actor_SetMovementScale(this->state.framerateDivisor); Actor_SetMovementScale(this->state.framerateDivisor);
@ -1091,12 +1091,12 @@ void Play_Draw(PlayState* this) {
u8 sp25B = false; u8 sp25B = false;
f32 var_fv0; // fogFar f32 var_fv0; // fogFar
if (R_PAUSE_MENU_MODE >= PAUSE_BG_PRERENDER_MAX) { if (R_PAUSE_MENU_MODE >= PICTO_PRERENDER_MAX) {
PreRender_ApplyFiltersSlowlyDestroy(&this->pauseBgPreRender); PreRender_ApplyFiltersSlowlyDestroy(&this->pauseBgPreRender);
R_PAUSE_MENU_MODE = PAUSE_BG_PRERENDER_OFF; R_PAUSE_MENU_MODE = PICTO_PRERENDER_OFF;
} }
if ((R_PAUSE_MENU_MODE <= PAUSE_BG_PRERENDER_SETUP) && (gTrnsnUnkState < 2)) { if ((R_PAUSE_MENU_MODE <= PICTO_PRERENDER_SETUP) && (gTrnsnUnkState < 2)) {
if (this->skyboxCtx.skyboxShouldDraw || (this->roomCtx.curRoom.mesh->type0.type == 1)) { if (this->skyboxCtx.skyboxShouldDraw || (this->roomCtx.curRoom.mesh->type0.type == 1)) {
func_8012CF0C(gfxCtx, 0, 1, 0, 0, 0); func_8012CF0C(gfxCtx, 0, 1, 0, 0, 0);
} else { } else {
@ -1208,15 +1208,15 @@ void Play_Draw(PlayState* this) {
PreRender_SetValues(&this->pauseBgPreRender, D_801FBBCC, D_801FBBCE, gfxCtx->curFrameBuffer, gfxCtx->zbuffer); PreRender_SetValues(&this->pauseBgPreRender, D_801FBBCC, D_801FBBCE, gfxCtx->curFrameBuffer, gfxCtx->zbuffer);
if (R_PAUSE_MENU_MODE == PAUSE_BG_PRERENDER_PROCESS) { if (R_PAUSE_MENU_MODE == PICTO_PRERENDER_PROCESS) {
MsgEvent_SendNullTask(); MsgEvent_SendNullTask();
if (!gSaveContext.screenScaleFlag) { if (!gSaveContext.screenScaleFlag) {
PreRender_ApplyFiltersSlowlyInit(&this->pauseBgPreRender); PreRender_ApplyFiltersSlowlyInit(&this->pauseBgPreRender);
} }
R_PAUSE_MENU_MODE = PAUSE_BG_PRERENDER_DONE; R_PAUSE_MENU_MODE = PICTO_PRERENDER_DONE;
SREG(33) |= 1; SREG(33) |= 1;
} else { } else {
if (R_PAUSE_MENU_MODE == PAUSE_BG_PRERENDER_DONE) { if (R_PAUSE_MENU_MODE == PICTO_PRERENDER_DONE) {
Gfx* sp8C = POLY_OPA_DISP; Gfx* sp8C = POLY_OPA_DISP;
if (this->pauseBgPreRender.unk_4D == 2) { if (this->pauseBgPreRender.unk_4D == 2) {
@ -1318,8 +1318,8 @@ void Play_Draw(PlayState* this) {
DebugDisplay_DrawObjects(this); DebugDisplay_DrawObjects(this);
Play_DrawMotionBlur(this); Play_DrawMotionBlur(this);
if (((R_PAUSE_MENU_MODE == PAUSE_BG_PRERENDER_SETUP) || (gTrnsnUnkState == 1)) || if (((R_PAUSE_MENU_MODE == PICTO_PRERENDER_SETUP) || (gTrnsnUnkState == 1)) ||
(R_PICTOGRAPH_PHOTO_STATE == 1)) { (R_PICTOGRAPH_PHOTO_STATE == PICTO_PRERENDER_SETUP)) {
Gfx* sp74; Gfx* sp74;
Gfx* sp70 = POLY_OPA_DISP; Gfx* sp70 = POLY_OPA_DISP;
@ -1327,12 +1327,12 @@ void Play_Draw(PlayState* this) {
gSPDisplayList(OVERLAY_DISP++, sp74); gSPDisplayList(OVERLAY_DISP++, sp74);
this->pauseBgPreRender.fbuf = gfxCtx->curFrameBuffer; this->pauseBgPreRender.fbuf = gfxCtx->curFrameBuffer;
if (R_PAUSE_MENU_MODE == PAUSE_BG_PRERENDER_SETUP) { if (R_PAUSE_MENU_MODE == PICTO_PRERENDER_SETUP) {
R_PAUSE_MENU_MODE = PAUSE_BG_PRERENDER_PROCESS; R_PAUSE_MENU_MODE = PICTO_PRERENDER_PROCESS;
this->pauseBgPreRender.fbufSave = (u16*)gfxCtx->zbuffer; this->pauseBgPreRender.fbufSave = (u16*)gfxCtx->zbuffer;
this->pauseBgPreRender.cvgSave = this->unk_18E58; this->pauseBgPreRender.cvgSave = this->unk_18E58;
} else if (R_PICTOGRAPH_PHOTO_STATE == PICTOGRAPH_PHOTO_STATE_SETUP) { } else if (R_PICTOGRAPH_PHOTO_STATE == PICTO_PRERENDER_SETUP) {
R_PICTOGRAPH_PHOTO_STATE = PICTOGRAPH_PHOTO_STATE_PROCESS; R_PICTOGRAPH_PHOTO_STATE = PICTO_PRERENDER_PROCESS;
this->pauseBgPreRender.fbufSave = (u16*)gfxCtx->zbuffer; this->pauseBgPreRender.fbufSave = (u16*)gfxCtx->zbuffer;
this->pauseBgPreRender.cvgSave = this->unk_18E58; this->pauseBgPreRender.cvgSave = this->unk_18E58;
} else { } else {
@ -2177,8 +2177,8 @@ void Play_Init(GameState* thisx) {
Play_InitMotionBlur(); Play_InitMotionBlur();
R_PAUSE_MENU_MODE = PAUSE_BG_PRERENDER_OFF; R_PAUSE_MENU_MODE = PICTO_PRERENDER_OFF;
R_PICTOGRAPH_PHOTO_STATE = PICTOGRAPH_PHOTO_STATE_OFF; R_PICTOGRAPH_PHOTO_STATE = PICTO_PRERENDER_OFF;
PreRender_Init(&this->pauseBgPreRender); PreRender_Init(&this->pauseBgPreRender);
PreRender_SetValuesSave(&this->pauseBgPreRender, D_801FBBCC, D_801FBBCE, NULL, NULL, NULL); PreRender_SetValuesSave(&this->pauseBgPreRender, D_801FBBCC, D_801FBBCE, NULL, NULL, NULL);

2
src/code/z_rcp.c
View File

@ -1328,7 +1328,7 @@ void func_8012CF0C(GraphicsContext* gfxCtx, s32 clearFb, s32 clearZb, u8 r, u8 g
} }
void func_8012D374(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { void func_8012D374(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) {
if ((R_PAUSE_MENU_MODE <= PAUSE_BG_PRERENDER_SETUP) && (gTrnsnUnkState < 2)) { if ((R_PAUSE_MENU_MODE <= PICTO_PRERENDER_SETUP) && (gTrnsnUnkState < 2)) {
func_8012CF0C(gfxCtx, true, true, r, g, b); func_8012CF0C(gfxCtx, true, true, r, g, b);
} else { } else {
func_8012CF0C(gfxCtx, false, false, r, g, b); func_8012CF0C(gfxCtx, false, false, r, g, b);