nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

NTSC Support (N64) (#4198)

Browse Source 
* copy n64 pal 10

doing this so i can check diffs i make

* transfer german->jp icon item

* overlays, message data, icon item jpn, audio, code

todo: title_static, gameplay keep

* add kanji and fix title cards

* title static

* spell folder correctly

* boss title cards, do action, icon item, item name, map name

* headers for jpn stuff

* gameplay_keep

* Scenes, audio, jp text extraction, rom support, overlay fixes, sheik & darunia

todo: test & disable darunia fix cvar for ntsc

* msgptr init fix

* icon item offsets

* comment out title cards until zapd can fix itself (we extract these in a different file anyway)

* compile and font implemented to get past title screen

* file select

* message, kaleido and everything else but rando

* uintptr_t

* rando and custom messages working!

* ntsc-j 1.0 support

* n64 logo?

* copy ntsc 10 to 11

* ntsc 11 extraction

* change title version names

* copy ntsc 11 to 12

* ntsc 12 extraction

* clean up some todos

* re checkout submodules post merge

* fix US filename

* support cross-version filenames

* add new versions to non-mq list

* use correct message table init

* Fix ntsc nes message table overriding pal nes message table

* actual fix, allows extraction

* fix file name using wrong font of file being hovered over

* Fix barinade crash

* re-add pal

* better jabu fix and revert LUS

* fix gerudo title cards

* better better owl select

* more owl fixes

* build

* fix some name decode issues

* Switch Language Mid Text

* Fix PAL displaying for JP filenames

* Fix AskToEquip Crash

* Disable Credits Timing Fix on NTSC

* Fix JP Text positioning

* basic language switching (BIG todo: file select, title screen)

* Title Screen Hopefully working

* add ntsc to linux appimage stuff, TODO: add .v64/.n64 support

* Update OTRExporter

* Fix pause to decide offset

* Fix bomb item name crash

* fix fire arrows and PoH

* builds

* update asset changes and fix menu language changing

* fix name decode

* Fix crashes and add rando/boss rush select stuff

* Revive debug feature by setting language cvar too

* Fix ocarina text speed softlock, and update jp text speed changes

* Merge remote-tracking branch 'upstream/develop' into NTSC

* Fix options menu and let pal use japanese fully

* Resolve some suggestions

* match up gTextSpeed changes to english (still broken!)

* Fix text speed crash

* Set default filename language on save init funcs

* bump otrexporter

* Display same correct info for n64 ntsc-j and ntsc-u

* quicktext more closely aligned with decomp

* linux appimage v64/n64 checksums

* bump zapd

* Credits Fix Tooltip Adjusted

* update supported hashes json

* update shasums to include JP n64
This commit is contained in:
inspectredc
2025-03-30 17:29:59 +01:00
committed by GitHub
parent 0e23adc237
commit 6140b2ec8f
1736 changed files with 107334 additions and 1129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
soh/assets/xml/N64_NTSC_11/objects/object_ganon.xml Normal file
View File

@@ -0,0 +1,106 @@
<Root>
<!-- Assets for Ganondorf -->
<File Name="object_ganon" Segment="6">
<!-- Ganondorf Limb DisplayLists -->
<DList Name="gGanondorfPelvisDL" Offset="0x49C0"/>
<DList Name="gGanondorfRightShinDL" Offset="0x4C08"/>
<DList Name="gGanondorfRightFootDL" Offset="0x4E08"/>
<DList Name="gGanondorfRightThighDL" Offset="0x4F20"/>
<DList Name="gGanondorfLeftShinDL" Offset="0x5070"/>
<DList Name="gGanondorfLeftFootDL" Offset="0x5270"/>
<DList Name="gGanondorfLeftThighDL" Offset="0x5388"/>
<DList Name="gGanondorfHeadDL" Offset="0x54D8"/>
<DList Name="gGanondorfRightUpperLipDL" Offset="0x6030"/>
<DList Name="gGanondorfLowerHairEndDL" Offset="0x6198"/>
<DList Name="gGanondorfUpperHairEndDL" Offset="0x62F0"/>
<DList Name="gGanondorfJawDL" Offset="0x6460"/>
<DList Name="gGanondorfMouthDL" Offset="0x66E8"/>
<DList Name="gGanondorfLeftUpperLipDL" Offset="0x6A28"/>
<DList Name="gGanondorfTorsoDL" Offset="0x6B90"/>
<DList Name="gGanondorfRightForearmDL" Offset="0x6F20"/>
<DList Name="gGanondorfRightUpperArmDL" Offset="0x7048"/>
<DList Name="gGanondorfRightShoulderDL" Offset="0x7310"/>
<DList Name="gGanondorfLeftForearmDL" Offset="0x7518"/>
<DList Name="gGanondorfLeftUpperArmDL" Offset="0x7640"/>
<DList Name="gGanondorfLeftShoulderDL" Offset="0x7908"/>
<!-- Ganondorf Textures -->
<Texture Name="gGanondorfSkinTLUT" OutName="ganondorf_skin_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7B10"/>
<Texture Name="gGanondorfHairTLUT" OutName="ganondorf_hair_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7D10"/>
<Texture Name="gGanondorfInnerMouthTex" OutName="ganondorf_inner_mouth" Format="rgba16" Width="8" Height="8" Offset="0x7F10"/>
<Texture Name="gGanondorfJawTex" OutName="ganondorf_jaw" Format="ci8" Width="16" Height="16" Offset="0x7F90" TlutOffset="0x7B10"/>
<Texture Name="gGanondorfSideburnTex" OutName="ganondorf_sideburn" Format="ci8" Width="16" Height="16" Offset="0x8090" TlutOffset="0x7D10"/>
<Texture Name="gGanondorfOuterMouthTex" OutName="ganondorf_outer_mouth" Format="rgba16" Width="4" Height="8" Offset="0x8190"/>
<Texture Name="gGanondorfUpperLipTex" OutName="ganondorf_upper_lip" Format="ci8" Width="16" Height="16" Offset="0x81D0" TlutOffset="0x7B10"/>
<Texture Name="gGanondorfHairTex" OutName="ganondorf_hair" Format="ci8" Width="16" Height="16" Offset="0x82D0" TlutOffset="0x7D10"/>
<Texture Name="gGanondorfTeethTex" OutName="ganondorf_teeth" Format="rgba16" Width="4" Height="4" Offset="0x83D0"/>
<Texture Name="gGanondorfEyebrowTex" OutName="ganondorf_eyebrow" Format="ci8" Width="16" Height="8" Offset="0x83F0" TlutOffset="0x7D10"/>
<Texture Name="gGanondorfHairFringeTex" OutName="ganondorf_hair_fringe" Format="ci8" Width="16" Height="16" Offset="0x8470" TlutOffset="0x7D10"/>
<Texture Name="gGanondorfNoseBridgeTex" OutName="ganondorf_nose_bridge" Format="rgba16" Width="4" Height="16" Offset="0x8570"/>
<Texture Name="gGanondorfNoseTex" OutName="ganondorf_nose" Format="ci8" Width="8" Height="8" Offset="0x85F0" TlutOffset="0x7B10"/>
<Texture Name="gGanondorfEarTex" OutName="ganondorf_ear" Format="rgba16" Width="8" Height="16" Offset="0x8630"/>
<Texture Name="gGanondorfEyeOrbitTex" OutName="ganondorf_eye_orbit" Format="ci8" Width="32" Height="16" Offset="0x8730" TlutOffset="0x7B10"/>
<Texture Name="gGanondorfGerudoFabricTex" OutName="ganondorf_gerudo_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8930"/>
<Texture Name="gGanondorfRedFabricTex" OutName="ganondorf_red_fabric" Format="rgba16" Width="16" Height="16" Offset="0x8B30"/>
<Texture Name="gGanondorfBodysuitTex" OutName="ganondorf_bodysuit" Format="rgba16" Width="8" Height="8" Offset="0x8D30"/>
<Texture Name="gGanondorfLeatherTex" OutName="ganondorf_leather" Format="rgba16" Width="16" Height="16" Offset="0x8DB0"/>
<Texture Name="gGanondorfCapeFasteningTex" OutName="ganondorf_cape_fastening" Format="rgba16" Width="16" Height="16" Offset="0x8FB0"/>
<Texture Name="gGanondorfGerudoFabricWithSunTex" OutName="ganondorf_gerudo_fabric_with_sun" Format="rgba16" Width="32" Height="16" Offset="0x91B0"/>
<Texture Name="gGanondorfHandTLUT" OutName="ganondorf_hand_tlut" Format="rgba16" Width="56" Height="1" Offset="0x95B0"/>
<Texture Name="gGanondorfJewelTex" OutName="ganondorf_jewel" Format="rgba16" Width="16" Height="32" Offset="0x9620"/>
<Texture Name="gGanondorfNormalEyeTex" OutName="ganondorf_normal_eye" Format="rgba16" Width="32" Height="16" Offset="0x9A20"/>
<Texture Name="gGanondorfChestJewelTex" OutName="ganondorf_chest_jewel" Format="rgba16" Width="16" Height="16" Offset="0x9E20"/>
<Texture Name="gGanondorfBlackLeatherTex" OutName="ganondorf_black_leather" Format="rgba16" Width="16" Height="16" Offset="0xA020"/>
<Texture Name="gGanondorfThumbTex" OutName="ganondorf_thumb" Format="ci8" Width="8" Height="8" Offset="0xA220" TlutOffset="0x95B0"/>
<Texture Name="gGanondorfGauntletAndPauldronTex" OutName="ganondorf_gauntlet_and_pauldron" Format="rgba16" Width="16" Height="16" Offset="0xA260"/>
<Texture Name="gGanondorfHandSideTex" OutName="ganondorf_hand_side" Format="ci8" Width="8" Height="8" Offset="0xA460" TlutOffset="0x95B0"/>
<Texture Name="gGanondorfFingerTex" OutName="ganondorf_finger" Format="ci8" Width="8" Height="8" Offset="0xA4A0" TlutOffset="0x95B0"/>
<Texture Name="gGanondorfCrazedEyeTex" OutName="ganondorf_crazed_eye" Format="rgba16" Width="32" Height="16" Offset="0xA4E0"/>
<Texture Name="gGanondorfEmptyEyeTex" OutName="ganondorf_empty_eye" Format="rgba16" Width="32" Height="16" Offset="0xA8E0"/>
<!-- DisplayList for Ganondorf's eyes -->
<DList Name="gGanondorfEyesDL" Offset="0xBE90"/>
<!-- Ganondorf Limb DisplayLists -->
<DList Name="gGanondorfJewelDL" Offset="0xBF40"/>
<DList Name="gGanondorfLeftHandDL" Offset="0xC048"/>
<DList Name="gGanondorfRightHandClosedDL" Offset="0xC518"/>
<DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>
<!-- Ganondorf Title Card Texture -->
<!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="120" Offset="0xCF00"/> -->
<!-- Ganondorf Animation -->
<Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
<!-- Ganondorf Limbs -->
<Limb Name="gGanondorfRootLimb" LimbType="Standard" Offset="0xFF58"/>
<Limb Name="gGanondorfTorsoLimb" LimbType="Standard" Offset="0xFF64"/>
<Limb Name="gGanondorfLeftShoulderLimb" LimbType="Standard" Offset="0xFF70"/>
<Limb Name="gGanondorfLeftUpperArmLimb" LimbType="Standard" Offset="0xFF7C"/>
<Limb Name="gGanondorfLeftForearmLimb" LimbType="Standard" Offset="0xFF88"/>
<Limb Name="gGanondorfLeftHandLimb" LimbType="Standard" Offset="0xFF94"/>
<Limb Name="gGanondorfRightShoulderLimb" LimbType="Standard" Offset="0xFFA0"/>
<Limb Name="gGanondorfRightUpperArmLimb" LimbType="Standard" Offset="0xFFAC"/>
<Limb Name="gGanondorfRightForearmLimb" LimbType="Standard" Offset="0xFFB8"/>
<Limb Name="gGanondorfRightHandLimb" LimbType="Standard" Offset="0xFFC4"/>
<Limb Name="gGanondorfJewelLimb" LimbType="Standard" Offset="0xFFD0"/>
<Limb Name="gGanondorfLeftUpperLipLimb" LimbType="Standard" Offset="0xFFDC"/>
<Limb Name="gGanondorfMouthLimb" LimbType="Standard" Offset="0xFFE8"/>
<Limb Name="gGanondorfJawLimb" LimbType="Standard" Offset="0xFFF4"/>
<Limb Name="gGanondorfUpperHairEndLimb" LimbType="Standard" Offset="0x10000"/>
<Limb Name="gGanondorfLowerHairEndLimb" LimbType="Standard" Offset="0x1000C"/>
<Limb Name="gGanondorfRightUpperLipLimb" LimbType="Standard" Offset="0x10018"/>
<Limb Name="gGanondorfHeadLimb" LimbType="Standard" Offset="0x10024"/>
<Limb Name="gGanondorfPelvisLimb" LimbType="Standard" Offset="0x10030"/>
<Limb Name="gGanondorfLeftThighLimb" LimbType="Standard" Offset="0x1003C"/>
<Limb Name="gGanondorfLeftShinLimb" LimbType="Standard" Offset="0x10048"/>
<Limb Name="gGanondorfLeftFootLimb" LimbType="Standard" Offset="0x10054"/>
<Limb Name="gGanondorfRightThighLimb" LimbType="Standard" Offset="0x10060"/>
<Limb Name="gGanondorfRightShinLimb" LimbType="Standard" Offset="0x1006C"/>
<Limb Name="gGanondorfRightFootLimb" LimbType="Standard" Offset="0x10078"/>
<!-- Ganondorf Skeleton -->
<Skeleton Name="gGanondorfSkel" Type="Flex" LimbType="Standard" Offset="0x100E8"/>
</File>
</Root>