mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-13 12:59:59 +00:00
Code Issues Projects Releases Wiki Activity
oot/asm/non_matchings/overlays/actors
History
Zelllll 20c1f4e648
Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 
* 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>
2021-01-24 19:36:40 -05:00
..
ovl_Bg_Breakwall Document Collision_Check (#468) 2021-01-17 21:13:36 -05:00
ovl_Bg_Dy_Yoseizo Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Bg_Gnd_Firemeiro z_bgcheck.c, 800430A0.c, 80043480.c (#256) 2021-01-08 06:12:58 -05:00
ovl_Bg_Haka_Huta z_bgcheck.c, 800430A0.c, 80043480.c (#256) 2021-01-08 06:12:58 -05:00
ovl_Bg_Haka_Ship z_bgcheck.c, 800430A0.c, 80043480.c (#256) 2021-01-08 06:12:58 -05:00
ovl_Bg_Hidan_Hrock Document Collision_Check (#468) 2021-01-17 21:13:36 -05:00
ovl_Bg_Hidan_Rock Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Bg_Hidan_Sekizou Document Collision_Check (#468) 2021-01-17 21:13:36 -05:00
ovl_Bg_Hidan_Sima z_bgcheck.c, 800430A0.c, 80043480.c (#256) 2021-01-08 06:12:58 -05:00
ovl_Bg_Ice_Shelter Document Collision_Check (#468) 2021-01-17 21:13:36 -05:00
ovl_Bg_Jya_Cobra Decompile Bg Jya Cobra (#588) 2021-01-21 09:55:11 -05:00
ovl_Bg_Jya_Ironobj Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Bg_Mizu_Movebg Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Bg_Spot00_Hanebasi Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_Bg_Spot02_Objects Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Bg_Spot07_Taki z_bgcheck.c, 800430A0.c, 80043480.c (#256) 2021-01-08 06:12:58 -05:00
ovl_Bg_Spot08_Iceblock z_bgcheck.c, 800430A0.c, 80043480.c (#256) 2021-01-08 06:12:58 -05:00
ovl_Bg_Sst_Floor Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Bg_Toki_Hikari Undefined Symbols in the ASM (#527) 2020-12-12 14:22:33 -05:00
ovl_Bg_Vb_Sima z_bgcheck.c, 800430A0.c, 80043480.c (#256) 2021-01-08 06:12:58 -05:00
ovl_Bg_Ydan_Sp Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Boss_Dodongo Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Boss_Fd Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Boss_Fd2 Document Collision_Check (#468) 2021-01-17 21:13:36 -05:00
ovl_Boss_Ganon Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Boss_Ganon2 Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Boss_Ganondrof Document Collision_Check (#468) 2021-01-17 21:13:36 -05:00
ovl_Boss_Goma Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Boss_Mo Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_Boss_Sst Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_Boss_Tw Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_Boss_Va Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_Demo_6K Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_Demo_Du Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Demo_Gj Document Collision_Check (#468) 2021-01-17 21:13:36 -05:00
ovl_Demo_Ik Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Demo_Kankyo Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_Demo_Kekkai Document Collision_Check (#468) 2021-01-17 21:13:36 -05:00
ovl_Door_Killer Document Collision_Check (#468) 2021-01-17 21:13:36 -05:00
ovl_Door_Warp1 Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Efc_Erupc Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Eff_Dust Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_En_Am Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Anubice Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Anubice_Fire Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Arrow Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_En_Ba Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Bdfire Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Bigokuta Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Bili Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Bom_Chu Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_En_Brob Document Collision_Check (#468) 2021-01-17 21:13:36 -05:00
ovl_En_Clear_Tag Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Cs Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Daiku ovl_En_Daiku OK and documented (#422) 2020-12-03 16:58:05 -05:00
ovl_En_Daiku_Kakariko Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Dekubaba Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_En_Dekunuts Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Diving_Game Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Dnt_Demo Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Dnt_Jiji Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Dnt_Nomal Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Dodojr Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Du Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Eiyer Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Elf Three new matching functions (#492) 2020-11-19 16:49:08 -05:00
ovl_En_Encount2 Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_fHG Docs for the Anime part of SkelAnime (#517) 2020-12-29 17:46:46 -05:00
ovl_En_Fhg_Fire Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Fire_Rock Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Fish Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_En_Fr Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Fz Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Ganon_Mant Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_En_Gb Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Ge1 Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Ge2 Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Ge3 Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Go Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Go2 Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Goma Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Holl decompile z_camera (#398) 2020-12-06 17:39:47 -05:00
ovl_En_Horse Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Horse_Game_Check Math3D and olib updates (#315) 2020-08-17 15:42:08 -04:00
ovl_En_Jj Document Collision_Check (#468) 2021-01-17 21:13:36 -05:00
ovl_En_Jsjutan Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Ko Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_M_Thunder Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_En_Mk Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Mm Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Mm2 Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Mu Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Ny Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Ossan Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_En_Peehat Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_River_Sound z_bgcheck.c, 800430A0.c, 80043480.c (#256) 2021-01-08 06:12:58 -05:00
ovl_En_Sa Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Skb Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Skj Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Sth Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Sw Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Test Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Tg Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Torch2 Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Tp Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Tr Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Trap Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Vali Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Vb_Ball Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_En_Weiyer Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Wf Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Xc Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Yabusame_Mark Document Collision_Check (#468) 2021-01-17 21:13:36 -05:00
ovl_En_Zf Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Zl4 Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Fishing Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Item_Shield Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_kaleido_scope Docs for the Anime part of SkelAnime (#517) 2020-12-29 17:46:46 -05:00
ovl_Magic_Fire Document Collision_Check (#468) 2021-01-17 21:13:36 -05:00
ovl_Obj_Bean Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Obj_Lift z_bgcheck.c, 800430A0.c, 80043480.c (#256) 2021-01-08 06:12:58 -05:00
ovl_Obj_Mure Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Obj_Mure2 Obj_Mure2 (one non-matching) (#550) 2020-12-29 20:14:04 -05:00
ovl_Obj_Mure3 Consistent naming for Math_ functions (#542) 2020-12-26 05:44:53 -05:00
ovl_Obj_Tsubo Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Obj_Warp2block Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Object_Kankyo Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00