mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-09-03 02:03:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some fixable warnings (#728)

Browse Source 
* Fix setup warnings

Signed-off-by: angie <angheloalf95@gmail.com>

* Casting the problems away

Signed-off-by: angie <angheloalf95@gmail.com>

* I don't really like changing the type to void

Signed-off-by: angie <angheloalf95@gmail.com>

* We're out of EARLY hell

Signed-off-by: angie <angheloalf95@gmail.com>

* ./format.sh

Signed-off-by: angie <angheloalf95@gmail.com>

* Change skel type to "Normal"

Signed-off-by: angie <angheloalf95@gmail.com>

* Changes requested

Signed-off-by: angie <angheloalf95@gmail.com>

* suggestion of roman

Signed-off-by: angie <angheloalf95@gmail.com>

* early is back :c

Signed-off-by: angie <angheloalf95@gmail.com>

* This will be a fix in ZAPD

Signed-off-by: angie <angheloalf95@gmail.com>
This commit is contained in:
Anghelo Carvajal
2021-03-23 20:45:42 -03:00
committed by GitHub
parent 9b9a983860
commit 5562b2ef6f
16 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_bg.xml
+10 -10
View File
@@ -22,16 +22,16 @@
<DList Name="gChuGirlRightHandDL" Offset="0x3968"/>
<!-- Bombchu Bowling Girl limbs -->
<Limb Name="gChuGirlWaistLimb" Type="Standard" Offset="0x6E10"/>
<Limb Name="gChuGirlTorsoLimb" Type="Standard" Offset="0x6E1C"/>
<Limb Name="gChuGirlNeckLimb" Type="Standard" Offset="0x6E28"/>
<Limb Name="gChuGirlHeadLimb" Type="Standard" Offset="0x6E34"/>
<Limb Name="gChuGirlLeftUpperArmLimb" Type="Standard" Offset="0x6E40"/>
<Limb Name="gChuGirlLeftForearmLimb" Type="Standard" Offset="0x6E4C"/>
<Limb Name="gChuGirlLeftHandLimb" Type="Standard" Offset="0x6E58"/>
<Limb Name="gChuGirlRightUpperArmLimb" Type="Standard" Offset="0x6E64"/>
<Limb Name="gChuGirlRightForearmLimb" Type="Standard" Offset="0x6E70"/>
<Limb Name="gChuGirlRightHandLimb" Type="Standard" Offset="0x6E7C"/>
<Limb Name="gChuGirlWaistLimb" LimbType="Standard" Offset="0x6E10"/>
<Limb Name="gChuGirlTorsoLimb" LimbType="Standard" Offset="0x6E1C"/>
<Limb Name="gChuGirlNeckLimb" LimbType="Standard" Offset="0x6E28"/>
<Limb Name="gChuGirlHeadLimb" LimbType="Standard" Offset="0x6E34"/>
<Limb Name="gChuGirlLeftUpperArmLimb" LimbType="Standard" Offset="0x6E40"/>
<Limb Name="gChuGirlLeftForearmLimb" LimbType="Standard" Offset="0x6E4C"/>
<Limb Name="gChuGirlLeftHandLimb" LimbType="Standard" Offset="0x6E58"/>
<Limb Name="gChuGirlRightUpperArmLimb" LimbType="Standard" Offset="0x6E64"/>
<Limb Name="gChuGirlRightForearmLimb" LimbType="Standard" Offset="0x6E70"/>
<Limb Name="gChuGirlRightHandLimb" LimbType="Standard" Offset="0x6E7C"/>
<!-- Bombchu Bowling Girl limb textures -->
<Texture Name="gChuGirlMouthTex" OutName="chu_girl_mouth" Format="rgb5a1" Width="32" Height="32" Offset="0x5910"/>
assets/xml/objects/object_dekunuts.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<Root>
<File Name="object_dekunuts" Segment="6">
<!-- Deku Scrub skeleton -->
<Skeleton Name="gDekuNutsSkel" Type="Standard" LimbType="Standard" Offset="0x3268"/>
<Skeleton Name="gDekuNutsSkel" Type="Normal" LimbType="Standard" Offset="0x3268"/>
<!-- Deku Scrub animations -->
<Animation Name="gDekuNutsSpitAnim" Offset="0x1C4"/>
assets/xml/objects/object_dnk.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<Root>
<File Name="object_dnk" Segment="6">
<!-- Forest Stage scrub skeleton -->
<Skeleton Name="gDntStageSkel" Type="Standard" LimbType="Standard" Offset="0x2AF0"/>
<Skeleton Name="gDntStageSkel" Type="Normal" LimbType="Standard" Offset="0x2AF0"/>
<!-- Forest Stage scrub animations -->
<Animation Name="gDntStageSpitAnim" Offset="0x31C"/>
assets/xml/objects/object_dns.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<Root>
<File Name="object_dns" Segment="6">
<!-- Forest Stage leader skeleton -->
<Skeleton Name="gDntJijiSkel" Type="Standard" LimbType="Standard" Offset="0x33E0"/>
<Skeleton Name="gDntJijiSkel" Type="Normal" LimbType="Standard" Offset="0x33E0"/>
<!-- Forest Stage leader animations -->
<Animation Name="gDntJijiBurrowAnim" Offset="0x560"/>
assets/xml/objects/object_dodongo.xml
+1 -1
View File
@@ -27,7 +27,7 @@
<Texture Name="gDodongoToothTex" OutName="tooth" Format="rgb5a1" Width="8" Height="8" Offset="0x80B8"/>
<!-- Dodongo Skeleton -->
<Skeleton Name="gDodongoSkel" Type="Standard" LimbType="Standard" Offset="0x8318"/>
<Skeleton Name="gDodongoSkel" Type="Normal" LimbType="Standard" Offset="0x8318"/>
<!-- Fire Effect Textures -->
<Texture Name="gDodongoFire0Tex" OutName="fire_0" Format="i4" Width="32" Height="32" Offset="0x90A0"/>
assets/xml/objects/object_firefly.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<File Name="object_firefly" Segment="6">
<Animation Name="gKeeseFlyAnim" Offset="0x17C"/>
<Skeleton Name="gKeeseSkeleton" Type="Standard" LimbType="Standard" Offset="0x18B8"/>
<Skeleton Name="gKeeseSkeleton" Type="Normal" LimbType="Standard" Offset="0x18B8"/>
<DList Name="gKeeseEyesDL" Offset="0x1678"/>
assets/xml/objects/object_hintnuts.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<Root>
<File Name="object_hintnuts" Segment="6">
<!-- Deku scrub skeleton -->
<Skeleton Name="gHintNutsSkel" Type="Standard" LimbType="Standard" Offset="0x23B8"/>
<Skeleton Name="gHintNutsSkel" Type="Normal" LimbType="Standard" Offset="0x23B8"/>
<!-- Deku Scrub animations -->
<Animation Name="gHintNutsSpitAnim" Offset="0x168"/>
assets/xml/objects/object_okuta.xml
+1 -1
View File
@@ -20,7 +20,7 @@
<Texture Name="gOctorokFadeToBlackTex" OutName="fade_to_black" Format="rgb5a1" Width="8" Height="8" Offset="0x30D0"/>
<!-- Octorok Skeleton -->
<Skeleton Name="gOctorokSkel" Offset="0x3660"/>
<Skeleton Name="gOctorokSkel" Type="Normal" LimbType="Standard" Offset="0x3660"/>
<!-- Projectile -->
<Texture Name="gOctorokProjectileTex" OutName="projectile" Format="rgb5a1" Width="16" Height="16" Offset="0x3150"/>
assets/xml/objects/object_sk2.xml
+5 -5
View File
@@ -24,11 +24,11 @@
<DList Name="gStalfosLeftThighDL" Offset="0x68E0"/>
<DList Name="gStalfosLeftFistDL" Offset="0x6988"/>
<DList Name="gStalfosSwordDL" Offset="0x6A48"/>
<Limb Name="gStalfosLimb0" Type="Standard" Offset="0x7868"/>
<Limb Name="gStalfosLimb1" Type="Standard" Offset="0x7874"/>
<Limb Name="gStalfosJawLimb" Type="Standard" Offset="0x78D4"/>
<Limb Name="gStalfosHeadLimb" Type="Standard" Offset="0x78E0"/>
<Limb Name="gStalfosEntryFirstVertebLimb" Type="Standard" Offset="0x78EC"/>
<Limb Name="gStalfosLimb0" LimbType="Standard" Offset="0x7868"/>
<Limb Name="gStalfosLimb1" LimbType="Standard" Offset="0x7874"/>
<Limb Name="gStalfosJawLimb" LimbType="Standard" Offset="0x78D4"/>
<Limb Name="gStalfosHeadLimb" LimbType="Standard" Offset="0x78E0"/>
<Limb Name="gStalfosEntryFirstVertebLimb" LimbType="Standard" Offset="0x78EC"/>
<Skeleton Name="gStalfosSkel" Type="Normal" LimbType="Standard" Offset="0x7C28"/>
<Animation Name="gStalfosBackDamageAnim" Offset="0x444"/>
<Animation Name="gStalfosBackDownAnim" Offset="0x1420"/>