mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-13 04:39:36 +00:00
Code Issues Projects Releases Wiki Activity
oot/assets/xml/objects
History
petrie911 7b2b88d552
Volvagia (ovl_Boss_Fd) and related actors (#352) 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* Lots of functions matched. Some big ones are close.

* Five left unmatched, one close.

* Merged data and decompiled the giant function into something readable. Its branch structure has yet to be matched.

* Three unmatched, one essentially matched, the rest matched.

* More fixes.

* Documented more of the structure and cleaned up a bit.

* BossFd2, BgVbSima, and EnVbBall matched and documented

* Also removed unneeded .s files

* And need to name EnVbBall's functions

* give this a shot

* fix conflict

* one more try

* removing darkmeiro changes

* and again

* now OK from make clean

* minor cleanup

* One more matching function for BossFd

* which means it doesn't need its .s

* splitting

* splitting

* splitting

* forgot some .s

* fancy new names

* fancy new names

* trying again

* sneaky .s files

* sound effects and some hex to decimal conversions

* Sound effects and static variable cleanup

* format.sh and clean up static variables

* sfx and formatting

* ZAP and cleanup

* small cleanup

* cleanup and ZAP

* ZAP

* looking at the giant function again

* looking at the giant function again

* Only the big function left.

* Those .s files aren't mine, officer

* float literals might be fixed. regalloc still a nightmare

* almost done with the big function

* should make now

* not much of a change

* all functions match. rodata somehow doesn't.

* forgot some things

* lots of cleanup

* and a little more

* small error

* large cleanup. Also BossFd has function names and inlined variable declarations

* still more cleanup

* the quest for 0.1f continues

* forgot to put NON_MATCHING back in

* Data structures fully documented. Still more cleanup.

* DECR now works with BossFd2

* should match now

* cleanup

* small cleanup

* cleanup and names

* tiny thing

* particles and headers and stuff

* now with more enums

* merge

* test

* end test

* update

* cleanup

* object 2

* object 1

* doc object_fd2

* 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"

* formatting

* .s

* merge actor

* vertex arrays

* a little more

* formatting

* merge opd

* fixed damage check

* cleanup

* fixes

* effect struct

* review

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: fig02 <fig02srl@gmail.com>
2021-04-17 19:12:46 +02:00
..
gameplay_dangeon_keep.xml gameplay_dangeon_keep (#665) 2021-02-12 18:33:55 -05:00
gameplay_keep.xml Gerudo objects (#757) 2021-04-10 18:25:03 +02:00
object_am.xml Armos and object_am OK (#652) 2021-02-15 19:41:55 +01:00
object_anubice.xml object_anubice OK (#696) 2021-03-17 21:22:06 +01:00
object_bg.xml Fix some fixable warnings (#728) 2021-03-23 19:45:42 -04:00
object_blkobj.xml object_torch2, object_blkobj, and object_geldb (#592) 2021-01-30 14:16:18 -05:00
object_crow.xml Various objects (#677) 2021-03-17 17:06:56 -04:00
object_dekunuts.xml Fix some fixable warnings (#728) 2021-03-23 19:45:42 -04:00
object_demo_kekkai.xml Demo_Kekkai, its object, and its cutscenes (#627) 2021-02-01 14:52:23 -05:00
object_dnk.xml Fix some fixable warnings (#728) 2021-03-23 19:45:42 -04:00
object_dns.xml Fix some fixable warnings (#728) 2021-03-23 19:45:42 -04:00
object_dodongo.xml Fix some fixable warnings (#728) 2021-03-23 19:45:42 -04:00
object_du.xml object_du OK (#693) 2021-03-27 23:02:45 -04:00
object_efc_crystal_light.xml Objects used in DemoEffect OK (#731) 2021-03-23 20:40:36 -04:00
object_efc_fire_ball.xml Objects used in DemoEffect OK (#731) 2021-03-23 20:40:36 -04:00
object_efc_lgt_shower.xml Objects used in DemoEffect OK (#731) 2021-03-23 20:40:36 -04:00
object_efc_tw.xml Objects used in DemoEffect OK (#731) 2021-03-23 20:40:36 -04:00
object_fd.xml Volvagia (ovl_Boss_Fd) and related actors (#352) 2021-04-17 19:12:46 +02:00
object_fd2.xml Volvagia (ovl_Boss_Fd) and related actors (#352) 2021-04-17 19:12:46 +02:00
object_fhg.xml Phantom Ganon (ovl_Boss_Ganondrof) and related actors (#442) 2021-03-29 15:35:46 -04:00
object_fire.xml Various objects (#677) 2021-03-17 17:06:56 -04:00
object_firefly.xml Fix some fixable warnings (#728) 2021-03-23 19:45:42 -04:00
object_ge1.xml Gerudo objects (#757) 2021-04-10 18:25:03 +02:00
object_geldb.xml object_torch2, object_blkobj, and object_geldb (#592) 2021-01-30 14:16:18 -05:00
object_gi_arrow.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_arrowcase.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_bean.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_bomb_1.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_bomb_2.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_bombpouch.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_boomerang.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_boots_2.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_bosskey.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_bottle.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_bottle_letter.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_bow.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_bracelet.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_brokensword.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_butterfly.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_clothes.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_coin.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_compass.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_dekupouch.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_egg.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_eye_lotion.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_fire.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_fish.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_frog.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_gerudo.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_gerudomask.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_ghost.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_glasses.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_gloves.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_goddess.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_golonmask.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_grass.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_hammer.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_heart.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_hearts.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_hookshot.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_hoverboots.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_insect.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_jewel.xml Objects used in DemoEffect OK (#731) 2021-03-23 20:40:36 -04:00
object_gi_key.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_ki_tan_mask.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_letter.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_liquid.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_longsword.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_m_arrow.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_magicpot.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_map.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_medal.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_melody.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_milk.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_mushroom.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_niwatori.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_nuts.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_ocarina.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_ocarina_0.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_pachinko.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_powder.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_prescription.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_purse.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_rabit_mask.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_redead_mask.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_rupy.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_saw.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_scale.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_seed.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_shield_1.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_shield_2.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_shield_3.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_skj_mask.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_soldout.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_soul.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_stick.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_sutaru.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_sword_1.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_ticketstone.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_truth_mask.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gi_zoramask.xml All* Get Item objects decompiled (#668) 2021-02-12 22:57:06 +01:00
object_gj.xml object_gj OK (#698) 2021-03-17 17:53:05 -04:00
object_gla.xml Gerudo objects (#757) 2021-04-10 18:25:03 +02:00
object_gnd.xml Phantom Ganon (ovl_Boss_Ganondrof) and related actors (#442) 2021-03-29 15:35:46 -04:00
object_god_lgt.xml Objects used in DemoEffect OK (#731) 2021-03-23 20:40:36 -04:00
object_goma.xml object_goma (#754) 2021-04-04 17:54:56 -04:00
object_hidan_objects.xml Misc objects problems (#748) 2021-04-02 19:30:26 -04:00
object_hintnuts.xml Fix some fixable warnings (#728) 2021-03-23 19:45:42 -04:00
object_hni.xml object_horse and object_hni (#772) 2021-04-14 17:12:00 -04:00
object_horse.xml object_horse and object_hni (#772) 2021-04-14 17:12:00 -04:00
object_horse_ganon.xml object_horse_ganon, object_horse_link_child, object_horse_normal and object_horse_zelda OK (#724) 2021-03-27 23:44:11 -04:00
object_horse_link_child.xml object_horse_ganon, object_horse_link_child, object_horse_normal and object_horse_zelda OK (#724) 2021-03-27 23:44:11 -04:00
object_horse_normal.xml object_horse_ganon, object_horse_link_child, object_horse_normal and object_horse_zelda OK (#724) 2021-03-27 23:44:11 -04:00
object_horse_zelda.xml object_horse_ganon, object_horse_link_child, object_horse_normal and object_horse_zelda OK (#724) 2021-03-27 23:44:11 -04:00
object_jj.xml EnJj and object_jj OK (#741) 2021-03-28 20:02:09 -04:00
object_jya_iron.xml z_bg_jya_ironobj and object_jya_iron OK (#676) 2021-02-13 19:10:40 -05:00
object_light_ring.xml Objects used in DemoEffect OK (#731) 2021-03-23 20:40:36 -04:00
object_mir_ray.xml object_bg and object_mir_ray OK (#714) 2021-03-18 03:46:42 -04:00
object_mm.xml en_mm and object_mm OK (#735) 2021-03-28 19:18:41 -04:00
object_nb.xml Gerudo objects (#757) 2021-04-10 18:25:03 +02:00
object_ny.xml EnNy OK (#624) 2021-01-31 15:32:55 -05:00
object_okuta.xml Fix some fixable warnings (#728) 2021-03-23 19:45:42 -04:00
object_po_composer.xml Poe Objects (#743) 2021-04-04 23:48:12 +02:00
object_po_field.xml Poe Objects (#743) 2021-04-04 23:48:12 +02:00
object_po_sisters.xml Poe Objects (#743) 2021-04-04 23:48:12 +02:00
object_poh.xml Poe Objects (#743) 2021-04-04 23:48:12 +02:00
object_ps.xml Poe Objects (#743) 2021-04-04 23:48:12 +02:00
object_pu_box.xml object_torch2, object_blkobj, and object_geldb (#592) 2021-01-30 14:16:18 -05:00
object_sk2.xml Fix some fixable warnings (#728) 2021-03-23 19:45:42 -04:00
object_skj.xml Decompile and mostly document EnSkj, EnSkjNeedle, and OBJECT_SKJ. One NON_MATCHING (#750) 2021-04-10 17:39:25 +02:00
object_spot09_obj.xml object_torch2, object_blkobj, and object_geldb (#592) 2021-01-30 14:16:18 -05:00
object_spot11_obj.xml object_torch2, object_blkobj, and object_geldb (#592) 2021-01-30 14:16:18 -05:00
object_spot17_obj.xml object_torch2, object_blkobj, and object_geldb (#592) 2021-01-30 14:16:18 -05:00
object_sst.xml Bongo Bongo (ovl_Boss_Sst) (#458) 2021-04-06 01:08:45 +02:00
object_syokudai.xml Decompile object_syokudai and object_ydan_objects (#699) 2021-02-17 14:42:59 -05:00
object_tk.xml Poe Objects (#743) 2021-04-04 23:48:12 +02:00
object_torch2.xml object_torch2, object_blkobj, and object_geldb (#592) 2021-01-30 14:16:18 -05:00
object_triforce_spot.xml Objects used in DemoEffect OK (#731) 2021-03-23 20:40:36 -04:00
object_vase.xml object_torch2, object_blkobj, and object_geldb (#592) 2021-01-30 14:16:18 -05:00
object_wallmaster.xml Various objects (#677) 2021-03-17 17:06:56 -04:00
object_xc.xml ovl_En_Xc and object_xc OK (#746) 2021-04-14 18:49:56 -04:00
object_ydan_objects.xml Decompile object_syokudai and object_ydan_objects (#699) 2021-02-17 14:42:59 -05:00
object_zl2.xml object_zl2, object_zl2_anime1 & object_zl2_anime2 OK (#694) 2021-03-27 22:24:28 -04:00
object_zl2_anime1.xml object_zl2, object_zl2_anime1 & object_zl2_anime2 OK (#694) 2021-03-27 22:24:28 -04:00
object_zl2_anime2.xml object_zl2, object_zl2_anime1 & object_zl2_anime2 OK (#694) 2021-03-27 22:24:28 -04:00
object_zl4.xml En_Zl4 (#590) 2021-02-12 17:16:40 -05:00