mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 07:20:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix misc 6 (#1148)

Browse source 
* Fix typo `vertexs` -> `vertices`

* Fix typo `limbMatricies` -> `limbMatrices`

* Fix some `gSPTextureRectangle` usage of fixed point constants

* Run formatter

* `ALIGN8` macro

* `object_skj` cleanup

* sholder -> shoulder

* cleanup `stdbool.h`

* Some function prototypes cleanup

* Use macros in `osVirtualToPhysical`
This commit is contained in:
Dragorn421 2022-02-20 14:22:29 +01:00 • committed by GitHub
parent c3533052ca
commit a9526a3354
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 128 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/xml/objects/object_sd.xml
View file

@ -47,7 +47,7 @@
<Texture Name="gEnHeishiKingGuardTex_200" Format="ci8" Width="8" Height="8" Offset="0x0200" TlutOffset="0x0000"/><!--Mouth?-->
<Texture Name="gEnHeishiKingGuardTex_240" Format="ci8" Width="8" Height="8" Offset="0x0240" TlutOffset="0x0000"/><!--Eyes?-->
<Texture Name="gEnHeishiKingGuardArmorTex" OutName="king_guard_armor" Format="ci8" Width="8" Height="8" Offset="0x0280" TlutOffset="0x0000"/>
<Texture Name="gEnHeishiKingGuardSholderGuardTex" OutName="king_guard_sholder_guard" Format="ci8" Width="8" Height="16" Offset="0x02C0" TlutOffset="0x0000"/>
<Texture Name="gEnHeishiKingGuardShoulderGuardTex" OutName="king_guard_shoulder_guard" Format="ci8" Width="8" Height="16" Offset="0x02C0" TlutOffset="0x0000"/>
<Texture Name="gEnHeishiKingGuardChestArmorTex" OutName="king_guard_chest_armor" Format="ci8" Width="32" Height="64" Offset="0x0340" TlutOffset="0x0000"/>
<Texture Name="gEnHeishiKingGuardTex_B40" Format="ci8" Width="16" Height="16" Offset="0x0B40" TlutOffset="0x0000"/> <!--Leg Armor?-->
<Texture Name="gEnHeishiKingGuardHandTex" OutName="king_guard_hand" Format="ci8" Width="8" Height="8" Offset="0x0C40" TlutOffset="0x0000"/>

18
assets/xml/objects/object_skj.xml
View file

@ -1,7 +1,7 @@
<Root>
<File Name="object_skj" Segment="6">
<DList Name="gSKJNeedleDL" Offset="0x0EB0"/>
<DList Name="gSKJskullMaskDL" Offset="0x14C8"/>
<DList Name="gSkullKidNeedleDL" Offset="0x0EB0"/>
<DList Name="gSkullKidSkullMaskDL" Offset="0x14C8"/>
<Limb Name="gSkullKidUnkLimb_5E20" LimbType="Standard" Offset="0x5E20"/>
<Limb Name="gSkullKidUnkLimb_5E2C" LimbType="Standard" Offset="0x5E2C"/>
@ -16,12 +16,11 @@
<Limb Name="gSkullKidNeckLimb" LimbType="Standard" Offset="0x5E98"/>
<Limb Name="gSkullKidHeadAndFaceLimb" LimbType="Standard" Offset="0x5EA4"/>
<Limb Name="gSkullKidUpperHatLimb" LimbType="Standard" Offset="0x5EB0"/>
<Limb Name="gSkullKidLeftSholderLimb" LimbType="Standard" Offset="0x5EBC"/>
<Limb Name="gSkullKidLeftShoulderLimb" LimbType="Standard" Offset="0x5EBC"/>
<Limb Name="gSkullKidLeftArmLimb" LimbType="Standard" Offset="0x5EC8"/>
<Limb Name="gSkullKidLeftHandAndFluteLimb" LimbType="Standard" Offset="0x5ED4"/>
<Limb Name="gSkullKidRightSholderLimb" LimbType="Standard" Offset="0x5EE0"/>
<Limb Name="gSkullKidRightShoulderLimb" LimbType="Standard" Offset="0x5EE0"/>
<Limb Name="gSkullKidRightArmLimb" LimbType="Standard" Offset="0x5EEC"/>
<!--<Limb Name="gSkullKidRightHandLimb" LimbType="Standard" Offset="0x5EF8"/> ZAPD doesnt extract this limb correctly for some reason-->
<Skeleton Name="gSkullKidSkel" Type="Flex" LimbType="Standard" Offset="0x5F40"/>
<!--Limb DLists-->
@ -31,16 +30,15 @@
<DList Name="gSkullKidRightUpperLegDL" Offset="0x3770"/>
<DList Name="gSkullKidRightLowerLegDL" Offset="0x3868"/>
<DList Name="gSkullKidRightFootDL" Offset="0x4630"/>
<DList Name="gSkullKidChestandClothesDL" Offset="0x4008"/>
<DList Name="gSkullKidChestAndClothesDL" Offset="0x4008"/>
<DList Name="gSkullKidNeckDL" Offset="0x40E8"/>
<DList Name="gSKullKidHeadAndFaceDL" Offset="0x44C8"/>
<DList Name="gSkullKidUpperHatDL" Offset="0x5130"/>
<DList Name="gSkullKidLeftSholderDL" Offset="0x4FB8"/>
<DList Name="gSkullKidLeftShoulderDL" Offset="0x4FB8"/>
<DList Name="gSkullKidLeftArmDL" Offset="0x4CF8"/>
<DList Name="gSkullKidLeftHandAndFluteDL" Offset="0x4B28"/>
<DList Name="gSkullKidRightSholderDL" Offset="0x49B0"/>
<DList Name="gSkullKidRightShoulderDL" Offset="0x49B0"/>
<DList Name="gSkullKidRightArmDL" Offset="0x4810"/>
<!--<DList Name="gSkullKidRightHand" Offset="0x5E38"/>-->
<Animation Name="gSkullKidBackflipAnim" Offset="0x051C"/>
<Animation Name="gSkullKidShootNeedleAnim" Offset="0x07A4"/>
@ -48,7 +46,7 @@
<Animation Name="gSkullKidDieAnim" Offset="0x6A98"/>
<Animation Name="gSkullKidHitAnim" Offset="0x6D84"/>
<Animation Name="gSkullKidLandAnim" Offset="0x7128"/>
<Animation Name="gSkullKidLookLeftAndRightAnim" Offset="0x8174"/> <!--Unused-->
<Animation Name="gSkullKidLookLeftAndRightAnim" Offset="0x8174"/>
<Animation Name="gSkullKidFightingStanceAnim" Offset="0x8374"/>
<Animation Name="gSkullKidWaitAnim" Offset="0x8B9C"/>
<Animation Name="gSkullKidWalkToPlayerAnim" Offset="0x8E14"/>

2
assets/xml/overlays/ovl_En_Jsjutan.xml
View file

@ -24,7 +24,7 @@
<!-- D_80A8D618. Draws the carpet's shadow texture. -->
<DList Name="sShadowMaterialDL" Offset="0x3E78"/>
<!-- D_80A8D688. Draws vertexs in segment 0x0C. -->
<!-- D_80A8D688. Draws vertices in segment 0x0C. -->
<DList Name="sModelDL" Offset="0x3EE8"/>
<!-- D_80A8DAB8. Carpet vertices. Same vertex type as sCarpetOddVtx. Used when gameplayFrames is even. -->