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
Dragorn421 76cffddf29
Cleanup pass on in-actor effects systems (#1167) 
* Name in-actor effect functions / improve naming consistency

"particle" -> "effect"

Fixup: consistent effect functions names, missed a bunch

* Use `materialFlag` as int for the "is material already set" "boolean"

Fixup `materialFlag` (actually a boolean one), and `objectFlag`

More actually boolean `materialFlag`s

* Consistently use `_EFFECTS_COUNT` defines (except partial buffer usage, for now)

`BOSSFD_EFFECT_COUNT` -> `BOSSFD_EFFECTS_COUNT`

`EFFECT_COUNT` -> `FISHING_EFFECTS_COUNT`

Place `_EFFECTS_COUNT` defines before effect struct definition

* Name `countLimit` the "max new effect index" argument

* Rename all effect buffers to `effects`/`sEffects`

* Fixup some array/pointer usage

* `EnNiw` also has this pseudo-effects system

* `EnSyatekiNiw` also has this pseudo-effects system

* `EnFz` also has this pseudo-effects system

* `_EFFECTS_COUNT` -> `_EFFECT_COUNT`

* `effects` -> `effect` where used as iterator (hopefully covers everything)

* Run formatter
2022-04-08 20:29:26 -04:00
..
gameplay_dangeon_keep.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
gameplay_field_keep.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
gameplay_keep.xml Renamed gLinkTunic1Tex to gDekuStickTex (#1169) 2022-03-12 23:31:17 -05:00
object_ahg.xml Cleanup symbols 7 (#1073) 2022-01-17 18:50:18 -05:00
object_am.xml
object_ane.xml
object_ani.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_anubice.xml
object_aob.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_b_heart.xml
object_Bb.xml
object_bba.xml
object_bdan_objects.xml
object_bdoor.xml Replace more constants with proper asset symbols (#1071) 2021-12-07 20:10:44 +01:00
object_bg.xml
object_bigokuta.xml
object_bird.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_bji.xml Cleanup symbols 7 (#1073) 2022-01-17 18:50:18 -05:00
object_bl.xml
object_blkobj.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_bob.xml Replace more constants with proper asset symbols (#1071) 2021-12-07 20:10:44 +01:00
object_boj.xml Cleanup symbols 7 (#1073) 2022-01-17 18:50:18 -05:00
object_bombf.xml
object_bombiwa.xml
object_bowl.xml
object_box.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_brob.xml
object_bubble.xml
object_bv.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_bw.xml
object_bwall.xml
object_bxa.xml Replace more constants with proper asset symbols (#1071) 2021-12-07 20:10:44 +01:00
object_cne.xml Cleanup symbols 7 (#1073) 2022-01-17 18:50:18 -05:00
object_cob.xml
object_cow.xml
object_crow.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_cs.xml
object_d_elevator.xml
object_d_hsblock.xml Fix misc 7 (#1149) 2022-02-20 08:31:31 -05:00
object_d_lift.xml
object_daiku.xml
object_ddan_objects.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_dekubaba.xml
object_dekujr.xml
object_dekunuts.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_demo_6k.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_demo_kekkai.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_demo_tre_lgt.xml
object_dh.xml
object_dnk.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_dns.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_dodojr.xml
object_dodongo.xml
object_dog.xml Objects4 (#1057) 2021-12-27 08:08:26 -05:00
object_door_gerudo.xml
object_door_killer.xml
object_ds.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_ds2.xml
object_du.xml
object_dy_obj.xml Doc misc 1 (#1160) 2022-02-27 16:32:05 -05:00
object_ec.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_efc_crystal_light.xml
object_efc_doughnut.xml
object_efc_erupc.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_efc_fire_ball.xml
object_efc_flash.xml
object_efc_lgt_shower.xml
object_efc_star_field.xml
object_efc_tw.xml
object_ei.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_fa.xml
object_fd.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_fd2.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_fhg.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_fire.xml
object_firefly.xml
object_fish.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_fr.xml Replace more constants with proper asset symbols (#1071) 2021-12-07 20:10:44 +01:00
object_fu.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_fw.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_fz.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_ganon.xml boss_ganon (Ganondorf) OK (#1037) 2021-12-02 17:31:39 -05:00
object_ganon2.xml
object_ganon_anime1.xml boss_ganon (Ganondorf) OK (#1037) 2021-12-02 17:31:39 -05:00
object_ganon_anime2.xml
object_ganon_anime3.xml
object_ganon_objects.xml
object_ge1.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_geff.xml
object_geldb.xml
object_gi_arrow.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_arrowcase.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_bean.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_bomb_1.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_bomb_2.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_bombpouch.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_boomerang.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_boots_2.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_bosskey.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_bottle.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_bottle_letter.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_bow.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_bracelet.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_brokensword.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_butterfly.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_clothes.xml
object_gi_coin.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_compass.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_dekupouch.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_egg.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_eye_lotion.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_fire.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_fish.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_frog.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_gerudo.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_gerudomask.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_ghost.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_glasses.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_gloves.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_goddess.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_golonmask.xml
object_gi_grass.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_hammer.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_heart.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_hearts.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_hookshot.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_hoverboots.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_insect.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_jewel.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_key.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_ki_tan_mask.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_letter.xml
object_gi_liquid.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_longsword.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_m_arrow.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_magicpot.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_map.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_medal.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_melody.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_milk.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_mushroom.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_niwatori.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_nuts.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_ocarina.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_ocarina_0.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_pachinko.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_powder.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_prescription.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_purse.xml
object_gi_rabit_mask.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_redead_mask.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_rupy.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_saw.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_scale.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_seed.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_shield_1.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_shield_2.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_shield_3.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_skj_mask.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_soldout.xml
object_gi_soul.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_stick.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_sutaru.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_sword_1.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_ticketstone.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_truth_mask.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gi_zoramask.xml
object_gj.xml
object_gjyo_objects.xml
object_gla.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_gm.xml
object_gnd.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_gnd_magic.xml
object_gndd.xml
object_god_lgt.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_gol.xml
object_goma.xml
object_goroiwa.xml
object_gr.xml
object_gs.xml
object_gt.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_haka.xml
object_haka_door.xml
object_haka_objects.xml
object_hakach_objects.xml
object_hata.xml
object_heavy_object.xml
object_hidan_objects.xml
object_hintnuts.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_hni.xml
object_horse.xml
object_horse_ganon.xml
object_horse_link_child.xml Change all instances of "palette" in object symbols/OutNames to "tlut" (#1099) 2022-01-10 20:41:47 -05:00
object_horse_normal.xml
object_horse_zelda.xml
object_hs.xml
object_human.xml object_human OK (#1004) 2022-03-19 20:43:33 -04:00
object_ice_objects.xml
object_ik.xml
object_im.xml
object_in.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_ingate.xml
object_jj.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_js.xml
object_jya_door.xml
object_jya_iron.xml
object_jya_obj.xml Change all instances of "palette" in object symbols/OutNames to "tlut" (#1099) 2022-01-10 20:41:47 -05:00
object_ka.xml
object_kanban.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_kibako2.xml
object_kingdodongo.xml Replace more constants with proper asset symbols (#1071) 2021-12-07 20:10:44 +01:00
object_km1.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_kusa.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_kw1.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_kz.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_light_ring.xml
object_lightbox.xml
object_lightswitch.xml
object_link_boy.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_link_child.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_ma1.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_ma2.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_mag.xml
object_mamenoki.xml
object_mastergolon.xml
object_masterkokiri.xml
object_masterkokirihead.xml
object_masterzoora.xml
object_mb.xml
object_md.xml
object_medal.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_menkuri_objects.xml
object_mir_ray.xml
object_mizu_objects.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_mjin.xml
object_mjin_dark.xml
object_mjin_flame.xml
object_mjin_flash.xml
object_mjin_ice.xml
object_mjin_oka.xml
object_mjin_soul.xml
object_mjin_wind.xml
object_mk.xml
object_mm.xml
object_mo.xml Define gMorphaAndPoolWaterTex to remove unknown bytes. (#1174) 2022-03-12 23:54:42 -05:00
object_mori_hineri1.xml
object_mori_hineri1a.xml
object_mori_hineri2.xml
object_mori_hineri2a.xml
object_mori_objects.xml Change all instances of "palette" in object symbols/OutNames to "tlut" (#1099) 2022-01-10 20:41:47 -05:00
object_mori_tex.xml
object_ms.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_mu.xml
object_nb.xml
object_niw.xml Cleanup pass on in-actor effects systems (#1167) 2022-04-08 20:29:26 -04:00
object_nwc.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_ny.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_o_anime.xml
object_oA1.xml
object_oA2.xml
object_oA3.xml
object_oA4.xml
object_oA5.xml
object_oA6.xml
object_oA7.xml
object_oA8.xml
object_oA9.xml
object_oA10.xml
object_oA11.xml
object_oB1.xml
object_oB2.xml
object_oB3.xml
object_oB4.xml
object_oE1.xml
object_oE1s.xml
object_oE2.xml
object_oE3.xml
object_oE4.xml
object_oE4s.xml
object_oE5.xml
object_oE6.xml
object_oE7.xml
object_oE8.xml
object_oE9.xml
object_oE10.xml
object_oE11.xml
object_oE12.xml
object_oE_anime.xml
object_oF1d_map.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_oF1s.xml Cleanup symbols 7 (#1073) 2022-01-17 18:50:18 -05:00
object_okuta.xml
object_opening_demo1.xml
object_os.xml
object_os_anime.xml
object_ossan.xml Change all instances of "palette" in object symbols/OutNames to "tlut" (#1099) 2022-01-10 20:41:47 -05:00
object_ouke_haka.xml
object_owl.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_peehat.xml
object_po_composer.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_po_field.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_po_sisters.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_poh.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_ps.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_pu_box.xml
object_rd.xml
object_reeba.xml
object_relay_objects.xml
object_rl.xml
object_rr.xml
object_rs.xml
object_ru1.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_ru2.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_sa.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_sb.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_sd.xml Fix misc 6 (#1148) 2022-02-20 14:22:29 +01:00
object_shop_dungen.xml
object_shopnuts.xml
object_siofuki.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_sk2.xml
object_skb.xml
object_skj.xml Fix misc 6 (#1148) 2022-02-20 14:22:29 +01:00
object_spot00_break.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_spot00_objects.xml
object_spot01_matoya.xml
object_spot01_matoyab.xml
object_spot01_objects.xml
object_spot01_objects2.xml
object_spot02_objects.xml
object_spot03_object.xml
object_spot04_objects.xml
object_spot05_objects.xml
object_spot06_objects.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_spot07_object.xml
object_spot08_obj.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_spot09_obj.xml
object_spot11_obj.xml
object_spot12_obj.xml
object_spot15_obj.xml
object_spot16_obj.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_spot17_obj.xml Change all instances of "palette" in object symbols/OutNames to "tlut" (#1099) 2022-01-10 20:41:47 -05:00
object_spot18_obj.xml
object_ssh.xml Replace some more constants with proper asset symbols (#1053) 2021-12-02 16:19:19 -05:00
object_sst.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_st.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_stream.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_syokudai.xml
object_ta.xml
object_timeblock.xml
object_tite.xml
object_tk.xml
object_toki_objects.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_torch2.xml
object_toryo.xml
object_tp.xml
object_tr.xml Replace some more constants with proper asset symbols (#1053) 2021-12-02 16:19:19 -05:00
object_trap.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_triforce_spot.xml
object_ts.xml Replace some more constants with proper asset symbols (#1053) 2021-12-02 16:19:19 -05:00
object_tsubo.xml
object_tw.xml
object_umajump.xml
object_vali.xml
object_vase.xml
object_vm.xml
object_wallmaster.xml
object_warp1.xml
object_warp2.xml
object_wf.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_wood02.xml
object_xc.xml
object_yabusame_point.xml Replace some more constants with proper asset symbols (#1053) 2021-12-02 16:19:19 -05:00
object_ydan_objects.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_yukabyun.xml
object_zf.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00
object_zg.xml
object_zl1.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_zl2.xml
object_zl2_anime1.xml
object_zl2_anime2.xml
object_zl4.xml Whitespace (#1112) 2022-01-23 18:09:02 -05:00
object_zo.xml Asset header split (#1023) 2022-01-17 17:38:32 -05:00