diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2023-05-28 20:04:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-29 13:04:07 +1000 |
| commit | fc475a97565ade34d57f80970c6b5cebcc2892a7 (patch) | |
| tree | 92d32e23a29bf3b2c7063ddc730c7c66b5b5f4d6 /assets/xml/objects | |
| parent | 1ec875f6dccf7efd9d637cd27a1a500f35eed43e (diff) | |
Docs Cleanup (#1153)
* sysheap
* Gorons
* Update goron comment
* functions.h
* Update src/boot_O2/system_heap.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* add header
* Fix header guards
* Update data
* Add malloc and free to header
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Diffstat (limited to 'assets/xml/objects')
| -rw-r--r-- | assets/xml/objects/object_oF1d_map.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/assets/xml/objects/object_oF1d_map.xml b/assets/xml/objects/object_oF1d_map.xml index 0f331cbce..a241eac13 100644 --- a/assets/xml/objects/object_oF1d_map.xml +++ b/assets/xml/objects/object_oF1d_map.xml @@ -47,16 +47,16 @@ <Texture Name="gGoronDonGeroMaskFrillsTex" OutName="goron_don_gero_mask_frills" Format="rgba16" Width="32" Height="32" Offset="0x6440" /> <Texture Name="gGoronDonGeroMaskEyeTex" OutName="goron_don_gero_mask_eye" Format="rgba16" Width="16" Height="16" Offset="0x6C40" /> - <!-- Rolled Up Half --> - <!-- Note: Seems broken --> + <!-- Scared --> + <!-- Unused leftover from OoT --> <DList Name="gGoronEmptyDL" Offset="0x7A60" /> - <DList Name="gGoronRolledUpHalfDL" Offset="0x7A68" /> - <Texture Name="gGoronRolledUpHalfTLUT" OutName="goron_rolled_up_half_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7EF0" /> - <Texture Name="gGoronRolledUpHalfSkinTex" OutName="goron_rolled_up_half_skin" Format="ci8" Width="16" Height="16" Offset="0x80F0" /> - <Texture Name="gGoronRolledUpHalfBellyButtonTex" OutName="goron_rolled_up_half_belly_button" Format="ci8" Width="8" Height="8" Offset="0x81F0" /> - <Texture Name="gGoronRolledUpHalfBottomTex" OutName="goron_rolled_up_half_bottom" Format="ci8" Width="8" Height="16" Offset="0x8230" /> - <Texture Name="gGoronRolledUpHalfRocksTex" OutName="goron_rolled_up_half_rocks" Format="ci8" Width="32" Height="64" Offset="0x82B0" /> - <Texture Name="gGoronRolledUpHalfHairTex" OutName="goron_rolled_up_half_hair" Format="ci8" Width="16" Height="16" Offset="0x8AB0" /> + <DList Name="gGoronScaredDL" Offset="0x7A68" /> + <Texture Name="gGoronScaredTLUT" OutName="goron_scared_tlut" Format="rgba16" Width="16" Height="16" Offset="0x7EF0" /> + <Texture Name="gGoronScaredSkinTex" OutName="goron_scared_skin" Format="ci8" Width="16" Height="16" Offset="0x80F0" /> + <Texture Name="gGoronScaredBellyButtonTex" OutName="goron_scared_belly_button" Format="ci8" Width="8" Height="8" Offset="0x81F0" /> + <Texture Name="gGoronScaredBottomTex" OutName="goron_scared_bottom" Format="ci8" Width="8" Height="16" Offset="0x8230" /> + <Texture Name="gGoronScaredRocksTex" OutName="goron_scared_rocks" Format="ci8" Width="32" Height="64" Offset="0x82B0" /> + <Texture Name="gGoronScaredHairTex" OutName="goron_scared_hair" Format="ci8" Width="16" Height="16" Offset="0x8AB0" /> <!-- Rolled Up --> <DList Name="gGoronEmpty2DL" Offset="0x91A0" /> |