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

More docs

Browse Source
This commit is contained in:
engineer124
2022-05-23 17:56:34 +10:00
parent a4f17618c7
commit 2fe641ed5c
45 changed files with 146 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64.h
+1 -1
View File
@@ -1404,7 +1404,7 @@ struct GlobalContext {
/* 0x1886C */ AnimatedMaterial* sceneMaterialAnims;
/* 0x18870 */ void* specialEffects;
/* 0x18874 */ u8 skyboxId;
/* 0x18875 */ s8 sceneLoadFlag; // "fade_direction"
/* 0x18875 */ s8 transitionTrigger; // "fade_direction"
/* 0x18876 */ s16 unk_18876;
/* 0x18878 */ s16 bgCoverAlpha;
/* 0x1887A */ u16 nextEntranceIndex;
src/code/z_demo.c
+21 -20
View File
@@ -81,7 +81,7 @@ CutsceneStateHandler sCsStateHandlers2[] = {
};
void Cutscene_Update2(GlobalContext* globalCtx, CutsceneContext* csCtx) {
if ((gSaveContext.cutsceneTrigger != 0) && (globalCtx->sceneLoadFlag == 0x14)) {
if ((gSaveContext.cutsceneTrigger != 0) && (globalCtx->transitionTrigger == 0x14)) {
gSaveContext.cutsceneTrigger = 0;
}
@@ -292,7 +292,7 @@ void Cutscene_Command_Misc(GlobalContext* globalCtx2, CutsceneContext* csCtx, Cs
if (isStartFrame) {
globalCtx->nextEntranceIndex = 0x1C00;
gSaveContext.nextCutsceneIndex = 0xFFF8;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
}
break;
@@ -571,7 +571,7 @@ void Cutscene_TerminatorImpl(GlobalContext* globalCtx, CutsceneContext* csCtx, C
if (cmd->base == 1) {
globalCtx->nextEntranceIndex = globalCtx->csCtx.sceneCsList[globalCtx->csCtx.currentCsIndex].nextEntranceIndex;
gSaveContext.nextCutsceneIndex = 0;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
if (gSaveContext.gameMode != 1) {
Scene_SetExitFade(globalCtx);
} else {
@@ -604,12 +604,12 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt
case 0x1F:
if (gSaveContext.save.weekEventReg[20] & 2) {
globalCtx->nextEntranceIndex = 0x3010;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
} else {
globalCtx->nextEntranceIndex = 0x8600;
gSaveContext.nextCutsceneIndex = 0xFFF0;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
}
break;
@@ -617,12 +617,12 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt
case 0x44:
if (gSaveContext.save.weekEventReg[33] & 0x80) {
globalCtx->nextEntranceIndex = 0xAE70;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
} else {
globalCtx->nextEntranceIndex = 0xAE00;
gSaveContext.nextCutsceneIndex = 0xFFF0;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
}
break;
@@ -631,7 +631,7 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt
gSaveContext.save.weekEventReg[55] |= 0x80;
globalCtx->nextEntranceIndex = 0x6A80;
gSaveContext.nextCutsceneIndex = 0xFFF0;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
break;
@@ -639,7 +639,7 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt
gSaveContext.save.weekEventReg[52] |= 0x20;
globalCtx->nextEntranceIndex = 0x2000;
gSaveContext.nextCutsceneIndex = 0xFFF1;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
break;
}
@@ -666,7 +666,7 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont
globalCtx->nextEntranceIndex = 0x1C00;
gSaveContext.nextCutsceneIndex = 0xFFF9;
}
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
break;
case 3:
@@ -679,7 +679,7 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont
globalCtx->nextEntranceIndex = 0x1C10;
gSaveContext.nextCutsceneIndex = 0xFFF9;
}
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
break;
case 4:
@@ -692,7 +692,7 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont
globalCtx->nextEntranceIndex = 0x1C20;
gSaveContext.nextCutsceneIndex = 0xFFF9;
}
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
break;
case 5:
@@ -705,7 +705,7 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont
globalCtx->nextEntranceIndex = 0x1C30;
gSaveContext.nextCutsceneIndex = 0xFFF9;
}
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
break;
case 6:
@@ -718,7 +718,7 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont
globalCtx->nextEntranceIndex = 0x1C50;
gSaveContext.nextCutsceneIndex = 0xFFF9;
}
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
break;
case 7:
@@ -731,14 +731,14 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont
globalCtx->nextEntranceIndex = 0x1C60;
gSaveContext.nextCutsceneIndex = 0xFFF9;
}
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
break;
case 8:
// Ikana canyon
globalCtx->nextEntranceIndex = 0x2000;
gSaveContext.nextCutsceneIndex = 0xFFF3;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
break;
case 9:
@@ -751,7 +751,7 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont
globalCtx->nextEntranceIndex = 0x1C70;
gSaveContext.nextCutsceneIndex = 0xFFF9;
}
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
break;
case 10:
@@ -764,7 +764,7 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont
globalCtx->nextEntranceIndex = 0x1C40;
gSaveContext.nextCutsceneIndex = 0xFFF9;
}
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
break;
case 11:
@@ -777,7 +777,7 @@ void Cutscene_Command_ChooseCreditsScenes(GlobalContext* globalCtx, CutsceneCont
globalCtx->nextEntranceIndex = 0x1C80;
gSaveContext.nextCutsceneIndex = 0xFFF9;
}
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
break;
}
}
@@ -1175,7 +1175,8 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx,
bcopy(cutscenePtr, &cutsceneEndFrame, sizeof(s32));
cutscenePtr += sizeof(s32);
if (((u16)cutsceneEndFrame < csCtx->frames) && (globalCtx->sceneLoadFlag != 0x14) && (csCtx->state != CS_STATE_4)) {
if (((u16)cutsceneEndFrame < csCtx->frames) && (globalCtx->transitionTrigger != 0x14) &&
(csCtx->state != CS_STATE_4)) {
csCtx->state = CS_STATE_3;
return;
}
src/code/z_kaleido_setup.c
+1 -1
View File
@@ -70,7 +70,7 @@ void KaleidoSetup_Update(GlobalContext* globalCtx) {
}
if ((pauseCtx->state == 0) && (pauseCtx->debugState == 0) && (globalCtx->gameOverCtx.state == GAMEOVER_INACTIVE)) {
if ((globalCtx->sceneLoadFlag == 0) && (globalCtx->transitionMode == 0)) {
if ((globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0)) {
if ((gSaveContext.save.cutscene < 0xFFF0) && (gSaveContext.nextCutsceneIndex < 0xFFF0)) {
if (!Play_InCsMode(globalCtx) || ((msgCtx->msgMode != 0) && (msgCtx->currentTextId == 0xFF))) {
if ((globalCtx->unk_1887C < 2) && (gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY) &&
src/code/z_parameter.c
+59 -52
View File
@@ -148,9 +148,9 @@ u16 sMinigameScoreDigits[] = { 0, 0, 0, 0 };
u16 sCUpInvisible = 0;
u16 sCUpTimer = 0;
s16 sMagicBarOutlinePrimRed = 255;
s16 sMagicBarOutlinePrimGreen = 255;
s16 sMagicBarOutlinePrimBlue = 255;
s16 sMagicMeterOutlinePrimRed = 255;
s16 sMagicMeterOutlinePrimGreen = 255;
s16 sMagicMeterOutlinePrimBlue = 255;
s16 sMagicBorderRatio = 2;
s16 sMagicBorderStep = 1;
@@ -1638,7 +1638,7 @@ void func_80110038(GlobalContext* globalCtx) {
gSaveContext.unk_3F22 = 0;
}
if ((globalCtx->sceneLoadFlag == 0) && (globalCtx->transitionMode == 0)) {
if ((globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0)) {
if (ActorCutscene_GetCurrentIndex() == -1) {
Interface_ChangeAlpha(50);
}
@@ -1898,7 +1898,7 @@ void func_80110038(GlobalContext* globalCtx) {
}
}
if (phi_t3 && (globalCtx->activeCamera == 0) && (globalCtx->sceneLoadFlag == 0) &&
if (phi_t3 && (globalCtx->activeCamera == 0) && (globalCtx->transitionTrigger == 0) &&
(globalCtx->transitionMode == 0)) {
gSaveContext.unk_3F22 = 0;
Interface_ChangeAlpha(50);
@@ -1982,7 +1982,7 @@ void func_80111CB4(GlobalContext* globalCtx) {
if (globalCtx->transitionMode != 0) {
Interface_ChangeAlpha(1);
} else if ((gSaveContext.minigameState == 1) && (gSaveContext.save.entranceIndex == 0x6400) &&
(Cutscene_GetSceneSetupIndex(globalCtx) != 0) && (globalCtx->sceneLoadFlag == 0)) {
(Cutscene_GetSceneSetupIndex(globalCtx) != 0) && (globalCtx->transitionTrigger == 0)) {
Interface_ChangeAlpha(12);
} else if ((gSaveContext.minigameState == 1) && (gSaveContext.eventInf[3] & 0x20)) {
Interface_ChangeAlpha(17);
@@ -2040,7 +2040,7 @@ void func_80111CB4(GlobalContext* globalCtx) {
if (globalCtx->transitionMode != 0) {
Interface_ChangeAlpha(1);
} else if ((gSaveContext.minigameState == 1) && (gSaveContext.save.entranceIndex == 0x6400) &&
(Cutscene_GetSceneSetupIndex(globalCtx) != 0) && (globalCtx->sceneLoadFlag == 0)) {
(Cutscene_GetSceneSetupIndex(globalCtx) != 0) && (globalCtx->transitionTrigger == 0)) {
Interface_ChangeAlpha(12);
} else if (gSaveContext.minigameState == 1) {
Interface_ChangeAlpha(8);
@@ -2108,12 +2108,12 @@ void func_80111CB4(GlobalContext* globalCtx) {
}
}
} else if ((gSaveContext.minigameState == 1) && (gSaveContext.save.entranceIndex == 0x8E10) &&
(globalCtx->sceneLoadFlag == 0) && (globalCtx->transitionMode == 0)) {
(globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0)) {
gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED;
gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED;
gSaveContext.buttonStatus[EQUIP_SLOT_C_RIGHT] = BTN_DISABLED;
Interface_ChangeAlpha(12);
} else if ((gSaveContext.save.entranceIndex == 0xD010) && (globalCtx->sceneLoadFlag == 0) &&
} else if ((gSaveContext.save.entranceIndex == 0xD010) && (globalCtx->transitionTrigger == 0) &&
(globalCtx->transitionMode == 0)) {
gSaveContext.buttonStatus[EQUIP_SLOT_C_LEFT] = BTN_DISABLED;
gSaveContext.buttonStatus[EQUIP_SLOT_C_DOWN] = BTN_DISABLED;
@@ -2136,7 +2136,7 @@ void func_80111CB4(GlobalContext* globalCtx) {
}
if (sp28) {
gSaveContext.unk_3F22 = 0;
if ((globalCtx->sceneLoadFlag == 0) && (globalCtx->transitionMode == 0)) {
if ((globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0)) {
Interface_ChangeAlpha(50);
}
}
@@ -3170,12 +3170,12 @@ void Magic_Add(GlobalContext* globalCtx, s16 magicToAdd) {
void Magic_Reset(GameState* gamestate) {
if ((gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY) && (gSaveContext.magicState != MAGIC_STATE_FILL)) {
sMagicBarOutlinePrimRed = sMagicBarOutlinePrimGreen = sMagicBarOutlinePrimBlue = 255;
sMagicMeterOutlinePrimRed = sMagicMeterOutlinePrimGreen = sMagicMeterOutlinePrimBlue = 255;
gSaveContext.magicState = MAGIC_STATE_IDLE;
}
}
s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 consumeType) {
s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 type) {
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
if (!gSaveContext.save.playerData.isMagicAcquired) {
@@ -3189,9 +3189,10 @@ s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 consumeType)
return false;
}
switch (consumeType) {
case MAGIC_BAR_CONSUME_NOW: // Deku Bubble
switch (type) {
case MAGIC_BAR_CONSUME_NOW:
case MAGIC_BAR_CONSUME_NOW_ALT:
// Deku Bubble
if ((gSaveContext.magicState == MAGIC_STATE_IDLE) ||
(gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) {
if (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS) {
@@ -3225,7 +3226,7 @@ s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 consumeType)
return false;
}
case MAGIC_BAR_CONSUME_LENS: // Lens
case MAGIC_BAR_CONSUME_LENS:
if (gSaveContext.magicState == MAGIC_STATE_IDLE) {
if (gSaveContext.save.playerData.magic != 0) {
interfaceCtx->magicConsumptionTimer = 80;
@@ -3240,7 +3241,8 @@ s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 consumeType)
return false;
}
case MAGIC_BAR_CONSUME_WAIT_PREVIEW: // Spin Attack
case MAGIC_BAR_CONSUME_WAIT_PREVIEW:
// Spin Attack
if ((gSaveContext.magicState == MAGIC_STATE_IDLE) ||
(gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) {
if (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS) {
@@ -3254,7 +3256,8 @@ s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 consumeType)
return false;
}
case MAGIC_BAR_CONSUME_GORON_ZORA: // Zora Shock, Goron Spike Roll
case MAGIC_BAR_CONSUME_GORON_ZORA:
// Zora Shock, Goron Spike Roll
if (gSaveContext.save.playerData.magic != 0) {
interfaceCtx->magicConsumptionTimer = 10;
gSaveContext.magicState = MAGIC_STATE_CONSUME_GORON_ZORA_SETUP;
@@ -3263,7 +3266,8 @@ s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 consumeType)
return false;
}
case MAGIC_BAR_CONSUME_GIANTS_MASK: // Giants Mask
case MAGIC_BAR_CONSUME_GIANTS_MASK:
// Wearing Giants Mask
if (gSaveContext.magicState == MAGIC_STATE_IDLE) {
if (gSaveContext.save.playerData.magic != 0) {
interfaceCtx->magicConsumptionTimer = R_MAGIC_CONSUME_TIMER_GIANT;
@@ -3279,7 +3283,9 @@ s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 consumeType)
return false;
}
case MAGIC_BAR_CONSUME_DEITY_BEAM: // Fierce Deity Beam
case MAGIC_BAR_CONSUME_DEITY_BEAM:
// Using Fierce Deity Beam
// Consumes magic immediately
if ((gSaveContext.magicState == MAGIC_STATE_IDLE) ||
(gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS)) {
if (gSaveContext.magicState == MAGIC_STATE_CONSUME_LENS) {
@@ -3294,10 +3300,9 @@ s32 Magic_Consume(GlobalContext* globalCtx, s16 magicToConsume, s16 consumeType)
play_sound(NA_SE_SY_ERROR);
return false;
}
default:
return false;
}
return false;
}
void Magic_UpdateAddRequest(void) {
@@ -3331,33 +3336,33 @@ void Magic_UpdateMeterBorderColor(void) {
s16 borderChangeB;
s16 index = sMagicBorderIndices[sMagicBorderStep];
borderChangeR = ABS_ALT(sMagicBarOutlinePrimRed - sMagicBorderColors[index][0]) / sMagicBorderRatio;
borderChangeG = ABS_ALT(sMagicBarOutlinePrimGreen - sMagicBorderColors[index][1]) / sMagicBorderRatio;
borderChangeB = ABS_ALT(sMagicBarOutlinePrimBlue - sMagicBorderColors[index][2]) / sMagicBorderRatio;
borderChangeR = ABS_ALT(sMagicMeterOutlinePrimRed - sMagicBorderColors[index][0]) / sMagicBorderRatio;
borderChangeG = ABS_ALT(sMagicMeterOutlinePrimGreen - sMagicBorderColors[index][1]) / sMagicBorderRatio;
borderChangeB = ABS_ALT(sMagicMeterOutlinePrimBlue - sMagicBorderColors[index][2]) / sMagicBorderRatio;
if (sMagicBarOutlinePrimRed >= sMagicBorderColors[index][0]) {
sMagicBarOutlinePrimRed -= borderChangeR;
if (sMagicMeterOutlinePrimRed >= sMagicBorderColors[index][0]) {
sMagicMeterOutlinePrimRed -= borderChangeR;
} else {
sMagicBarOutlinePrimRed += borderChangeR;
sMagicMeterOutlinePrimRed += borderChangeR;
}
if (sMagicBarOutlinePrimGreen >= sMagicBorderColors[index][1]) {
sMagicBarOutlinePrimGreen -= borderChangeG;
if (sMagicMeterOutlinePrimGreen >= sMagicBorderColors[index][1]) {
sMagicMeterOutlinePrimGreen -= borderChangeG;
} else {
sMagicBarOutlinePrimGreen += borderChangeG;
sMagicMeterOutlinePrimGreen += borderChangeG;
}
if (sMagicBarOutlinePrimBlue >= sMagicBorderColors[index][2]) {
sMagicBarOutlinePrimBlue -= borderChangeB;
if (sMagicMeterOutlinePrimBlue >= sMagicBorderColors[index][2]) {
sMagicMeterOutlinePrimBlue -= borderChangeB;
} else {
sMagicBarOutlinePrimBlue += borderChangeB;
sMagicMeterOutlinePrimBlue += borderChangeB;
}
sMagicBorderRatio--;
if (sMagicBorderRatio == 0) {
sMagicBarOutlinePrimRed = sMagicBorderColors[index][0];
sMagicBarOutlinePrimGreen = sMagicBorderColors[index][1];
sMagicBarOutlinePrimBlue = sMagicBorderColors[index][2];
sMagicMeterOutlinePrimRed = sMagicBorderColors[index][0];
sMagicMeterOutlinePrimGreen = sMagicBorderColors[index][1];
sMagicMeterOutlinePrimBlue = sMagicBorderColors[index][2];
sMagicBorderRatio = sMagicBorderColorTimerIndex[sMagicBorderStep];
@@ -3423,7 +3428,7 @@ void Magic_Update(GlobalContext* globalCtx) {
gSaveContext.save.playerData.magic = 0;
}
gSaveContext.magicState = MAGIC_STATE_METER_FLASH_1;
sMagicBarOutlinePrimRed = sMagicBarOutlinePrimGreen = sMagicBarOutlinePrimBlue = 255;
sMagicMeterOutlinePrimRed = sMagicMeterOutlinePrimGreen = sMagicMeterOutlinePrimBlue = 255;
}
// fallthrough
@@ -3436,13 +3441,14 @@ void Magic_Update(GlobalContext* globalCtx) {
break;
case MAGIC_STATE_RESET:
sMagicBarOutlinePrimRed = sMagicBarOutlinePrimGreen = sMagicBarOutlinePrimBlue = 255;
sMagicMeterOutlinePrimRed = sMagicMeterOutlinePrimGreen = sMagicMeterOutlinePrimBlue = 255;
gSaveContext.magicState = MAGIC_STATE_IDLE;
break;
case MAGIC_STATE_CONSUME_LENS:
// Slowly consume magic while lens is on
if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.debugState == 0) && (msgCtx->msgMode == 0) &&
(globalCtx->gameOverCtx.state == 0) && (globalCtx->sceneLoadFlag == 0) &&
(globalCtx->gameOverCtx.state == 0) && (globalCtx->transitionTrigger == 0) &&
(globalCtx->transitionMode == 0) && !Play_InCsMode(globalCtx)) {
if ((gSaveContext.save.playerData.magic == 0) ||
@@ -3451,10 +3457,11 @@ void Magic_Update(GlobalContext* globalCtx) {
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_DOWN) != ITEM_LENS) &&
(BUTTON_ITEM_EQUIP(0, EQUIP_SLOT_C_RIGHT) != ITEM_LENS)) ||
!globalCtx->actorCtx.lensActive) {
// Force lens off and set magic meter state to idle
globalCtx->actorCtx.lensActive = false;
play_sound(NA_SE_SY_GLASSMODE_OFF);
gSaveContext.magicState = MAGIC_STATE_IDLE;
sMagicBarOutlinePrimRed = sMagicBarOutlinePrimGreen = sMagicBarOutlinePrimBlue = 255;
sMagicMeterOutlinePrimRed = sMagicMeterOutlinePrimGreen = sMagicMeterOutlinePrimBlue = 255;
break;
}
@@ -3482,7 +3489,7 @@ void Magic_Update(GlobalContext* globalCtx) {
// fallthrough
case MAGIC_STATE_CONSUME_GORON_ZORA:
if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.debugState == 0) && (msgCtx->msgMode == 0) &&
(globalCtx->gameOverCtx.state == 0) && (globalCtx->sceneLoadFlag == 0) &&
(globalCtx->gameOverCtx.state == 0) && (globalCtx->transitionTrigger == 0) &&
(globalCtx->transitionMode == 0)) {
if (!Play_InCsMode(globalCtx)) {
interfaceCtx->magicConsumptionTimer--;
@@ -3504,7 +3511,7 @@ void Magic_Update(GlobalContext* globalCtx) {
case MAGIC_STATE_CONSUME_GIANTS_MASK:
if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.debugState == 0) && (msgCtx->msgMode == 0) &&
(globalCtx->gameOverCtx.state == 0) && (globalCtx->sceneLoadFlag == 0) &&
(globalCtx->gameOverCtx.state == 0) && (globalCtx->transitionTrigger == 0) &&
(globalCtx->transitionMode == 0)) {
if (!Play_InCsMode(globalCtx)) {
interfaceCtx->magicConsumptionTimer--;
@@ -3548,16 +3555,16 @@ void Magic_DrawMeter(GlobalContext* globalCtx) {
gDPSetEnvColor(OVERLAY_DISP++, 100, 50, 50, 255);
OVERLAY_DISP = func_8010CFBC(OVERLAY_DISP, gMagicMeterEndTex, 8, 16, 18, magicBarY, 8, 16, 1 << 10, 1 << 10,
sMagicBarOutlinePrimRed, sMagicBarOutlinePrimGreen, sMagicBarOutlinePrimBlue,
sMagicMeterOutlinePrimRed, sMagicMeterOutlinePrimGreen, sMagicMeterOutlinePrimBlue,
interfaceCtx->magicAlpha);
OVERLAY_DISP =
func_8010CFBC(OVERLAY_DISP, gMagicMeterMidTex, 24, 16, 26, magicBarY, ((void)0, gSaveContext.magicCapacity),
16, 1 << 10, 1 << 10, sMagicBarOutlinePrimRed, sMagicBarOutlinePrimGreen,
sMagicBarOutlinePrimBlue, interfaceCtx->magicAlpha);
16, 1 << 10, 1 << 10, sMagicMeterOutlinePrimRed, sMagicMeterOutlinePrimGreen,
sMagicMeterOutlinePrimBlue, interfaceCtx->magicAlpha);
OVERLAY_DISP =
func_8010D480(OVERLAY_DISP, gMagicMeterEndTex, 8, 16, ((void)0, gSaveContext.magicCapacity) + 26, magicBarY,
8, 16, 1 << 10, 1 << 10, sMagicBarOutlinePrimRed, sMagicBarOutlinePrimGreen,
sMagicBarOutlinePrimBlue, interfaceCtx->magicAlpha, 3, 0x100);
8, 16, 1 << 10, 1 << 10, sMagicMeterOutlinePrimRed, sMagicMeterOutlinePrimGreen,
sMagicMeterOutlinePrimBlue, interfaceCtx->magicAlpha, 3, 0x100);
gDPPipeSync(OVERLAY_DISP++);
gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, PRIMITIVE, PRIMITIVE,
@@ -5114,7 +5121,7 @@ void func_8011C808(GlobalContext* globalCtx) {
gSaveContext.save.time = 0x400A;
globalCtx->nextEntranceIndex = 0x54C0;
gSaveContext.nextCutsceneIndex = 0;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
}
@@ -5173,7 +5180,7 @@ void Interface_DrawTimers(GlobalContext* globalCtx) {
(globalCtx->gameOverCtx.state == 0) &&
((msgCtx->msgMode == 0) ||
((msgCtx->msgMode != 0) && (msgCtx->currentTextId >= 0x1BB2) && (msgCtx->currentTextId <= 0x1BB6))) &&
!(player->stateFlags1 & 0x200) && (globalCtx->sceneLoadFlag == 0) && (globalCtx->transitionMode == 0) &&
!(player->stateFlags1 & 0x200) && (globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0) &&
!Play_InCsMode(globalCtx)) {
if (D_801BF968) {
@@ -5353,7 +5360,7 @@ void Interface_DrawTimers(GlobalContext* globalCtx) {
if ((globalCtx->sceneNum == SCENE_OKUJOU) && (gSaveContext.sceneSetupIndex == 3)) {
globalCtx->nextEntranceIndex = 0x5410;
gSaveContext.nextCutsceneIndex = 0xFFF0;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
} else {
func_8011C808(globalCtx);
}
@@ -5601,7 +5608,7 @@ void Interface_UpdateTimers(GlobalContext* globalCtx) {
(globalCtx->gameOverCtx.state == 0) &&
((msgCtx->msgMode == 0) || ((msgCtx->currentTextId >= 0x100) && (msgCtx->currentTextId <= 0x200)) ||
((msgCtx->currentTextId >= 0x1BB2) && (msgCtx->currentTextId <= 0x1BB6))) &&
(globalCtx->sceneLoadFlag == 0) && (globalCtx->transitionMode == 0) && !Play_InCsMode(globalCtx)) {
(globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0) && !Play_InCsMode(globalCtx)) {
if (D_801BF96C) {
var3 = osGetTime();
src/code/z_play.c
+2 -2
View File
@@ -215,7 +215,7 @@ void func_80169EFC(GameState* gameState) {
globalCtx->nextEntranceIndex = gSaveContext.respawn[RESTART_MODE_DOWN].entranceIndex;
gSaveContext.respawnFlag = 1;
func_80169ECC(globalCtx);
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 2;
}
@@ -227,7 +227,7 @@ void func_80169F78(GameState* gameState) {
globalCtx->nextEntranceIndex = gSaveContext.respawn[RESTART_MODE_TOP].entranceIndex;
gSaveContext.respawnFlag = -1;
func_80169ECC(globalCtx);
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 2;
}
src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
+1 -1
View File
@@ -249,7 +249,7 @@ void func_809542A0(BgIngate* this, GlobalContext* globalCtx) {
globalCtx->nextEntranceIndex = 0xA810;
}
gSaveContext.nextCutsceneIndex = 0;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
gSaveContext.nextTransition = 3;
this->actionFunc = func_80953F8C;
src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c
+1 -1
View File
@@ -1566,7 +1566,7 @@ void DmStk_Update(Actor* thisx, GlobalContext* globalCtx) {
if ((globalCtx->actorCtx.unk5 & 2) && (globalCtx->msgCtx.msgMode != 0) &&
(globalCtx->msgCtx.currentTextId == 0x5E6) && !FrameAdvance_IsEnabled(&globalCtx->state) &&
(globalCtx->sceneLoadFlag == 0) && (ActorCutscene_GetCurrentIndex() == -1) &&
(globalCtx->transitionTrigger == 0) && (ActorCutscene_GetCurrentIndex() == -1) &&
(globalCtx->csCtx.state == 0)) {
gSaveContext.save.time = ((void)0, gSaveContext.save.time) + (u16)REG(15);
if (REG(15) != 0) {
src/overlays/actors/ovl_Door_Ana/z_door_ana.c
+1 -1
View File
@@ -129,7 +129,7 @@ void DoorAna_WaitOpen(DoorAna* this, GlobalContext* globalCtx) {
s32 grottoType = DOORANA_GET_TYPE(&this->actor);
if (Math_StepToF(&this->actor.scale.x, 0.01f, 0.001f)) {
if (this->actor.targetMode != 0 && globalCtx->sceneLoadFlag == 0 && globalCtx->transitionMode == 0 &&
if (this->actor.targetMode != 0 && globalCtx->transitionTrigger == 0 && globalCtx->transitionMode == 0 &&
(player->stateFlags1 & 0x80000000) && player->unk_AE7 == 0) {
if (grottoType == DOORANA_TYPE_VISIBLE_SCENE_EXIT) {
src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+9 -9
View File
@@ -486,7 +486,7 @@ void func_808B98A8(DoorWarp1* this, GlobalContext* globalCtx) {
if (DOORWARP1_GET_FF00_1(&this->dyna.actor) != 0xFF) {
globalCtx->nextEntranceIndex = globalCtx->setupExitList[DOORWARP1_GET_FF00_3(&this->dyna.actor)];
Scene_SetExitFade(globalCtx);
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
} else {
func_80169FDC(&globalCtx->state);
}
@@ -704,7 +704,7 @@ void func_808BA10C(DoorWarp1* this, GlobalContext* globalCtx) {
gSaveContext.nextCutsceneIndex = phi_v0_3 + 0xFFF0;
}
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
gSaveContext.nextTransition = 3;
} else {
@@ -713,13 +713,13 @@ void func_808BA10C(DoorWarp1* this, GlobalContext* globalCtx) {
if (gSaveContext.save.weekEventReg[20] & 2) {
gSaveContext.save.weekEventReg[7] |= 0x80;
globalCtx->nextEntranceIndex = 0x3010;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
gSaveContext.nextTransition = 3;
} else {
globalCtx->nextEntranceIndex = 0x8600;
gSaveContext.nextCutsceneIndex = 0xFFF0;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
gSaveContext.nextTransition = 3;
}
@@ -728,7 +728,7 @@ void func_808BA10C(DoorWarp1* this, GlobalContext* globalCtx) {
case 1:
gSaveContext.save.weekEventReg[33] |= 0x80;
globalCtx->nextEntranceIndex = 0xAE70;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
gSaveContext.nextTransition = 3;
break;
@@ -737,14 +737,14 @@ void func_808BA10C(DoorWarp1* this, GlobalContext* globalCtx) {
if (gSaveContext.save.weekEventReg[55] & 0x80) {
globalCtx->nextEntranceIndex = 0x6A90;
gSaveContext.nextCutsceneIndex = 0xFFF0;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
gSaveContext.nextTransition = 3;
} else {
gSaveContext.save.weekEventReg[55] |= 0x80;
globalCtx->nextEntranceIndex = 0x6A80;
gSaveContext.nextCutsceneIndex = 0xFFF0;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
gSaveContext.nextTransition = 3;
}
@@ -754,7 +754,7 @@ void func_808BA10C(DoorWarp1* this, GlobalContext* globalCtx) {
gSaveContext.save.weekEventReg[52] |= 0x20;
globalCtx->nextEntranceIndex = 0x20F0;
gSaveContext.nextCutsceneIndex = 0xFFF2;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
gSaveContext.nextTransition = 3;
break;
@@ -766,7 +766,7 @@ void func_808BA10C(DoorWarp1* this, GlobalContext* globalCtx) {
}
globalCtx->nextEntranceIndex = globalCtx->setupExitList[DOORWARP1_GET_FF00_3(&this->dyna.actor)];
Scene_SetExitFade(globalCtx);
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
} else {
func_80169FDC(&globalCtx->state);
}
src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c
+2 -2
View File
@@ -421,7 +421,7 @@ void func_809C1C9C(EnAob01* this, GlobalContext* globalCtx) {
gSaveContext.nextTransition = 0x40;
gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & (u8)~7) | 2;
gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & 7) | (this->unk_432 * 8);
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
}
}
@@ -671,7 +671,7 @@ void func_809C2788(EnAob01* this, GlobalContext* globalCtx) {
gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & (u8)~7) | 3;
globalCtx->unk_1887F = 0x40;
gSaveContext.nextTransition = 3;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
}
}
}
src/overlays/actors/ovl_En_Baba/z_en_baba.c
+1 -1
View File
@@ -255,7 +255,7 @@ void func_80BA8C4C(GlobalContext* globalCtx, u16 nextEntrance) {
globalCtx->nextEntranceIndex = nextEntrance;
globalCtx->unk_1887F = 0x40;
gSaveContext.nextTransition = 0x40;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
}
void func_80BA8C90(EnBaba* this, GlobalContext* globalCtx) {
src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
+1 -1
View File
@@ -335,7 +335,7 @@ void func_809C51B4(EnBomBowlMan* this, GlobalContext* globalCtx) {
((globalCtx->msgCtx.msgMode == 0) || (Message_GetState(&globalCtx->msgCtx) == 6))) {
globalCtx->nextEntranceIndex = Entrance_CreateIndexFromSpawn(6);
gSaveContext.nextCutsceneIndex = 0;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 0x56;
gSaveContext.nextTransition = 3;
gSaveContext.save.weekEventReg[75] &= (u8)~0x40;
src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c
+1 -1
View File
@@ -759,7 +759,7 @@ void func_80BFFBC4(EnBomjima* this, GlobalContext* globalCtx) {
func_801477B4(globalCtx);
globalCtx->nextEntranceIndex = Entrance_CreateIndexFromSpawn(6);
gSaveContext.nextCutsceneIndex = 0;
globalCtx->sceneLoadFlag = 20;
globalCtx->transitionTrigger = 20;
globalCtx->unk_1887F = 0x56;
gSaveContext.nextTransition = 3;
ActorCutscene_Stop(this->unk_2D4[1]);
src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c
+2 -2
View File
@@ -789,11 +789,11 @@ void func_80C02CA4(EnBomjimb* this, GlobalContext* globalCtx) {
globalCtx->nextEntranceIndex = globalCtx->setupExitList[this->unk_2B2];
gSaveContext.nextCutsceneIndex = 0;
Scene_SetExitFade(globalCtx);
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
} else {
globalCtx->nextEntranceIndex = Entrance_CreateIndexFromSpawn(5);
gSaveContext.nextCutsceneIndex = 0;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 0x56;
gSaveContext.nextTransition = 3;
}
src/overlays/actors/ovl_En_Dns/z_en_dns.c
+1 -1
View File
@@ -442,7 +442,7 @@ void func_8092D330(EnDns* this, GlobalContext* globalCtx) {
this->unk_2C6 &= ~0x100;
globalCtx->nextEntranceIndex = 0x5010;
gSaveContext.nextCutsceneIndex = 0;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
gSaveContext.nextTransition = 3;
}
src/overlays/actors/ovl_En_Fall/z_en_fall.c
+1 -1
View File
@@ -342,7 +342,7 @@ void EnFall_CrashingMoon_HandleGiantsCutscene(EnFall* this, GlobalContext* globa
} else if (globalCtx->csCtx.frames > 1600) {
globalCtx->nextEntranceIndex = 0x2C00;
gSaveContext.nextCutsceneIndex = 0xFFF2;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 2;
gSaveContext.nextTransition = 2;
sGiantsCutsceneState = 9;
src/overlays/actors/ovl_En_Gb2/z_en_gb2.c
+2 -2
View File
@@ -359,14 +359,14 @@ void func_80B0FE18(GlobalContext* globalCtx) {
globalCtx->nextEntranceIndex = 0x9C10;
globalCtx->unk_1887F = 0x40;
gSaveContext.nextTransition = 0x40;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
}
void func_80B0FE7C(GlobalContext* globalCtx) {
globalCtx->nextEntranceIndex = 0x9C20;
globalCtx->unk_1887F = 0x40;
gSaveContext.nextTransition = 0x40;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
}
void func_80B0FEBC(EnGb2* this, GlobalContext* globalCtx) {
src/overlays/actors/ovl_En_Gk/z_en_gk.c
+1 -1
View File
@@ -724,7 +724,7 @@ void func_80B51B40(EnGk* this, GlobalContext* globalCtx) {
if (this->unk_31C == 0xE8F) {
globalCtx->nextEntranceIndex = 0xD010;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 3;
gSaveContext.nextTransition = 3;
Magic_Add(globalCtx,
src/overlays/actors/ovl_En_Holl/z_en_holl.c
+3 -3
View File
@@ -162,7 +162,7 @@ void EnHoll_VisibleIdle(EnHoll* this, GlobalContext* globalCtx) {
func_800B9010(&this->actor, NA_SE_EV_INVISIBLE_MONKEY - SFX_FLAG);
}
}
if ((globalCtx->sceneLoadFlag != 0) || (globalCtx->transitionMode != 0)) {
if ((globalCtx->transitionTrigger != 0) || (globalCtx->transitionMode != 0)) {
this->alpha = 255;
} else {
f32 enHollBottom = EN_HOLL_BOTTOM_DEFAULT;
@@ -191,7 +191,7 @@ void EnHoll_VisibleIdle(EnHoll* this, GlobalContext* globalCtx) {
globalCtx->nextEntranceIndex = globalCtx->setupExitList[EN_HOLL_GET_EXIT_LIST_INDEX(this)];
gSaveContext.unk_3DBB = 1;
Scene_SetExitFade(globalCtx);
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1878C(globalCtx);
} else {
this->actor.room = globalCtx->doorCtx.transitionActorList[enHollId].sides[this->playerSide ^ 1].room;
@@ -309,7 +309,7 @@ void EnHoll_Update(Actor* thisx, GlobalContext* globalCtx) {
EnHoll* this = THIS;
Player* player = GET_PLAYER(globalCtx);
if ((globalCtx->sceneLoadFlag == 0) && (globalCtx->transitionMode == 0) && !(player->stateFlags1 & 0x200)) {
if ((globalCtx->transitionTrigger == 0) && (globalCtx->transitionMode == 0) && !(player->stateFlags1 & 0x200)) {
this->actionFunc(this, globalCtx);
}
}
src/overlays/actors/ovl_En_Horse/z_en_horse.c
+1 -1
View File
@@ -2917,7 +2917,7 @@ void EnHorse_UpdateHorsebackArchery(EnHorse* this, GlobalContext* globalCtx) {
if (((this->hbaFlags & 1) || (this->hbaTimer > 45)) && (sp28 != 1) && (gSaveContext.minigameState != 3)) {
gSaveContext.save.cutscene = 0;
globalCtx->sceneLoadFlag = 0x14;
globalCtx->transitionTrigger = 0x14;
globalCtx->unk_1887F = 0x40;
}

Some files were not shown because too many files have changed in this diff Show More