github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-23 06:35:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'zelda64' into znx

Browse source
This commit is contained in:
KiritoDv 2022-05-30 14:25:15 -05:00
commit 219fd5b41f
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Jenkinsfile vendored
View file

@ -52,7 +52,7 @@ pipeline {
cd "..\\..\\" cd "..\\..\\"
move "soh\\Release\\soh.exe" ".\\" move "soh\\x64\\Release\\soh.exe" ".\\"
move "OTRGui\\build\\assets" ".\\" move "OTRGui\\build\\assets" ".\\"
move ".\\OTRExporter\\x64\\Release\\ZAPD.exe" ".\\assets\\extractor\\" move ".\\OTRExporter\\x64\\Release\\ZAPD.exe" ".\\assets\\extractor\\"
move ".\\OTRGui\\build\\Release\\OTRGui.exe" ".\\" move ".\\OTRGui\\build\\Release\\OTRGui.exe" ".\\"

2
soh/include/z64camera.h
View file

@ -1157,7 +1157,7 @@ typedef struct {
} CamColChk; // size = 0x28 } CamColChk; // size = 0x28
typedef struct { typedef struct {
/* 0x000 */ char paramData[0x50]; /* 0x000 */ char paramData[0xFF];
/* 0x050 */ Vec3f at; /* 0x050 */ Vec3f at;
/* 0x05C */ Vec3f eye; /* 0x05C */ Vec3f eye;
/* 0x068 */ Vec3f up; /* 0x068 */ Vec3f up;

1
soh/src/code/code_800EC960.c
View file

@ -4256,6 +4256,7 @@ void Audio_ClearSariaBgmAtPos(Vec3f* pos) {
* equally between the two bgm channels. Split based on note priority * equally between the two bgm channels. Split based on note priority
*/ */
void Audio_SplitBgmChannels(s8 volSplit) { void Audio_SplitBgmChannels(s8 volSplit) {
return;
u8 volume; u8 volume;
u8 notePriority; u8 notePriority;
u16 channelBits; u16 channelBits;