mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-08-21 22:40:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix misc 15 (#1298)

Browse Source 
* Use `SCENE_` enum more

* Decimal for pos in `D_8011F9B8`

* `__osEventStateTab`: length `OS_NUM_EVENTS + 1` -> `OS_NUM_EVENTS`

* thone -> throne

* `s` on local data

* minor sfxId cleanup

* Run formatter

* Fixup 0x19 + 1 = 0x1A, not 0x20 lol

* Tlut -> TLUT

* DemoKankyo params usage cleanup

* Some proofreading (up to z_actor.c)

* Revert 0 -> sfxId, add todo comment (sfxId=0 is weird apparently)

* `sZdWaterBox` -> `sZorasDomainWaterBox`

* `msgMode == MSGMODE_`, not `GAMEMODE_` (my bad Sadge)
This commit is contained in:
Dragorn421
2022-06-24 16:45:05 -07:00
committed by GitHub
parent fe7afb9b07
commit 397e481f9a
22 changed files with 60 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_kz.xml
+2 -2
View File
@@ -2,8 +2,8 @@
<File Name="object_kz" Segment="6">
<Animation Name="gKzMweepAnim" Offset="0x46C"/>
<Animation Name="gKzIdleAnim" Offset="0x75C"/>
<Texture Name="gKzTlut" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x770"/>
<Texture Name="gKzEyeTlut" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x970"/>
<Texture Name="gKzTLUT" OutName="tlut" Format="rgba16" Width="16" Height="16" Offset="0x770"/>
<Texture Name="gKzEyeTLUT" OutName="eye_tlut" Format="rgba16" Width="16" Height="16" Offset="0x970"/>
<Texture Name="gKzFaceScalesTex" OutName="face_scales" Format="ci8" Width="32" Height="32" Offset="0xB70" TlutOffset="0x770"/>
<Texture Name="gKzSkinGradient1Tex" OutName="skin_gradient_1" Format="ci8" Width="8" Height="16" Offset="0xF70" TlutOffset="0x770"/>
<Texture Name="gKzCrownTex" OutName="crown" Format="ci8" Width="32" Height="32" Offset="0xFF0" TlutOffset="0x770"/>
assets/xml/objects/object_link_boy.xml
+1 -1
View File
@@ -241,7 +241,7 @@
<Texture Name="gLinkAdultNoseTex" OutName="nose" Format="ci8" Width="16" Height="16" Offset="0x5100" TlutOffset="0x5C00"/>
<!-- Tluts -->
<Texture Name="gLinkAdultHeadTlut" OutName="head_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C00"/>
<Texture Name="gLinkAdultHeadTLUT" OutName="head_tlut" Format="rgba16" Width="16" Height="16" Offset="0x5C00"/>
<Texture Name="gLinkAdultTlut_005E00" OutName="tlut_5E00" Format="rgba16" Width="16" Height="16" Offset="0x5E00"/>
<!-- Unused -->