mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-09 00:00:44 +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

183
assets/textures/icon_item_static/icon_item_static.xml
View file

@ -1,183 +0,0 @@
<Root>
<File Name="icon_item_static">
<Texture Name="Deku_Stick" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Deku_Nut" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Bomb" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Fairy_Bow" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Fire_Arrow" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Dins_Fire" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Fairy_Slingshot" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Fairy_Ocarina" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Ocarina_of_Time" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Bombchu" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Hookshot" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Longshot" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Ice_Arrow" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Farores_Wind" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Boomerang" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Lens_of_Truth" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Magic_Beans" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Megaton_Hammer" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Light_Arrow" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Nayrus_Love" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Empty_Bottle" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Red_Potion" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Green_Potion" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Blue_Potion" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Bottled_Fairy" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Fish" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Milk_Full" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Rutos_Letter" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Blue_Fire" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Bug" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Big_Poe" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Milk_half" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Poe" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Weird_Egg" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Cucco" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Zeldas_Letter" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Keaton_Mask" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Skull_Mask" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Spooky_Mask" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Bunny_Hood" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Goron_Mask" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Zora_Mask" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Gerudo_Mask" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Mask_of_Truth" Format="rgba32" Width="32" Height="32"/>
<Texture Name="SOLD_OUT" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Pocket_Egg" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Pocket_Cucco" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Cojiro" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Odd_Mushroom" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Odd_Potion" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Poachers_Saw" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Gorons_Sword_Broken" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Prescription" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Eye_Ball_Frog" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Eye_Drops" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Claim_Check" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Fairy_Bow_Fire" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Fairy_Bow_Ice" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Fairy_Bow_Light" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Kokiri_Sword" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Master_Sword" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Biggoron_Sword" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Deku_Shield" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Hylian_Shield" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Mirror_Shield" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Kokiri_Tunic" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Goron_Tunic" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Zora_Tunic" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Kokiri_Boots" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Iron_Boots" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Hover_Boots" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Bullet_Bag_30" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Bullet_Bag_40" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Bullet_Bag_50" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Quiver_30" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Quiver_40" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Quiver_50" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Bomb_Bag_20" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Bomb_Bag_30" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Bomb_Bag_40" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Gorons_Bracelet" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Silver_Gauntlets" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Golden_Gauntlets" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Silver_Scale" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Golden_Scale" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Giants_Knife_Broken" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Adults_Wallet" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Giants_Wallet" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Deku_Seeds" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Fishing_Pole" Format="rgba32" Width="32" Height="32"/>
<Texture Name="Heart_Piece_1" Format="ia8" Width="48" Height="48"/>
<Texture Name="Heart_Piece_2" Format="ia8" Width="48" Height="48"/>
<Texture Name="Heart_Piece_3" Format="ia8" Width="48" Height="48"/>
<Texture Name="Save_GameOver_Cursor" Format="i4" Width="48" Height="48"/>
<Texture Name="Menu_Cursor_Unused" Format="i8" Width="24" Height="24"/>
<Texture Name="Pause_Menu_Cursor_Top_Left" Format="ia4" Width="16" Height="16"/>
<Texture Name="Pause_Menu_Cursor_Top_Right" Format="ia4" Width="16" Height="16"/>
<Texture Name="Pause_Menu_Cursor_Bottom_Left" Format="ia4" Width="16" Height="16"/>
<Texture Name="Pause_Menu_Cursor_Bottom_Right" Format="ia4" Width="16" Height="16"/>
<Texture Name="Equipment_0_0" Format="ia8" Width="80" Height="32"/>
<Texture Name="Equipment_2_0" Format="ia8" Width="80" Height="32"/>
<Texture Name="Map_0_0" Format="ia8" Width="80" Height="32"/>
<Texture Name="Map_2_0" Format="ia8" Width="80" Height="32"/>
<Texture Name="Quest_Status_0_0" Format="ia8" Width="80" Height="32"/>
<Texture Name="Quest_Status_2_0" Format="ia8" Width="80" Height="32"/>
<Texture Name="Save_0_0" Format="ia8" Width="80" Height="32"/>
<Texture Name="Save_2_0" Format="ia8" Width="80" Height="32"/>
<Texture Name="Equipment_0_1" Format="ia8" Width="80" Height="32"/>
<Texture Name="Equipment_1_1" Format="ia8" Width="80" Height="32"/>
<Texture Name="Equipment_2_1" Format="ia8" Width="80" Height="32"/>
<Texture Name="Select_Item_0_1" Format="ia8" Width="80" Height="32"/>
<Texture Name="Select_Item_1_1" Format="ia8" Width="80" Height="32"/>
<Texture Name="Select_Item_2_1" Format="ia8" Width="80" Height="32"/>
<Texture Name="Map_0_1" Format="ia8" Width="80" Height="32"/>
<Texture Name="Map_1_1" Format="ia8" Width="80" Height="32"/>
<Texture Name="Map_2_1" Format="ia8" Width="80" Height="32"/>
<Texture Name="Quest_Status_0_1" Format="ia8" Width="80" Height="32"/>
<Texture Name="Quest_Status_1_1" Format="ia8" Width="80" Height="32"/>
<Texture Name="Quest_Status_2_1" Format="ia8" Width="80" Height="32"/>
<Texture Name="Save_0_1" Format="ia8" Width="80" Height="32"/>
<Texture Name="Save_1_1" Format="ia8" Width="80" Height="32"/>
<Texture Name="Save_2_1" Format="ia8" Width="80" Height="32"/>
<Texture Name="Equipment_0_2" Format="ia8" Width="80" Height="32"/>
<Texture Name="Equipment_1_2" Format="ia8" Width="80" Height="32"/>
<Texture Name="Equipment_2_2" Format="ia8" Width="80" Height="32"/>
<Texture Name="Select_Item_0_2" Format="ia8" Width="80" Height="32"/>
<Texture Name="Select_Item_1_2" Format="ia8" Width="80" Height="32"/>
<Texture Name="Select_Item_2_2" Format="ia8" Width="80" Height="32"/>
<Texture Name="Map_0_2" Format="ia8" Width="80" Height="32"/>
<Texture Name="Map_1_2" Format="ia8" Width="80" Height="32"/>
<Texture Name="Map_2_2" Format="ia8" Width="80" Height="32"/>
<Texture Name="Quest_Status_0_2" Format="ia8" Width="80" Height="32"/>
<Texture Name="Quest_Status_1_2" Format="ia8" Width="80" Height="32"/>
<Texture Name="Quest_Status_2_2" Format="ia8" Width="80" Height="32"/>
<Texture Name="Save_0_2" Format="ia8" Width="80" Height="32"/>
<Texture Name="Save_1_2" Format="ia8" Width="80" Height="32"/>
<Texture Name="Save_2_2" Format="ia8" Width="80" Height="32"/>
<Texture Name="Equipment_0_3" Format="ia8" Width="80" Height="32"/>
<Texture Name="Equipment_1_3" Format="ia8" Width="80" Height="32"/>
<Texture Name="Equipment_2_3" Format="ia8" Width="80" Height="32"/>
<Texture Name="Select_Item_0_3" Format="ia8" Width="80" Height="32"/>
<Texture Name="Select_Item_1_3" Format="ia8" Width="80" Height="32"/>
<Texture Name="Select_Item_2_3" Format="ia8" Width="80" Height="32"/>
<Texture Name="Map_0_3" Format="ia8" Width="80" Height="32"/>
<Texture Name="Map_1_3" Format="ia8" Width="80" Height="32"/>
<Texture Name="Map_2_3" Format="ia8" Width="80" Height="32"/>
<Texture Name="Quest_Status_0_3" Format="ia8" Width="80" Height="32"/>
<Texture Name="Quest_Status_1_3" Format="ia8" Width="80" Height="32"/>
<Texture Name="Quest_Status_2_3" Format="ia8" Width="80" Height="32"/>
<Texture Name="Save_0_3" Format="ia8" Width="80" Height="32"/>
<Texture Name="Save_1_3" Format="ia8" Width="80" Height="32"/>
<Texture Name="Save_2_3" Format="ia8" Width="80" Height="32"/>
<Texture Name="Equipment_0_4" Format="ia8" Width="80" Height="32"/>
<Texture Name="Equipment_1_4" Format="ia8" Width="80" Height="32"/>
<Texture Name="Equipment_2_4" Format="ia8" Width="80" Height="32"/>
<Texture Name="Select_Item_0_4" Format="ia8" Width="80" Height="32"/>
<Texture Name="Select_Item_1_4" Format="ia8" Width="80" Height="32"/>
<Texture Name="Select_Item_2_4" Format="ia8" Width="80" Height="32"/>
<Texture Name="Map_0_4" Format="ia8" Width="80" Height="32"/>
<Texture Name="Map_1_4" Format="ia8" Width="80" Height="32"/>
<Texture Name="Map_2_4" Format="ia8" Width="80" Height="32"/>
<Texture Name="Quest_Status_0_4" Format="ia8" Width="80" Height="32"/>
<Texture Name="Quest_Status_1_4" Format="ia8" Width="80" Height="32"/>
<Texture Name="Quest_Status_2_4" Format="ia8" Width="80" Height="32"/>
<Texture Name="Save_0_4" Format="ia8" Width="80" Height="32"/>
<Texture Name="Save_1_4" Format="ia8" Width="80" Height="32"/>
<Texture Name="Save_2_4" Format="ia8" Width="80" Height="32"/>
<Texture Name="Game_Over_1_0" Format="ia8" Width="80" Height="32"/>
<Texture Name="A_Btn_Symbol" Format="ia8" Width="24" Height="16"/>
<Texture Name="B_Btn_Symbol" Format="ia8" Width="24" Height="16"/>
<Texture Name="C_Btn_Symbols" Format="ia8" Width="48" Height="16"/>
<Texture Name="Name_Panel_Left" Format="ia8" Width="72" Height="24"/>
<Texture Name="Name_Panel_Right" Format="ia8" Width="72" Height="24"/>
<Texture Name="L_Button" Format="ia8" Width="24" Height="32"/>
<Texture Name="R_Button" Format="ia8" Width="24" Height="32"/>
<Texture Name="Unknown_JP" Format="ia8" Width="80" Height="16"/>
<Texture Name="Song_Note" Format="ia8" Width="16" Height="24"/>
<Texture Name="Some_Cursor_Unused" Format="ia8" Width="32" Height="32"/>
<Blob Name="Unknown_Blob_00" Size="2E0"/>
</File>
</Root>