mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

ovl_En_Xc and object_xc OK (#746)

Browse source 
* Started

* did some more

* did a few more

* update

* Fixed corrupted git repo

* did some more

* Did a few more functions

* taking a break

* fix undefined

* matched the stupid hard function

* a few more

* did some more, done for tonight

* commit in case i mess up

* 3 non matching

* .

* remove tools/ZAP2 from origin master

* idk

* i cant figure this out

* object_xc OK

* compiles now

* the evil function is now ok

* z_en_xc OK

* some documentation

* more documentation i guess

* more documentation

* more z_en_xc docs

* z_en_xc updates

* Final pass, its been nearly a year

* Remove unnecessary comment

* forgot to remove unused asm

* Merge

* Made suggested changes and fixed warnings in z_en_xc

* Remove symbols from undefined_syms.txt

* Add some missing animmode to en_Xc

* review

* review

* fix tot cutscene

* comment

Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
This commit is contained in:
Lucas Shaw 2021-04-14 15:49:56 -07:00 • committed by GitHub
parent 9e956cbe3f
commit 70978762b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
249 changed files with 2555 additions and 7335 deletions
Download patch file Download diff file Expand all files Collapse all files

32
assets/xml/objects/object_xc.xml Normal file
View file

@ -0,0 +1,32 @@
<Root>
<File Name="object_xc" Segment="6">
<Skeleton Name="gShiekSkel" Type="Flex" LimbType="Standard" Offset="0x12AF0"/>
<Animation Name="gShiekPlayingHarpAnim" Offset="0xB6C"/>
<Animation Name="gShiekShowingTriforceOnHandAnim" Offset="0x1A08"/>
<Animation Name="gShiekShowingTriforceOnHandIdleAnim" Offset="0x1D14"/>
<Animation Name="gShiekPlayingHarp2Anim" Offset="0x289C"/>
<Animation Name="gShiekPlayingHarp3Anim" Offset="0x35C8"/>
<Animation Name="gShiekPlayingHarp4Anim" Offset="0x4570"/>
<Animation Name="gShiekIdleAnim" Offset="0x4828"/>
<Animation Name="gShiekWalkingAnim" Offset="0x12FD0"/>
<Animation Name="gShiekArmsCrossedIdleAnim" Offset="0x13AA4"/>
<Animation Name="gShiekFallingFromContortionsAnim" Offset="0x149E4"/>
<Animation Name="gShiekContortionsAnim" Offset="0x169E8"/>
<Animation Name="gShiekPlayingHarp5Anim" Offset="0x177F8"/>
<Animation Name="gShiekInitialHarpAnim" Offset="0x17C54"/>
<Animation Name="gShiekDefenseStanceAnim" Offset="0x18B00"/>
<Animation Name="gShiekThrowingNutAnim" Offset="0x19598"/>
<Animation Name="gShiekKneelingAnim" Offset="0x19C30"/>
<Animation Name="gShiekHittingGroundAnim" Offset="0x19F78"/>
<Animation Name="gShiekAnim_01A048" Offset="0x1A048"/>
<Animation Name="gShiekPullingOutHarpAnim" Offset="0x1B19C"/>
<Animation Name="gShiekFallingFromSkyAnim" Offset="0x1C0E8"/>
<Texture Name="gShiekEyeOpenTex" OutName="shiek_eye_open" Format="ci8" Width="32" Height="32" Offset="0x4CC0"/>
<Texture Name="gShiekEyeHalfClosedTex" OutName="shiek_eye_half_closed" Format="ci8" Width="32" Height="32" Offset="0x50C0"/>
<Texture Name="gShiekEyeShutTex" OutName="shiek_eye_shut" Format="ci8" Width="32" Height="32" Offset="0x54C0"/>
<Texture Name="gShiekEyeSquintingTex" OutName="shiek_eye_squinting" Format="ci8" Width="32" Height="32" Offset="0x58C0"/>
<DList Name="gShiekHarpDL" Offset="0x11150"/>
<DList Name="gShiekDL_011620" Offset="0x11620"/>
<DList Name="gShiekDL_012970" Offset="0x12970"/>
</File>
</Root>

5
assets/xml/scenes/indoors/tokinoma.xml
View file

@ -1,6 +1,9 @@
<Root>
<File Name="tokinoma_scene">
<Scene Name="tokinoma_scene"/>
<Scene Name="tokinoma_scene">
<CutsceneHint Name="gFirstAdultCs" Offset="0x0046F0"/>
<CutsceneHint Name="gPreludeCs" Offset="0x006D20"/>
</Scene>
</File>
<File Name="tokinoma_room_0">
<Room Name="tokinoma_room_0"/>

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

@ -5,6 +5,7 @@
<PathHint Offset="0x69E8"/>
<PathHint Offset="0x69F0"/>
<PathHint Offset="0x69F8"/>
<CutsceneHint Name="gMinuetCs" Offset="0x003F80"/>
</Scene>
</File>
<File Name="spot05_room_0">

1
assets/xml/scenes/overworld/spot17.xml
View file

@ -1,6 +1,7 @@
<Root>
<File Name="spot17_scene">
<Scene Name="spot17_scene">
<CutsceneHint Name="gBoleroCs" Offset="0x0045D0"/>
</Scene>
</File>
<File Name="spot17_room_0">