1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-13 12:59:59 +00:00
oot/asm/non_matchings/overlays/actors
AdamKiddle ca5a9aa7d1
EnEncount2 and EnFireRock OK (#659)
* first two funcs done

* fixing struct var name due to external use

* func_80A07CA4 done

* started EnEncount2_Update

* EnEncount2_Update done

* Encount2 done!

* EnFireRock_Init done (but will only match once initvars are uncommented

* progress

* 4 funcs left

* Fully matching

* minor formatting

* renames

* change structs back to normal

* formatting

* removing unused comments

* even more formatting stuff

* removed unused asm

* pr stuff

* pr stuff

* added newline at end of file

* some merge suggestions

* more pr stuff

* review

Co-authored-by: fig02 <fig02srl@gmail.com>
2021-03-14 10:39:41 -04:00
..
ovl_Bg_Gnd_Firemeiro Demo_Kekkai, its object, and its cutscenes (#627) 2021-02-01 14:52:23 -05:00
ovl_Bg_Hidan_Sekizou Document Collision_Check (#468) 2021-01-17 21:13:36 -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_Mizu_Movebg Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -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_Sst_Floor Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_Bg_Toki_Hikari Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Bg_Vb_Sima z_bgcheck.c, 800430A0.c, 80043480.c (#256) 2021-01-08 06:12:58 -05:00
ovl_Boss_Dodongo Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Fd Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Fd2 Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Ganon Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Ganon2 Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Ganondrof Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Goma Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Mo Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Sst Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_Boss_Tw Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Boss_Va Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Demo_6K Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Door_Killer Document Collision_Check (#468) 2021-01-17 21:13:36 -05:00
ovl_Door_Warp1 Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_Efc_Erupc Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28: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 Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_En_Clear_Tag Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_En_Daiku
ovl_En_Dekubaba Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_En_Diving_Game Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Eiyer Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_En_Elf
ovl_En_fHG
ovl_En_Fhg_Fire 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_Ganon_Mant Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_En_Goma Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_En_Holl
ovl_En_Horse Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05: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_Mm 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_Ossan Decompile Gameplay_Keep and fix all existing decompiled objects (#595) 2021-01-24 19:36:40 -05:00
ovl_En_River_Sound z_bgcheck.c, 800430A0.c, 80043480.c (#256) 2021-01-08 06:12:58 -05:00
ovl_En_Skb z_en skb, 1 non-matching, with some documentation (#669) 2021-02-15 17:52:22 -05:00
ovl_En_Skj Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_En_Test Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_En_Tg Actor Struct Changes (and a few related things) (#617) 2021-01-18 16:04:04 -05:00
ovl_En_Torch2 Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_En_Tp Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_En_Tr EnTr, 1 nonmatching, mostly documented (#621) 2021-01-31 00:07:58 -05:00
ovl_En_Vali Armos and object_am OK (#652) 2021-02-15 19:41:55 +01: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_Wf Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_En_Xc Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_En_Yabusame_Mark ovl_en_yabusame_mark, 1 nonmatching (#707) 2021-02-21 19:10:24 -05:00
ovl_En_Zf Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
ovl_Fishing Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -05:00
ovl_kaleido_scope Rename Matrix_Pull to Matrix_Pop (#703) 2021-02-24 14:28:04 -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
ovl_Obj_Mure2 Obj_Mure2 (one non-matching) (#550) 2020-12-29 20:14:04 -05:00
ovl_Obj_Mure3
ovl_Object_Kankyo Demo_Kekkai, its object, and its cutscenes (#627) 2021-02-01 14:52:23 -05:00