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

Misc Cleanup 2 (#1007)

Browse source 
* Cleanup `UNK_TYPE`, `UNK_PTR` usage

* Add some missing empty lines after declarations

* Remove some legacy comments from non-matching times

* Fix some grammar (mostly "it's"/"its")

* Use proper names for two symbols after ZAPD bugfix

* Cleanup `place_title_cards.xml`

* Use `NULL` to check against `D_8012D260` pointer

* Parentheses around some macro arguments

* wip proofread headers up to z64animation.h
This commit is contained in:
Dragorn421 2021-12-01 00:40:42 +01:00 • committed by GitHub
parent 04a9d51e90
commit 669732abbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
104 changed files with 217 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

3
assets/xml/scenes/overworld/spot02.xml
View file

@ -2,8 +2,7 @@
<File Name="spot02_scene" Segment="2">
<Scene Name="spot02_scene" Offset="0x0"/>
<!-- This symbol should be named spot02_scene_Cs_003C80 but a ZAPD bug prevents it -->
<Cutscene Name="spot02_sceneCutsceneData0x003C80" Offset="0x3C80"/>
<Cutscene Name="spot02_scene_Cs_003C80" Offset="0x3C80"/>
<Cutscene Name="spot02_scene_Cs_005020" Offset="0x5020"/>
<Cutscene Name="gGraveyardIntroCs" Offset="0x70C0"/>

3
assets/xml/scenes/overworld/spot05.xml
View file

@ -2,8 +2,7 @@
<File Name="spot05_scene" Segment="2">
<Cutscene Name="gMinuetCs" Offset="0x3F80"/>
<!-- This symbol should be named spot05_scene_Cs_005730 but a ZAPD bug prevents it -->
<Cutscene Name="spot05_sceneCutsceneData0x005730" Offset="0x5730"/>
<Cutscene Name="spot05_scene_Cs_005730" Offset="0x5730"/>
<Path Name="gSpot05Path_0069D8" Offset="0x69D8"/>
<Path Name="gSpot05Path_0069E0" Offset="0x69E0"/>

4
assets/xml/textures/place_title_cards.xml
View file

@ -1,5 +1,5 @@
<Root>
<File Name="g_pn_01" >
<File Name="g_pn_01">
<Texture Name="gForestTempleTitleCardENGTex" OutName="forest_temple_eng" Format="ia8" Width="144" Height="24" Offset="0x0"/>
<Texture Name="gForestTempleTitleCardGERTex" OutName="forest_temple_ger" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
<Texture Name="gForestTempleTitleCardFRATex" OutName="forest_temple_fra" Format="ia8" Width="144" Height="24" Offset="0x1B00"/>
@ -64,7 +64,7 @@
<Texture Name="gGreatFairysFountainTitleCardGERTex" OutName="great_fairys_fountain_ger" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
<Texture Name="gGreatFairysFountainTitleCardFRATex" OutName="great_fairys_fountain_fra" Format="ia8" Width="144" Height="24" Offset="0x1B00"/>
</File>
<File Name="g_pn_14">
<File Name="g_pn_14">
<Texture Name="gChamberOfTheSagesTitleCardENGTex" OutName="chamber_of_the_sages_eng" Format="ia8" Width="144" Height="24" Offset="0x0"/>
<Texture Name="gChamberOfTheSagesTitleCardGERTex" OutName="chamber_of_the_sages_ger" Format="ia8" Width="144" Height="24" Offset="0xD80"/>
<Texture Name="gChamberOfTheSagesTitleCardFRATex" OutName="chamber_of_the_sages_fra" Format="ia8" Width="144" Height="24" Offset="0x1B00"/>