mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-26 03:12:18 -05:00
Code Issues Projects Releases Wiki Activity

64-bit early draft - no audio yet

Browse Source
This commit is contained in:
Emil Lenngren 2022-05-15 01:19:02 +02:00
parent 247360cbf0
commit 92c8ecb726
29 changed files with 853 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ZAPDTR/ZAPDUtils/ZAPDUtils.vcxproj
View File

@ -41,7 +41,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
</PropertyGroup> </PropertyGroup>
@ -136,7 +136,7 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<LanguageStandard_C>Default</LanguageStandard_C> <LanguageStandard_C>Default</LanguageStandard_C>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile> </ClCompile>

51
libultraship/libultraship/DisplayList.cpp
View File

@ -12,20 +12,51 @@ namespace Ship
while (reader->GetBaseAddress() % 8 != 0) while (reader->GetBaseAddress() % 8 != 0)
reader->ReadByte(); reader->ReadByte();
while (true) if (sizeof(uintptr_t) < 8)
{ {
uint64_t data = reader->ReadUInt64(); while (true)
{
uint64_t data = reader->ReadUInt64();
dl->instructions.push_back(data); dl->instructions.push_back(data);
uint8_t opcode = data >> 24;
// These are 128-bit commands, so read an extra 64 bits... uint8_t opcode = data >> 24;
if (opcode == G_SETTIMG_OTR || opcode == G_DL_OTR || opcode == G_VTX_OTR || opcode == G_BRANCH_Z_OTR || opcode == G_MARKER || opcode == G_MTX_OTR)
dl->instructions.push_back(reader->ReadUInt64());
if (opcode == G_ENDDL) // These are 128-bit commands, so read an extra 64 bits...
break; if (opcode == G_SETTIMG_OTR || opcode == G_DL_OTR || opcode == G_VTX_OTR || opcode == G_BRANCH_Z_OTR || opcode == G_MARKER || opcode == G_MTX_OTR)
dl->instructions.push_back(reader->ReadUInt64());
if (opcode == G_ENDDL)
break;
}
}
else
{
while (true)
{
uint64_t data = reader->ReadUInt64();
uint32_t w0 = (uint32_t)data;
uint32_t w1 = (uint32_t)(data >> 32);
dl->instructions.push_back(w0);
dl->instructions.push_back(w1);
uint8_t opcode = (uint8_t)(w0 >> 24);
if (opcode == G_SETTIMG_OTR || opcode == G_DL_OTR || opcode == G_VTX_OTR || opcode == G_BRANCH_Z_OTR || opcode == G_MARKER || opcode == G_MTX_OTR)
{
data = reader->ReadUInt64();
w0 = (uint32_t)data;
w1 = (uint32_t)(data >> 32);
dl->instructions.push_back(w0);
dl->instructions.push_back(w1);
}
if (opcode == G_ENDDL)
break;
}
} }
} }
} }

62
libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h
View File

@ -1637,13 +1637,19 @@ typedef struct {
* Generic Gfx Packet * Generic Gfx Packet
*/ */
typedef struct { typedef struct {
unsigned int w0; uintptr_t w0;
unsigned int w1; uintptr_t w1;
//unsigned long long w0; //unsigned long long w0;
//unsigned long long w1; //unsigned long long w1;
} Gwords; } Gwords;
#ifdef __cplusplus
static_assert(sizeof(Gwords) == 2 * sizeof(void*), "fail");
#else
//_Static_assert(sizeof(Gwords) == 2 * sizeof(void*), "fail");
#endif
/* /*
* This union is the fundamental type of the display list. * This union is the fundamental type of the display list.
* It is, by law, exactly 64 bits in size. * It is, by law, exactly 64 bits in size.
@ -1684,12 +1690,12 @@ _DW({ \
Gfx *_g = (Gfx *)(pkt); \ Gfx *_g = (Gfx *)(pkt); \
\ \
_g->words.w0 = _SHIFTL((c), 24, 8) | _SHIFTL((l), 0, 24); \ _g->words.w0 = _SHIFTL((c), 24, 8) | _SHIFTL((l), 0, 24); \
_g->words.w1 = (unsigned int)(s); \ _g->words.w1 = (uintptr_t)(s); \
}) })
#define gsDma0p(c, s, l) \ #define gsDma0p(c, s, l) \
{ \ { \
_SHIFTL((c), 24, 8) | _SHIFTL((l), 0, 24), (unsigned int)(s) \ _SHIFTL((c), 24, 8) | _SHIFTL((l), 0, 24), (uintptr_t)(s) \
} }
#define gDma1p(pkt, c, s, l, p) \ #define gDma1p(pkt, c, s, l, p) \
@ -1698,14 +1704,14 @@ _DW({ \
\ \
_g->words.w0 = (_SHIFTL((c), 24, 8) | _SHIFTL((p), 16, 8) | \ _g->words.w0 = (_SHIFTL((c), 24, 8) | _SHIFTL((p), 16, 8) | \
_SHIFTL((l), 0, 16)); \ _SHIFTL((l), 0, 16)); \
_g->words.w1 = (unsigned int)(s); \ _g->words.w1 = (uintptr_t)(s); \
}) })
#define gsDma1p(c, s, l, p) \ #define gsDma1p(c, s, l, p) \
{ \ { \
(_SHIFTL((c), 24, 8) | _SHIFTL((p), 16, 8) | \ (_SHIFTL((c), 24, 8) | _SHIFTL((p), 16, 8) | \
_SHIFTL((l), 0, 16)), \ _SHIFTL((l), 0, 16)), \
(unsigned int)(s) \ (uintptr_t)(s) \
} }
#define gDma2p(pkt, c, adrs, len, idx, ofs) \ #define gDma2p(pkt, c, adrs, len, idx, ofs) \
@ -1713,13 +1719,13 @@ _DW({ \
Gfx *_g = (Gfx *)(pkt); \ Gfx *_g = (Gfx *)(pkt); \
_g->words.w0 = (_SHIFTL((c),24,8)|_SHIFTL(((len)-1)/8,19,5)| \ _g->words.w0 = (_SHIFTL((c),24,8)|_SHIFTL(((len)-1)/8,19,5)| \
_SHIFTL((ofs)/8,8,8)|_SHIFTL((idx),0,8)); \ _SHIFTL((ofs)/8,8,8)|_SHIFTL((idx),0,8)); \
_g->words.w1 = (unsigned int)(adrs); \ _g->words.w1 = (uintptr_t)(adrs); \
}) })
#define gsDma2p(c, adrs, len, idx, ofs) \ #define gsDma2p(c, adrs, len, idx, ofs) \
{ \ { \
(_SHIFTL((c),24,8)|_SHIFTL(((len)-1)/8,19,5)| \ (_SHIFTL((c),24,8)|_SHIFTL(((len)-1)/8,19,5)| \
_SHIFTL((ofs)/8,8,8)|_SHIFTL((idx),0,8)), \ _SHIFTL((ofs)/8,8,8)|_SHIFTL((idx),0,8)), \
(unsigned int)(adrs) \ (uintptr_t)(adrs) \
} }
#define gSPNoOp(pkt) gDma0p(pkt, G_SPNOOP, 0, 0) #define gSPNoOp(pkt) gDma0p(pkt, G_SPNOOP, 0, 0)
@ -1750,12 +1756,12 @@ _DW({ \
Gfx *_g = (Gfx *)(pkt); \ Gfx *_g = (Gfx *)(pkt); \
_g->words.w0 = \ _g->words.w0 = \
_SHIFTL(G_VTX,24,8)|_SHIFTL((n),12,8)|_SHIFTL((v0)+(n),1,7); \ _SHIFTL(G_VTX,24,8)|_SHIFTL((n),12,8)|_SHIFTL((v0)+(n),1,7); \
_g->words.w1 = (unsigned int)(v); \ _g->words.w1 = (uintptr_t)(v); \
}) })
# define gsSPVertex(v, n, v0) \ # define gsSPVertex(v, n, v0) \
{ \ { \
(_SHIFTL(G_VTX,24,8)|_SHIFTL((n),12,8)|_SHIFTL((v0)+(n),1,7)), \ (_SHIFTL(G_VTX,24,8)|_SHIFTL((n),12,8)|_SHIFTL((v0)+(n),1,7)), \
(unsigned int)(v) \ (uintptr_t)(v) \
} }
#elif (defined(F3DEX_GBI)||defined(F3DLP_GBI)) #elif (defined(F3DEX_GBI)||defined(F3DLP_GBI))
/* /*
@ -1820,12 +1826,12 @@ _DW({ \
Gfx *_g = (Gfx *)(pkt); \ Gfx *_g = (Gfx *)(pkt); \
\ \
_g->words.w0 = _SHIFTL((c), 24, 8); \ _g->words.w0 = _SHIFTL((c), 24, 8); \
_g->words.w1 = (unsigned int)(p0); \ _g->words.w1 = (uintptr_t)(p0); \
}) })
#define gsImmp1(c, p0) \ #define gsImmp1(c, p0) \
{ \ { \
_SHIFTL((c), 24, 8), (unsigned int)(p0) \ _SHIFTL((c), 24, 8), (uintptr_t)(p0) \
} }
#define gImmp2(pkt, c, p0, p1) \ #define gImmp2(pkt, c, p0, p1) \
@ -1862,13 +1868,13 @@ _DW({ \
\ \
_g->words.w0 = (_SHIFTL((c), 24, 8) | _SHIFTL((p0), 8, 16) | \ _g->words.w0 = (_SHIFTL((c), 24, 8) | _SHIFTL((p0), 8, 16) | \
_SHIFTL((p1), 0, 8)); \ _SHIFTL((p1), 0, 8)); \
_g->words.w1 = (unsigned int) (dat); \ _g->words.w1 = (uintptr_t) (dat); \
}) })
#define gsImmp21(c, p0, p1, dat) \ #define gsImmp21(c, p0, p1, dat) \
{ \ { \
_SHIFTL((c), 24, 8) | _SHIFTL((p0), 8, 16) | _SHIFTL((p1), 0, 8),\ _SHIFTL((c), 24, 8) | _SHIFTL((p0), 8, 16) | _SHIFTL((p1), 0, 8),\
(unsigned int) (dat) \ (uintptr_t) (dat) \
} }
#ifdef F3DEX_GBI_2 #ifdef F3DEX_GBI_2
@ -2308,7 +2314,7 @@ _DW({ \
_DW({ \ _DW({ \
Gfx *_g = (Gfx *)(pkt); \ Gfx *_g = (Gfx *)(pkt); \
_g->words.w0 = _SHIFTL(G_RDPHALF_1,24,8); \ _g->words.w0 = _SHIFTL(G_RDPHALF_1,24,8); \
_g->words.w1 = (unsigned int)(dl); \ _g->words.w1 = (uintptr_t)(dl); \
_g = (Gfx *)(pkt); \ _g = (Gfx *)(pkt); \
_g->words.w0 = (_SHIFTL(G_BRANCH_Z,24,8)| \ _g->words.w0 = (_SHIFTL(G_BRANCH_Z,24,8)| \
_SHIFTL((vtx)*5,12,12)|_SHIFTL((vtx)*2,0,12)); \ _SHIFTL((vtx)*5,12,12)|_SHIFTL((vtx)*2,0,12)); \
@ -2317,7 +2323,7 @@ _DW({ \
#define gsSPBranchLessZrg(dl, vtx, zval, near, far, flag, zmin, zmax) \ #define gsSPBranchLessZrg(dl, vtx, zval, near, far, flag, zmin, zmax) \
{ _SHIFTL(G_RDPHALF_1,24,8), \ { _SHIFTL(G_RDPHALF_1,24,8), \
(unsigned int)(dl), }, \ (uintptr_t)(dl), }, \
{ _SHIFTL(G_BRANCH_Z,24,8)|_SHIFTL((vtx)*5,12,12)|_SHIFTL((vtx)*2,0,12),\ { _SHIFTL(G_BRANCH_Z,24,8)|_SHIFTL((vtx)*5,12,12)|_SHIFTL((vtx)*2,0,12),\
G_DEPTOZSrg(zval, near, far, flag, zmin, zmax), } G_DEPTOZSrg(zval, near, far, flag, zmin, zmax), }
@ -2337,18 +2343,18 @@ _DW({ \
_DW({ \ _DW({ \
Gfx *_g = (Gfx *)(pkt); \ Gfx *_g = (Gfx *)(pkt); \
_g->words.w0 = _SHIFTL(G_RDPHALF_1,24,8); \ _g->words.w0 = _SHIFTL(G_RDPHALF_1,24,8); \
_g->words.w1 = (unsigned int)(dl); \ _g->words.w1 = (uintptr_t)(dl); \
_g = (Gfx *)(pkt); \ _g = (Gfx *)(pkt); \
_g->words.w0 = (_SHIFTL(G_BRANCH_Z,24,8)| \ _g->words.w0 = (_SHIFTL(G_BRANCH_Z,24,8)| \
_SHIFTL((vtx)*5,12,12)|_SHIFTL((vtx)*2,0,12)); \ _SHIFTL((vtx)*5,12,12)|_SHIFTL((vtx)*2,0,12)); \
_g->words.w1 = (unsigned int)(zval); \ _g->words.w1 = (uintptr_t)(zval); \
}) })
#define gsSPBranchLessZraw(dl, vtx, zval) \ #define gsSPBranchLessZraw(dl, vtx, zval) \
{ _SHIFTL(G_RDPHALF_1,24,8), \ { _SHIFTL(G_RDPHALF_1,24,8), \
(unsigned int)(dl), }, \ (uintptr_t)(dl), }, \
{ _SHIFTL(G_BRANCH_Z,24,8)|_SHIFTL((vtx)*5,12,12)|_SHIFTL((vtx)*2,0,12),\ { _SHIFTL(G_BRANCH_Z,24,8)|_SHIFTL((vtx)*5,12,12)|_SHIFTL((vtx)*2,0,12),\
(unsigned int)(zval), } (uintptr_t)(zval), }
/* /*
* gSPLoadUcode RSP loads specified ucode. * gSPLoadUcode RSP loads specified ucode.
@ -2360,19 +2366,19 @@ _DW({ \
_DW({ \ _DW({ \
Gfx *_g = (Gfx *)(pkt); \ Gfx *_g = (Gfx *)(pkt); \
_g->words.w0 = _SHIFTL(G_RDPHALF_1,24,8); \ _g->words.w0 = _SHIFTL(G_RDPHALF_1,24,8); \
_g->words.w1 = (unsigned int)(uc_dstart); \ _g->words.w1 = (uintptr_t)(uc_dstart); \
_g = (Gfx *)(pkt); \ _g = (Gfx *)(pkt); \
_g->words.w0 = (_SHIFTL(G_LOAD_UCODE,24,8)| \ _g->words.w0 = (_SHIFTL(G_LOAD_UCODE,24,8)| \
_SHIFTL((int)(uc_dsize)-1,0,16)); \ _SHIFTL((int)(uc_dsize)-1,0,16)); \
_g->words.w1 = (unsigned int)(uc_start); \ _g->words.w1 = (uintptr_t)(uc_start); \
}) })
#define gsSPLoadUcodeEx(uc_start, uc_dstart, uc_dsize) \ #define gsSPLoadUcodeEx(uc_start, uc_dstart, uc_dsize) \
{ _SHIFTL(G_RDPHALF_1,24,8), \ { _SHIFTL(G_RDPHALF_1,24,8), \
(unsigned int)(uc_dstart), }, \ (uintptr_t)(uc_dstart), }, \
{ _SHIFTL(G_LOAD_UCODE,24,8)| \ { _SHIFTL(G_LOAD_UCODE,24,8)| \
_SHIFTL((int)(uc_dsize)-1,0,16), \ _SHIFTL((int)(uc_dsize)-1,0,16), \
(unsigned int)(uc_start), } (uintptr_t)(uc_start), }
#define gSPLoadUcode(pkt, uc_start, uc_dstart) \ #define gSPLoadUcode(pkt, uc_start, uc_dstart) \
gSPLoadUcodeEx((pkt), (uc_start), (uc_dstart), SP_UCODE_DATA_SIZE) gSPLoadUcodeEx((pkt), (uc_start), (uc_dstart), SP_UCODE_DATA_SIZE)
@ -2396,14 +2402,14 @@ _DW({ \
Gfx *_g = (Gfx *)(pkt); \ Gfx *_g = (Gfx *)(pkt); \
_g->words.w0 = _SHIFTL(G_DMA_IO,24,8)|_SHIFTL((flag),23,1)| \ _g->words.w0 = _SHIFTL(G_DMA_IO,24,8)|_SHIFTL((flag),23,1)| \
_SHIFTL((dmem)/8,13,10)|_SHIFTL((size)-1,0,12); \ _SHIFTL((dmem)/8,13,10)|_SHIFTL((size)-1,0,12); \
_g->words.w1 = (unsigned int)(dram); \ _g->words.w1 = (uintptr_t)(dram); \
}) })
#define gsSPDma_io(flag, dmem, dram, size) \ #define gsSPDma_io(flag, dmem, dram, size) \
{ \ { \
_SHIFTL(G_DMA_IO,24,8)|_SHIFTL((flag),23,1)| \ _SHIFTL(G_DMA_IO,24,8)|_SHIFTL((flag),23,1)| \
_SHIFTL((dmem)/8,13,10)|_SHIFTL((size)-1,0,12), \ _SHIFTL((dmem)/8,13,10)|_SHIFTL((size)-1,0,12), \
(unsigned int)(dram) \ (uintptr_t)(dram) \
} }
#define gSPDmaRead(pkt,dmem,dram,size) gSPDma_io((pkt),0,(dmem),(dram),(size)) #define gSPDmaRead(pkt,dmem,dram,size) gSPDma_io((pkt),0,(dmem),(dram),(size))
@ -3018,14 +3024,14 @@ _DW({ \
\ \
_g->words.w0 = _SHIFTL(cmd, 24, 8) | _SHIFTL(fmt, 21, 3) | \ _g->words.w0 = _SHIFTL(cmd, 24, 8) | _SHIFTL(fmt, 21, 3) | \
_SHIFTL(siz, 19, 2) | _SHIFTL((width)-1, 0, 12); \ _SHIFTL(siz, 19, 2) | _SHIFTL((width)-1, 0, 12); \
_g->words.w1 = (unsigned int)(i); \ _g->words.w1 = (uintptr_t)(i); \
}) })
#define gsSetImage(cmd, fmt, siz, width, i) \ #define gsSetImage(cmd, fmt, siz, width, i) \
{ \ { \
_SHIFTL(cmd, 24, 8) | _SHIFTL(fmt, 21, 3) | \ _SHIFTL(cmd, 24, 8) | _SHIFTL(fmt, 21, 3) | \
_SHIFTL(siz, 19, 2) | _SHIFTL((width)-1, 0, 12), \ _SHIFTL(siz, 19, 2) | _SHIFTL((width)-1, 0, 12), \
(unsigned int)(i) \ (uintptr_t)(i) \
} }
#define gDPSetColorImage(pkt, f, s, w, i) gSetImage(pkt, G_SETCIMG, f, s, w, i) #define gDPSetColorImage(pkt, f, s, w, i) gSetImage(pkt, G_SETCIMG, f, s, w, i)

2
libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
View File

@ -1586,7 +1586,7 @@ static void gfx_sp_movemem(uint8_t index, uint8_t offset, const void* data) {
} }
} }
static void gfx_sp_moveword(uint8_t index, uint16_t offset, uint32_t data) { static void gfx_sp_moveword(uint8_t index, uint16_t offset, uintptr_t data) {
switch (index) { switch (index) {
case G_MW_NUMLIGHT: case G_MW_NUMLIGHT:
#ifdef F3DEX_GBI_2 #ifdef F3DEX_GBI_2

BIN
libultraship/libultraship/Lib/SDL/lib/x64/SDL2.lib
View File

Binary file not shown.

2
libultraship/libultraship/Resource.cpp
View File

@ -46,7 +46,7 @@ namespace Ship
{ {
auto res = (Ship::DisplayList*)resShared.get(); auto res = (Ship::DisplayList*)resShared.get();
Gfx* gfx = (Gfx*)&res->instructions[patches[i].index]; Gfx* gfx = &((Gfx*)res->instructions.data())[patches[i].index];
gfx->words.w1 = patches[i].origData; gfx->words.w1 = patches[i].origData;
} }
} }

15
libultraship/libultraship/libultraship.vcxproj
View File

@ -204,7 +204,7 @@
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_DX11;ENABLE_OPENGL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp20</LanguageStandard> <LanguageStandard>stdcpp20</LanguageStandard>
<LanguageStandard_C>stdc17</LanguageStandard_C> <LanguageStandard_C>stdc17</LanguageStandard_C>
@ -238,7 +238,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>SPDLOG_ACTIVE_LEVEL=0;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpplatest</LanguageStandard> <LanguageStandard>stdcpplatest</LanguageStandard>
<LanguageStandard_C>stdc11</LanguageStandard_C> <LanguageStandard_C>stdc11</LanguageStandard_C>
@ -446,4 +446,15 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> <ClInclude Include="WindowShim.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\OTRGui\build\ZERO_CHECK.vcxproj">
<Project>{02d10590-9542-3f55-aaf8-6055677e2a2a}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project> </Project>

4
soh/include/functions.h
View File

@ -2176,10 +2176,10 @@ f32 Math_FAtanF(f32 x);
f32 Math_FAtan2F(f32 y, f32 x); f32 Math_FAtan2F(f32 y, f32 x);
f32 Math_FAsinF(f32 x); f32 Math_FAsinF(f32 x);
f32 Math_FAcosF(f32 x); f32 Math_FAcosF(f32 x);
f32 ceilf(f32 x); /*f32 ceilf(f32 x);
f32 truncf(f32 x); f32 truncf(f32 x);
f32 roundf(f32 x); f32 roundf(f32 x);
f32 nearbyintf(f32 x); f32 nearbyintf(f32 x);*/
void SystemArena_CheckPointer(void* ptr, size_t size, const char* name, const char* action); void SystemArena_CheckPointer(void* ptr, size_t size, const char* name, const char* action);
void* SystemArena_Malloc(size_t size); void* SystemArena_Malloc(size_t size);
void* SystemArena_MallocDebug(size_t size, const char* file, s32 line); void* SystemArena_MallocDebug(size_t size, const char* file, s32 line);

21
soh/soh.vcxproj
View File

@ -85,12 +85,12 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<IncludePath>$(ProjectDir)assets;$(ProjectDir)build;$(ProjectDir)include;$(ProjectDir)src;$(ProjectDir);$(ProjectDir)..\libultraship\libultraship;$(ProjectDir)..\libultraship\libultraship\Lib\spdlog\include;$(ProjectDir)..\ZAPDTR\ZAPDUtils;$(ProjectDir)..\libultraship\libultraship\Lib\Fast3D\U64;$(ProjectDir)..\libultraship\libultraship\Lib\Fast3D\U64\PR;$(IncludePath)</IncludePath> <IncludePath>$(ProjectDir)assets;$(ProjectDir)build;$(ProjectDir)include;$(ProjectDir)src;$(ProjectDir);$(ProjectDir)..\libultraship\libultraship\Lib\libjpeg\include;$(ProjectDir)..\libultraship\libultraship;$(ProjectDir)..\libultraship\libultraship\Lib\spdlog\include;$(ProjectDir)..\ZAPDTR\ZAPDUtils;$(ProjectDir)..\libultraship\libultraship\Lib\Fast3D\U64;$(ProjectDir)..\libultraship\libultraship\Lib\Fast3D\U64\PR;$(ProjectDir)..\libultraship\libultraship\Lib\SDL;$(IncludePath)</IncludePath>
<LibraryPath>$(OutDir);$(ProjectDir)..\libultraship\libultraship;$(ProjectDir)..\libultraship\libultraship\Lib\SDL\lib\x64;$(ProjectDir)..\libultraship\libultraship\Lib\GLEW\x64;$(ProjectDir)..\libultraship\libultraship\Lib\GLFW;$(LibraryPath)</LibraryPath> <LibraryPath>$(OutDir);$(ProjectDir)..\libultraship\libultraship;$(ProjectDir)..\libultraship\libultraship\Lib\SDL\lib\x64;$(ProjectDir)..\libultraship\libultraship\Lib\GLEW\x64;$(ProjectDir)..\libultraship\libultraship\Lib\GLFW;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<IncludePath>$(ProjectDir)assets;$(ProjectDir)build;$(ProjectDir)include;$(ProjectDir)src;$(ProjectDir);$(ProjectDir)..\libultraship\libultraship;$(ProjectDir)..\libultraship\libultraship\Lib\spdlog\include;$(ProjectDir)..\ZAPDTR\ZAPDUtils;$(ProjectDir)..\libultraship\libultraship\Lib\Fast3D\U64;$(ProjectDir)..\libultraship\libultraship\Lib\Fast3D\U64\PR;$(IncludePath)</IncludePath> <IncludePath>$(ProjectDir)assets;$(ProjectDir)build;$(ProjectDir)include;$(ProjectDir)src;$(ProjectDir);$(ProjectDir)..\libultraship\libultraship\Lib\libjpeg\include;$(ProjectDir)..\libultraship\libultraship;$(ProjectDir)..\libultraship\libultraship\Lib\spdlog\include;$(ProjectDir)..\ZAPDTR\ZAPDUtils;$(ProjectDir)..\libultraship\libultraship\Lib\Fast3D\U64;$(ProjectDir)..\libultraship\libultraship\Lib\Fast3D\U64\PR;$(ProjectDir)..\libultraship\libultraship\Lib\SDL;$(IncludePath)</IncludePath>
<LibraryPath>$(OutDir);$(ProjectDir)..\libultraship\libultraship;$(ProjectDir)..\libultraship\libultraship\Lib\SDL\lib\x64;$(ProjectDir)..\libultraship\libultraship\Lib\GLEW\x64;$(ProjectDir)..\libultraship\libultraship\Lib\GLFW;$(LibraryPath)</LibraryPath> <LibraryPath>$(OutDir);$(ProjectDir)..\libultraship\libultraship;$(ProjectDir)..\libultraship\libultraship\Lib\SDL\lib\x64;$(ProjectDir)..\libultraship\libultraship\Lib\GLEW\x64;$(ProjectDir)..\libultraship\libultraship\Lib\GLFW;$(LibraryPath)</LibraryPath>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@ -100,14 +100,14 @@
<PreprocessorDefinitions>NOINCLUDE_GAME_PRINTF;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NOINCLUDE_GAME_PRINTF;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_OPENGL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp20</LanguageStandard> <LanguageStandard>stdcpp20</LanguageStandard>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<BasicRuntimeChecks>StackFrameRuntimeCheck</BasicRuntimeChecks> <BasicRuntimeChecks>StackFrameRuntimeCheck</BasicRuntimeChecks>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>libultraship.lib;ZAPDUtils.lib;opengl32.lib;glu32.lib;SDL2.lib;SDL2main.lib;glfw3dll.lib;glew32s.lib;winmm.lib;imm32.lib;version.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libultraship.lib;ZAPDUtils.lib;opengl32.lib;glu32.lib;SDL2.lib;SDL2main.lib;glew32s.lib;winmm.lib;imm32.lib;version.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<StackReserveSize>8777216</StackReserveSize> <StackReserveSize>8777216</StackReserveSize>
<GenerateMapFile>true</GenerateMapFile> <GenerateMapFile>true</GenerateMapFile>
<MapExports>true</MapExports> <MapExports>true</MapExports>
@ -131,7 +131,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>libultraship.lib;ZAPDUtils.lib;opengl32.lib;glu32.lib;SDL2.lib;SDL2main.lib;glfw3dll.lib;glew32s.lib;winmm.lib;imm32.lib;version.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libultraship.lib;ZAPDUtils.lib;opengl32.lib;glu32.lib;SDL2.lib;SDL2main.lib;glew32s.lib;winmm.lib;imm32.lib;version.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -148,7 +148,7 @@
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>libultraship.lib;ZAPDUtils.lib;opengl32.lib;glu32.lib;SDL2.lib;SDL2main.lib;glfw3dll.lib;glew32s.lib;winmm.lib;imm32.lib;version.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libultraship.lib;ZAPDUtils.lib;opengl32.lib;glu32.lib;SDL2.lib;SDL2main.lib;glew32s.lib;winmm.lib;imm32.lib;version.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries> <IgnoreSpecificDefaultLibraries>
</IgnoreSpecificDefaultLibraries> </IgnoreSpecificDefaultLibraries>
<AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
@ -156,13 +156,15 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>TurnOffAllWarnings</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>false</SDLCheck>
<PreprocessorDefinitions>INCLUDE_GAME_PRINTF;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions> <PreprocessorDefinitions>INCLUDE_GAME_PRINTF;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<LanguageStandard>stdcpp20</LanguageStandard>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -170,6 +172,7 @@
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/FORCE:MULTIPLE %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>libultraship.lib;ZAPDUtils.lib;opengl32.lib;glu32.lib;SDL2.lib;SDL2main.lib;glew32s.lib;winmm.lib;imm32.lib;version.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>

798
soh/soh.vcxproj.filters
View File

@ -1,87 +1,710 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Source Files"> <ClCompile Include="soh\frame_interpolation.cpp" />
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> <ClCompile Include="soh\Enhancements\bootcommands.c" />
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions> <ClCompile Include="soh\Enhancements\debugconsole.cpp" />
</Filter> <ClCompile Include="soh\Enhancements\debugger\colViewer.cpp" />
<Filter Include="Header Files"> <ClCompile Include="soh\Enhancements\debugger\debugger.cpp" />
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> <ClCompile Include="soh\Enhancements\debugger\debugSaveEditor.cpp" />
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions> <ClCompile Include="soh\Enhancements\debugger\ImGuiHelpers.cpp" />
</Filter> <ClCompile Include="soh\Enhancements\gameconsole.c" />
<Filter Include="Resource Files"> <ClCompile Include="soh\Enhancements\savestates.cpp" />
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> <ClCompile Include="soh\GbiWrap.cpp" />
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> <ClCompile Include="soh\gu_pc.c" />
</Filter> <ClCompile Include="soh\OTRGlobals.cpp" />
<Filter Include="Source Files\src"> <ClCompile Include="soh\stubs.c" />
<UniqueIdentifier>{8d479b58-9306-40c3-9728-2cf5b185f5c4}</UniqueIdentifier> <ClCompile Include="soh\util.cpp" />
</Filter> <ClCompile Include="soh\z_message_OTR.cpp" />
<Filter Include="Source Files\src\libultra"> <ClCompile Include="soh\z_play_otr.cpp" />
<UniqueIdentifier>{8ebc52ba-5b1d-4bb3-9848-ba9ea57fc49f}</UniqueIdentifier> <ClCompile Include="soh\z_scene_otr.cpp" />
</Filter> <ClCompile Include="src\boot\assert.c" />
<Filter Include="Source Files\src\buffers"> <ClCompile Include="src\boot\boot_main.c" />
<UniqueIdentifier>{54c2fe99-a68e-4ce2-813d-bce0ab1ac24f}</UniqueIdentifier> <ClCompile Include="src\boot\build.c" />
</Filter> <ClCompile Include="src\boot\idle.c" />
<Filter Include="Source Files\src\code"> <ClCompile Include="src\boot\is_debug.c" />
<UniqueIdentifier>{0b91ecc8-6f20-4da1-87ca-6c7263aab3db}</UniqueIdentifier> <ClCompile Include="src\boot\logutils.c" />
</Filter> <ClCompile Include="src\boot\missing_gcc_functions.c" />
<Filter Include="Source Files\src\boot"> <ClCompile Include="src\boot\stackcheck.c" />
<UniqueIdentifier>{2104d3ab-707c-4ab2-bb1a-5cdce5c3d07d}</UniqueIdentifier> <ClCompile Include="src\boot\viconfig.c" />
</Filter> <ClCompile Include="src\boot\yaz0.c" />
<Filter Include="Source Files\src\overlays"> <ClCompile Include="src\boot\z_locale.c" />
<UniqueIdentifier>{022552c8-3bb8-4ba5-904c-e2c3eb28ce10}</UniqueIdentifier> <ClCompile Include="src\boot\z_std_dma.c" />
</Filter> <ClCompile Include="src\buffers\gfxbuffers.c" />
<Filter Include="Header Files\include"> <ClCompile Include="src\buffers\heaps.c" />
<UniqueIdentifier>{3ab8c311-cbfb-4eca-88af-2446ce3c89b0}</UniqueIdentifier> <ClCompile Include="src\buffers\zbuffer.c" />
</Filter> <ClCompile Include="src\code\audioMgr.c" />
<Filter Include="Source Files\src\overlays\effects"> <ClCompile Include="src\code\audio_data.c" />
<UniqueIdentifier>{8f2da1b8-973e-4be0-a036-c79a63bc3067}</UniqueIdentifier> <ClCompile Include="src\code\audio_effects.c" />
</Filter> <ClCompile Include="src\code\audio_heap.c" />
<Filter Include="Source Files\src\overlays\gamestates"> <ClCompile Include="src\code\audio_init_params.c" />
<UniqueIdentifier>{1a584bc2-7081-4251-a953-cdc7b611d62b}</UniqueIdentifier> <ClCompile Include="src\code\audio_load.c" />
</Filter> <ClCompile Include="src\code\audio_playback.c" />
<Filter Include="Source Files\src\overlays\gamestates\ovl_title"> <ClCompile Include="src\code\audio_seqplayer.c" />
<UniqueIdentifier>{49bb84e4-a0b9-4733-9720-1ea120795083}</UniqueIdentifier> <ClCompile Include="src\code\audio_sound_params.c" />
</Filter> <ClCompile Include="src\code\audio_synthesis.c" />
<Filter Include="Source Files\src\overlays\gamestates\ovl_select"> <ClCompile Include="src\code\code_800430A0.c" />
<UniqueIdentifier>{d4794b4c-ae5d-4bf0-96f4-077f03807f5e}</UniqueIdentifier> <ClCompile Include="src\code\code_80043480.c" />
</Filter> <ClCompile Include="src\code\code_8006C3A0.c" />
<Filter Include="Source Files\src\overlays\gamestates\ovl_opening"> <ClCompile Include="src\code\code_8006C510.c" />
<UniqueIdentifier>{981df102-b362-4e2b-8efc-62756c28aa60}</UniqueIdentifier> <ClCompile Include="src\code\code_80097A00.c" />
</Filter> <ClCompile Include="src\code\code_800A9F30.c" />
<Filter Include="Source Files\src\overlays\gamestates\ovl_file_choose"> <ClCompile Include="src\code\code_800ACE70.c" />
<UniqueIdentifier>{f8b2165f-9b32-4be1-a285-49349e09bef5}</UniqueIdentifier> <ClCompile Include="src\code\code_800AD920.c" />
</Filter> <ClCompile Include="src\code\code_800BB0A0.c" />
<Filter Include="Header Files\soh"> <ClCompile Include="src\code\code_800C3C20.c" />
<UniqueIdentifier>{fcaae731-4e17-448b-b6c7-36e4c8413838}</UniqueIdentifier> <ClCompile Include="src\code\code_800D2E30.c" />
</Filter> <ClCompile Include="src\code\code_800D31A0.c" />
<Filter Include="Header Files\soh\Enhancements"> <ClCompile Include="src\code\code_800E4FE0.c" />
<UniqueIdentifier>{264ed8f8-f42b-475f-82ca-c264225ef56c}</UniqueIdentifier> <ClCompile Include="src\code\code_800E6840.c" />
</Filter> <ClCompile Include="src\code\code_800EC960.c" />
<Filter Include="Source Files\soh"> <ClCompile Include="src\code\code_800F7260.c" />
<UniqueIdentifier>{5fde6633-a728-4eea-a616-59d413bec476}</UniqueIdentifier> <ClCompile Include="src\code\code_800F9280.c" />
</Filter> <ClCompile Include="src\code\code_800FBCE0.c" />
<Filter Include="Source Files\soh\Enhancements"> <ClCompile Include="src\code\code_800FC620.c" />
<UniqueIdentifier>{3aeae6ac-1340-4a7b-bf34-cd196667fe37}</UniqueIdentifier> <ClCompile Include="src\code\code_800FCE80.c" />
</Filter> <ClCompile Include="src\code\code_800FD970.c" />
<Filter Include="Source Files\src\overlays\misc"> <ClCompile Include="src\code\code_801067F0.c" />
<UniqueIdentifier>{fe745190-d4ec-4dc3-a9fd-ea553a971b14}</UniqueIdentifier> <ClCompile Include="src\code\code_801068B0.c" />
</Filter> <ClCompile Include="src\code\db_camera.c" />
<Filter Include="Source Files\src\overlays\misc\ovl_map_mark_data"> <ClCompile Include="src\code\debug_malloc.c" />
<UniqueIdentifier>{06ba0ec4-2ee7-4454-93b5-5fd804723b6d}</UniqueIdentifier> <ClCompile Include="src\code\fault.c" />
</Filter> <ClCompile Include="src\code\fault_drawer.c" />
<Filter Include="Source Files\src\overlays\misc\ovl_kaleido_scope"> <ClCompile Include="src\code\flg_set.c" />
<UniqueIdentifier>{ffe200b9-a955-4843-a1ce-3603c132e591}</UniqueIdentifier> <ClCompile Include="src\code\game.c" />
</Filter> <ClCompile Include="src\code\gamealloc.c" />
<Filter Include="Source Files\src\overlays\actors"> <ClCompile Include="src\code\gfxprint.c" />
<UniqueIdentifier>{18b9727f-30de-4ab8-a317-916090d4a110}</UniqueIdentifier> <ClCompile Include="src\code\graph.c" />
</Filter> <ClCompile Include="src\code\irqmgr.c" />
<Filter Include="Header Files\soh\Enhancements\debugger"> <ClCompile Include="src\code\jpegdecoder.c" />
<UniqueIdentifier>{9a4378ec-e30f-47b6-9ad6-5ce738b4cf99}</UniqueIdentifier> <ClCompile Include="src\code\jpegutils.c" />
</Filter> <ClCompile Include="src\code\listalloc.c" />
<Filter Include="Source Files\soh\Enhancements\debugger"> <ClCompile Include="src\code\loadfragment2.c" />
<UniqueIdentifier>{04fc1c52-49ff-48e2-ae23-2c00867374f8}</UniqueIdentifier> <ClCompile Include="src\code\logseverity.c" />
</Filter> <ClCompile Include="src\code\main.c" />
<ClCompile Include="src\code\mempak.c" />
<ClCompile Include="src\code\mtxuty-cvt.c" />
<ClCompile Include="src\code\padmgr.c" />
<ClCompile Include="src\code\padsetup.c" />
<ClCompile Include="src\code\padutils.c" />
<ClCompile Include="src\code\PreRender.c" />
<ClCompile Include="src\code\printutils.c" />
<ClCompile Include="src\code\relocation.c" />
<ClCompile Include="src\code\sched.c" />
<ClCompile Include="src\code\shrink_window.c" />
<ClCompile Include="src\code\sleep.c" />
<ClCompile Include="src\code\speed_meter.c" />
<ClCompile Include="src\code\system_malloc.c" />
<ClCompile Include="src\code\sys_cfb.c" />
<ClCompile Include="src\code\sys_math.c" />
<ClCompile Include="src\code\sys_math3d.c" />
<ClCompile Include="src\code\sys_math_atan.c" />
<ClCompile Include="src\code\sys_matrix.c" />
<ClCompile Include="src\code\sys_ucode.c" />
<ClCompile Include="src\code\title_setup.c" />
<ClCompile Include="src\code\TwoHeadArena.c" />
<ClCompile Include="src\code\ucode_disas.c" />
<ClCompile Include="src\code\z_actor.c" />
<ClCompile Include="src\code\z_actor_dlftbls.c" />
<ClCompile Include="src\code\z_bgcheck.c" />
<ClCompile Include="src\code\z_camera.c" />
<ClCompile Include="src\code\z_cheap_proc.c" />
<ClCompile Include="src\code\z_collision_btltbls.c" />
<ClCompile Include="src\code\z_collision_check.c" />
<ClCompile Include="src\code\z_common_data.c" />
<ClCompile Include="src\code\z_construct.c" />
<ClCompile Include="src\code\z_debug.c" />
<ClCompile Include="src\code\z_debug_display.c" />
<ClCompile Include="src\code\z_demo.c" />
<ClCompile Include="src\code\z_DLF.c" />
<ClCompile Include="src\code\z_draw.c" />
<ClCompile Include="src\code\z_effect.c" />
<ClCompile Include="src\code\z_effect_soft_sprite.c" />
<ClCompile Include="src\code\z_effect_soft_sprite_dlftbls.c" />
<ClCompile Include="src\code\z_effect_soft_sprite_old_init.c" />
<ClCompile Include="src\code\z_eff_blure.c" />
<ClCompile Include="src\code\z_eff_shield_particle.c" />
<ClCompile Include="src\code\z_eff_spark.c" />
<ClCompile Include="src\code\z_eff_ss_dead.c" />
<ClCompile Include="src\code\z_elf_message.c" />
<ClCompile Include="src\code\z_en_a_keep.c" />
<ClCompile Include="src\code\z_en_item00.c" />
<ClCompile Include="src\code\z_face_reaction.c" />
<ClCompile Include="src\code\z_fbdemo.c" />
<ClCompile Include="src\code\z_fbdemo_circle.c" />
<ClCompile Include="src\code\z_fbdemo_fade.c" />
<ClCompile Include="src\code\z_fbdemo_triforce.c" />
<ClCompile Include="src\code\z_fbdemo_wipe1.c" />
<ClCompile Include="src\code\z_fcurve_data_skelanime.c" />
<ClCompile Include="src\code\z_frame_advance.c" />
<ClCompile Include="src\code\z_game_dlftbls.c" />
<ClCompile Include="src\code\z_game_over.c" />
<ClCompile Include="src\code\z_horse.c" />
<ClCompile Include="src\code\z_jpeg.c" />
<ClCompile Include="src\code\z_kaleido_manager.c" />
<ClCompile Include="src\code\z_kaleido_scope_call.c" />
<ClCompile Include="src\code\z_kaleido_setup.c" />
<ClCompile Include="src\code\z_kanfont.c" />
<ClCompile Include="src\code\z_kankyo.c" />
<ClCompile Include="src\code\z_lib.c" />
<ClCompile Include="src\code\z_lifemeter.c" />
<ClCompile Include="src\code\z_lights.c" />
<ClCompile Include="src\code\z_malloc.c" />
<ClCompile Include="src\code\z_map_data.c" />
<ClCompile Include="src\code\z_map_exp.c" />
<ClCompile Include="src\code\z_map_mark.c" />
<ClCompile Include="src\code\z_message_PAL.c" />
<ClCompile Include="src\code\z_moji.c" />
<ClCompile Include="src\code\z_msgevent.c" />
<ClCompile Include="src\code\z_olib.c" />
<ClCompile Include="src\code\z_onepointdemo.c" />
<ClCompile Include="src\code\z_parameter.c" />
<ClCompile Include="src\code\z_path.c" />
<ClCompile Include="src\code\z_play.c" />
<ClCompile Include="src\code\z_player_call.c" />
<ClCompile Include="src\code\z_player_lib.c" />
<ClCompile Include="src\code\z_prenmi.c" />
<ClCompile Include="src\code\z_prenmi_buff.c" />
<ClCompile Include="src\code\z_quake.c" />
<ClCompile Include="src\code\z_rcp.c" />
<ClCompile Include="src\code\z_room.c" />
<ClCompile Include="src\code\z_sample.c" />
<ClCompile Include="src\code\z_scene.c" />
<ClCompile Include="src\code\z_scene_table.c" />
<ClCompile Include="src\code\z_skelanime.c" />
<ClCompile Include="src\code\z_skin.c" />
<ClCompile Include="src\code\z_skin_awb.c" />
<ClCompile Include="src\code\z_skin_matrix.c" />
<ClCompile Include="src\code\z_sound_source.c" />
<ClCompile Include="src\code\z_sram.c" />
<ClCompile Include="src\code\z_ss_sram.c" />
<ClCompile Include="src\code\z_view.c" />
<ClCompile Include="src\code\z_vimode.c" />
<ClCompile Include="src\code\z_vismono.c" />
<ClCompile Include="src\code\z_vr_box.c" />
<ClCompile Include="src\code\z_vr_box_draw.c" />
<ClCompile Include="src\code\__osMalloc.c" />
<ClCompile Include="src\libultra\gu\coss.c" />
<ClCompile Include="src\libultra\gu\guLookAt.c" />
<ClCompile Include="src\libultra\gu\guLookAtHilite.c" />
<ClCompile Include="src\libultra\gu\guPerspectiveF.c" />
<ClCompile Include="src\libultra\gu\guPosition.c" />
<ClCompile Include="src\libultra\gu\guS2DInitBg.c" />
<ClCompile Include="src\libultra\gu\ortho.c" />
<ClCompile Include="src\libultra\gu\rotate.c" />
<ClCompile Include="src\libultra\gu\sins.c" />
<ClCompile Include="src\libultra\gu\sintable.c" />
<ClCompile Include="src\libultra\libc\sprintf.c" />
<ClCompile Include="src\overlays\actors\ovl_Arms_Hook\z_arms_hook.c" />
<ClCompile Include="src\overlays\actors\ovl_Arrow_Fire\z_arrow_fire.c" />
<ClCompile Include="src\overlays\actors\ovl_Arrow_Ice\z_arrow_ice.c" />
<ClCompile Include="src\overlays\actors\ovl_Arrow_Light\z_arrow_light.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Bdan_Objects\z_bg_bdan_objects.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Bdan_Switch\z_bg_bdan_switch.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Bombwall\z_bg_bombwall.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Bom_Guard\z_bg_bom_guard.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Bowl_Wall\z_bg_bowl_wall.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Breakwall\z_bg_breakwall.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Ddan_Jd\z_bg_ddan_jd.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Ddan_Kd\z_bg_ddan_kd.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Dodoago\z_bg_dodoago.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Dy_Yoseizo\z_bg_dy_yoseizo.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Ganon_Otyuka\z_bg_ganon_otyuka.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Gate_Shutter\z_bg_gate_shutter.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Gjyo_Bridge\z_bg_gjyo_bridge.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Gnd_Darkmeiro\z_bg_gnd_darkmeiro.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Gnd_Firemeiro\z_bg_gnd_firemeiro.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Gnd_Iceblock\z_bg_gnd_iceblock.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Gnd_Nisekabe\z_bg_gnd_nisekabe.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Gnd_Soulmeiro\z_bg_gnd_soulmeiro.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Haka\z_bg_haka.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Gate\z_bg_haka_gate.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Huta\z_bg_haka_huta.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Haka_MeganeBG\z_bg_haka_meganebg.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Megane\z_bg_haka_megane.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Sgami\z_bg_haka_sgami.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Ship\z_bg_haka_ship.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Trap\z_bg_haka_trap.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Tubo\z_bg_haka_tubo.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Water\z_bg_haka_water.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Haka_Zou\z_bg_haka_zou.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Heavy_Block\z_bg_heavy_block.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Curtain\z_bg_hidan_curtain.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Dalm\z_bg_hidan_dalm.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Firewall\z_bg_hidan_firewall.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Fslift\z_bg_hidan_fslift.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Fwbig\z_bg_hidan_fwbig.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Hamstep\z_bg_hidan_hamstep.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Hrock\z_bg_hidan_hrock.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Kousi\z_bg_hidan_kousi.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Kowarerukabe\z_bg_hidan_kowarerukabe.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Rock\z_bg_hidan_rock.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Rsekizou\z_bg_hidan_rsekizou.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Sekizou\z_bg_hidan_sekizou.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Sima\z_bg_hidan_sima.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Hidan_Syoku\z_bg_hidan_syoku.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Ice_Objects\z_bg_ice_objects.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Ice_Shelter\z_bg_ice_shelter.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Ice_Shutter\z_bg_ice_shutter.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Ice_Turara\z_bg_ice_turara.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Ingate\z_bg_ingate.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Jya_1flift\z_bg_jya_1flift.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Amishutter\z_bg_jya_amishutter.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Bigmirror\z_bg_jya_bigmirror.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Block\z_bg_jya_block.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Bombchuiwa\z_bg_jya_bombchuiwa.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Bombiwa\z_bg_jya_bombiwa.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Cobra\z_bg_jya_cobra.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Goroiwa\z_bg_jya_goroiwa.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Haheniron\z_bg_jya_haheniron.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Ironobj\z_bg_jya_ironobj.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Kanaami\z_bg_jya_kanaami.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Lift\z_bg_jya_lift.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Megami\z_bg_jya_megami.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Jya_Zurerukabe\z_bg_jya_zurerukabe.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Menkuri_Eye\z_bg_menkuri_eye.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Menkuri_Kaiten\z_bg_menkuri_kaiten.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Menkuri_Nisekabe\z_bg_menkuri_nisekabe.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Mizu_Bwall\z_bg_mizu_bwall.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Mizu_Movebg\z_bg_mizu_movebg.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Mizu_Shutter\z_bg_mizu_shutter.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Mizu_Uzu\z_bg_mizu_uzu.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Mizu_Water\z_bg_mizu_water.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Mjin\z_bg_mjin.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Bigst\z_bg_mori_bigst.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Elevator\z_bg_mori_elevator.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Hashigo\z_bg_mori_hashigo.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Hashira4\z_bg_mori_hashira4.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Hineri\z_bg_mori_hineri.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Idomizu\z_bg_mori_idomizu.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Kaitenkabe\z_bg_mori_kaitenkabe.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Mori_Rakkatenjo\z_bg_mori_rakkatenjo.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Po_Event\z_bg_po_event.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Po_Syokudai\z_bg_po_syokudai.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Pushbox\z_bg_pushbox.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Relay_Objects\z_bg_relay_objects.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot00_Break\z_bg_spot00_break.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot00_Hanebasi\z_bg_spot00_hanebasi.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot01_Fusya\z_bg_spot01_fusya.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot01_Idohashira\z_bg_spot01_idohashira.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot01_Idomizu\z_bg_spot01_idomizu.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot01_Idosoko\z_bg_spot01_idosoko.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot01_Objects2\z_bg_spot01_objects2.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot02_Objects\z_bg_spot02_objects.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot03_Taki\z_bg_spot03_taki.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot05_Soko\z_bg_spot05_soko.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot06_Objects\z_bg_spot06_objects.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot07_Taki\z_bg_spot07_taki.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot08_Bakudankabe\z_bg_spot08_bakudankabe.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot08_Iceblock\z_bg_spot08_iceblock.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot09_Obj\z_bg_spot09_obj.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot11_Bakudankabe\z_bg_spot11_bakudankabe.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot11_Oasis\z_bg_spot11_oasis.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot12_Gate\z_bg_spot12_gate.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot12_Saku\z_bg_spot12_saku.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot15_Rrbox\z_bg_spot15_rrbox.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot15_Saku\z_bg_spot15_saku.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot16_Bombstone\z_bg_spot16_bombstone.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot16_Doughnut\z_bg_spot16_doughnut.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot17_Bakudankabe\z_bg_spot17_bakudankabe.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot17_Funen\z_bg_spot17_funen.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot18_Basket\z_bg_spot18_basket.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot18_Futa\z_bg_spot18_futa.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot18_Obj\z_bg_spot18_obj.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Spot18_Shutter\z_bg_spot18_shutter.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Sst_Floor\z_bg_sst_floor.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Toki_Hikari\z_bg_toki_hikari.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Toki_Swd\z_bg_toki_swd.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Toki_Swd\z_bg_toki_swd_cutscene_data_1.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Toki_Swd\z_bg_toki_swd_cutscene_data_2.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Toki_Swd\z_bg_toki_swd_cutscene_data_3.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Treemouth\z_bg_treemouth.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Treemouth\z_bg_treemouth_cutscene_data.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Umajump\z_bg_umajump.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Vb_Sima\z_bg_vb_sima.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Ydan_Hasi\z_bg_ydan_hasi.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Ydan_Maruta\z_bg_ydan_maruta.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Ydan_Sp\z_bg_ydan_sp.c" />
<ClCompile Include="src\overlays\actors\ovl_Bg_Zg\z_bg_zg.c" />
<ClCompile Include="src\overlays\actors\ovl_Boss_Dodongo\z_boss_dodongo.c" />
<ClCompile Include="src\overlays\actors\ovl_Boss_Dodongo\z_boss_dodongo_data.c" />
<ClCompile Include="src\overlays\actors\ovl_Boss_Fd2\z_boss_fd2.c" />
<ClCompile Include="src\overlays\actors\ovl_Boss_Fd2\z_boss_fd2_colchk.c" />
<ClCompile Include="src\overlays\actors\ovl_Boss_Fd\z_boss_fd.c" />
<ClCompile Include="src\overlays\actors\ovl_Boss_Fd\z_boss_fd_colchk.c" />
<ClCompile Include="src\overlays\actors\ovl_Boss_Ganon2\z_boss_ganon2.c" />
<ClCompile Include="src\overlays\actors\ovl_Boss_Ganon2\z_boss_ganon2_data.c" />
<ClCompile Include="src\overlays\actors\ovl_Boss_Ganondrof\z_boss_ganondrof.c" />
<ClCompile Include="src\overlays\actors\ovl_Boss_Ganon\z_boss_ganon.c" />
<ClCompile Include="src\overlays\actors\ovl_Boss_Goma\z_boss_goma.c" />
<ClCompile Include="src\overlays\actors\ovl_Boss_Mo\z_boss_mo.c" />
<ClCompile Include="src\overlays\actors\ovl_Boss_Mo\z_boss_mo_colchk.c" />
<ClCompile Include="src\overlays\actors\ovl_Boss_Sst\z_boss_sst.c" />
<ClCompile Include="src\overlays\actors\ovl_Boss_Sst\z_boss_sst_colchk.c" />
<ClCompile Include="src\overlays\actors\ovl_Boss_Tw\z_boss_tw.c" />
<ClCompile Include="src\overlays\actors\ovl_Boss_Va\z_boss_va.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_6K\z_demo_6k.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Du\z_demo_du.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Du\z_demo_du_cutscene_data.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Ec\z_demo_ec.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Effect\z_demo_effect.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Ext\z_demo_ext.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Geff\z_demo_geff.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Gj\z_demo_gj.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Go\z_demo_go.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Gt\z_demo_gt.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Ik\z_demo_ik.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Im\z_demo_im.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Im\z_demo_im_cutscene_data.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data1.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data2.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data3.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data4.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data5.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data6.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data7.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Kankyo\z_demo_kankyo_cutscene_data8.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Kekkai\z_demo_kekkai.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Sa\z_demo_sa.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Sa\z_demo_sa_cutscene_data.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Shd\z_demo_shd.c" />
<ClCompile Include="src\overlays\actors\ovl_Demo_Tre_Lgt\z_demo_tre_lgt.c" />
<ClCompile Include="src\overlays\actors\ovl_Door_Ana\z_door_ana.c" />
<ClCompile Include="src\overlays\actors\ovl_Door_Gerudo\z_door_gerudo.c" />
<ClCompile Include="src\overlays\actors\ovl_Door_Killer\z_door_killer.c" />
<ClCompile Include="src\overlays\actors\ovl_Door_Shutter\z_door_shutter.c" />
<ClCompile Include="src\overlays\actors\ovl_Door_Toki\z_door_toki.c" />
<ClCompile Include="src\overlays\actors\ovl_Door_Warp1\z_door_warp1.c" />
<ClCompile Include="src\overlays\actors\ovl_Efc_Erupc\z_efc_erupc.c" />
<ClCompile Include="src\overlays\actors\ovl_Eff_Dust\z_eff_dust.c" />
<ClCompile Include="src\overlays\actors\ovl_Elf_Msg2\z_elf_msg2.c" />
<ClCompile Include="src\overlays\actors\ovl_Elf_Msg\z_elf_msg.c" />
<ClCompile Include="src\overlays\actors\ovl_End_Title\z_end_title.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Am\z_en_am.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ani\z_en_ani.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Anubice\z_en_anubice.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Anubice_Fire\z_en_anubice_fire.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Anubice_Tag\z_en_anubice_tag.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Arow_Trap\z_en_arow_trap.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Arrow\z_en_arrow.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Attack_Niw\z_en_attack_niw.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ba\z_en_ba.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Bb\z_en_bb.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Bdfire\z_en_bdfire.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Bigokuta\z_en_bigokuta.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Bili\z_en_bili.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Bird\z_en_bird.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Blkobj\z_en_blkobj.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Bombf\z_en_bombf.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Bom\z_en_bom.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Bom_Bowl_Man\z_en_bom_bowl_man.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Bom_Bowl_Pit\z_en_bom_bowl_pit.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Bom_Chu\z_en_bom_chu.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Boom\z_en_boom.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Box\z_en_box.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Brob\z_en_brob.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Bubble\z_en_bubble.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Butte\z_en_butte.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Bw\z_en_bw.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Bx\z_en_bx.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Changer\z_en_changer.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Clear_Tag\z_en_clear_tag.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Cow\z_en_cow.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Crow\z_en_crow.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Cs\z_en_cs.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Daiku\z_en_daiku.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Daiku_Kakariko\z_en_daiku_kakariko.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Dekubaba\z_en_dekubaba.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Dekunuts\z_en_dekunuts.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Dha\z_en_dha.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Dh\z_en_dh.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Diving_Game\z_en_diving_game.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Dns\z_en_dns.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Dnt_Demo\z_en_dnt_demo.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Dnt_Jiji\z_en_dnt_jiji.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Dnt_Nomal\z_en_dnt_nomal.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Dodojr\z_en_dodojr.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Dodongo\z_en_dodongo.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Dog\z_en_dog.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Door\z_en_door.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ds\z_en_ds.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Du\z_en_du.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Dy_Extra\z_en_dy_extra.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Eg\z_en_eg.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Eiyer\z_en_eiyer.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Elf\z_en_elf.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Encount1\z_en_encount1.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Encount2\z_en_encount2.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ex_Item\z_en_ex_item.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ex_Ruppy\z_en_ex_ruppy.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Fd\z_en_fd.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Fd_Fire\z_en_fd_fire.c" />
<ClCompile Include="src\overlays\actors\ovl_En_fHG\z_en_fhg.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Fhg_Fire\z_en_fhg_fire.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Firefly\z_en_firefly.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Fire_Rock\z_en_fire_rock.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Fish\z_en_fish.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Floormas\z_en_floormas.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Fr\z_en_fr.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Fu\z_en_fu.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Fw\z_en_fw.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Fz\z_en_fz.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ganon_Mant\z_en_ganon_mant.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ganon_Organ\z_en_ganon_organ.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Gb\z_en_gb.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ge1\z_en_ge1.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ge2\z_en_ge2.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ge3\z_en_ge3.c" />
<ClCompile Include="src\overlays\actors\ovl_En_GeldB\z_en_geldb.c" />
<ClCompile Include="src\overlays\actors\ovl_En_GirlA\z_en_girla.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Gm\z_en_gm.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Go2\z_en_go2.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Goma\z_en_goma.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Goroiwa\z_en_goroiwa.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Go\z_en_go.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Gs\z_en_gs.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Guest\z_en_guest.c" />
<ClCompile Include="src\overlays\actors\ovl_En_G_Switch\z_en_g_switch.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Hata\z_en_hata.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Heishi1\z_en_heishi1.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Heishi2\z_en_heishi2.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Heishi3\z_en_heishi3.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Heishi4\z_en_heishi4.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Hintnuts\z_en_hintnuts.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Holl\z_en_holl.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Honotrap\z_en_honotrap.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Horse\z_en_horse.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Horse_Game_Check\z_en_horse_game_check.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Horse_Ganon\z_en_horse_ganon.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Horse_Link_Child\z_en_horse_link_child.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Horse_Normal\z_en_horse_normal.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Horse_Zelda\z_en_horse_zelda.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Hs2\z_en_hs2.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Hs\z_en_hs.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Hy\z_en_hy.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ice_Hono\z_en_ice_hono.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ik\z_en_ik.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Insect\z_en_insect.c" />
<ClCompile Include="src\overlays\actors\ovl_En_In\z_en_in.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ishi\z_en_ishi.c" />
<ClCompile Include="src\overlays\actors\ovl_En_It\z_en_it.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Jj\z_en_jj.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Jj\z_en_jj_cutscene_data.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Jsjutan\z_en_jsjutan.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Js\z_en_js.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Kakasi2\z_en_kakasi2.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Kakasi3\z_en_kakasi3.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Kakasi\z_en_kakasi.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Kanban\z_en_kanban.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Kanban\z_en_kanban_gfx.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Karebaba\z_en_karebaba.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ko\z_en_ko.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Kusa\z_en_kusa.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Kz\z_en_kz.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Lightbox\z_en_lightbox.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Light\z_en_light.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ma1\z_en_ma1.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ma2\z_en_ma2.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ma3\z_en_ma3.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Mag\z_en_mag.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Mb\z_en_mb.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Md\z_en_md.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Mk\z_en_mk.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Mm2\z_en_mm2.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Mm\z_en_mm.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ms\z_en_ms.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Mu\z_en_mu.c" />
<ClCompile Include="src\overlays\actors\ovl_En_M_Fire1\z_en_m_fire1.c" />
<ClCompile Include="src\overlays\actors\ovl_En_M_Thunder\z_en_m_thunder.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Nb\z_en_nb.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Nb\z_en_nb_cutscene_data.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Niw\z_en_niw.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Niw_Girl\z_en_niw_girl.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Niw_Lady\z_en_niw_lady.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Nutsball\z_en_nutsball.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Nwc\z_en_nwc.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ny\z_en_ny.c" />
<ClCompile Include="src\overlays\actors\ovl_En_OE2\z_en_oe2.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Okarina_Effect\z_en_okarina_effect.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Okarina_Tag\z_en_okarina_tag.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Okarina_Tag\z_en_okarina_tag_cutscene_data.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Okuta\z_en_okuta.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ossan\z_en_ossan.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Owl\z_en_owl.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Part\z_en_part.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Peehat\z_en_peehat.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Poh\z_en_poh.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Po_Desert\z_en_po_desert.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Po_Field\z_en_po_field.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Po_Relay\z_en_po_relay.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Po_Sisters\z_en_po_sisters.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Pu_box\z_en_pu_box.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Rd\z_en_rd.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Reeba\z_en_reeba.c" />
<ClCompile Include="src\overlays\actors\ovl_En_River_Sound\z_en_river_sound.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Rl\z_en_rl.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Rr\z_en_rr.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ru1\z_en_ru1.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ru1\z_en_ru1_cutscene_data.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ru2\z_en_ru2.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ru2\z_en_ru2_cutscene_data.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Sa\z_en_sa.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Sb\z_en_sb.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Scene_Change\z_en_scene_change.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Sda\z_en_sda.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Shopnuts\z_en_shopnuts.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Siofuki\z_en_siofuki.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Si\z_en_si.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Skb\z_en_skb.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Skjneedle\z_en_skjneedle.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Skj\z_en_skj.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ssh\z_en_ssh.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Sth\z_en_sth.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Stream\z_en_stream.c" />
<ClCompile Include="src\overlays\actors\ovl_En_St\z_en_st.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Sw\z_en_sw.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Syateki_Itm\z_en_syateki_itm.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Syateki_Man\z_en_syateki_man.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Syateki_Niw\z_en_syateki_niw.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Takara_Man\z_en_takara_man.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Tana\z_en_tana.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Ta\z_en_ta.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Test\z_en_test.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Tg\z_en_tg.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Tite\z_en_tite.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Tk\z_en_tk.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Torch2\z_en_torch2.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Torch\z_en_torch.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Toryo\z_en_toryo.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Tp\z_en_tp.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Trap\z_en_trap.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Tr\z_en_tr.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Tubo_Trap\z_en_tubo_trap.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Vali\z_en_vali.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Vase\z_en_vase.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Vb_Ball\z_en_vb_ball.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Viewer\z_en_viewer.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Vm\z_en_vm.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Wallmas\z_en_wallmas.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Wall_Tubo\z_en_wall_tubo.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Weather_Tag\z_en_weather_tag.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Weiyer\z_en_weiyer.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Wf\z_en_wf.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Wonder_Item\z_en_wonder_item.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Wonder_Talk2\z_en_wonder_talk2.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Wonder_Talk\z_en_wonder_talk.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Wood02\z_en_wood02.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Xc\z_en_xc.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Yabusame_Mark\z_en_yabusame_mark.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Yukabyun\z_en_yukabyun.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Zf\z_en_zf.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Zl1\z_en_zl1.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Zl1\z_en_zl1_camera_data.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Zl1\z_en_zl1_cutscene_data.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Zl2\z_en_zl2.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Zl3\z_en_zl3.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Zl4\z_en_zl4.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Zl4\z_en_zl4_cutscene_data.c" />
<ClCompile Include="src\overlays\actors\ovl_En_Zo\z_en_zo.c" />
<ClCompile Include="src\overlays\actors\ovl_Fishing\z_fishing.c" />
<ClCompile Include="src\overlays\actors\ovl_Item_B_Heart\z_item_b_heart.c" />
<ClCompile Include="src\overlays\actors\ovl_Item_Etcetera\z_item_etcetera.c" />
<ClCompile Include="src\overlays\actors\ovl_Item_Inbox\z_item_inbox.c" />
<ClCompile Include="src\overlays\actors\ovl_Item_Ocarina\z_item_ocarina.c" />
<ClCompile Include="src\overlays\actors\ovl_Item_Shield\z_item_shield.c" />
<ClCompile Include="src\overlays\actors\ovl_Magic_Dark\z_magic_dark.c" />
<ClCompile Include="src\overlays\actors\ovl_Magic_Fire\z_magic_fire.c" />
<ClCompile Include="src\overlays\actors\ovl_Magic_Wind\z_magic_wind.c" />
<ClCompile Include="src\overlays\actors\ovl_Mir_Ray\z_mir_ray.c" />
<ClCompile Include="src\overlays\actors\ovl_Object_Kankyo\z_object_kankyo.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Bean\z_obj_bean.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Blockstop\z_obj_blockstop.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Bombiwa\z_obj_bombiwa.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Comb\z_obj_comb.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Dekujr\z_obj_dekujr.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Elevator\z_obj_elevator.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Hamishi\z_obj_hamishi.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Hana\z_obj_hana.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Hsblock\z_obj_hsblock.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Ice_Poly\z_obj_ice_poly.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Kibako2\z_obj_kibako2.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Kibako\z_obj_kibako.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Lift\z_obj_lift.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Lightswitch\z_obj_lightswitch.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Makekinsuta\z_obj_makekinsuta.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Makeoshihiki\z_obj_makeoshihiki.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Mure2\z_obj_mure2.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Mure3\z_obj_mure3.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Mure\z_obj_mure.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Oshihiki\z_obj_oshihiki.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Roomtimer\z_obj_roomtimer.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Switch\z_obj_switch.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Syokudai\z_obj_syokudai.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Timeblock\z_obj_timeblock.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Tsubo\z_obj_tsubo.c" />
<ClCompile Include="src\overlays\actors\ovl_Obj_Warp2block\z_obj_warp2block.c" />
<ClCompile Include="src\overlays\actors\ovl_Oceff_Spot\z_oceff_spot.c" />
<ClCompile Include="src\overlays\actors\ovl_Oceff_Storm\z_oceff_storm.c" />
<ClCompile Include="src\overlays\actors\ovl_Oceff_Wipe2\z_oceff_wipe2.c" />
<ClCompile Include="src\overlays\actors\ovl_Oceff_Wipe3\z_oceff_wipe3.c" />
<ClCompile Include="src\overlays\actors\ovl_Oceff_Wipe4\z_oceff_wipe4.c" />
<ClCompile Include="src\overlays\actors\ovl_Oceff_Wipe\z_oceff_wipe.c" />
<ClCompile Include="src\overlays\actors\ovl_player_actor\z_player.c" />
<ClCompile Include="src\overlays\actors\ovl_Shot_Sun\z_shot_sun.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Blast\z_eff_ss_blast.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Bomb2\z_eff_ss_bomb2.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Bomb\z_eff_ss_bomb.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Bubble\z_eff_ss_bubble.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dead_Db\z_eff_ss_dead_db.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dead_Dd\z_eff_ss_dead_dd.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dead_Ds\z_eff_ss_dead_ds.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dead_Sound\z_eff_ss_dead_sound.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dt_Bubble\z_eff_ss_dt_bubble.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Dust\z_eff_ss_dust.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_D_Fire\z_eff_ss_d_fire.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_En_Fire\z_eff_ss_en_fire.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_En_Ice\z_eff_ss_en_ice.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Extra\z_eff_ss_extra.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Fcircle\z_eff_ss_fcircle.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Fhg_Flash\z_eff_ss_fhg_flash.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Fire_Tail\z_eff_ss_fire_tail.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Fire\z_eff_ss_g_fire.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Magma2\z_eff_ss_g_magma2.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Magma\z_eff_ss_g_magma.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Ripple\z_eff_ss_g_ripple.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Spk\z_eff_ss_g_spk.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_G_Splash\z_eff_ss_g_splash.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Hahen\z_eff_ss_hahen.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_HitMark\z_eff_ss_hitmark.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Ice_Piece\z_eff_ss_ice_piece.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Ice_Smoke\z_eff_ss_ice_smoke.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Kakera\z_eff_ss_kakera.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_KiraKira\z_eff_ss_kirakira.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_K_Fire\z_eff_ss_k_fire.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Lightning\z_eff_ss_lightning.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Sibuki2\z_eff_ss_sibuki2.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Sibuki\z_eff_ss_sibuki.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Solder_Srch_Ball\z_eff_ss_solder_srch_ball.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Stick\z_eff_ss_stick.c" />
<ClCompile Include="src\overlays\effects\ovl_Effect_Ss_Stone1\z_eff_ss_stone1.c" />
<ClCompile Include="src\overlays\gamestates\ovl_file_choose\z_file_choose.c" />
<ClCompile Include="src\overlays\gamestates\ovl_file_choose\z_file_copy_erase.c" />
<ClCompile Include="src\overlays\gamestates\ovl_file_choose\z_file_nameset_data.c" />
<ClCompile Include="src\overlays\gamestates\ovl_file_choose\z_file_nameset_PAL.c" />
<ClCompile Include="src\overlays\gamestates\ovl_opening\z_opening.c" />
<ClCompile Include="src\overlays\gamestates\ovl_select\z_select.c" />
<ClCompile Include="src\overlays\gamestates\ovl_title\z_title.c" />
<ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_collect.c" />
<ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_debug.c" />
<ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_equipment.c" />
<ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_item.c" />
<ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_map_PAL.c" />
<ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_prompt.c" />
<ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_kaleido_scope_PAL.c" />
<ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_lmap_mark.c" />
<ClCompile Include="src\overlays\misc\ovl_kaleido_scope\z_lmap_mark_data.c" />
<ClCompile Include="src\overlays\misc\ovl_map_mark_data\z_map_mark_data.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\boot\assert.c"> <ClCompile Include="src\boot\assert.c">
@ -3761,18 +4384,9 @@
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="include\macro.inc"> <Image Include="SHIPOFHARKINIAN.ico" />
<Filter>Header Files\include</Filter>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="Resource.rc"> <None Include="include\macro.inc" />
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<Image Include="SHIPOFHARKINIAN.ico">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup> </ItemGroup>
</Project> </Project>

8
soh/soh/OTRGlobals.cpp
View File

@ -177,7 +177,7 @@ extern "C" void Graph_StartFrame() {
extern "C" void Graph_ProcessGfxCommands(Gfx* commands) { extern "C" void Graph_ProcessGfxCommands(Gfx* commands) {
OTRGlobals::Instance->context->GetWindow()->SetFrameDivisor(CVar_GetS32("g60FPS", 0) == 0 ? R_UPDATE_RATE : 1); OTRGlobals::Instance->context->GetWindow()->SetFrameDivisor(CVar_GetS32("g60FPS", 0) == 0 ? R_UPDATE_RATE : 1);
if (!audio.initialized) { if (!audio.initialized && 0) {
audio.initialized = true; audio.initialized = true;
std::thread([]() { std::thread([]() {
for (;;) { for (;;) {
@ -235,7 +235,7 @@ extern "C" void Graph_ProcessGfxCommands(Gfx* commands) {
OTRGlobals::Instance->context->GetWindow()->RunCommands(commands, mtx_replacements); OTRGlobals::Instance->context->GetWindow()->RunCommands(commands, mtx_replacements);
{ if (0) {
std::unique_lock<std::mutex> Lock(audio.mutex); std::unique_lock<std::mutex> Lock(audio.mutex);
while (audio.processing) { while (audio.processing) {
audio.cv_from_thread.wait(Lock); audio.cv_from_thread.wait(Lock);
@ -512,10 +512,10 @@ extern "C" int ResourceMgr_OTRSigCheck(char* imgData)
{ {
uintptr_t i = (uintptr_t)(imgData); uintptr_t i = (uintptr_t)(imgData);
if (i == 0xD9000000 || i == 0xE7000000 || (i & 1) == 1) if ((i & 1) == 1)
return 0; return 0;
if ((i & 0xFF000000) != 0xAB000000 && (i & 0xFF000000) != 0xCD000000 && i != 0) { if (i != 0) {
if (imgData[0] == '_' && imgData[1] == '_' && imgData[2] == 'O' && imgData[3] == 'T' && imgData[4] == 'R' && if (imgData[0] == '_' && imgData[1] == '_' && imgData[2] == 'O' && imgData[3] == 'T' && imgData[4] == 'R' &&
imgData[5] == '_' && imgData[6] == '_') imgData[5] == '_' && imgData[6] == '_')
return 1; return 1;

4
soh/soh/OTRGlobals.h
View File

@ -37,18 +37,22 @@ uint32_t ResourceMgr_GetGameVersion();
void ResourceMgr_CacheDirectory(const char* resName); void ResourceMgr_CacheDirectory(const char* resName);
void ResourceMgr_LoadFile(const char* resName); void ResourceMgr_LoadFile(const char* resName);
char* ResourceMgr_LoadFileFromDisk(const char* filePath); char* ResourceMgr_LoadFileFromDisk(const char* filePath);
char* ResourceMgr_LoadJPEG(char* data, int dataSize);
char* ResourceMgr_LoadTexByName(const char* texPath); char* ResourceMgr_LoadTexByName(const char* texPath);
char* ResourceMgr_LoadTexOrDListByName(const char* filePath); char* ResourceMgr_LoadTexOrDListByName(const char* filePath);
char* ResourceMgr_LoadPlayerAnimByName(const char* animPath); char* ResourceMgr_LoadPlayerAnimByName(const char* animPath);
AnimationHeaderCommon* ResourceMgr_LoadAnimByName(const char* path);
char* ResourceMgr_GetNameByCRC(uint64_t crc, char* alloc); char* ResourceMgr_GetNameByCRC(uint64_t crc, char* alloc);
Gfx* ResourceMgr_LoadGfxByCRC(uint64_t crc); Gfx* ResourceMgr_LoadGfxByCRC(uint64_t crc);
Gfx* ResourceMgr_LoadGfxByName(const char* path); Gfx* ResourceMgr_LoadGfxByName(const char* path);
Gfx* ResourceMgr_PatchGfxByName(const char* path, int size); Gfx* ResourceMgr_PatchGfxByName(const char* path, int size);
char* ResourceMgr_LoadArrayByNameAsVec3s(const char* path);
Vtx* ResourceMgr_LoadVtxByCRC(uint64_t crc); Vtx* ResourceMgr_LoadVtxByCRC(uint64_t crc);
Vtx* ResourceMgr_LoadVtxByName(const char* path); Vtx* ResourceMgr_LoadVtxByName(const char* path);
CollisionHeader* ResourceMgr_LoadColByName(const char* path); CollisionHeader* ResourceMgr_LoadColByName(const char* path);
uint64_t GetPerfCounter(); uint64_t GetPerfCounter();
struct SkeletonHeader* ResourceMgr_LoadSkeletonByName(const char* path); struct SkeletonHeader* ResourceMgr_LoadSkeletonByName(const char* path);
s32* ResourceMgr_LoadCSByName(const char* path);
int ResourceMgr_OTRSigCheck(char* imgData); int ResourceMgr_OTRSigCheck(char* imgData);
uint64_t osGetTime(void); uint64_t osGetTime(void);
uint32_t osGetCount(void); uint32_t osGetCount(void);

3
soh/soh/z_scene_otr.cpp
View File

@ -449,6 +449,7 @@ bool func_8009899C(GlobalContext* globalCtx, Ship::SceneCommand* cmd)
k = 0; k = 0;
//i = globalCtx->objectCtx.unk_09; //i = globalCtx->objectCtx.unk_09;
i = 0;
firstStatus = &globalCtx->objectCtx.status[0]; firstStatus = &globalCtx->objectCtx.status[0];
status = &globalCtx->objectCtx.status[i]; status = &globalCtx->objectCtx.status[i];
@ -913,7 +914,7 @@ extern "C" s32 OTRfunc_8009728C(GlobalContext* globalCtx, RoomContext* roomCtx,
return 0; // UH OH return 0; // UH OH
size = globalCtx->roomList[roomNum].vromEnd - globalCtx->roomList[roomNum].vromStart; size = globalCtx->roomList[roomNum].vromEnd - globalCtx->roomList[roomNum].vromStart;
roomCtx->unk_34 = (void*)ALIGN16((u32)roomCtx->bufPtrs[roomCtx->unk_30] - ((size + 8) * roomCtx->unk_30 + 7)); roomCtx->unk_34 = (void*)ALIGN16((uintptr_t)roomCtx->bufPtrs[roomCtx->unk_30] - ((size + 8) * roomCtx->unk_30 + 7));
osCreateMesgQueue(&roomCtx->loadQueue, &roomCtx->loadMsg, 1); osCreateMesgQueue(&roomCtx->loadQueue, &roomCtx->loadMsg, 1);
//DmaMgr_SendRequest2(&roomCtx->dmaRequest, roomCtx->unk_34, globalCtx->roomList[roomNum].vromStart, size, 0, //DmaMgr_SendRequest2(&roomCtx->dmaRequest, roomCtx->unk_34, globalCtx->roomList[roomNum].vromStart, size, 0,

1
soh/src/code/audioMgr.c
View File

@ -84,6 +84,7 @@ void AudioMgr_Unlock(AudioMgr* audioMgr) {
} }
void AudioMgr_Init(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, SchedContext* sched, IrqMgr* irqMgr) { void AudioMgr_Init(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, SchedContext* sched, IrqMgr* irqMgr) {
return; // OTRTODO64
AudioPlayer_Init(); AudioPlayer_Init();
memset(audioMgr,0, sizeof(AudioMgr)); memset(audioMgr,0, sizeof(AudioMgr));

2
soh/src/code/code_800C3C20.c
View File

@ -7,6 +7,8 @@ u8 D_8012D200[] = {
void func_800C3C20(void) { void func_800C3C20(void) {
s32 i; s32 i;
return; // OTRTODO64
for (i = 0; (i < ARRAY_COUNT(D_8012D200)) & 0xFFFFFFFF; i++) { for (i = 0; (i < ARRAY_COUNT(D_8012D200)) & 0xFFFFFFFF; i++) {
Audio_StopSfxByBank(D_8012D200[i]); Audio_StopSfxByBank(D_8012D200[i]);
} }

5
soh/src/code/code_800EC960.c
View File

@ -3502,6 +3502,7 @@ void func_800F4A70(void);
void func_800F5CF8(void); void func_800F5CF8(void);
void func_800F3054(void) { void func_800F3054(void) {
return; // OTRTODO64
if (func_800FAD34() == 0) { if (func_800FAD34() == 0) {
sAudioUpdateTaskStart = gAudioContext.totalTaskCnt; sAudioUpdateTaskStart = gAudioContext.totalTaskCnt;
sAudioUpdateStartTime = osGetTime(); sAudioUpdateStartTime = osGetTime();
@ -4420,6 +4421,8 @@ void func_800F5918(void) {
void func_800F595C(u16 arg0) { void func_800F595C(u16 arg0) {
u8 arg0b = arg0 & 0xFF; u8 arg0b = arg0 & 0xFF;
return; // OTRTODO60
if (sSeqFlags[arg0b] & 2) { if (sSeqFlags[arg0b] & 2) {
Audio_PlayFanfare(arg0); Audio_PlayFanfare(arg0);
} else if (sSeqFlags[arg0b] & 4) { } else if (sSeqFlags[arg0b] & 4) {
@ -4524,6 +4527,8 @@ void Audio_PlayFanfare(u16 seqId)
u8* sp1C; u8* sp1C;
u8* sp18; u8* sp18;
return; // OTRTODO64
sp26 = func_800FA0B4(SEQ_PLAYER_FANFARE); sp26 = func_800FA0B4(SEQ_PLAYER_FANFARE);
sp1C = func_800E5E84(sp26 & 0xFF, &sp20); sp1C = func_800E5E84(sp26 & 0xFF, &sp20);
sp18 = func_800E5E84(seqId & 0xFF, &sp20); sp18 = func_800E5E84(seqId & 0xFF, &sp20);

4
soh/src/code/code_800F7260.c
View File

@ -579,6 +579,8 @@ void func_800F8884(u8 bankId, Vec3f* pos) {
u8 entryIndex = gSoundBanks[bankId][0].next; u8 entryIndex = gSoundBanks[bankId][0].next;
u8 prevEntryIndex = 0; u8 prevEntryIndex = 0;
return; // OTRTODO64
while (entryIndex != 0xFF) { while (entryIndex != 0xFF) {
entry = &gSoundBanks[bankId][entryIndex]; entry = &gSoundBanks[bankId][entryIndex];
if (entry->posX == &pos->x) { if (entry->posX == &pos->x) {
@ -676,6 +678,7 @@ void Audio_StopSfxById(u32 sfxId) {
u8 entryIndex = gSoundBanks[SFX_BANK(sfxId)][0].next; u8 entryIndex = gSoundBanks[SFX_BANK(sfxId)][0].next;
u8 prevEntryIndex = 0; u8 prevEntryIndex = 0;
SoundBankEntry cmp; SoundBankEntry cmp;
return; // OTRTODO64
while (entryIndex != 0xFF) { while (entryIndex != 0xFF) {
entry = &gSoundBanks[SFX_BANK(sfxId)][entryIndex]; entry = &gSoundBanks[SFX_BANK(sfxId)][entryIndex];
@ -737,6 +740,7 @@ void func_800F8F88(void) {
u8 Audio_IsSfxPlaying(u32 sfxId) u8 Audio_IsSfxPlaying(u32 sfxId)
{ {
return; // OTRTODO64
SoundBankEntry* entry; SoundBankEntry* entry;
u8 entryIndex = gSoundBanks[SFX_BANK(sfxId)][0].next; u8 entryIndex = gSoundBanks[SFX_BANK(sfxId)][0].next;

2
soh/src/code/z_bgcheck.c
View File

@ -1516,7 +1516,7 @@ void BgCheck_Allocate(CollisionContext* colCtx, GlobalContext* globalCtx, Collis
if (globalCtx->sceneNum == SCENE_MALON_STABLE) { if (globalCtx->sceneNum == SCENE_MALON_STABLE) {
// "/* BGCheck LonLon Size %dbyte */\n" // "/* BGCheck LonLon Size %dbyte */\n"
osSyncPrintf("/* BGCheck LonLonサイズ %dbyte */\n", 0x3520); osSyncPrintf("/* BGCheck LonLonサイズ %dbyte */\n", 0x3520);
colCtx->memSize = 0x3520; colCtx->memSize = 0x3520 * (sizeof(void*) / 4); // 64-bit build needs more memory
} else { } else {
// "/* BGCheck Mini Size %dbyte */\n" // "/* BGCheck Mini Size %dbyte */\n"
osSyncPrintf("/* BGCheck ミニサイズ %dbyte */\n", 0x4E20); osSyncPrintf("/* BGCheck ミニサイズ %dbyte */\n", 0x4E20);

2
soh/src/code/z_kanfont.c
View File

@ -194,7 +194,7 @@ void Font_LoadOrderedFont(Font* font) {
size_t len; size_t len;
size_t jj; size_t jj;
s32 fontStatic; s32 fontStatic;
u32 fontBuf; u8* fontBuf;
s32 codePointIndex; s32 codePointIndex;
s32 fontBufIndex; s32 fontBufIndex;
s32 offset; s32 offset;

4
soh/src/code/z_play.c
View File

@ -198,8 +198,8 @@ void Gameplay_Init(GameState* thisx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
gGlobalCtx = globalCtx; gGlobalCtx = globalCtx;
//globalCtx->state.gfxCtx = NULL; //globalCtx->state.gfxCtx = NULL;
u32 zAlloc; uintptr_t zAlloc;
u32 zAllocAligned; uintptr_t zAllocAligned;
size_t zAllocSize; size_t zAllocSize;
Player* player; Player* player;
s32 playerStartCamId; s32 playerStartCamId;

2
soh/src/code/z_room.c
View File

@ -554,7 +554,7 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) {
roomCtx->bufPtrs[0] = GameState_Alloc(&globalCtx->state, maxRoomSize, "../z_room.c", 946); roomCtx->bufPtrs[0] = GameState_Alloc(&globalCtx->state, maxRoomSize, "../z_room.c", 946);
// "Room buffer initial pointer=%08x" // "Room buffer initial pointer=%08x"
osSyncPrintf("部屋バッファ開始ポインタ=%08x\n", roomCtx->bufPtrs[0]); osSyncPrintf("部屋バッファ開始ポインタ=%08x\n", roomCtx->bufPtrs[0]);
roomCtx->bufPtrs[1] = (void*)((s32)roomCtx->bufPtrs[0] + maxRoomSize); roomCtx->bufPtrs[1] = (void*)((intptr_t)roomCtx->bufPtrs[0] + maxRoomSize);
// "Room buffer end pointer=%08x" // "Room buffer end pointer=%08x"
osSyncPrintf("部屋バッファ終了ポインタ=%08x\n", roomCtx->bufPtrs[1]); osSyncPrintf("部屋バッファ終了ポインタ=%08x\n", roomCtx->bufPtrs[1]);
osSyncPrintf(VT_RST); osSyncPrintf(VT_RST);

1
soh/src/code/z_scene.c
View File

@ -61,6 +61,7 @@ void Object_InitBank(GlobalContext* globalCtx, ObjectContext* objectCtx) {
for (i = 0; i < OBJECT_EXCHANGE_BANK_MAX; i++) { for (i = 0; i < OBJECT_EXCHANGE_BANK_MAX; i++) {
objectCtx->status[i].id = OBJECT_INVALID; objectCtx->status[i].id = OBJECT_INVALID;
objectCtx->status[i].segment = NULL;
} }
osSyncPrintf(VT_FGCOL(GREEN)); osSyncPrintf(VT_FGCOL(GREEN));

2
soh/src/code/z_skelanime.c
View File

@ -857,7 +857,7 @@ void AnimationContext_SetLoadFrame(GlobalContext* globalCtx, LinkAnimationHeader
animation = ResourceMgr_LoadAnimByName(animation); animation = ResourceMgr_LoadAnimByName(animation);
LinkAnimationHeader* linkAnimHeader = SEGMENTED_TO_VIRTUAL(animation); LinkAnimationHeader* linkAnimHeader = SEGMENTED_TO_VIRTUAL(animation);
u32 ram = frameTable; Vec3s* ram = frameTable;
osCreateMesgQueue(&entry->data.load.msgQueue, &entry->data.load.msg, 1); osCreateMesgQueue(&entry->data.load.msgQueue, &entry->data.load.msg, 1);

2
soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c
View File

@ -2370,7 +2370,7 @@ void EnHorse_CutsceneUpdate(EnHorse* this, GlobalContext* globalCtx) {
EnHorse_Freeze(this); EnHorse_Freeze(this);
return; return;
} }
if (linkCsAction != 0 && linkCsAction != 0xABABABAB) { if (linkCsAction != 0 && (uint32_t)(uintptr_t)linkCsAction != 0xABABABAB) {
csFunctionIdx = EnHorse_GetCutsceneFunctionIndex(linkCsAction->action); csFunctionIdx = EnHorse_GetCutsceneFunctionIndex(linkCsAction->action);
if (csFunctionIdx != 0) { if (csFunctionIdx != 0) {
if (this->cutsceneAction != csFunctionIdx) { if (this->cutsceneAction != csFunctionIdx) {

1
soh/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c
View File

@ -204,6 +204,7 @@ void EnRiverSound_Update(Actor* thisx, GlobalContext* globalCtx) {
} }
void EnRiverSound_Draw(Actor* thisx, GlobalContext* globalCtx) { void EnRiverSound_Draw(Actor* thisx, GlobalContext* globalCtx) {
return; // OTRTODO64
static s16 soundEffects[] = { static s16 soundEffects[] = {
0, 0,
NA_SE_EV_WATER_WALL - SFX_FLAG, NA_SE_EV_WATER_WALL - SFX_FLAG,

2
soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c
View File

@ -660,7 +660,7 @@ void func_80AF68E4(EnSa* this, GlobalContext* globalCtx) {
EnSa_ChangeAnim(this, csAction->action); EnSa_ChangeAnim(this, csAction->action);
this->unk_210 = csAction->action; this->unk_210 = csAction->action;
} }
if (phi_v0) {} //if (phi_v0) {}
if (csAction->action == 3) { if (csAction->action == 3) {
if (this->unk_20C == 0) { if (this->unk_20C == 0) {
phi_v0 = 0; phi_v0 = 0;

2
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -9419,7 +9419,7 @@ void Player_Init(Actor* thisx, GlobalContext* globalCtx2) {
Player_SetEquipmentData(globalCtx, this); Player_SetEquipmentData(globalCtx, this);
this->prevBoots = this->currentBoots; this->prevBoots = this->currentBoots;
Player_InitCommon(this, globalCtx, gPlayerSkelHeaders[((void)0, gSaveContext.linkAge)]); Player_InitCommon(this, globalCtx, gPlayerSkelHeaders[((void)0, gSaveContext.linkAge)]);
this->giObjectSegment = (void*)(((u32)ZeldaArena_MallocDebug(0x3008, "../z_player.c", 17175) + 8) & ~0xF); this->giObjectSegment = (void*)(((uintptr_t)ZeldaArena_MallocDebug(0x3008, "../z_player.c", 17175) + 8) & ~0xF);
sp50 = gSaveContext.respawnFlag; sp50 = gSaveContext.respawnFlag;

2
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
View File

@ -135,7 +135,7 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) {
u16 pad; u16 pad;
s16 cursorMoveResult; s16 cursorMoveResult;
u16 cursorItem; u16 cursorItem;
u16 cursorSlot; u16 cursorSlot = 0;
s16 cursorPoint; s16 cursorPoint;
s16 cursorX; s16 cursorX;
s16 cursorY; s16 cursorY;

14
soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
View File

@ -3036,11 +3036,11 @@ void KaleidoScope_Update(GlobalContext* globalCtx)
GameOverContext* gameOverCtx = &globalCtx->gameOverCtx; GameOverContext* gameOverCtx = &globalCtx->gameOverCtx;
Player* player = GET_PLAYER(globalCtx); Player* player = GET_PLAYER(globalCtx);
Input* input = &globalCtx->state.input[0]; Input* input = &globalCtx->state.input[0];
size_t size; size_t size = 0;
size_t size0; size_t size0 = 0;
size_t size1; size_t size1 = 0;
size_t size2; size_t size2 = 0;
u16 i; u16 i = 0;
s16 stepR; s16 stepR;
s16 stepG; s16 stepG;
s16 stepB; s16 stepB;
@ -3103,7 +3103,7 @@ void KaleidoScope_Update(GlobalContext* globalCtx)
//DmaMgr_SendRequest1(pauseCtx->iconItem24Segment, (uintptr_t)_icon_item_24_staticSegmentRomStart, size, //DmaMgr_SendRequest1(pauseCtx->iconItem24Segment, (uintptr_t)_icon_item_24_staticSegmentRomStart, size,
//"../z_kaleido_scope_PAL.c", 3675); //"../z_kaleido_scope_PAL.c", 3675);
pauseCtx->iconItemAltSegment = (void*)(((uintptr_t)pauseCtx->iconItem24Segment + size + 0xF) & ~0xF); //pauseCtx->iconItemAltSegment = (void*)(((uintptr_t)pauseCtx->iconItem24Segment + size + 0xF) & ~0xF);
#endif #endif
switch (globalCtx->sceneNum) { switch (globalCtx->sceneNum) {
@ -3151,7 +3151,7 @@ void KaleidoScope_Update(GlobalContext* globalCtx)
// OTRTODO: LANGUAGE SUPPORT // OTRTODO: LANGUAGE SUPPORT
#if 1 #if 1
pauseCtx->iconItemLangSegment = (void*)(((uintptr_t)pauseCtx->iconItemAltSegment + size2 + 0xF) & ~0xF); //pauseCtx->iconItemLangSegment = (void*)(((uintptr_t)pauseCtx->iconItemAltSegment + size2 + 0xF) & ~0xF);
if (gSaveContext.language == LANGUAGE_ENG) { if (gSaveContext.language == LANGUAGE_ENG) {
//size = (uintptr_t)_icon_item_nes_staticSegmentRomEnd - (uintptr_t)_icon_item_nes_staticSegmentRomStart; //size = (uintptr_t)_icon_item_nes_staticSegmentRomEnd - (uintptr_t)_icon_item_nes_staticSegmentRomStart;