mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-15 20:35:13 +00:00
Code Issues Projects Releases Wiki Activity

wip 2, lots on KaleidoScope_DrawQuestStatus

Browse source
This commit is contained in:
Dragorn421 2022-08-26 15:32:41 +02:00
parent 38cf1d05d5
commit 118e3f84d5
No known key found for this signature in database
GPG key ID: 32B53D2D16FC4118
14 changed files with 511 additions and 440 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/code/z_construct.c
View file

@ -526,11 +526,12 @@ void func_80111070(void) {
R_MINIMAP_COLOR(2) = 255;
}
VREG(21) = 0;
VREG(22) = 0;
VREG(23) = 0;
VREG(24) = 0;
VREG(25) = 0;
R_PAUSE_SONG_NOTE_Y(OCARINA_BTN_A) = 0;
R_PAUSE_SONG_NOTE_Y(OCARINA_BTN_C_DOWN) = 0;
R_PAUSE_SONG_NOTE_Y(OCARINA_BTN_C_RIGHT) = 0;
R_PAUSE_SONG_NOTE_Y(OCARINA_BTN_C_LEFT) = 0;
R_PAUSE_SONG_NOTE_Y(OCARINA_BTN_C_UP) = 0;
VREG(26) = 0;
VREG(27) = 0;
R_OCARINA_BUTTONS_XPOS = 98;

6
src/code/z_kaleido_scope_call.c
View file

@ -62,7 +62,7 @@ void KaleidoScopeCall_Update(PlayState* play) {
HREG(80) = 7;
HREG(82) = 3;
R_PAUSE_MENU_MODE = 1;
pauseCtx->unk_1E4 = PAUSECTX_UNK_1E4_0;
pauseCtx->unk_1E4_ps6_ = PAUSE_S6_0;
pauseCtx->unk_1EC = PAUSECTX_UNK_1EC_0;
pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1; // PAUSECTX_STATE_2
}
@ -70,14 +70,14 @@ void KaleidoScopeCall_Update(PlayState* play) {
HREG(80) = 7;
HREG(82) = 3;
R_PAUSE_MENU_MODE = 1;
pauseCtx->unk_1E4 = PAUSECTX_UNK_1E4_0;
pauseCtx->unk_1E4_ps6_ = PAUSE_S6_0;
pauseCtx->unk_1EC = PAUSECTX_UNK_1EC_0;
pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1; // PAUSECTX_STATE_9
} else if ((pauseCtx->state == PAUSECTX_STATE_2) || (pauseCtx->state == PAUSECTX_STATE_9)) {
osSyncPrintf("PR_KAREIDOSCOPE_MODE=%d\n", R_PAUSE_MENU_MODE);
if (R_PAUSE_MENU_MODE >= 3) {
pauseCtx->state++;
pauseCtx->state++; // PAUSECTX_STATE_3 or PAUSECTX_STATE_10
}
} else if (pauseCtx->state != PAUSECTX_STATE_0) {
if (gKaleidoMgrCurOvl != kaleidoScopeOvl) {

6
src/code/z_kaleido_setup.c
View file

@ -30,7 +30,7 @@ void KaleidoSetup_Update(PlayState* play) {
WREG(17) = 155;
pauseCtx->unk_1EA = 0;
pauseCtx->unk_1E4 = PAUSECTX_UNK_1E4_1;
pauseCtx->unk_1E4_ps6_ = PAUSE_S6_1;
if (ZREG(48) == 0) {
pauseCtx->eye.x = sKaleidoSetupEyeX0[pauseCtx->pageIndex];
@ -70,7 +70,7 @@ void KaleidoSetup_Init(PlayState* play) {
pauseCtx->debugState = 0;
pauseCtx->alpha = 0;
pauseCtx->unk_1EA = 0;
pauseCtx->unk_1E4 = PAUSECTX_UNK_1E4_0;
pauseCtx->unk_1E4_ps6_ = PAUSE_S6_0;
pauseCtx->mode = 0;
pauseCtx->pageIndex = PAUSE_ITEM;
@ -83,7 +83,7 @@ void KaleidoSetup_Init(PlayState* play) {
pauseCtx->cursorPoint[PAUSE_ITEM] = 0;
pauseCtx->cursorPoint[PAUSE_MAP] = VREG(30) + 3;
pauseCtx->cursorPoint[PAUSE_QUEST] = 0;
pauseCtx->cursorPoint[PAUSE_QUEST] = QUEST_MEDALLION_FOREST;
pauseCtx->cursorPoint[PAUSE_EQUIP] = 1;
pauseCtx->cursorPoint[PAUSE_WORLD_MAP] = 10;

4
src/code/z_parameter.c
View file

@ -2765,7 +2765,7 @@ void Interface_DrawItemButtons(PlayState* play) {
if ((pauseCtx->state < PAUSECTX_STATE_8) /* PAUSECTX_STATE_0, PAUSECTX_STATE_1, PAUSECTX_STATE_2, PAUSECTX_STATE_3,
PAUSECTX_STATE_4, PAUSECTX_STATE_5, PAUSECTX_STATE_6, PAUSECTX_STATE_7 */
|| (pauseCtx->state >= PAUSECTX_STATE_18) /* PAUSECTX_STATE_18, PAUSECTX_STATE_19 */) {
|| (pauseCtx->state >= PAUSECTX_STATE_18_FLIP_PAGES_AND_UNPAUSE) /* PAUSECTX_STATE_18_FLIP_PAGES_AND_UNPAUSE, PAUSECTX_STATE_19_UNPAUSE */) {
if ((play->pauseCtx.state != 0) || (play->pauseCtx.debugState != 0)) {
// Start Button Texture, Color & Label
gDPPipeSync(OVERLAY_DISP++);
@ -3320,7 +3320,7 @@ void Interface_Draw(PlayState* play) {
func_8008A994(interfaceCtx);
if ((pauseCtx->state == PAUSECTX_STATE_6) && (pauseCtx->unk_1E4 == PAUSECTX_UNK_1E4_3)) {
if ((pauseCtx->state == PAUSECTX_STATE_6) && (pauseCtx->unk_1E4_ps6_ == PAUSE_S6_3)) {
// Inventory Equip Effects
gSPSegment(OVERLAY_DISP++, 0x08, pauseCtx->iconItemSegment);
Gfx_SetupDL_42Overlay(play->state.gfxCtx);