summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
Diffstat (limited to 'src/code')
-rw-r--r--src/code/title_setup.c2
-rw-r--r--src/code/z_kaleido_scope_call.c4
-rw-r--r--src/code/z_message.c4
-rw-r--r--src/code/z_scene.c1
-rw-r--r--src/code/z_sram_NES.c34
5 files changed, 25 insertions, 20 deletions
diff --git a/src/code/title_setup.c b/src/code/title_setup.c
index 841c301e2..21331d6f3 100644
--- a/src/code/title_setup.c
+++ b/src/code/title_setup.c
@@ -24,7 +24,7 @@ void Setup_SetRegs(void) {
XREG(77) = 0x3C;
XREG(78) = 0x2F;
XREG(79) = 0x62;
- R_PAUSE_OWLWARP_ALPHA = 0;
+ R_PAUSE_OWL_WARP_ALPHA = 0;
XREG(88) = 0x56;
XREG(89) = 0x258;
XREG(90) = 0x1C2;
diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c
index 1d2046e57..36d45c02b 100644
--- a/src/code/z_kaleido_scope_call.c
+++ b/src/code/z_kaleido_scope_call.c
@@ -35,7 +35,7 @@ void KaleidoScopeCall_Update(PlayState* play) {
KaleidoMgrOverlay* kaleidoScopeOvl = &gKaleidoMgrOverlayTable[KALEIDO_OVL_KALEIDO_SCOPE];
if ((play->pauseCtx.state != PAUSE_STATE_OFF) || (play->pauseCtx.debugEditor != DEBUG_EDITOR_NONE)) {
- if ((pauseCtx->state == PAUSE_STATE_OPENING_0) || (pauseCtx->state == PAUSE_STATE_OWLWARP_0)) {
+ if ((pauseCtx->state == PAUSE_STATE_OPENING_0) || (pauseCtx->state == PAUSE_STATE_OWL_WARP_0)) {
if (ShrinkWindow_Letterbox_GetSize() == 0) {
R_PAUSE_BG_PRERENDER_STATE = PAUSE_BG_PRERENDER_SETUP;
pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE;
@@ -48,7 +48,7 @@ void KaleidoScopeCall_Update(PlayState* play) {
pauseCtx->savePromptState = PAUSE_SAVEPROMPT_STATE_APPEARING;
pauseCtx->state = (pauseCtx->state & 0xFFFF) + 1;
} else if ((pauseCtx->state == PAUSE_STATE_OPENING_1) || (pauseCtx->state == PAUSE_STATE_GAMEOVER_1) ||
- (pauseCtx->state == PAUSE_STATE_OWLWARP_1)) {
+ (pauseCtx->state == PAUSE_STATE_OWL_WARP_1)) {
if (R_PAUSE_BG_PRERENDER_STATE == PAUSE_BG_PRERENDER_READY) {
pauseCtx->state++;
}
diff --git a/src/code/z_message.c b/src/code/z_message.c
index 4e541de2e..37588bd13 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -5604,7 +5604,7 @@ void Message_Update(PlayState* play) {
Message_CloseTextbox(play);
}
} else if ((msgCtx->textboxEndType != TEXTBOX_ENDTYPE_10) ||
- (pauseCtx->state != PAUSE_STATE_OWLWARP_CONFIRM)) {
+ (pauseCtx->state != PAUSE_STATE_OWL_WARP_CONFIRM)) {
if ((msgCtx->textboxEndType == TEXTBOX_ENDTYPE_10) &&
(play->msgCtx.ocarinaMode == OCARINA_MODE_1B)) {
if (Message_ShouldAdvance(play)) {
@@ -5676,7 +5676,7 @@ void Message_Update(PlayState* play) {
pauseCtx->unk_2C8 = pauseCtx->pageIndex;
pauseCtx->unk_2CA = pauseCtx->cursorPoint[4];
pauseCtx->pageIndex = PAUSE_ITEM;
- pauseCtx->state = PAUSE_STATE_OWLWARP_0;
+ pauseCtx->state = PAUSE_STATE_OWL_WARP_0;
func_800F4A10(play);
pauseCtx->pageIndex = PAUSE_MAP;
sLastPlayedSong = 0xFF;
diff --git a/src/code/z_scene.c b/src/code/z_scene.c
index 8f2fe0cf6..b6d3ed194 100644
--- a/src/code/z_scene.c
+++ b/src/code/z_scene.c
@@ -18,6 +18,7 @@ s32 Object_SpawnPersistent(ObjectContext* objectCtx, s16 id) {
objectCtx->slots[objectCtx->numEntries].id = id;
size = gObjectTable[id].vromEnd - gObjectTable[id].vromStart;
+ //! FAKE:
if (1) {}
if (size != 0) {
diff --git a/src/code/z_sram_NES.c b/src/code/z_sram_NES.c
index 1e3867bdf..d66fee9c3 100644
--- a/src/code/z_sram_NES.c
+++ b/src/code/z_sram_NES.c
@@ -388,12 +388,11 @@ u8 sBitFlags8[] = {
u16 D_801F6AF0;
u8 D_801F6AF2;
-void Sram_ActivateOwl(u8 owlId) {
- gSaveContext.save.saveInfo.playerData.owlActivationFlags =
- ((void)0, gSaveContext.save.saveInfo.playerData.owlActivationFlags) | (u16)gBitFlags[owlId];
+void Sram_ActivateOwl(u8 owlWarpId) {
+ SET_OWL_STATUE_ACTIVATED(owlWarpId);
- if (gSaveContext.save.saveInfo.playerData.unk_20 == 0xFF) {
- gSaveContext.save.saveInfo.playerData.unk_20 = owlId;
+ if (gSaveContext.save.saveInfo.playerData.owlWarpId == OWL_WARP_NONE) {
+ gSaveContext.save.saveInfo.playerData.owlWarpId = owlWarpId;
}
}
@@ -780,8 +779,8 @@ SavePlayerData sSaveDefaultPlayerData = {
false, // isDoubleMagicAcquired
0, // doubleDefense
0, // unk_1F
- 0xFF, // unk_20
- 0x0000, // owlActivationFlags
+ OWL_WARP_NONE, // owlWarpId
+ 0, // owlActivationFlags
0xFF, // unk_24
SCENE_SPOT00, // savedSceneId
};
@@ -956,7 +955,7 @@ SavePlayerData sSaveDebugPlayerData = {
false, // isDoubleMagicAcquired
0, // doubleDefense
0, // unk_1F
- 0xFF, // unk_20
+ OWL_WARP_NONE, // owlWarpId
0, // owlActivationFlags
0xFF, // unk_24
SCENE_SPOT00, // savedSceneId
@@ -1208,12 +1207,17 @@ void Sram_ResetSaveFromMoonCrash(SramContext* sramCtx) {
gSaveContext.jinxTimer = 0;
}
-u16 D_801C6A58[] = {
- ENTRANCE(GREAT_BAY_COAST, 11), ENTRANCE(ZORA_CAPE, 6),
- ENTRANCE(SNOWHEAD, 3), ENTRANCE(MOUNTAIN_VILLAGE_WINTER, 8),
- ENTRANCE(SOUTH_CLOCK_TOWN, 9), ENTRANCE(MILK_ROAD, 4),
- ENTRANCE(WOODFALL, 4), ENTRANCE(SOUTHERN_SWAMP_POISONED, 10),
- ENTRANCE(IKANA_CANYON, 4), ENTRANCE(STONE_TOWER, 3),
+static u16 sOwlWarpEntrances[OWL_WARP_MAX - 1] = {
+ ENTRANCE(GREAT_BAY_COAST, 11), // OWL_WARP_GREAT_BAY_COAST
+ ENTRANCE(ZORA_CAPE, 6), // OWL_WARP_ZORA_CAPE
+ ENTRANCE(SNOWHEAD, 3), // OWL_WARP_SNOWHEAD
+ ENTRANCE(MOUNTAIN_VILLAGE_WINTER, 8), // OWL_WARP_MOUNTAIN_VILLAGE
+ ENTRANCE(SOUTH_CLOCK_TOWN, 9), // OWL_WARP_CLOCK_TOWN
+ ENTRANCE(MILK_ROAD, 4), // OWL_WARP_MILK_ROAD
+ ENTRANCE(WOODFALL, 4), // OWL_WARP_WOODFALL
+ ENTRANCE(SOUTHERN_SWAMP_POISONED, 10), // OWL_WARP_SOUTHERN_SWAMP
+ ENTRANCE(IKANA_CANYON, 4), // OWL_WARP_IKANA_CANYON
+ ENTRANCE(STONE_TOWER, 3), // OWL_WARP_STONE_TOWER
};
void Sram_OpenSave(FileSelectState* fileSelect, SramContext* sramCtx) {
@@ -1288,7 +1292,7 @@ void Sram_OpenSave(FileSelectState* fileSelect, SramContext* sramCtx) {
gSaveContext.save.playerForm = PLAYER_FORM_HUMAN;
}
} else {
- gSaveContext.save.entrance = D_801C6A58[(void)0, gSaveContext.save.owlSaveLocation];
+ gSaveContext.save.entrance = sOwlWarpEntrances[(void)0, gSaveContext.save.owlWarpId];
if ((gSaveContext.save.entrance == ENTRANCE(SOUTHERN_SWAMP_POISONED, 10)) &&
CHECK_WEEKEVENTREG(WEEKEVENTREG_CLEARED_WOODFALL_TEMPLE)) {
gSaveContext.save.entrance = ENTRANCE(SOUTHERN_SWAMP_CLEARED, 10);
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-04 22:34:33 +0000