nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'pr/73' into aManchipelago-QuestSelect

Browse Source
This commit is contained in:
aMannus
2025-07-01 09:49:21 +02:00
parent 3e06696441 786b7481c4
commit cd90410489
15 changed files with 351 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
soh/include/z64.h
View File

@@ -1593,7 +1593,7 @@ typedef struct {
/* 0x1CAD4 */ s16 newFileNameCharCount;
/* 0x1CAD6 */ s16 unk_1CAD6[5];
s16 logoAlpha;
s8 questType[3]; // 0 for Normal, 1 for MQ
s8 questType[4]; // 0 for Normal, 1 for MQ
StickDirectionPrompt stickLeftPrompt;
StickDirectionPrompt stickRightPrompt;
f32 arrowAnimTween;
@@ -1607,6 +1607,10 @@ typedef struct {
uint8_t randomizerIndex;
int16_t randomizerUIAlpha;
uint16_t randomizerArrowOffset;
uint8_t archipelagoIndex;
int16_t archipelagoUIAlpha;
uint16_t archipelagoArrowOffset;
} FileChooseContext; // size = 0x1CAE0
// Macros for `EntranceInfo.field`

2
soh/include/z64save.h
View File

@@ -329,7 +329,7 @@ typedef enum {
/* 01 */ QUEST_MASTER,
/* 02 */ QUEST_RANDOMIZER,
/* 03 */ QUEST_BOSSRUSH,
/* 03 */ QUEST_ARCHIPELAGO,
/* 04 */ QUEST_ARCHIPELAGO,
} Quest;
#define IS_VANILLA (gSaveContext.ship.quest.id == QUEST_NORMAL)