inspectredc 6140b2ec8f
NTSC Support (N64) (#4198)
* 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
2025-03-30 12:29:59 -04:00

56 lines
3.9 KiB
XML

<Root>
<File Name="object_js" Segment="6">
<!-- Carpet Merchant Skeleton -->
<Skeleton Name="gCarpetMerchantSkel" Type="Flex" LimbType="Standard" Offset="0x5EA0"/>
<!-- Carpet Merchant Limbs -->
<Limb Name="gCarpetMerchantRootLimb" LimbType="Standard" Offset="0x5DE0"/>
<Limb Name="gCarpetMerchantTopRootLimb" LimbType="Standard" Offset="0x5DEC"/>
<Limb Name="gCarpetMerchantLowerHairLimb" LimbType="Standard" Offset="0x5DF8"/>
<Limb Name="gCarpetMerchantUpperHairLimb" LimbType="Standard" Offset="0x5E04"/>
<Limb Name="gCarpetMerchantTorsoLimb" LimbType="Standard" Offset="0x5E10"/>
<Limb Name="gCarpetMerchantUpperArmLeftLimb" LimbType="Standard" Offset="0x5E1C"/>
<Limb Name="gCarpetMerchantForearmLeftLimb" LimbType="Standard" Offset="0x5E28"/>
<Limb Name="gCarpetMerchantLeftHandLimb" LimbType="Standard" Offset="0x5E34"/>
<Limb Name="gCarpetMerchantUpperArmRightLimb" LimbType="Standard" Offset="0x5E40"/>
<Limb Name="gCarpetMerchantForearmRightLimb" LimbType="Standard" Offset="0x5E4C"/>
<Limb Name="gCarpetMerchantRightHandLimb" LimbType="Standard" Offset="0x5E58"/>
<Limb Name="gCarpetMerchantHeadLimb" LimbType="Standard" Offset="0x5E64"/>
<!-- Carpet Merchant Limb DisplayLists -->
<DList Name="gCarpetMerchantBlanketAndLowerBodyDL" Offset="0x3440"/>
<DList Name="gCarpetMerchantLowerHairDL" Offset="0x3B98"/>
<DList Name="gCarpetMerchantUpperHairDL" Offset="0x3A20"/>
<DList Name="gCarpetMerchantTorsoDL" Offset="0x3D78"/>
<DList Name="gCarpetMerchantUpperArmLeftDL" Offset="0x47E8"/>
<DList Name="gCarpetMerchantForearmLeftDL" Offset="0x4918"/>
<DList Name="gCarpetMerchantLeftHandDL" Offset="0x4AC0"/>
<DList Name="gCarpetMerchantUpperArmRightDL" Offset="0x43B0"/>
<DList Name="gCarpetMerchantForearmRightDL" Offset="0x44E0"/>
<DList Name="gCarpetMerchantRightHandDL" Offset="0x4688"/>
<DList Name="gCarpetMerchantHeadDL" Offset="0x4070"/>
<!-- Carpet Merchant Palettes -->
<Texture Name="gCarpetMerchantTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x4C20"/>
<!-- Carpet Merchant DisplayList Textures -->
<Texture Name="gCarpetMerchantPantsTex" OutName="pants" Format="ci8" Width="8" Height="16" Offset="0x4E20" TlutOffset="0x4C20"/>
<Texture Name="gCarpetMerchantHairTex" OutName="hair" Format="ci8" Width="16" Height="16" Offset="0x4EA0" TlutOffset="0x4C20"/>
<Texture Name="gCarpetMerchantFootTex" OutName="foot" Format="ci8" Width="32" Height="16" Offset="0x4FA0" TlutOffset="0x4C20"/>
<Texture Name="gCarpetMerchantSkinGradientTex" OutName="skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x51A0" TlutOffset="0x4C20"/>
<Texture Name="gCarpetMerchantFootSoleTex" OutName="foot_sole" Format="ci8" Width="32" Height="32" Offset="0x51E0" TlutOffset="0x4C20"/>
<Texture Name="gCarpetMerchantHandTex" OutName="hand" Format="ci8" Width="16" Height="16" Offset="0x55E0" TlutOffset="0x4C20"/>
<Texture Name="gCarpetMerchantBraceletTex" OutName="bracelet" Format="ci8" Width="16" Height="32" Offset="0x56E0" TlutOffset="0x4C20"/>
<Texture Name="gCarpetMerchantShirtTex" OutName="shirt" Format="ci8" Width="16" Height="32" Offset="0x58E0" TlutOffset="0x4C20"/>
<Texture Name="gCarpetMerchantChestTex" OutName="chest" Format="ci8" Width="16" Height="32" Offset="0x5AE0" TlutOffset="0x4C20"/>
<Texture Name="gCarpetMerchantHatTex" OutName="hat" Format="ci8" Width="16" Height="16" Offset="0x5CE0" TlutOffset="0x4C20"/>
<!-- Carpet Merchant Animations -->
<Animation Name="gCarpetMerchantSlappingKneeAnim" Offset="0x45C"/>
<Animation Name="gCarpetMerchantIdleAnim" Offset="0x18C"/>
<!-- Carpet Merchant Collision -->
<Collision Name="gCarpetMerchantCol" Offset="0x5EF8"/>
</File>
</Root>