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

GC PAL Non-MQ support complete

Browse source
This commit is contained in:
Jack Walker 2022-03-27 20:17:12 -04:00
commit a7a56632ca
43 changed files with 340 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

4
OTRExporter/extract_assets.py
View file

@ -48,7 +48,7 @@ def ExtractFunc(fullPath):
*pathList, xmlName = fullPath.split(os.sep)
objectName = os.path.splitext(xmlName)[0]
outPath = os.path.join("..\\soh\\assets\\", *pathList[4:], objectName)
outPath = os.path.join("..\\soh\\assets\\", *pathList[5:], objectName)
os.makedirs(outPath, exist_ok=True)
outSourcePath = outPath
@ -90,7 +90,7 @@ def main():
extract_staff_text_path = None
xmlFiles = []
for currentPath, _, files in os.walk(os.path.join("..\\soh\\assets", "xml")):
for currentPath, _, files in os.walk(os.path.join("..\\soh\\assets\\", "xml\\GC_NMQ_PAL_F")):
for file in files:
fullPath = os.path.join(currentPath, file)
if file.endswith(".xml"):

2
OTRExporter/extract_baserom_gc.py
View file

@ -36,8 +36,8 @@ FILE_NAMES = [
'fra_message_data_static',
'staff_message_data_static',
'map_grand_static',
'map_i_static',
'map_48x85_static',
'map_i_static',
'code',
'ovl_title',
'ovl_select',

16
ZAPDTR/ZAPDUtils/ZAPDUtils.vcxproj.filters
View file

@ -12,14 +12,14 @@
<Filter Include="Header Files\Utils">
<UniqueIdentifier>{d8c2c1e7-b065-4b0f-86a2-46ab46eedc0b}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Source Files">
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files\Source Files\Utils">
<Filter Include="Source Files\Utils">
<UniqueIdentifier>{e047919d-7186-49ca-b115-e48fbb5c8743}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\Source Files\Libraries">
<Filter Include="Source Files\Libraries">
<UniqueIdentifier>{3de9dd46-0dfd-4d48-9f20-9f24e5b80fe0}</UniqueIdentifier>
</Filter>
</ItemGroup>
@ -69,19 +69,19 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="Utils\BinaryWriter.cpp">
<Filter>Header Files\Source Files\Utils</Filter>
<Filter>Source Files\Utils</Filter>
</ClCompile>
<ClCompile Include="Utils\MemoryStream.cpp">
<Filter>Header Files\Source Files\Utils</Filter>
<Filter>Source Files\Utils</Filter>
</ClCompile>
<ClCompile Include="Utils\BinaryReader.cpp">
<Filter>Header Files\Source Files\Utils</Filter>
<Filter>Source Files\Utils</Filter>
</ClCompile>
<ClCompile Include="..\lib\tinyxml2\tinyxml2.cpp">
<Filter>Header Files\Source Files\Libraries</Filter>
<Filter>Source Files\Libraries</Filter>
</ClCompile>
<ClCompile Include="Utils\StringHelper.cpp">
<Filter>Header Files\Source Files\Utils</Filter>
<Filter>Source Files\Utils</Filter>
</ClCompile>
</ItemGroup>
</Project>

78
libultraship/libultraship/ResourceMgr.cpp
View file

@ -86,7 +86,10 @@ namespace Ship {
OTR->LoadFile(ToLoad->path, true, ToLoad);
//Lock.lock();
FileCache[ToLoad->path] = ToLoad->bIsLoaded && !ToLoad->bHasLoadError ? ToLoad : nullptr;
if (!ToLoad->bHasLoadError)
FileCache[ToLoad->path] = ToLoad->bIsLoaded && !ToLoad->bHasLoadError ? ToLoad : nullptr;
//Lock.unlock();
SPDLOG_DEBUG("Loaded File {} on ResourceMgr thread", ToLoad->path);
@ -124,39 +127,47 @@ namespace Ship {
}
}
auto UnmanagedRes = ResourceLoader::LoadResource(ToLoad->File);
if (UnmanagedRes != nullptr)
if (!ToLoad->File->bHasLoadError)
{
UnmanagedRes->resMgr = this;
auto Res = std::shared_ptr<Resource>(UnmanagedRes);
auto UnmanagedRes = ResourceLoader::LoadResource(ToLoad->File);
if (Res != nullptr) {
std::unique_lock<std::mutex> Lock(ToLoad->ResourceLoadMutex);
if (UnmanagedRes != nullptr)
{
UnmanagedRes->resMgr = this;
auto Res = std::shared_ptr<Resource>(UnmanagedRes);
ToLoad->bHasResourceLoaded = true;
ToLoad->Resource = Res;
ResourceCache[Res->file->path] = Res;
if (Res != nullptr) {
std::unique_lock<std::mutex> Lock(ToLoad->ResourceLoadMutex);
SPDLOG_DEBUG("Loaded Resource {} on ResourceMgr thread", ToLoad->File->path);
ToLoad->bHasResourceLoaded = true;
ToLoad->Resource = Res;
ResourceCache[Res->file->path] = Res;
// Disabled for now because it can cause random crashes
//FileCache[Res->File->path] = nullptr;
//FileCache.erase(FileCache.find(Res->File->path));
Res->file = nullptr;
SPDLOG_DEBUG("Loaded Resource {} on ResourceMgr thread", ToLoad->File->path);
// Disabled for now because it can cause random crashes
//FileCache[Res->File->path] = nullptr;
//FileCache.erase(FileCache.find(Res->File->path));
Res->file = nullptr;
}
else {
ToLoad->bHasResourceLoaded = false;
ToLoad->Resource = nullptr;
SPDLOG_ERROR("Resource load FAILED {} on ResourceMgr thread", ToLoad->File->path);
}
//ResLock.lock();
//ResLock.unlock();
}
else {
ToLoad->bHasResourceLoaded = false;
ToLoad->Resource = nullptr;
SPDLOG_ERROR("Resource load FAILED {} on ResourceMgr thread", ToLoad->File->path);
}
//ResLock.lock();
//ResLock.unlock();
ToLoad->ResourceLoadNotifier.notify_all();
}
else
{
ToLoad->bHasResourceLoaded = false;
ToLoad->Resource = nullptr;
}
ToLoad->ResourceLoadNotifier.notify_all();
}
SPDLOG_INFO("Resource Manager LoadResourceThread ended");
@ -232,9 +243,16 @@ namespace Ship {
std::shared_ptr<File> FileData = LoadFile(FilePath);
Promise->File = FileData;
Promise->bHasResourceLoaded = false;
ResourceLoadQueue.push(Promise);
ResourceLoadNotifier.notify_all();
if (Promise->File->bHasLoadError)
{
Promise->bHasResourceLoaded = true;
}
else
{
Promise->bHasResourceLoaded = false;
ResourceLoadQueue.push(Promise);
ResourceLoadNotifier.notify_all();
}
} else {
Promise->bHasResourceLoaded = true;
Promise->Resource = resCacheFind->second;

14
soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_circle.xml
View file

@ -1,14 +1,14 @@
<Root>
<File Name="code" OutName="z_fbdemo_circle" RangeStart="0x10ED48" RangeEnd="0x12CBB0">
<Texture Name="sCircleWipeDefaultTex" Format="i8" Width="16" Height="64" Offset="0x10ED68"/>
<Texture Name="sCircleWipeWaveTex" Format="i8" Width="16" Height="64" Offset="0x10F168"/>
<Texture Name="sCircleWipeRippleTex" Format="i8" Width="16" Height="64" Offset="0x10F568"/>
<Texture Name="sCircleWipeStarburstTex" Format="i8" Width="16" Height="64" Offset="0x10F968"/>
<Array Name="sCircleWipeVtx" Count="34" Offset="0x10FD68">
<File Name="code" OutName="z_fbdemo_circle" RangeStart="0xE90E0" RangeEnd="0x12CBB0">
<Texture Name="sCircleWipeDefaultTex" Format="i8" Width="16" Height="64" Offset="0xE90E0"/>
<Texture Name="sCircleWipeWaveTex" Format="i8" Width="16" Height="64" Offset="0xE94E0"/>
<Texture Name="sCircleWipeRippleTex" Format="i8" Width="16" Height="64" Offset="0xE98E0"/>
<Texture Name="sCircleWipeStarburstTex" Format="i8" Width="16" Height="64" Offset="0xE9CE0"/>
<Array Name="sCircleWipeVtx" Count="34" Offset="0xEA0E0">
<Vtx/>
</Array>
<!-- ZAPD isn't finding symbols correctly, instead finding them much later in `code`-->
<!--<DList Name="sCircleWipeDL" Offset="0x10FF68"/>-->
<DList Name="sCircleDList" Offset="0x10FF68"/>
<DList Name="sCircleDList" Offset="0xEA2E0"/>
</File>
</Root>

6
soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_triforce.xml
View file

@ -1,7 +1,7 @@
<Root>
<File Name="code" OutName="z_fbdemo_triforce" RangeStart="0x10E1D0" RangeEnd="0x10E2A0">
<DList Name="sTriforceWipeDL" Offset="0x10E1D0"/>
<Array Name="sTriforceWipeVtx" Count="10" Offset="0x10E200">
<File Name="code" OutName="z_fbdemo_triforce" RangeStart="0xE8550" RangeEnd="0x10E2A0">
<DList Name="sTriforceWipeDL" Offset="0xE8550"/>
<Array Name="sTriforceWipeVtx" Count="10" Offset="0xE8580">
<Vtx/>
</Array>
</File>

6
soh/assets/xml/GC_NMQ_PAL_F/code/fbdemo_wipe1.xml
View file

@ -1,10 +1,10 @@
<Root>
<!-- ZAPD isn't finding sWipe1Vtx and sWipe1Tex properly for sWipe1DL, instead finding symbols much later in `code`-->
<File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0x10E2A0" RangeEnd="0x10EC30" Segment="0">
<Array Name="sWipe1Vtx" Count="25" Offset="0x10E2A0">
<File Name="code" OutName="z_fbdemo_wipe1" RangeStart="0xE8620" RangeEnd="0x10EC30" Segment="0">
<Array Name="sWipe1Vtx" Count="25" Offset="0xE8620">
<Vtx/>
</Array>
<Texture Name="sWipe1Tex" Format="i4" Width="64" Height="64" Offset="0x10E430"/>
<Texture Name="sWipe1Tex" Format="i4" Width="64" Height="64" Offset="0xE87B0"/>
<!-- <DList Name="sWipe1DL" Offset="0x10EC30"/>-->
</File>
</Root>

12
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Arrow_Fire.xml
View file

@ -1,11 +1,11 @@
<Root>
<File Name="ovl_Arrow_Fire" BaseAddress="0x80865D10" RangeStart="0x9D0" RangeEnd="0x1DF0">
<Texture Name="s1Tex" OutName="fire_tex_1" Format="i8" Width="32" Height="64" Offset="0x9D0" Static="On"/>
<Texture Name="s2Tex" OutName="fire_tex_2" Format="i8" Width="32" Height="64" Offset="0x11D0" Static="On"/>
<Array Name="sVtx" Count="43" Offset="0x19D0" Static="On">
<File Name="ovl_Arrow_Fire" BaseAddress="0x808625F0" RangeStart="0x980" RangeEnd="0x1DF0">
<Texture Name="s1Tex" OutName="fire_tex_1" Format="i8" Width="32" Height="64" Offset="0x980" Static="On"/>
<Texture Name="s2Tex" OutName="fire_tex_2" Format="i8" Width="32" Height="64" Offset="0x1180" Static="On"/>
<Array Name="sVtx" Count="43" Offset="0x1980" Static="On">
<Vtx/>
</Array>
<DList Name="sMaterialDL" Offset="0x1C80" Static="On"/>
<DList Name="sModelDL" Offset="0x1D30" Static="On"/>
<DList Name="sMaterialDL" Offset="0x1C30" Static="On"/>
<DList Name="sModelDL" Offset="0x1CE0" Static="On"/>
</File>
</Root>

12
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Arrow_Ice.xml
View file

@ -1,11 +1,11 @@
<Root>
<File Name="ovl_Arrow_Ice" BaseAddress="0x80867CD0" RangeStart="0x9F0" RangeEnd="0x1E10">
<Texture Name="s1Tex" OutName="ice_tex_1" Format="i8" Width="32" Height="64" Offset="0x9F0" Static="On"/>
<Texture Name="s2Tex" OutName="ice_tex_2" Format="i8" Width="32" Height="64" Offset="0x11F0" Static="On"/>
<Array Name="sVtx" Count="43" Offset="0x19F0" Static="On">
<File Name="ovl_Arrow_Ice" BaseAddress="0x808644D0" RangeStart="0x9A0" RangeEnd="0x1E10">
<Texture Name="s1Tex" OutName="ice_tex_1" Format="i8" Width="32" Height="64" Offset="0x9A0" Static="On"/>
<Texture Name="s2Tex" OutName="ice_tex_2" Format="i8" Width="32" Height="64" Offset="0x11A0" Static="On"/>
<Array Name="sVtx" Count="43" Offset="0x19A0" Static="On">
<Vtx/>
</Array>
<DList Name="sMaterialDL" Offset="0x1CA0" Static="On"/>
<DList Name="sModelDL" Offset="0x1D50" Static="On"/>
<DList Name="sMaterialDL" Offset="0x1C50" Static="On"/>
<DList Name="sModelDL" Offset="0x1D00" Static="On"/>
</File>
</Root>

12
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Arrow_Light.xml
View file

@ -1,11 +1,11 @@
<Root>
<File Name="ovl_Arrow_Light" BaseAddress="0x80869CB0" RangeStart="0xA00" RangeEnd="0x1E20">
<Texture Name="s1Tex" OutName="light_tex_1" Format="i8" Width="32" Height="64" Offset="0xA00" Static="On"/>
<Texture Name="s2Tex" OutName="light_tex_2" Format="i8" Width="32" Height="64" Offset="0x1200" Static="On"/>
<Array Name="sVtx" Count="43" Offset="0x1A00" Static="On">
<File Name="ovl_Arrow_Light" BaseAddress="0x808663D0" RangeStart="0x9B0" RangeEnd="0x1DD0">
<Texture Name="s1Tex" OutName="light_tex_1" Format="i8" Width="32" Height="64" Offset="0x9B0" Static="On"/>
<Texture Name="s2Tex" OutName="light_tex_2" Format="i8" Width="32" Height="64" Offset="0x11B0" Static="On"/>
<Array Name="sVtx" Count="43" Offset="0x19B0" Static="On">
<Vtx/>
</Array>
<DList Name="sMaterialDL" Offset="0x1CB0" Static="On"/>
<DList Name="sModelDL" Offset="0x1D60" Static="On"/>
<DList Name="sMaterialDL" Offset="0x1C60" Static="On"/>
<DList Name="sModelDL" Offset="0x1D10" Static="On"/>
</File>
</Root>

26
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Bg_Ganon_Otyuka.xml
View file

@ -1,29 +1,29 @@
<Root>
<File Name="ovl_Bg_Ganon_Otyuka" BaseAddress="0x80875920" RangeStart="0x11C0" RangeEnd="0x259C">
<Texture Name="sPlatformTex" OutName="platform_tex" Format="rgba16" Width="32" Height="32" Offset="0x11C0"/>
<File Name="ovl_Bg_Ganon_Otyuka" BaseAddress="0x80871790" RangeStart="0x1100" RangeEnd="0x259C">
<Texture Name="sPlatformTex" OutName="platform_tex" Format="rgba16" Width="32" Height="32" Offset="0x1100"/>
<Array Name="sPlatformTopVtx" Count="4" Offset="0x19C8">
<Array Name="sPlatformTopVtx" Count="4" Offset="0x1908">
<Vtx/>
</Array>
<DList Name="sPlatformMaterialDL" Offset="0x1A08"/>
<DList Name="sPlatformTopDL" Offset="0x1A90"/>
<DList Name="sPlatformMaterialDL" Offset="0x1948"/>
<DList Name="sPlatformTopDL" Offset="0x19D0"/>
<Array Name="sPlatformBottomVtx" Count="4" Offset="0x1AA8">
<Array Name="sPlatformBottomVtx" Count="4" Offset="0x19E8">
<Vtx/>
</Array>
<DList Name="sPlatformBottomDL" Offset="0x1AE8"/>
<DList Name="sPlatformBottomDL" Offset="0x1A28"/>
<Array Name="sPlatformSideVtx" Count="4" Offset="0x01B00">
<Array Name="sPlatformSideVtx" Count="4" Offset="0x01A40">
<Vtx/>
</Array>
<DList Name="sPlatformSideDL" Offset="0x1B40"/>
<DList Name="sPlatformSideDL" Offset="0x1A80"/>
<Texture Name="sFlashTex" OutName="flash_tex" Format="i8" Width="32" Height="64" Offset="0x1B58"/>
<Array Name="sFlashVtx" Count="8" Offset="0x2358">
<Texture Name="sFlashTex" OutName="flash_tex" Format="i8" Width="32" Height="64" Offset="0x1A98"/>
<Array Name="sFlashVtx" Count="8" Offset="0x2298">
<Vtx/>
</Array>
<DList Name="sFlashDL" Offset="0x23D8"/>
<DList Name="sFlashDL" Offset="0x2318"/>
<Collision Name="sCol" Offset="0x2570"/>
<Collision Name="sCol" Offset="0x24B0"/>
</File>
</Root>

6
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Bg_Jya_Cobra.xml
View file

@ -1,10 +1,10 @@
<Root>
<File Name="ovl_Bg_Jya_Cobra" BaseAddress="0x808958F0" RangeStart="0x1980" RangeEnd="0x19F8">
<Array Name="sShadowVtx" Count="4" Offset="0x1980">
<File Name="ovl_Bg_Jya_Cobra" BaseAddress="0x8088F8A0" RangeStart="0x1850" RangeEnd="0x19F8">
<Array Name="sShadowVtx" Count="4" Offset="0x1850">
<Vtx/>
</Array>
<DList Name="sShadowDL" Offset="0x19C0"/>
<DList Name="sShadowDL" Offset="0x1890"/>
</File>
</Root>

92
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon.xml
View file

@ -1,52 +1,52 @@
<Root>
<File Name="ovl_Boss_Ganon" BaseAddress="0x808D6870" RangeStart="0xE6B8" RangeEnd="0x211D8">
<Texture Name="gDorfLightning1Tex" OutName="lightning_1" Format="i8" Width="32" Height="96" Offset="0x11600" Static="Off"/>
<Texture Name="gDorfLightning2Tex" OutName="lightning_2" Format="i8" Width="32" Height="96" Offset="0x12200" Static="Off"/>
<Texture Name="gDorfLightning3Tex" OutName="lightning_3" Format="i8" Width="32" Height="96" Offset="0x12E00" Static="Off"/>
<Texture Name="gDorfLightning4Tex" OutName="lightning_4" Format="i8" Width="32" Height="96" Offset="0x13A00" Static="Off"/>
<Texture Name="gDorfLightning5Tex" OutName="lightning_5" Format="i8" Width="32" Height="96" Offset="0x14600" Static="Off"/>
<Texture Name="gDorfLightning6Tex" OutName="lightning_6" Format="i8" Width="32" Height="96" Offset="0x15200" Static="Off"/>
<Texture Name="gDorfLightning7Tex" OutName="lightning_7" Format="i8" Width="32" Height="96" Offset="0x15E00" Static="Off"/>
<Texture Name="gDorfLightning8Tex" OutName="lightning_8" Format="i8" Width="32" Height="96" Offset="0x16A00" Static="Off"/>
<Texture Name="gDorfLightning9Tex" OutName="lightning_9" Format="i8" Width="32" Height="96" Offset="0x17600" Static="Off"/>
<Texture Name="gDorfLightning10Tex" OutName="lightning_10" Format="i8" Width="32" Height="96" Offset="0x18200" Static="Off"/>
<Texture Name="gDorfLightning11Tex" OutName="lightning_11" Format="i8" Width="32" Height="96" Offset="0x18E00" Static="Off"/>
<Texture Name="gDorfLightning12Tex" OutName="lightning_12" Format="i8" Width="32" Height="96" Offset="0x19A00" Static="Off"/>
<File Name="ovl_Boss_Ganon" BaseAddress="0x808CBF80" RangeStart="0xE3C8" RangeEnd="0x211D8">
<Texture Name="gDorfLightning1Tex" OutName="lightning_1" Format="i8" Width="32" Height="96" Offset="0x11310" Static="Off"/>
<Texture Name="gDorfLightning2Tex" OutName="lightning_2" Format="i8" Width="32" Height="96" Offset="0x11F10" Static="Off"/>
<Texture Name="gDorfLightning3Tex" OutName="lightning_3" Format="i8" Width="32" Height="96" Offset="0x12B10" Static="Off"/>
<Texture Name="gDorfLightning4Tex" OutName="lightning_4" Format="i8" Width="32" Height="96" Offset="0x13710" Static="Off"/>
<Texture Name="gDorfLightning5Tex" OutName="lightning_5" Format="i8" Width="32" Height="96" Offset="0x14310" Static="Off"/>
<Texture Name="gDorfLightning6Tex" OutName="lightning_6" Format="i8" Width="32" Height="96" Offset="0x14F10" Static="Off"/>
<Texture Name="gDorfLightning7Tex" OutName="lightning_7" Format="i8" Width="32" Height="96" Offset="0x15B10" Static="Off"/>
<Texture Name="gDorfLightning8Tex" OutName="lightning_8" Format="i8" Width="32" Height="96" Offset="0x16710" Static="Off"/>
<Texture Name="gDorfLightning9Tex" OutName="lightning_9" Format="i8" Width="32" Height="96" Offset="0x17310" Static="Off"/>
<Texture Name="gDorfLightning10Tex" OutName="lightning_10" Format="i8" Width="32" Height="96" Offset="0x17F10" Static="Off"/>
<Texture Name="gDorfLightning11Tex" OutName="lightning_11" Format="i8" Width="32" Height="96" Offset="0x18B10" Static="Off"/>
<Texture Name="gDorfLightning12Tex" OutName="lightning_12" Format="i8" Width="32" Height="96" Offset="0x19710" Static="Off"/>
<Texture Name="gDorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="ci8" Width="32" Height="64" Offset="0xFD38" Static="Off"/>
<Texture Name="gDorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="ci8" Width="32" Height="64" Offset="0xFA48" Static="Off"/>
<DList Name="gDorfLightStreak1DL" Offset="0x1FCF0" Static="Off"/>
<DList Name="gDorfLightStreak2DL" Offset="0x1FD28" Static="Off"/>
<DList Name="gDorfLightStreak3DL" Offset="0x1FD60" Static="Off"/>
<DList Name="gDorfLightStreak4DL" Offset="0x1FD98" Static="Off"/>
<DList Name="gDorfLightStreak5DL" Offset="0x1FDD0" Static="Off"/>
<DList Name="gDorfLightStreak6DL" Offset="0x1FE08" Static="Off"/>
<DList Name="gDorfLightStreak7DL" Offset="0x1FE40" Static="Off"/>
<DList Name="gDorfLightStreak8DL" Offset="0x1FE78" Static="Off"/>
<DList Name="gDorfLightStreak9DL" Offset="0x1FEB0" Static="Off"/>
<DList Name="gDorfLightStreak10DL" Offset="0x1FEE8" Static="Off"/>
<DList Name="gDorfLightStreak11DL" Offset="0x1FF20" Static="Off"/>
<DList Name="gDorfLightStreak12DL" Offset="0x1FF58" Static="Off"/>
<DList Name="gDorfLightStreak1DL" Offset="0x1FA00" Static="Off"/>
<DList Name="gDorfLightStreak2DL" Offset="0x1FA38" Static="Off"/>
<DList Name="gDorfLightStreak3DL" Offset="0x1FA70" Static="Off"/>
<DList Name="gDorfLightStreak4DL" Offset="0x1FAA8" Static="Off"/>
<DList Name="gDorfLightStreak5DL" Offset="0x1FAE0" Static="Off"/>
<DList Name="gDorfLightStreak6DL" Offset="0x1FB18" Static="Off"/>
<DList Name="gDorfLightStreak7DL" Offset="0x1FB50" Static="Off"/>
<DList Name="gDorfLightStreak8DL" Offset="0x1FB88" Static="Off"/>
<DList Name="gDorfLightStreak9DL" Offset="0x1FBC0" Static="Off"/>
<DList Name="gDorfLightStreak10DL" Offset="0x1FBF8" Static="Off"/>
<DList Name="gDorfLightStreak11DL" Offset="0x1FC30" Static="Off"/>
<DList Name="gDorfLightStreak12DL" Offset="0x1FC68" Static="Off"/>
<DList Name="gDorfShadowSetupDL" Offset="0xE6F8" Static="Off"/>
<DList Name="gDorfShadowModelDL" Offset="0xE718" Static="Off"/>
<DList Name="gDorfTriforceDL" Offset="0xF788" Static="Off"/>
<DList Name="gDorfWindowShardMaterialDL" Offset="0xFC78" Static="Off"/>
<DList Name="gDorfWindowShardModelDL" Offset="0xFD20" Static="Off"/>
<DList Name="gDorfLightBallMaterialDL" Offset="0x11578" Static="Off"/>
<DList Name="gDorfSquareDL" Offset="0x115E8" Static="Off"/>
<DList Name="gDorfLightningDL" Offset="0x1A640" Static="Off"/>
<DList Name="gDorfUnusedDL" Offset="0x1A6F0" Static="Off"/>
<DList Name="gDorfLightRayTriDL" Offset="0x1A768" Static="Off"/>
<DList Name="gDorfLightFlecksDL" Offset="0x1C1C0" Static="Off"/>
<DList Name="gDorfBigMagicBGCircleDL" Offset="0x1C2B0" Static="Off"/>
<DList Name="gDorfDotDL" Offset="0x1C358" Static="Off"/>
<DList Name="gDorfShockwaveDL" Offset="0x1CDC0" Static="Off"/>
<DList Name="gDorfImpactDarkDL" Offset="0x1DC58" Static="Off"/>
<DList Name="gDorfImpactLightDL" Offset="0x1DD70" Static="Off"/>
<DList Name="gDorfShockGlowDL" Offset="0x1EEC8" Static="Off"/>
<DList Name="gDorfLightCoreDL" Offset="0x20228" Static="Off"/>
<DList Name="gDorfShockDL" Offset="0x202F0" Static="Off"/>
<DList Name="gDorfVortexDL" Offset="0x210D0" Static="Off"/>
<DList Name="gDorfShadowSetupDL" Offset="0xE408" Static="Off"/>
<DList Name="gDorfShadowModelDL" Offset="0xE428" Static="Off"/>
<DList Name="gDorfTriforceDL" Offset="0xF498" Static="Off"/>
<DList Name="gDorfWindowShardMaterialDL" Offset="0xF988" Static="Off"/>
<DList Name="gDorfWindowShardModelDL" Offset="0xFA30" Static="Off"/>
<DList Name="gDorfLightBallMaterialDL" Offset="0x11288" Static="Off"/>
<DList Name="gDorfSquareDL" Offset="0x112F8" Static="Off"/>
<DList Name="gDorfLightningDL" Offset="0x1A350" Static="Off"/>
<DList Name="gDorfUnusedDL" Offset="0x1A400" Static="Off"/>
<DList Name="gDorfLightRayTriDL" Offset="0x1A478" Static="Off"/>
<DList Name="gDorfLightFlecksDL" Offset="0x1BED0" Static="Off"/>
<DList Name="gDorfBigMagicBGCircleDL" Offset="0x1BFC0" Static="Off"/>
<DList Name="gDorfDotDL" Offset="0x1C068" Static="Off"/>
<DList Name="gDorfShockwaveDL" Offset="0x1CAD0" Static="Off"/>
<DList Name="gDorfImpactDarkDL" Offset="0x1D968" Static="Off"/>
<DList Name="gDorfImpactLightDL" Offset="0x1DA80" Static="Off"/>
<DList Name="gDorfShockGlowDL" Offset="0x1EBD8" Static="Off"/>
<DList Name="gDorfLightCoreDL" Offset="0x1FF38" Static="Off"/>
<DList Name="gDorfShockDL" Offset="0x20000" Static="Off"/>
<DList Name="gDorfVortexDL" Offset="0x20DE0" Static="Off"/>
</File>
</Root>

78
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Ganon2.xml
View file

@ -1,76 +1,76 @@
<Root>
<File Name="ovl_Boss_Ganon2" BaseAddress="0x808FCF40" RangeStart="0xA2C8" RangeEnd="0x10778">
<Texture Name="ovl_Boss_Ganon2_Tex_00A2C8" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x00A2C8"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00B2C8" Count="4" Offset="0x00B2C8">
<File Name="ovl_Boss_Ganon2" BaseAddress="0x808F1DB0" RangeStart="0x9F88" RangeEnd="0x10778">
<Texture Name="ovl_Boss_Ganon2_Tex_00A2C8" OutName="tex_0000A2C8" Format="i8" Width="64" Height="64" Offset="0x009F88"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00B2C8" Count="4" Offset="0x00AF88">
<Vtx/>
</Array>
<DList Name="ovl_Boss_Ganon2_DL_00B308" Offset="0x00B308"/>
<DList Name="ovl_Boss_Ganon2_DL_00B378" Offset="0x00B378"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00B390" Count="4" Offset="0x00B390">
<DList Name="ovl_Boss_Ganon2_DL_00B308" Offset="0x00AFC8"/>
<DList Name="ovl_Boss_Ganon2_DL_00B378" Offset="0x00B038"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00B390" Count="4" Offset="0x00B050">
<Vtx/>
</Array>
<DList Name="ovl_Boss_Ganon2_DL_00B3D0" Offset="0x00B3D0"/>
<DList Name="ovl_Boss_Ganon2_DL_00B3F0" Offset="0x00B3F0"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00B420" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0x00B420"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00B820" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0x00B820"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00BA20" Count="22" Offset="0x00BA20">
<DList Name="ovl_Boss_Ganon2_DL_00B3D0" Offset="0x00B090"/>
<DList Name="ovl_Boss_Ganon2_DL_00B3F0" Offset="0x00B0B0"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00B420" OutName="tex_0000B420" Format="i8" Width="32" Height="32" Offset="0x00B0E0"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00B820" OutName="tex_0000B820" Format="i4" Width="32" Height="32" Offset="0x00B4E0"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00BA20" Count="22" Offset="0x00B6E0">
<Vtx/>
</Array>
<DList Name="ovl_Boss_Ganon2_DL_00BB80" Offset="0x00BB80"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00BC98" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0x00BC98"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00CC98" Count="4" Offset="0x00CC98">
<DList Name="ovl_Boss_Ganon2_DL_00BB80" Offset="0x00B840"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00BC98" OutName="tex_0000BC98" Format="i8" Width="64" Height="64" Offset="0x00B958"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00CC98" Count="4" Offset="0x00C958">
<Vtx/>
</Array>
<DList Name="ovl_Boss_Ganon2_DL_00CCD8" Offset="0x00CCD8"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00CD58" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0x00CD58"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00D758" Count="4" Offset="0x00D758">
<DList Name="ovl_Boss_Ganon2_DL_00CCD8" Offset="0x00CA98"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00CD58" OutName="tex_0000CD58" Format="i4" Width="32" Height="160" Offset="0x00CA18"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00D758" Count="4" Offset="0x00D418">
<Vtx/>
</Array>
<DList Name="ovl_Boss_Ganon2_DL_00D798" Offset="0x00D798"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00D820" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0x00D820"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00E020" Count="26" Offset="0x00E020">
<DList Name="ovl_Boss_Ganon2_DL_00D798" Offset="0x00D458"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00D820" OutName="tex_0000D820" Format="i8" Width="32" Height="64" Offset="0x00D4E0"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00E020" Count="26" Offset="0x00DCE0">
<Vtx/>
</Array>
<DList Name="ovl_Boss_Ganon2_DL_00E1C0" Offset="0x00E1C0"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00E2E0" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0x00E2E0"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00EAE0" Count="22" Offset="0x00EAE0">
<DList Name="ovl_Boss_Ganon2_DL_00E1C0" Offset="0x00DE80"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00E2E0" OutName="tex_0000E2E0" Format="i8" Width="32" Height="64" Offset="0x00DFA0"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00EAE0" Count="22" Offset="0x00E7A0">
<Vtx/>
</Array>
<DList Name="ovl_Boss_Ganon2_DL_00EC40" Offset="0x00EC40"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00ED48" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0x00ED48"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00F148" Count="4" Offset="0x00F148">
<DList Name="ovl_Boss_Ganon2_DL_00EC40" Offset="0x00E900"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00ED48" OutName="tex_0000ED48" Format="i8" Width="32" Height="32" Offset="0x00EA08"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00F148" Count="4" Offset="0x00EE08">
<Vtx/>
</Array>
<DList Name="ovl_Boss_Ganon2_DL_00F188" Offset="0x00F188"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00F208" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0x00F208"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00F408" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0x00F408"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00FC08" Count="3" Offset="0x00FC08">
<DList Name="ovl_Boss_Ganon2_DL_00F188" Offset="0x00EE48"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00F208" OutName="tex_0000F208" Format="rgba16" Width="16" Height="16" Offset="0x00EEC8"/>
<Texture Name="ovl_Boss_Ganon2_Tex_00F408" OutName="tex_0000F408" Format="rgba16" Width="32" Height="32" Offset="0x00F0C8"/>
<Array Name="ovl_Boss_Ganon2_Vtx_00FC08" Count="3" Offset="0x00F8C8">
<Vtx/>
</Array>
<Array Name="ovl_Boss_Ganon2_Vtx_00FC38" Count="32" Offset="0x00FC38">
<Array Name="ovl_Boss_Ganon2_Vtx_00FC38" Count="32" Offset="0x00F8F8">
<Vtx/>
</Array>
<Array Name="ovl_Boss_Ganon2_Vtx_00FE38" Count="15" Offset="0x00FE38">
<Array Name="ovl_Boss_Ganon2_Vtx_00FE38" Count="15" Offset="0x00FAF8">
<Vtx/>
</Array>
<Array Name="ovl_Boss_Ganon2_Vtx_00FF28" Count="11" Offset="0x00FF28">
<Array Name="ovl_Boss_Ganon2_Vtx_00FF28" Count="11" Offset="0x00FBE8">
<Vtx/>
</Array>
<Array Name="ovl_Boss_Ganon2_Vtx_00FFD8" Count="6" Offset="0x00FFD8">
<Array Name="ovl_Boss_Ganon2_Vtx_00FFD8" Count="6" Offset="0x00FC98">
<Vtx/>
</Array>
<Array Name="ovl_Boss_Ganon2_Vtx_010038" Count="12" Offset="0x010038">
<Array Name="ovl_Boss_Ganon2_Vtx_010038" Count="12" Offset="0xFCF8">
<Vtx/>
</Array>
<Array Name="ovl_Boss_Ganon2_Vtx_0100F8" Count="10" Offset="0x0100F8">
<Array Name="ovl_Boss_Ganon2_Vtx_0100F8" Count="10" Offset="0xFDB8">
<Vtx/>
</Array>
<Array Name="ovl_Boss_Ganon2_Vtx_010198" Count="16" Offset="0x010198">
<Array Name="ovl_Boss_Ganon2_Vtx_010198" Count="16" Offset="0xFE58">
<Vtx/>
</Array>
<Array Name="ovl_Boss_Ganon2_Vtx_010298" Count="17" Offset="0x010298">
<Array Name="ovl_Boss_Ganon2_Vtx_010298" Count="17" Offset="0xFF58">
<Vtx/>
</Array>
<DList Name="ovl_Boss_Ganon2_DL_0103A8" Offset="0x0103A8"/>
<DList Name="ovl_Boss_Ganon2_DL_0103A8" Offset="0x010168"/>
</File>
</Root>

10
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Boss_Sst.xml
View file

@ -1,8 +1,8 @@
<Root>
<File Name="ovl_Boss_Sst" BaseAddress="0x8092C5D0" RangeStart="0xA3C0" RangeEnd="0xAD70">
<DList Name="sBodyStaticDList" Offset="0xA3C0"/>
<DList Name="sHandTrailDList" Offset="0xA3D8"/>
<DList Name="sIntroVanishDList" Offset="0xA838"/>
<DList Name="sShadowDList" Offset="0xACF0"/>
<File Name="ovl_Boss_Sst" BaseAddress="0x8091FF30" RangeStart="0xA380" RangeEnd="0xAD70">
<DList Name="sBodyStaticDList" Offset="0xA380"/>
<DList Name="sHandTrailDList" Offset="0xA398"/>
<DList Name="sIntroVanishDList" Offset="0xA7F8"/>
<DList Name="sShadowDList" Offset="0xACB0"/>
</File>
</Root>

8
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Demo_Shd.xml
View file

@ -1,8 +1,8 @@
<Root>
<File Name="ovl_Demo_Shd" BaseAddress="0x80991230" RangeStart="0x450" RangeEnd="0x23D0">
<File Name="ovl_Demo_Shd" BaseAddress="0x80980DA0" RangeStart="0x410" RangeEnd="0x23D0">
<DList Name="D_809932D0" Offset="0x20A0"/>
<DList Name="D_80993390" Offset="0x2160"/>
<DList Name="D_809934B8" Offset="0x2288"/>
<DList Name="D_809932D0" Offset="0x2060"/>
<DList Name="D_80993390" Offset="0x2120"/>
<DList Name="D_809934B8" Offset="0x2248"/>
</File>
</Root>

2
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Elf_Msg.xml
View file

@ -1,5 +1,5 @@
<Root>
<File Name="ovl_Elf_Msg" BaseAddress="0x809ACB20" RangeStart="0x758" RangeEnd="0x9D8">
<File Name="ovl_Elf_Msg" BaseAddress="0x8099AB00" RangeStart="0x758" RangeEnd="0x9D8">
<DList Name="D_809AD278" Offset="0x758"/>

2
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Elf_Msg2.xml
View file

@ -1,5 +1,5 @@
<Root>
<File Name="ovl_Elf_Msg2" BaseAddress="0x809AD700" RangeStart="0x538" RangeEnd="0x638">
<File Name="ovl_Elf_Msg2" BaseAddress="0x8099B0F0" RangeStart="0x538" RangeEnd="0x638">
<DList Name="D_809ADC38" Offset="0x538"/>

6
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_En_Bili.xml
View file

@ -1,7 +1,7 @@
<Root>
<File Name="ovl_En_Bili" BaseAddress="0x809BF8A0" RangeStart="0x1E50" RangeEnd="0x1E70">
<DList Name="D_809C16F0" Offset="0x1E50"/>
<DList Name="D_809C1700" Offset="0x1E60"/>
<File Name="ovl_En_Bili" BaseAddress="0x809AC710" RangeStart="0x1E40" RangeEnd="0x1E70">
<DList Name="D_809C16F0" Offset="0x1E40"/>
<DList Name="D_809C1700" Offset="0x1E50"/>
</File>
</Root>

22
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_En_Clear_Tag.xml
View file

@ -1,14 +1,14 @@
<Root>
<File Name="ovl_En_Clear_Tag" BaseAddress="0x809D35B0" RangeStart="0x26F0" RangeEnd="0x89F0">
<DList Name="gArwingDL" Offset="0x26F0"/>
<DList Name="gArwingLaserDL" Offset="0x6388"/>
<DList Name="gArwingBackfireDL" Offset="0x6688"/>
<DList Name="gArwingDebrisEffectMaterialDL" Offset="0x6A38"/>
<DList Name="gArwingDebrisEffectDL" Offset="0x6AB8"/>
<DList Name="gArwingFireEffectMaterialDL" Offset="0x7100"/>
<DList Name="gArwingFireEffectDL" Offset="0x71A8"/>
<DList Name="gArwingFlashEffectDL" Offset="0x8208"/>
<DList Name="gArwingFlashEffectGroundDL" Offset="0x84B8"/>
<DList Name="gArwingShadowDL" Offset="0x8970"/>
<File Name="ovl_En_Clear_Tag" BaseAddress="0x809BF430" RangeStart="0x2600" RangeEnd="0x89F0">
<DList Name="gArwingDL" Offset="0x2600"/>
<DList Name="gArwingLaserDL" Offset="0x6298"/>
<DList Name="gArwingBackfireDL" Offset="0x6598"/>
<DList Name="gArwingDebrisEffectMaterialDL" Offset="0x6948"/>
<DList Name="gArwingDebrisEffectDL" Offset="0x69C8"/>
<DList Name="gArwingFireEffectMaterialDL" Offset="0x7010"/>
<DList Name="gArwingFireEffectDL" Offset="0x70B8"/>
<DList Name="gArwingFlashEffectDL" Offset="0x8118"/>
<DList Name="gArwingFlashEffectGroundDL" Offset="0x83C8"/>
<DList Name="gArwingShadowDL" Offset="0x8880"/>
</File>
</Root>

30
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_En_Ganon_Organ.xml
View file

@ -1,19 +1,19 @@
<Root>
<File Name="ovl_En_Ganon_Organ" BaseAddress="0x80A28000" RangeStart="0x3E0" RangeEnd="0x6F70">
<Texture Name="sRoomCarpetTex" OutName="room_carpet" Format="rgba16" Width="64" Height="16" Offset="0x3E8"/>
<Texture Name="sRoomOrganPipeTex" OutName="room_organ_pipe" Format="i4" Width="16" Height="64" Offset="0xBE8"/>
<Texture Name="sRoomOrganCorbelsTex" OutName="room_organ_corbels" Format="i4" Width="16" Height="16" Offset="0xDE8"/>
<Texture Name="sRoomOrganGrillTex" OutName="room_organ_grill" Format="rgba16" Width="16" Height="16" Offset="0xE68"/>
<Texture Name="sRoomCrestFriezeTex" OutName="room_crest_frieze" Format="i4" Width="32" Height="32" Offset="0x1068"/>
<Texture Name="sRoomColumnFriezeAndCanopyTex" OutName="room_column_frieze_and_canopy" Format="i4" Width="16" Height="16" Offset="0x1268"/>
<Texture Name="sRoomColumnMetalEdgingTex" OutName="room_metal_edging" Format="rgba16" Width="16" Height="16" Offset="0x12E8"/>
<Texture Name="sRoomStatueWingTex" OutName="room_statue_wing" Format="rgba16" Width="16" Height="16" Offset="0x14E8"/>
<Texture Name="sRoomPillarTex" OutName="room_pillar" Format="i8" Width="8" Height="32" Offset="0x16E8"/>
<Texture Name="sRoomOrganKeyboardTex" OutName="room_organ_keyboard" Format="rgba16" Width="32" Height="8" Offset="0x17E8"/>
<Texture Name="sRoomOrganKeyEndTex" OutName="room_organ_key_end" Format="rgba16" Width="4" Height="8" Offset="0x19E8"/>
<Texture Name="sRoomStepTex" OutName="room_step" Format="i4" Width="16" Height="16" Offset="0x1A28"/>
<File Name="ovl_En_Ganon_Organ" BaseAddress="0x80A0FEF0" RangeStart="0x368" RangeEnd="0x6F70">
<Texture Name="sRoomCarpetTex" OutName="room_carpet" Format="rgba16" Width="64" Height="16" Offset="0x368"/>
<Texture Name="sRoomOrganPipeTex" OutName="room_organ_pipe" Format="i4" Width="16" Height="64" Offset="0xB68"/>
<Texture Name="sRoomOrganCorbelsTex" OutName="room_organ_corbels" Format="i4" Width="16" Height="16" Offset="0xD68"/>
<Texture Name="sRoomOrganGrillTex" OutName="room_organ_grill" Format="rgba16" Width="16" Height="16" Offset="0xDE8"/>
<Texture Name="sRoomCrestFriezeTex" OutName="room_crest_frieze" Format="i4" Width="32" Height="32" Offset="0xFE8"/>
<Texture Name="sRoomColumnFriezeAndCanopyTex" OutName="room_column_frieze_and_canopy" Format="i4" Width="16" Height="16" Offset="0x11E8"/>
<Texture Name="sRoomColumnMetalEdgingTex" OutName="room_metal_edging" Format="rgba16" Width="16" Height="16" Offset="0x1268"/>
<Texture Name="sRoomStatueWingTex" OutName="room_statue_wing" Format="rgba16" Width="16" Height="16" Offset="0x1468"/>
<Texture Name="sRoomPillarTex" OutName="room_pillar" Format="i8" Width="8" Height="32" Offset="0x1668"/>
<Texture Name="sRoomOrganKeyboardTex" OutName="room_organ_keyboard" Format="rgba16" Width="32" Height="8" Offset="0x1768"/>
<Texture Name="sRoomOrganKeyEndTex" OutName="room_organ_key_end" Format="rgba16" Width="4" Height="8" Offset="0x1968"/>
<Texture Name="sRoomStepTex" OutName="room_step" Format="i4" Width="16" Height="16" Offset="0x19A8"/>
<DList Name="sRoomOrganAndFloorDL" Offset="0x4CA8"/>
<DList Name="sRoomStatuesDL" Offset="0x6AB0"/>
<DList Name="sRoomOrganAndFloorDL" Offset="0x4C28"/>
<DList Name="sRoomStatuesDL" Offset="0x6A30"/>
</File>
</Root>

6
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_En_Holl.xml
View file

@ -1,8 +1,8 @@
<Root>
<File Name="ovl_En_Holl" BaseAddress="0x80A58C10" RangeStart="0xE78" RangeEnd="0xEE0">
<Array Name="sPlaneVtx" Count="4" Offset="0xE78">
<File Name="ovl_En_Holl" BaseAddress="0x80A3E510" RangeStart="0xE68" RangeEnd="0xEE0">
<Array Name="sPlaneVtx" Count="4" Offset="0xE68">
<Vtx/>
</Array>
<DList Name="sPlaneDL" Offset="0xEB8"/>
<DList Name="sPlaneDL" Offset="0xEA8"/>
</File>
</Root>

22
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_En_Jsjutan.xml
View file

@ -1,38 +1,38 @@
<Root>
<File Name="ovl_En_Jsjutan" BaseAddress="0x80A897A0" RangeStart="0x12F8" RangeEnd="0x4C88">
<File Name="ovl_En_Jsjutan" BaseAddress="0x80A6E250" RangeStart="0x12C8" RangeEnd="0x4C88">
<!-- D_80A8AA98. Carpet texture. -->
<Texture Name="sCarpetTex" OutName="carpet" Format="rgba16" Width="32" Height="64" Offset="0x12F8"/>
<Texture Name="sCarpetTex" OutName="carpet" Format="rgba16" Width="32" Height="64" Offset="0x12C8"/>
<!-- D_80A8BA98. Carpet's shadow vertices. Same vertex type as sShadowEvenVtx. Used when gameplayFrames is odd. -->
<Array Name="gShadowOddVtx" Count="144" Offset="0x22F8">
<Array Name="gShadowOddVtx" Count="144" Offset="0x22C8">
<Vtx/>
</Array>
<!-- D_80A8C398. Carpet's shadow vertices. Same vertex type as gShadowOddVtx. Used when gameplayFrames is even. -->
<Array Name="sShadowEvenVtx" Count="144" Offset="0x2BF8">
<Array Name="sShadowEvenVtx" Count="144" Offset="0x2BC8">
<Vtx/>
</Array>
<!-- D_80A8CC98. Carpet vertices. Same vertex type as sCarpetEvenVtx. Used when gameplayFrames is odd. -->
<Array Name="sCarpetOddVtx" Count="144" Offset="0x34F8">
<Array Name="sCarpetOddVtx" Count="144" Offset="0x34C8">
<Vtx/>
</Array>
<!-- D_80A8E610. Variable declared in `.bss` of EnJsjutan. Used by sShadowMaterialDL -->
<Symbol Name="sShadowTex" Type="u8" TypeSize="1" Count="0x800" Offset="0x4E70"/>
<Symbol Name="sShadowTex" Type="u8" TypeSize="1" Count="0x800" Offset="0x4E40"/>
<!-- D_80A8D598. Draws the carpet's texture. -->
<DList Name="sCarpetMaterialDL" Offset="0x3DF8"/>
<DList Name="sCarpetMaterialDL" Offset="0x3DC8"/>
<!-- D_80A8D618. Draws the carpet's shadow texture. -->
<DList Name="sShadowMaterialDL" Offset="0x3E78"/>
<DList Name="sShadowMaterialDL" Offset="0x3E48"/>
<!-- D_80A8D688. Draws vertexs in segment 0x0C. -->
<DList Name="sModelDL" Offset="0x3EE8"/>
<DList Name="sModelDL" Offset="0x3EB8"/>
<!-- D_80A8DAB8. Carpet vertices. Same vertex type as sCarpetOddVtx. Used when gameplayFrames is even. -->
<Array Name="sCarpetEvenVtx" Count="144" Offset="0x4318">
<Array Name="sCarpetEvenVtx" Count="144" Offset="0x42E8">
<Vtx/>
</Array>
<!-- D_80A8E400 -->
<Collision Name="sCol" Offset="0x4C60"/>
<Collision Name="sCol" Offset="0x4C30"/>
</File>
</Root>

6
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_En_Kanban.xml
View file

@ -1,8 +1,8 @@
<Root>
<File Name="ovl_En_Kanban" BaseAddress="0x80A91FA0" RangeStart="0x2F80" RangeEnd="0x3040">
<Array Name="sShadowVtx" Count="4" Offset="0x2F80">
<File Name="ovl_En_Kanban" BaseAddress="0x80A760C0" RangeStart="0x2E70" RangeEnd="0x3040">
<Array Name="sShadowVtx" Count="4" Offset="0x2E70">
<Vtx/>
</Array>
<DList Name="sShadowDL" Offset="0x2FC0"/>
<DList Name="sShadowDL" Offset="0x2EB0"/>
</File>
</Root>

8
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_En_Sda.xml
View file

@ -1,9 +1,9 @@
<Root>
<File Name="ovl_En_Sda" BaseAddress="0x80AF8E20" RangeStart="0x1578" RangeEnd="0x1608">
<Array Name="D_80AFA398" Count="4" Offset="0x1578">
<File Name="ovl_En_Sda" BaseAddress="0x80AD86D0" RangeStart="0x1498" RangeEnd="0x1608">
<Array Name="D_80AFA398" Count="4" Offset="0x1498">
<Vtx/>
</Array>
<DList Name="D_80AFA3D8" Offset="0x15B8"/>
<DList Name="D_80AFA3F8" Offset="0x15D8"/>
<DList Name="D_80AFA3D8" Offset="0x14D8"/>
<DList Name="D_80AFA3F8" Offset="0x14F8"/>
</File>
</Root>

2
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_En_Ssh.xml
View file

@ -1,5 +1,5 @@
<Root>
<File Name="ovl_En_Ssh" BaseAddress="0x80B02270" RangeStart="0x2150" RangeEnd="0x21E0">
<File Name="ovl_En_Ssh" BaseAddress="0x80AE14D0" RangeStart="0x2150" RangeEnd="0x21E0">
<Array Name="D_80B043C0" Count="4" Offset="0x2150">
<Vtx/>
</Array>

6
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_En_St.xml
View file

@ -1,8 +1,8 @@
<Root>
<File Name="ovl_En_St" BaseAddress="0x80B04890" RangeStart="0x26B0" RangeEnd="0x2740">
<Array Name="sSkulltulaUnusedVtx" Count="4" Offset="0x26B0">
<File Name="ovl_En_St" BaseAddress="0x80AE3AC0" RangeStart="0x26A0" RangeEnd="0x2740">
<Array Name="sSkulltulaUnusedVtx" Count="4" Offset="0x26A0">
<Vtx/>
</Array>
<DList Name="sSkulltulaUnusedDL" Offset="0x26F0"/>
<DList Name="sSkulltulaUnusedDL" Offset="0x26E0"/>
</File>
</Root>

24
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_En_Sth.xml
View file

@ -1,15 +1,15 @@
<Root>
<File Name="ovl_En_Sth" BaseAddress="0x80B07540" RangeStart="0xEF0" RangeEnd="0x3EC4">
<Texture Name="sNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0xEF0"/>
<Texture Name="sHair1Tex" OutName="hair_1" Format="rgba16" Width="8" Height="16" Offset="0xF70"/>
<Texture Name="sEar1Tex" OutName="ear_1" Format="rgba16" Width="8" Height="8" Offset="0x1070"/>
<Texture Name="sEyeTex" OutName="eye" Format="rgba16" Width="32" Height="32" Offset="0x10F0"/>
<Texture Name="sMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x18F0"/>
<Texture Name="sEar2Tex" OutName="ear_2" Format="rgba16" Width="8" Height="8" Offset="0x1CF0"/>
<Texture Name="sHair2Tex" OutName="hair_2" Format="rgba16" Width="8" Height="16" Offset="0x1D70"/>
<DList Name="D_80B0A050" Offset="0x2B10"/>
<DList Name="D_80B0A3C0" Offset="0x2E80"/>
<Animation Name="sChildDanceAnim" Offset="0x3620"/>
<Animation Name="sParentDanceAnim" Offset="0x3EB4"/>
<File Name="ovl_En_Sth" BaseAddress="0x80AE6730" RangeStart="0xE70" RangeEnd="0x3EC4">
<Texture Name="sNoseTex" OutName="nose" Format="rgba16" Width="8" Height="8" Offset="0xE70"/>
<Texture Name="sHair1Tex" OutName="hair_1" Format="rgba16" Width="8" Height="16" Offset="0xEF0"/>
<Texture Name="sEar1Tex" OutName="ear_1" Format="rgba16" Width="8" Height="8" Offset="0xFF0"/>
<Texture Name="sEyeTex" OutName="eye" Format="rgba16" Width="32" Height="32" Offset="0x1070"/>
<Texture Name="sMouthTex" OutName="mouth" Format="rgba16" Width="32" Height="16" Offset="0x1870"/>
<Texture Name="sEar2Tex" OutName="ear_2" Format="rgba16" Width="8" Height="8" Offset="0x1C70"/>
<Texture Name="sHair2Tex" OutName="hair_2" Format="rgba16" Width="8" Height="16" Offset="0x1CF0"/>
<DList Name="D_80B0A050" Offset="0x2A90"/>
<DList Name="D_80B0A3C0" Offset="0x2E00"/>
<Animation Name="sChildDanceAnim" Offset="0x35A0"/>
<Animation Name="sParentDanceAnim" Offset="0x3E34"/>
</File>
</Root>

20
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_End_Title.xml
View file

@ -1,17 +1,17 @@
<Root>
<File Name="ovl_End_Title" BaseAddress="0x80B65720" RangeStart="0x780" RangeEnd="0x4128">
<Texture Name="sTheLegendOfZeldaTex" OutName="the_legend_of_zelda" Format="ia8" Width="120" Height="24" Offset="0x780"/>
<Texture Name="sOcarinaOfTimeTex" OutName="ocarina_of_time" Format="ia8" Width="112" Height="16" Offset="0x12C0"/>
<Texture Name="sTheEndTex" OutName="the_end" Format="ia8" Width="80" Height="24" Offset="0x19C0"/>
<Texture Name="sNintendoLeftTex" OutName="nintendo_left" Format="ia8" Width="64" Height="48" Offset="0x2140"/>
<Texture Name="sNintendoRightTex" OutName="nintendo_right" Format="ia8" Width="64" Height="48" Offset="0x2D40"/>
<Texture Name="sPresentedByTex" OutName="presented_by" Format="ia8" Width="96" Height="16" Offset="0x3940"/>
<File Name="ovl_End_Title" BaseAddress="0x80B3F920" RangeStart="0x6E0" RangeEnd="0x4128">
<Texture Name="sTheLegendOfZeldaTex" OutName="the_legend_of_zelda" Format="ia8" Width="120" Height="24" Offset="0x6E0"/>
<Texture Name="sOcarinaOfTimeTex" OutName="ocarina_of_time" Format="ia8" Width="112" Height="16" Offset="0x1220"/>
<Texture Name="sTheEndTex" OutName="the_end" Format="ia8" Width="80" Height="24" Offset="0x1920"/>
<Texture Name="sNintendoLeftTex" OutName="nintendo_left" Format="ia8" Width="64" Height="48" Offset="0x20A0"/>
<Texture Name="sNintendoRightTex" OutName="nintendo_right" Format="ia8" Width="64" Height="48" Offset="0x2CA0"/>
<Texture Name="sPresentedByTex" OutName="presented_by" Format="ia8" Width="96" Height="16" Offset="0x38A0"/>
<Array Name="sTriforceVtx" Count="6" Offset="0x3F40">
<Array Name="sTriforceVtx" Count="6" Offset="0x3EA0">
<Vtx/>
</Array>
<DList Name="sTriforceDL" Offset="0x3FA0"/>
<DList Name="sTriforceDL" Offset="0x3F00"/>
<DList Name="sPresentedByNintendoDL" Offset="0x4000"/>
<DList Name="sPresentedByNintendoDL" Offset="0x3F60"/>
</File>
</Root>

18
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_File_Choose.xml
View file

@ -1,27 +1,27 @@
<Root>
<File Name="ovl_file_choose" BaseAddress="0x80803D40" RangeStart="0xDE70" RangeEnd="0xE6B0">
<Array Name="D_80811BB0" Count="24" Offset="0xDE70" Static="Off">
<File Name="ovl_file_choose" BaseAddress="0x80803630" RangeStart="0xD740" RangeEnd="0xE6B0">
<Array Name="D_80811BB0" Count="24" Offset="0xD740" Static="Off">
<Vtx/>
</Array>
<Array Name="D_80811D30" Count="16" Offset="0xDFF0" Static="Off">
<Array Name="D_80811D30" Count="16" Offset="0xD8C0" Static="Off">
<Vtx/>
</Array>
<Array Name="D_80811E30" Count="16" Offset="0xE0F0" Static="Off">
<Array Name="D_80811E30" Count="16" Offset="0xD9C0" Static="Off">
<Vtx/>
</Array>
<Array Name="D_80811F30" Count="32" Offset="0xE1F0" Static="Off">
<Array Name="D_80811F30" Count="32" Offset="0xDAC0" Static="Off">
<Vtx/>
</Array>
<Array Name="D_80812130" Count="32" Offset="0xE3F0" Static="Off">
<Array Name="D_80812130" Count="32" Offset="0xDCC0" Static="Off">
<Vtx/>
</Array>
<Array Name="gOptionsDividerTopVtx" Count="4" Offset="0xE5F0" Static="Off">
<Array Name="gOptionsDividerTopVtx" Count="4" Offset="0xDEC0" Static="Off">
<Vtx/>
</Array>
<Array Name="gOptionsDividerMiddleVtx" Count="4" Offset="0xE630" Static="Off">
<Array Name="gOptionsDividerMiddleVtx" Count="4" Offset="0xDF00" Static="Off">
<Vtx/>
</Array>
<Array Name="gOptionsDividerBottomVtx" Count="4" Offset="0xE670" Static="Off">
<Array Name="gOptionsDividerBottomVtx" Count="4" Offset="0xDF40" Static="Off">
<Vtx/>
</Array>
</File>

10
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Magic_Dark.xml
View file

@ -1,12 +1,12 @@
<Root>
<File Name="ovl_Magic_Dark" BaseAddress="0x80B873D0" RangeStart="0xD10" RangeEnd="0x1740">
<Texture Name="sDiamondTex" OutName="diamond_texture" Format="i8" Width="32" Height="64" Offset="0xD10"/>
<File Name="ovl_Magic_Dark" BaseAddress="0x80B605D0" RangeStart="0xC90" RangeEnd="0x1740">
<Texture Name="sDiamondTex" OutName="diamond_texture" Format="i8" Width="32" Height="64" Offset="0xC90"/>
<Array Name="sDiamondVtx" Count="20" Offset="0x1510">
<Array Name="sDiamondVtx" Count="20" Offset="0x1490">
<Vtx/>
</Array>
<DList Name="sDiamondMaterialDL" Offset="0x1650"/>
<DList Name="sDiamondModelDL" Offset="0x1700"/>
<DList Name="sDiamondMaterialDL" Offset="0x15D0"/>
<DList Name="sDiamondModelDL" Offset="0x1680"/>
</File>
</Root>

2
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Magic_Wind.xml
View file

@ -1,5 +1,5 @@
<Root>
<File Name="ovl_Magic_Wind" BaseAddress="0x80B64134" RangeStart="0x580" RangeEnd="0x1C98">
<File Name="ovl_Magic_Wind" BaseAddress="0x80B64120" RangeStart="0x580" RangeEnd="0x1C98">
<Skeleton Name="sSkel" Type="Curve" LimbType="Curve" Offset="0x1BB0"/>
<CurveAnimation Name="sAnim" SkelOffset="0x1BB0" Offset="0x1B70"/>
<Limb Name="sRootLimb" LimbType="Curve" Offset="0x1B80"/>

12
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Oceff_Storm.xml
View file

@ -1,11 +1,11 @@
<Root>
<File Name="ovl_Oceff_Storm" BaseAddress="0x80BA70E0" RangeStart="0x7B0" RangeEnd="0x1B40">
<Texture Name="sTex" OutName="song_of_storms_effect" Format="i8" Width="64" Height="64" Offset="0x7B0"/>
<DList Name="sMaterialDL" Offset="0x17B0"/>
<Array Name="sCylinderVtx" Count="27" Offset="0x1858">
<File Name="ovl_Oceff_Storm" BaseAddress="0x80B7DCF0" RangeStart="0x750" RangeEnd="0x1B40">
<Texture Name="sTex" OutName="song_of_storms_effect" Format="i8" Width="64" Height="64" Offset="0x750"/>
<DList Name="sMaterialDL" Offset="0x1750"/>
<Array Name="sCylinderVtx" Count="27" Offset="0x17F8">
<Vtx/>
</Array>
<DList Name="sCylinderMaterialDL" Offset="0x1A08"/>
<DList Name="sCylinderModelDL" Offset="0x1AB0"/>
<DList Name="sCylinderMaterialDL" Offset="0x19A8"/>
<DList Name="sCylinderModelDL" Offset="0x1A50"/>
</File>
</Root>

10
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Oceff_Wipe.xml
View file

@ -1,10 +1,10 @@
<Root>
<File Name="ovl_Oceff_Wipe" BaseAddress="0x80BA8D90" RangeStart="0x550" RangeEnd="0xD10">
<Texture Name="sTex" OutName="oceff" Format="i8" Width="32" Height="32" Offset="0x550"/>
<Array Name="sFrustumVtx" Count="40" Offset="0x950">
<File Name="ovl_Oceff_Wipe" BaseAddress="0x80B7F8A0" RangeStart="0x520" RangeEnd="0xD10">
<Texture Name="sTex" OutName="oceff" Format="i8" Width="32" Height="32" Offset="0x520"/>
<Array Name="sFrustumVtx" Count="40" Offset="0x920">
<Vtx/>
</Array>
<DList Name="sMaterialDL" Offset="0xBD0"/>
<DList Name="sFrustumDL" Offset="0xC58"/>
<DList Name="sMaterialDL" Offset="0xBA0"/>
<DList Name="sFrustumDL" Offset="0xC28"/>
</File>
</Root>

12
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Oceff_Wipe2.xml
View file

@ -1,11 +1,11 @@
<Root>
<File Name="ovl_Oceff_Wipe2" BaseAddress="0x80BA9BB0" RangeStart="0x480" RangeEnd="0x16E8">
<Texture Name="s1Tex" OutName="eponas_song_effect_1" Format="i4" Width="64" Height="64" Offset="0x480"/>
<Texture Name="s2Tex" OutName="eponas_song_effect_2" Format="i4" Width="64" Height="64" Offset="0xC80"/>
<Array Name="sFrustumVtx" Count="22" Offset="0x1480">
<File Name="ovl_Oceff_Wipe2" BaseAddress="0x80B80620" RangeStart="0x430" RangeEnd="0x16E8">
<Texture Name="s1Tex" OutName="eponas_song_effect_1" Format="i4" Width="64" Height="64" Offset="0x430"/>
<Texture Name="s2Tex" OutName="eponas_song_effect_2" Format="i4" Width="64" Height="64" Offset="0xC30"/>
<Array Name="sFrustumVtx" Count="22" Offset="0x1430">
<Vtx/>
</Array>
<DList Name="sMaterialDL" Offset="0x15E0"/>
<DList Name="sFrustumDL" Offset="0x1688"/>
<DList Name="sMaterialDL" Offset="0x1590"/>
<DList Name="sFrustumDL" Offset="0x1638"/>
</File>
</Root>

12
soh/assets/xml/GC_NMQ_PAL_F/overlays/ovl_Oceff_Wipe4.xml
View file

@ -1,11 +1,11 @@
<Root>
<File Name="ovl_Oceff_Wipe4" BaseAddress="0x80BACC10" RangeStart="0x460" RangeEnd="0xF48">
<Texture Name="sTex" OutName="scarecrow_song_effect" Format="i8" Width="32" Height="64" Offset="0x460"/>
<Array Name="sFrustumVtx" Count="22" Offset="0xC60">
<File Name="ovl_Oceff_Wipe4" BaseAddress="0x80B834E0" RangeStart="0x410" RangeEnd="0xF48">
<Texture Name="sTex" OutName="scarecrow_song_effect" Format="i8" Width="32" Height="64" Offset="0x410"/>
<Array Name="sFrustumVtx" Count="22" Offset="0xC10">
<Vtx/>
</Array>
<DList Name="sMaterialDL" Offset="0xDC0"/>
<DList Name="sUnusedMaterialDL" Offset="0xE28"/>
<DList Name="sMaterial2DL" Offset="0xE90"/>
<DList Name="sMaterialDL" Offset="0xD70"/>
<DList Name="sUnusedMaterialDL" Offset="0xDD8"/>
<DList Name="sMaterial2DL" Offset="0xE40"/>
</File>
</Root>

2
soh/build.c
View file

@ -1,4 +1,4 @@
const char gBuildVersion[] = "DECKARD";
const char gBuildVersion[] = "DECKARD ALFA (1.0.0)";
const char gBuildTeam[] = "github.com/harbourmasters";
#ifdef __TIMESTAMP__
const char gBuildDate[] = __TIMESTAMP__;

2
soh/soh.vcxproj
View file

@ -144,7 +144,7 @@
<SDLCheck>false</SDLCheck>
<PreprocessorDefinitions>INCLUDE_GAME_PRINTF;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;ENABLE_DX11;%(PreprocessorDefinitions)GLEW_STATIC </PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpp17</LanguageStandard>
<LanguageStandard>stdcpp20</LanguageStandard>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>

10
soh/soh/z_play_otr.cpp
View file

@ -31,6 +31,16 @@ extern "C" void OTRGameplay_SpawnScene(GlobalContext* globalCtx, s32 sceneNum, s
std::string scenePath = StringHelper::Sprintf("scenes\\%s\\%s", scene->sceneFile.fileName, scene->sceneFile.fileName);
globalCtx->sceneSegment = (Ship::Scene*)OTRGameplay_LoadFile(globalCtx, scenePath.c_str());
// Failed to load scene... default to doodongs cavern
if (globalCtx->sceneSegment == nullptr)
{
lusprintf(__FILE__, __LINE__, 2, "Unable to load scene %s... Defaulting to Doodong's Cavern!\n",
scenePath.c_str());
OTRGameplay_SpawnScene(globalCtx, 0x01, 0);
return;
}
scene->unk_13 = 0;
//ASSERT(globalCtx->sceneSegment != NULL, "this->sceneSegment != NULL", "../z_play.c", 4960);

20
soh/src/code/z_play.c
View file

@ -1495,26 +1495,6 @@ void Gameplay_InitScene(GlobalContext* globalCtx, s32 spawn)
void Gameplay_SpawnScene(GlobalContext* globalCtx, s32 sceneNum, s32 spawn) {
OTRGameplay_SpawnScene(globalCtx, sceneNum, spawn);
return;
SceneTableEntry* scene = &gSceneTable[sceneNum];
scene->unk_13 = 0;
globalCtx->loadedScene = scene;
globalCtx->sceneNum = sceneNum;
globalCtx->sceneConfig = scene->config;
osSyncPrintf("\nSCENE SIZE %fK\n", (scene->sceneFile.vromEnd - scene->sceneFile.vromStart) / 1024.0f);
globalCtx->sceneSegment = Gameplay_LoadFile(globalCtx, &scene->sceneFile);
scene->unk_13 = 0;
ASSERT(globalCtx->sceneSegment != NULL, "this->sceneSegment != NULL", "../z_play.c", 4960);
gSegments[2] = VIRTUAL_TO_PHYSICAL(globalCtx->sceneSegment);
Gameplay_InitScene(globalCtx, spawn);
osSyncPrintf("ROOM SIZE=%fK\n", func_80096FE8(globalCtx, &globalCtx->roomCtx) / 1024.0f);
}
void func_800C016C(GlobalContext* globalCtx, Vec3f* src, Vec3f* dest) {

7
soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
View file

@ -164,9 +164,13 @@ void ElfMsg_Update(Actor* thisx, GlobalContext* globalCtx) {
}
}
#ifdef ZELDA_DEBUG
#include "overlays/ovl_Elf_Msg/ovl_Elf_Msg.h"
#endif
void ElfMsg_Draw(Actor* thisx, GlobalContext* globalCtx) {
void ElfMsg_Draw(Actor* thisx, GlobalContext* globalCtx)
{
#ifdef ZELDA_DEBUG
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg.c", 436);
if (R_NAVI_MSG_REGION_ALPHA == 0) {
@ -191,4 +195,5 @@ void ElfMsg_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg.c", 457);
#endif
}

4
soh/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c
View file

@ -148,9 +148,12 @@ void ElfMsg2_Update(Actor* thisx, GlobalContext* globalCtx) {
}
}
#if ZELDA_DEBUG
#include "overlays/ovl_Elf_Msg2/ovl_Elf_Msg2.h"
#endif
void ElfMsg2_Draw(Actor* thisx, GlobalContext* globalCtx) {
#if ZELDA_DEBUG
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg2.c", 355);
if (R_NAVI_MSG_REGION_ALPHA == 0) {
@ -165,4 +168,5 @@ void ElfMsg2_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, sCubeDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg2.c", 367);
#endif
}