mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-04-28 21:27:58 +03:00
Compare commits
61 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
fbbfc07ff1 | ||
|
|
52a3058926 | ||
|
|
14907a24b0 | ||
|
|
1b6dc13491 | ||
|
|
02ef33393a | ||
|
|
5ae8ce4eac | ||
|
|
5e399fe7a2 | ||
|
|
46b40b0220 | ||
|
|
1416b2490a | ||
|
|
f304de2eb1 | ||
|
|
fc0cbbe9e7 | ||
|
|
824c203b97 | ||
|
|
f0f2157a4c | ||
|
|
698fca8862 | ||
|
|
86e1e8e3aa | ||
|
|
05e96f310d | ||
|
|
a93917bb4a | ||
|
|
9783f918d2 | ||
|
|
1791a0c52c | ||
|
|
7e78694aee | ||
|
|
85bc67ef24 | ||
|
|
a99e8836fb | ||
|
|
c12349a7a3 | ||
|
|
73400f5856 | ||
|
|
e98a6c3748 | ||
|
|
c3322c85ae | ||
|
|
c21c632c09 | ||
|
|
93d49d5c41 | ||
|
|
cf75520394 | ||
|
|
9250af0216 | ||
|
|
2576f75b1a | ||
|
|
30520a7565 | ||
|
|
f2161297a8 | ||
|
|
c1885991fa | ||
|
|
f5e0179e2b | ||
|
|
f0f6259d2f | ||
|
|
1b17fea3d0 | ||
|
|
88669742a2 | ||
|
|
4a3d60d061 | ||
|
|
d40fa00b9e | ||
|
|
88154d78c8 | ||
|
|
ae7654cb0e | ||
|
|
71bd48cba9 | ||
|
|
b71a0c5803 | ||
|
|
4acbf799cc | ||
|
|
98146c29f9 | ||
|
|
c351a2cf75 | ||
|
|
497f90a392 | ||
|
|
a247c06be8 | ||
|
|
ee23d02921 | ||
|
|
2589448057 | ||
|
|
cb7d9279e4 | ||
|
|
38574bbb9e | ||
|
|
e2bb2edb8a | ||
|
|
f37c3aa228 | ||
|
|
9a78b04e68 | ||
|
|
4f783d5945 | ||
|
|
2deea6e105 | ||
|
|
ef8fa17e7c | ||
|
|
1e51f1e162 | ||
|
|
fd96bf6b14 |
183 changed files with 3103 additions and 2628 deletions
|
|
@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD 20 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.2 LANGUAGES C CXX)
|
||||
include(CMake/soh-cvars.cmake)
|
||||
include(CMake/lus-cvars.cmake)
|
||||
|
||||
|
|
|
|||
|
|
@ -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 |
|
||||
|
|
|
|||
|
|
@ -37,12 +37,13 @@ if (-not (Test-Path $clangFormatFilePath) -or ($currentVersion -ne $requiredVers
|
|||
$basePath = (Resolve-Path .).Path
|
||||
$files = Get-ChildItem -Path $basePath\soh -Recurse -File `
|
||||
| Where-Object { ($_.Extension -eq '.c' -or $_.Extension -eq '.cpp' -or `
|
||||
($_.Extension -eq '.h' -and `
|
||||
(($_.Extension -eq '.h' -or $_.Extension -eq '.hpp') -and `
|
||||
(-not ($_.FullName -like "*\soh\src\*" -or $_.FullName -like "*\soh\include\*")))) -and `
|
||||
(-not ($_.FullName -like "*\soh\assets\*")) }
|
||||
|
||||
foreach ($file in $files) {
|
||||
for ($i = 0; $i -lt $files.Length; $i++) {
|
||||
$file = $files[$i]
|
||||
$relativePath = $file.FullName.Substring($basePath.Length + 1)
|
||||
Write-Host "Formatting $relativePath"
|
||||
Write-Host "Formatting [$($i+1)/$($files.Length)] $relativePath"
|
||||
.\clang-format.exe -i $file.FullName
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,20 +10,20 @@
|
|||
# -name "*.c" -o -name "*.cpp"
|
||||
# find all .c and .cpp files
|
||||
#
|
||||
# -name "*.h" ! -path "soh/src/**.h" ! -path "soh/include/**.h"
|
||||
# find all .h files that aren't in soh/src or soh/include
|
||||
# ( -name "*.h" -o -name "*.hpp" ) ! -path "soh/src/**.h" ! -path "soh/include/**.h"
|
||||
# find all .h and .hpp files that aren't in soh/src or soh/include
|
||||
# this is because zret decomp only runs clang-format on c files
|
||||
# https://github.com/zeldaret/mm/blob/b7e5468ca16315a7e322055eff3d97fe980bbc25/format.py#L182
|
||||
#
|
||||
# ! -path "soh/assets/*"
|
||||
# asset headers are autogenerated, don't fight them
|
||||
#
|
||||
# | sed 's| |\\ |g'
|
||||
# pipe the result of find into sed to
|
||||
# ensure all the paths returned by find have spaces escaped
|
||||
# -print0
|
||||
# separate paths with NUL bytes, avoiding issues with spaces in paths
|
||||
#
|
||||
# | xargs clang-format-14 -i
|
||||
# | xargs -0 clang-format-14 -i -verbose
|
||||
# use xargs to take each path we've found
|
||||
# and pass it as an argument to clang-format
|
||||
# verbose to print files being formatted and X out of Y status
|
||||
|
||||
find soh -type f \( -name "*.c" -o -name "*.cpp" -o \( -name "*.h" ! -path "soh/src/**.h" ! -path "soh/include/**.h" \) \) ! -path "soh/assets/*" | sed 's| |\\ |g' | xargs clang-format-14 -i
|
||||
find soh -type f \( -name "*.c" -o -name "*.cpp" -o \( \( -name "*.h" -o -name "*.hpp" \) ! -path "soh/src/*" ! -path "soh/include/*" \) \) ! -path "soh/assets/*" -print0 | xargs -0 clang-format-14 -i --verbose
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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) -->
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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 -->
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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) -->
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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 -->
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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) -->
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x19A00"/>
|
||||
<Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x19D00"/>
|
||||
<Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x1A500"/>
|
||||
|
|
@ -17,4 +17,4 @@
|
|||
<Texture Name="gTitleOcarinaOfTimeTMTextTex" OutName="title_ocarina_of_time_tm_text" Format="i8" Width="96" Height="8" Offset="0x1EB40"/>
|
||||
<Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x1EE40"/>
|
||||
</File>
|
||||
</Root>
|
||||
</Root>
|
||||
|
|
|
|||
|
|
@ -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 -->
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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) -->
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<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="gTitleCopyright19982002Tex" OutName="title_copyright_19982002" Format="ia8" Width="160" Height="16" Offset="0x19000"/>
|
||||
<Texture Name="gTitleCopyright19982003Tex" OutName="title_copyright_19982003" Format="ia8" Width="160" Height="16" Offset="0x19A00"/>
|
||||
<Texture Name="gTitleCopyright19982004JpnTex" OutName="title_copyright_19982004_jpn" Format="ia8" Width="160" Height="16" Offset="0x19000"/>
|
||||
<Texture Name="gTitleCopyright19982004EngTex" OutName="title_copyright_19982004_eng" Format="ia8" Width="160" Height="16" Offset="0x19A00"/>
|
||||
<Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x1A400"/>
|
||||
<Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x1A700"/>
|
||||
<Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x1AF00"/>
|
||||
|
|
@ -18,4 +18,4 @@
|
|||
<Texture Name="gTitleOcarinaOfTimeTMTextTex" OutName="title_ocarina_of_time_tm_text" Format="i8" Width="96" Height="8" Offset="0x1F540"/>
|
||||
<Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x1F840"/>
|
||||
</File>
|
||||
</Root>
|
||||
</Root>
|
||||
|
|
|
|||
|
|
@ -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 -->
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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) -->
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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 -->
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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) -->
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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 -->
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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) -->
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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 -->
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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) -->
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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 -->
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
|
|
@ -544,6 +544,8 @@ typedef enum {
|
|||
LANGUAGE_MAX
|
||||
} Language;
|
||||
|
||||
#define TODO_TRANSLATE "__Translate_This__"
|
||||
|
||||
// TODO get these properties from the textures themselves
|
||||
#define FONT_CHAR_TEX_WIDTH 16
|
||||
#define FONT_CHAR_TEX_HEIGHT 16
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ const std::vector<PresetEntry> vanillaPlusPresetEntries = {
|
|||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixZoraHintDialogue"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixVineFall"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("EnemySpawnsOverWaterboxes"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixSawSoftlock"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DekuNutUpgradeFix"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixGrokenGiantsKnife"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixBrokenGiantsKnife"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixDungeonMinimapIcon"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TwoHandedIdle"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NaviTextFix"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("GerudoWarriorClothingFix"), 1),
|
||||
|
|
@ -125,7 +125,7 @@ const std::vector<PresetEntry> enhancedPresetEntries = {
|
|||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixZoraHintDialogue"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixVineFall"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("EnemySpawnsOverWaterboxes"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixSawSoftlock"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DekuNutUpgradeFix"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixGrokenGiantsKnife"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixBrokenGiantsKnife"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixDungeonMinimapIcon"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TwoHandedIdle"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NaviTextFix"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("GerudoWarriorClothingFix"), 1),
|
||||
|
|
@ -251,7 +251,7 @@ const std::vector<PresetEntry> randomizerPresetEntries = {
|
|||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("EnemySpawnsOverWaterboxes"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixSawSoftlock"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DekuNutUpgradeFix"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixGrokenGiantsKnife"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixBrokenGiantsKnife"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixDungeonMinimapIcon"), 1),
|
||||
PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TwoHandedIdle"), 1),
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ AudioCollection::AudioCollection() {
|
|||
SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_2, "End Credits II", "NA_BGM_STAFF_2", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere?
|
||||
SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_3, "End Credits III", "NA_BGM_STAFF_3", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere?
|
||||
SEQUENCE_MAP_ENTRY(NA_BGM_STAFF_4, "End Credits IV", "NA_BGM_STAFF_4", SEQ_BGM_EVENT, false, false), // Previously SEQ_UNUSED, so not shown anywhere?
|
||||
|
||||
|
||||
// SEQ_INSTRUMENT
|
||||
SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 1, "Ocarina", "OCARINA_INSTRUMENT_DEFAULT", SEQ_INSTRUMENT, true, true),
|
||||
SEQUENCE_MAP_ENTRY(INSTRUMENT_OFFSET + 2, "Malon", "OCARINA_INSTRUMENT_MALON", SEQ_INSTRUMENT, true, true),
|
||||
|
|
@ -304,7 +304,7 @@ AudioCollection::AudioCollection() {
|
|||
//SEQUENCE_MAP_ENTRY("Adult Link - Unused Sound 1?","NA_SE_VO_LI_ELECTRIC_SHOCK_LV", "NA_SE_VO_LI_ELECTRIC_SHOCK_LV", SEQ_VOICE, true, false),
|
||||
//SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_GROAN_KID, "Child Link - Groan (Unused)", "NA_SE_VO_LI_GROAN_KID", SEQ_VOICE, true, false),
|
||||
//SEQUENCE_MAP_ENTRY(NA_SE_VO_LI_ELECTRIC_SHOCK_LV_KID, "Child Link - Unused Sound 1?", "NA_SE_VO_LI_ELECTRIC_SHOCK_LV_KID", SEQ_VOICE, true, false),
|
||||
|
||||
|
||||
// Following group of Dummies are all duplicate entries for Navi saying Look/Hey/Watchout
|
||||
//SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x45, "NA_SE_VO_DUMMY_0x45", "NA_SE_VO_DUMMY_0x45", SEQ_VOICE, true, false),
|
||||
//SEQUENCE_MAP_ENTRY(NA_SE_VO_DUMMY_0x46, "NA_SE_VO_DUMMY_0x46", "NA_SE_VO_DUMMY_0x46", SEQ_VOICE, true, false),
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ void InputViewer::DrawElement() {
|
|||
}
|
||||
|
||||
ImVec2 mainPos = ImGui::GetWindowPos();
|
||||
ImVec2 size = ImGui::GetContentRegionAvail();
|
||||
ImVec2 size = ImGui::GetMainViewport()->WorkSize;
|
||||
|
||||
#ifdef __WIIU__
|
||||
const float scale = CVarGetFloat(CVAR_INPUT_VIEWER("Scale"), 1.0f) * 2.0f;
|
||||
|
|
@ -584,7 +584,7 @@ void InputViewerSettingsWindow::DrawElement() {
|
|||
}
|
||||
// gInputViewer.Dpad
|
||||
CVarCheckbox("Show D-Pad Layers", CVAR_INPUT_VIEWER("Dpad"),
|
||||
CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
|
||||
CheckboxOptions().Color(THEME_COLOR).DefaultValue(false));
|
||||
if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("Dpad"), 0)) {
|
||||
ImGui::Indent();
|
||||
CVarCombobox("##DpadOutline", CVAR_INPUT_VIEWER("DpadOutlineMode"), buttonOutlineOptionsVerbose,
|
||||
|
|
@ -593,7 +593,7 @@ void InputViewerSettingsWindow::DrawElement() {
|
|||
}
|
||||
// gInputViewer.Mod1
|
||||
CVarCheckbox("Show Modifier Button 1 Layers", CVAR_INPUT_VIEWER("Mod1"),
|
||||
CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
|
||||
CheckboxOptions().Color(THEME_COLOR).DefaultValue(false));
|
||||
if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("Mod1"), 0)) {
|
||||
ImGui::Indent();
|
||||
CVarCombobox("##Mmod1Outline", CVAR_INPUT_VIEWER("Mod1OutlineMode"), buttonOutlineOptionsVerbose,
|
||||
|
|
@ -602,7 +602,7 @@ void InputViewerSettingsWindow::DrawElement() {
|
|||
}
|
||||
// gInputViewer.Mod2
|
||||
CVarCheckbox("Show Modifier Button 2 Layers", CVAR_INPUT_VIEWER("Mod2"),
|
||||
CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
|
||||
CheckboxOptions().Color(THEME_COLOR).DefaultValue(false));
|
||||
if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("Mod2"), 0)) {
|
||||
ImGui::Indent();
|
||||
CVarCombobox("##Mod2Outline", CVAR_INPUT_VIEWER("Mod2OutlineMode"), buttonOutlineOptionsVerbose,
|
||||
|
|
@ -652,7 +652,7 @@ void InputViewerSettingsWindow::DrawElement() {
|
|||
"Right Stick Visibility", CVAR_INPUT_VIEWER("RightStick.VisibilityMode"), stickModeOptions,
|
||||
ComboboxOptions()
|
||||
.Color(THEME_COLOR)
|
||||
.DefaultIndex(STICK_MODE_ALWAYS_SHOWN)
|
||||
.DefaultIndex(STICK_MODE_ALWAYS_HIDDEN)
|
||||
.Tooltip(
|
||||
"Determines the conditions under which the moving layer of the right stick texture is visible."));
|
||||
|
||||
|
|
@ -661,7 +661,7 @@ void InputViewerSettingsWindow::DrawElement() {
|
|||
"Right Stick Outline/Background Visibility", CVAR_INPUT_VIEWER("RightStick.OutlineMode"), stickModeOptions,
|
||||
ComboboxOptions()
|
||||
.Color(THEME_COLOR)
|
||||
.DefaultIndex(STICK_MODE_ALWAYS_SHOWN)
|
||||
.DefaultIndex(STICK_MODE_ALWAYS_HIDDEN)
|
||||
.Tooltip(
|
||||
"Determines the conditions under which the right stick outline/background texture is visible."));
|
||||
|
||||
|
|
|
|||
|
|
@ -2376,10 +2376,12 @@ void CosmeticsEditorWindow::DrawElement() {
|
|||
.Step(0.01f)
|
||||
.Size(ImVec2(300.0f, 0.0f))
|
||||
.Color(THEME_COLOR));
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
UIWidgets::CVarCheckbox("Randomize All on New Scene", CVAR_COSMETIC("RandomizeAllOnNewScene"),
|
||||
UIWidgets::CheckboxOptions()
|
||||
.Color(THEME_COLOR)
|
||||
.Tooltip("Enables randomizing all unlocked cosmetics when you enter a new scene."));
|
||||
ImGui::EndDisabled();
|
||||
UIWidgets::CVarCheckbox(
|
||||
"Advanced Mode", CVAR_COSMETIC("AdvancedMode"),
|
||||
UIWidgets::CheckboxOptions()
|
||||
|
|
@ -2408,13 +2410,15 @@ void CosmeticsEditorWindow::DrawElement() {
|
|||
}
|
||||
}
|
||||
}
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
if (UIWidgets::Button("Randomize All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
|
||||
CosmeticsEditor_RandomizeAll();
|
||||
}
|
||||
ImGui::EndDisabled();
|
||||
|
||||
ImGui::SameLine();
|
||||
if (UIWidgets::Button("Reset All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
|
||||
CVarClearBlock("gCosmetics");
|
||||
ApplyOrResetCustomGfxPatches();
|
||||
CosmeticsEditor_ResetAll();
|
||||
}
|
||||
if (UIWidgets::Button("Lock All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
|
||||
for (auto& [id, cosmeticOption] : cosmeticOptions) {
|
||||
|
|
@ -2432,6 +2436,7 @@ void CosmeticsEditorWindow::DrawElement() {
|
|||
}
|
||||
}
|
||||
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
if (UIWidgets::Button("Rainbow All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
|
||||
for (auto& [id, cosmeticOption] : cosmeticOptions) {
|
||||
if (!CVarGetInteger(cosmeticOption.lockedCvar, 0) &&
|
||||
|
|
@ -2441,6 +2446,8 @@ void CosmeticsEditorWindow::DrawElement() {
|
|||
}
|
||||
}
|
||||
}
|
||||
ImGui::EndDisabled();
|
||||
|
||||
ImGui::SameLine();
|
||||
if (UIWidgets::Button("Un-Rainbow All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
|
||||
for (auto& [id, cosmeticOption] : cosmeticOptions) {
|
||||
|
|
@ -2470,6 +2477,7 @@ void CosmeticsEditorWindow::DrawElement() {
|
|||
|
||||
if (ImGui::BeginTabItem("Keys")) {
|
||||
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
UIWidgets::Separator(true, true, 2.0f, 2.0f);
|
||||
|
||||
if (UIWidgets::Button("Give all keys dungeon-specific colors",
|
||||
|
|
@ -2483,6 +2491,7 @@ void CosmeticsEditorWindow::DrawElement() {
|
|||
DrawCosmeticGroup(COSMETICS_GROUP_SMALL_KEYS);
|
||||
DrawCosmeticGroup(COSMETICS_GROUP_BOSS_KEYS);
|
||||
|
||||
ImGui::EndDisabled();
|
||||
ImGui::EndTabItem();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -281,11 +281,24 @@ void PatchIronKnuckleTextureOverflow() {
|
|||
}
|
||||
}
|
||||
|
||||
void PatchBoulderFragment() {
|
||||
// The boulder fragment renders invisible due to the change made by https://github.com/Kenix3/libultraship/pull/721
|
||||
// Until it is known wether this change is approriate or something else should be done to it, the following patches
|
||||
// adjust the render mode for the DL to not become invisible
|
||||
ResourceMgr_PatchGfxByName(gBoulderFragmentsDL, "boulderFragmentRenderFix3", 3,
|
||||
gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2));
|
||||
ResourceMgr_PatchGfxByName(gBoulderFragmentsDL, "boulderFragmentRenderFix6", 6,
|
||||
gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIA_PRIM2));
|
||||
}
|
||||
|
||||
void ApplyAuthenticGfxPatches() {
|
||||
// Overflow textures
|
||||
PatchArrowTipTexture();
|
||||
PatchDekuStickTextureOverflow();
|
||||
PatchFreezardTextureOverflow();
|
||||
PatchIronKnuckleTextureOverflow();
|
||||
|
||||
PatchBoulderFragment();
|
||||
}
|
||||
|
||||
// Patches the Sold Out GI DL to render the texture in the mirror boundary
|
||||
|
|
|
|||
|
|
@ -155,11 +155,12 @@ const std::string CustomMessage::GetFrench(MessageFormat format) const {
|
|||
}
|
||||
|
||||
const std::string CustomMessage::GetForCurrentLanguage(MessageFormat format) const {
|
||||
return GetForLanguage((gSaveContext.language == LANGUAGE_JPN) ? LANGUAGE_ENG : gSaveContext.language, format);
|
||||
return GetForLanguage(((Language)gSaveContext.language == LANGUAGE_JPN) ? LANGUAGE_ENG : gSaveContext.language,
|
||||
format);
|
||||
}
|
||||
|
||||
const std::string CustomMessage::GetForLanguage(uint8_t language, MessageFormat format) const {
|
||||
std::string output = messages[language].length() > 0 ? messages[language] : messages[LANGUAGE_ENG];
|
||||
std::string output = messages[language] != TODO_TRANSLATE ? messages[language] : messages[LANGUAGE_ENG];
|
||||
ProcessMessageFormat(output, format);
|
||||
return output;
|
||||
}
|
||||
|
|
@ -273,8 +274,12 @@ void CustomMessage::Replace(std::string&& oldStr, std::string&& newStr) {
|
|||
void CustomMessage::Replace(std::string&& oldStr, CustomMessage newMessage) {
|
||||
for (uint8_t language = 0; language < LANGUAGE_MAX - 1; language++) {
|
||||
size_t position = messages[language].find(oldStr);
|
||||
std::string newMsg = newMessage.messages[language];
|
||||
if (language != LANGUAGE_ENG && newMsg == TODO_TRANSLATE) {
|
||||
newMsg = newMessage.messages[LANGUAGE_ENG];
|
||||
}
|
||||
while (position != std::string::npos) {
|
||||
messages[language].replace(position, oldStr.length(), newMessage.messages[language]);
|
||||
messages[language].replace(position, oldStr.length(), newMsg);
|
||||
position = messages[language].find(oldStr);
|
||||
}
|
||||
}
|
||||
|
|
@ -464,6 +469,27 @@ size_t CustomMessage::FindNEWLINE(std::string& str, size_t lastNewline) const {
|
|||
return newLine;
|
||||
}
|
||||
|
||||
bool CustomMessage::AddBreakString(std::string& str, size_t pos, std::string breakString) const {
|
||||
if (str[pos] == ' ' || str[pos] == '&') {
|
||||
str.replace(pos, 1, breakString);
|
||||
return false;
|
||||
} else {
|
||||
if (pos <= str.size() - 1) {
|
||||
// If the next char is a new textbox, it has priority, ignore whatever we are replacing it with
|
||||
if (str[pos + 1] == '^') {
|
||||
return false;
|
||||
// otherwise, if it is a line break or space, replace it
|
||||
} else if (str[pos + 1] == ' ' || str[pos + 1] == '&') {
|
||||
str.replace(pos + 1, 1, breakString);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
// otherwise insert after it
|
||||
str.insert(pos + 1, breakString);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
void CustomMessage::AutoFormatString(std::string& str) const {
|
||||
ReplaceAltarIcons(str);
|
||||
ReplaceColors(str);
|
||||
|
|
@ -476,7 +502,6 @@ void CustomMessage::AutoFormatString(std::string& str) const {
|
|||
while (lastNewline + lineLength < str.length() || yesNo != std::string::npos) {
|
||||
const size_t carrot = str.find('^', lastNewline);
|
||||
const size_t ampersand = str.find('&', lastNewline);
|
||||
const size_t lastSpace = str.rfind(' ', lastNewline + lineLength);
|
||||
size_t waitForInput = str.find(WAIT_FOR_INPUT()[0], lastNewline);
|
||||
size_t newLine = FindNEWLINE(str, lastNewline);
|
||||
if (carrot < waitForInput) {
|
||||
|
|
@ -508,13 +533,25 @@ void CustomMessage::AutoFormatString(std::string& str) const {
|
|||
lastNewline = waitForInput + 1;
|
||||
lineCount = 0;
|
||||
// some lines need to be split but don't have spaces, look for periods instead
|
||||
} else if (lastSpace == std::string::npos) {
|
||||
const size_t lastPeriod = str.rfind('.', lastNewline + lineLength);
|
||||
str.replace(lastPeriod, 1, ".&");
|
||||
lastNewline = lastPeriod + 2;
|
||||
} else {
|
||||
str.replace(lastSpace, 1, "&");
|
||||
lastNewline = lastSpace + 1;
|
||||
const size_t lastBreak =
|
||||
str.find_last_of(static_cast<std::string>(".,!?- "), lastNewline + lineLength);
|
||||
// if none exist or we go backwards, we look forward for a something and allow the overflow
|
||||
if (lastBreak == std::string::npos || lastBreak < lastNewline) {
|
||||
const size_t nextBreak = str.find_first_of(static_cast<std::string>(".,!?- &^"), lastNewline);
|
||||
if (str[nextBreak] == '^') {
|
||||
lastNewline = nextBreak + 1;
|
||||
lineCount = 0; // increments to 1 at the end
|
||||
} else if (str[nextBreak] == '&') {
|
||||
lastNewline = nextBreak + 1;
|
||||
} else {
|
||||
bool isAdded = AddBreakString(str, nextBreak, "&");
|
||||
lastNewline = nextBreak + 1 + isAdded;
|
||||
}
|
||||
} else {
|
||||
bool isAdded = AddBreakString(str, lastBreak, "&");
|
||||
lastNewline = lastBreak + 1 + isAdded;
|
||||
}
|
||||
}
|
||||
lineCount += 1;
|
||||
} else {
|
||||
|
|
@ -531,14 +568,23 @@ void CustomMessage::AutoFormatString(std::string& str) const {
|
|||
// or move the lastNewline cursor to the next line if a '^' is encountered.
|
||||
} else if (carrot < lastNewline + lineLength) {
|
||||
lastNewline = carrot + 1;
|
||||
// some lines need to be split but don't have spaces, look for periods instead
|
||||
} else if (lastSpace == std::string::npos) {
|
||||
const size_t lastPeriod = str.rfind('.', lastNewline + lineLength);
|
||||
str.replace(lastPeriod, 1, ".^" + colorText);
|
||||
lastNewline = lastPeriod + 2;
|
||||
// some lines need to be split but don't have spaces, look for punctuation instead
|
||||
} else {
|
||||
str.replace(lastSpace, 1, "^" + colorText);
|
||||
lastNewline = lastSpace + 1;
|
||||
const size_t lastBreak =
|
||||
str.find_last_of(static_cast<std::string>(".,!?- &"), lastNewline + lineLength);
|
||||
// if none exist or we go backwards, we look forward for a something and allow the overflow
|
||||
if (lastBreak == std::string::npos || lastBreak < lastNewline) {
|
||||
const size_t nextBreak = str.find_first_of(static_cast<std::string>(".,!?- &^"), lastNewline);
|
||||
if (str[nextBreak] == '^') {
|
||||
lastNewline = nextBreak + 1;
|
||||
} else {
|
||||
bool isAdded = AddBreakString(str, nextBreak, "^" + colorText);
|
||||
lastNewline = nextBreak + 1 + isAdded;
|
||||
}
|
||||
} else {
|
||||
bool isAdded = AddBreakString(str, lastBreak, "^" + colorText);
|
||||
lastNewline = lastBreak + 1 + isAdded;
|
||||
}
|
||||
}
|
||||
lineCount = 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
#include <string>
|
||||
|
||||
#include "../../../include/z64item.h"
|
||||
#include "../../../include/z64.h"
|
||||
#include "../../../include/message_data_textbox_types.h"
|
||||
#include "../randomizer/3drando/text.hpp"
|
||||
|
||||
|
|
@ -189,6 +190,17 @@ class CustomMessage {
|
|||
*/
|
||||
size_t FindNEWLINE(std::string& str, size_t lastNewline) const;
|
||||
|
||||
/**
|
||||
* @brief Inserts a string into another string, following the rules
|
||||
* of auto-format inserting new lines: spaces and & are replaced while
|
||||
* other chars are appended to.
|
||||
*
|
||||
* @param str the string we are inserting into
|
||||
* @param pos the position in the string to insert
|
||||
* @param breakString the string we are inserting
|
||||
*/
|
||||
bool AddBreakString(std::string& str, size_t pos, std::string breakString) const;
|
||||
|
||||
/**
|
||||
* @brief formats the string specifically to fit in OoT's
|
||||
* textboxes, and use it's formatting.
|
||||
|
|
@ -203,7 +215,7 @@ class CustomMessage {
|
|||
void CleanString(std::string& str) const;
|
||||
|
||||
private:
|
||||
std::vector<std::string> messages = { "", "", "" };
|
||||
std::vector<std::string> messages = { "", TODO_TRANSLATE, TODO_TRANSLATE };
|
||||
TextBoxType type = TEXTBOX_TYPE_BLACK;
|
||||
TextBoxPosition position = TEXTBOX_POS_BOTTOM;
|
||||
std::vector<std::string> colors = {};
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
#include "soh/SohGui/UIWidgets.hpp"
|
||||
#include "soh/SohGui/SohGui.hpp"
|
||||
#include "soh/SohGui/SohMenu.h"
|
||||
#include "soh/OTRGlobals.h"
|
||||
|
||||
#include <textures/message_static/message_static.h>
|
||||
|
|
@ -26,6 +27,7 @@ void MessageViewer::InitElement() {
|
|||
}
|
||||
|
||||
void MessageViewer::DrawElement() {
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
ImGui::Text("Table ID");
|
||||
ImGui::SameLine();
|
||||
PushStyleInput(THEME_COLOR);
|
||||
|
|
@ -56,22 +58,12 @@ void MessageViewer::DrawElement() {
|
|||
memset(mTextIdBuf, 0, sizeof(char) * MAX_STRING_SIZE);
|
||||
}
|
||||
PopStyleCheckbox();
|
||||
ImGui::Text("Language");
|
||||
ImGui::SameLine();
|
||||
PushStyleCombobox(THEME_COLOR);
|
||||
if (ImGui::BeginCombo("##Language", mLanguages[mLanguage])) {
|
||||
// ReSharper disable CppDFAUnreachableCode
|
||||
for (size_t i = 0; i < mLanguages.size(); i++) {
|
||||
if (strlen(mLanguages[i]) > 0) {
|
||||
if (ImGui::Selectable(mLanguages[i], i == mLanguage)) {
|
||||
mLanguage = i;
|
||||
}
|
||||
}
|
||||
}
|
||||
ImGui::EndCombo();
|
||||
}
|
||||
PopStyleCombobox();
|
||||
UIWidgets::InsertHelpHoverText("Which language to load from the selected text ID");
|
||||
SohGui::SohMenu::UpdateLanguageMap(SohGui::languages);
|
||||
UIWidgets::Combobox("Language", &mLanguage, SohGui::languages,
|
||||
UIWidgets::ComboboxOptions()
|
||||
.Color(THEME_COLOR)
|
||||
.DefaultIndex(0)
|
||||
.Tooltip("Which language to load from the selected text ID"));
|
||||
PushStyleButton(THEME_COLOR);
|
||||
if (ImGui::Button("Display Message##ExistingMessage")) {
|
||||
mDisplayExistingMessageClicked = true;
|
||||
|
|
@ -87,6 +79,7 @@ void MessageViewer::DrawElement() {
|
|||
mDisplayCustomMessageClicked = true;
|
||||
}
|
||||
PopStyleButton();
|
||||
ImGui::EndDisabled();
|
||||
}
|
||||
|
||||
void MessageViewer::UpdateElement() {
|
||||
|
|
@ -196,6 +189,11 @@ void MessageDebug_StartTextBox(const char* tableId, uint16_t textId, uint8_t lan
|
|||
R_TEXT_CHAR_SCALE = 75;
|
||||
R_TEXT_LINE_SPACING = 12;
|
||||
R_TEXT_INIT_XPOS = 65;
|
||||
if (language == LANGUAGE_JPN) {
|
||||
R_TEXT_CHAR_SCALE = 88;
|
||||
R_TEXT_LINE_SPACING = 18;
|
||||
R_TEXT_INIT_XPOS = 65;
|
||||
}
|
||||
char* buffer = font->msgBuf;
|
||||
msgCtx->textId = textId;
|
||||
if (strlen(tableId) == 0) {
|
||||
|
|
@ -207,10 +205,8 @@ void MessageDebug_StartTextBox(const char* tableId, uint16_t textId, uint8_t lan
|
|||
constexpr int maxBufferSize = sizeof(font->msgBuf);
|
||||
const CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(tableId, textId);
|
||||
font->charTexBuf[0] = (messageEntry.GetTextBoxType() << 4) | messageEntry.GetTextBoxPosition();
|
||||
switch (language) {
|
||||
font->msgLength =
|
||||
SohUtils::CopyStringToCharBuffer(buffer, messageEntry.GetForLanguage(language), maxBufferSize);
|
||||
}
|
||||
font->msgLength =
|
||||
SohUtils::CopyStringToCharBuffer(buffer, messageEntry.GetForLanguage(language), maxBufferSize);
|
||||
msgCtx->msgLength = static_cast<int32_t>(font->msgLength);
|
||||
}
|
||||
msgCtx->textBoxProperties = font->charTexBuf[0];
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#ifdef __cplusplus
|
||||
#include "GuiWindow.h"
|
||||
#include <array>
|
||||
#include <unordered_map>
|
||||
extern "C" {
|
||||
#endif
|
||||
/**
|
||||
|
|
@ -41,7 +41,6 @@ class MessageViewer : public Ship::GuiWindow {
|
|||
void DisplayCustomMessage() const;
|
||||
|
||||
static constexpr uint16_t MAX_STRING_SIZE = 1024;
|
||||
static constexpr std::array<const char*, LANGUAGE_MAX> mLanguages = { "English", "German", "French" };
|
||||
static constexpr int HEXADECIMAL = 0;
|
||||
static constexpr int DECIMAL = 1;
|
||||
char* mTableIdBuf;
|
||||
|
|
@ -49,7 +48,7 @@ class MessageViewer : public Ship::GuiWindow {
|
|||
char* mTextIdBuf;
|
||||
uint16_t mTextId;
|
||||
int mTextIdBase = HEXADECIMAL;
|
||||
size_t mLanguage = LANGUAGE_ENG;
|
||||
int32_t mLanguage = LANGUAGE_ENG;
|
||||
char* mCustomMessageBuf;
|
||||
std::string mCustomMessageString;
|
||||
bool mDisplayExistingMessageClicked = false;
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ void SohConsoleWindow::UpdateElement() {
|
|||
}
|
||||
|
||||
void SohConsoleWindow::DrawElement() {
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
UIWidgets::PushStyleInput(THEME_COLOR);
|
||||
// Small font (13) to match hardcoded width values in the LUS window.. set large font after below TODO addressed
|
||||
ImGui::PushFont(OTRGlobals::Instance->fontMonoSmall);
|
||||
|
|
@ -27,4 +28,5 @@ void SohConsoleWindow::DrawElement() {
|
|||
|
||||
ImGui::PopFont();
|
||||
UIWidgets::PopStyleInput();
|
||||
ImGui::EndDisabled();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,9 @@ void SohGfxDebuggerWindow::UpdateElement() {
|
|||
}
|
||||
|
||||
void SohGfxDebuggerWindow::DrawElement() {
|
||||
ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
|
||||
ImGui::PushFont(OTRGlobals::Instance->fontMonoLarger);
|
||||
GfxDebuggerWindow::DrawElement();
|
||||
ImGui::PopFont();
|
||||
ImGui::EndDisabled();
|
||||
}
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue