Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gerudo objects #757

Merged
merged 11 commits into from
Apr 10, 2021
Merged

Gerudo objects #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
51c177f
object_ge1
EllipticEllipsis Apr 3, 2021
00c9851
more stuff named
EllipticEllipsis Apr 3, 2021
742983a
object_gla OK, symbols added to C
EllipticEllipsis Apr 4, 2021
eb8f187
eff fire fix in gameplay_keep
EllipticEllipsis Apr 4, 2021
1e48e1c
object_nb OK, fixed gameplay_keep
EllipticEllipsis Apr 5, 2021
e4f3046
replaced symbols in EnNb, limb enums
EllipticEllipsis Apr 5, 2021
dd33278
Change EnGeldB limb enums to hex
EllipticEllipsis Apr 5, 2021
e6f4891
Use enum in header too
EllipticEllipsis Apr 5, 2021
e8ea690
Add descriptions to EnGe2 and EnNb, rearrange xml
EllipticEllipsis Apr 5, 2021
6208981
Reorder xml
EllipticEllipsis Apr 5, 2021
457cfef
review changes
EllipticEllipsis Apr 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions assets/xml/objects/gameplay_keep.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,8 +929,8 @@
<DList Name="gZTargetLockOnTriangleDL" Offset="0x4D450"/>
<DList Name="gEffFire1DL" Offset="0x4D4E0"/>
<DList Name="gEffFire2DL" Offset="0x4D5A0"/>
<Texture Name="gEffFire1Tex" OutName="eff_fire_1" Format="i8" Width="32" Height="64" Offset="0x4D660"/>
<Texture Name="gEffFire2Tex" OutName="eff_fire_2" Format="i8" Width="32" Height="64" Offset="0x4DE60"/>
<Texture Name="gDecorativeFlameMaskTex" OutName="eff_fire_mask" Format="i4" Width="32" Height="128" Offset="0x4D660"/>
<Texture Name="gDecorativeFlameTex" OutName="eff_fire" Format="i8" Width="32" Height="64" Offset="0x4DE60"/>
<DList Name="gUnusedUnknownShape1DL" Offset="0x4F2B0"/>
<DList Name="gUnusedUnknownShape1RefDL" Offset="0x4F630"/>
<DList Name="gUnusedUnknownShape2DL" Offset="0x502E0"/>
Expand Down
78 changes: 78 additions & 0 deletions assets/xml/objects/object_ge1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<Root>
<File Name="object_ge1" Segment="6">

<!-- White-clothed Gerudo Skeleton -->
<Skeleton Name="gGerudoWhiteSkel" Type="Flex" LimbType="Standard" Offset="0x0330"/>

<!-- White-clothed Gerudo Limbs -->
<Limb Name="gGerudoWhiteWaistLimb" Type="Standard" Offset="0x0240"/>
<Limb Name="gGerudoWhiteLeftThighLimb" Type="Standard" Offset="0x024C"/>
<Limb Name="gGerudoWhiteLeftShinLimb" Type="Standard" Offset="0x0258"/>
<Limb Name="gGerudoWhiteLeftFootLimb" Type="Standard" Offset="0x0264"/>
<Limb Name="gGerudoWhiteRightThighLimb" Type="Standard" Offset="0x0270"/>
<Limb Name="gGerudoWhiteRightShinLimb" Type="Standard" Offset="0x027C"/>
<Limb Name="gGerudoWhiteRightFootLimb" Type="Standard" Offset="0x0288"/>
<Limb Name="gGerudoWhiteTorsoLimb" Type="Standard" Offset="0x0294"/>
<Limb Name="gGerudoWhiteLeftUpperArmLimb" Type="Standard" Offset="0x02A0"/>
<Limb Name="gGerudoWhiteLeftForearmLimb" Type="Standard" Offset="0x02AC"/>
<Limb Name="gGerudoWhiteLeftHandLimb" Type="Standard" Offset="0x02B8"/>
<Limb Name="gGerudoWhiteRightUpperArmLimb" Type="Standard" Offset="0x02C4"/>
<Limb Name="gGerudoWhiteRightForearmLimb" Type="Standard" Offset="0x02D0"/>
<Limb Name="gGerudoWhiteRightHandLimb" Type="Standard" Offset="0x02DC"/>
<Limb Name="gGerudoWhiteHeadLimb" Type="Standard" Offset="0x02E8"/>

<!-- White-clothed Gerudo Limb DisplayLists -->
<DList Name="gGerudoWhiteWaistDL" Offset="0x69E0"/>
<DList Name="gGerudoWhiteLeftThighDL" Offset="0x70B0"/>
<DList Name="gGerudoWhiteLeftShinDL" Offset="0x71E0"/>
<DList Name="gGerudoWhiteLeftFootDL" Offset="0x73A8"/>
<DList Name="gGerudoWhiteRightThighDL" Offset="0x6AD0"/>
<DList Name="gGerudoWhiteRightShinDL" Offset="0x6C00"/>
<DList Name="gGerudoWhiteRightFootDL" Offset="0x6E50"/>
<DList Name="gGerudoWhiteTorsoDL" Offset="0x5608"/>
<DList Name="gGerudoWhiteLeftUpperArmDL" Offset="0x6510"/>
<DList Name="gGerudoWhiteLeftForearmDL" Offset="0x66B8"/>
<DList Name="gGerudoWhiteLeftHandDL" Offset="0x67E8"/>
<DList Name="gGerudoWhiteRightUpperArmDL" Offset="0x6040"/>
<DList Name="gGerudoWhiteRightForearmDL" Offset="0x61E8"/>
<DList Name="gGerudoWhiteRightHandDL" Offset="0x6318"/>
<DList Name="gGerudoWhiteHeadDL" Offset="0x5C38"/>

<!-- White-clothed Gerudo palettes -->
<Texture Name="gGerudoWhiteGeneralTLUT" OutName="gerudo_white_general_tlut" Format="rgb5a1" Width="16" Height="16" Offset="0x0348"/>
<Texture Name="gGerudoWhiteHairTLUT" OutName="gerudo_white_hair_tlut" Format="rgb5a1" Width="16" Height="16" Offset="0x2808"/>

<!-- White-clothed Gerudo Displaylist textures -->
<Texture Name="gGerudoWhiteSkinGradientTex" OutName="gerudo_white_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x0548"/>
<Texture Name="gGerudoWhiteWhiteFabricLipsTex" OutName="gerudo_white_white_fabric_lips" Format="ci8" Width="16" Height="16" Offset="0x0588"/>
<Texture Name="gGerudoWhiteEarTex" OutName="gerudo_white_ear" Format="ci8" Width="8" Height="16" Offset="0x0688"/>
<Texture Name="gGerudoWhiteFingersTex" OutName="gerudo_white_fingers" Format="ci8" Width="32" Height="32" Offset="0x1F08"/>
<Texture Name="gGerudoWhiteArmletTex" OutName="gerudo_white_armlet" Format="ci8" Width="8" Height="16" Offset="0x2308"/>
<Texture Name="gGerudoWhiteJacketTex" OutName="gerudo_white_jacket" Format="ci8" Width="16" Height="16" Offset="0x2388"/>
<Texture Name="gGerudoWhiteTubeTopTex" OutName="gerudo_white_tube_top" Format="ci8" Width="16" Height="16" Offset="0x2488"/>
<Texture Name="gGerudoWhiteNavelTex" OutName="gerudo_white_navel" Format="ci8" Width="16" Height="16" Offset="0x2588"/>
<Texture Name="gGerudoWhiteCleavageTex" OutName="gerudo_white_cleavage" Format="ci8" Width="8" Height="8" Offset="0x2688"/>
<Texture Name="gGerudoWhiteShoeUpperTex" OutName="gerudo_white_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x26C8"/>
<Texture Name="gGerudoWhiteShoeSoleTex" OutName="gerudo_white_shoe_sole" Format="ci8" Width="8" Height="8" Offset="0x2748"/>
<Texture Name="gGerudoWhiteCrotchTex" OutName="gerudo_white_crotch" Format="rgb5a1" Width="8" Height="8" Offset="0x2788"/>

<!-- White-clothed Gerudo Hairstyle DisplayLists -->
<DList Name="gGerudoWhiteHairstyleBobDL" Offset="0x9198"/>
<DList Name="gGerudoWhiteHairstyleStraightFringeDL" Offset="0x9430"/>
<DList Name="gGerudoWhiteHairstyleSpikyDL" Offset="0x9690"/>

<!-- White-clothed Gerudo Hair textures -->
<Texture Name="gGerudoWhiteHairTex" OutName="gerudo_white_hair" Format="ci8" Width="16" Height="16" Offset="0x2A08"/>

<!-- White-clothed Gerudo Eye Textures -->
<Texture Name="gGerudoWhiteEyeOpenTex" OutName="gerudo_white_eye_open" Format="rgb5a1" Width="32" Height="32" Offset="0x0708"/>
<Texture Name="gGerudoWhiteEyeHalfTex" OutName="gerudo_white_eye_half" Format="rgb5a1" Width="32" Height="32" Offset="0x0F08"/>
<Texture Name="gGerudoWhiteEyeClosedTex" OutName="gerudo_white_eye_closed" Format="rgb5a1" Width="32" Height="32" Offset="0x1708"/>

<!-- White-clothed Gerudo Animations -->
<Animation Name="gGerudoWhiteUnusedFoldingArmsAnim" Offset="0x0168"/>
<Animation Name="gGerudoWhiteIdleAnim" Offset="0x0228"/>
<Animation Name="gGerudoWhiteClapAnim" Offset="0xA048"/>
<Animation Name="gGerudoWhiteDismissiveAnim" Offset="0xA498"/>
</File>
</Root>
85 changes: 85 additions & 0 deletions assets/xml/objects/object_gla.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<Root>
<File Name="object_gla" Segment="6">
<!-- Purple-clothed Gerudo Skeleton -->
<Skeleton Name="gGerudoPurpleSkel" Type="Flex" LimbType="Standard" Offset="0x8968"/>

<!-- Purple-clothed Gerudo Limbs -->
<Limb Name="gGerudoPurpleRootLimb" Type="Standard" Offset="0x8818"/>
<Limb Name="gGerudoPurpleTorsoLimb" Type="Standard" Offset="0x8824"/>
<Limb Name="gGerudoPurpleNeckLimb" Type="Standard" Offset="0x8830"/>
<Limb Name="gGerudoPurplePonytailLimb" Type="Standard" Offset="0x883C"/>
<Limb Name="gGerudoPurpleVeilLimb" Type="Standard" Offset="0x8848"/>
<Limb Name="gGerudoPurpleHeadLimb" Type="Standard" Offset="0x8854"/>
<Limb Name="gGerudoPurpleRightUpperArmLimb" Type="Standard" Offset="0x8860"/>
<Limb Name="gGerudoPurpleRightForearmLimb" Type="Standard" Offset="0x886C"/>
<Limb Name="gGerudoPurpleRightWristLimb" Type="Standard" Offset="0x8878"/>
<Limb Name="gGerudoPurpleRightHandLimb" Type="Standard" Offset="0x8884"/>
<Limb Name="gGerudoPurpleGlaiveLimb" Type="Standard" Offset="0x8890"/>
<Limb Name="gGerudoPurpleLeftUpperArmLimb" Type="Standard" Offset="0x889C"/>
<Limb Name="gGerudoPurpleLeftForearmLimb" Type="Standard" Offset="0x88A8"/>
<Limb Name="gGerudoPurpleLeftHandLimb" Type="Standard" Offset="0x88B4"/>
<Limb Name="gGerudoPurpleLeftThighLimb" Type="Standard" Offset="0x88C0"/>
<Limb Name="gGerudoPurpleLeftShinLimb" Type="Standard" Offset="0x88CC"/>
<Limb Name="gGerudoPurpleLeftFootLimb" Type="Standard" Offset="0x88D8"/>
<Limb Name="gGerudoPurpleRightThighLimb" Type="Standard" Offset="0x88E4"/>
<Limb Name="gGerudoPurpleRightShinLimb" Type="Standard" Offset="0x88F0"/>
<Limb Name="gGerudoPurpleRightFootLimb" Type="Standard" Offset="0x88FC"/>
<Limb Name="gGerudoPurpleWaistLimb" Type="Standard" Offset="0x8908"/>

<!-- Purple-clothed Gerudo Limb DisplayLists -->
<DList Name="gGerudoPurpleTorsoDL" Offset="0x3540"/>
<DList Name="gGerudoPurplePonytailDL" Offset="0x8270"/>
<DList Name="gGerudoPurpleVeilDL" Offset="0x81B8"/>
<DList Name="gGerudoPurpleHeadDL" Offset="0x8360"/>
<DList Name="gGerudoPurpleRightUpperArmDL" Offset="0x39E0"/>
<DList Name="gGerudoPurpleRightForearmDL" Offset="0x3B18"/>
<DList Name="gGerudoPurpleRightHandDL" Offset="0x7E60"/>
<DList Name="gGerudoPurpleGlaiveDL" Offset="0x7FC8"/>
<DList Name="gGerudoPurpleLeftUpperArmDL" Offset="0x3D18"/>
<DList Name="gGerudoPurpleLeftForearmDL" Offset="0x3E50"/>
<DList Name="gGerudoPurpleLeftHandDL" Offset="0x7CF8"/>
<DList Name="gGerudoPurpleLeftThighDL" Offset="0x44B8"/>
<DList Name="gGerudoPurpleLeftShinDL" Offset="0x45C8"/>
<DList Name="gGerudoPurpleLeftFootDL" Offset="0x7978"/>
<DList Name="gGerudoPurpleRightThighDL" Offset="0x41E8"/>
<DList Name="gGerudoPurpleRightShinDL" Offset="0x42F8"/>
<DList Name="gGerudoPurpleRightFootDL" Offset="0x7B38"/>
<DList Name="gGerudoPurpleWaistDL" Offset="0x4050"/>

<!-- Purple-clothed Gerudo palettes -->
<Texture Name="gGerudoPurple1TLUT" OutName="gerudo_purple_1_tlut" Format="rgb5a1" Width="16" Height="16" Offset="0x4788"/>
<Texture Name="gGerudoPurple2TLUT" OutName="gerudo_purple_2_tlut" Format="rgb5a1" Width="18" Height="12" Offset="0x4D08"/>

<!-- Purple-clothed Gerudo Displaylist textures -->
<Texture Name="gGerudoPurpleSkinShadowTex" OutName="gerudo_purple_skin_shadow" Format="ci8" Width="8" Height="8" Offset="0x4988"/>
<Texture Name="gGerudoPurpleNavelTex" OutName="gerudo_purple_navel" Format="ci8" Width="16" Height="16" Offset="0x4A08"/>
<Texture Name="gGerudoPurpleChestJewelTex" OutName="gerudo_purple_chest_jewel" Format="ci8" Width="16" Height="16" Offset="0x4B08"/>
<Texture Name="gGerudoPurpleSkinEdgeTex" OutName="gerudo_purple_skin_edge" Format="ci8" Width="8" Height="8" Offset="0x4EB8"/>
<Texture Name="gGerudoPurpleEarTex" OutName="gerudo_purple_ear" Format="ci8" Width="8" Height="16" Offset="0x4EF8"/>
<Texture Name="gGerudoPurpleDarkFabricTex" OutName="gerudo_purple_dark_fabric" Format="ci8" Width="8" Height="8" Offset="0x49C8"/>
<Texture Name="gGerudoPurpleFabricFoldTex" OutName="gerudo_purple_fabric_fold" Format="i8" Width="16" Height="16" Offset="0x4C08"/>
<Texture Name="gGerudoPurpleGlaiveGuard" OutName="gerudo_purple_glaive_guard" Format="i8" Width="8" Height="8" Offset="0x5378"/>
<Texture Name="gGerudoPurpleGlaiveBladeFabricPatternTex" OutName="gerudo_purple_fabric_pattern" Format="i8" Width="16" Height="16" Offset="0x53B8"/>
<Texture Name="gGerudoPurpleShoeUpperTex" OutName="gerudo_purple_shoe_upper" Format="ci8" Width="8" Height="16" Offset="0x54B8"/>
<Texture Name="gGerudoPurpleGlaiveHaftShoeSoleTex" OutName="gerudo_purple_glaive_haft_shoe_upper" Format="ci8" Width="8" Height="8" Offset="0x5538"/>
<Texture Name="gGerudoPurpleMetalTex" OutName="gerudo_purple_metal" Format="i8" Width="8" Height="16" Offset="0x5978"/>
<Texture Name="gGerudoPurpleHairTex" OutName="gerudo_purple_hair" Format="ci8" Width="16" Height="16" Offset="0x59F8"/>
<Texture Name="gGerudoPurpleLipsFingersTex" OutName="gerudo_purple_lips_fingers" Format="i8" Width="16" Height="16" Offset="0x5AF8"/>

<!-- Purple-clothed Gerudo Eye Textures -->
<Texture Name="gGerudoPurpleEyeOpenTex" OutName="gerudo_purple_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4F78"/>
<Texture Name="gGerudoPurpleEyeHalfTex" OutName="gerudo_purple_eye_half" Format="ci8" Width="32" Height="32" Offset="0x5578"/>
<Texture Name="gGerudoPurpleEyeClosedTex" OutName="gerudo_purple_eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5BF8"/>

<!-- Purple-clothed Gerudo Animations -->
<Animation Name="gGerudoPurpleUnusedHorizontalSlashAnim" Offset="0x0324"/>
<Animation Name="gGerudoPurpleUnusedSlashToStandingAnim" Offset="0x0780"/>
<Animation Name="gGerudoPurpleFallingToGroundAnim" Offset="0x11F4"/>
<Animation Name="gGerudoPurpleUnusedStandingToCrouchAnim" Offset="0x15D0"/>
<Animation Name="gGerudoPurpleUnusedCrouchingLookAroundAnim" Offset="0x1B3C"/>
<Animation Name="gGerudoPurpleChargingAnim" Offset="0x8D60"/>
<Animation Name="gGerudoPurpleLookingAboutAnim" Offset="0x98AC"/>
<Animation Name="gGerudoPurpleWalkingAnim" Offset="0x9ED4"/>

</File>
</Root>
Loading