Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
158 commits
Select commit Hold shift + click to select a range
fd96bf6
Fix Disable Bomb Billboarding (#5290)
inspectredc Apr 3, 2025
4f783d5
fix oversight causing big poes check not to run (#5303)
Pepper0ni Apr 3, 2025
9a78b04
ESC now toggles menubar (#5293)
PBillodeau Apr 4, 2025
8b8403f
Implemented Leveled in to Blair Alfa. Changed to new UI for configura…
Arrenton Apr 4, 2025
e2bb2ed
Fix the start with Master Sword option (#5304)
leggettc18 Apr 4, 2025
38574bb
Fix excluded locations on subsequent seed generations (#5302)
leggettc18 Apr 4, 2025
cb7d927
Fix the GS Map combobox in the Flags tab of the save editor not remem…
Malkierian Apr 4, 2025
2589448
Fix boss title card extraction for NTSC; Fix Morpha water (#5320)
Archez Apr 4, 2025
ee23d02
move AltAssets to gSettings from gEnhancements (#5323)
leggettc18 Apr 4, 2025
a247c06
Various menu fixes (#5321)
A-Green-Spoon Apr 4, 2025
64cc4fe
Some various fixes. Flare dancer core now takes a minimum of 9 hits t…
Arrenton Apr 7, 2025
497f90a
Set Savewarp in Ganondorf to Ganon's Tower in Entrance Rando (#5339)
A-Green-Spoon Apr 7, 2025
c351a2c
Fix shop translations and unify untranslated message alerts. (#5312)
Pepper0ni Apr 7, 2025
98146c2
fix blank names in spoiler (#5329)
briaguya0 Apr 7, 2025
4acbf79
French Rando : Add missing text + some tweaks (#5327)
PurpleHato Apr 7, 2025
b71a0c5
Fix checking gSaveContext for used small keys (#5346)
leggettc18 Apr 7, 2025
d99aaf9
Some Ganon health check fixes.
Arrenton Apr 8, 2025
71bd48c
Move the white iron knuckle entry in `randomizedEnemySpawnTable` to m…
Malkierian Apr 8, 2025
ae7654c
Change check total array types to s16 to handle more check totals (th…
Malkierian Apr 8, 2025
88154d7
Fix Market Grass and Crate logic (#5340)
Pepper0ni Apr 8, 2025
d40fa00
Mixed pools now properly disables itself when hidden. (#5341)
Pepper0ni Apr 8, 2025
4a3d60d
Fix Rando Give for Adult Fishing as Child Glitch (#5349)
A-Green-Spoon Apr 8, 2025
8866974
Fix copyright tex for GC JP (#5324)
Archez Apr 8, 2025
1b17fea
Add temporary patch for invisible boulder fragments (#5352)
Archez Apr 8, 2025
f0f6259
Fix Docked Tracker Ghosting (#5354)
Malkierian Apr 8, 2025
f5e0179
Fix a couple typos in enhancement descriptions. (#5358)
Malkierian Apr 8, 2025
c188599
Additions for the German translation in two files (#5351)
Extloga Apr 8, 2025
f216129
Fix break room access and crates underneath crates logic (#5347)
Pepper0ni Apr 9, 2025
30520a7
Rando: Last missing french + tiny tweak (#5359)
PurpleHato Apr 9, 2025
2576f75
Fix non-loach fish making it into the pool when Loach Only is selecte…
leggettc18 Apr 9, 2025
9250af0
add check for agony option (#5365)
A-Green-Spoon Apr 9, 2025
cf75520
Fix crash in Message Viewer when playing with an NTSC OTR. (#5367)
leggettc18 Apr 9, 2025
93d49d5
Fix ZD beehives and some small cleanup. (#5353)
Pepper0ni Apr 9, 2025
c21c632
Additions for the currencies in randomizer.cpp (#5344)
Extloga Apr 9, 2025
c3322c8
Swap call to `RecalculateAvailableChecks()` in `SaveFile()` to a vari…
Malkierian Apr 9, 2025
e98a6c3
Fix migrators for tracker colors to match new menu formats. (#5369)
Malkierian Apr 9, 2025
73400f5
IC ledge to fountain child logic fixed (#5368)
Pepper0ni Apr 9, 2025
c12349a
Add check for bean inventory slot having bean on it to allow availabi…
Malkierian Apr 9, 2025
a99e883
Allow seeded enemy rando to use the values of the enemy list selectio…
Malkierian Apr 9, 2025
85bc67e
Blair Bravo version bump (#5372)
leggettc18 Apr 9, 2025
1791a0c
Fix input viewer's first-open position calculation. (#5376)
Malkierian Apr 10, 2025
9783f91
Add `ImGuiWindowFlags_NoSavedSettings` to notification windows to pre…
Malkierian Apr 10, 2025
a93917b
Fix Adult Fishing as Child Softlock (#5377)
A-Green-Spoon Apr 10, 2025
05e96f3
Fix Fishing-related checks location pool (again) (#5378)
leggettc18 Apr 11, 2025
86e1e8e
Fix boss key kaleido text for NTSC (#5389)
Archez Apr 11, 2025
698fca8
Fixed right stick aiming being significantly less precise than left s…
Proloe Apr 11, 2025
f0f2157
Move processing for RAND_INF_WEIRD_EGG to trade item processing so it…
Malkierian Apr 11, 2025
fc0cbbe
Improve tracker dock bgs (#5383)
Malkierian Apr 12, 2025
f304de2
fix oversight in forest trial first room (#5381)
Pepper0ni Apr 12, 2025
1416b24
Change the Reset All callback back to `CosmeticsEditor_ResetAll`, bec…
Malkierian Apr 12, 2025
46b40b0
Fix misspelling of Broken Giant's Knife fix CVar (#5395)
JordanLongstaff Apr 12, 2025
5e399fe
Race Lockout (#5364)
Malkierian Apr 13, 2025
5ae8ce4
Fix Entrance Rando weather override behavior (#5403)
Archez Apr 14, 2025
02ef333
Implements a rand inf for Ruto's letter to apply to logic to track it…
Malkierian Apr 15, 2025
1b6dc13
Blair Charlie version bump (#5407)
leggettc18 Apr 15, 2025
29af294
fix TODO_TRANSLATE language replacement in cases where the text is al…
Pepper0ni Apr 17, 2025
3c4f38e
make sure adult is spawned for big poe check (#5431)
Pepper0ni Apr 23, 2025
103a36e
fix MQGTG right side resetting (#5442)
Pepper0ni Apr 23, 2025
8a8ea67
Prevents hidden button combo setting from hiding the personal notes w…
Malkierian Apr 23, 2025
3d3d9c5
add some imgui ids in input editor (#5439)
briaguya0 Apr 23, 2025
fec676b
Fix C-Down Position with Anchor Left (#5423)
A-Green-Spoon Apr 23, 2025
17ed54d
add DC boss switch exception + tooltip (#5447)
A-Green-Spoon Apr 29, 2025
d304e13
Fix Ganon's Castle Max Level setting.
Arrenton Apr 30, 2025
a016453
Ganon's Tower barrier dispelled if cutscene is skipped (#5462)
JordanLongstaff May 2, 2025
6c14311
add dragon room CS (#5461)
A-Green-Spoon May 2, 2025
baa91cb
Format map GI text (#5417)
Pepper0ni May 2, 2025
bc3b17f
Add coloured text as current BGM indicator in Audio Editor (#5392)
JordanLongstaff May 2, 2025
19eb4f3
Skip trial barrier dispel cutscenes (#5464)
JordanLongstaff May 2, 2025
6cbb298
Skip Kakariko and Hyrule Castle gate cutscenes (#5314)
JordanLongstaff May 7, 2025
804a248
add option description to LACS reward options (#5472)
A-Green-Spoon May 7, 2025
f72085b
fix oversight in dragon room of MQ water (#5482)
Pepper0ni May 13, 2025
e8c2db8
remove all refernces to Doge (#5488)
Pepper0ni May 16, 2025
4fd0bf4
set c standard to 17 (#5492)
briaguya0 May 16, 2025
6acabae
Prevent another use of gSaveContext during Seed Generation (#5458)
leggettc18 May 17, 2025
9cb6530
Fix Enable Available Checks from title screen. (#5502)
xxAtrain223 May 18, 2025
66351fa
Remove freestanding key from Bottom of the Well Perimeter. (#5496)
xxAtrain223 May 18, 2025
b30fff5
Skip Forest Temple Basement Pillars Cutscene (#5473)
A-Green-Spoon May 18, 2025
e0d5fbe
Available Checks Prices (#5446)
xxAtrain223 May 18, 2025
8e34942
Toggle the vanilla flags instead of the rando flags when removing one…
Pepper0ni May 18, 2025
ecad59e
Add tooltip to Generate Seed button when disabled indicating the need…
Malkierian May 18, 2025
53566c9
fix incorrect `__VA_ARGS__` use in `lusprintf` version of `osSyncPrin…
briaguya0 May 18, 2025
f16e34e
fix and rename IsKeysanity to IsFireLoopLocked (#5515)
Pepper0ni May 18, 2025
f0e40fd
fix incorrect token count in messages when tokensanity is off (#5503)
briaguya0 May 18, 2025
4334a13
fix the wrong codepath being used in CanBuy when generating seeds (#5…
Pepper0ni May 18, 2025
081f828
fix link voice missing when hanging off ledges (#5506)
briaguya0 May 19, 2025
5bf3761
Fix Boss and Tower entryways skipping requirements in decoupled (#5484)
Pepper0ni May 21, 2025
01ce1ee
Fix oversight in lab boots trick, you need to be able to swim back up…
Pepper0ni May 21, 2025
2511275
Fix getting heart containers on pocket and skipped impas song (#5518)
Pepper0ni May 21, 2025
a9fc317
Fix crash when no valid enemies are selected (#5519)
Pepper0ni May 22, 2025
d69a456
Adds a check for "OneDrive" in the execution path to the startup erro…
Malkierian May 23, 2025
d330f22
Available Checks Entrance Shuffle (#5363)
xxAtrain223 May 24, 2025
de96f3c
Typo Fixes (#5533)
xxAtrain223 May 24, 2025
f0e36c2
Fix failure to assign areas to regions on initial spoiler load (#5540)
Pepper0ni May 27, 2025
fc10e36
Fix minor mistakes in region table (#5545)
Lorithan May 27, 2025
40da999
Fix some dark link issues (#5532)
Pepe20129 May 29, 2025
ad850e5
prevent OOB write for BGM fix in grotto mixed pools (#5572)
A-Green-Spoon Jun 11, 2025
0b9fe2d
Fix Search Crash from Scrolling (#5571)
Malkierian Jun 11, 2025
69792e9
Save and Randomizer Version Control (#5557)
Malkierian Jun 11, 2025
c7e3e08
Fix club moblins moving out of bounds and remove them from the no-cle…
Pepper0ni Jun 12, 2025
ab9af74
Finish hint translations for fish by waterfall (#5466)
JordanLongstaff Jun 14, 2025
eefe772
CanUse instead of HasItem for Hover Boots to reach jabu switch ledge …
Pepper0ni Jun 14, 2025
b600836
New options that affect feeding Jabu-Jabu (#5397)
JordanLongstaff Jun 15, 2025
35361c9
Create macro to make All and None buttons for cutscene skips trigger …
Malkierian Jun 15, 2025
620d080
RecalculateAvailableChecks Fix - IsSaveLoaded Guard (#5587)
xxAtrain223 Jun 15, 2025
f2bc7cd
Fix rare crash in randomiser generation (#5585)
Pepper0ni Jun 15, 2025
aa7693a
fix various oversights with altar hint off (#5589)
Pepper0ni Jun 16, 2025
19e9f39
Hardcode spirit hands to be dungeon checks (#5590)
Pepper0ni Jun 16, 2025
b932b8f
Clarify hint text for pots in interiors (#5591)
Pepper0ni Jun 18, 2025
2daf343
Change excluded checks to have junk instead of non-advancment. (#5592)
Pepper0ni Jun 19, 2025
a9a49cc
Adds saving and loading for location exclusion, and hooks the check t…
Malkierian Jun 19, 2025
b564148
Add wallet to mask logic, clean up mask logic (#5567)
Pepper0ni Jun 19, 2025
17613d1
Fix Available Checks On Load (#5599)
xxAtrain223 Jun 23, 2025
afde504
Updated SpoilerFileExists to cache the results. (#5606)
xxAtrain223 Jun 23, 2025
4676242
Fix dpad navigation on Quest Status pause screen. (#5607)
Malkierian Jun 23, 2025
3b82b8e
Ruto no longer targetable with sitting down skip (#5611)
JordanLongstaff Jun 25, 2025
8b616c8
first person to first-person (#5616)
A-Green-Spoon Jun 26, 2025
1161ce3
Expand tooltip for Free Look to explain camera locks and scene reload…
Malkierian Jun 28, 2025
a9b8574
Fix Boss Rush scene/cutscene setup after Bongo/Twinrova. (#5623)
Malkierian Jun 29, 2025
32683e2
Change early return in CheckTrackerLoadGame to check specifically for…
Malkierian Jun 30, 2025
dfa1038
Split Skip Pickup Messages (#5648)
OtherBlue Jul 3, 2025
a93b484
Add Clear Devices button that will erase the controllers block. (#5683)
Malkierian Jul 21, 2025
681e8dd
Ivan: collect deku seeds (#5654)
ShishuTheDragon Jul 21, 2025
37fb25d
Fix logic for items given at run start due to settings (#5665)
Pepper0ni Jul 21, 2025
47c5a7f
Bump version to Blair Delta 9.0.3, and fix a typo. (#5687)
Malkierian Jul 21, 2025
5066fbf
Fix old file deletion. (#5688)
Malkierian Jul 22, 2025
35ad685
Prevent empty randomizer blocks from triggering the rando version flo…
Malkierian Jul 22, 2025
c588d48
Bump version to Blair Echo. (#5690)
Malkierian Jul 22, 2025
d51e88b
Rando Versioning (Again) (#5691)
Malkierian Jul 24, 2025
d06cf6b
`timesplitdata.json` obey app directory (#5693)
Alto1772 Jul 24, 2025
ccf3d4b
Add playing icon to improve Audio Editor indicator (#5686)
JordanLongstaff Jul 24, 2025
7d7072f
Bump version to 9.0.5 (#5694)
Malkierian Jul 24, 2025
be77a9b
Fix Dpad Navigation and Dpad equips on Inventory (#5708)
Malkierian Jul 30, 2025
b87f143
properly clear location subcatagories when generating a seed (#5707)
Pepper0ni Aug 6, 2025
89c1c97
Add missing CVar check for tab key processing for alt asset toggle. (…
Malkierian Aug 9, 2025
353ad94
Removed SHUTTER_BACK_LOCKED and SHUTTER_BOSS from GetDungeonSmallKeyD…
xxAtrain223 Aug 13, 2025
e104870
remove !IS_RANDO check (#5728)
A-Green-Spoon Aug 13, 2025
568639d
skip ItemGet for small keys after skeleton key (#5730)
A-Green-Spoon Aug 13, 2025
4e50d78
Update gameplaystats.cpp
Arrenton Aug 15, 2025
9ff9beb
Fix faulty Nocturne trigger when receiving Fire Medallion (#5761)
JordanLongstaff Aug 25, 2025
b6166f4
Restore previous state of `z_door_warp1.c`, and reimplement boss rush…
Malkierian Aug 25, 2025
224efe2
Fix TOT_MASTER_SWORD when the master sword is stated with but not shu…
Pepper0ni Aug 25, 2025
820d097
Fix King Dodongo door switch cutscene (#5729)
A-Green-Spoon Aug 25, 2025
21e37d9
Fix the Show Horizontal Resolution Field option v2 (#5744)
balloondude2 Aug 25, 2025
7b38093
[TWEAK] Localization support for the Notification System (#5751)
PurpleHato Aug 26, 2025
cbd376a
Search Tweaks (#5767)
Malkierian Aug 28, 2025
405fc7a
Fixes for the German translation in util.cpp (#5768)
Extloga Sep 9, 2025
837f497
Encapsulate `BeginTable` for item and check tracker settings windows.…
Malkierian Sep 9, 2025
27f2292
Fix gerudo card generation failures (#5774)
Pepper0ni Sep 9, 2025
ac93d7c
Add additional glitch-aiding cutscenes for MQ (#5769)
A-Green-Spoon Sep 9, 2025
1240eb3
Implemented Leveled in to Blair Alfa. Changed to new UI for configura…
Arrenton Apr 4, 2025
4139f23
Some various fixes. Flare dancer core now takes a minimum of 9 hits t…
Arrenton Apr 7, 2025
a5f4460
Some Ganon health check fixes.
Arrenton Apr 8, 2025
1982944
Fix Ganon's Castle Max Level setting.
Arrenton Apr 30, 2025
09f6c5e
Update gameplaystats.cpp
Arrenton Aug 15, 2025
ab28472
Rebase Blair
Arrenton Sep 19, 2025
e7a0ef2
Fixed Rando crash when generating in the file select. Added options t…
Arrenton Sep 19, 2025
197115d
Put damage numbers in a Vertex and Matrix. Makes them smooth animated…
Arrenton Oct 8, 2025
4f6f5f7
Moved where the mod version is shown
Arrenton Jan 17, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ cmake_minimum_required(VERSION 3.26.0 FATAL_ERROR)

set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "" FORCE)
set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
set(CMAKE_C_STANDARD 17 CACHE STRING "The C standard to use")

set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")

project(Ship VERSION 9.0.0 LANGUAGES C CXX)
project(Ship VERSION 9.0.5 LANGUAGES C CXX)
include(CMake/soh-cvars.cmake)
include(CMake/lus-cvars.cmake)

Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ Congratulations, you are now sailing with the Ship of Harkinian! Have fun!
### Other shortcuts
| Keys | Action |
| - | - |
| F1 | Toggle menubar |
| ESC | Toggle menu |
| F2 | Toggle capture mouse input |
| F5 | Save state |
| F6 | Change state |
| F7 | Load state |
Expand Down
1 change: 1 addition & 0 deletions soh/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "" FORCE)

project(soh LANGUAGES C CXX)
set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
set(CMAKE_C_STANDARD 17 CACHE STRING "The C standard to use")

if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
enable_language(OBJCXX)
Expand Down
6 changes: 6 additions & 0 deletions soh/assets/objects/object_mag/object_mag.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ static const ALIGN_ASSET(2) char gTitleCopyright19982002Tex[] = dgTitleCopyright
#define dgTitleCopyright19982003Tex "__OTR__objects/object_mag/gTitleCopyright19982003Tex"
static const ALIGN_ASSET(2) char gTitleCopyright19982003Tex[] = dgTitleCopyright19982003Tex;

#define dgTitleCopyright19982004EngTex "__OTR__objects/object_mag/gTitleCopyright19982004EngTex"
static const ALIGN_ASSET(2) char gTitleCopyright19982004EngTex[] = dgTitleCopyright19982004EngTex;

#define dgTitleCopyright19982004JpnTex "__OTR__objects/object_mag/gTitleCopyright19982004JpnTex"
static const ALIGN_ASSET(2) char gTitleCopyright19982004JpnTex[] = dgTitleCopyright19982004JpnTex;

#define dgTitleMasterQuestSubtitleTex "__OTR__objects/object_mag/gTitleMasterQuestSubtitleTex"
static const ALIGN_ASSET(2) char gTitleMasterQuestSubtitleTex[] = dgTitleMasterQuestSubtitleTex;

Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_J/objects/object_bv.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
<Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
<!-- Boss title card -->
<Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="120" Offset="0x1230"/>
<Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>

<Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
<Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_J/objects/object_fd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
<Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
<!-- Boss title card -->
<!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/> -->
<!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->

<!-- Skeletons -->
<Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_J/objects/object_fhg.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>

<!-- Boss title card -->
<Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="120" Offset="0x59A0"/>
<Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>

<!-- Energy attack DLists -->
<DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_J/objects/object_ganon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>

<!-- Ganondorf Title Card Texture -->
<!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="120" Offset="0xCF00"/> -->
<!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->

<!-- Ganondorf Animation -->
<Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_J/objects/object_goma.xml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
<Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>

<!-- Boss title card -->
<Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="120" Offset="0x19BA8"/>
<Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>

<!-- Door -->
<DList Name="gGohmaDoorDL" Offset="0x1D820"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_J/objects/object_kingdodongo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
<Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
<Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
<Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x17410"/>
<Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
<Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
<Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
<Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
Expand Down
4 changes: 2 additions & 2 deletions soh/assets/xml/GC_MQ_NTSC_J/objects/object_mag.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Root>
<File Name="object_mag" Segment="6">
<Texture Name="gTitleZeldaShieldLogoMQTex" OutName="title_zelda_shield_logo_mq" Format="rgba32" Width="160" Height="160" Offset="0x0"/>
<Texture Name="gTitleCopyright19982003Tex" OutName="title_copyright_19982003" Format="ia8" Width="160" Height="16" Offset="0x19000"/>
<Texture Name="gTitleCopyright19982002Tex" OutName="title_copyright_19982002" Format="ia8" Width="160" Height="16" Offset="0x19000"/>
<Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x1B600"/>
<Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x1BE00"/>
<Texture Name="gTitleEffectMask02Tex" OutName="title_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0x1C600"/>
Expand All @@ -18,4 +18,4 @@
<Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x1B300"/>
<Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x20740"/>
</File>
</Root>
</Root>
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_J/objects/object_mo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
<Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
<!-- Morpha's Title Card -->
<Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
<Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
<Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>

<!-- DLists for Morpha's Core -->
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_J/objects/object_sst.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
<Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
<!-- Boss Title Card -->
<Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="120" Offset="0x13D80"/>
<Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>

<!-- Skeletons -->
<Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_J/objects/object_tw.xml
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
<DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
<DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
<DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
<Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x2E170"/>
<Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
<Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
<Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
<Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_J/textures/item_name_static.xml
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
<Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
<Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
<Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
<Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
<Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
<Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
<Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
<Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_U/objects/object_bv.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
<Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
<!-- Boss title card -->
<Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="120" Offset="0x1230"/>
<Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>

<Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
<Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_U/objects/object_fd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
<Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
<!-- Boss title card -->
<!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/> -->
<!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->

<!-- Skeletons -->
<Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_U/objects/object_fhg.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>

<!-- Boss title card -->
<Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="120" Offset="0x59A0"/>
<Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>

<!-- Energy attack DLists -->
<DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_U/objects/object_ganon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>

<!-- Ganondorf Title Card Texture -->
<!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="120" Offset="0xCF00"/> -->
<!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->

<!-- Ganondorf Animation -->
<Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_U/objects/object_goma.xml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
<Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>

<!-- Boss title card -->
<Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="120" Offset="0x19BA8"/>
<Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>

<!-- Door -->
<DList Name="gGohmaDoorDL" Offset="0x1D820"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_U/objects/object_kingdodongo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
<Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
<Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
<Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x17410"/>
<Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
<Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
<Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
<Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_U/objects/object_mo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
<Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
<!-- Morpha's Title Card -->
<Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
<Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
<Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>

<!-- DLists for Morpha's Core -->
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_U/objects/object_sst.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
<Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
<!-- Boss Title Card -->
<Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="120" Offset="0x13D80"/>
<Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>

<!-- Skeletons -->
<Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_U/objects/object_tw.xml
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
<DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
<DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
<DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
<Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x2E170"/>
<Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
<Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
<Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
<Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_MQ_NTSC_U/textures/item_name_static.xml
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
<Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
<Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
<Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
<Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
<Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
<Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
<Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
<Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_NMQ_NTSC_J/objects/object_bv.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
<Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
<!-- Boss title card -->
<Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="120" Offset="0x1230"/>
<Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>

<Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
<Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
<Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
<!-- Boss title card -->
<!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/> -->
<!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->

<!-- Skeletons -->
<Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
Expand Down
2 changes: 1 addition & 1 deletion soh/assets/xml/GC_NMQ_NTSC_J/objects/object_fhg.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>

<!-- Boss title card -->
<Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="120" Offset="0x59A0"/>
<Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>

<!-- Energy attack DLists -->
<DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
Expand Down
Loading
Loading