mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-16 12:54:40 +00:00
Code Issues Projects Releases Wiki Activity

Decompile Gameplay_Keep and fix all existing decompiled objects (#595)

Browse source 
* First batch of files

* Add missing folders back

* Fix missing folders again

* Finish fixing existing texture files

* Gameplay_Keep XML finished

* Most actor gameplay_keep undefined syms removed

* Only ~200 gkeep symbols remain

* All gkeep symbols that ZAP supports are fixed

* Cleanup, and make gkeep names more accurate

* Starting to figure out what some unknown blobs are, merge zeldaret in

* fix a few more things

* refactor gkeep

* Change how gitkeep is handled

* gkeep xml cleanup

* Gkeep finished, now just waiting up ZAP updates

* 100 link animations finished

* 150 link animations finished

* 200 link animations finished

* 250 link animations finished

* 350 link animations finished

* 400 link animations finished

* 450 link animations finished

* 500 link animations finished

* 550 link animations finished

* All Link animations finished

cannot build yet because ZAP doesn't have LinkAnimationHeader yet

* xml changes for new zap stuff

* finish gameplay_keep

* fixing existing objects

* ready for pr besides zap padding issue

* mostly ready for pr

* format all c files

* all conflicts fixed

* make changes that roman requested

* fix thing i didn't mean to change

* some animation symbols renamed

* fixed roman's stuff

* lifemeter hardcoded pointers removed

* fix issue with incorrect data in gameplay_keep

* removed unused asm

* fixed most of fig's comments

* fix all of fig's comments

* reformat files

* Update assets/xml/textures/icon_item_static.xml

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update assets/xml/textures/icon_item_static.xml

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* fixed stuff

* fixed most of roman's comments

* remove leading zeroes

* should build now

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "f84d8337b"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "f84d8337b"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* all of gkeep symbols fixed

* compiler error fixed

* format files

* final changes

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Zelllll 2021-01-24 18:36:40 -06:00 • committed by GitHub
parent 84195fcef6
commit 20c1f4e648
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
198 changed files with 4775 additions and 4232 deletions
Download patch file Download diff file Expand all files Collapse all files

63
assets/xml/objects/gameplay_field_keep.xml.ignore
View file

@ -1,63 +0,0 @@
<Root>
<File Name="gameplay_field_keep">
<DList Name="Gfx_Graveyard_Flower_Petals_0" Offset="0x0000"/>
<DList Name="Gfx_Graveyard_Flower_Petals_1" Offset="0x00A0"/>
<DList Name="Gfx_Graveyard_Flower_Petals_2" Offset="0x0140"/>
<DList Name="Gfx_Graveyard_Flower_Leaf_0" Offset="0x01E0"/>
<DList Name="Gfx_Graveyard_Flower_Leaf_1" Offset="0x0280"/>
<DList Name="Gfx_Graveyard_Flower_Leaf_2" Offset="0x0320"/>
<DList Name="Gfx_Graveyard_Flower_Leaf_3" Offset="0x03C0"/>
<DList Name="Gfx_Graveyard_Flower_Leaf_4" Offset="0x0460"/>
<DList Name="Gfx_Graveyard_Flower" Offset="0x0500"/>
<Texture Name="Tex_Graveyard_Flower_Petals" Format="rgb5a1" Width="16" Height="32" Offset="0x0750"/>
<Texture Name="Tex_Graveyard_Flower_Leaf" Format="rgb5a1" Width="32" Height="32"/>
<DList Name="Gfx_Grotto_Hole" Offset="0x1390"/>
<Texture Name="Tex_Grotto_Hole" Format="ia16" Width="32" Height="64"/>
<!--<Skeleton Name="Hier_Butterfly" Offset="0x2474" Type="Standard"/>-->
<DList Name="Gfx_Butterfly_Wing_R" Offset="0x2480"/>
<DList Name="Gfx_Butterfly_Wing_R_Ref" Offset="0x2520"/>
<DList Name="Gfx_Butterfly_Wing_R_Ref_Ref" Offset="0x2530"/>
<DList Name="Gfx_Butterfly_Wing_L" Offset="0x2580"/>
<DList Name="Gfx_Butterfly_Wing_L_Ref" Offset="0x2620"/>
<DList Name="Gfx_Butterfly_Wing_L_Ref_Ref" Offset="0x2630"/>
<!--<Texture Name="Tex_Butterfly_Wing" Format="rgb5a1" Width="32" Height="64"/>-->
<!--<Skeleton Name="Hier_Bombable_Wall" Offset="0x36EC"/>-->
<!--<Palette Name="Pal_Bombable_Wall" Format="rgb5a1" Offset="0x3700" Width="16" Height="16"/>-->
<!--<Texture Name="Tex_Bombable_Wall" Format="ci4" Palette="Pal_Bombable_Wall" Width="32" Height="64"/>-->
<!--<Texture Name="Tex_Bombable_Wall_Broken" Format="ci4" Palette="Pal_Bombable_Wall" Width="32" Height="64"/>-->
<DList Name="Gfx_Bombable_Wall" Offset="0x3FC0"/>
<DList Name="Gfx_Bombable_Wall_Broken" Offset="0x4088"/>
<DList Name="Gfx_Wooden_Door_Frame" Offset="0x4720"/>
<DList Name="Gfx_Wooden_Door_L" Offset="0x47A0"/>
<DList Name="Gfx_Wooden_Door_R" Offset="0x4978"/>
<Texture Name="Tex_Door_Handle_Edge" Format="rgb5a1" Width="16" Height="16" Offset="0x4B50"/>
<Texture Name="Tex_Door_Handle_Front" Format="rgb5a1" Width="16" Height="16"/>
<Texture Name="Tex_Door" Format="i4" Width="64" Height="128"/>
<Animation Name="Anim_Door" Offset="0x5FF0"/>
<DList Name="Gfx_Orange_Fish_Body" Offset="0x6000"/>
<DList Name="Gfx_Orange_Fish_Body_Ref" Offset="0x61E8"/>
<DList Name="Gfx_Orange_Fish_Body_Ref_Ref" Offset="0x61F8"/>
<DList Name="Gfx_Orange_Fish_Tail" Offset="0x63A0"/>
<DList Name="Gfx_Orange_Fish_Tail_Ref" Offset="0x6448"/>
<DList Name="Gfx_Orange_Fish_Tail_Ref_Ref" Offset="0x6458"/>
<Texture Name="Tex_Orange_Fish_Body" Format="rgb5a1" Width="64" Height="64"/>
<Texture Name="Tex_Orange_Body_Tail" Format="rgb5a1" Width="32" Height="16"/>
<!--<Skeleton Name="Hier_Fish" Offset="0x88F4"/>-->
<Texture Name="Tex_Beehive" Format="rgb5a1" Width="32" Height="32" Offset="0x8900"/>
<Gfx Name="Gfx_Beehive" Offset="0x95B0"/>
<Texture Name="Tex_Beehive_Fragment" Format="rgb5a1" Width="16" Height="16" Offset="0x9710"/>
<Gfx Name="Gfx_Beehive_Fragment" Offset="0x9940"/>
<Palette Name="Pal_Silver_Boulder" Format="rgb5a1" Width="16" Height="16" Offset="0x99D0"/>
<Texture Name="Tex_Silver_Boulder" Format="ci4" Width="64" Height="64" Offset="0x99F8"/>
<Gfx Name="Gfx_Silver_Boulder" Offset="0xA3B8"/>
<Gfx Name="Gfx_Silver_Boulder_Fragment" Offset="0xA5E8"/>
<Gfx Name="Gfx_Small_Rock" Offset="0xA880"/>
<Texture Name="Tex_Small_Rock" Format="rgb5a1" Width="32" Height="32" Offset="0xA940"/>
<Texture Name="Tex_Grass_Clump" Format="rgb5a1" Width="32" Height="32"/>
<Gfx Name="Gfx_Grass_Clump" Offset="0xB9D0"/>
<Texture Name="Tex_Sandstorm_0" Format="i8" Width="64" Height="32" Offset="0xBA70"/>
<Texture Name="Tex_Sandstorm_1" Format="ia8" Width="64" Height="32"/>
<Gfx Name="Gfx_Sandstorm" Offset="0xCA70"/>
<Texture Name="Tex_Wood" Format="rgb5a1" Width="32" Height="32" Offset="0xCB30"/>
</File>
</Root>

1322
assets/xml/objects/gameplay_keep.xml
View file

File diff suppressed because it is too large Load diff

12
assets/xml/objects/object_pu_box.xml
View file

@ -1,7 +1,13 @@
<Root>
<File Name="object_pu_box" Segment="6">
<DList Name="gPuBoxDL"/>
<DList Name="gPuBoxDL2" Offset="0x380"/>
<Blob Name="gPuBoxCol" Offset="0x6D0" Size="0x80"/>
<DList Name="gUnknownUnusedBox1DL" Offset="0x0"/>
<Collision Name="gUnknownUnusedBox1Col" Offset="0x350"/>
<DList Name="gUnknownUnusedBox2DL" Offset="0x380"/>
<Collision Name="gUnknownUnusedBox2Col" Offset="0x6D0"/>
<DList Name="gUnknownUnusedBox3DL" Offset="0x700"/>
<Collision Name="gUnknownUnusedBox3Col" Offset="0xA50"/>
<DList Name="gUnknownUnusedBox4DL" Offset="0xA80"/>
<Collision Name="gUnknownUnusedBox4Col" Offset="0x15D0"/>
<Texture Name="gUnknownUnusedBoxTex" OutName="unknown_unused_box" Format="rgb5a1" Width="32" Height="32" Offset="0xCC8"/>
</File>
</Root>

20
assets/xml/objects/object_spot09_obj.xml
View file

@ -1,14 +1,14 @@
<Root>
<File Name="object_spot09_obj" Segment="6">
<DList Name="gBgSpot09DL1" Offset="0x100"/>
<DList Name="gBgSpot09DL2" Offset="0x3970"/>
<DList Name="gBgSpot09DL3" Offset="0x1120"/>
<DList Name="gBgSpot09DL4" Offset="0x7D40"/>
<DList Name="gBgSpot09DL5" Offset="0x6210"/>
<DList Name="gBgSpot09DL6" Offset="0x8010"/>
<Blob Name="gBgSpot09Col1" Offset="0x5520" Size="0x30"/>
<Blob Name="gBgSpot09Col2" Offset="0x283C" Size="0x30"/>
<Blob Name="gBgSpot09Col3" Offset="0x8458" Size="0x30"/>
<Blob Name="gBgSpot09Col4" Offset="0x7580" Size="0x30"/>
<DList Name="gValleyBridgeSidesDL" Offset="0x100"/>
<DList Name="gValleyBrokenBridgeDL" Offset="0x3970"/>
<DList Name="gValleyBridgeChildDL" Offset="0x1120"/>
<DList Name="gCarpentersTentDL" Offset="0x7D40"/>
<DList Name="gValleyRepairedBridgeDL" Offset="0x6210"/>
<DList Name="gCarpentersTentEntranceDL" Offset="0x8010"/>
<Collision Name="gValleyObjects1Col" Offset="0x5520" Size="0x30"/>
<Collision Name="gValleyObjects2Col" Offset="0x283C" Size="0x30"/>
<Collision Name="gValleyObjects3Col" Offset="0x8458" Size="0x30"/>
<Collision Name="gValleyObjects4Col" Offset="0x7580" Size="0x30"/>
</File>
</Root>

8
assets/xml/objects/object_spot11_obj.xml
View file

@ -1,7 +1,9 @@
<Root>
<File Name="object_spot11_obj" Segment="6">
<Blob Name="gBgSpot11Unk" Offset="0x0000" Size="0x940"/>
<DList Name="gBgSpot11DL1" Offset="0x1980"/>
<Blob Name="gBgSpot11Col" Offset="0x1A58" Size="0x30"/>
<Texture Name="gDesertColossusOasisWaterTex" OutName="desert_colossus_oasis_water" Format="rgb5a1" Width="32" Height="32" Offset="0x0"/>
<DList Name="gDesertColossusOasisDL" Offset="0x870"/>
<Texture Name="gDesertColossusBombableWallTex" OutName="desert_colossus_bombable_wall" Format="rgb5a1" Width="32" Height="64" Offset="0x940"/>
<DList Name="gDesertColossusBombableWallDL" Offset="0x1980"/>
<Collision Name="gDesertColossusBombableWallCol" Offset="0x1A58"/>
</File>
</Root>

10
assets/xml/objects/object_spot17_obj.xml
View file

@ -1,6 +1,12 @@
<Root>
<File Name="object_spot17_obj" Segment="6">
<Blob Name="gBgSpot17Unk" Offset="0x0000" Size="0xA70"/>
<DList Name="gBgSpot17DL1" Offset="0xB40"/>
<Texture Name="gCraterRockPaletteTex" OutName="crater_rock_palette" Format="rgb5a1" Width="4" Height="4" Offset="0x00"/>
<Texture Name="gCraterRockTex" OutName="crater_rock" Format="ci4" Width="64" Height="64" Offset="0x20"/>
<DList Name="gCraterBombableWallDL" Offset="0x8A0"/>
<DList Name="gCraterBombableWallCracksDL" Offset="0x960"/>
<Collision Name="gCraterBombableWallCol" Offset="0xA38"/>
<DList Name="gCraterSmokeConeDL" Offset="0xB40"/>
<Texture Name="gCraterSmokeConeTex" OutName="crater_smoke_cone" Format="ia8" Width="32" Height="32" Offset="0xC30"/>
<Texture Name="gCraterBombableWallCracksTex" OutName="crater_bombable_wall_cracks" Format="ia8" Width="32" Height="64" Offset="0x1030"/>
</File>
</Root>

6
assets/xml/objects/object_vase.xml
View file

@ -1,7 +1,7 @@
<Root>
<File Name="object_vase" Segment="6">
<DList Name="gVaseDL"/>
<Texture Name="gVaseTopTex" Format="rgb5a1" Width="32" Height="32" Offset="0xD90"/>
<Texture Name="gVaseBodyTex" Format="rgb5a1" Width="32" Height="32" Offset="0x590"/>
<DList Name="gUnusedVaseDL"/>
<Texture Name="gUnusedVaseTopTex" OutName="unused_vase_top" Format="rgb5a1" Width="32" Height="32" Offset="0xD90"/>
<Texture Name="gUnusedVaseBodyTex" OutName="unused_vase_body" Format="rgb5a1" Width="32" Height="32" Offset="0x590"/>
</File>
</Root>