diff --git a/assets/xml/scenes/dungeons/ice_doukutu.xml b/assets/xml/scenes/dungeons/ice_doukutu.xml index eaac729a33..d64e41876e 100644 --- a/assets/xml/scenes/dungeons/ice_doukutu.xml +++ b/assets/xml/scenes/dungeons/ice_doukutu.xml @@ -1,6 +1,8 @@ - + + + diff --git a/assets/xml/scenes/overworld/spot12.xml b/assets/xml/scenes/overworld/spot12.xml index fa679878d4..cd5df69b2a 100644 --- a/assets/xml/scenes/overworld/spot12.xml +++ b/assets/xml/scenes/overworld/spot12.xml @@ -1,6 +1,7 @@ - + + diff --git a/include/z64scene.h b/include/z64scene.h index 3e5f38d43a..1225bc3c9c 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -431,7 +431,7 @@ typedef enum { /* 0x06 */ SCENE_CMD_ID_ENTRANCE_LIST, /* 0x07 */ SCENE_CMD_ID_SPECIAL_FILES, /* 0x08 */ SCENE_CMD_ID_ROOM_BEHAVIOR, - /* 0x09 */ SCENE_CMD_ID_UNUSED_09, + /* 0x09 */ SCENE_CMD_ID_UNK_09, /* 0x0A */ SCENE_CMD_ID_MESH, /* 0x0B */ SCENE_CMD_ID_OBJECT_LIST, /* 0x0C */ SCENE_CMD_ID_LIGHT_LIST, @@ -478,6 +478,9 @@ typedef enum { { SCENE_CMD_ID_ROOM_BEHAVIOR, curRoomUnk3, \ curRoomUnk2 | _SHIFTL(showInvisActors, 8, 1) | _SHIFTL(disableWarpSongs, 10, 1) } +#define SCENE_CMD_UNK_09() \ + { SCENE_CMD_ID_UNK_09, 0, CMD_W(0) } + #define SCENE_CMD_MESH(meshHeader) \ { SCENE_CMD_ID_MESH, 0, CMD_PTR(meshHeader) } diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index 1a24fc4c90..fe5834b673 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -347,7 +347,7 @@ s32 EnXc_SerenadeCS(EnXc* this, GlobalContext* globalCtx) { s32 stateFlags = player->stateFlags1; if (CHECK_OWNED_EQUIP(EQUIP_BOOTS, 1) && !(gSaveContext.eventChkInf[5] & 4) && !(stateFlags & 0x20000000) && !Gameplay_InCsMode(globalCtx)) { - Cutscene_SetSegment(globalCtx, &ice_doukutu_sceneCutsceneData0x000330); + Cutscene_SetSegment(globalCtx, &gIceCavernSerenadeCs); gSaveContext.cutsceneTrigger = 1; gSaveContext.eventChkInf[5] |= 4; // Learned Serenade of Water Flag Item_Give(globalCtx, ITEM_SONG_SERENADE);