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

import transition docs from OoT

Browse Source
This commit is contained in:
engineer124
2022-08-20 02:03:34 -04:00
parent 6476e90bb7
commit b4463f0d5f
38 changed files with 330 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+3 -3
View File
@@ -2498,8 +2498,8 @@ void func_80163C90(TransitionContext* transitionCtx);
void func_80163D80(TransitionContext* transitionCtx, PlayState* play);
// void func_80163DC0(void);
// void func_8016418C(void);
void func_8016424C(FbDemoStruct* this);
// void func_801642D8(void);
void TransitionUnk_Destroy(FbDemoStruct* this);
// void TransitionUnk_Init(void);
// void func_80164438(void);
// void func_8016454C(void);
// void func_80164678(void);
@@ -2548,7 +2548,7 @@ void Play_Destroy(GameState* thisx);
// void func_80166644(void);
// void func_801668B4(void);
void func_80166968(PlayState* play, Camera* camera);
void func_80166B30(PlayState* play);
void Play_UpdateTransition(PlayState* play);
void Play_Update(PlayState* play);
void func_80167DE4(PlayState* play);
// void Play_DrawOverlayElements(void);
include/variables.h
+3 -3
View File
@@ -3190,11 +3190,11 @@ extern ShrinkWindowContext* gShrinkWindowContextPtr;
extern void (*sKaleidoScopeUpdateFunc)(PlayState* play);
extern void (*sKaleidoScopeDrawFunc)(PlayState* play);
extern FaultAddrConvClient sKaleidoAreaFaultClient;
// extern UNK_TYPE1 D_801F6C10;
// extern UNK_TYPE1 sTransitionFillTimer;
extern Input D_801F6C18;
// extern UNK_TYPE1 D_801F6C30;
// extern UNK_TYPE1 sTrnsnUnk;
// extern UNK_TYPE1 D_801F6D0C;
extern UNK_TYPE4 D_801F6D10;
extern UNK_TYPE4 gTrnsnUnkState;
// extern UNK_TYPE1 D_801F6D18;
extern Color_RGBA8 D_801F6D30;
// extern UNK_TYPE1 D_801F6D38;
include/z64.h
+56 -55
View File
@@ -654,8 +654,8 @@ typedef struct {
/* 0xE5 */ u8 fillScreen;
/* 0xE6 */ u8 screenFillColor[4];
/* 0xEA */ u8 sandstormState;
/* 0xEB */ u8 unk_EB;
/* 0xEC */ u8 unk_EC;
/* 0xEB */ u8 sandstormPrimA;
/* 0xEC */ u8 sandstormEnvA;
/* 0xED */ u8 unk_ED;
/* 0xEE */ u8 unk_EE[4];
/* 0xF2 */ u8 unk_F2[8]; // [3] is used by both DemoKankyo and ObjectKankyo effect count
@@ -745,46 +745,46 @@ typedef struct {
typedef enum {
/* 0 */ TRANS_MODE_OFF,
/* 1 */ TRANS_MODE_01,
/* 2 */ TRANS_MODE_02,
/* 3 */ TRANS_MODE_03,
/* 4 */ TRANS_MODE_04,
/* 5 */ TRANS_MODE_05,
/* 6 */ TRANS_MODE_06,
/* 7 */ TRANS_MODE_07,
/* 1 */ TRANS_MODE_SETUP,
/* 2 */ TRANS_MODE_INSTANCE_INIT,
/* 3 */ TRANS_MODE_INSTANCE_RUNNING,
/* 4 */ TRANS_MODE_FILL_WHITE_INIT,
/* 5 */ TRANS_MODE_FILL_IN,
/* 6 */ TRANS_MODE_FILL_OUT,
/* 7 */ TRANS_MODE_FILL_BROWN_INIT,
/* 8 */ TRANS_MODE_08,
/* 9 */ TRANS_MODE_09,
/* 10 */ TRANS_MODE_10,
/* 11 */ TRANS_MODE_11,
/* 12 */ TRANS_MODE_12,
/* 13 */ TRANS_MODE_13,
/* 14 */ TRANS_MODE_14,
/* 15 */ TRANS_MODE_15,
/* 16 */ TRANS_MODE_16,
/* 17 */ TRANS_MODE_17
/* 10 */ TRANS_MODE_INSTANT,
/* 11 */ TRANS_MODE_INSTANCE_WAIT,
/* 12 */ TRANS_MODE_SANDSTORM_INIT,
/* 13 */ TRANS_MODE_SANDSTORM,
/* 14 */ TRANS_MODE_SANDSTORM_END_INIT,
/* 15 */ TRANS_MODE_SANDSTORM_END,
/* 16 */ TRANS_MODE_CS_BLACK_FILL_INIT,
/* 17 */ TRANS_MODE_CS_BLACK_FILL
} TransitionMode;
typedef enum {
/* 0 */ TRANS_TYPE_00,
/* 1 */ TRANS_TYPE_01,
/* 2 */ TRANS_TYPE_02,
/* 3 */ TRANS_TYPE_03,
/* 4 */ TRANS_TYPE_04,
/* 5 */ TRANS_TYPE_05,
/* 6 */ TRANS_TYPE_06,
/* 7 */ TRANS_TYPE_07,
/* 8 */ TRANS_TYPE_08,
/* 9 */ TRANS_TYPE_09,
/* 10 */ TRANS_TYPE_10,
/* 11 */ TRANS_TYPE_11,
/* 12 */ TRANS_TYPE_12,
/* 13 */ TRANS_TYPE_13,
/* 14 */ TRANS_TYPE_14,
/* 15 */ TRANS_TYPE_15,
/* 16 */ TRANS_TYPE_16,
/* 17 */ TRANS_TYPE_17,
/* 18 */ TRANS_TYPE_18,
/* 19 */ TRANS_TYPE_19,
/* 0 */ TRANS_TYPE_WIPE,
/* 1 */ TRANS_TYPE_TRIFORCE,
/* 2 */ TRANS_TYPE_FADE_BLACK,
/* 3 */ TRANS_TYPE_FADE_WHITE,
/* 4 */ TRANS_TYPE_FADE_BLACK_FAST,
/* 5 */ TRANS_TYPE_FADE_WHITE_FAST,
/* 6 */ TRANS_TYPE_FADE_BLACK_SLOW,
/* 7 */ TRANS_TYPE_FADE_WHITE_SLOW,
/* 8 */ TRANS_TYPE_WIPE_FAST,
/* 9 */ TRANS_TYPE_FILL_WHITE2,
/* 10 */ TRANS_TYPE_FILL_WHITE,
/* 11 */ TRANS_TYPE_INSTANT,
/* 12 */ TRANS_TYPE_FILL_BROWN,
/* 13 */ TRANS_TYPE_FADE_WHITE_CS_DELAYED,
/* 14 */ TRANS_TYPE_SANDSTORM_PERSIST,
/* 15 */ TRANS_TYPE_SANDSTORM_END,
/* 16 */ TRANS_TYPE_CS_BLACK_FILL,
/* 17 */ TRANS_TYPE_FADE_WHITE_INSTANT,
/* 18 */ TRANS_TYPE_FADE_GREEN,
/* 19 */ TRANS_TYPE_FADE_BLUE,
/* 20 */ TRANS_TYPE_20,
/* 21 */ TRANS_TYPE_21,
/* 22 */ TRANS_TYPE_22,
@@ -808,6 +808,24 @@ typedef enum {
#define TRANS_NEXT_TYPE_DEFAULT 0xFF
typedef struct {
/* 0x000 */ s16 transitionType;
/* 0x002 */ s8 fbdemoType;
/* 0x003 */ char unk03[0x5];
/* 0x008 */ s32 instanceData;
/* 0x00C */ char unk0C[0x224];
/* 0x230 */ void* (*init)(void* transition);
/* 0x234 */ void (*destroy)(void* transition);
/* 0x238 */ void (*update)(void* transition, s32 updateRate);
/* 0x23C */ void (*draw)(void* transition, Gfx** gfxP);
/* 0x240 */ void (*start)(void* transition);
/* 0x244 */ void (*setType)(void* transition, s32 type);
/* 0x248 */ void (*setColor)(void* transition, u32 color);
/* 0x24C */ void (*setUnkColor)(void* transition, u32 color);
/* 0x250 */ s32 (*isDone)(void* transition);
/* 0x254 */ char unk254[0x4];
} TransitionContext; // size = 0x258
typedef struct FaultAddrConvClient {
/* 0x0 */ struct FaultAddrConvClient* next;
/* 0x4 */ void* (*callback)(void*, void*);
@@ -1099,24 +1117,6 @@ typedef struct {
/* 0x0 */ u16 state;
} GameOverContext; // size = 0x2
typedef struct {
/* 0x000 */ s16 transitionType;
/* 0x002 */ s8 fbdemoType;
/* 0x003 */ char unk03[0x5];
/* 0x008 */ s32 unk_08;
/* 0x00C */ char unk0C[0x224];
/* 0x230 */ void* (*unk_230)(void*);
/* 0x234 */ void (*unk_234)(void*);
/* 0x238 */ void (*unk_238)(void*, u8);
/* 0x23C */ char unk23C[0x4];
/* 0x240 */ void (*unk_240)(void*);
/* 0x244 */ void (*unk_244)(void*, s32);
/* 0x248 */ void (*unk_248)(void*, u32); // RGBA8 colour?
/* 0x24C */ void (*unk_24C)(void*, u32); // RGBA8 colour?
/* 0x250 */ s32 (*unk_250)(void*);
/* 0x254 */ char unk254[0x4];
} TransitionContext; // size = 0x258
struct PlayState {
/* 0x00000 */ GameState state;
/* 0x000A4 */ s16 sceneNum;
@@ -1230,6 +1230,7 @@ typedef struct {
/* 0xA8 */ s32 unk_A8;
} HiresoStruct; // size = 0xAC
// OoT's TransitionUnk
typedef struct {
/* 0x00 */ char unk_00[0xDC];
} FbDemoStruct; // size = 0xDC
src/code/z_demo.c
+8 -8
View File
@@ -293,7 +293,7 @@ void Cutscene_Command_Misc(PlayState* play2, CutsceneContext* csCtx, CsCmdBase*
play->nextEntrance = ENTRANCE(CUTSCENE, 0);
gSaveContext.nextCutsceneIndex = 0xFFF8;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
}
break;
case 0x1C:
@@ -580,7 +580,7 @@ void Cutscene_TerminatorImpl(PlayState* play, CutsceneContext* csCtx, CsCmdBase*
if (D_801BB12C >= 2) {
D_801BB12C = 0;
}
play->transitionType = TRANS_TYPE_04;
play->transitionType = TRANS_TYPE_FADE_BLACK_FAST;
}
if ((play->nextEntrance & 0xF) > 0) {
@@ -606,12 +606,12 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
if (gSaveContext.save.weekEventReg[20] & 2) {
play->nextEntrance = ENTRANCE(WOODFALL_TEMPLE, 1);
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
} else {
play->nextEntrance = ENTRANCE(WOODFALL, 0);
gSaveContext.nextCutsceneIndex = 0xFFF0;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
}
break;
@@ -619,12 +619,12 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
if (gSaveContext.save.weekEventReg[33] & 0x80) {
play->nextEntrance = ENTRANCE(MOUNTAIN_VILLAGE_SPRING, 7);
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
} else {
play->nextEntrance = ENTRANCE(MOUNTAIN_VILLAGE_SPRING, 0);
gSaveContext.nextCutsceneIndex = 0xFFF0;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
}
break;
@@ -633,7 +633,7 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
play->nextEntrance = ENTRANCE(ZORA_CAPE, 8);
gSaveContext.nextCutsceneIndex = 0xFFF0;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
break;
case 0x36:
@@ -641,7 +641,7 @@ void Cutscene_Command_Terminator(PlayState* play, CutsceneContext* csCtx, CsCmdB
play->nextEntrance = ENTRANCE(IKANA_CANYON, 0);
gSaveContext.nextCutsceneIndex = 0xFFF1;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
break;
}
}
src/code/z_fbdemo.c
+2 -2
View File
@@ -5,9 +5,9 @@
#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo/func_8016418C.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo/func_8016424C.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo/TransitionUnk_Destroy.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo/func_801642D8.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo/TransitionUnk_Init.s")
#pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo/func_80164438.s")
src/code/z_game_over.c
+1 -1
View File
@@ -72,7 +72,7 @@ void GameOver_Update(PlayState* play) {
if (gSaveContext.respawnFlag != -7) {
gSaveContext.respawnFlag = -6;
}
gSaveContext.nextTransitionType = TRANS_TYPE_02;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK;
gSaveContext.save.playerData.health = 0x30;
gameOverCtx->state++;
if (INV_CONTENT(ITEM_MASK_DEKU) == ITEM_MASK_DEKU) {
src/code/z_play.c
+175 -152
View File
@@ -5,14 +5,14 @@
#include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h"
s32 gDbgCamEnabled = false;
u8 D_801D0D54 = 0;
u8 D_801D0D54 = false;
// bss
extern s16 D_801F6C10;
extern s16 sTransitionFillTimer;
extern Input D_801F6C18;
extern FbDemoStruct D_801F6C30;
extern FbDemoStruct sTrnsnUnk;
extern u16* D_801F6D0C;
extern s32 D_801F6D10;
extern s32 gTrnsnUnkState;
extern VisMono D_801F6D18;
extern Color_RGBA8 D_801F6D30;
extern Struct_80140E80 D_801F6D38;
@@ -214,9 +214,9 @@ s32 func_80165E7C(PlayState* this, s32 transitionType) {
if (transitionType == TRANS_TYPE_20) {
if (!gSaveContext.save.isNight) {
nextTransitionType = TRANS_TYPE_03;
nextTransitionType = TRANS_TYPE_FADE_WHITE;
} else {
nextTransitionType = TRANS_TYPE_02;
nextTransitionType = TRANS_TYPE_FADE_BLACK;
}
}
if (nextTransitionType != transitionType) {
@@ -238,59 +238,59 @@ void Play_SetupTransition(PlayState* this, s32 transitionType) {
fbdemoType = FBDEMO_WIPE4;
} else if (!(transitionType & 0x60)) {
switch (transitionType) {
case TRANS_TYPE_01:
case TRANS_TYPE_TRIFORCE:
fbdemoType = FBDEMO_TRIFORCE;
break;
case TRANS_TYPE_00:
case TRANS_TYPE_08:
case TRANS_TYPE_WIPE:
case TRANS_TYPE_WIPE_FAST:
fbdemoType = FBDEMO_WIPE1;
break;
case TRANS_TYPE_02:
case TRANS_TYPE_03:
case TRANS_TYPE_04:
case TRANS_TYPE_05:
case TRANS_TYPE_06:
case TRANS_TYPE_07:
case TRANS_TYPE_13:
case TRANS_TYPE_17:
case TRANS_TYPE_18:
case TRANS_TYPE_19:
case TRANS_TYPE_FADE_BLACK:
case TRANS_TYPE_FADE_WHITE:
case TRANS_TYPE_FADE_BLACK_FAST:
case TRANS_TYPE_FADE_WHITE_FAST:
case TRANS_TYPE_FADE_BLACK_SLOW:
case TRANS_TYPE_FADE_WHITE_SLOW:
case TRANS_TYPE_FADE_WHITE_CS_DELAYED:
case TRANS_TYPE_FADE_WHITE_INSTANT:
case TRANS_TYPE_FADE_GREEN:
case TRANS_TYPE_FADE_BLUE:
fbdemoType = FBDEMO_FADE;
break;
case TRANS_TYPE_09:
case TRANS_TYPE_10:
this->transitionMode = TRANS_MODE_04;
case TRANS_TYPE_FILL_WHITE2:
case TRANS_TYPE_FILL_WHITE:
this->transitionMode = TRANS_MODE_FILL_WHITE_INIT;
break;
case TRANS_TYPE_11:
this->transitionMode = TRANS_MODE_10;
case TRANS_TYPE_INSTANT:
this->transitionMode = TRANS_MODE_INSTANT;
break;
case TRANS_TYPE_12:
this->transitionMode = TRANS_MODE_07;
case TRANS_TYPE_FILL_BROWN:
this->transitionMode = TRANS_MODE_FILL_BROWN_INIT;
break;
case TRANS_TYPE_14:
this->transitionMode = TRANS_MODE_12;
case TRANS_TYPE_SANDSTORM_PERSIST:
this->transitionMode = TRANS_MODE_SANDSTORM_INIT;
break;
case TRANS_TYPE_15:
this->transitionMode = TRANS_MODE_14;
case TRANS_TYPE_SANDSTORM_END:
this->transitionMode = TRANS_MODE_SANDSTORM_END_INIT;
break;
case TRANS_TYPE_16:
this->transitionMode = TRANS_MODE_16;
case TRANS_TYPE_CS_BLACK_FILL:
this->transitionMode = TRANS_MODE_CS_BLACK_FILL_INIT;
break;
case TRANS_TYPE_21:
fbdemoType = 5;
fbdemoType = FBDEMO_CIRCLE;
break;
case TRANS_TYPE_22:
fbdemoType = 6;
fbdemoType = FBDEMO_WIPE5;
break;
default:
@@ -391,7 +391,7 @@ void Play_Destroy(GameState* thisx) {
PlayState* this = (PlayState*)thisx;
GraphicsContext* gfxCtx = this->state.gfxCtx;
if (D_801F6DFC != 0) {
if (D_801F6DFC) {
MsgEvent_SendNullTask();
func_80178750();
gfxCtx->curFrameBuffer = SysCfb_GetFbPtr(gfxCtx->framebufferIdx % 2);
@@ -401,7 +401,7 @@ void Play_Destroy(GameState* thisx) {
gfxCtx->xScale = gViConfigXScale;
gfxCtx->yScale = gViConfigYScale;
gfxCtx->updateViMode = true;
D_801F6DFC = 0;
D_801F6DFC = false;
}
func_8016FC98(&D_801F6D50);
@@ -425,13 +425,13 @@ void Play_Destroy(GameState* thisx) {
EffectSS_Clear(this);
CollisionCheck_DestroyContext(this, &this->colChkCtx);
if (D_801F6D10 == 3) {
func_8016424C(&D_801F6C30);
D_801F6D10 = 0;
if (gTrnsnUnkState == 3) {
TransitionUnk_Destroy(&sTrnsnUnk);
gTrnsnUnkState = 0;
}
if ((this->transitionMode == TRANS_MODE_03) || (D_801D0D54 != 0)) {
this->transitionCtx.unk_234(&this->transitionCtx.unk_08);
if ((this->transitionMode == TRANS_MODE_INSTANCE_RUNNING) || D_801D0D54) {
this->transitionCtx.destroy(&this->transitionCtx.instanceData);
func_80166060(this);
this->transitionMode = TRANS_MODE_OFF;
}
@@ -526,7 +526,7 @@ void func_80166968(PlayState* this, Camera* camera) {
}
}
void func_80166B30(PlayState* this) {
void Play_UpdateTransition(PlayState* this) {
s32 pad;
if (this->transitionMode == TRANS_MODE_OFF) {
@@ -534,11 +534,12 @@ void func_80166B30(PlayState* this) {
}
switch (this->transitionMode) {
case TRANS_MODE_01:
case TRANS_MODE_SETUP:
if (this->transitionTrigger != TRANS_TRIGGER_END) {
s16 sceneLayer = 0;
Interface_ChangeAlpha(1);
if (gSaveContext.nextCutsceneIndex >= 0xFFF0) {
sceneLayer = (gSaveContext.nextCutsceneIndex & 0xF) + 1;
}
@@ -567,30 +568,33 @@ void func_80166B30(PlayState* this) {
if (func_800FE590(this) && (Entrance_GetSceneNum(this->nextEntrance + sceneLayer) >= 0) &&
(func_801A8A50(0) == NA_BGM_FINAL_HOURS)) {
func_801A41C8(0x14);
func_801A41C8(20);
}
}
if (D_801D0D54 == 0) {
if (!D_801D0D54) {
Play_SetupTransition(this, func_80165E7C(this, this->transitionType));
}
if (this->transitionMode >= TRANS_MODE_04) {
if (this->transitionMode >= TRANS_MODE_FILL_WHITE_INIT) {
// non-instance modes break out of this switch
break;
}
case TRANS_MODE_02: {
// fallthrough
case TRANS_MODE_INSTANCE_INIT: {
s32 transWipeSpeed;
s32 transFadeDuration;
u32 color;
this->transitionCtx.unk_230(&this->transitionCtx.unk_08);
this->transitionCtx.init(&this->transitionCtx.instanceData);
if (this->transitionCtx.transitionType & 0x60) {
this->transitionCtx.unk_244(&this->transitionCtx.unk_08, this->transitionCtx.transitionType | 0x80);
this->transitionCtx.setType(&this->transitionCtx.instanceData,
this->transitionCtx.transitionType | 0x80);
}
if ((this->transitionCtx.transitionType == TRANS_TYPE_08) ||
(this->transitionCtx.transitionType == TRANS_TYPE_09)) {
if ((this->transitionCtx.transitionType == TRANS_TYPE_WIPE_FAST) ||
(this->transitionCtx.transitionType == TRANS_TYPE_FILL_WHITE2)) {
transWipeSpeed = 28;
} else {
transWipeSpeed = 14;
@@ -598,17 +602,20 @@ void func_80166B30(PlayState* this) {
gSaveContext.transWipeSpeed = transWipeSpeed;
switch (this->transitionCtx.transitionType) {
case TRANS_TYPE_04:
case TRANS_TYPE_05:
case TRANS_TYPE_FADE_BLACK_FAST:
case TRANS_TYPE_FADE_WHITE_FAST:
transFadeDuration = 20;
break;
case TRANS_TYPE_06:
case TRANS_TYPE_07:
case TRANS_TYPE_FADE_BLACK_SLOW:
case TRANS_TYPE_FADE_WHITE_SLOW:
transFadeDuration = 150;
break;
case TRANS_TYPE_17:
case TRANS_TYPE_FADE_WHITE_INSTANT:
transFadeDuration = 2;
break;
default:
transFadeDuration = 60;
break;
@@ -616,43 +623,49 @@ void func_80166B30(PlayState* this) {
gSaveContext.transFadeDuration = transFadeDuration;
switch (this->transitionCtx.transitionType) {
case TRANS_TYPE_03:
case TRANS_TYPE_05:
case TRANS_TYPE_07:
case TRANS_TYPE_13:
case TRANS_TYPE_17:
case TRANS_TYPE_FADE_WHITE:
case TRANS_TYPE_FADE_WHITE_FAST:
case TRANS_TYPE_FADE_WHITE_SLOW:
case TRANS_TYPE_FADE_WHITE_CS_DELAYED:
case TRANS_TYPE_FADE_WHITE_INSTANT:
color = RGBA8(160, 160, 160, 255);
break;
case TRANS_TYPE_18:
case TRANS_TYPE_FADE_GREEN:
color = RGBA8(140, 140, 100, 255);
break;
case TRANS_TYPE_19:
case TRANS_TYPE_FADE_BLUE:
color = RGBA8(70, 100, 110, 255);
break;
default:
color = RGBA8(0, 0, 0, 255);
break;
}
this->transitionCtx.unk_248(&this->transitionCtx.unk_08, color);
if (this->transitionCtx.unk_24C != NULL) {
this->transitionCtx.unk_24C(&this->transitionCtx.unk_08, color);
this->transitionCtx.setColor(&this->transitionCtx.instanceData, color);
if (this->transitionCtx.setUnkColor != NULL) {
this->transitionCtx.setUnkColor(&this->transitionCtx.instanceData, color);
}
this->transitionCtx.unk_244(&this->transitionCtx.unk_08,
this->transitionCtx.setType(&this->transitionCtx.instanceData,
(this->transitionTrigger == TRANS_TRIGGER_END) ? 1 : 2);
this->transitionCtx.unk_240(&this->transitionCtx.unk_08);
if (this->transitionCtx.transitionType == TRANS_TYPE_13) {
this->transitionMode = TRANS_MODE_11;
this->transitionCtx.start(&this->transitionCtx.instanceData);
if (this->transitionCtx.transitionType == TRANS_TYPE_FADE_WHITE_CS_DELAYED) {
this->transitionMode = TRANS_MODE_INSTANCE_WAIT;
} else {
this->transitionMode = TRANS_MODE_03;
this->transitionMode = TRANS_MODE_INSTANCE_RUNNING;
}
break;
}
case TRANS_MODE_03:
if (this->transitionCtx.unk_250(&this->transitionCtx.unk_08)) {
case TRANS_MODE_INSTANCE_RUNNING:
if (this->transitionCtx.isDone(&this->transitionCtx.instanceData)) {
if (this->transitionTrigger != TRANS_TRIGGER_END) {
if (this->transitionCtx.transitionType == TRANS_TYPE_21) {
D_801D0D54 = 0;
D_801D0D54 = false;
}
if (gSaveContext.gameMode == 4) {
@@ -678,6 +691,7 @@ void func_80166B30(PlayState* this) {
SET_NEXT_GAMESTATE(state, Play_Init, PlayState);
} while (0);
gSaveContext.save.entrance = this->nextEntrance;
if (gSaveContext.minigameState == 1) {
gSaveContext.minigameState = 3;
}
@@ -695,44 +709,47 @@ void func_80166B30(PlayState* this) {
}
} else {
if (this->transitionCtx.transitionType == TRANS_TYPE_21) {
D_801D0D54 = 1;
D_801D0D54 = true;
} else {
this->transitionCtx.unk_234(&this->transitionCtx.unk_08);
this->transitionCtx.destroy(&this->transitionCtx.instanceData);
func_80166060(this);
}
this->transitionMode = TRANS_MODE_OFF;
if (D_801F6D10 == 3) {
func_8016424C(&D_801F6C30);
D_801F6D10 = 0;
if (gTrnsnUnkState == 3) {
TransitionUnk_Destroy(&sTrnsnUnk);
gTrnsnUnkState = 0;
Game_SetFramerateDivisor(&this->state, 3);
}
}
this->transitionTrigger = TRANS_TRIGGER_OFF;
} else {
this->transitionCtx.unk_238(&this->transitionCtx.unk_08, this->state.framerateDivisor);
this->transitionCtx.update(&this->transitionCtx.instanceData, this->state.framerateDivisor);
}
break;
}
// update non-instance transitions
switch (this->transitionMode) {
case TRANS_MODE_04:
D_801F6C10 = 0;
this->envCtx.fillScreen = 1;
case TRANS_MODE_FILL_WHITE_INIT:
sTransitionFillTimer = 0;
this->envCtx.fillScreen = true;
this->envCtx.screenFillColor[0] = 160;
this->envCtx.screenFillColor[1] = 160;
this->envCtx.screenFillColor[2] = 160;
if (this->transitionTrigger != TRANS_TRIGGER_END) {
this->envCtx.screenFillColor[3] = 0;
this->transitionMode = TRANS_MODE_05;
this->transitionMode = TRANS_MODE_FILL_IN;
} else {
this->envCtx.screenFillColor[3] = 255;
this->transitionMode = TRANS_MODE_06;
this->transitionMode = TRANS_MODE_FILL_OUT;
}
break;
case TRANS_MODE_05:
this->envCtx.screenFillColor[3] = (D_801F6C10 / 20.0f) * 255.0f;
if (D_801F6C10 >= 20) {
case TRANS_MODE_FILL_IN:
this->envCtx.screenFillColor[3] = (sTransitionFillTimer / 20.0f) * 255.0f;
if (sTransitionFillTimer >= 20) {
do {
GameState* state = &this->state;
@@ -747,39 +764,41 @@ void func_80166B30(PlayState* this) {
this->transitionTrigger = TRANS_TRIGGER_OFF;
this->transitionMode = TRANS_MODE_OFF;
} else {
D_801F6C10++;
sTransitionFillTimer++;
}
break;
case TRANS_MODE_06:
this->envCtx.screenFillColor[3] = (1.0f - (D_801F6C10 / 20.0f)) * 255.0f;
if (D_801F6C10 >= 20) {
D_801F6D10 = 0;
case TRANS_MODE_FILL_OUT:
this->envCtx.screenFillColor[3] = (1.0f - (sTransitionFillTimer / 20.0f)) * 255.0f;
if (sTransitionFillTimer >= 20) {
gTrnsnUnkState = 0;
Game_SetFramerateDivisor(&this->state, 3);
this->transitionTrigger = TRANS_TRIGGER_OFF;
this->transitionMode = TRANS_MODE_OFF;
this->envCtx.fillScreen = 0;
this->envCtx.fillScreen = false;
} else {
D_801F6C10++;
sTransitionFillTimer++;
}
break;
case TRANS_MODE_07:
D_801F6C10 = 0;
this->envCtx.fillScreen = 1;
case TRANS_MODE_FILL_BROWN_INIT:
sTransitionFillTimer = 0;
this->envCtx.fillScreen = true;
this->envCtx.screenFillColor[0] = 170;
this->envCtx.screenFillColor[1] = 160;
this->envCtx.screenFillColor[2] = 150;
if (this->transitionTrigger != TRANS_TRIGGER_END) {
this->envCtx.screenFillColor[3] = 0;
this->transitionMode = TRANS_MODE_05;
this->transitionMode = TRANS_MODE_FILL_IN;
} else {
this->envCtx.screenFillColor[3] = 255;
this->transitionMode = TRANS_MODE_06;
this->transitionMode = TRANS_MODE_FILL_OUT;
}
break;
case TRANS_MODE_10:
case TRANS_MODE_INSTANT:
if (this->transitionTrigger != TRANS_TRIGGER_END) {
do {
GameState* state = &this->state;
@@ -795,73 +814,76 @@ void func_80166B30(PlayState* this) {
this->transitionTrigger = TRANS_TRIGGER_OFF;
this->transitionMode = TRANS_MODE_OFF;
} else {
D_801F6D10 = 0;
gTrnsnUnkState = 0;
Game_SetFramerateDivisor(&this->state, 3);
this->transitionTrigger = TRANS_TRIGGER_OFF;
this->transitionMode = TRANS_MODE_OFF;
}
break;
case TRANS_MODE_11:
case TRANS_MODE_INSTANCE_WAIT:
if (gSaveContext.cutsceneTransitionControl != 0) {
this->transitionMode = TRANS_MODE_03;
this->transitionMode = TRANS_MODE_INSTANCE_RUNNING;
}
break;
case TRANS_MODE_12:
case TRANS_MODE_SANDSTORM_INIT:
if (this->transitionTrigger != TRANS_TRIGGER_END) {
this->envCtx.sandstormState = 1;
this->transitionMode = TRANS_MODE_13;
this->transitionMode = TRANS_MODE_SANDSTORM;
} else {
this->envCtx.sandstormState = 2;
this->envCtx.unk_EB = 0xFF;
this->envCtx.unk_EC = 0xFF;
this->transitionMode = TRANS_MODE_13;
this->envCtx.sandstormPrimA = 255;
this->envCtx.sandstormEnvA = 255;
this->transitionMode = TRANS_MODE_SANDSTORM;
}
break;
case TRANS_MODE_13:
case TRANS_MODE_SANDSTORM:
func_8019F128(NA_SE_EV_SAND_STORM - SFX_FLAG);
if (this->transitionTrigger == TRANS_TRIGGER_END) {
if (this->envCtx.unk_EB < 0x6E) {
D_801F6D10 = 0;
if (this->envCtx.sandstormPrimA < 110) {
gTrnsnUnkState = 0;
Game_SetFramerateDivisor(&this->state, 3);
this->transitionTrigger = TRANS_TRIGGER_OFF;
this->transitionMode = TRANS_MODE_OFF;
}
} else if (this->envCtx.unk_EC == 0xFF) {
do {
GameState* state = &this->state;
} else {
if (this->envCtx.sandstormEnvA == 255) {
do {
GameState* state = &this->state;
state->running = false;
} while (0);
do {
GameState* state = &this->state;
state->running = false;
} while (0);
do {
GameState* state = &this->state;
SET_NEXT_GAMESTATE(state, Play_Init, PlayState);
} while (0);
gSaveContext.save.entrance = this->nextEntrance;
this->transitionTrigger = TRANS_TRIGGER_OFF;
this->transitionMode = TRANS_MODE_OFF;
SET_NEXT_GAMESTATE(state, Play_Init, PlayState);
} while (0);
gSaveContext.save.entrance = this->nextEntrance;
this->transitionTrigger = TRANS_TRIGGER_OFF;
this->transitionMode = TRANS_MODE_OFF;
}
}
break;
case TRANS_MODE_14:
case TRANS_MODE_SANDSTORM_END_INIT:
if (this->transitionTrigger == TRANS_TRIGGER_END) {
this->envCtx.sandstormState = 4;
this->envCtx.unk_EB = 0xFF;
this->envCtx.unk_EC = 0xFF;
this->transitionMode = TRANS_MODE_15;
this->envCtx.sandstormPrimA = 255;
this->envCtx.sandstormEnvA = 255;
this->transitionMode = TRANS_MODE_SANDSTORM_END;
} else {
this->transitionMode = TRANS_MODE_12;
this->transitionMode = TRANS_MODE_SANDSTORM_INIT;
}
break;
case TRANS_MODE_15:
case TRANS_MODE_SANDSTORM_END:
func_8019F128(NA_SE_EV_SAND_STORM - SFX_FLAG);
if (this->transitionTrigger == TRANS_TRIGGER_END) {
if (this->envCtx.unk_EB <= 0) {
D_801F6D10 = 0;
if (this->envCtx.sandstormPrimA <= 0) {
gTrnsnUnkState = 0;
Game_SetFramerateDivisor(&this->state, 3);
this->transitionTrigger = TRANS_TRIGGER_OFF;
this->transitionMode = TRANS_MODE_OFF;
@@ -869,21 +891,22 @@ void func_80166B30(PlayState* this) {
}
break;
case TRANS_MODE_16:
D_801F6C10 = 0;
this->envCtx.fillScreen = 1;
case TRANS_MODE_CS_BLACK_FILL_INIT:
sTransitionFillTimer = 0;
this->envCtx.fillScreen = true;
this->envCtx.screenFillColor[0] = 0;
this->envCtx.screenFillColor[1] = 0;
this->envCtx.screenFillColor[2] = 0;
this->envCtx.screenFillColor[3] = 255;
this->transitionMode = TRANS_MODE_17;
this->transitionMode = TRANS_MODE_CS_BLACK_FILL;
break;
case TRANS_MODE_17:
case TRANS_MODE_CS_BLACK_FILL:
if (gSaveContext.cutsceneTransitionControl != 0) {
this->envCtx.screenFillColor[3] = gSaveContext.cutsceneTransitionControl;
if (gSaveContext.cutsceneTransitionControl < 0x65) {
D_801F6D10 = 0;
if (gSaveContext.cutsceneTransitionControl <= 100) {
gTrnsnUnkState = 0;
Game_SetFramerateDivisor(&this->state, 3);
this->transitionTrigger = TRANS_TRIGGER_OFF;
this->transitionMode = TRANS_MODE_OFF;
@@ -896,16 +919,16 @@ void func_80166B30(PlayState* this) {
#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/Play_Update.s")
void func_80167DE4(PlayState* play) {
if (D_801F6DFC == 0) {
if (!D_801F6DFC) {
if (play->pauseCtx.unk_1F0 != 0) {
D_801F6DFC = 1;
D_801F6DFC = true;
D_801F6D50.unk_00 = 0;
}
} else {
if (CHECK_BTN_ALL(CONTROLLER1(&play->state)->press.button, BTN_L) ||
CHECK_BTN_ALL(CONTROLLER1(&play->state)->press.button, BTN_B) ||
CHECK_BTN_ALL(CONTROLLER1(&play->state)->press.button, BTN_START) || (gIrqMgrResetStatus != 0)) {
D_801F6DFC = 0;
D_801F6DFC = false;
play->pauseCtx.unk_1F0 = 0;
D_801F6D50.unk_00 = 0;
play->msgCtx.msgLength = 0;
@@ -915,7 +938,7 @@ void func_80167DE4(PlayState* play) {
play_sound(NA_SE_SY_CANCEL);
}
}
if (D_801F6DFC != 0) {
if (D_801F6DFC) {
func_8016F5A8(play, &D_801F6D50, play->state.input);
func_8015680C(play);
} else {
@@ -973,7 +996,7 @@ void func_80168DAC(PlayState* this) {
{
GraphicsContext* gfxCtx2 = this->state.gfxCtx;
if (D_801F6DFC != 0) {
if (D_801F6DFC) {
if (D_801FBBD4 != 1) {
MsgEvent_SendNullTask();
func_80178818();
@@ -1000,7 +1023,7 @@ void func_80168DAC(PlayState* this) {
}
}
if ((D_801F6DFC != 0) && ((SREG(2) != 2) || (gZBufferPtr == NULL))) {
if (D_801F6DFC && ((SREG(2) != 2) || (gZBufferPtr == NULL))) {
func_8016F1A8(&D_801F6D50, gfxCtx);
Message_Draw(this);
} else {
@@ -1452,7 +1475,7 @@ void func_80169EFC(GameState* thisx) {
gSaveContext.respawnFlag = 1;
func_80169ECC(this);
this->transitionTrigger = TRANS_TRIGGER_START;
this->transitionType = TRANS_TYPE_02;
this->transitionType = TRANS_TYPE_FADE_BLACK;
}
// Gameplay_LoadToLastEntrance ?
@@ -1464,7 +1487,7 @@ void func_80169F78(GameState* thisx) {
gSaveContext.respawnFlag = -1;
func_80169ECC(this);
this->transitionTrigger = TRANS_TRIGGER_START;
this->transitionType = TRANS_TYPE_02;
this->transitionType = TRANS_TYPE_FADE_BLACK;
}
// Gameplay_TriggerRespawn ?
@@ -1794,9 +1817,9 @@ void Play_Init(GameState* thisx) {
this->unk_18E68 = D_80784600;
this->unk_18E58 = D_80784600;
this->unk_18E60 = D_80784600;
D_801F6D10 = 0;
gTrnsnUnkState = 0;
this->transitionMode = TRANS_MODE_OFF;
D_801D0D54 = 0;
D_801D0D54 = false;
FrameAdvance_Init(&this->frameAdvCtx);
Rand_Seed(osGetTime());
@@ -1820,7 +1843,7 @@ void Play_Init(GameState* thisx) {
gSaveContext.nextTransitionType = TRANS_NEXT_TYPE_DEFAULT;
}
} else {
this->transitionType = TRANS_TYPE_02;
this->transitionType = TRANS_TYPE_FADE_BLACK;
}
TransitionFade_Init(&this->unk_18E48);
@@ -1872,7 +1895,7 @@ void Play_Init(GameState* thisx) {
AnimationContext_Update(this, &this->animationCtx);
func_800EDBE0(this);
gSaveContext.respawnFlag = 0;
D_801F6DFC = 0;
D_801F6DFC = false;
func_8016FC78(&D_801F6D50);
}
src/code/z_rcp.c
+1 -1
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) {
if ((R_PAUSE_MENU_MODE < 2) && (D_801F6D10 < 2)) {
if ((R_PAUSE_MENU_MODE < 2) && (gTrnsnUnkState < 2)) {
func_8012CF0C(gfxCtx, true, true, r, g, b);
} else {
func_8012CF0C(gfxCtx, false, false, r, g, b);
src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
+2 -2
View File
@@ -252,8 +252,8 @@ void func_809542A0(BgIngate* this, PlayState* play) {
}
gSaveContext.nextCutsceneIndex = 0;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
this->actionFunc = func_80953F8C;
gSaveContext.save.weekEventReg[90] &= (u8)~0x40;
func_800FE498();
src/overlays/actors/ovl_Boss_06/z_boss_06.c
+2 -2
View File
@@ -220,7 +220,7 @@ void func_809F24C8(Boss06* this, PlayState* play) {
case 1:
if (this->unk_1CA >= 10) {
Math_ApproachF(&this->unk_1E4, 30.0f, 0.2f, 1.0f);
play->envCtx.fillScreen = 1;
play->envCtx.fillScreen = true;
play->envCtx.screenFillColor[2] = 0;
play->envCtx.screenFillColor[1] = 0;
play->envCtx.screenFillColor[0] = 0;
@@ -233,7 +233,7 @@ void func_809F24C8(Boss06* this, PlayState* play) {
}
if (this->unk_1CA >= 60) {
play->envCtx.fillScreen = 0;
play->envCtx.fillScreen = false;
this->unk_1C8 = 0;
this->unk_1DC = 0.0f;
this->unk_1D8 = 0.0f;
src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+17 -17
View File
@@ -410,8 +410,8 @@ void func_808B958C(DoorWarp1* this, PlayState* play) {
this->unk_1D0++;
if ((this->unk_1D0 > 120) && (gSaveContext.nextCutsceneIndex == 0xFFEF)) {
func_808BA10C(this, play);
play->transitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
}
Math_SmoothStepToF(&this->unk_1A8, 6.0f, 0.2f, 0.02f, 0.01f);
@@ -706,8 +706,8 @@ void func_808BA10C(DoorWarp1* this, PlayState* play) {
}
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
} else {
switch (phi_v0_2) {
case 0:
@@ -715,14 +715,14 @@ void func_808BA10C(DoorWarp1* this, PlayState* play) {
gSaveContext.save.weekEventReg[7] |= 0x80;
play->nextEntrance = ENTRANCE(WOODFALL_TEMPLE, 1);
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
} else {
play->nextEntrance = ENTRANCE(WOODFALL, 0);
gSaveContext.nextCutsceneIndex = 0xFFF0;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
}
break;
@@ -730,8 +730,8 @@ void func_808BA10C(DoorWarp1* this, PlayState* play) {
gSaveContext.save.weekEventReg[33] |= 0x80;
play->nextEntrance = ENTRANCE(MOUNTAIN_VILLAGE_SPRING, 7);
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
break;
case 3:
@@ -739,15 +739,15 @@ void func_808BA10C(DoorWarp1* this, PlayState* play) {
play->nextEntrance = ENTRANCE(ZORA_CAPE, 9);
gSaveContext.nextCutsceneIndex = 0xFFF0;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
} else {
gSaveContext.save.weekEventReg[55] |= 0x80;
play->nextEntrance = ENTRANCE(ZORA_CAPE, 8);
gSaveContext.nextCutsceneIndex = 0xFFF0;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
}
break;
@@ -756,8 +756,8 @@ void func_808BA10C(DoorWarp1* this, PlayState* play) {
play->nextEntrance = ENTRANCE(IKANA_CANYON, 15);
gSaveContext.nextCutsceneIndex = 0xFFF2;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
break;
}
}
@@ -834,7 +834,7 @@ void func_808BA550(DoorWarp1* this, PlayState* play) {
}
if (this->unk_1D0 > 140) {
play->envCtx.fillScreen = 1;
play->envCtx.fillScreen = true;
temp_f0 = (this->unk_1D0 - 140) / 20.0f;
if (temp_f0 > 1.0f) {
temp_f0 = 1.0f;
src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
+1 -1
View File
@@ -675,7 +675,7 @@ void func_809C2788(EnAob01* this, PlayState* play) {
play->nextEntrance = ENTRANCE(DOGGY_RACETRACK, 1);
gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & (u8)~7) | 3;
play->transitionType = TRANS_TYPE_64;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
play->transitionTrigger = TRANS_TRIGGER_START;
}
}
src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
+1 -1
View File
@@ -336,7 +336,7 @@ void func_809C51B4(EnBomBowlMan* this, PlayState* play) {
gSaveContext.nextCutsceneIndex = 0;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_86;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
gSaveContext.save.weekEventReg[75] &= (u8)~0x40;
if (player->transformation == PLAYER_FORM_HUMAN) {
gSaveContext.save.weekEventReg[84] |= 0x80;
src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c
+1 -1
View File
@@ -761,7 +761,7 @@ void func_80BFFBC4(EnBomjima* this, PlayState* play) {
gSaveContext.nextCutsceneIndex = 0;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_86;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
ActorCutscene_Stop(this->unk_2D4[1]);
}
}
src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c
+1 -1
View File
@@ -799,7 +799,7 @@ void func_80C02CA4(EnBomjimb* this, PlayState* play) {
gSaveContext.nextCutsceneIndex = 0;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_86;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
}
gSaveContext.save.weekEventReg[75] |= 0x40;
gSaveContext.save.weekEventReg[83] |= 4;
src/overlays/actors/ovl_En_Dns/z_en_dns.c
+2 -2
View File
@@ -440,8 +440,8 @@ void func_8092D330(EnDns* this, PlayState* play) {
play->nextEntrance = ENTRANCE(DEKU_PALACE, 1);
gSaveContext.nextCutsceneIndex = 0;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
}
}
src/overlays/actors/ovl_En_Fall/z_en_fall.c
+2 -2
View File
@@ -344,8 +344,8 @@ void EnFall_CrashingMoon_HandleGiantsCutscene(EnFall* this, PlayState* play) {
play->nextEntrance = ENTRANCE(CLOCK_TOWER_ROOFTOP, 0);
gSaveContext.nextCutsceneIndex = 0xFFF2;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_02;
gSaveContext.nextTransitionType = TRANS_TYPE_02;
play->transitionType = TRANS_TYPE_FADE_BLACK;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK;
sGiantsCutsceneState = 9;
}
break;
src/overlays/actors/ovl_En_Gk/z_en_gk.c
+2 -2
View File
@@ -722,8 +722,8 @@ void func_80B51B40(EnGk* this, PlayState* play) {
if (this->unk_31C == 0xE8F) {
play->nextEntrance = ENTRANCE(GORON_RACETRACK, 1);
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
Parameter_AddMagic(play, ((void)0, gSaveContext.unk_3F30) +
(gSaveContext.save.playerData.doubleMagic * 0x30) + 0x30);
} else {
src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c
+4 -4
View File
@@ -158,14 +158,14 @@ s32 func_808F8EB0(EnHorseGameCheck* this, PlayState* play) {
if (GET_RACE_FLAGS == RACE_FLAG_3) {
play->transitionType = TRANS_TYPE_64;
gSaveContext.nextTransitionType = TRANS_TYPE_02;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK;
} else if (GET_RACE_FLAGS == RACE_FLAG_2) {
play->transitionType = TRANS_TYPE_80;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
} else if (GET_RACE_FLAGS == RACE_FLAG_4) {
SET_RACE_FLAGS(RACE_FLAG_3);
play->transitionType = TRANS_TYPE_02;
gSaveContext.nextTransitionType = TRANS_TYPE_02;
play->transitionType = TRANS_TYPE_FADE_BLACK;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK;
}
D_801BDA9C = 0;
src/overlays/actors/ovl_En_In/z_en_in.c
+2 -2
View File
@@ -820,7 +820,7 @@ s32 func_808F4414(PlayState* play, EnIn* this, s32 arg2) {
SET_RACE_FLAGS(RACE_FLAG_START);
func_800FD750(NA_BGM_HORSE);
play->nextEntrance = ENTRANCE(GORMAN_TRACK, 5);
play->transitionType = TRANS_TYPE_05;
play->transitionType = TRANS_TYPE_FADE_WHITE_FAST;
play->transitionTrigger = TRANS_TRIGGER_START;
gSaveContext.save.weekEventReg[57] |= 1;
break;
@@ -1067,7 +1067,7 @@ s32 func_808F4414(PlayState* play, EnIn* this, s32 arg2) {
SET_RACE_FLAGS(RACE_FLAG_START);
func_800FD750(NA_BGM_HORSE);
play->nextEntrance = ENTRANCE(GORMAN_TRACK, 5);
play->transitionType = TRANS_TYPE_05;
play->transitionType = TRANS_TYPE_FADE_WHITE_FAST;
play->transitionTrigger = TRANS_TRIGGER_START;
gSaveContext.save.weekEventReg[57] |= 1;
break;
src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c
+1 -1
View File
@@ -370,7 +370,7 @@ void func_80C144F8(EnJgameTsn* this, PlayState* play) {
play->nextEntrance = ENTRANCE(GREAT_BAY_COAST, 13);
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_80;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
}
void func_80C14540(EnJgameTsn* this) {
src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
+4 -4
View File
@@ -666,7 +666,7 @@ void EnMa4_BeginHorsebackGame(EnMa4* this, PlayState* play) {
gSaveContext.nextCutsceneIndex = 0xFFF0;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_80;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
}
void EnMa4_HorsebackGameCheckPlayerInteractions(EnMa4* this, PlayState* play) {
@@ -760,10 +760,10 @@ void EnMa4_HorsebackGameEnd(EnMa4* this, PlayState* play) {
if (this->poppedBalloonCounter == 10) {
play->transitionType = TRANS_TYPE_80;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
} else {
play->transitionType = TRANS_TYPE_64;
gSaveContext.nextTransitionType = TRANS_TYPE_02;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK;
}
this->poppedBalloonCounter = 0;
@@ -863,7 +863,7 @@ void EnMa4_BeginDescribeThemCs(EnMa4* this, PlayState* play) {
gSaveContext.nextCutsceneIndex = 0xFFF5;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_64;
gSaveContext.nextTransitionType = TRANS_TYPE_02;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK;
}
void EnMa4_StartDialogue(EnMa4* this, PlayState* play) {
src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c
+1 -1
View File
@@ -1098,7 +1098,7 @@ void EnMaYto_PostMilkRunEnd(EnMaYto* this, PlayState* play) {
gSaveContext.nextCutsceneIndex = 0;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_80;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
}
void EnMaYto_DefaultStartDialogue(EnMaYto* this, PlayState* play) {
src/overlays/actors/ovl_En_Mag/z_en_mag.c
+1 -1
View File
@@ -390,7 +390,7 @@ void EnMag_Update(Actor* thisx, PlayState* play) {
play_sound(NA_SE_SY_PIECE_OF_HEART);
gSaveContext.gameMode = 2; // Go to FileChoose
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_02;
play->transitionType = TRANS_TYPE_FADE_BLACK;
play->nextEntrance = ENTRANCE(CUTSCENE, 0);
gSaveContext.save.cutscene = 0;
gSaveContext.sceneSetupIndex = 0;
src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c
+6 -6
View File
@@ -398,10 +398,10 @@ void EnMttag_RaceFinish(EnMttag* this, PlayState* play) {
if (DECR(this->timer) == 0) {
if ((gSaveContext.eventInf[1] & 2)) {
// Player won
EnMttag_ExitRace(play, TRANS_TYPE_03, TRANS_TYPE_03);
EnMttag_ExitRace(play, TRANS_TYPE_FADE_WHITE, TRANS_TYPE_FADE_WHITE);
} else {
// A non-player Goron won
EnMttag_ExitRace(play, TRANS_TYPE_02, TRANS_TYPE_02);
EnMttag_ExitRace(play, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK);
}
Actor_MarkForDeath(&this->actor);
@@ -429,8 +429,8 @@ void EnMttag_PotentiallyRestartRace(EnMttag* this, PlayState* play) {
}
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_02;
gSaveContext.nextTransitionType = TRANS_TYPE_02;
play->transitionType = TRANS_TYPE_FADE_BLACK;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK;
func_801477B4(play);
func_800B7298(play, &this->actor, 7);
Parameter_AddMagic(play,
@@ -442,7 +442,7 @@ void EnMttag_PotentiallyRestartRace(EnMttag* this, PlayState* play) {
gSaveContext.eventInf[1] &= (u8)~8;
gSaveContext.eventInf[2] = ((gSaveContext.eventInf[2] & 0xF) + 1) | (gSaveContext.eventInf[2] & 0xF0);
} else {
EnMttag_ExitRace(play, TRANS_TYPE_02, TRANS_TYPE_02);
EnMttag_ExitRace(play, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK);
}
Actor_MarkForDeath(&this->actor);
}
@@ -458,7 +458,7 @@ void EnMttag_HandleCantWinChoice(EnMttag* this, PlayState* play) {
// Exit the race
func_8019F230();
gSaveContext.unk_3DD0[4] = 0;
EnMttag_ExitRace(play, TRANS_TYPE_02, TRANS_TYPE_02);
EnMttag_ExitRace(play, TRANS_TYPE_FADE_BLACK, TRANS_TYPE_FADE_BLACK);
gSaveContext.eventInf[1] &= (u8)~8;
gSaveContext.eventInf[1] |= 4;
Actor_MarkForDeath(&this->actor);
src/overlays/actors/ovl_En_Pamera/z_en_pamera.c
+1 -1
View File
@@ -689,7 +689,7 @@ void func_80BD9C70(EnPamera* this, PlayState* play) {
play->nextEntrance = ENTRANCE(IKANA_CANYON, 2);
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_70;
gSaveContext.nextTransitionType = TRANS_TYPE_02;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK;
}
s32 func_80BD9CB8(EnPamera* this, PlayState* play) {
src/overlays/actors/ovl_En_Shn/z_en_shn.c
+2 -2
View File
@@ -263,8 +263,8 @@ s32 func_80AE6704(Actor* thisx, PlayState* play) {
play->nextEntrance = ENTRANCE(SOUTHERN_SWAMP_POISONED, 6);
gSaveContext.nextCutsceneIndex = 0;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_07;
play->transitionType = TRANS_TYPE_FADE_WHITE;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE_SLOW;
this->unk_2C6++;
break;
}
src/overlays/actors/ovl_En_Test4/z_en_test4.c
+1 -1
View File
@@ -457,7 +457,7 @@ void func_80A42AB8(EnTest4* this, PlayState* play) {
}
gSaveContext.nextCutsceneIndex = 0xFFF1;
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_02;
play->transitionType = TRANS_TYPE_FADE_BLACK;
player->stateFlags1 |= 0x200;
Actor_MarkForDeath(&this->actor);
}
src/overlays/actors/ovl_En_Test6/z_en_test6.c
+5 -5
View File
@@ -197,7 +197,7 @@ void func_80A90C34(void) {
}
void func_80A90C54(PlayState* play, f32 arg1) {
play->envCtx.fillScreen = 1;
play->envCtx.fillScreen = true;
play->envCtx.screenFillColor[0] = 250;
play->envCtx.screenFillColor[1] = 250;
play->envCtx.screenFillColor[2] = 250;
@@ -205,7 +205,7 @@ void func_80A90C54(PlayState* play, f32 arg1) {
}
void func_80A90D20(PlayState* play) {
play->envCtx.fillScreen = 0;
play->envCtx.fillScreen = false;
}
void func_80A90D34(EnTest6* this, PlayState* play, EnTest6Struct* ptr) {
@@ -344,7 +344,7 @@ void EnTest6_Destroy(Actor* thisx, PlayState* play2) {
play->envCtx.lightSettings.fogColor[2] = 0;
play->envCtx.lightSettings.fogNear = 0;
play->envCtx.lightSettings.fogFar = 0;
play->envCtx.fillScreen = 0;
play->envCtx.fillScreen = false;
for (i = 0; i < ARRAY_COUNT(this->lights); i++) {
LightContext_RemoveLight(play, &play->lightCtx, this->lights[i].node);
@@ -981,7 +981,7 @@ void func_80A92950(EnTest6* this, PlayState* play) {
this->unk_276 = 99;
play->transitionTrigger = TRANS_TRIGGER_START;
play->nextEntrance = gSaveContext.respawn[RESPAWN_MODE_RETURN].entrance;
play->transitionType = TRANS_TYPE_02;
play->transitionType = TRANS_TYPE_FADE_BLACK;
if ((gSaveContext.save.time > CLOCK_TIME(18, 0)) || (gSaveContext.save.time < CLOCK_TIME(6, 0))) {
gSaveContext.respawnFlag = -0x63;
gSaveContext.eventInf[2] |= 0x80;
@@ -1062,7 +1062,7 @@ void func_80A92950(EnTest6* this, PlayState* play) {
this->unk_276 = 99;
play->transitionTrigger = TRANS_TRIGGER_START;
play->nextEntrance = gSaveContext.respawn[RESPAWN_MODE_RETURN].entrance;
play->transitionType = TRANS_TYPE_02;
play->transitionType = TRANS_TYPE_FADE_BLACK;
gSaveContext.respawnFlag = 2;
play->msgCtx.ocarinaMode = 4;
}
src/overlays/actors/ovl_En_Test7/z_en_test7.c
+1 -1
View File
@@ -676,7 +676,7 @@ void func_80AF2350(EnTest7* this, PlayState* play) {
}
play->transitionTrigger = TRANS_TRIGGER_START;
play->transitionType = TRANS_TYPE_02;
play->transitionType = TRANS_TYPE_FADE_BLACK;
gSaveContext.seqIndex = 0xFF;
gSaveContext.nightSeqIndex = 0xFF;
}
src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c
+2 -2
View File
@@ -374,8 +374,8 @@ void func_80B76BB8(EnTruMt* this, PlayState* play) {
if (Message_GetState(&play->msgCtx) == TEXT_STATE_5) {
if (Message_ShouldAdvance(play)) {
play->nextEntrance = ENTRANCE(TOURIST_INFORMATION, 1);
play->transitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
play->transitionType = TRANS_TYPE_FADE_WHITE;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
play->transitionTrigger = TRANS_TRIGGER_START;
}
}
src/overlays/actors/ovl_En_Zov/z_en_zov.c
+1 -1
View File
@@ -424,7 +424,7 @@ void func_80BD1DB8(EnZov* this, PlayState* play) {
case 0x1039:
play->nextEntrance = play->setupExitList[ENZOV_GET_FE00(&this->picto.actor)];
play->transitionType = TRANS_TYPE_05;
play->transitionType = TRANS_TYPE_FADE_WHITE_FAST;
play->transitionTrigger = TRANS_TRIGGER_START;
gSaveContext.save.weekEventReg[78] |= 1;
this->actionFunc = func_80BD1D94;
src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c
+2 -2
View File
@@ -458,11 +458,11 @@ void ObjTokeidai_TowerOpening_EndCutscene(ObjTokeidai* this, PlayState* play) {
gSaveContext.respawnFlag = 2;
play->transitionTrigger = TRANS_TRIGGER_START;
play->nextEntrance = gSaveContext.respawn[RESPAWN_MODE_RETURN].entrance;
play->transitionType = TRANS_TYPE_02;
play->transitionType = TRANS_TYPE_FADE_BLACK;
if (gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams == 0xCFF) {
gSaveContext.nextTransitionType = TRANS_TYPE_21;
} else {
gSaveContext.nextTransitionType = TRANS_TYPE_02;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK;
}
}
this->actionFunc = ObjTokeidai_DoNothing;
src/overlays/actors/ovl_Obj_Um/z_obj_um.c
+6 -6
View File
@@ -838,7 +838,7 @@ s32 func_80B795A0(PlayState* play, ObjUm* this, s32 arg2) {
D_801BDAA0 = 1;
}
play->transitionType = TRANS_TYPE_64;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
play->transitionTrigger = TRANS_TRIGGER_START;
phi_v1 = true;
} else {
@@ -1142,7 +1142,7 @@ void ObjUm_RanchWaitPathFinished(ObjUm* this, PlayState* play) {
ActorCutscene_Stop(this->dyna.actor.cutscene);
play->nextEntrance = ENTRANCE(MILK_ROAD, 5);
play->transitionType = TRANS_TYPE_64;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
play->transitionTrigger = TRANS_TRIGGER_START;
} else {
func_80B79524(this);
@@ -1245,7 +1245,7 @@ void func_80B7A2AC(ObjUm* this, PlayState* play) {
case OBJUM_PATH_STATE_FINISH:
play->nextEntrance = ENTRANCE(GORMAN_TRACK, 4);
play->transitionType = TRANS_TYPE_64;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
play->transitionTrigger = TRANS_TRIGGER_START;
break;
@@ -1303,14 +1303,14 @@ void ObjUm_RunMinigame(ObjUm* this, PlayState* play) {
if (!this->areAllPotsBroken) {
play->nextEntrance = ENTRANCE(MILK_ROAD, 6);
play->transitionType = TRANS_TYPE_64;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
play->transitionTrigger = TRANS_TRIGGER_START;
gSaveContext.save.weekEventReg[52] |= 1;
gSaveContext.save.weekEventReg[52] &= (u8)~2;
} else {
play->nextEntrance = ENTRANCE(ROMANI_RANCH, 8);
play->transitionType = TRANS_TYPE_64;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
play->transitionTrigger = TRANS_TRIGGER_START;
gSaveContext.save.weekEventReg[52] |= 2;
gSaveContext.save.weekEventReg[52] &= (u8)~1;
@@ -1552,7 +1552,7 @@ void ObjUm_PostMilkRunWaitPathFinished(ObjUm* this, PlayState* play) {
gSaveContext.nextCutsceneIndex = 0xFFF3;
play->nextEntrance = ENTRANCE(TERMINA_FIELD, 0);
play->transitionType = TRANS_TYPE_64;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
play->transitionTrigger = TRANS_TRIGGER_START;
gSaveContext.save.time += CLOCK_TIME(1, 0) + 2;
}
src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c
+1 -1
View File
@@ -110,7 +110,7 @@ void func_808A7C78(ObjWturn* this, PlayState* play) {
Play_SetCameraAtEyeUp(play, this->subCamId, &player->actor.focus.pos, &subCam->eye, &sSubCamUp);
if (this->unk_14A == 1) {
play->transitionType = TRANS_TYPE_64;
gSaveContext.nextTransitionType = TRANS_TYPE_03;
gSaveContext.nextTransitionType = TRANS_TYPE_FADE_WHITE;
gSaveContext.nextCutsceneIndex = 0;
if (play->sceneNum == SCENE_F40) {
play->nextEntrance = ENTRANCE(STONE_TOWER_INVERTED, 0);
tools/disasm/functions.txt
+3 -3
View File
@@ -2940,8 +2940,8 @@
0x80163D80:("func_80163D80",),
0x80163DC0:("func_80163DC0",),
0x8016418C:("func_8016418C",),
0x8016424C:("func_8016424C",),
0x801642D8:("func_801642D8",),
0x8016424C:("TransitionUnk_Destroy",),
0x801642D8:("TransitionUnk_Init",),
0x80164438:("func_80164438",),
0x8016454C:("func_8016454C",),
0x80164678:("func_80164678",),
@@ -2991,7 +2991,7 @@
0x80166644:("func_80166644",),
0x801668B4:("func_801668B4",),
0x80166968:("func_80166968",),
0x80166B30:("func_80166B30",),
0x80166B30:("Play_UpdateTransition",),
0x80167814:("Play_Update",),
0x80167DE4:("func_80167DE4",),
0x80167F0C:("Play_DrawOverlayElements",),
tools/disasm/variables.txt
+3 -3
View File
@@ -4053,11 +4053,11 @@
0x801F6BF0:("sKaleidoAreaFaultClient","FaultAddrConvClient","",0xC),
0x801F6C00:("sKaleidoScopeUpdateFunc","void*","",0x4),
0x801F6C04:("sKaleidoScopeDrawFunc","void*","",0x4),
0x801F6C10:("D_801F6C10","UNK_TYPE1","",0x1),
0x801F6C10:("sTransitionFillTimer","UNK_TYPE1","",0x1),
0x801F6C18:("D_801F6C18","Input","",0x18),
0x801F6C30:("D_801F6C30","UNK_TYPE1","",0x1),
0x801F6C30:("sTrnsnUnk","UNK_TYPE1","",0x1),
0x801F6D0C:("D_801F6D0C","UNK_TYPE1","",0x1),
0x801F6D10:("D_801F6D10","UNK_TYPE4","",0x4),
0x801F6D10:("gTrnsnUnkState","UNK_TYPE4","",0x4),
0x801F6D18:("D_801F6D18","UNK_TYPE1","",0x1),
0x801F6D30:("D_801F6D30","Color_RGBA8","",0x4),
0x801F6D38:("D_801F6D38","UNK_TYPE1","",0x1),
tools/sizes/code_functions.csv
+3 -3
View File
@@ -2454,8 +2454,8 @@ asm/non_matchings/code/z_fbdemo_dlftbls/func_80163C90.s,func_80163C90,0x80163C90
asm/non_matchings/code/z_fbdemo_dlftbls/func_80163D80.s,func_80163D80,0x80163D80,0x10
asm/non_matchings/code/z_fbdemo/func_80163DC0.s,func_80163DC0,0x80163DC0,0xF3
asm/non_matchings/code/z_fbdemo/func_8016418C.s,func_8016418C,0x8016418C,0x30
asm/non_matchings/code/z_fbdemo/func_8016424C.s,func_8016424C,0x8016424C,0x23
asm/non_matchings/code/z_fbdemo/func_801642D8.s,func_801642D8,0x801642D8,0x58
asm/non_matchings/code/z_fbdemo/TransitionUnk_Destroy.s,TransitionUnk_Destroy,0x8016424C,0x23
asm/non_matchings/code/z_fbdemo/TransitionUnk_Init.s,TransitionUnk_Init,0x801642D8,0x58
asm/non_matchings/code/z_fbdemo/func_80164438.s,func_80164438,0x80164438,0x45
asm/non_matchings/code/z_fbdemo/func_8016454C.s,func_8016454C,0x8016454C,0x4B
asm/non_matchings/code/z_fbdemo/func_80164678.s,func_80164678,0x80164678,0x4D
@@ -2505,7 +2505,7 @@ asm/non_matchings/code/z_play/func_801663C4.s,func_801663C4,0x801663C4,0xA0
asm/non_matchings/code/z_play/func_80166644.s,func_80166644,0x80166644,0x9C
asm/non_matchings/code/z_play/func_801668B4.s,func_801668B4,0x801668B4,0x2D
asm/non_matchings/code/z_play/func_80166968.s,func_80166968,0x80166968,0x72
asm/non_matchings/code/z_play/func_80166B30.s,func_80166B30,0x80166B30,0x339
asm/non_matchings/code/z_play/Play_UpdateTransition.s,Play_UpdateTransition,0x80166B30,0x339
asm/non_matchings/code/z_play/Play_Update.s,Play_Update,0x80167814,0x174
asm/non_matchings/code/z_play/func_80167DE4.s,func_80167DE4,0x80167DE4,0x4A
asm/non_matchings/code/z_play/Play_DrawOverlayElements.s,Play_DrawOverlayElements,0x80167F0C,0x61
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
2454 asm/non_matchings/code/z_fbdemo_dlftbls/func_80163D80.s func_80163D80 0x80163D80 0x10
2455 asm/non_matchings/code/z_fbdemo/func_80163DC0.s func_80163DC0 0x80163DC0 0xF3
2456 asm/non_matchings/code/z_fbdemo/func_8016418C.s func_8016418C 0x8016418C 0x30
2457 asm/non_matchings/code/z_fbdemo/func_8016424C.s asm/non_matchings/code/z_fbdemo/TransitionUnk_Destroy.s func_8016424C TransitionUnk_Destroy 0x8016424C 0x23
2458 asm/non_matchings/code/z_fbdemo/func_801642D8.s asm/non_matchings/code/z_fbdemo/TransitionUnk_Init.s func_801642D8 TransitionUnk_Init 0x801642D8 0x58
2459 asm/non_matchings/code/z_fbdemo/func_80164438.s func_80164438 0x80164438 0x45
2460 asm/non_matchings/code/z_fbdemo/func_8016454C.s func_8016454C 0x8016454C 0x4B
2461 asm/non_matchings/code/z_fbdemo/func_80164678.s func_80164678 0x80164678 0x4D
2505 asm/non_matchings/code/z_play/func_80166644.s func_80166644 0x80166644 0x9C
2506 asm/non_matchings/code/z_play/func_801668B4.s func_801668B4 0x801668B4 0x2D
2507 asm/non_matchings/code/z_play/func_80166968.s func_80166968 0x80166968 0x72
2508 asm/non_matchings/code/z_play/func_80166B30.s asm/non_matchings/code/z_play/Play_UpdateTransition.s func_80166B30 Play_UpdateTransition 0x80166B30 0x339
2509 asm/non_matchings/code/z_play/Play_Update.s Play_Update 0x80167814 0x174
2510 asm/non_matchings/code/z_play/func_80167DE4.s func_80167DE4 0x80167DE4 0x4A
2511 asm/non_matchings/code/z_play/Play_DrawOverlayElements.s Play_DrawOverlayElements 0x80167F0C 0x61