mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-01 15:26:01 +00:00
Code Issues Projects Releases Wiki Activity

Add UNK_09 macro and other minor fixes (#813)

Browse source 
(cherry picked from commit d3a6d4d2e1)
This commit is contained in:
Anghelo Carvajal 2021-05-14 20:11:00 -04:00 committed by GitHub
parent 58813216fc
commit 8f9881ece2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assets/xml/scenes/dungeons/ice_doukutu.xml
View file

@ -1,6 +1,8 @@
<Root> <Root>
<File Name="ice_doukutu_scene" Segment="2"> <File Name="ice_doukutu_scene" Segment="2">
<Scene Name="ice_doukutu_scene"/> <Cutscene Name="gIceCavernSerenadeCs" Offset="0x330"/>
<Scene Name="ice_doukutu_scene" Offset="0x0"/>
</File> </File>
<File Name="ice_doukutu_room_0" Segment="3"> <File Name="ice_doukutu_room_0" Segment="3">
<Room Name="ice_doukutu_room_0" Offset="0x0"/> <Room Name="ice_doukutu_room_0" Offset="0x0"/>

3
assets/xml/scenes/overworld/spot12.xml
View file

@ -1,6 +1,7 @@
<Root> <Root>
<File Name="spot12_scene" Segment="2"> <File Name="spot12_scene" Segment="2">
<Cutscene Offset="0x6490"/> <Cutscene Name="gSpot12Cs_006490" Offset="0x6490"/>
<Scene Name="spot12_scene" Offset="0x0"/> <Scene Name="spot12_scene" Offset="0x0"/>
</File> </File>
<File Name="spot12_room_0" Segment="3"> <File Name="spot12_room_0" Segment="3">

5
include/z64scene.h
View file

@ -431,7 +431,7 @@ typedef enum {
/* 0x06 */ SCENE_CMD_ID_ENTRANCE_LIST, /* 0x06 */ SCENE_CMD_ID_ENTRANCE_LIST,
/* 0x07 */ SCENE_CMD_ID_SPECIAL_FILES, /* 0x07 */ SCENE_CMD_ID_SPECIAL_FILES,
/* 0x08 */ SCENE_CMD_ID_ROOM_BEHAVIOR, /* 0x08 */ SCENE_CMD_ID_ROOM_BEHAVIOR,
/* 0x09 */ SCENE_CMD_ID_UNUSED_09, /* 0x09 */ SCENE_CMD_ID_UNK_09,
/* 0x0A */ SCENE_CMD_ID_MESH, /* 0x0A */ SCENE_CMD_ID_MESH,
/* 0x0B */ SCENE_CMD_ID_OBJECT_LIST, /* 0x0B */ SCENE_CMD_ID_OBJECT_LIST,
/* 0x0C */ SCENE_CMD_ID_LIGHT_LIST, /* 0x0C */ SCENE_CMD_ID_LIGHT_LIST,
@ -478,6 +478,9 @@ typedef enum {
{ SCENE_CMD_ID_ROOM_BEHAVIOR, curRoomUnk3, \ { SCENE_CMD_ID_ROOM_BEHAVIOR, curRoomUnk3, \
curRoomUnk2 | _SHIFTL(showInvisActors, 8, 1) | _SHIFTL(disableWarpSongs, 10, 1) } 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) \ #define SCENE_CMD_MESH(meshHeader) \
{ SCENE_CMD_ID_MESH, 0, CMD_PTR(meshHeader) } { SCENE_CMD_ID_MESH, 0, CMD_PTR(meshHeader) }

2
src/overlays/actors/ovl_En_Xc/z_en_xc.c
View file

@ -347,7 +347,7 @@ s32 EnXc_SerenadeCS(EnXc* this, GlobalContext* globalCtx) {
s32 stateFlags = player->stateFlags1; s32 stateFlags = player->stateFlags1;
if (CHECK_OWNED_EQUIP(EQUIP_BOOTS, 1) && !(gSaveContext.eventChkInf[5] & 4) && !(stateFlags & 0x20000000) && if (CHECK_OWNED_EQUIP(EQUIP_BOOTS, 1) && !(gSaveContext.eventChkInf[5] & 4) && !(stateFlags & 0x20000000) &&
!Gameplay_InCsMode(globalCtx)) { !Gameplay_InCsMode(globalCtx)) {
Cutscene_SetSegment(globalCtx, &ice_doukutu_sceneCutsceneData0x000330); Cutscene_SetSegment(globalCtx, &gIceCavernSerenadeCs);
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
gSaveContext.eventChkInf[5] |= 4; // Learned Serenade of Water Flag gSaveContext.eventChkInf[5] |= 4; // Learned Serenade of Water Flag
Item_Give(globalCtx, ITEM_SONG_SERENADE); Item_Give(globalCtx, ITEM_SONG_SERENADE);