1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-26 02:04:18 +00:00
oot/asm/non_matchings/overlays/actors
petrie911 65f65870a1
Barinade (Boss_Va) (#529)
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* When life gives you Bari, make Barinade

* Now with more names

* merge

* enums everywhere

* just one left

* OK

* more docs

* a little more

* I don't even remember what I changed

* small cleanup

* maybe it's time

* weird

* not sure what's up with sys_matrix

* camera functions

* it's no object

* unused

* back to being unused

* git subrepo pull --force tools/ZAPD

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

* hope this works

* git subrepo pull --force tools/ZAPD

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

* object fix

* stuff

* test merge

* merge colchk

* merge colchk

* one more thing

* naming things

* naming things

* implement most suggestions, and format

* fixes

* format

* more fixes

* more fixes and format

* body -> get_body

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-08 13:57:07 -04:00
..
ovl_Bg_Hidan_Sekizou object_hidan_objects OK (#695) 2021-03-18 03:23:59 -04:00
ovl_Bg_Jya_Cobra three more matches in BgJyaCobra (#758) 2021-04-09 19:02:16 -04:00
ovl_Bg_Mizu_Movebg Match 1 of the 2 remaining functions in Bg_Mizu_Movebg (#840) 2021-06-02 19:25:27 -04:00
ovl_Boss_Ganon ovl_Boss_Ganon2 (2 nonmatching) (#874) 2021-08-06 20:30:31 +02:00
ovl_Boss_Ganon2 ovl_Boss_Ganon2 (2 nonmatching) (#874) 2021-08-06 20:30:31 +02:00
ovl_Boss_Mo Audio WIP (#836) 2021-07-27 19:44:58 -04:00
ovl_Boss_Tw Decompile Twinrova (#837) 2021-08-04 14:13:00 -04:00
ovl_Door_Warp1 Audio WIP (#836) 2021-07-27 19:44:58 -04:00
ovl_En_Ganon_Mant Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_En_Holl decompile z_camera (#398) 2020-12-06 17:39:47 -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_Torch2 Some actor.c docs (in preparation for en_test) (#820) 2021-06-22 08:51:04 +09:00
ovl_En_Tp EnTp, 1 nonmatching, and object_tp (#782) 2021-04-21 14:26:24 -04:00
ovl_En_Wf EnMb documented (Moblins) (#861) 2021-08-08 07:28:28 -04:00
ovl_En_Yabusame_Mark Audio WIP (#836) 2021-07-27 19:44:58 -04:00
ovl_En_Zf EnMb documented (Moblins) (#861) 2021-08-08 07:28:28 -04:00
ovl_kaleido_scope Audio WIP (#836) 2021-07-27 19:44:58 -04:00
ovl_Obj_Lift Decompiled A LOT of objects (#815) 2021-08-05 11:53:58 -04:00
ovl_Object_Kankyo Demo_Kekkai, its object, and its cutscenes (#627) 2021-02-01 14:52:23 -05:00