From 7da80ae27f51b544d4f7c1017bdd1362d4bb4c9e Mon Sep 17 00:00:00 2001 From: Angie Date: Sun, 13 Nov 2022 20:53:24 -0300 Subject: [PATCH] Remove ActorFunc cast --- docs/tutorial/advanced_control_flow.md | 8 ++++---- docs/tutorial/beginning_decomp.md | 16 ++++++++-------- docs/tutorial/data.md | 16 ++++++++-------- docs/tutorial/documenting.md | 8 ++++---- src/code/z_en_item00.c | 8 ++++---- src/code/z_player_call.c | 8 ++++---- src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c | 8 ++++---- .../actors/ovl_Arrow_Fire/z_arrow_fire.c | 8 ++++---- src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c | 8 ++++---- .../actors/ovl_Arrow_Light/z_arrow_light.c | 8 ++++---- .../ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c | 8 ++++---- .../actors/ovl_Bg_Botihasira/z_bg_botihasira.c | 8 ++++---- .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c | 4 ++-- .../ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c | 8 ++++---- .../actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c | 8 ++++---- .../actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c | 8 ++++---- .../ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c | 8 ++++---- .../ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c | 8 ++++---- .../ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c | 8 ++++---- .../ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c | 8 ++++---- .../z_bg_dblue_waterfall.c | 8 ++++---- .../actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c | 8 ++++---- .../actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c | 8 ++++---- .../actors/ovl_Bg_F40_Block/z_bg_f40_block.c | 8 ++++---- .../actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c | 8 ++++---- .../actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c | 8 ++++---- .../actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c | 8 ++++---- .../actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c | 8 ++++---- .../actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c | 8 ++++---- .../actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c | 8 ++++---- .../actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c | 8 ++++---- .../ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c | 8 ++++---- .../ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c | 8 ++++---- .../actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c | 8 ++++---- .../z_bg_hakugin_bombwall.c | 8 ++++---- .../z_bg_hakugin_elvpole.c | 8 ++++---- .../ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c | 8 ++++---- .../ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c | 8 ++++---- .../actors/ovl_Bg_Icefloe/z_bg_icefloe.c | 8 ++++---- src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c | 8 ++++---- .../actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c | 8 ++++---- .../ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c | 8 ++++---- .../ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c | 8 ++++---- .../ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c | 8 ++++---- .../actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c | 8 ++++---- .../z_bg_ikana_rotaryroom.c | 8 ++++---- .../ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c | 8 ++++---- .../ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c | 8 ++++---- .../actors/ovl_Bg_Ikninside/z_bg_ikninside.c | 8 ++++---- .../ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c | 8 ++++---- .../actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c | 8 ++++---- src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c | 8 ++++---- .../ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c | 8 ++++---- .../ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c | 8 ++++---- .../actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c | 8 ++++---- .../ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c | 8 ++++---- .../actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c | 8 ++++---- .../ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c | 8 ++++---- .../actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c | 8 ++++---- src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c | 8 ++++---- .../actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c | 8 ++++---- .../actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c | 8 ++++---- src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c | 8 ++++---- .../actors/ovl_Bg_Market_Step/z_bg_market_step.c | 4 ++-- .../actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c | 8 ++++---- .../actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c | 8 ++++---- .../ovl_Bg_Open_Shutter/z_bg_open_shutter.c | 8 ++++---- .../actors/ovl_Bg_Open_Spot/z_bg_open_spot.c | 8 ++++---- .../actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c | 8 ++++---- src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c | 8 ++++---- .../actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c | 8 ++++---- .../actors/ovl_Bg_Tobira01/z_bg_tobira01.c | 8 ++++---- .../actors/ovl_Bg_Umajump/z_bg_umajump.c | 8 ++++---- src/overlays/actors/ovl_Boss_01/z_boss_01.c | 8 ++++---- src/overlays/actors/ovl_Boss_02/z_boss_02.c | 8 ++++---- src/overlays/actors/ovl_Boss_03/z_boss_03.c | 8 ++++---- src/overlays/actors/ovl_Boss_04/z_boss_04.c | 8 ++++---- src/overlays/actors/ovl_Boss_05/z_boss_05.c | 8 ++++---- src/overlays/actors/ovl_Boss_06/z_boss_06.c | 8 ++++---- src/overlays/actors/ovl_Boss_07/z_boss_07.c | 8 ++++---- .../actors/ovl_Boss_Hakugin/z_boss_hakugin.c | 8 ++++---- .../actors/ovl_Demo_Effect/z_demo_effect.c | 8 ++++---- .../actors/ovl_Demo_Getitem/z_demo_getitem.c | 8 ++++---- .../actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 8 ++++---- .../actors/ovl_Demo_Moonend/z_demo_moonend.c | 8 ++++---- src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c | 8 ++++---- .../actors/ovl_Demo_Syoten/z_demo_syoten.c | 8 ++++---- .../actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c | 8 ++++---- src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c | 8 ++++---- src/overlays/actors/ovl_Dm_Al/z_dm_al.c | 8 ++++---- src/overlays/actors/ovl_Dm_An/z_dm_an.c | 8 ++++---- src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c | 8 ++++---- src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c | 8 ++++---- src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c | 8 ++++---- src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c | 8 ++++---- src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c | 8 ++++---- src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c | 8 ++++---- src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c | 8 ++++---- src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c | 8 ++++---- src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c | 8 ++++---- src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c | 8 ++++---- src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c | 8 ++++---- src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c | 8 ++++---- src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c | 8 ++++---- src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c | 8 ++++---- .../actors/ovl_Dm_Opstage/z_dm_opstage.c | 8 ++++---- src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c | 8 ++++---- src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c | 8 ++++---- src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c | 8 ++++---- src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c | 8 ++++---- src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c | 8 ++++---- src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c | 8 ++++---- src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c | 8 ++++---- src/overlays/actors/ovl_Door_Ana/z_door_ana.c | 8 ++++---- .../actors/ovl_Door_Shutter/z_door_shutter.c | 8 ++++---- .../actors/ovl_Door_Spiral/z_door_spiral.c | 8 ++++---- .../actors/ovl_Door_Warp1/z_door_warp1.c | 8 ++++---- .../actors/ovl_Eff_Change/z_eff_change.c | 8 ++++---- src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c | 8 ++++---- .../ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c | 8 ++++---- .../actors/ovl_Eff_Lastday/z_eff_lastday.c | 8 ++++---- src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c | 8 ++++---- .../actors/ovl_Eff_Zoraband/z_eff_zoraband.c | 8 ++++---- src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c | 8 ++++---- src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c | 8 ++++---- src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c | 8 ++++---- src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c | 8 ++++---- src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c | 8 ++++---- src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c | 8 ++++---- src/overlays/actors/ovl_En_Ah/z_en_ah.c | 8 ++++---- .../actors/ovl_En_Akindonuts/z_en_akindonuts.c | 8 ++++---- src/overlays/actors/ovl_En_Al/z_en_al.c | 8 ++++---- src/overlays/actors/ovl_En_Am/z_en_am.c | 8 ++++---- src/overlays/actors/ovl_En_An/z_en_an.c | 8 ++++---- src/overlays/actors/ovl_En_And/z_en_and.c | 8 ++++---- src/overlays/actors/ovl_En_Ani/z_en_ani.c | 8 ++++---- src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c | 8 ++++---- src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 8 ++++---- .../actors/ovl_En_Attack_Niw/z_en_attack_niw.c | 8 ++++---- src/overlays/actors/ovl_En_Az/z_en_az.c | 8 ++++---- src/overlays/actors/ovl_En_Baba/z_en_baba.c | 8 ++++---- src/overlays/actors/ovl_En_Baguo/z_en_baguo.c | 8 ++++---- src/overlays/actors/ovl_En_Baisen/z_en_baisen.c | 8 ++++---- src/overlays/actors/ovl_En_Bal/z_en_bal.c | 8 ++++---- src/overlays/actors/ovl_En_Bat/z_en_bat.c | 8 ++++---- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 8 ++++---- src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c | 8 ++++---- src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c | 8 ++++---- src/overlays/actors/ovl_En_Bee/z_en_bee.c | 8 ++++---- src/overlays/actors/ovl_En_Bh/z_en_bh.c | 8 ++++---- .../actors/ovl_En_Bigokuta/z_en_bigokuta.c | 8 ++++---- .../actors/ovl_En_Bigpamet/z_en_bigpamet.c | 8 ++++---- src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c | 8 ++++---- .../actors/ovl_En_Bigslime/z_en_bigslime.c | 8 ++++---- src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c | 8 ++++---- src/overlays/actors/ovl_En_Bjt/z_en_bjt.c | 8 ++++---- src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c | 8 ++++---- src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c | 8 ++++---- src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c | 8 ++++---- src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c | 8 ++++---- src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c | 8 ++++---- src/overlays/actors/ovl_En_Bom/z_en_bom.c | 8 ++++---- .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 8 ++++---- .../actors/ovl_En_Bom_Chu/z_en_bom_chu.c | 8 ++++---- src/overlays/actors/ovl_En_Bombal/z_en_bombal.c | 8 ++++---- .../actors/ovl_En_Bombers/z_en_bombers.c | 8 ++++---- .../actors/ovl_En_Bombers2/z_en_bombers2.c | 8 ++++---- src/overlays/actors/ovl_En_Bombf/z_en_bombf.c | 8 ++++---- .../actors/ovl_En_Bomjima/z_en_bomjima.c | 8 ++++---- .../actors/ovl_En_Bomjimb/z_en_bomjimb.c | 8 ++++---- src/overlays/actors/ovl_En_Boom/z_en_boom.c | 8 ++++---- src/overlays/actors/ovl_En_Box/z_en_box.c | 8 ++++---- src/overlays/actors/ovl_En_Bsb/z_en_bsb.c | 8 ++++---- src/overlays/actors/ovl_En_Bu/z_en_bu.c | 8 ++++---- src/overlays/actors/ovl_En_Bubble/z_en_bubble.c | 8 ++++---- src/overlays/actors/ovl_En_Butte/z_en_butte.c | 8 ++++---- src/overlays/actors/ovl_En_Cha/z_en_cha.c | 8 ++++---- .../actors/ovl_En_Clear_Tag/z_en_clear_tag.c | 8 ++++---- src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c | 8 ++++---- .../actors/ovl_En_Col_Man/z_en_col_man.c | 8 ++++---- src/overlays/actors/ovl_En_Cow/z_en_cow.c | 8 ++++---- src/overlays/actors/ovl_En_Crow/z_en_crow.c | 8 ++++---- src/overlays/actors/ovl_En_Dai/z_en_dai.c | 8 ++++---- src/overlays/actors/ovl_En_Daiku/z_en_daiku.c | 8 ++++---- src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c | 8 ++++---- src/overlays/actors/ovl_En_Death/z_en_death.c | 8 ++++---- .../actors/ovl_En_Dekubaba/z_en_dekubaba.c | 8 ++++---- .../actors/ovl_En_Dekunuts/z_en_dekunuts.c | 8 ++++---- .../actors/ovl_En_Demo_heishi/z_en_demo_heishi.c | 8 ++++---- src/overlays/actors/ovl_En_Dg/z_en_dg.c | 8 ++++---- .../actors/ovl_En_Dinofos/z_en_dinofos.c | 8 ++++---- src/overlays/actors/ovl_En_Dnb/z_en_dnb.c | 8 ++++---- src/overlays/actors/ovl_En_Dnh/z_en_dnh.c | 8 ++++---- src/overlays/actors/ovl_En_Dnk/z_en_dnk.c | 8 ++++---- src/overlays/actors/ovl_En_Dno/z_en_dno.c | 8 ++++---- src/overlays/actors/ovl_En_Dnp/z_en_dnp.c | 8 ++++---- src/overlays/actors/ovl_En_Dnq/z_en_dnq.c | 8 ++++---- src/overlays/actors/ovl_En_Dns/z_en_dns.c | 8 ++++---- .../actors/ovl_En_Dodongo/z_en_dodongo.c | 8 ++++---- src/overlays/actors/ovl_En_Door/z_en_door.c | 8 ++++---- .../actors/ovl_En_Door_Etc/z_en_door_etc.c | 8 ++++---- src/overlays/actors/ovl_En_Dragon/z_en_dragon.c | 8 ++++---- src/overlays/actors/ovl_En_Drs/z_en_drs.c | 8 ++++---- src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c | 8 ++++---- src/overlays/actors/ovl_En_Dt/z_en_dt.c | 8 ++++---- .../actors/ovl_En_Dy_Extra/z_en_dy_extra.c | 8 ++++---- .../actors/ovl_En_Egblock/z_en_egblock.c | 8 ++++---- src/overlays/actors/ovl_En_Egol/z_en_egol.c | 8 ++++---- src/overlays/actors/ovl_En_Elf/z_en_elf.c | 8 ++++---- src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c | 8 ++++---- src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c | 8 ++++---- src/overlays/actors/ovl_En_Elforg/z_en_elforg.c | 8 ++++---- .../actors/ovl_En_Encount1/z_en_encount1.c | 8 ++++---- .../actors/ovl_En_Encount2/z_en_encount2.c | 8 ++++---- .../actors/ovl_En_Encount3/z_en_encount3.c | 8 ++++---- .../actors/ovl_En_Encount4/z_en_encount4.c | 8 ++++---- .../actors/ovl_En_Ending_Hero/z_en_ending_hero.c | 8 ++++---- .../ovl_En_Ending_Hero2/z_en_ending_hero2.c | 8 ++++---- .../ovl_En_Ending_Hero3/z_en_ending_hero3.c | 8 ++++---- .../ovl_En_Ending_Hero4/z_en_ending_hero4.c | 8 ++++---- .../ovl_En_Ending_Hero5/z_en_ending_hero5.c | 8 ++++---- .../ovl_En_Ending_Hero6/z_en_ending_hero6.c | 8 ++++---- src/overlays/actors/ovl_En_Estone/z_en_estone.c | 8 ++++---- src/overlays/actors/ovl_En_Fall/z_en_fall.c | 8 ++++---- src/overlays/actors/ovl_En_Fall2/z_en_fall2.c | 8 ++++---- src/overlays/actors/ovl_En_Famos/z_en_famos.c | 8 ++++---- src/overlays/actors/ovl_En_Fg/z_en_fg.c | 8 ++++---- .../actors/ovl_En_Fire_Rock/z_en_fire_rock.c | 8 ++++---- .../actors/ovl_En_Firefly/z_en_firefly.c | 8 ++++---- .../actors/ovl_En_Firefly2/z_en_firefly2.c | 8 ++++---- src/overlays/actors/ovl_En_Fish/z_en_fish.c | 8 ++++---- src/overlays/actors/ovl_En_Fish2/z_en_fish2.c | 8 ++++---- .../actors/ovl_En_Fishing/z_en_fishing.c | 8 ++++---- .../actors/ovl_En_Floormas/z_en_floormas.c | 8 ++++---- src/overlays/actors/ovl_En_Fr/z_en_fr.c | 8 ++++---- src/overlays/actors/ovl_En_Fsn/z_en_fsn.c | 8 ++++---- src/overlays/actors/ovl_En_Fu/z_en_fu.c | 8 ++++---- .../actors/ovl_En_Fu_Kago/z_en_fu_kago.c | 8 ++++---- .../actors/ovl_En_Fu_Mato/z_en_fu_mato.c | 8 ++++---- src/overlays/actors/ovl_En_Fz/z_en_fz.c | 8 ++++---- src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c | 8 ++++---- .../actors/ovl_En_Gamelupy/z_en_gamelupy.c | 8 ++++---- src/overlays/actors/ovl_En_Gb2/z_en_gb2.c | 8 ++++---- src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 8 ++++---- src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 8 ++++---- src/overlays/actors/ovl_En_Ge3/z_en_ge3.c | 8 ++++---- src/overlays/actors/ovl_En_Geg/z_en_geg.c | 8 ++++---- src/overlays/actors/ovl_En_Gg/z_en_gg.c | 8 ++++---- src/overlays/actors/ovl_En_Gg2/z_en_gg2.c | 8 ++++---- src/overlays/actors/ovl_En_Giant/z_en_giant.c | 8 ++++---- .../actors/ovl_En_Ginko_Man/z_en_ginko_man.c | 8 ++++---- src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 8 ++++---- src/overlays/actors/ovl_En_Gk/z_en_gk.c | 8 ++++---- src/overlays/actors/ovl_En_Gm/z_en_gm.c | 8 ++++---- src/overlays/actors/ovl_En_Go/z_en_go.c | 8 ++++---- .../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 8 ++++---- .../actors/ovl_En_Grasshopper/z_en_grasshopper.c | 8 ++++---- src/overlays/actors/ovl_En_Gs/z_en_gs.c | 8 ++++---- .../actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c | 8 ++++---- .../actors/ovl_En_Guruguru/z_en_guruguru.c | 8 ++++---- .../actors/ovl_En_Hakurock/z_en_hakurock.c | 8 ++++---- src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c | 8 ++++---- src/overlays/actors/ovl_En_Hata/z_en_hata.c | 8 ++++---- src/overlays/actors/ovl_En_Heishi/z_en_heishi.c | 8 ++++---- src/overlays/actors/ovl_En_Hg/z_en_hg.c | 8 ++++---- src/overlays/actors/ovl_En_Hgo/z_en_hgo.c | 8 ++++---- .../actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c | 8 ++++---- .../actors/ovl_En_Hint_Skb/z_en_hint_skb.c | 8 ++++---- .../actors/ovl_En_Hit_Tag/z_en_hit_tag.c | 8 ++++---- src/overlays/actors/ovl_En_Holl/z_en_holl.c | 8 ++++---- .../actors/ovl_En_Honotrap/z_en_honotrap.c | 8 ++++---- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 8 ++++---- .../z_en_horse_game_check.c | 8 ++++---- .../z_en_horse_link_child.c | 8 ++++---- src/overlays/actors/ovl_En_Hs/z_en_hs.c | 8 ++++---- src/overlays/actors/ovl_En_Hs2/z_en_hs2.c | 8 ++++---- src/overlays/actors/ovl_En_Ig/z_en_ig.c | 8 ++++---- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 8 ++++---- src/overlays/actors/ovl_En_In/z_en_in.c | 8 ++++---- src/overlays/actors/ovl_En_Insect/z_en_insect.c | 8 ++++---- .../actors/ovl_En_Invadepoh/z_en_invadepoh.c | 8 ++++---- .../ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c | 8 ++++---- .../z_en_invisible_ruppe.c | 8 ++++---- src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 8 ++++---- src/overlays/actors/ovl_En_Ja/z_en_ja.c | 8 ++++---- .../actors/ovl_En_Jc_Mato/z_en_jc_mato.c | 8 ++++---- src/overlays/actors/ovl_En_Jg/z_en_jg.c | 8 ++++---- .../actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c | 8 ++++---- src/overlays/actors/ovl_En_Js/z_en_js.c | 8 ++++---- src/overlays/actors/ovl_En_Jso/z_en_jso.c | 8 ++++---- src/overlays/actors/ovl_En_Jso2/z_en_jso2.c | 8 ++++---- .../actors/ovl_En_Kaizoku/z_en_kaizoku.c | 8 ++++---- src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c | 8 ++++---- src/overlays/actors/ovl_En_Kame/z_en_kame.c | 8 ++++---- src/overlays/actors/ovl_En_Kanban/z_en_kanban.c | 8 ++++---- .../actors/ovl_En_Karebaba/z_en_karebaba.c | 8 ++++---- src/overlays/actors/ovl_En_Kbt/z_en_kbt.c | 8 ++++---- .../actors/ovl_En_Kendo_Js/z_en_kendo_js.c | 8 ++++---- src/overlays/actors/ovl_En_Kgy/z_en_kgy.c | 8 ++++---- src/overlays/actors/ovl_En_Kitan/z_en_kitan.c | 8 ++++---- src/overlays/actors/ovl_En_Knight/z_en_knight.c | 8 ++++---- src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c | 8 ++++---- src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 8 ++++---- src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c | 8 ++++---- .../actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c | 8 ++++---- src/overlays/actors/ovl_En_Light/z_en_light.c | 8 ++++---- .../actors/ovl_En_Look_Nuts/z_en_look_nuts.c | 8 ++++---- .../actors/ovl_En_M_Fire1/z_en_m_fire1.c | 8 ++++---- .../actors/ovl_En_M_Thunder/z_en_m_thunder.c | 8 ++++---- src/overlays/actors/ovl_En_Ma4/z_en_ma4.c | 8 ++++---- src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c | 8 ++++---- src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c | 8 ++++---- src/overlays/actors/ovl_En_Mag/z_en_mag.c | 8 ++++---- src/overlays/actors/ovl_En_Maruta/z_en_maruta.c | 8 ++++---- .../actors/ovl_En_Minideath/z_en_minideath.c | 8 ++++---- .../actors/ovl_En_Minifrog/z_en_minifrog.c | 8 ++++---- .../actors/ovl_En_Minislime/z_en_minislime.c | 8 ++++---- src/overlays/actors/ovl_En_Mk/z_en_mk.c | 8 ++++---- src/overlays/actors/ovl_En_Mkk/z_en_mkk.c | 8 ++++---- src/overlays/actors/ovl_En_Mm/z_en_mm.c | 8 ++++---- src/overlays/actors/ovl_En_Mm2/z_en_mm2.c | 8 ++++---- src/overlays/actors/ovl_En_Mm3/z_en_mm3.c | 8 ++++---- src/overlays/actors/ovl_En_Mnk/z_en_mnk.c | 8 ++++---- src/overlays/actors/ovl_En_Ms/z_en_ms.c | 8 ++++---- src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c | 8 ++++---- src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c | 8 ++++---- src/overlays/actors/ovl_En_Muto/z_en_muto.c | 8 ++++---- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 8 ++++---- .../actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c | 8 ++++---- .../actors/ovl_En_Nimotsu/z_en_nimotsu.c | 8 ++++---- src/overlays/actors/ovl_En_Niw/z_en_niw.c | 8 ++++---- src/overlays/actors/ovl_En_Nnh/z_en_nnh.c | 8 ++++---- .../actors/ovl_En_Nutsball/z_en_nutsball.c | 8 ++++---- src/overlays/actors/ovl_En_Nwc/z_en_nwc.c | 8 ++++---- .../ovl_En_Okarina_Effect/z_en_okarina_effect.c | 8 ++++---- .../actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c | 8 ++++---- src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 8 ++++---- .../actors/ovl_En_Onpuman/z_en_onpuman.c | 8 ++++---- src/overlays/actors/ovl_En_Osk/z_en_osk.c | 8 ++++---- src/overlays/actors/ovl_En_Osn/z_en_osn.c | 8 ++++---- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 8 ++++---- src/overlays/actors/ovl_En_Ot/z_en_ot.c | 8 ++++---- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 8 ++++---- src/overlays/actors/ovl_En_Pamera/z_en_pamera.c | 8 ++++---- .../actors/ovl_En_Pametfrog/z_en_pametfrog.c | 8 ++++---- src/overlays/actors/ovl_En_Paper/z_en_paper.c | 8 ++++---- src/overlays/actors/ovl_En_Part/z_en_part.c | 8 ++++---- src/overlays/actors/ovl_En_Peehat/z_en_peehat.c | 8 ++++---- src/overlays/actors/ovl_En_Pm/z_en_pm.c | 8 ++++---- .../actors/ovl_En_Po_Composer/z_en_po_composer.c | 8 ++++---- .../actors/ovl_En_Po_Fusen/z_en_po_fusen.c | 8 ++++---- .../actors/ovl_En_Po_Sisters/z_en_po_sisters.c | 8 ++++---- src/overlays/actors/ovl_En_Poh/z_en_poh.c | 8 ++++---- src/overlays/actors/ovl_En_Pp/z_en_pp.c | 8 ++++---- src/overlays/actors/ovl_En_Pr/z_en_pr.c | 8 ++++---- src/overlays/actors/ovl_En_Pr2/z_en_pr2.c | 8 ++++---- src/overlays/actors/ovl_En_Prz/z_en_prz.c | 8 ++++---- src/overlays/actors/ovl_En_Pst/z_en_pst.c | 8 ++++---- .../actors/ovl_En_Racedog/z_en_racedog.c | 8 ++++---- src/overlays/actors/ovl_En_Raf/z_en_raf.c | 8 ++++---- .../actors/ovl_En_Rail_Skb/z_en_rail_skb.c | 8 ++++---- .../actors/ovl_En_Railgibud/z_en_railgibud.c | 8 ++++---- src/overlays/actors/ovl_En_Rat/z_en_rat.c | 8 ++++---- src/overlays/actors/ovl_En_Rd/z_en_rd.c | 8 ++++---- .../actors/ovl_En_Recepgirl/z_en_recepgirl.c | 8 ++++---- src/overlays/actors/ovl_En_Rg/z_en_rg.c | 8 ++++---- .../actors/ovl_En_River_Sound/z_en_river_sound.c | 8 ++++---- src/overlays/actors/ovl_En_Rr/z_en_rr.c | 8 ++++---- src/overlays/actors/ovl_En_Rsn/z_en_rsn.c | 8 ++++---- src/overlays/actors/ovl_En_Ru/z_en_ru.c | 8 ++++---- .../actors/ovl_En_Ruppecrow/z_en_ruppecrow.c | 8 ++++---- src/overlays/actors/ovl_En_Rz/z_en_rz.c | 8 ++++---- src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c | 8 ++++---- src/overlays/actors/ovl_En_Sb/z_en_sb.c | 8 ++++---- .../actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c | 8 ++++---- .../actors/ovl_En_Scopecoin/z_en_scopecoin.c | 8 ++++---- .../actors/ovl_En_Scopecrow/z_en_scopecrow.c | 8 ++++---- .../actors/ovl_En_Scopenuts/z_en_scopenuts.c | 8 ++++---- src/overlays/actors/ovl_En_Sda/z_en_sda.c | 8 ++++---- src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c | 8 ++++---- .../actors/ovl_En_Sellnuts/z_en_sellnuts.c | 8 ++++---- src/overlays/actors/ovl_En_Shn/z_en_shn.c | 8 ++++---- src/overlays/actors/ovl_En_Si/z_en_si.c | 8 ++++---- src/overlays/actors/ovl_En_Skb/z_en_skb.c | 8 ++++---- src/overlays/actors/ovl_En_Slime/z_en_slime.c | 8 ++++---- .../actors/ovl_En_Snowman/z_en_snowman.c | 8 ++++---- src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c | 8 ++++---- src/overlays/actors/ovl_En_Sob1/z_en_sob1.c | 8 ++++---- src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 8 ++++---- src/overlays/actors/ovl_En_St/z_en_st.c | 8 ++++---- src/overlays/actors/ovl_En_Sth/z_en_sth.c | 8 ++++---- src/overlays/actors/ovl_En_Sth2/z_en_sth2.c | 8 ++++---- .../ovl_En_Stone_heishi/z_en_stone_heishi.c | 8 ++++---- .../actors/ovl_En_Stop_heishi/z_en_stop_heishi.c | 8 ++++---- src/overlays/actors/ovl_En_Stream/z_en_stream.c | 8 ++++---- .../actors/ovl_En_Suttari/z_en_suttari.c | 8 ++++---- src/overlays/actors/ovl_En_Sw/z_en_sw.c | 8 ++++---- .../ovl_En_Syateki_Crow/z_en_syateki_crow.c | 8 ++++---- .../z_en_syateki_dekunuts.c | 8 ++++---- .../actors/ovl_En_Syateki_Man/z_en_syateki_man.c | 8 ++++---- .../ovl_En_Syateki_Okuta/z_en_syateki_okuta.c | 8 ++++---- .../actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c | 8 ++++---- src/overlays/actors/ovl_En_Tab/z_en_tab.c | 8 ++++---- .../actors/ovl_En_Tag_Obj/z_en_tag_obj.c | 8 ++++---- .../actors/ovl_En_Takaraya/z_en_takaraya.c | 8 ++++---- src/overlays/actors/ovl_En_Talk/z_en_talk.c | 8 ++++---- .../actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c | 8 ++++---- .../actors/ovl_En_Tanron1/z_en_tanron1.c | 8 ++++---- .../actors/ovl_En_Tanron2/z_en_tanron2.c | 8 ++++---- .../actors/ovl_En_Tanron3/z_en_tanron3.c | 8 ++++---- .../actors/ovl_En_Tanron4/z_en_tanron4.c | 8 ++++---- .../actors/ovl_En_Tanron5/z_en_tanron5.c | 8 ++++---- .../actors/ovl_En_Tanron6/z_en_tanron6.c | 8 ++++---- src/overlays/actors/ovl_En_Test/z_en_test.c | 8 ++++---- src/overlays/actors/ovl_En_Test2/z_en_test2.c | 8 ++++---- src/overlays/actors/ovl_En_Test3/z_en_test3.c | 8 ++++---- src/overlays/actors/ovl_En_Test4/z_en_test4.c | 8 ++++---- src/overlays/actors/ovl_En_Test5/z_en_test5.c | 8 ++++---- src/overlays/actors/ovl_En_Test6/z_en_test6.c | 8 ++++---- src/overlays/actors/ovl_En_Test7/z_en_test7.c | 8 ++++---- src/overlays/actors/ovl_En_Tg/z_en_tg.c | 8 ++++---- .../actors/ovl_En_Thiefbird/z_en_thiefbird.c | 8 ++++---- .../actors/ovl_En_Time_Tag/z_en_time_tag.c | 8 ++++---- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 8 ++++---- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 8 ++++---- src/overlays/actors/ovl_En_Torch/z_en_torch.c | 2 +- src/overlays/actors/ovl_En_Torch2/z_en_torch2.c | 8 ++++---- src/overlays/actors/ovl_En_Toto/z_en_toto.c | 8 ++++---- src/overlays/actors/ovl_En_Trt/z_en_trt.c | 8 ++++---- src/overlays/actors/ovl_En_Trt2/z_en_trt2.c | 8 ++++---- src/overlays/actors/ovl_En_Tru/z_en_tru.c | 8 ++++---- src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c | 8 ++++---- src/overlays/actors/ovl_En_Tsn/z_en_tsn.c | 8 ++++---- .../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 8 ++++---- src/overlays/actors/ovl_En_Twig/z_en_twig.c | 8 ++++---- src/overlays/actors/ovl_En_Viewer/z_en_viewer.c | 8 ++++---- src/overlays/actors/ovl_En_Vm/z_en_vm.c | 8 ++++---- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 8 ++++---- .../actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c | 8 ++++---- .../actors/ovl_En_Warp_tag/z_en_warp_tag.c | 8 ++++---- .../ovl_En_Water_Effect/z_en_water_effect.c | 8 ++++---- src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c | 8 ++++---- .../actors/ovl_En_Weather_Tag/z_en_weather_tag.c | 8 ++++---- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 8 ++++---- src/overlays/actors/ovl_En_Wiz/z_en_wiz.c | 8 ++++---- .../actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c | 8 ++++---- .../actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c | 8 ++++---- src/overlays/actors/ovl_En_Wood02/z_en_wood02.c | 8 ++++---- src/overlays/actors/ovl_En_Yb/z_en_yb.c | 8 ++++---- src/overlays/actors/ovl_En_Zl1/z_en_zl1.c | 8 ++++---- src/overlays/actors/ovl_En_Zl4/z_en_zl4.c | 8 ++++---- src/overlays/actors/ovl_En_Zo/z_en_zo.c | 8 ++++---- src/overlays/actors/ovl_En_Zob/z_en_zob.c | 8 ++++---- src/overlays/actors/ovl_En_Zod/z_en_zod.c | 8 ++++---- src/overlays/actors/ovl_En_Zog/z_en_zog.c | 8 ++++---- .../actors/ovl_En_Zoraegg/z_en_zoraegg.c | 8 ++++---- src/overlays/actors/ovl_En_Zos/z_en_zos.c | 8 ++++---- src/overlays/actors/ovl_En_Zot/z_en_zot.c | 8 ++++---- src/overlays/actors/ovl_En_Zov/z_en_zov.c | 8 ++++---- src/overlays/actors/ovl_En_Zow/z_en_zow.c | 8 ++++---- .../actors/ovl_Item_B_Heart/z_item_b_heart.c | 8 ++++---- .../actors/ovl_Item_Etcetera/z_item_etcetera.c | 8 ++++---- .../actors/ovl_Item_Inbox/z_item_inbox.c | 8 ++++---- src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c | 8 ++++---- src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c | 8 ++++---- src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c | 8 ++++---- src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c | 8 ++++---- src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c | 8 ++++---- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 8 ++++---- src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c | 8 ++++---- .../actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c | 8 ++++---- .../actors/ovl_Obj_Blockstop/z_obj_blockstop.c | 8 ++++---- src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c | 8 ++++---- .../actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c | 8 ++++---- src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c | 8 ++++---- src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c | 8 ++++---- .../actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c | 8 ++++---- src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c | 8 ++++---- .../actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c | 8 ++++---- src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c | 8 ++++---- .../actors/ovl_Obj_Dhouse/z_obj_dhouse.c | 8 ++++---- .../actors/ovl_Obj_Dinner/z_obj_dinner.c | 8 ++++---- src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c | 8 ++++---- .../actors/ovl_Obj_Dowsing/z_obj_dowsing.c | 8 ++++---- .../actors/ovl_Obj_Driftice/z_obj_driftice.c | 8 ++++---- .../actors/ovl_Obj_Ending/z_obj_ending.c | 8 ++++---- .../actors/ovl_Obj_Entotu/z_obj_entotu.c | 8 ++++---- .../actors/ovl_Obj_Etcetera/z_obj_etcetera.c | 8 ++++---- .../actors/ovl_Obj_Fireshield/z_obj_fireshield.c | 8 ++++---- .../actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c | 8 ++++---- src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c | 4 ++-- src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c | 8 ++++---- src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c | 8 ++++---- .../ovl_Obj_Grass_Carry/z_obj_grass_carry.c | 8 ++++---- .../actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c | 8 ++++---- .../actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c | 8 ++++---- .../actors/ovl_Obj_Hamishi/z_obj_hamishi.c | 8 ++++---- src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c | 8 ++++---- .../actors/ovl_Obj_Hariko/z_obj_hariko.c | 8 ++++---- .../actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c | 8 ++++---- .../actors/ovl_Obj_HsStump/z_obj_hsstump.c | 8 ++++---- .../actors/ovl_Obj_Hsblock/z_obj_hsblock.c | 8 ++++---- .../ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c | 8 ++++---- .../actors/ovl_Obj_Hunsui/z_obj_hunsui.c | 8 ++++---- .../actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c | 8 ++++---- .../actors/ovl_Obj_Iceblock/z_obj_iceblock.c | 8 ++++---- .../actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c | 8 ++++---- .../ovl_Obj_Jgame_Light/z_obj_jgame_light.c | 8 ++++---- .../ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c | 8 ++++---- .../actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c | 8 ++++---- .../actors/ovl_Obj_Kibako/z_obj_kibako.c | 8 ++++---- .../actors/ovl_Obj_Kibako2/z_obj_kibako2.c | 8 ++++---- .../actors/ovl_Obj_Kinoko/z_obj_kinoko.c | 8 ++++---- .../actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c | 8 ++++---- src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c | 8 ++++---- .../actors/ovl_Obj_Lightblock/z_obj_lightblock.c | 8 ++++---- .../ovl_Obj_Lightswitch/z_obj_lightswitch.c | 8 ++++---- .../ovl_Obj_Lupygamelift/z_obj_lupygamelift.c | 8 ++++---- .../ovl_Obj_Makekinsuta/z_obj_makekinsuta.c | 8 ++++---- .../ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c | 8 ++++---- .../actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c | 8 ++++---- src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c | 8 ++++---- .../actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c | 8 ++++---- .../actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c | 8 ++++---- src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c | 8 ++++---- src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c | 8 ++++---- src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c | 8 ++++---- .../actors/ovl_Obj_Nozoki/z_obj_nozoki.c | 8 ++++---- .../ovl_Obj_Ocarinalift/z_obj_ocarinalift.c | 8 ++++---- .../actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c | 8 ++++---- .../actors/ovl_Obj_Purify/z_obj_purify.c | 8 ++++---- .../actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c | 8 ++++---- .../actors/ovl_Obj_Raillift/z_obj_raillift.c | 8 ++++---- .../actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c | 8 ++++---- .../actors/ovl_Obj_Rotlift/z_obj_rotlift.c | 8 ++++---- .../actors/ovl_Obj_Shutter/z_obj_shutter.c | 8 ++++---- .../actors/ovl_Obj_Skateblock/z_obj_skateblock.c | 8 ++++---- src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c | 8 ++++---- .../actors/ovl_Obj_Snowball/z_obj_snowball.c | 8 ++++---- .../actors/ovl_Obj_Snowball2/z_obj_snowball2.c | 8 ++++---- src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c | 8 ++++---- .../actors/ovl_Obj_Spidertent/z_obj_spidertent.c | 8 ++++---- .../actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c | 8 ++++---- .../actors/ovl_Obj_Switch/z_obj_switch.c | 8 ++++---- .../actors/ovl_Obj_Swprize/z_obj_swprize.c | 8 ++++---- .../actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 8 ++++---- .../ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c | 8 ++++---- src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c | 8 ++++---- src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c | 8 ++++---- .../actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c | 8 ++++---- .../ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c | 8 ++++---- .../ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c | 8 ++++---- .../actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c | 8 ++++---- .../actors/ovl_Obj_Toudai/z_obj_toudai.c | 8 ++++---- src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c | 8 ++++---- src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 8 ++++---- src/overlays/actors/ovl_Obj_Um/z_obj_um.c | 8 ++++---- .../actors/ovl_Obj_Usiyane/z_obj_usiyane.c | 8 ++++---- .../actors/ovl_Obj_Visiblock/z_obj_visiblock.c | 8 ++++---- .../actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c | 8 ++++---- .../actors/ovl_Obj_Warpstone/z_obj_warpstone.c | 8 ++++---- src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c | 8 ++++---- src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c | 4 ++-- .../actors/ovl_Obj_Y2lift/z_obj_y2lift.c | 8 ++++---- .../actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c | 8 ++++---- src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c | 8 ++++---- src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c | 8 ++++---- .../actors/ovl_Object_Kankyo/z_object_kankyo.c | 8 ++++---- .../actors/ovl_Oceff_Spot/z_oceff_spot.c | 8 ++++---- .../actors/ovl_Oceff_Storm/z_oceff_storm.c | 8 ++++---- .../actors/ovl_Oceff_Wipe/z_oceff_wipe.c | 8 ++++---- .../actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c | 8 ++++---- .../actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c | 8 ++++---- .../actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c | 8 ++++---- .../actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c | 8 ++++---- .../actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c | 8 ++++---- .../actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c | 8 ++++---- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 8 ++++---- src/overlays/actors/ovl_TG_Sw/z_tg_sw.c | 8 ++++---- 579 files changed, 2313 insertions(+), 2313 deletions(-) diff --git a/docs/tutorial/advanced_control_flow.md b/docs/tutorial/advanced_control_flow.md index 96ba7a43d1..48f645f4ea 100644 --- a/docs/tutorial/advanced_control_flow.md +++ b/docs/tutorial/advanced_control_flow.md @@ -32,10 +32,10 @@ ActorInit En_Ms_InitVars = { FLAGS, OBJECT_MS, sizeof(EnMs), - (ActorFunc)EnMs_Init, - (ActorFunc)EnMs_Destroy, - (ActorFunc)EnMs_Update, - (ActorFunc)EnMs_Draw, + EnMs_Init, + EnMs_Destroy, + EnMs_Update, + EnMs_Draw, }; static ColliderCylinderInitType1 D_80952BA0 = { diff --git a/docs/tutorial/beginning_decomp.md b/docs/tutorial/beginning_decomp.md index 591f12a2b2..dd750d1ad8 100644 --- a/docs/tutorial/beginning_decomp.md +++ b/docs/tutorial/beginning_decomp.md @@ -33,10 +33,10 @@ ActorInit En_Recepgirl_InitVars = { FLAGS, OBJECT_BG, sizeof(EnRecepgirl), - (ActorFunc)EnRecepgirl_Init, - (ActorFunc)EnRecepgirl_Destroy, - (ActorFunc)EnRecepgirl_Update, - (ActorFunc)EnRecepgirl_Draw, + EnRecepgirl_Init, + EnRecepgirl_Destroy, + EnRecepgirl_Update, + EnRecepgirl_Draw, }; // static InitChainEntry sInitChain[] = { @@ -341,10 +341,10 @@ ActorInit En_Recepgirl_InitVars = { FLAGS, OBJECT_BG, sizeof(EnRecepgirl), - (ActorFunc)EnRecepgirl_Init, - (ActorFunc)EnRecepgirl_Destroy, - (ActorFunc)EnRecepgirl_Update, - (ActorFunc)EnRecepgirl_Draw, + EnRecepgirl_Init, + EnRecepgirl_Destroy, + EnRecepgirl_Update, + EnRecepgirl_Draw, }; static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 }; diff --git a/docs/tutorial/data.md b/docs/tutorial/data.md index 6884ebb125..b4b386eaac 100644 --- a/docs/tutorial/data.md +++ b/docs/tutorial/data.md @@ -49,10 +49,10 @@ ActorInit En_Recepgirl_InitVars = { FLAGS, OBJECT_BG, sizeof(EnRecepgirl), - (ActorFunc)EnRecepgirl_Init, - (ActorFunc)EnRecepgirl_Destroy, - (ActorFunc)EnRecepgirl_Update, - (ActorFunc)EnRecepgirl_Draw, + EnRecepgirl_Init, + EnRecepgirl_Destroy, + EnRecepgirl_Update, + EnRecepgirl_Draw, }; static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 }; @@ -105,10 +105,10 @@ ActorInit En_Recepgirl_InitVars = { FLAGS, OBJECT_BG, sizeof(EnRecepgirl), - (ActorFunc)EnRecepgirl_Init, - (ActorFunc)EnRecepgirl_Destroy, - (ActorFunc)EnRecepgirl_Update, - (ActorFunc)EnRecepgirl_Draw, + EnRecepgirl_Init, + EnRecepgirl_Destroy, + EnRecepgirl_Update, + EnRecepgirl_Draw, }; static void* D_80C106B0[4] = { (void*)0x600F8F0, (void*)0x600FCF0, (void*)0x60100F0, (void*)0x600FCF0 }; diff --git a/docs/tutorial/documenting.md b/docs/tutorial/documenting.md index 68c90ef665..ec00f169a3 100644 --- a/docs/tutorial/documenting.md +++ b/docs/tutorial/documenting.md @@ -54,10 +54,10 @@ ActorInit En_Recepgirl_InitVars = { FLAGS, OBJECT_BG, sizeof(EnRecepgirl), - (ActorFunc)EnRecepgirl_Init, - (ActorFunc)EnRecepgirl_Destroy, - (ActorFunc)EnRecepgirl_Update, - (ActorFunc)EnRecepgirl_Draw, + EnRecepgirl_Init, + EnRecepgirl_Destroy, + EnRecepgirl_Update, + EnRecepgirl_Draw, }; static void* D_80C106B0[4] = { object_bg_Tex_00F8F0, object_bg_Tex_00FCF0, object_bg_Tex_0100F0, object_bg_Tex_00FCF0 }; diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 944e650a00..8f135d79bb 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -29,10 +29,10 @@ ActorInit En_Item00_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnItem00), - (ActorFunc)EnItem00_Init, - (ActorFunc)EnItem00_Destroy, - (ActorFunc)EnItem00_Update, - (ActorFunc)EnItem00_Draw, + EnItem00_Init, + EnItem00_Destroy, + EnItem00_Update, + EnItem00_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c index a4ceeba955..fa52c8f23b 100644 --- a/src/code/z_player_call.c +++ b/src/code/z_player_call.c @@ -20,10 +20,10 @@ ActorInit Player_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(Player), - (ActorFunc)PlayerCall_Init, - (ActorFunc)PlayerCall_Destroy, - (ActorFunc)PlayerCall_Update, - (ActorFunc)PlayerCall_Draw, + PlayerCall_Init, + PlayerCall_Destroy, + PlayerCall_Update, + PlayerCall_Draw, }; void Player_Init(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index e3ac3e7538..0a94c1d867 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -26,10 +26,10 @@ ActorInit Arms_Hook_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ArmsHook), - (ActorFunc)ArmsHook_Init, - (ActorFunc)ArmsHook_Destroy, - (ActorFunc)ArmsHook_Update, - (ActorFunc)ArmsHook_Draw, + ArmsHook_Init, + ArmsHook_Destroy, + ArmsHook_Update, + ArmsHook_Draw, }; static ColliderQuadInit D_808C1BC0 = { diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 41a3f25eca..ec0045c014 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -27,10 +27,10 @@ ActorInit Arrow_Fire_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ArrowFire), - (ActorFunc)ArrowFire_Init, - (ActorFunc)ArrowFire_Destroy, - (ActorFunc)ArrowFire_Update, - (ActorFunc)ArrowFire_Draw, + ArrowFire_Init, + ArrowFire_Destroy, + ArrowFire_Update, + ArrowFire_Draw, }; static ColliderQuadInit sQuadInit = { diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 5c5cd0c872..1889d3897b 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -29,10 +29,10 @@ ActorInit Arrow_Ice_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ArrowIce), - (ActorFunc)ArrowIce_Init, - (ActorFunc)ArrowIce_Destroy, - (ActorFunc)ArrowIce_Update, - (ActorFunc)ArrowIce_Draw, + ArrowIce_Init, + ArrowIce_Destroy, + ArrowIce_Update, + ArrowIce_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index b7918b5b46..822400f288 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -27,10 +27,10 @@ ActorInit Arrow_Light_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ArrowLight), - (ActorFunc)ArrowLight_Init, - (ActorFunc)ArrowLight_Destroy, - (ActorFunc)ArrowLight_Update, - (ActorFunc)ArrowLight_Draw, + ArrowLight_Init, + ArrowLight_Destroy, + ArrowLight_Update, + ArrowLight_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c index dcf37d848e..106c1b988f 100644 --- a/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c @@ -29,10 +29,10 @@ ActorInit Bg_Astr_Bombwall_InitVars = { FLAGS, OBJECT_ASTR_OBJ, sizeof(BgAstrBombwall), - (ActorFunc)BgAstrBombwall_Init, - (ActorFunc)BgAstrBombwall_Destroy, - (ActorFunc)BgAstrBombwall_Update, - (ActorFunc)BgAstrBombwall_Draw, + BgAstrBombwall_Init, + BgAstrBombwall_Destroy, + BgAstrBombwall_Update, + BgAstrBombwall_Draw, }; static ColliderTrisElementInit sTrisElementsInit[2] = { diff --git a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c index a5168eb240..ab01da4db0 100644 --- a/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c +++ b/src/overlays/actors/ovl_Bg_Botihasira/z_bg_botihasira.c @@ -24,10 +24,10 @@ ActorInit Bg_Botihasira_InitVars = { FLAGS, OBJECT_BOTIHASIRA, sizeof(BgBotihasira), - (ActorFunc)BgBotihasira_Init, - (ActorFunc)BgBotihasira_Destroy, - (ActorFunc)BgBotihasira_Update, - (ActorFunc)BgBotihasira_Draw, + BgBotihasira_Init, + BgBotihasira_Destroy, + BgBotihasira_Update, + BgBotihasira_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index 4c73987ecc..32b3d22bd0 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -47,8 +47,8 @@ void BgBreakwall_Draw(Actor* thisx, PlayState* play); ActorInit Bg_Breakwall_InitVars = { ACTOR_BG_BREAKWALL, ACTORCAT_ITEMACTION, FLAGS, - GAMEPLAY_KEEP, sizeof(BgBreakwall), (ActorFunc)BgBreakwall_Init, - (ActorFunc)NULL, (ActorFunc)BgBreakwall_Update, (ActorFunc)NULL, + GAMEPLAY_KEEP, sizeof(BgBreakwall), BgBreakwall_Init, + NULL, BgBreakwall_Update, NULL, }; typedef struct { diff --git a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c index 19cafc2bdc..b0966cf20f 100644 --- a/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c +++ b/src/overlays/actors/ovl_Bg_Crace_Movebg/z_bg_crace_movebg.c @@ -47,10 +47,10 @@ ActorInit Bg_Crace_Movebg_InitVars = { FLAGS, OBJECT_CRACE_OBJECT, sizeof(BgCraceMovebg), - (ActorFunc)BgCraceMovebg_Init, - (ActorFunc)BgCraceMovebg_Destroy, - (ActorFunc)BgCraceMovebg_Update, - (ActorFunc)BgCraceMovebg_Draw, + BgCraceMovebg_Init, + BgCraceMovebg_Destroy, + BgCraceMovebg_Update, + BgCraceMovebg_Draw, }; static u8 sHasInitializedIsLoaded = 0; diff --git a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c index 68b2d77d2e..33f7eae318 100644 --- a/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c +++ b/src/overlays/actors/ovl_Bg_Ctower_Gear/z_bg_ctower_gear.c @@ -25,10 +25,10 @@ ActorInit Bg_Ctower_Gear_InitVars = { FLAGS, OBJECT_CTOWER_ROT, sizeof(BgCtowerGear), - (ActorFunc)BgCtowerGear_Init, - (ActorFunc)BgCtowerGear_Destroy, - (ActorFunc)BgCtowerGear_Update, - (ActorFunc)BgCtowerGear_Draw, + BgCtowerGear_Init, + BgCtowerGear_Destroy, + BgCtowerGear_Update, + BgCtowerGear_Draw, }; static Vec3f sExitSplashOffsets[] = { diff --git a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c index 85dcb0aca7..e63d4ff5b4 100644 --- a/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c +++ b/src/overlays/actors/ovl_Bg_Ctower_Rot/z_bg_ctower_rot.c @@ -27,10 +27,10 @@ ActorInit Bg_Ctower_Rot_InitVars = { FLAGS, OBJECT_CTOWER_ROT, sizeof(BgCtowerRot), - (ActorFunc)BgCtowerRot_Init, - (ActorFunc)BgCtowerRot_Destroy, - (ActorFunc)BgCtowerRot_Update, - (ActorFunc)BgCtowerRot_Draw, + BgCtowerRot_Init, + BgCtowerRot_Destroy, + BgCtowerRot_Update, + BgCtowerRot_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c index a5d01fe657..2a73bf7d3d 100644 --- a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c +++ b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c @@ -21,10 +21,10 @@ ActorInit Bg_Danpei_Movebg_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(BgDanpeiMovebg), - (ActorFunc)BgDanpeiMovebg_Init, - (ActorFunc)BgDanpeiMovebg_Destroy, - (ActorFunc)BgDanpeiMovebg_Update, - (ActorFunc)NULL, + BgDanpeiMovebg_Init, + BgDanpeiMovebg_Destroy, + BgDanpeiMovebg_Update, + NULL, }; // static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c index c962cf8efd..70248cb8eb 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c @@ -36,10 +36,10 @@ ActorInit Bg_Dblue_Balance_InitVars = { FLAGS, OBJECT_DBLUE_OBJECT, sizeof(BgDblueBalance), - (ActorFunc)BgDblueBalance_Init, - (ActorFunc)BgDblueBalance_Destroy, - (ActorFunc)BgDblueBalance_Update, - (ActorFunc)BgDblueBalance_Draw, + BgDblueBalance_Init, + BgDblueBalance_Destroy, + BgDblueBalance_Update, + BgDblueBalance_Draw, }; typedef struct { diff --git a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c index a1d724b29e..1400033b56 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Elevator/z_bg_dblue_elevator.c @@ -22,10 +22,10 @@ ActorInit Bg_Dblue_Elevator_InitVars = { FLAGS, OBJECT_DBLUE_OBJECT, sizeof(BgDblueElevator), - (ActorFunc)BgDblueElevator_Init, - (ActorFunc)BgDblueElevator_Destroy, - (ActorFunc)BgDblueElevator_Update, - (ActorFunc)BgDblueElevator_Draw, + BgDblueElevator_Init, + BgDblueElevator_Destroy, + BgDblueElevator_Update, + BgDblueElevator_Draw, }; // static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c index d6819aa004..8a4f883ed5 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c @@ -51,10 +51,10 @@ ActorInit Bg_Dblue_Movebg_InitVars = { FLAGS, OBJECT_DBLUE_OBJECT, sizeof(BgDblueMovebg), - (ActorFunc)BgDblueMovebg_Init, - (ActorFunc)BgDblueMovebg_Destroy, - (ActorFunc)BgDblueMovebg_Update, - (ActorFunc)BgDblueMovebg_Draw, + BgDblueMovebg_Init, + BgDblueMovebg_Destroy, + BgDblueMovebg_Update, + BgDblueMovebg_Draw, }; static Gfx* sOpaDLists[] = { diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c index b4c97fddef..8653c4e1e9 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c @@ -31,10 +31,10 @@ ActorInit Bg_Dblue_Waterfall_InitVars = { FLAGS, OBJECT_DBLUE_OBJECT, sizeof(BgDblueWaterfall), - (ActorFunc)BgDblueWaterfall_Init, - (ActorFunc)BgDblueWaterfall_Destroy, - (ActorFunc)BgDblueWaterfall_Update, - (ActorFunc)BgDblueWaterfall_Draw, + BgDblueWaterfall_Init, + BgDblueWaterfall_Destroy, + BgDblueWaterfall_Update, + BgDblueWaterfall_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c index 6ec845e2c2..d83131359f 100644 --- a/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c +++ b/src/overlays/actors/ovl_Bg_Dkjail_Ivy/z_bg_dkjail_ivy.c @@ -30,10 +30,10 @@ ActorInit Bg_Dkjail_Ivy_InitVars = { FLAGS, OBJECT_DKJAIL_OBJ, sizeof(BgDkjailIvy), - (ActorFunc)BgDkjailIvy_Init, - (ActorFunc)BgDkjailIvy_Destroy, - (ActorFunc)BgDkjailIvy_Update, - (ActorFunc)BgDkjailIvy_Draw, + BgDkjailIvy_Init, + BgDkjailIvy_Destroy, + BgDkjailIvy_Update, + BgDkjailIvy_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index 332e4e5430..6bd6519d37 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -32,10 +32,10 @@ ActorInit Bg_Dy_Yoseizo_InitVars = { FLAGS, OBJECT_DY_OBJ, sizeof(BgDyYoseizo), - (ActorFunc)BgDyYoseizo_Init, - (ActorFunc)BgDyYoseizo_Destroy, - (ActorFunc)BgDyYoseizo_Update, - (ActorFunc)NULL, + BgDyYoseizo_Init, + BgDyYoseizo_Destroy, + BgDyYoseizo_Update, + NULL, }; #endif diff --git a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c index 71aa958dc7..b620a4ddda 100644 --- a/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c +++ b/src/overlays/actors/ovl_Bg_F40_Block/z_bg_f40_block.c @@ -32,10 +32,10 @@ ActorInit Bg_F40_Block_InitVars = { FLAGS, OBJECT_F40_OBJ, sizeof(BgF40Block), - (ActorFunc)BgF40Block_Init, - (ActorFunc)BgF40Block_Destroy, - (ActorFunc)BgF40Block_Update, - (ActorFunc)BgF40Block_Draw, + BgF40Block_Init, + BgF40Block_Destroy, + BgF40Block_Update, + BgF40Block_Draw, }; static Vec3f D_80BC4620[] = { diff --git a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c index 4ae6a8ed7d..14789a6e61 100644 --- a/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c +++ b/src/overlays/actors/ovl_Bg_F40_Flift/z_bg_f40_flift.c @@ -25,10 +25,10 @@ ActorInit Bg_F40_Flift_InitVars = { FLAGS, OBJECT_F40_OBJ, sizeof(BgF40Flift), - (ActorFunc)BgF40Flift_Init, - (ActorFunc)BgF40Flift_Destroy, - (ActorFunc)BgF40Flift_Update, - (ActorFunc)BgF40Flift_Draw, + BgF40Flift_Init, + BgF40Flift_Destroy, + BgF40Flift_Update, + BgF40Flift_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c index 3a7916e7d3..7ff35618e2 100644 --- a/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c +++ b/src/overlays/actors/ovl_Bg_F40_Switch/z_bg_f40_switch.c @@ -30,10 +30,10 @@ ActorInit Bg_F40_Switch_InitVars = { FLAGS, OBJECT_F40_SWITCH, sizeof(BgF40Switch), - (ActorFunc)BgF40Switch_Init, - (ActorFunc)BgF40Switch_Destroy, - (ActorFunc)BgF40Switch_Update, - (ActorFunc)BgF40Switch_Draw, + BgF40Switch_Init, + BgF40Switch_Destroy, + BgF40Switch_Update, + BgF40Switch_Draw, }; s32 sBgF40SwitchGlobalsInitialized = false; diff --git a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c index 97fd3f068e..9b8fe0c513 100644 --- a/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c +++ b/src/overlays/actors/ovl_Bg_F40_Swlift/z_bg_f40_swlift.c @@ -22,10 +22,10 @@ ActorInit Bg_F40_Swlift_InitVars = { FLAGS, OBJECT_F40_OBJ, sizeof(BgF40Swlift), - (ActorFunc)BgF40Swlift_Init, - (ActorFunc)BgF40Swlift_Destroy, - (ActorFunc)BgF40Swlift_Update, - (ActorFunc)BgF40Swlift_Draw, + BgF40Swlift_Init, + BgF40Swlift_Destroy, + BgF40Swlift_Update, + BgF40Swlift_Draw, }; // static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c index 40b8c78a7f..bcd2dcae2e 100644 --- a/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c +++ b/src/overlays/actors/ovl_Bg_Fire_Wall/z_bg_fire_wall.c @@ -27,10 +27,10 @@ ActorInit Bg_Fire_Wall_InitVars = { FLAGS, OBJECT_FWALL, sizeof(BgFireWall), - (ActorFunc)BgFireWall_Init, - (ActorFunc)BgFireWall_Destroy, - (ActorFunc)BgFireWall_Update, - (ActorFunc)NULL, + BgFireWall_Init, + BgFireWall_Destroy, + BgFireWall_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c index 40a981a6ec..277a5ef662 100644 --- a/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Fu_Kaiten/z_bg_fu_kaiten.c @@ -22,10 +22,10 @@ ActorInit Bg_Fu_Kaiten_InitVars = { FLAGS, OBJECT_FU_KAITEN, sizeof(BgFuKaiten), - (ActorFunc)BgFuKaiten_Init, - (ActorFunc)BgFuKaiten_Destroy, - (ActorFunc)BgFuKaiten_Update, - (ActorFunc)BgFuKaiten_Draw, + BgFuKaiten_Init, + BgFuKaiten_Destroy, + BgFuKaiten_Update, + BgFuKaiten_Draw, }; void BgFuKaiten_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c index 5cb3372387..fe2e23a332 100644 --- a/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c +++ b/src/overlays/actors/ovl_Bg_Fu_Mizu/z_bg_fu_mizu.c @@ -22,10 +22,10 @@ ActorInit Bg_Fu_Mizu_InitVars = { FLAGS, OBJECT_FU_KAITEN, sizeof(BgFuMizu), - (ActorFunc)BgFuMizu_Init, - (ActorFunc)BgFuMizu_Destroy, - (ActorFunc)BgFuMizu_Update, - (ActorFunc)BgFuMizu_Draw, + BgFuMizu_Init, + BgFuMizu_Destroy, + BgFuMizu_Update, + BgFuMizu_Draw, }; void BgFuMizu_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c index cfd9003ec3..a8665c347d 100644 --- a/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c +++ b/src/overlays/actors/ovl_Bg_Goron_Oyu/z_bg_goron_oyu.c @@ -29,10 +29,10 @@ ActorInit Bg_Goron_Oyu_InitVars = { FLAGS, OBJECT_OYU, sizeof(BgGoronOyu), - (ActorFunc)BgGoronOyu_Init, - (ActorFunc)BgGoronOyu_Destroy, - (ActorFunc)BgGoronOyu_Update, - (ActorFunc)BgGoronOyu_Draw, + BgGoronOyu_Init, + BgGoronOyu_Destroy, + BgGoronOyu_Update, + BgGoronOyu_Draw, }; void func_80B40080(BgGoronOyu* this) { diff --git a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c index 331a6dfe5d..938f8e7be2 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c @@ -30,10 +30,10 @@ ActorInit Bg_Haka_Bombwall_InitVars = { FLAGS, OBJECT_HAKA_OBJ, sizeof(BgHakaBombwall), - (ActorFunc)BgHakaBombwall_Init, - (ActorFunc)BgHakaBombwall_Destroy, - (ActorFunc)BgHakaBombwall_Update, - (ActorFunc)BgHakaBombwall_Draw, + BgHakaBombwall_Init, + BgHakaBombwall_Destroy, + BgHakaBombwall_Update, + BgHakaBombwall_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c index 412ea3a395..ffad13ffc8 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c +++ b/src/overlays/actors/ovl_Bg_Haka_Curtain/z_bg_haka_curtain.c @@ -32,10 +32,10 @@ ActorInit Bg_Haka_Curtain_InitVars = { FLAGS, OBJECT_HAKA_OBJ, sizeof(BgHakaCurtain), - (ActorFunc)BgHakaCurtain_Init, - (ActorFunc)BgHakaCurtain_Destroy, - (ActorFunc)BgHakaCurtain_Update, - (ActorFunc)BgHakaCurtain_Draw, + BgHakaCurtain_Init, + BgHakaCurtain_Destroy, + BgHakaCurtain_Update, + BgHakaCurtain_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c index a8d63c309f..c5450e0160 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tomb/z_bg_haka_tomb.c @@ -29,10 +29,10 @@ ActorInit Bg_Haka_Tomb_InitVars = { FLAGS, OBJECT_HAKA_OBJ, sizeof(BgHakaTomb), - (ActorFunc)BgHakaTomb_Init, - (ActorFunc)BgHakaTomb_Destroy, - (ActorFunc)BgHakaTomb_Update, - (ActorFunc)BgHakaTomb_Draw, + BgHakaTomb_Init, + BgHakaTomb_Destroy, + BgHakaTomb_Update, + BgHakaTomb_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c index bde3c85407..6a3a0a9c77 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Bombwall/z_bg_hakugin_bombwall.c @@ -32,10 +32,10 @@ ActorInit Bg_Hakugin_Bombwall_InitVars = { FLAGS, OBJECT_HAKUGIN_OBJ, sizeof(BgHakuginBombwall), - (ActorFunc)BgHakuginBombwall_Init, - (ActorFunc)BgHakuginBombwall_Destroy, - (ActorFunc)BgHakuginBombwall_Update, - (ActorFunc)BgHakuginBombwall_Draw, + BgHakuginBombwall_Init, + BgHakuginBombwall_Destroy, + BgHakuginBombwall_Update, + BgHakuginBombwall_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c index 0b8d2490b5..30abfabc04 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c @@ -24,10 +24,10 @@ ActorInit Bg_Hakugin_Elvpole_InitVars = { FLAGS, OBJECT_HAKUGIN_OBJ, sizeof(BgHakuginElvpole), - (ActorFunc)BgHakuginElvpole_Init, - (ActorFunc)BgHakuginElvpole_Destroy, - (ActorFunc)BgHakuginElvpole_Update, - (ActorFunc)BgHakuginElvpole_Draw, + BgHakuginElvpole_Init, + BgHakuginElvpole_Destroy, + BgHakuginElvpole_Update, + BgHakuginElvpole_Draw, }; void BgHakuginElvpole_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c index 7f77b66453..10182898c1 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c @@ -45,10 +45,10 @@ ActorInit Bg_Hakugin_Post_InitVars = { FLAGS, OBJECT_HAKUGIN_OBJ, sizeof(BgHakuginPost), - (ActorFunc)BgHakuginPost_Init, - (ActorFunc)BgHakuginPost_Destroy, - (ActorFunc)BgHakuginPost_Update, - (ActorFunc)NULL, + BgHakuginPost_Init, + BgHakuginPost_Destroy, + BgHakuginPost_Update, + NULL, }; typedef struct { diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c index aa22dd8af8..7c9dc96020 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Switch/z_bg_hakugin_switch.c @@ -44,10 +44,10 @@ ActorInit Bg_Hakugin_Switch_InitVars = { FLAGS, OBJECT_GORONSWITCH, sizeof(BgHakuginSwitch), - (ActorFunc)BgHakuginSwitch_Init, - (ActorFunc)BgHakuginSwitch_Destroy, - (ActorFunc)BgHakuginSwitch_Update, - (ActorFunc)BgHakuginSwitch_Draw, + BgHakuginSwitch_Init, + BgHakuginSwitch_Destroy, + BgHakuginSwitch_Update, + BgHakuginSwitch_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c index 265490e52b..e40cba9547 100644 --- a/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c +++ b/src/overlays/actors/ovl_Bg_Icefloe/z_bg_icefloe.c @@ -29,10 +29,10 @@ ActorInit Bg_Icefloe_InitVars = { FLAGS, OBJECT_ICEFLOE, sizeof(BgIcefloe), - (ActorFunc)BgIcefloe_Init, - (ActorFunc)BgIcefloe_Destroy, - (ActorFunc)BgIcefloe_Update, - (ActorFunc)BgIcefloe_Draw, + BgIcefloe_Init, + BgIcefloe_Destroy, + BgIcefloe_Update, + BgIcefloe_Draw, }; static BgIcefloe* sSpawnedInstances[] = { NULL, NULL, NULL }; diff --git a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c index 7432136529..4465ba1daa 100644 --- a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c +++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c @@ -48,10 +48,10 @@ ActorInit Bg_Icicle_InitVars = { FLAGS, OBJECT_ICICLE, sizeof(BgIcicle), - (ActorFunc)BgIcicle_Init, - (ActorFunc)BgIcicle_Destroy, - (ActorFunc)BgIcicle_Update, - (ActorFunc)BgIcicle_Draw, + BgIcicle_Init, + BgIcicle_Destroy, + BgIcicle_Update, + BgIcicle_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c index 9d249314a5..6e991c0e82 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.c @@ -31,10 +31,10 @@ ActorInit Bg_Ikana_Block_InitVars = { FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(BgIkanaBlock), - (ActorFunc)BgIkanaBlock_Init, - (ActorFunc)BgIkanaBlock_Destroy, - (ActorFunc)BgIkanaBlock_Update, - (ActorFunc)NULL, + BgIkanaBlock_Init, + BgIkanaBlock_Destroy, + BgIkanaBlock_Update, + NULL, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c index a97ed6b28e..7325e3e7db 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c @@ -31,10 +31,10 @@ ActorInit Bg_Ikana_Bombwall_InitVars = { FLAGS, OBJECT_IKANA_OBJ, sizeof(BgIkanaBombwall), - (ActorFunc)BgIkanaBombwall_Init, - (ActorFunc)BgIkanaBombwall_Destroy, - (ActorFunc)BgIkanaBombwall_Update, - (ActorFunc)BgIkanaBombwall_Draw, + BgIkanaBombwall_Init, + BgIkanaBombwall_Destroy, + BgIkanaBombwall_Update, + BgIkanaBombwall_Draw, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c index 678080ae16..c810290777 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Dharma/z_bg_ikana_dharma.c @@ -30,10 +30,10 @@ ActorInit Bg_Ikana_Dharma_InitVars = { FLAGS, OBJECT_IKANA_OBJ, sizeof(BgIkanaDharma), - (ActorFunc)BgIkanaDharma_Init, - (ActorFunc)BgIkanaDharma_Destroy, - (ActorFunc)BgIkanaDharma_Update, - (ActorFunc)BgIkanaDharma_Draw, + BgIkanaDharma_Init, + BgIkanaDharma_Destroy, + BgIkanaDharma_Update, + BgIkanaDharma_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c index 5fc28c5a54..1c53c95dc8 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c @@ -32,10 +32,10 @@ ActorInit Bg_Ikana_Mirror_InitVars = { FLAGS, OBJECT_IKANA_OBJ, sizeof(BgIkanaMirror), - (ActorFunc)BgIkanaMirror_Init, - (ActorFunc)BgIkanaMirror_Destroy, - (ActorFunc)BgIkanaMirror_Update, - (ActorFunc)BgIkanaMirror_Draw, + BgIkanaMirror_Init, + BgIkanaMirror_Destroy, + BgIkanaMirror_Update, + BgIkanaMirror_Draw, }; static ColliderTrisElementInit sMirrorColliderElementsInit[] = { diff --git a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c index 6a08ba1014..22d9d86ed7 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Ray/z_bg_ikana_ray.c @@ -27,10 +27,10 @@ ActorInit Bg_Ikana_Ray_InitVars = { FLAGS, OBJECT_IKANA_OBJ, sizeof(BgIkanaRay), - (ActorFunc)BgIkanaRay_Init, - (ActorFunc)BgIkanaRay_Destroy, - (ActorFunc)BgIkanaRay_Update, - (ActorFunc)BgIkanaRay_Draw, + BgIkanaRay_Init, + BgIkanaRay_Destroy, + BgIkanaRay_Update, + BgIkanaRay_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c index 27cecd05af..9e830e7e82 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c @@ -40,10 +40,10 @@ ActorInit Bg_Ikana_Rotaryroom_InitVars = { FLAGS, OBJECT_IKANA_OBJ, sizeof(BgIkanaRotaryroom), - (ActorFunc)BgIkanaRotaryroom_Init, - (ActorFunc)BgIkanaRotaryroom_Destroy, - (ActorFunc)BgIkanaRotaryroom_Update, - (ActorFunc)BgIkanaRotaryroom_Draw, + BgIkanaRotaryroom_Init, + BgIkanaRotaryroom_Destroy, + BgIkanaRotaryroom_Update, + BgIkanaRotaryroom_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit1[2] = { diff --git a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c index a7ba89cdc6..18bfb09097 100644 --- a/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ikana_Shutter/z_bg_ikana_shutter.c @@ -42,10 +42,10 @@ ActorInit Bg_Ikana_Shutter_InitVars = { FLAGS, OBJECT_IKANA_OBJ, sizeof(BgIkanaShutter), - (ActorFunc)BgIkanaShutter_Init, - (ActorFunc)BgIkanaShutter_Destroy, - (ActorFunc)BgIkanaShutter_Update, - (ActorFunc)BgIkanaShutter_Draw, + BgIkanaShutter_Init, + BgIkanaShutter_Destroy, + BgIkanaShutter_Update, + BgIkanaShutter_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c index f9a9fcc379..abf59a1783 100644 --- a/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c +++ b/src/overlays/actors/ovl_Bg_Iknin_Susceil/z_bg_iknin_susceil.c @@ -35,10 +35,10 @@ ActorInit Bg_Iknin_Susceil_InitVars = { FLAGS, OBJECT_IKNINSIDE_OBJ, sizeof(BgIkninSusceil), - (ActorFunc)BgIkninSusceil_Init, - (ActorFunc)BgIkninSusceil_Destroy, - (ActorFunc)BgIkninSusceil_Update, - (ActorFunc)BgIkninSusceil_Draw, + BgIkninSusceil_Init, + BgIkninSusceil_Destroy, + BgIkninSusceil_Update, + BgIkninSusceil_Draw, }; static s32 unused = 0; diff --git a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c index 6016b2e443..c72efb9cef 100644 --- a/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c +++ b/src/overlays/actors/ovl_Bg_Ikninside/z_bg_ikninside.c @@ -24,10 +24,10 @@ ActorInit Bg_Ikninside_InitVars = { FLAGS, OBJECT_IKNINSIDE_OBJ, sizeof(BgIkninside), - (ActorFunc)BgIkninside_Init, - (ActorFunc)BgIkninside_Destroy, - (ActorFunc)BgIkninside_Update, - (ActorFunc)BgIkninside_Draw, + BgIkninside_Init, + BgIkninside_Destroy, + BgIkninside_Update, + BgIkninside_Draw, }; static Gfx* D_80C076A0[] = { object_ikninside_obj_DL_00A748, object_ikninside_obj_DL_00A5A8 }; diff --git a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c index 9cbfaec61b..50487b99a0 100644 --- a/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c +++ b/src/overlays/actors/ovl_Bg_Iknv_Doukutu/z_bg_iknv_doukutu.c @@ -33,10 +33,10 @@ ActorInit Bg_Iknv_Doukutu_InitVars = { FLAGS, OBJECT_IKNV_OBJ, sizeof(BgIknvDoukutu), - (ActorFunc)BgIknvDoukutu_Init, - (ActorFunc)BgIknvDoukutu_Destroy, - (ActorFunc)BgIknvDoukutu_Update, - (ActorFunc)BgIknvDoukutu_Draw, + BgIknvDoukutu_Init, + BgIknvDoukutu_Destroy, + BgIknvDoukutu_Update, + BgIknvDoukutu_Draw, }; void BgIknvDoukutu_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c index ba65baca42..c5b59f26d2 100644 --- a/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c +++ b/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.c @@ -27,10 +27,10 @@ ActorInit Bg_Iknv_Obj_InitVars = { FLAGS, OBJECT_IKNV_OBJ, sizeof(BgIknvObj), - (ActorFunc)BgIknvObj_Init, - (ActorFunc)BgIknvObj_Destroy, - (ActorFunc)BgIknvObj_Update, - (ActorFunc)BgIknvObj_Draw, + BgIknvObj_Init, + BgIknvObj_Destroy, + BgIknvObj_Update, + BgIknvObj_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index 0f267dccbb..fc19d2feed 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -32,10 +32,10 @@ ActorInit Bg_Ingate_InitVars = { FLAGS, OBJECT_SICHITAI_OBJ, sizeof(BgIngate), - (ActorFunc)BgIngate_Init, - (ActorFunc)BgIngate_Destroy, - (ActorFunc)BgIngate_Update, - (ActorFunc)BgIngate_Draw, + BgIngate_Init, + BgIngate_Destroy, + BgIngate_Update, + BgIngate_Draw, }; /** diff --git a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c index 1b1deb6c28..6b67a3c50e 100644 --- a/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c +++ b/src/overlays/actors/ovl_Bg_Inibs_Movebg/z_bg_inibs_movebg.c @@ -21,10 +21,10 @@ ActorInit Bg_Inibs_Movebg_InitVars = { FLAGS, OBJECT_INIBS_OBJECT, sizeof(BgInibsMovebg), - (ActorFunc)BgInibsMovebg_Init, - (ActorFunc)BgInibsMovebg_Destroy, - (ActorFunc)Actor_Noop, - (ActorFunc)BgInibsMovebg_Draw, + BgInibsMovebg_Init, + BgInibsMovebg_Destroy, + Actor_Noop, + BgInibsMovebg_Draw, }; Gfx* sOpaDLists[] = { gTwinmoldArenaNormalModeSandDL, gTwinmoldArenaGiantModeSandDL }; diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c index 12bfc0f3c2..7c92f99183 100644 --- a/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c +++ b/src/overlays/actors/ovl_Bg_Keikoku_Saku/z_bg_keikoku_saku.c @@ -26,10 +26,10 @@ ActorInit Bg_Keikoku_Saku_InitVars = { FLAGS, OBJECT_KEIKOKU_OBJ, sizeof(BgKeikokuSaku), - (ActorFunc)BgKeikokuSaku_Init, - (ActorFunc)BgKeikokuSaku_Destroy, - (ActorFunc)BgKeikokuSaku_Update, - (ActorFunc)BgKeikokuSaku_Draw, + BgKeikokuSaku_Init, + BgKeikokuSaku_Destroy, + BgKeikokuSaku_Update, + BgKeikokuSaku_Draw, }; void BgKeikokuSaku_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c index 8afd5d7307..20d79e61c6 100644 --- a/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c +++ b/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.c @@ -22,10 +22,10 @@ ActorInit Bg_Keikoku_Spr_InitVars = { FLAGS, OBJECT_KEIKOKU_OBJ, sizeof(BgKeikokuSpr), - (ActorFunc)BgKeikokuSpr_Init, - (ActorFunc)BgKeikokuSpr_Destroy, - (ActorFunc)BgKeikokuSpr_Update, - (ActorFunc)BgKeikokuSpr_Draw, + BgKeikokuSpr_Init, + BgKeikokuSpr_Destroy, + BgKeikokuSpr_Update, + BgKeikokuSpr_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c index 2da4ddcee5..7d45695d29 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c @@ -28,10 +28,10 @@ ActorInit Bg_Kin2_Bombwall_InitVars = { FLAGS, OBJECT_KIN2_OBJ, sizeof(BgKin2Bombwall), - (ActorFunc)BgKin2Bombwall_Init, - (ActorFunc)BgKin2Bombwall_Destroy, - (ActorFunc)BgKin2Bombwall_Update, - (ActorFunc)BgKin2Bombwall_Draw, + BgKin2Bombwall_Init, + BgKin2Bombwall_Destroy, + BgKin2Bombwall_Update, + BgKin2Bombwall_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c index dfb22deee0..2ed9207b55 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Fence/z_bg_kin2_fence.c @@ -33,10 +33,10 @@ ActorInit Bg_Kin2_Fence_InitVars = { FLAGS, OBJECT_KIN2_OBJ, sizeof(BgKin2Fence), - (ActorFunc)BgKin2Fence_Init, - (ActorFunc)BgKin2Fence_Destroy, - (ActorFunc)BgKin2Fence_Update, - (ActorFunc)BgKin2Fence_Draw, + BgKin2Fence_Init, + BgKin2Fence_Destroy, + BgKin2Fence_Update, + BgKin2Fence_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[4] = { diff --git a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c index 5892376ba1..df8e16d5ea 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Picture/z_bg_kin2_picture.c @@ -33,10 +33,10 @@ ActorInit Bg_Kin2_Picture_InitVars = { FLAGS, OBJECT_KIN2_OBJ, sizeof(BgKin2Picture), - (ActorFunc)BgKin2Picture_Init, - (ActorFunc)BgKin2Picture_Destroy, - (ActorFunc)BgKin2Picture_Update, - (ActorFunc)BgKin2Picture_Draw, + BgKin2Picture_Init, + BgKin2Picture_Destroy, + BgKin2Picture_Update, + BgKin2Picture_Draw, }; static ColliderTrisElementInit sTrisElementsInit[] = { diff --git a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c index 6c30347ef4..79b6f55541 100644 --- a/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c +++ b/src/overlays/actors/ovl_Bg_Kin2_Shelf/z_bg_kin2_shelf.c @@ -29,10 +29,10 @@ ActorInit Bg_Kin2_Shelf_InitVars = { FLAGS, OBJECT_KIN2_OBJ, sizeof(BgKin2Shelf), - (ActorFunc)BgKin2Shelf_Init, - (ActorFunc)BgKin2Shelf_Destroy, - (ActorFunc)BgKin2Shelf_Update, - (ActorFunc)BgKin2Shelf_Draw, + BgKin2Shelf_Init, + BgKin2Shelf_Destroy, + BgKin2Shelf_Update, + BgKin2Shelf_Draw, }; f32 D_80B70750[] = { 60.0f, 120.0f }; diff --git a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c index f766fef784..12e3a39982 100644 --- a/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c +++ b/src/overlays/actors/ovl_Bg_Ladder/z_bg_ladder.c @@ -26,10 +26,10 @@ ActorInit Bg_Ladder_InitVars = { FLAGS, OBJECT_LADDER, sizeof(BgLadder), - (ActorFunc)BgLadder_Init, - (ActorFunc)BgLadder_Destroy, - (ActorFunc)BgLadder_Update, - (ActorFunc)BgLadder_Draw, + BgLadder_Init, + BgLadder_Destroy, + BgLadder_Update, + BgLadder_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c index d704adf861..e2a8a08bee 100644 --- a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c +++ b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c @@ -43,10 +43,10 @@ ActorInit Bg_Last_Bwall_InitVars = { FLAGS, OBJECT_LAST_OBJ, sizeof(BgLastBwall), - (ActorFunc)BgLastBwall_Init, - (ActorFunc)BgLastBwall_Destroy, - (ActorFunc)BgLastBwall_Update, - (ActorFunc)BgLastBwall_Draw, + BgLastBwall_Init, + BgLastBwall_Destroy, + BgLastBwall_Update, + BgLastBwall_Draw, }; static ColliderTrisElementInit sTrisElementsInit[] = { diff --git a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c index 75e7b9e328..c187c3b908 100644 --- a/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c +++ b/src/overlays/actors/ovl_Bg_Lbfshot/z_bg_lbfshot.c @@ -21,10 +21,10 @@ ActorInit Bg_Lbfshot_InitVars = { FLAGS, OBJECT_LBFSHOT, sizeof(BgLbfshot), - (ActorFunc)BgLbfshot_Init, - (ActorFunc)BgLbfshot_Destroy, - (ActorFunc)Actor_Noop, - (ActorFunc)BgLbfshot_Draw, + BgLbfshot_Init, + BgLbfshot_Destroy, + Actor_Noop, + BgLbfshot_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c index 20be54a2f3..e8906b5626 100644 --- a/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c +++ b/src/overlays/actors/ovl_Bg_Lotus/z_bg_lotus.c @@ -26,10 +26,10 @@ ActorInit Bg_Lotus_InitVars = { FLAGS, OBJECT_LOTUS, sizeof(BgLotus), - (ActorFunc)BgLotus_Init, - (ActorFunc)BgLotus_Destroy, - (ActorFunc)BgLotus_Update, - (ActorFunc)BgLotus_Draw, + BgLotus_Init, + BgLotus_Destroy, + BgLotus_Update, + BgLotus_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c index 44d797b8ea..36a2dcf2dc 100644 --- a/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c +++ b/src/overlays/actors/ovl_Bg_Market_Step/z_bg_market_step.c @@ -16,8 +16,8 @@ void BgMarketStep_Draw(Actor* thisx, PlayState* play); ActorInit Bg_Market_Step_InitVars = { ACTOR_BG_MARKET_STEP, ACTORCAT_BG, FLAGS, - OBJECT_MARKET_OBJ, sizeof(BgMarketStep), (ActorFunc)BgMarketStep_Init, - (ActorFunc)Actor_Noop, (ActorFunc)Actor_Noop, (ActorFunc)BgMarketStep_Draw, + OBJECT_MARKET_OBJ, sizeof(BgMarketStep), BgMarketStep_Init, + Actor_Noop, Actor_Noop, BgMarketStep_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c index 305c3084ed..0eec819894 100644 --- a/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c +++ b/src/overlays/actors/ovl_Bg_Mbar_Chair/z_bg_mbar_chair.c @@ -22,10 +22,10 @@ ActorInit Bg_Mbar_Chair_InitVars = { FLAGS, OBJECT_MBAR_OBJ, sizeof(BgMbarChair), - (ActorFunc)BgMbarChair_Init, - (ActorFunc)BgMbarChair_Destroy, - (ActorFunc)BgMbarChair_Update, - (ActorFunc)BgMbarChair_Draw, + BgMbarChair_Init, + BgMbarChair_Destroy, + BgMbarChair_Update, + BgMbarChair_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c index 497ed10abc..fe49011205 100644 --- a/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c +++ b/src/overlays/actors/ovl_Bg_Numa_Hana/z_bg_numa_hana.c @@ -36,10 +36,10 @@ ActorInit Bg_Numa_Hana_InitVars = { FLAGS, OBJECT_NUMA_OBJ, sizeof(BgNumaHana), - (ActorFunc)BgNumaHana_Init, - (ActorFunc)BgNumaHana_Destroy, - (ActorFunc)BgNumaHana_Update, - (ActorFunc)BgNumaHana_Draw, + BgNumaHana_Init, + BgNumaHana_Destroy, + BgNumaHana_Update, + BgNumaHana_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c index c264b9775d..2a4f22bb3c 100644 --- a/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c +++ b/src/overlays/actors/ovl_Bg_Open_Shutter/z_bg_open_shutter.c @@ -33,10 +33,10 @@ ActorInit Bg_Open_Shutter_InitVars = { FLAGS, OBJECT_OPEN_OBJ, sizeof(BgOpenShutter), - (ActorFunc)BgOpenShutter_Init, - (ActorFunc)BgOpenShutter_Destroy, - (ActorFunc)BgOpenShutter_Update, - (ActorFunc)BgOpenShutter_Draw, + BgOpenShutter_Init, + BgOpenShutter_Destroy, + BgOpenShutter_Update, + BgOpenShutter_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c index dbe935b3fc..f012c2d253 100644 --- a/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c +++ b/src/overlays/actors/ovl_Bg_Open_Spot/z_bg_open_spot.c @@ -22,10 +22,10 @@ ActorInit Bg_Open_Spot_InitVars = { FLAGS, OBJECT_OPEN_OBJ, sizeof(BgOpenSpot), - (ActorFunc)BgOpenSpot_Init, - (ActorFunc)BgOpenSpot_Destroy, - (ActorFunc)BgOpenSpot_Update, - (ActorFunc)NULL, + BgOpenSpot_Init, + BgOpenSpot_Destroy, + BgOpenSpot_Update, + NULL, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c index 2ec37cb7e0..ed84bce219 100644 --- a/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c +++ b/src/overlays/actors/ovl_Bg_Sinkai_Kabe/z_bg_sinkai_kabe.c @@ -30,10 +30,10 @@ ActorInit Bg_Sinkai_Kabe_InitVars = { FLAGS, OBJECT_SINKAI_KABE, sizeof(BgSinkaiKabe), - (ActorFunc)BgSinkaiKabe_Init, - (ActorFunc)BgSinkaiKabe_Destroy, - (ActorFunc)BgSinkaiKabe_Update, - (ActorFunc)NULL, + BgSinkaiKabe_Init, + BgSinkaiKabe_Destroy, + BgSinkaiKabe_Update, + NULL, }; static s32 sCurrentPythonIndex = 0; diff --git a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c index fb8d464c8b..219a4e81c6 100644 --- a/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c +++ b/src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c @@ -30,10 +30,10 @@ ActorInit Bg_Spdweb_InitVars = { FLAGS, OBJECT_SPDWEB, sizeof(BgSpdweb), - (ActorFunc)BgSpdweb_Init, - (ActorFunc)BgSpdweb_Destroy, - (ActorFunc)BgSpdweb_Update, - (ActorFunc)BgSpdweb_Draw, + BgSpdweb_Init, + BgSpdweb_Destroy, + BgSpdweb_Update, + BgSpdweb_Draw, }; static ColliderTrisElementInit sTrisElementsInit1[2] = { diff --git a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c index fdf56d87cc..bfaeff36b3 100644 --- a/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c +++ b/src/overlays/actors/ovl_Bg_Spout_Fire/z_bg_spout_fire.c @@ -28,10 +28,10 @@ ActorInit Bg_Spout_Fire_InitVars = { FLAGS, OBJECT_FWALL, sizeof(BgSpoutFire), - (ActorFunc)BgSpoutFire_Init, - (ActorFunc)BgSpoutFire_Destroy, - (ActorFunc)BgSpoutFire_Update, - (ActorFunc)NULL, + BgSpoutFire_Init, + BgSpoutFire_Destroy, + BgSpoutFire_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c index d6617ef1c0..49e860b713 100644 --- a/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c +++ b/src/overlays/actors/ovl_Bg_Tobira01/z_bg_tobira01.c @@ -22,10 +22,10 @@ ActorInit Bg_Tobira01_InitVars = { FLAGS, OBJECT_SPOT11_OBJ, sizeof(BgTobira01), - (ActorFunc)BgTobira01_Init, - (ActorFunc)BgTobira01_Destroy, - (ActorFunc)BgTobira01_Update, - (ActorFunc)BgTobira01_Draw, + BgTobira01_Init, + BgTobira01_Destroy, + BgTobira01_Update, + BgTobira01_Draw, }; void BgTobira01_Open(BgTobira01* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c index bef32aeddc..80d0f551a7 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -24,10 +24,10 @@ ActorInit Bg_Umajump_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(BgUmajump), - (ActorFunc)BgUmajump_Init, - (ActorFunc)BgUmajump_Destroy, - (ActorFunc)BgUmajump_Update, - (ActorFunc)NULL, + BgUmajump_Init, + BgUmajump_Destroy, + BgUmajump_Update, + NULL, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Boss_01/z_boss_01.c b/src/overlays/actors/ovl_Boss_01/z_boss_01.c index 8d13ab6d32..98b6d74586 100644 --- a/src/overlays/actors/ovl_Boss_01/z_boss_01.c +++ b/src/overlays/actors/ovl_Boss_01/z_boss_01.c @@ -240,10 +240,10 @@ ActorInit Boss_01_InitVars = { FLAGS, OBJECT_BOSS01, sizeof(Boss01), - (ActorFunc)Boss01_Init, - (ActorFunc)Boss01_Destroy, - (ActorFunc)Boss01_Update, - (ActorFunc)Boss01_Draw, + Boss01_Init, + Boss01_Destroy, + Boss01_Update, + Boss01_Draw, }; #endif diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.c b/src/overlays/actors/ovl_Boss_02/z_boss_02.c index 8d65c8a76f..cbcf4aae65 100644 --- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c +++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c @@ -118,10 +118,10 @@ ActorInit Boss_02_InitVars = { FLAGS, OBJECT_BOSS02, sizeof(Boss02), - (ActorFunc)Boss02_Init, - (ActorFunc)Boss02_Destroy, - (ActorFunc)Boss02_Twinmold_Update, - (ActorFunc)Boss02_Twinmold_Draw, + Boss02_Init, + Boss02_Destroy, + Boss02_Twinmold_Update, + Boss02_Twinmold_Draw, }; f32 D_809DF5B0 = 1.0f; diff --git a/src/overlays/actors/ovl_Boss_03/z_boss_03.c b/src/overlays/actors/ovl_Boss_03/z_boss_03.c index 4c3b34fbb4..46640c82a1 100644 --- a/src/overlays/actors/ovl_Boss_03/z_boss_03.c +++ b/src/overlays/actors/ovl_Boss_03/z_boss_03.c @@ -280,10 +280,10 @@ ActorInit Boss_03_InitVars = { FLAGS, OBJECT_BOSS03, sizeof(Boss03), - (ActorFunc)Boss03_Init, - (ActorFunc)Boss03_Destroy, - (ActorFunc)Boss03_Update, - (ActorFunc)Boss03_Draw, + Boss03_Init, + Boss03_Destroy, + Boss03_Update, + Boss03_Draw, }; // The limbs referenced here are not used. The spheres are positioned manually by Boss03_PostLimbDraw diff --git a/src/overlays/actors/ovl_Boss_04/z_boss_04.c b/src/overlays/actors/ovl_Boss_04/z_boss_04.c index 0b59ff9ed7..9e40a3a7de 100644 --- a/src/overlays/actors/ovl_Boss_04/z_boss_04.c +++ b/src/overlays/actors/ovl_Boss_04/z_boss_04.c @@ -68,10 +68,10 @@ ActorInit Boss_04_InitVars = { FLAGS, OBJECT_BOSS04, sizeof(Boss04), - (ActorFunc)Boss04_Init, - (ActorFunc)Boss04_Destroy, - (ActorFunc)Boss04_Update, - (ActorFunc)Boss04_Draw, + Boss04_Init, + Boss04_Destroy, + Boss04_Update, + Boss04_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit1[1] = { diff --git a/src/overlays/actors/ovl_Boss_05/z_boss_05.c b/src/overlays/actors/ovl_Boss_05/z_boss_05.c index 3143700799..a4a9316c0a 100644 --- a/src/overlays/actors/ovl_Boss_05/z_boss_05.c +++ b/src/overlays/actors/ovl_Boss_05/z_boss_05.c @@ -153,10 +153,10 @@ ActorInit Boss_05_InitVars = { FLAGS, OBJECT_BOSS05, sizeof(Boss05), - (ActorFunc)Boss05_Init, - (ActorFunc)Boss05_Destroy, - (ActorFunc)Boss05_Update, - (ActorFunc)Boss05_Draw, + Boss05_Init, + Boss05_Destroy, + Boss05_Update, + Boss05_Draw, }; #endif diff --git a/src/overlays/actors/ovl_Boss_06/z_boss_06.c b/src/overlays/actors/ovl_Boss_06/z_boss_06.c index 5dce58c4e4..a8ce22de62 100644 --- a/src/overlays/actors/ovl_Boss_06/z_boss_06.c +++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.c @@ -75,10 +75,10 @@ ActorInit Boss_06_InitVars = { FLAGS, OBJECT_KNIGHT, sizeof(Boss06), - (ActorFunc)Boss06_Init, - (ActorFunc)Boss06_Destroy, - (ActorFunc)Boss06_Update, - (ActorFunc)Boss06_Draw, + Boss06_Init, + Boss06_Destroy, + Boss06_Update, + Boss06_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Boss_07/z_boss_07.c b/src/overlays/actors/ovl_Boss_07/z_boss_07.c index 824c70fa22..b8cabbd573 100644 --- a/src/overlays/actors/ovl_Boss_07/z_boss_07.c +++ b/src/overlays/actors/ovl_Boss_07/z_boss_07.c @@ -240,10 +240,10 @@ ActorInit Boss_07_InitVars = { FLAGS, OBJECT_BOSS07, sizeof(Boss07), - (ActorFunc)Boss07_Init, - (ActorFunc)Boss07_Destroy, - (ActorFunc)Boss07_Update, - (ActorFunc)Boss07_Draw, + Boss07_Init, + Boss07_Destroy, + Boss07_Update, + Boss07_Draw, }; // static ColliderJntSphElementInit sJntSphElementsInit[11] = { diff --git a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c index d9a7cb348a..26b3695476 100644 --- a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c +++ b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.c @@ -40,10 +40,10 @@ ActorInit Boss_Hakugin_InitVars = { FLAGS, OBJECT_BOSS_HAKUGIN, sizeof(BossHakugin), - (ActorFunc)BossHakugin_Init, - (ActorFunc)BossHakugin_Destroy, - (ActorFunc)BossHakugin_Update, - (ActorFunc)BossHakugin_Draw, + BossHakugin_Init, + BossHakugin_Destroy, + BossHakugin_Update, + BossHakugin_Draw, }; // static ColliderJntSphElementInit sJntSphElementsInit[19] = { diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index cb34f8ff8d..9356ff7709 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -31,10 +31,10 @@ ActorInit Demo_Effect_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(DemoEffect), - (ActorFunc)DemoEffect_Init, - (ActorFunc)DemoEffect_Destroy, - (ActorFunc)DemoEffect_Update, - (ActorFunc)NULL, + DemoEffect_Init, + DemoEffect_Destroy, + DemoEffect_Update, + NULL, }; void DemoEffect_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c index aa37e7b855..2831e709eb 100644 --- a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c +++ b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c @@ -24,10 +24,10 @@ ActorInit Demo_Getitem_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(DemoGetitem), - (ActorFunc)DemoGetitem_Init, - (ActorFunc)DemoGetitem_Destroy, - (ActorFunc)DemoGetitem_Update, - (ActorFunc)NULL, + DemoGetitem_Init, + DemoGetitem_Destroy, + DemoGetitem_Update, + NULL, }; static s16 sObjectBankIndices[] = { OBJECT_GI_MASK14, OBJECT_GI_SWORD_4 }; diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index c1303efab1..83b1add406 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -28,10 +28,10 @@ ActorInit Demo_Kankyo_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(DemoKankyo), - (ActorFunc)DemoKankyo_Init, - (ActorFunc)DemoKankyo_Destroy, - (ActorFunc)DemoKankyo_Update, - (ActorFunc)DemoKankyo_Draw, + DemoKankyo_Init, + DemoKankyo_Destroy, + DemoKankyo_Update, + DemoKankyo_Draw, }; static s32 sObjectBubbleIndex = OBJECT_BUBBLE | 0x10000; diff --git a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c index 76a4230f55..66715e3eb3 100644 --- a/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c +++ b/src/overlays/actors/ovl_Demo_Moonend/z_demo_moonend.c @@ -22,10 +22,10 @@ ActorInit Demo_Moonend_InitVars = { FLAGS, OBJECT_MOONEND, sizeof(DemoMoonend), - (ActorFunc)DemoMoonend_Init, - (ActorFunc)DemoMoonend_Destroy, - (ActorFunc)DemoMoonend_Update, - (ActorFunc)DemoMoonend_Draw, + DemoMoonend_Init, + DemoMoonend_Destroy, + DemoMoonend_Update, + DemoMoonend_Draw, }; #endif diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c index f5e20a5096..2912760cb9 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -21,10 +21,10 @@ ActorInit Demo_Shd_InitVars = { FLAGS, OBJECT_FWALL, sizeof(DemoShd), - (ActorFunc)DemoShd_Init, - (ActorFunc)DemoShd_Destroy, - (ActorFunc)DemoShd_Update, - (ActorFunc)DemoShd_Draw, + DemoShd_Init, + DemoShd_Destroy, + DemoShd_Update, + DemoShd_Draw, }; void DemoShd_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c index 60f9e898bb..9432dc5980 100644 --- a/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c +++ b/src/overlays/actors/ovl_Demo_Syoten/z_demo_syoten.c @@ -31,10 +31,10 @@ ActorInit Demo_Syoten_InitVars = { FLAGS, OBJECT_SYOTEN, sizeof(DemoSyoten), - (ActorFunc)DemoSyoten_Init, - (ActorFunc)DemoSyoten_Destroy, - (ActorFunc)DemoSyoten_Update, - (ActorFunc)DemoSyoten_Draw, + DemoSyoten_Init, + DemoSyoten_Destroy, + DemoSyoten_Update, + DemoSyoten_Draw, }; u8 D_80C177D0[] = { diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c index b2b8e0077b..01faa431ca 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c @@ -41,10 +41,10 @@ ActorInit Demo_Tre_Lgt_InitVars = { FLAGS, OBJECT_BOX, sizeof(DemoTreLgt), - (ActorFunc)DemoTreLgt_Init, - (ActorFunc)DemoTreLgt_Destroy, - (ActorFunc)DemoTreLgt_Update, - (ActorFunc)DemoTreLgt_Draw, + DemoTreLgt_Init, + DemoTreLgt_Destroy, + DemoTreLgt_Update, + DemoTreLgt_Draw, }; static TransformUpdateIndex* sBoxLightAnimations[] = { diff --git a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c index 047d17b902..4f18196484 100644 --- a/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c +++ b/src/overlays/actors/ovl_Dm_Ah/z_dm_ah.c @@ -21,10 +21,10 @@ ActorInit Dm_Ah_InitVars = { FLAGS, OBJECT_AH, sizeof(DmAh), - (ActorFunc)DmAh_Init, - (ActorFunc)DmAh_Destroy, - (ActorFunc)DmAh_Update, - (ActorFunc)DmAh_Draw, + DmAh_Init, + DmAh_Destroy, + DmAh_Update, + DmAh_Draw, }; static AnimationInfoS sAnimations[] = { diff --git a/src/overlays/actors/ovl_Dm_Al/z_dm_al.c b/src/overlays/actors/ovl_Dm_Al/z_dm_al.c index f817137318..9a325b6957 100644 --- a/src/overlays/actors/ovl_Dm_Al/z_dm_al.c +++ b/src/overlays/actors/ovl_Dm_Al/z_dm_al.c @@ -21,10 +21,10 @@ ActorInit Dm_Al_InitVars = { FLAGS, OBJECT_AL, sizeof(DmAl), - (ActorFunc)DmAl_Init, - (ActorFunc)DmAl_Destroy, - (ActorFunc)DmAl_Update, - (ActorFunc)DmAl_Draw, + DmAl_Init, + DmAl_Destroy, + DmAl_Update, + DmAl_Draw, }; typedef enum { diff --git a/src/overlays/actors/ovl_Dm_An/z_dm_an.c b/src/overlays/actors/ovl_Dm_An/z_dm_an.c index d536425b01..028d0c428b 100644 --- a/src/overlays/actors/ovl_Dm_An/z_dm_an.c +++ b/src/overlays/actors/ovl_Dm_An/z_dm_an.c @@ -27,10 +27,10 @@ ActorInit Dm_An_InitVars = { FLAGS, OBJECT_AN1, sizeof(DmAn), - (ActorFunc)DmAn_Init, - (ActorFunc)DmAn_Destroy, - (ActorFunc)DmAn_Update, - (ActorFunc)NULL, + DmAn_Init, + DmAn_Destroy, + DmAn_Update, + NULL, }; static AnimationInfoS sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c index e2dc0daa71..54fd75174a 100644 --- a/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c +++ b/src/overlays/actors/ovl_Dm_Bal/z_dm_bal.c @@ -24,10 +24,10 @@ ActorInit Dm_Bal_InitVars = { FLAGS, OBJECT_BAL, sizeof(DmBal), - (ActorFunc)DmBal_Init, - (ActorFunc)DmBal_Destroy, - (ActorFunc)DmBal_Update, - (ActorFunc)DmBal_Draw, + DmBal_Init, + DmBal_Destroy, + DmBal_Update, + DmBal_Draw, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c index 43cc626037..53ddcbc5c3 100644 --- a/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c +++ b/src/overlays/actors/ovl_Dm_Char00/z_dm_char00.c @@ -26,10 +26,10 @@ ActorInit Dm_Char00_InitVars = { FLAGS, OBJECT_DELF, sizeof(DmChar00), - (ActorFunc)DmChar00_Init, - (ActorFunc)DmChar00_Destroy, - (ActorFunc)DmChar00_Update, - (ActorFunc)DmChar00_Draw, + DmChar00_Init, + DmChar00_Destroy, + DmChar00_Update, + DmChar00_Draw, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c index 069d829c1e..49a53f5573 100644 --- a/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c +++ b/src/overlays/actors/ovl_Dm_Char01/z_dm_char01.c @@ -41,10 +41,10 @@ ActorInit Dm_Char01_InitVars = { FLAGS, OBJECT_MTORIDE, sizeof(DmChar01), - (ActorFunc)DmChar01_Init, - (ActorFunc)DmChar01_Destroy, - (ActorFunc)DmChar01_Update, - (ActorFunc)DmChar01_Draw, + DmChar01_Init, + DmChar01_Destroy, + DmChar01_Update, + DmChar01_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c index b618281c2d..ebd0c80c86 100644 --- a/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c +++ b/src/overlays/actors/ovl_Dm_Char02/z_dm_char02.c @@ -24,10 +24,10 @@ ActorInit Dm_Char02_InitVars = { FLAGS, OBJECT_STK2, sizeof(DmChar02), - (ActorFunc)DmChar02_Init, - (ActorFunc)DmChar02_Destroy, - (ActorFunc)DmChar02_Update, - (ActorFunc)DmChar02_Draw, + DmChar02_Init, + DmChar02_Destroy, + DmChar02_Update, + DmChar02_Draw, }; diff --git a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c index 714913231b..8840ac165e 100644 --- a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c +++ b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c @@ -26,10 +26,10 @@ ActorInit Dm_Char03_InitVars = { FLAGS, OBJECT_OSN, sizeof(DmChar03), - (ActorFunc)DmChar03_Init, - (ActorFunc)DmChar03_Destroy, - (ActorFunc)DmChar03_Update, - (ActorFunc)DmChar03_Draw, + DmChar03_Init, + DmChar03_Destroy, + DmChar03_Update, + DmChar03_Draw, }; AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c index 5c835152df..a542c04db2 100644 --- a/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c +++ b/src/overlays/actors/ovl_Dm_Char04/z_dm_char04.c @@ -24,10 +24,10 @@ ActorInit Dm_Char04_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(DmChar04), - (ActorFunc)DmChar04_Init, - (ActorFunc)DmChar04_Destroy, - (ActorFunc)DmChar04_Update, - (ActorFunc)DmChar04_Draw, + DmChar04_Init, + DmChar04_Destroy, + DmChar04_Update, + DmChar04_Draw, }; void DmChar04_ChangeAnim(SkelAnime* skelAnime, AnimationInfo* animation, u16 animIndex) { diff --git a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c index 7e368b9e3c..dcd6267fec 100644 --- a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c +++ b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c @@ -41,10 +41,10 @@ ActorInit Dm_Char05_InitVars = { FLAGS, OBJECT_DMASK, sizeof(DmChar05), - (ActorFunc)DmChar05_Init, - (ActorFunc)DmChar05_Destroy, - (ActorFunc)DmChar05_Update, - (ActorFunc)DmChar05_Draw, + DmChar05_Init, + DmChar05_Destroy, + DmChar05_Update, + DmChar05_Draw, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c index 0385a82d4f..f33e2461ad 100644 --- a/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c +++ b/src/overlays/actors/ovl_Dm_Char06/z_dm_char06.c @@ -24,10 +24,10 @@ ActorInit Dm_Char06_InitVars = { FLAGS, OBJECT_YUKIYAMA, sizeof(DmChar06), - (ActorFunc)DmChar06_Init, - (ActorFunc)DmChar06_Destroy, - (ActorFunc)DmChar06_Update, - (ActorFunc)DmChar06_Draw, + DmChar06_Init, + DmChar06_Destroy, + DmChar06_Update, + DmChar06_Draw, }; void DmChar06_SetupAction(DmChar06* this, DmChar06ActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c index 844be223e9..55dd0352c8 100644 --- a/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c +++ b/src/overlays/actors/ovl_Dm_Char07/z_dm_char07.c @@ -24,10 +24,10 @@ ActorInit Dm_Char07_InitVars = { FLAGS, OBJECT_MILKBAR, sizeof(DmChar07), - (ActorFunc)DmChar07_Init, - (ActorFunc)DmChar07_Destroy, - (ActorFunc)DmChar07_Update, - (ActorFunc)DmChar07_Draw, + DmChar07_Init, + DmChar07_Destroy, + DmChar07_Update, + DmChar07_Draw, }; void DmChar07_SetupAction(DmChar07* this, DmChar07ActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c index 4129adfbef..6a1ac36b7b 100644 --- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c +++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c @@ -57,10 +57,10 @@ ActorInit Dm_Char08_InitVars = { FLAGS, OBJECT_KAMEJIMA, sizeof(DmChar08), - (ActorFunc)DmChar08_Init, - (ActorFunc)DmChar08_Destroy, - (ActorFunc)DmChar08_Update, - (ActorFunc)DmChar08_Draw, + DmChar08_Init, + DmChar08_Destroy, + DmChar08_Update, + DmChar08_Draw, }; #include "overlays/ovl_Dm_Char08/ovl_Dm_Char08.c" diff --git a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c index 654bc6c07c..3e8989e9de 100644 --- a/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c +++ b/src/overlays/actors/ovl_Dm_Char09/z_dm_char09.c @@ -24,10 +24,10 @@ ActorInit Dm_Char09_InitVars = { FLAGS, OBJECT_BEE, sizeof(DmChar09), - (ActorFunc)DmChar09_Init, - (ActorFunc)DmChar09_Destroy, - (ActorFunc)DmChar09_Update, - (ActorFunc)DmChar09_Draw, + DmChar09_Init, + DmChar09_Destroy, + DmChar09_Update, + DmChar09_Draw, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c index 5321abc922..ca850f2d86 100644 --- a/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c +++ b/src/overlays/actors/ovl_Dm_Gm/z_dm_gm.c @@ -27,10 +27,10 @@ ActorInit Dm_Gm_InitVars = { FLAGS, OBJECT_AN1, sizeof(DmGm), - (ActorFunc)DmGm_Init, - (ActorFunc)DmGm_Destroy, - (ActorFunc)DmGm_Update, - (ActorFunc)NULL, + DmGm_Init, + DmGm_Destroy, + DmGm_Update, + NULL, }; static AnimationInfoS sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c index a2a2589fb1..d981d73a13 100644 --- a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c +++ b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c @@ -27,10 +27,10 @@ ActorInit Dm_Hina_InitVars = { FLAGS, OBJECT_BSMASK, sizeof(DmHina), - (ActorFunc)DmHina_Init, - (ActorFunc)DmHina_Destroy, - (ActorFunc)DmHina_Update, - (ActorFunc)DmHina_Draw, + DmHina_Init, + DmHina_Destroy, + DmHina_Update, + DmHina_Draw, }; #endif diff --git a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c index 98f7bac489..4b4dda5e59 100644 --- a/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c +++ b/src/overlays/actors/ovl_Dm_Nb/z_dm_nb.c @@ -21,10 +21,10 @@ ActorInit Dm_Nb_InitVars = { FLAGS, OBJECT_NB, sizeof(DmNb), - (ActorFunc)DmNb_Init, - (ActorFunc)DmNb_Destroy, - (ActorFunc)DmNb_Update, - (ActorFunc)DmNb_Draw, + DmNb_Init, + DmNb_Destroy, + DmNb_Update, + DmNb_Draw, }; static AnimationInfoS sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c index db76db2787..e7ea6ce5c8 100644 --- a/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c +++ b/src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c @@ -24,10 +24,10 @@ ActorInit Dm_Opstage_InitVars = { FLAGS, OBJECT_KEIKOKU_DEMO, sizeof(DmOpstage), - (ActorFunc)DmOpstage_Init, - (ActorFunc)DmOpstage_Destroy, - (ActorFunc)DmOpstage_Update, - (ActorFunc)DmOpstage_Draw, + DmOpstage_Init, + DmOpstage_Destroy, + DmOpstage_Update, + DmOpstage_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c index 25fee11db7..1dc86989f4 100644 --- a/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c +++ b/src/overlays/actors/ovl_Dm_Ravine/z_dm_ravine.c @@ -22,10 +22,10 @@ ActorInit Dm_Ravine_InitVars = { FLAGS, OBJECT_KEIKOKU_DEMO, sizeof(DmRavine), - (ActorFunc)DmRavine_Init, - (ActorFunc)DmRavine_Destroy, - (ActorFunc)DmRavine_Update, - (ActorFunc)DmRavine_Draw, + DmRavine_Init, + DmRavine_Destroy, + DmRavine_Update, + DmRavine_Draw, }; void DmRavine_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c index dc6d8bcef9..895c9a6a9c 100644 --- a/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c +++ b/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.c @@ -24,10 +24,10 @@ ActorInit Dm_Sa_InitVars = { FLAGS, OBJECT_STK, sizeof(DmSa), - (ActorFunc)DmSa_Init, - (ActorFunc)DmSa_Destroy, - (ActorFunc)DmSa_Update, - (ActorFunc)DmSa_Draw, + DmSa_Init, + DmSa_Destroy, + DmSa_Update, + DmSa_Draw, }; static AnimationInfo sAnimationInfo[] = { { &gSkullKidTPoseAnim, 1.0f, 0, -1.0f, ANIMMODE_LOOP, 0 } }; diff --git a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c index 11f2724de3..fc69f14f67 100644 --- a/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c +++ b/src/overlays/actors/ovl_Dm_Statue/z_dm_statue.c @@ -22,10 +22,10 @@ ActorInit Dm_Statue_InitVars = { FLAGS, OBJECT_SMTOWER, sizeof(DmStatue), - (ActorFunc)DmStatue_Init, - (ActorFunc)DmStatue_Destroy, - (ActorFunc)DmStatue_Update, - (ActorFunc)DmStatue_Draw, + DmStatue_Init, + DmStatue_Destroy, + DmStatue_Update, + DmStatue_Draw, }; void DmStatue_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c index f82279c09b..bfd6e5c7b6 100644 --- a/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c +++ b/src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c @@ -156,10 +156,10 @@ ActorInit Dm_Stk_InitVars = { FLAGS, OBJECT_STK, sizeof(DmStk), - (ActorFunc)DmStk_Init, - (ActorFunc)DmStk_Destroy, - (ActorFunc)DmStk_Update, - (ActorFunc)DmStk_Draw, + DmStk_Init, + DmStk_Destroy, + DmStk_Update, + DmStk_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c index ce1cc98f38..fe85d9f1cb 100644 --- a/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c +++ b/src/overlays/actors/ovl_Dm_Tag/z_dm_tag.c @@ -24,10 +24,10 @@ ActorInit Dm_Tag_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(DmTag), - (ActorFunc)DmTag_Init, - (ActorFunc)DmTag_Destroy, - (ActorFunc)DmTag_Update, - (ActorFunc)NULL, + DmTag_Init, + DmTag_Destroy, + DmTag_Update, + NULL, }; s32 D_80C22BF0[] = { diff --git a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c index 7dec0540e5..336d61696d 100644 --- a/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c +++ b/src/overlays/actors/ovl_Dm_Tsg/z_dm_tsg.c @@ -22,10 +22,10 @@ ActorInit Dm_Tsg_InitVars = { FLAGS, OBJECT_OPEN_OBJ, sizeof(DmTsg), - (ActorFunc)DmTsg_Init, - (ActorFunc)DmTsg_Destroy, - (ActorFunc)DmTsg_Update, - (ActorFunc)DmTsg_Draw, + DmTsg_Init, + DmTsg_Destroy, + DmTsg_Update, + DmTsg_Draw, }; #endif diff --git a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c index a671fe3f26..d2f16d7cec 100644 --- a/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c +++ b/src/overlays/actors/ovl_Dm_Zl/z_dm_zl.c @@ -23,10 +23,10 @@ ActorInit Dm_Zl_InitVars = { FLAGS, OBJECT_ZL4, sizeof(DmZl), - (ActorFunc)DmZl_Init, - (ActorFunc)DmZl_Destroy, - (ActorFunc)DmZl_Update, - (ActorFunc)DmZl_Draw, + DmZl_Init, + DmZl_Destroy, + DmZl_Update, + DmZl_Draw, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index 9086a052dc..f8431fd8e7 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -26,10 +26,10 @@ ActorInit Door_Ana_InitVars = { FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(DoorAna), - (ActorFunc)DoorAna_Init, - (ActorFunc)DoorAna_Destroy, - (ActorFunc)DoorAna_Update, - (ActorFunc)DoorAna_Draw, + DoorAna_Init, + DoorAna_Destroy, + DoorAna_Update, + DoorAna_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index db564f3f26..c2abe35d31 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -46,10 +46,10 @@ ActorInit Door_Shutter_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(DoorShutter), - (ActorFunc)DoorShutter_Init, - (ActorFunc)DoorShutter_Destroy, - (ActorFunc)DoorShutter_Update, - (ActorFunc)NULL, + DoorShutter_Init, + DoorShutter_Destroy, + DoorShutter_Update, + NULL, }; typedef struct { diff --git a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c index 541e3de233..126278ee9d 100644 --- a/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c +++ b/src/overlays/actors/ovl_Door_Spiral/z_door_spiral.c @@ -73,10 +73,10 @@ ActorInit Door_Spiral_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(DoorSpiral), - (ActorFunc)DoorSpiral_Init, - (ActorFunc)DoorSpiral_Destroy, - (ActorFunc)DoorSpiral_Update, - (ActorFunc)DoorSpiral_Draw, + DoorSpiral_Init, + DoorSpiral_Destroy, + DoorSpiral_Update, + DoorSpiral_Draw, }; // Parameters for each staircase, indexed with SpiralType diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index bf31f039cb..e9b60f6ed6 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -55,10 +55,10 @@ ActorInit Door_Warp1_InitVars = { FLAGS, OBJECT_WARP1, sizeof(DoorWarp1), - (ActorFunc)DoorWarp1_Init, - (ActorFunc)DoorWarp1_Destroy, - (ActorFunc)DoorWarp1_Update, - (ActorFunc)DoorWarp1_Draw, + DoorWarp1_Init, + DoorWarp1_Destroy, + DoorWarp1_Update, + DoorWarp1_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Eff_Change/z_eff_change.c b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c index 9174fafc00..c324243e01 100644 --- a/src/overlays/actors/ovl_Eff_Change/z_eff_change.c +++ b/src/overlays/actors/ovl_Eff_Change/z_eff_change.c @@ -24,10 +24,10 @@ ActorInit Eff_Change_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EffChange), - (ActorFunc)EffChange_Init, - (ActorFunc)EffChange_Destroy, - (ActorFunc)EffChange_Update, - (ActorFunc)NULL, + EffChange_Init, + EffChange_Destroy, + EffChange_Update, + NULL, }; static u8 D_80A4C920[] = { diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index 2833477e4a..2d2c222af2 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -30,10 +30,10 @@ ActorInit Eff_Dust_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EffDust), - (ActorFunc)EffDust_Init, - (ActorFunc)EffDust_Destroy, - (ActorFunc)EffDust_Update, - (ActorFunc)EffDust_Draw, + EffDust_Init, + EffDust_Destroy, + EffDust_Update, + EffDust_Draw, }; void func_80918B40(EffDust* this) { diff --git a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c index 75ff275a14..e04bfcdce7 100644 --- a/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c +++ b/src/overlays/actors/ovl_Eff_Kamejima_Wave/z_eff_kamejima_wave.c @@ -29,10 +29,10 @@ ActorInit Eff_Kamejima_Wave_InitVars = { FLAGS, OBJECT_KAMEJIMA, sizeof(EffKamejimaWave), - (ActorFunc)EffKamejimaWave_Init, - (ActorFunc)EffKamejimaWave_Destroy, - (ActorFunc)EffKamejimaWave_Update, - (ActorFunc)NULL, + EffKamejimaWave_Init, + EffKamejimaWave_Destroy, + EffKamejimaWave_Update, + NULL, }; static Color_RGBA8 sPrimColors[] = { diff --git a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c index 0041f1e99c..aacfb97250 100644 --- a/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c +++ b/src/overlays/actors/ovl_Eff_Lastday/z_eff_lastday.c @@ -34,10 +34,10 @@ ActorInit Eff_Lastday_InitVars = { FLAGS, OBJECT_LASTDAY, sizeof(EffLastday), - (ActorFunc)EffLastday_Init, - (ActorFunc)EffLastday_Destroy, - (ActorFunc)EffLastday_Update, - (ActorFunc)EffLastday_Draw, + EffLastday_Init, + EffLastday_Destroy, + EffLastday_Update, + EffLastday_Draw, }; void EffLastday_Init(Actor* thisx, PlayState* play2) { diff --git a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c index 4d66cc8276..f98d97deee 100644 --- a/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c +++ b/src/overlays/actors/ovl_Eff_Stk/z_eff_stk.c @@ -22,10 +22,10 @@ ActorInit Eff_Stk_InitVars = { FLAGS, OBJECT_STK2, sizeof(EffStk), - (ActorFunc)EffStk_Init, - (ActorFunc)EffStk_Destroy, - (ActorFunc)EffStk_Update, - (ActorFunc)EffStk_Draw, + EffStk_Init, + EffStk_Destroy, + EffStk_Update, + EffStk_Draw, }; #endif diff --git a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c index 842ae4b9ec..f6aafe4393 100644 --- a/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c +++ b/src/overlays/actors/ovl_Eff_Zoraband/z_eff_zoraband.c @@ -24,10 +24,10 @@ ActorInit Eff_Zoraband_InitVars = { FLAGS, OBJECT_ZORABAND, sizeof(EffZoraband), - (ActorFunc)EffZoraband_Init, - (ActorFunc)EffZoraband_Destroy, - (ActorFunc)EffZoraband_Update, - (ActorFunc)EffZoraband_Draw, + EffZoraband_Init, + EffZoraband_Destroy, + EffZoraband_Update, + EffZoraband_Draw, }; void EffZoraband_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index 3d7df7c278..ffbf51eb48 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -24,10 +24,10 @@ ActorInit Elf_Msg_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg), - (ActorFunc)ElfMsg_Init, - (ActorFunc)ElfMsg_Destroy, - (ActorFunc)ElfMsg_Update, - (ActorFunc)NULL, + ElfMsg_Init, + ElfMsg_Destroy, + ElfMsg_Update, + NULL, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c index a29b226b0f..ce5b0cec86 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -24,10 +24,10 @@ ActorInit Elf_Msg2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg2), - (ActorFunc)ElfMsg2_Init, - (ActorFunc)ElfMsg2_Destroy, - (ActorFunc)ElfMsg2_Update, - (ActorFunc)NULL, + ElfMsg2_Init, + ElfMsg2_Destroy, + ElfMsg2_Update, + NULL, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c index da6b291804..7adf9f5d1b 100644 --- a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c +++ b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c @@ -23,10 +23,10 @@ ActorInit Elf_Msg3_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg3), - (ActorFunc)ElfMsg3_Init, - (ActorFunc)ElfMsg3_Destroy, - (ActorFunc)ElfMsg3_Update, - (ActorFunc)NULL, + ElfMsg3_Init, + ElfMsg3_Destroy, + ElfMsg3_Update, + NULL, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c index 7fbf402fa8..6976ad7051 100644 --- a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c +++ b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c @@ -28,10 +28,10 @@ ActorInit Elf_Msg4_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg4), - (ActorFunc)ElfMsg4_Init, - (ActorFunc)ElfMsg4_Destroy, - (ActorFunc)ElfMsg4_Update, - (ActorFunc)NULL, + ElfMsg4_Init, + ElfMsg4_Destroy, + ElfMsg4_Update, + NULL, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c index db97a0f744..1da7943265 100644 --- a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c +++ b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c @@ -23,10 +23,10 @@ ActorInit Elf_Msg5_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg5), - (ActorFunc)ElfMsg5_Init, - (ActorFunc)ElfMsg5_Destroy, - (ActorFunc)ElfMsg5_Update, - (ActorFunc)NULL, + ElfMsg5_Init, + ElfMsg5_Destroy, + ElfMsg5_Update, + NULL, }; static InitChainEntry sInitChainsInitChain[] = { diff --git a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c index 0ffb5c7589..bb904e1d9d 100644 --- a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c +++ b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c @@ -29,10 +29,10 @@ ActorInit Elf_Msg6_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ElfMsg6), - (ActorFunc)ElfMsg6_Init, - (ActorFunc)ElfMsg6_Destroy, - (ActorFunc)ElfMsg6_Update, - (ActorFunc)NULL, + ElfMsg6_Init, + ElfMsg6_Destroy, + ElfMsg6_Update, + NULL, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_En_Ah/z_en_ah.c b/src/overlays/actors/ovl_En_Ah/z_en_ah.c index 2f4e4ed039..ed01a43edc 100644 --- a/src/overlays/actors/ovl_En_Ah/z_en_ah.c +++ b/src/overlays/actors/ovl_En_Ah/z_en_ah.c @@ -53,10 +53,10 @@ ActorInit En_Ah_InitVars = { FLAGS, OBJECT_AH, sizeof(EnAh), - (ActorFunc)EnAh_Init, - (ActorFunc)EnAh_Destroy, - (ActorFunc)EnAh_Update, - (ActorFunc)EnAh_Draw, + EnAh_Init, + EnAh_Destroy, + EnAh_Update, + EnAh_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c index d2bdf0ceec..aefc2ee72f 100644 --- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c +++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c @@ -37,10 +37,10 @@ ActorInit En_Akindonuts_InitVars = { FLAGS, OBJECT_DNT, sizeof(EnAkindonuts), - (ActorFunc)EnAkindonuts_Init, - (ActorFunc)EnAkindonuts_Destroy, - (ActorFunc)EnAkindonuts_Update, - (ActorFunc)EnAkindonuts_Draw, + EnAkindonuts_Init, + EnAkindonuts_Destroy, + EnAkindonuts_Update, + EnAkindonuts_Draw, }; static ColliderCylinderInitType1 sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Al/z_en_al.c b/src/overlays/actors/ovl_En_Al/z_en_al.c index b5ea2f64f7..b51e2fef17 100644 --- a/src/overlays/actors/ovl_En_Al/z_en_al.c +++ b/src/overlays/actors/ovl_En_Al/z_en_al.c @@ -91,10 +91,10 @@ ActorInit En_Al_InitVars = { FLAGS, OBJECT_AL, sizeof(EnAl), - (ActorFunc)EnAl_Init, - (ActorFunc)EnAl_Destroy, - (ActorFunc)EnAl_Update, - (ActorFunc)EnAl_Draw, + EnAl_Init, + EnAl_Destroy, + EnAl_Update, + EnAl_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index f76ebc4f3f..4755135722 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -43,10 +43,10 @@ ActorInit En_Am_InitVars = { FLAGS, OBJECT_AM, sizeof(EnAm), - (ActorFunc)EnAm_Init, - (ActorFunc)EnAm_Destroy, - (ActorFunc)EnAm_Update, - (ActorFunc)EnAm_Draw, + EnAm_Init, + EnAm_Destroy, + EnAm_Update, + EnAm_Draw, }; static ColliderCylinderInit sEnemyCylinderInit = { diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c index 6b85ffc53b..9f08c215bd 100644 --- a/src/overlays/actors/ovl_En_An/z_en_an.c +++ b/src/overlays/actors/ovl_En_An/z_en_an.c @@ -25,10 +25,10 @@ ActorInit En_An_InitVars = { FLAGS, OBJECT_AN1, sizeof(EnAn), - (ActorFunc)EnAn_Init, - (ActorFunc)EnAn_Destroy, - (ActorFunc)EnAn_Update, - (ActorFunc)NULL, + EnAn_Init, + EnAn_Destroy, + EnAn_Update, + NULL, }; // static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_And/z_en_and.c b/src/overlays/actors/ovl_En_And/z_en_and.c index 5c888ba452..21fda2fbb4 100644 --- a/src/overlays/actors/ovl_En_And/z_en_and.c +++ b/src/overlays/actors/ovl_En_And/z_en_and.c @@ -24,10 +24,10 @@ ActorInit En_And_InitVars = { FLAGS, OBJECT_AND, sizeof(EnAnd), - (ActorFunc)EnAnd_Init, - (ActorFunc)EnAnd_Destroy, - (ActorFunc)EnAnd_Update, - (ActorFunc)EnAnd_Draw, + EnAnd_Init, + EnAnd_Destroy, + EnAnd_Update, + EnAnd_Draw, }; #endif diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index 8e98ae8a33..5dd2e7c4e9 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -46,10 +46,10 @@ ActorInit En_Ani_InitVars = { FLAGS, OBJECT_ANI, sizeof(EnAni), - (ActorFunc)EnAni_Init, - (ActorFunc)EnAni_Destroy, - (ActorFunc)EnAni_Update, - (ActorFunc)EnAni_Draw, + EnAni_Init, + EnAni_Destroy, + EnAni_Update, + EnAni_Draw, }; // two different colliders, but only one init for both diff --git a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c index 8f1915ae5e..11f8d9123b 100644 --- a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c +++ b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c @@ -40,10 +40,10 @@ ActorInit En_Aob_01_InitVars = { FLAGS, OBJECT_AOB, sizeof(EnAob01), - (ActorFunc)EnAob01_Init, - (ActorFunc)EnAob01_Destroy, - (ActorFunc)EnAob01_Update, - (ActorFunc)EnAob01_Draw, + EnAob01_Init, + EnAob01_Destroy, + EnAob01_Update, + EnAob01_Draw, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index b07e65de31..ddad9b88ed 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -28,10 +28,10 @@ ActorInit En_Arrow_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnArrow), - (ActorFunc)EnArrow_Init, - (ActorFunc)EnArrow_Destroy, - (ActorFunc)EnArrow_Update, - (ActorFunc)EnArrow_Draw, + EnArrow_Init, + EnArrow_Destroy, + EnArrow_Update, + EnArrow_Draw, }; static ColliderQuadInit sQuadInit = { diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index b4501ffa08..ce3439bda7 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -26,10 +26,10 @@ ActorInit En_Attack_Niw_InitVars = { FLAGS, OBJECT_NIW, sizeof(EnAttackNiw), - (ActorFunc)EnAttackNiw_Init, - (ActorFunc)EnAttackNiw_Destroy, - (ActorFunc)EnAttackNiw_Update, - (ActorFunc)EnAttackNiw_Draw, + EnAttackNiw_Init, + EnAttackNiw_Destroy, + EnAttackNiw_Update, + EnAttackNiw_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_En_Az/z_en_az.c b/src/overlays/actors/ovl_En_Az/z_en_az.c index 0a5056b1fb..88389b9055 100644 --- a/src/overlays/actors/ovl_En_Az/z_en_az.c +++ b/src/overlays/actors/ovl_En_Az/z_en_az.c @@ -98,10 +98,10 @@ ActorInit En_Az_InitVars = { FLAGS, OBJECT_AZ, sizeof(EnAz), - (ActorFunc)EnAz_Init, - (ActorFunc)EnAz_Destroy, - (ActorFunc)EnAz_Update, - (ActorFunc)EnAz_Draw, + EnAz_Init, + EnAz_Destroy, + EnAz_Update, + EnAz_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Baba/z_en_baba.c b/src/overlays/actors/ovl_En_Baba/z_en_baba.c index 0c5d7b799b..e35405e429 100644 --- a/src/overlays/actors/ovl_En_Baba/z_en_baba.c +++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.c @@ -56,10 +56,10 @@ ActorInit En_Baba_InitVars = { FLAGS, OBJECT_BBA, sizeof(EnBaba), - (ActorFunc)EnBaba_Init, - (ActorFunc)EnBaba_Destroy, - (ActorFunc)EnBaba_Update, - (ActorFunc)EnBaba_Draw, + EnBaba_Init, + EnBaba_Destroy, + EnBaba_Update, + EnBaba_Draw, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c index 9017e0f89a..2a0bda7664 100644 --- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c +++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c @@ -47,10 +47,10 @@ ActorInit En_Baguo_InitVars = { FLAGS, OBJECT_GMO, sizeof(EnBaguo), - (ActorFunc)EnBaguo_Init, - (ActorFunc)EnBaguo_Destroy, - (ActorFunc)EnBaguo_Update, - (ActorFunc)NULL, + EnBaguo_Init, + EnBaguo_Destroy, + EnBaguo_Update, + NULL, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c index 8812ae6d35..89f1adbe50 100644 --- a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c +++ b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c @@ -29,10 +29,10 @@ ActorInit En_Baisen_InitVars = { FLAGS, OBJECT_BAI, sizeof(EnBaisen), - (ActorFunc)EnBaisen_Init, - (ActorFunc)EnBaisen_Destroy, - (ActorFunc)EnBaisen_Update, - (ActorFunc)EnBaisen_Draw, + EnBaisen_Init, + EnBaisen_Destroy, + EnBaisen_Update, + EnBaisen_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bal/z_en_bal.c b/src/overlays/actors/ovl_En_Bal/z_en_bal.c index 779373a9dc..55da6ce363 100644 --- a/src/overlays/actors/ovl_En_Bal/z_en_bal.c +++ b/src/overlays/actors/ovl_En_Bal/z_en_bal.c @@ -22,10 +22,10 @@ ActorInit En_Bal_InitVars = { FLAGS, OBJECT_BAL, sizeof(EnBal), - (ActorFunc)EnBal_Init, - (ActorFunc)EnBal_Destroy, - (ActorFunc)EnBal_Update, - (ActorFunc)EnBal_Draw, + EnBal_Init, + EnBal_Destroy, + EnBal_Update, + EnBal_Draw, }; // static DamageTable sDamageTable = { diff --git a/src/overlays/actors/ovl_En_Bat/z_en_bat.c b/src/overlays/actors/ovl_En_Bat/z_en_bat.c index cee109c700..834f3dce5f 100644 --- a/src/overlays/actors/ovl_En_Bat/z_en_bat.c +++ b/src/overlays/actors/ovl_En_Bat/z_en_bat.c @@ -34,10 +34,10 @@ ActorInit En_Bat_InitVars = { FLAGS, OBJECT_BAT, sizeof(EnBat), - (ActorFunc)EnBat_Init, - (ActorFunc)EnBat_Destroy, - (ActorFunc)EnBat_Update, - (ActorFunc)EnBat_Draw, + EnBat_Init, + EnBat_Destroy, + EnBat_Update, + EnBat_Draw, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index c5657e3858..0a6e0e7000 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -41,10 +41,10 @@ ActorInit En_Bb_InitVars = { FLAGS, OBJECT_BB, sizeof(EnBb), - (ActorFunc)EnBb_Init, - (ActorFunc)EnBb_Destroy, - (ActorFunc)EnBb_Update, - (ActorFunc)EnBb_Draw, + EnBb_Init, + EnBb_Destroy, + EnBb_Update, + EnBb_Draw, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c index 1b95381460..331ead772b 100644 --- a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c +++ b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c @@ -34,10 +34,10 @@ ActorInit En_Bba_01_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBba01), - (ActorFunc)EnBba01_Init, - (ActorFunc)EnBba01_Destroy, - (ActorFunc)EnBba01_Update, - (ActorFunc)EnBba01_Draw, + EnBba01_Init, + EnBba01_Destroy, + EnBba01_Update, + EnBba01_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c index 1dfc74a222..e60464479e 100644 --- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c @@ -41,10 +41,10 @@ ActorInit En_Bbfall_InitVars = { FLAGS, OBJECT_BB, sizeof(EnBbfall), - (ActorFunc)EnBbfall_Init, - (ActorFunc)EnBbfall_Destroy, - (ActorFunc)EnBbfall_Update, - (ActorFunc)EnBbfall_Draw, + EnBbfall_Init, + EnBbfall_Destroy, + EnBbfall_Update, + EnBbfall_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[3] = { diff --git a/src/overlays/actors/ovl_En_Bee/z_en_bee.c b/src/overlays/actors/ovl_En_Bee/z_en_bee.c index cf8c5f68a4..077ce319f1 100644 --- a/src/overlays/actors/ovl_En_Bee/z_en_bee.c +++ b/src/overlays/actors/ovl_En_Bee/z_en_bee.c @@ -28,10 +28,10 @@ ActorInit En_Bee_InitVars = { FLAGS, OBJECT_BEE, sizeof(EnBee), - (ActorFunc)EnBee_Init, - (ActorFunc)EnBee_Destroy, - (ActorFunc)EnBee_Update, - (ActorFunc)EnBee_Draw, + EnBee_Init, + EnBee_Destroy, + EnBee_Update, + EnBee_Draw, }; static DamageTable sDamageTable = { diff --git a/src/overlays/actors/ovl_En_Bh/z_en_bh.c b/src/overlays/actors/ovl_En_Bh/z_en_bh.c index 2aff9891d3..e083ce6a02 100644 --- a/src/overlays/actors/ovl_En_Bh/z_en_bh.c +++ b/src/overlays/actors/ovl_En_Bh/z_en_bh.c @@ -23,10 +23,10 @@ ActorInit En_Bh_InitVars = { FLAGS, OBJECT_BH, sizeof(EnBh), - (ActorFunc)EnBh_Init, - (ActorFunc)EnBh_Destroy, - (ActorFunc)EnBh_Update, - (ActorFunc)EnBh_Draw, + EnBh_Init, + EnBh_Destroy, + EnBh_Update, + EnBh_Draw, }; void EnBh_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index b995d77eaf..2b80d73829 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -36,10 +36,10 @@ ActorInit En_Bigokuta_InitVars = { FLAGS, OBJECT_BIGOKUTA, sizeof(EnBigokuta), - (ActorFunc)EnBigokuta_Init, - (ActorFunc)EnBigokuta_Destroy, - (ActorFunc)EnBigokuta_Update, - (ActorFunc)EnBigokuta_Draw, + EnBigokuta_Init, + EnBigokuta_Destroy, + EnBigokuta_Update, + EnBigokuta_Draw, }; static ColliderCylinderInit sShellCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c index 2c27a18013..f348912ace 100644 --- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c +++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c @@ -52,10 +52,10 @@ ActorInit En_Bigpamet_InitVars = { FLAGS, OBJECT_TL, sizeof(EnBigpamet), - (ActorFunc)EnBigpamet_Init, - (ActorFunc)EnBigpamet_Destroy, - (ActorFunc)EnBigpamet_Update, - (ActorFunc)EnBigpamet_Draw, + EnBigpamet_Init, + EnBigpamet_Destroy, + EnBigpamet_Update, + EnBigpamet_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c index 5398418f2c..52fad91a16 100644 --- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c +++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c @@ -88,10 +88,10 @@ ActorInit En_Bigpo_InitVars = { FLAGS, OBJECT_BIGPO, sizeof(EnBigpo), - (ActorFunc)EnBigpo_Init, - (ActorFunc)EnBigpo_Destroy, - (ActorFunc)EnBigpo_Update, - (ActorFunc)NULL, + EnBigpo_Init, + EnBigpo_Destroy, + EnBigpo_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c index 9cf4b425b2..2a08596761 100644 --- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c @@ -217,10 +217,10 @@ ActorInit En_Bigslime_InitVars = { FLAGS, OBJECT_BIGSLIME, sizeof(EnBigslime), - (ActorFunc)EnBigslime_Init, - (ActorFunc)EnBigslime_Destroy, - (ActorFunc)EnBigslime_UpdateGekko, - (ActorFunc)EnBigslime_DrawGekko, + EnBigslime_Init, + EnBigslime_Destroy, + EnBigslime_UpdateGekko, + EnBigslime_DrawGekko, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c index 25b59b59be..753f349806 100644 --- a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c +++ b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c @@ -35,10 +35,10 @@ ActorInit En_Bji_01_InitVars = { FLAGS, OBJECT_BJI, sizeof(EnBji01), - (ActorFunc)EnBji01_Init, - (ActorFunc)EnBji01_Destroy, - (ActorFunc)EnBji01_Update, - (ActorFunc)EnBji01_Draw, + EnBji01_Init, + EnBji01_Destroy, + EnBji01_Update, + EnBji01_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c index 08070b61d7..a1f5529fab 100644 --- a/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c +++ b/src/overlays/actors/ovl_En_Bjt/z_en_bjt.c @@ -52,10 +52,10 @@ ActorInit En_Bjt_InitVars = { FLAGS, OBJECT_BJT, sizeof(EnBjt), - (ActorFunc)EnBjt_Init, - (ActorFunc)EnBjt_Destroy, - (ActorFunc)EnBjt_Update, - (ActorFunc)EnBjt_Draw, + EnBjt_Init, + EnBjt_Destroy, + EnBjt_Update, + EnBjt_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c index bd4b0e499e..0516274221 100644 --- a/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c +++ b/src/overlays/actors/ovl_En_Boj_01/z_en_boj_01.c @@ -21,10 +21,10 @@ ActorInit En_Boj_01_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj01), - (ActorFunc)EnBoj01_Init, - (ActorFunc)EnBoj01_Destroy, - (ActorFunc)EnBoj01_Update, - (ActorFunc)EnBoj01_Draw, + EnBoj01_Init, + EnBoj01_Destroy, + EnBoj01_Update, + EnBoj01_Draw, }; void EnBoj01_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c index 89f6ba0cb6..280d37f85a 100644 --- a/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c +++ b/src/overlays/actors/ovl_En_Boj_02/z_en_boj_02.c @@ -21,10 +21,10 @@ ActorInit En_Boj_02_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj02), - (ActorFunc)EnBoj02_Init, - (ActorFunc)EnBoj02_Destroy, - (ActorFunc)EnBoj02_Update, - (ActorFunc)EnBoj02_Draw, + EnBoj02_Init, + EnBoj02_Destroy, + EnBoj02_Update, + EnBoj02_Draw, }; void EnBoj02_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c index 0c55b79a6b..319e110a39 100644 --- a/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c +++ b/src/overlays/actors/ovl_En_Boj_03/z_en_boj_03.c @@ -21,10 +21,10 @@ ActorInit En_Boj_03_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj03), - (ActorFunc)EnBoj03_Init, - (ActorFunc)EnBoj03_Destroy, - (ActorFunc)EnBoj03_Update, - (ActorFunc)EnBoj03_Draw, + EnBoj03_Init, + EnBoj03_Destroy, + EnBoj03_Update, + EnBoj03_Draw, }; void EnBoj03_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c index 7fe308520b..7654f13e49 100644 --- a/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c +++ b/src/overlays/actors/ovl_En_Boj_04/z_en_boj_04.c @@ -21,10 +21,10 @@ ActorInit En_Boj_04_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj04), - (ActorFunc)EnBoj04_Init, - (ActorFunc)EnBoj04_Destroy, - (ActorFunc)EnBoj04_Update, - (ActorFunc)EnBoj04_Draw, + EnBoj04_Init, + EnBoj04_Destroy, + EnBoj04_Update, + EnBoj04_Draw, }; void EnBoj04_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c index da6816840a..e96e0f94ce 100644 --- a/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c +++ b/src/overlays/actors/ovl_En_Boj_05/z_en_boj_05.c @@ -21,10 +21,10 @@ ActorInit En_Boj_05_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBoj05), - (ActorFunc)EnBoj05_Init, - (ActorFunc)EnBoj05_Destroy, - (ActorFunc)EnBoj05_Update, - (ActorFunc)EnBoj05_Draw, + EnBoj05_Init, + EnBoj05_Destroy, + EnBoj05_Update, + EnBoj05_Draw, }; void EnBoj05_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index a25a339042..85d5c6b6b6 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -38,10 +38,10 @@ ActorInit En_Bom_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBom), - (ActorFunc)EnBom_Init, - (ActorFunc)EnBom_Destroy, - (ActorFunc)EnBom_Update, - (ActorFunc)EnBom_Draw, + EnBom_Init, + EnBom_Destroy, + EnBom_Update, + EnBom_Draw, }; static f32 enBomScales[] = { 0.01f, 0.03f }; diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index 9b1f45a204..a2953ee696 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -43,10 +43,10 @@ ActorInit En_Bom_Bowl_Man_InitVars = { FLAGS, OBJECT_CS, sizeof(EnBomBowlMan), - (ActorFunc)EnBomBowlMan_Init, - (ActorFunc)EnBomBowlMan_Destroy, - (ActorFunc)EnBomBowlMan_Update, - (ActorFunc)EnBomBowlMan_Draw, + EnBomBowlMan_Init, + EnBomBowlMan_Destroy, + EnBomBowlMan_Update, + EnBomBowlMan_Draw, }; static AnimationHeader* sAnimations[] = { diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index cbcc402117..23b2e49322 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -31,10 +31,10 @@ ActorInit En_Bom_Chu_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBomChu), - (ActorFunc)EnBomChu_Init, - (ActorFunc)EnBomChu_Destroy, - (ActorFunc)EnBomChu_Update, - (ActorFunc)EnBomChu_Draw, + EnBomChu_Init, + EnBomChu_Destroy, + EnBomChu_Update, + EnBomChu_Draw, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c index bcb7cb5348..4beb8c9198 100644 --- a/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c +++ b/src/overlays/actors/ovl_En_Bombal/z_en_bombal.c @@ -31,10 +31,10 @@ ActorInit En_Bombal_InitVars = { FLAGS, OBJECT_FUSEN, sizeof(EnBombal), - (ActorFunc)EnBombal_Init, - (ActorFunc)EnBombal_Destroy, - (ActorFunc)EnBombal_Update, - (ActorFunc)EnBombal_Draw, + EnBombal_Init, + EnBombal_Destroy, + EnBombal_Update, + EnBombal_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c index 2ca62ef0a0..6fdfd2ef36 100644 --- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c +++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c @@ -31,10 +31,10 @@ ActorInit En_Bombers_InitVars = { FLAGS, OBJECT_CS, sizeof(EnBombers), - (ActorFunc)EnBombers_Init, - (ActorFunc)EnBombers_Destroy, - (ActorFunc)EnBombers_Update, - (ActorFunc)EnBombers_Draw, + EnBombers_Init, + EnBombers_Destroy, + EnBombers_Update, + EnBombers_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c index 74575628f6..31fa3b8086 100644 --- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c +++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c @@ -29,10 +29,10 @@ ActorInit En_Bombers2_InitVars = { FLAGS, OBJECT_CS, sizeof(EnBombers2), - (ActorFunc)EnBombers2_Init, - (ActorFunc)EnBombers2_Destroy, - (ActorFunc)EnBombers2_Update, - (ActorFunc)EnBombers2_Draw, + EnBombers2_Init, + EnBombers2_Destroy, + EnBombers2_Update, + EnBombers2_Draw, }; static u16 sTextIds[] = { diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 0b5ffff54d..c93e2fa3cc 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -30,10 +30,10 @@ ActorInit En_Bombf_InitVars = { FLAGS, OBJECT_BOMBF, sizeof(EnBombf), - (ActorFunc)EnBombf_Init, - (ActorFunc)EnBombf_Destroy, - (ActorFunc)EnBombf_Update, - (ActorFunc)EnBombf_Draw, + EnBombf_Init, + EnBombf_Destroy, + EnBombf_Update, + EnBombf_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c index 126c293c37..8346d41ef2 100644 --- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c @@ -59,10 +59,10 @@ ActorInit En_Bomjima_InitVars = { FLAGS, OBJECT_CS, sizeof(EnBomjima), - (ActorFunc)EnBomjima_Init, - (ActorFunc)EnBomjima_Destroy, - (ActorFunc)EnBomjima_Update, - (ActorFunc)EnBomjima_Draw, + EnBomjima_Init, + EnBomjima_Destroy, + EnBomjima_Update, + EnBomjima_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c index c0033b1036..2eae67a962 100644 --- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c +++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c @@ -46,10 +46,10 @@ ActorInit En_Bomjimb_InitVars = { FLAGS, OBJECT_CS, sizeof(EnBomjimb), - (ActorFunc)EnBomjimb_Init, - (ActorFunc)EnBomjimb_Destroy, - (ActorFunc)EnBomjimb_Update, - (ActorFunc)EnBomjimb_Draw, + EnBomjimb_Init, + EnBomjimb_Destroy, + EnBomjimb_Update, + EnBomjimb_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index 33af85b3e5..4243b71dd9 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -25,10 +25,10 @@ ActorInit En_Boom_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBoom), - (ActorFunc)EnBoom_Init, - (ActorFunc)EnBoom_Destroy, - (ActorFunc)EnBoom_Update, - (ActorFunc)EnBoom_Draw, + EnBoom_Init, + EnBoom_Destroy, + EnBoom_Update, + EnBoom_Draw, }; static ColliderQuadInit sQuadInit = { diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index 33dd4f69fd..6d8ca6f533 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -62,10 +62,10 @@ ActorInit En_Box_InitVars = { FLAGS, OBJECT_BOX, sizeof(EnBox), - (ActorFunc)EnBox_Init, - (ActorFunc)EnBox_Destroy, - (ActorFunc)EnBox_Update, - (ActorFunc)EnBox_Draw, + EnBox_Init, + EnBox_Destroy, + EnBox_Update, + EnBox_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c index 6c6e832c80..9736085e67 100644 --- a/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c +++ b/src/overlays/actors/ovl_En_Bsb/z_en_bsb.c @@ -118,10 +118,10 @@ ActorInit En_Bsb_InitVars = { FLAGS, OBJECT_BSB, sizeof(EnBsb), - (ActorFunc)EnBsb_Init, - (ActorFunc)EnBsb_Destroy, - (ActorFunc)EnBsb_Update, - (ActorFunc)EnBsb_Draw, + EnBsb_Init, + EnBsb_Destroy, + EnBsb_Update, + EnBsb_Draw, }; #endif diff --git a/src/overlays/actors/ovl_En_Bu/z_en_bu.c b/src/overlays/actors/ovl_En_Bu/z_en_bu.c index 043f1ebb78..e0a233d161 100644 --- a/src/overlays/actors/ovl_En_Bu/z_en_bu.c +++ b/src/overlays/actors/ovl_En_Bu/z_en_bu.c @@ -23,10 +23,10 @@ ActorInit En_Bu_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnBu), - (ActorFunc)EnBu_Init, - (ActorFunc)EnBu_Destroy, - (ActorFunc)EnBu_Update, - (ActorFunc)EnBu_Draw, + EnBu_Init, + EnBu_Destroy, + EnBu_Update, + EnBu_Draw, }; void EnBu_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index cbf9e9f3ca..845a7b3c70 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -25,10 +25,10 @@ ActorInit En_Bubble_InitVars = { FLAGS, OBJECT_BUBBLE, sizeof(EnBubble), - (ActorFunc)EnBubble_Init, - (ActorFunc)EnBubble_Destroy, - (ActorFunc)EnBubble_Update, - (ActorFunc)EnBubble_Draw, + EnBubble_Init, + EnBubble_Destroy, + EnBubble_Update, + EnBubble_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[2] = { diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index eb3365b836..9769d77ded 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -59,10 +59,10 @@ ActorInit En_Butte_InitVars = { FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(EnButte), - (ActorFunc)EnButte_Init, - (ActorFunc)EnButte_Destroy, - (ActorFunc)EnButte_Update, - (ActorFunc)EnButte_Draw, + EnButte_Init, + EnButte_Destroy, + EnButte_Update, + EnButte_Draw, }; typedef struct { diff --git a/src/overlays/actors/ovl_En_Cha/z_en_cha.c b/src/overlays/actors/ovl_En_Cha/z_en_cha.c index d32fe32ac9..7e4460b624 100644 --- a/src/overlays/actors/ovl_En_Cha/z_en_cha.c +++ b/src/overlays/actors/ovl_En_Cha/z_en_cha.c @@ -24,10 +24,10 @@ ActorInit En_Cha_InitVars = { FLAGS, OBJECT_CHA, sizeof(EnCha), - (ActorFunc)EnCha_Init, - (ActorFunc)EnCha_Destroy, - (ActorFunc)EnCha_Update, - (ActorFunc)EnCha_Draw, + EnCha_Init, + EnCha_Destroy, + EnCha_Update, + EnCha_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c index bfc8281942..c9ffe6b179 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -37,10 +37,10 @@ ActorInit En_Clear_Tag_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnClearTag), - (ActorFunc)EnClearTag_Init, - (ActorFunc)EnClearTag_Destroy, - (ActorFunc)EnClearTag_Update, - (ActorFunc)EnClearTag_Draw, + EnClearTag_Init, + EnClearTag_Destroy, + EnClearTag_Update, + EnClearTag_Draw, }; static Vec3f sZeroVector = { 0.0f, 0.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c index 876914a2a6..b7c3df5124 100644 --- a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c +++ b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c @@ -26,10 +26,10 @@ ActorInit En_Cne_01_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnCne01), - (ActorFunc)EnCne01_Init, - (ActorFunc)EnCne01_Destroy, - (ActorFunc)EnCne01_Update, - (ActorFunc)EnCne01_Draw, + EnCne01_Init, + EnCne01_Destroy, + EnCne01_Update, + EnCne01_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c index 63c83f0ea9..2224341a6f 100644 --- a/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c +++ b/src/overlays/actors/ovl_En_Col_Man/z_en_col_man.c @@ -53,10 +53,10 @@ ActorInit En_Col_Man_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnColMan), - (ActorFunc)EnColMan_Init, - (ActorFunc)EnColMan_Destroy, - (ActorFunc)EnColMan_Update, - (ActorFunc)NULL, + EnColMan_Init, + EnColMan_Destroy, + EnColMan_Update, + NULL, }; static Color_RGBA8 primColor = { 60, 50, 20, 255 }; diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index 4e9040d83a..1da2428a74 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -33,10 +33,10 @@ ActorInit En_Cow_InitVars = { FLAGS, OBJECT_COW, sizeof(EnCow), - (ActorFunc)EnCow_Init, - (ActorFunc)EnCow_Destroy, - (ActorFunc)EnCow_Update, - (ActorFunc)EnCow_Draw, + EnCow_Init, + EnCow_Destroy, + EnCow_Update, + EnCow_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index b9e1071feb..d6b981f561 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -33,10 +33,10 @@ ActorInit En_Crow_InitVars = { FLAGS, OBJECT_CROW, sizeof(EnCrow), - (ActorFunc)EnCrow_Init, - (ActorFunc)EnCrow_Destroy, - (ActorFunc)EnCrow_Update, - (ActorFunc)EnCrow_Draw, + EnCrow_Init, + EnCrow_Destroy, + EnCrow_Update, + EnCrow_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Dai/z_en_dai.c b/src/overlays/actors/ovl_En_Dai/z_en_dai.c index 2f2496f576..e5e7a57f0f 100644 --- a/src/overlays/actors/ovl_En_Dai/z_en_dai.c +++ b/src/overlays/actors/ovl_En_Dai/z_en_dai.c @@ -25,10 +25,10 @@ ActorInit En_Dai_InitVars = { FLAGS, OBJECT_DAI, sizeof(EnDai), - (ActorFunc)EnDai_Init, - (ActorFunc)EnDai_Destroy, - (ActorFunc)EnDai_Update, - (ActorFunc)EnDai_Draw, + EnDai_Init, + EnDai_Destroy, + EnDai_Update, + EnDai_Draw, }; static Vec3f D_80B3FBF0 = { 1.0f, 1.0f, 1.0f }; diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index 263b22ada4..cb8eb5bf76 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -27,10 +27,10 @@ ActorInit En_Daiku_InitVars = { FLAGS, OBJECT_DAIKU, sizeof(EnDaiku), - (ActorFunc)EnDaiku_Init, - (ActorFunc)EnDaiku_Destroy, - (ActorFunc)EnDaiku_Update, - (ActorFunc)EnDaiku_Draw, + EnDaiku_Init, + EnDaiku_Destroy, + EnDaiku_Update, + EnDaiku_Draw, }; static u16 sTextIds[] = { diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c index 0e5e7a3eab..a14ae79fc5 100644 --- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c +++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c @@ -38,10 +38,10 @@ ActorInit En_Daiku2_InitVars = { FLAGS, OBJECT_DAIKU, sizeof(EnDaiku2), - (ActorFunc)EnDaiku2_Init, - (ActorFunc)EnDaiku2_Destroy, - (ActorFunc)EnDaiku2_Update, - (ActorFunc)EnDaiku2_Draw, + EnDaiku2_Init, + EnDaiku2_Destroy, + EnDaiku2_Update, + EnDaiku2_Draw, }; static u16 sTextIds[] = { diff --git a/src/overlays/actors/ovl_En_Death/z_en_death.c b/src/overlays/actors/ovl_En_Death/z_en_death.c index dd05c2d483..b7cfc944bb 100644 --- a/src/overlays/actors/ovl_En_Death/z_en_death.c +++ b/src/overlays/actors/ovl_En_Death/z_en_death.c @@ -44,10 +44,10 @@ ActorInit En_Death_InitVars = { FLAGS, OBJECT_DEATH, sizeof(EnDeath), - (ActorFunc)EnDeath_Init, - (ActorFunc)EnDeath_Destroy, - (ActorFunc)EnDeath_Update, - (ActorFunc)EnDeath_Draw, + EnDeath_Init, + EnDeath_Destroy, + EnDeath_Update, + EnDeath_Draw, }; // static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index 93d4952670..94d6e1a12c 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -38,10 +38,10 @@ ActorInit En_Dekubaba_InitVars = { FLAGS, OBJECT_DEKUBABA, sizeof(EnDekubaba), - (ActorFunc)EnDekubaba_Init, - (ActorFunc)EnDekubaba_Destroy, - (ActorFunc)EnDekubaba_Update, - (ActorFunc)EnDekubaba_Draw, + EnDekubaba_Init, + EnDekubaba_Destroy, + EnDekubaba_Update, + EnDekubaba_Draw, }; // static ColliderJntSphElementInit sJntSphElementsInit[7] = { diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index 6bc0fd8d19..5af29f0bfc 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -45,10 +45,10 @@ ActorInit En_Dekunuts_InitVars = { FLAGS, OBJECT_DEKUNUTS, sizeof(EnDekunuts), - (ActorFunc)EnDekunuts_Init, - (ActorFunc)EnDekunuts_Destroy, - (ActorFunc)EnDekunuts_Update, - (ActorFunc)EnDekunuts_Draw, + EnDekunuts_Init, + EnDekunuts_Destroy, + EnDekunuts_Update, + EnDekunuts_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c index 2a4eb1553a..0d45691aa7 100644 --- a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c +++ b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c @@ -36,10 +36,10 @@ ActorInit En_Demo_heishi_InitVars = { FLAGS, OBJECT_SDN, sizeof(EnDemoheishi), - (ActorFunc)EnDemoheishi_Init, - (ActorFunc)EnDemoheishi_Destroy, - (ActorFunc)EnDemoheishi_Update, - (ActorFunc)EnDemoheishi_Draw, + EnDemoheishi_Init, + EnDemoheishi_Destroy, + EnDemoheishi_Update, + EnDemoheishi_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Dg/z_en_dg.c b/src/overlays/actors/ovl_En_Dg/z_en_dg.c index d9bebb4046..ddcd4d0d1d 100644 --- a/src/overlays/actors/ovl_En_Dg/z_en_dg.c +++ b/src/overlays/actors/ovl_En_Dg/z_en_dg.c @@ -44,10 +44,10 @@ ActorInit En_Dg_InitVars = { FLAGS, OBJECT_DOG, sizeof(EnDg), - (ActorFunc)EnDg_Init, - (ActorFunc)EnDg_Destroy, - (ActorFunc)EnDg_Update, - (ActorFunc)EnDg_Draw, + EnDg_Init, + EnDg_Destroy, + EnDg_Update, + EnDg_Draw, }; #define DOG_FLAG_NONE 0 diff --git a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c index 643c167f07..86800a97a0 100644 --- a/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c +++ b/src/overlays/actors/ovl_En_Dinofos/z_en_dinofos.c @@ -63,10 +63,10 @@ ActorInit En_Dinofos_InitVars = { FLAGS, OBJECT_DINOFOS, sizeof(EnDinofos), - (ActorFunc)EnDinofos_Init, - (ActorFunc)EnDinofos_Destroy, - (ActorFunc)EnDinofos_Update, - (ActorFunc)EnDinofos_Draw, + EnDinofos_Init, + EnDinofos_Destroy, + EnDinofos_Update, + EnDinofos_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[9] = { diff --git a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c index 615383a27a..edea6d3700 100644 --- a/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c +++ b/src/overlays/actors/ovl_En_Dnb/z_en_dnb.c @@ -27,10 +27,10 @@ ActorInit En_Dnb_InitVars = { FLAGS, OBJECT_HANAREYAMA_OBJ, sizeof(EnDnb), - (ActorFunc)EnDnb_Init, - (ActorFunc)EnDnb_Destroy, - (ActorFunc)EnDnb_Update, - (ActorFunc)EnDnb_Draw, + EnDnb_Init, + EnDnb_Destroy, + EnDnb_Update, + EnDnb_Draw, }; void func_80A4FDD0(EnDnbEffect* effect, EnDnb* this, s16* alloc, s32 idx) { diff --git a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c index 9413b046ce..130fc9e0c7 100644 --- a/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c +++ b/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c @@ -25,10 +25,10 @@ ActorInit En_Dnh_InitVars = { FLAGS, OBJECT_TRO, sizeof(EnDnh), - (ActorFunc)EnDnh_Init, - (ActorFunc)EnDnh_Destroy, - (ActorFunc)EnDnh_Update, - (ActorFunc)EnDnh_Draw, + EnDnh_Init, + EnDnh_Destroy, + EnDnh_Update, + EnDnh_Draw, }; #endif diff --git a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c index ee035f06b1..8723994276 100644 --- a/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c +++ b/src/overlays/actors/ovl_En_Dnk/z_en_dnk.c @@ -30,10 +30,10 @@ ActorInit En_Dnk_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnDnk), - (ActorFunc)EnDnk_Init, - (ActorFunc)EnDnk_Destroy, - (ActorFunc)EnDnk_Update, - (ActorFunc)NULL, + EnDnk_Init, + EnDnk_Destroy, + EnDnk_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.c b/src/overlays/actors/ovl_En_Dno/z_en_dno.c index 12e048955b..8abf7b2c0b 100644 --- a/src/overlays/actors/ovl_En_Dno/z_en_dno.c +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.c @@ -95,10 +95,10 @@ ActorInit En_Dno_InitVars = { FLAGS, OBJECT_DNJ, sizeof(EnDno), - (ActorFunc)EnDno_Init, - (ActorFunc)EnDno_Destroy, - (ActorFunc)EnDno_Update, - (ActorFunc)EnDno_Draw, + EnDno_Init, + EnDno_Destroy, + EnDno_Update, + EnDno_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c index b504e9a115..0fdb12fbc4 100644 --- a/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c +++ b/src/overlays/actors/ovl_En_Dnp/z_en_dnp.c @@ -38,10 +38,10 @@ ActorInit En_Dnp_InitVars = { FLAGS, OBJECT_DNQ, sizeof(EnDnp), - (ActorFunc)EnDnp_Init, - (ActorFunc)EnDnp_Destroy, - (ActorFunc)EnDnp_Update, - (ActorFunc)EnDnp_Draw, + EnDnp_Init, + EnDnp_Destroy, + EnDnp_Update, + EnDnp_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c index 021b94476d..954765187e 100644 --- a/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c +++ b/src/overlays/actors/ovl_En_Dnq/z_en_dnq.c @@ -31,10 +31,10 @@ ActorInit En_Dnq_InitVars = { FLAGS, OBJECT_DNO, sizeof(EnDnq), - (ActorFunc)EnDnq_Init, - (ActorFunc)EnDnq_Destroy, - (ActorFunc)EnDnq_Update, - (ActorFunc)EnDnq_Draw, + EnDnq_Init, + EnDnq_Destroy, + EnDnq_Update, + EnDnq_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index 714235b174..ab84386a7a 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -45,10 +45,10 @@ ActorInit En_Dns_InitVars = { FLAGS, OBJECT_DNS, sizeof(EnDns), - (ActorFunc)EnDns_Init, - (ActorFunc)EnDns_Destroy, - (ActorFunc)EnDns_Update, - (ActorFunc)EnDns_Draw, + EnDns_Init, + EnDns_Destroy, + EnDns_Update, + EnDns_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index d1ec4ea701..195c9baa77 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -41,10 +41,10 @@ ActorInit En_Dodongo_InitVars = { FLAGS, OBJECT_DODONGO, sizeof(EnDodongo), - (ActorFunc)EnDodongo_Init, - (ActorFunc)EnDodongo_Destroy, - (ActorFunc)EnDodongo_Update, - (ActorFunc)EnDodongo_Draw, + EnDodongo_Init, + EnDodongo_Destroy, + EnDodongo_Update, + EnDodongo_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit1[10] = { diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index 3d7e79a3dc..5fae597ca2 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -283,10 +283,10 @@ ActorInit En_Door_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnDoor), - (ActorFunc)EnDoor_Init, - (ActorFunc)EnDoor_Destroy, - (ActorFunc)EnDoor_Update, - (ActorFunc)EnDoor_Draw, + EnDoor_Init, + EnDoor_Destroy, + EnDoor_Update, + EnDoor_Draw, }; typedef struct { diff --git a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c index 8959dde7ac..3132722924 100644 --- a/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c +++ b/src/overlays/actors/ovl_En_Door_Etc/z_en_door_etc.c @@ -26,10 +26,10 @@ ActorInit En_Door_Etc_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnDoorEtc), - (ActorFunc)EnDoorEtc_Init, - (ActorFunc)EnDoorEtc_Destroy, - (ActorFunc)EnDoorEtc_Update, - (ActorFunc)NULL, + EnDoorEtc_Init, + EnDoorEtc_Destroy, + EnDoorEtc_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c index 83b93cf529..0dbb4416be 100644 --- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c +++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c @@ -56,10 +56,10 @@ ActorInit En_Dragon_InitVars = { FLAGS, OBJECT_UTUBO, sizeof(EnDragon), - (ActorFunc)EnDragon_Init, - (ActorFunc)EnDragon_Destroy, - (ActorFunc)EnDragon_Update, - (ActorFunc)EnDragon_Draw, + EnDragon_Init, + EnDragon_Destroy, + EnDragon_Update, + EnDragon_Draw, }; typedef enum { diff --git a/src/overlays/actors/ovl_En_Drs/z_en_drs.c b/src/overlays/actors/ovl_En_Drs/z_en_drs.c index 7e232d5bdb..8e13082e33 100644 --- a/src/overlays/actors/ovl_En_Drs/z_en_drs.c +++ b/src/overlays/actors/ovl_En_Drs/z_en_drs.c @@ -23,10 +23,10 @@ ActorInit En_Drs_InitVars = { FLAGS, OBJECT_DRS, sizeof(EnDrs), - (ActorFunc)EnDrs_Init, - (ActorFunc)EnDrs_Destroy, - (ActorFunc)EnDrs_Update, - (ActorFunc)NULL, + EnDrs_Init, + EnDrs_Destroy, + EnDrs_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c index 67dff9c41f..0a2de4cc63 100644 --- a/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c +++ b/src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c @@ -26,10 +26,10 @@ ActorInit En_Ds2n_InitVars = { FLAGS, OBJECT_DS2N, sizeof(EnDs2n), - (ActorFunc)EnDs2n_Init, - (ActorFunc)EnDs2n_Destroy, - (ActorFunc)EnDs2n_Update, - (ActorFunc)EnDs2n_Draw, + EnDs2n_Init, + EnDs2n_Destroy, + EnDs2n_Update, + EnDs2n_Draw, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Dt/z_en_dt.c b/src/overlays/actors/ovl_En_Dt/z_en_dt.c index 0ac7dcb4bb..8287938d60 100644 --- a/src/overlays/actors/ovl_En_Dt/z_en_dt.c +++ b/src/overlays/actors/ovl_En_Dt/z_en_dt.c @@ -22,10 +22,10 @@ ActorInit En_Dt_InitVars = { FLAGS, OBJECT_DT, sizeof(EnDt), - (ActorFunc)EnDt_Init, - (ActorFunc)EnDt_Destroy, - (ActorFunc)EnDt_Update, - (ActorFunc)EnDt_Draw, + EnDt_Init, + EnDt_Destroy, + EnDt_Update, + EnDt_Draw, }; // static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index dfd97196a9..f41e25d669 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -25,10 +25,10 @@ ActorInit En_Dy_Extra_InitVars = { FLAGS, OBJECT_DY_OBJ, sizeof(EnDyExtra), - (ActorFunc)EnDyExtra_Init, - (ActorFunc)EnDyExtra_Destroy, - (ActorFunc)EnDyExtra_Update, - (ActorFunc)EnDyExtra_Draw, + EnDyExtra_Init, + EnDyExtra_Destroy, + EnDyExtra_Update, + EnDyExtra_Draw, }; void EnDyExtra_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c index de26515fab..d87e27b979 100644 --- a/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c +++ b/src/overlays/actors/ovl_En_Egblock/z_en_egblock.c @@ -35,10 +35,10 @@ ActorInit En_Egblock_InitVars = { FLAGS, OBJECT_EG, sizeof(EnEgblock), - (ActorFunc)EnEgblock_Init, - (ActorFunc)EnEgblock_Destroy, - (ActorFunc)EnEgblock_Update, - (ActorFunc)EnEgblock_Draw, + EnEgblock_Init, + EnEgblock_Destroy, + EnEgblock_Update, + EnEgblock_Draw, }; void EnEgblock_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Egol/z_en_egol.c b/src/overlays/actors/ovl_En_Egol/z_en_egol.c index 7314974368..936da3157e 100644 --- a/src/overlays/actors/ovl_En_Egol/z_en_egol.c +++ b/src/overlays/actors/ovl_En_Egol/z_en_egol.c @@ -299,10 +299,10 @@ ActorInit En_Egol_InitVars = { FLAGS, OBJECT_EG, sizeof(EnEgol), - (ActorFunc)EnEgol_Init, - (ActorFunc)EnEgol_Destroy, - (ActorFunc)EnEgol_Update, - (ActorFunc)EnEgol_Draw, + EnEgol_Init, + EnEgol_Destroy, + EnEgol_Update, + EnEgol_Draw, }; void EnEgol_ChangeAnim(EnEgol* this, s32 animation) { diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c index 54d5c3210b..1fe4557449 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -39,10 +39,10 @@ ActorInit En_Elf_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnElf), - (ActorFunc)EnElf_Init, - (ActorFunc)EnElf_Destroy, - (ActorFunc)EnElf_Update, - (ActorFunc)EnElf_Draw, + EnElf_Init, + EnElf_Destroy, + EnElf_Update, + EnElf_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c index 12026b8b9f..2c32201432 100644 --- a/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c +++ b/src/overlays/actors/ovl_En_Elfbub/z_en_elfbub.c @@ -26,10 +26,10 @@ ActorInit En_Elfbub_InitVars = { FLAGS, OBJECT_BUBBLE, sizeof(EnElfbub), - (ActorFunc)EnElfbub_Init, - (ActorFunc)EnElfbub_Destroy, - (ActorFunc)EnElfbub_Update, - (ActorFunc)EnElfbub_Draw, + EnElfbub_Init, + EnElfbub_Destroy, + EnElfbub_Update, + EnElfbub_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c index 169d56fddc..f370a63e50 100644 --- a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c +++ b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c @@ -41,10 +41,10 @@ ActorInit En_Elfgrp_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnElfgrp), - (ActorFunc)EnElfgrp_Init, - (ActorFunc)EnElfgrp_Destroy, - (ActorFunc)EnElfgrp_Update, - (ActorFunc)NULL, + EnElfgrp_Init, + EnElfgrp_Destroy, + EnElfgrp_Update, + NULL, }; void func_80A396B0(EnElfgrp* this, s32 arg1) { diff --git a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c index 803a66ac4f..7bfb5ebb5b 100644 --- a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c +++ b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c @@ -28,10 +28,10 @@ ActorInit En_Elforg_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnElforg), - (ActorFunc)EnElforg_Init, - (ActorFunc)EnElforg_Destroy, - (ActorFunc)EnElforg_Update, - (ActorFunc)EnElforg_Draw, + EnElforg_Init, + EnElforg_Destroy, + EnElforg_Update, + EnElforg_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c index 2e6a44b64d..819351184b 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -21,10 +21,10 @@ ActorInit En_Encount1_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnEncount1), - (ActorFunc)EnEncount1_Init, - (ActorFunc)NULL, - (ActorFunc)EnEncount1_Update, - (ActorFunc)NULL, + EnEncount1_Init, + NULL, + EnEncount1_Update, + NULL, }; static s16 sActorList[] = { diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index 656ec7936f..624ebbb91a 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -31,10 +31,10 @@ ActorInit En_Encount2_InitVars = { FLAGS, OBJECT_FUSEN, sizeof(EnEncount2), - (ActorFunc)EnEncount2_Init, - (ActorFunc)EnEncount2_Destroy, - (ActorFunc)EnEncount2_Update, - (ActorFunc)EnEncount2_Draw, + EnEncount2_Init, + EnEncount2_Destroy, + EnEncount2_Update, + EnEncount2_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c index 869d8681e2..47d60d34e1 100644 --- a/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c +++ b/src/overlays/actors/ovl_En_Encount3/z_en_encount3.c @@ -26,10 +26,10 @@ ActorInit En_Encount3_InitVars = { FLAGS, OBJECT_BIG_FWALL, sizeof(EnEncount3), - (ActorFunc)EnEncount3_Init, - (ActorFunc)EnEncount3_Destroy, - (ActorFunc)EnEncount3_Update, - (ActorFunc)EnEncount3_Draw, + EnEncount3_Init, + EnEncount3_Destroy, + EnEncount3_Update, + EnEncount3_Draw, }; #endif diff --git a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c index 311668bfe5..ceca077e45 100644 --- a/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c +++ b/src/overlays/actors/ovl_En_Encount4/z_en_encount4.c @@ -26,10 +26,10 @@ ActorInit En_Encount4_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnEncount4), - (ActorFunc)EnEncount4_Init, - (ActorFunc)EnEncount4_Destroy, - (ActorFunc)EnEncount4_Update, - (ActorFunc)NULL, + EnEncount4_Init, + EnEncount4_Destroy, + EnEncount4_Update, + NULL, }; s16 D_809C46D0[] = { diff --git a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c index 6cdf54d701..18824f1abd 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c +++ b/src/overlays/actors/ovl_En_Ending_Hero/z_en_ending_hero.c @@ -25,10 +25,10 @@ ActorInit En_Ending_Hero_InitVars = { FLAGS, OBJECT_DT, sizeof(EnEndingHero), - (ActorFunc)EnEndingHero_Init, - (ActorFunc)EnEndingHero_Destroy, - (ActorFunc)EnEndingHero_Update, - (ActorFunc)EnEndingHero_Draw, + EnEndingHero_Init, + EnEndingHero_Destroy, + EnEndingHero_Update, + EnEndingHero_Draw, }; void EnEndingHero_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c index 2650ad1565..be07ef6de6 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c +++ b/src/overlays/actors/ovl_En_Ending_Hero2/z_en_ending_hero2.c @@ -25,10 +25,10 @@ ActorInit En_Ending_Hero2_InitVars = { FLAGS, OBJECT_BAI, sizeof(EnEndingHero2), - (ActorFunc)EnEndingHero2_Init, - (ActorFunc)EnEndingHero2_Destroy, - (ActorFunc)EnEndingHero2_Update, - (ActorFunc)EnEndingHero2_Draw, + EnEndingHero2_Init, + EnEndingHero2_Destroy, + EnEndingHero2_Update, + EnEndingHero2_Draw, }; void EnEndingHero2_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c index 8dcc12199b..5e9906ffeb 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c +++ b/src/overlays/actors/ovl_En_Ending_Hero3/z_en_ending_hero3.c @@ -25,10 +25,10 @@ ActorInit En_Ending_Hero3_InitVars = { FLAGS, OBJECT_TORYO, sizeof(EnEndingHero3), - (ActorFunc)EnEndingHero3_Init, - (ActorFunc)EnEndingHero3_Destroy, - (ActorFunc)EnEndingHero3_Update, - (ActorFunc)EnEndingHero3_Draw, + EnEndingHero3_Init, + EnEndingHero3_Destroy, + EnEndingHero3_Update, + EnEndingHero3_Draw, }; void EnEndingHero3_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c index 333bbc9180..d9f081a445 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c +++ b/src/overlays/actors/ovl_En_Ending_Hero4/z_en_ending_hero4.c @@ -25,10 +25,10 @@ ActorInit En_Ending_Hero4_InitVars = { FLAGS, OBJECT_SDN, sizeof(EnEndingHero4), - (ActorFunc)EnEndingHero4_Init, - (ActorFunc)EnEndingHero4_Destroy, - (ActorFunc)EnEndingHero4_Update, - (ActorFunc)EnEndingHero4_Draw, + EnEndingHero4_Init, + EnEndingHero4_Destroy, + EnEndingHero4_Update, + EnEndingHero4_Draw, }; void EnEndingHero4_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c index ee62798f18..d0bd861523 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c +++ b/src/overlays/actors/ovl_En_Ending_Hero5/z_en_ending_hero5.c @@ -25,10 +25,10 @@ ActorInit En_Ending_Hero5_InitVars = { FLAGS, OBJECT_DAIKU, sizeof(EnEndingHero5), - (ActorFunc)EnEndingHero5_Init, - (ActorFunc)EnEndingHero5_Destroy, - (ActorFunc)EnEndingHero5_Update, - (ActorFunc)EnEndingHero5_Draw, + EnEndingHero5_Init, + EnEndingHero5_Destroy, + EnEndingHero5_Update, + EnEndingHero5_Draw, }; void EnEndingHero5_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c index 8f19fe9f8c..d15a62dc29 100644 --- a/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c +++ b/src/overlays/actors/ovl_En_Ending_Hero6/z_en_ending_hero6.c @@ -30,10 +30,10 @@ ActorInit En_Ending_Hero6_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnEndingHero6), - (ActorFunc)EnEndingHero6_Init, - (ActorFunc)EnEndingHero6_Destroy, - (ActorFunc)EnEndingHero6_Update, - (ActorFunc)EnEndingHero6_Draw, + EnEndingHero6_Init, + EnEndingHero6_Destroy, + EnEndingHero6_Update, + EnEndingHero6_Draw, }; static FlexSkeletonHeader* sSkeletons[] = { diff --git a/src/overlays/actors/ovl_En_Estone/z_en_estone.c b/src/overlays/actors/ovl_En_Estone/z_en_estone.c index c55ab52720..9b9c43bce1 100644 --- a/src/overlays/actors/ovl_En_Estone/z_en_estone.c +++ b/src/overlays/actors/ovl_En_Estone/z_en_estone.c @@ -29,10 +29,10 @@ ActorInit En_Estone_InitVars = { FLAGS, OBJECT_EG, sizeof(EnEstone), - (ActorFunc)EnEstone_Init, - (ActorFunc)EnEstone_Destroy, - (ActorFunc)EnEstone_Update, - (ActorFunc)EnEstone_Draw, + EnEstone_Init, + EnEstone_Destroy, + EnEstone_Update, + EnEstone_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Fall/z_en_fall.c b/src/overlays/actors/ovl_En_Fall/z_en_fall.c index 32a4b7c823..f00cead6b3 100644 --- a/src/overlays/actors/ovl_En_Fall/z_en_fall.c +++ b/src/overlays/actors/ovl_En_Fall/z_en_fall.c @@ -68,10 +68,10 @@ ActorInit En_Fall_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnFall), - (ActorFunc)EnFall_Init, - (ActorFunc)EnFall_Destroy, - (ActorFunc)EnFall_Update, - (ActorFunc)NULL, + EnFall_Init, + EnFall_Destroy, + EnFall_Update, + NULL, }; /** diff --git a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c index 33cf9a64df..bd7013a97a 100644 --- a/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c +++ b/src/overlays/actors/ovl_En_Fall2/z_en_fall2.c @@ -27,10 +27,10 @@ ActorInit En_Fall2_InitVars = { FLAGS, OBJECT_FALL2, sizeof(EnFall2), - (ActorFunc)EnFall2_Init, - (ActorFunc)EnFall2_Destroy, - (ActorFunc)EnFall2_Update, - (ActorFunc)EnFall2_Draw, + EnFall2_Init, + EnFall2_Destroy, + EnFall2_Update, + EnFall2_Draw, }; void EnFall2_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.c b/src/overlays/actors/ovl_En_Famos/z_en_famos.c index 27dcabc23c..cc7c7f3456 100644 --- a/src/overlays/actors/ovl_En_Famos/z_en_famos.c +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c @@ -57,10 +57,10 @@ ActorInit En_Famos_InitVars = { FLAGS, OBJECT_FAMOS, sizeof(EnFamos), - (ActorFunc)EnFamos_Init, - (ActorFunc)EnFamos_Destroy, - (ActorFunc)EnFamos_Update, - (ActorFunc)EnFamos_Draw, + EnFamos_Init, + EnFamos_Destroy, + EnFamos_Update, + EnFamos_Draw, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_En_Fg/z_en_fg.c b/src/overlays/actors/ovl_En_Fg/z_en_fg.c index 6a4c357d9b..e449804503 100644 --- a/src/overlays/actors/ovl_En_Fg/z_en_fg.c +++ b/src/overlays/actors/ovl_En_Fg/z_en_fg.c @@ -30,10 +30,10 @@ ActorInit En_Fg_InitVars = { FLAGS, OBJECT_FR, sizeof(EnFg), - (ActorFunc)EnFg_Init, - (ActorFunc)EnFg_Destroy, - (ActorFunc)EnFg_Update, - (ActorFunc)EnFg_Draw, + EnFg_Init, + EnFg_Destroy, + EnFg_Update, + EnFg_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index 90801ef444..80218a417d 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -21,10 +21,10 @@ ActorInit En_Fire_Rock_InitVars = { FLAGS, OBJECT_EFC_STAR_FIELD, sizeof(EnFireRock), - (ActorFunc)EnFireRock_Init, - (ActorFunc)EnFireRock_Destroy, - (ActorFunc)EnFireRock_Update, - (ActorFunc)EnFireRock_Draw, + EnFireRock_Init, + EnFireRock_Destroy, + EnFireRock_Update, + EnFireRock_Draw, }; void EnFireRock_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index 5cdcd99feb..8c7e461687 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -50,10 +50,10 @@ ActorInit En_Firefly_InitVars = { FLAGS, OBJECT_FIREFLY, sizeof(EnFirefly), - (ActorFunc)EnFirefly_Init, - (ActorFunc)EnFirefly_Destroy, - (ActorFunc)EnFirefly_Update, - (ActorFunc)EnFirefly_Draw, + EnFirefly_Init, + EnFirefly_Destroy, + EnFirefly_Update, + EnFirefly_Draw, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c index 6c105caa2c..0a8a56ef32 100644 --- a/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c +++ b/src/overlays/actors/ovl_En_Firefly2/z_en_firefly2.c @@ -21,10 +21,10 @@ ActorInit En_Firefly2_InitVars = { FLAGS, OBJECT_FIREFLY, sizeof(EnFirefly2), - (ActorFunc)EnFirefly2_Init, - (ActorFunc)EnFirefly2_Destroy, - (ActorFunc)EnFirefly2_Update, - (ActorFunc)EnFirefly2_Draw, + EnFirefly2_Init, + EnFirefly2_Destroy, + EnFirefly2_Update, + EnFirefly2_Draw, }; void EnFirefly2_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index 5f9bbb2daa..11924553ac 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -74,10 +74,10 @@ ActorInit En_Fish_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnFish), - (ActorFunc)EnFish_Init, - (ActorFunc)EnFish_Destroy, - (ActorFunc)EnFish_Update, - (ActorFunc)EnFish_Draw, + EnFish_Init, + EnFish_Destroy, + EnFish_Update, + EnFish_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c index c7dd18369b..3f9daaac11 100644 --- a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c +++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c @@ -55,10 +55,10 @@ ActorInit En_Fish2_InitVars = { FLAGS, OBJECT_FB, sizeof(EnFish2), - (ActorFunc)EnFish2_Init, - (ActorFunc)EnFish2_Destroy, - (ActorFunc)EnFish2_Update, - (ActorFunc)EnFish2_Draw, + EnFish2_Init, + EnFish2_Destroy, + EnFish2_Update, + EnFish2_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[2] = { diff --git a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c index ac7fc1debf..942f3d7a42 100644 --- a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c +++ b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c @@ -207,10 +207,10 @@ ActorInit En_Fishing_InitVars = { FLAGS, OBJECT_FISH, sizeof(EnFishing), - (ActorFunc)EnFishing_Init, - (ActorFunc)EnFishing_Destroy, - (ActorFunc)EnFishing_UpdateFish, - (ActorFunc)EnFishing_DrawFish, + EnFishing_Init, + EnFishing_Destroy, + EnFishing_UpdateFish, + EnFishing_DrawFish, }; f32 D_8090CCD0 = 0.0f; diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index 3ad6809dcc..d2c99d39dc 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -65,10 +65,10 @@ ActorInit En_Floormas_InitVars = { FLAGS, OBJECT_WALLMASTER, sizeof(EnFloormas), - (ActorFunc)EnFloormas_Init, - (ActorFunc)EnFloormas_Destroy, - (ActorFunc)EnFloormas_Update, - (ActorFunc)EnFloormas_Draw, + EnFloormas_Init, + EnFloormas_Destroy, + EnFloormas_Update, + EnFloormas_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 0b645b3029..3beb49b111 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -20,10 +20,10 @@ ActorInit En_Fr_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnFr), - (ActorFunc)EnFr_Init, - (ActorFunc)EnFr_Destroy, - (ActorFunc)EnFr_Update, - (ActorFunc)NULL, + EnFr_Init, + EnFr_Destroy, + EnFr_Update, + NULL, }; void EnFr_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c index 23dc0f3505..293c8df0ce 100644 --- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c @@ -75,10 +75,10 @@ ActorInit En_Fsn_InitVars = { FLAGS, OBJECT_FSN, sizeof(EnFsn), - (ActorFunc)EnFsn_Init, - (ActorFunc)EnFsn_Destroy, - (ActorFunc)EnFsn_Update, - (ActorFunc)EnFsn_Draw, + EnFsn_Init, + EnFsn_Destroy, + EnFsn_Update, + EnFsn_Draw, }; static AnimationInfoS sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index a3d76fab70..c6ec0361f3 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -61,10 +61,10 @@ ActorInit En_Fu_InitVars = { FLAGS, OBJECT_MU, sizeof(EnFu), - (ActorFunc)EnFu_Init, - (ActorFunc)EnFu_Destroy, - (ActorFunc)EnFu_Update, - (ActorFunc)EnFu_Draw, + EnFu_Init, + EnFu_Destroy, + EnFu_Update, + EnFu_Draw, }; static s32 D_80964B00[] = { 300, 100, 100 }; diff --git a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c index b232210f50..3147c68bf1 100644 --- a/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c +++ b/src/overlays/actors/ovl_En_Fu_Kago/z_en_fu_kago.c @@ -34,10 +34,10 @@ ActorInit En_Fu_Kago_InitVars = { FLAGS, OBJECT_FU_MATO, sizeof(EnFuKago), - (ActorFunc)EnFuKago_Init, - (ActorFunc)EnFuKago_Destroy, - (ActorFunc)EnFuKago_Update, - (ActorFunc)EnFuKago_Draw, + EnFuKago_Init, + EnFuKago_Destroy, + EnFuKago_Update, + EnFuKago_Draw, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c index 6f9706a2ba..049b7849ef 100644 --- a/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c +++ b/src/overlays/actors/ovl_En_Fu_Mato/z_en_fu_mato.c @@ -33,10 +33,10 @@ ActorInit En_Fu_Mato_InitVars = { FLAGS, OBJECT_FU_MATO, sizeof(EnFuMato), - (ActorFunc)EnFuMato_Init, - (ActorFunc)EnFuMato_Destroy, - (ActorFunc)EnFuMato_Update, - (ActorFunc)EnFuMato_Draw, + EnFuMato_Init, + EnFuMato_Destroy, + EnFuMato_Update, + EnFuMato_Draw, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index f7d1d7cd13..eb466ec6e5 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -55,10 +55,10 @@ ActorInit En_Fz_InitVars = { FLAGS, OBJECT_FZ, sizeof(EnFz), - (ActorFunc)EnFz_Init, - (ActorFunc)EnFz_Destroy, - (ActorFunc)EnFz_Update, - (ActorFunc)EnFz_Draw, + EnFz_Init, + EnFz_Destroy, + EnFz_Update, + EnFz_Draw, }; static s16 D_809346F0[] = { 0, 0x2000, 0x4000, 0 }; diff --git a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c index 55dc237374..5bd1b0f6b0 100644 --- a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c +++ b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c @@ -31,10 +31,10 @@ ActorInit En_Gakufu_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnGakufu), - (ActorFunc)EnGakufu_Init, - (ActorFunc)EnGakufu_Destroy, - (ActorFunc)EnGakufu_Update, - (ActorFunc)EnGakufu_Draw, + EnGakufu_Init, + EnGakufu_Destroy, + EnGakufu_Update, + EnGakufu_Draw, }; Vec3f sRewardDropsSpawnTerminaFieldPos = { diff --git a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c index 40c3d5c05f..0b48b1d124 100644 --- a/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c +++ b/src/overlays/actors/ovl_En_Gamelupy/z_en_gamelupy.c @@ -29,10 +29,10 @@ ActorInit En_Gamelupy_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnGamelupy), - (ActorFunc)EnGamelupy_Init, - (ActorFunc)EnGamelupy_Destroy, - (ActorFunc)EnGamelupy_Update, - (ActorFunc)EnGamelupy_Draw, + EnGamelupy_Init, + EnGamelupy_Destroy, + EnGamelupy_Update, + EnGamelupy_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c index 632b29a235..0f156a58b3 100644 --- a/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c +++ b/src/overlays/actors/ovl_En_Gb2/z_en_gb2.c @@ -42,10 +42,10 @@ ActorInit En_Gb2_InitVars = { FLAGS, OBJECT_PS, sizeof(EnGb2), - (ActorFunc)EnGb2_Init, - (ActorFunc)EnGb2_Destroy, - (ActorFunc)EnGb2_Update, - (ActorFunc)EnGb2_Draw, + EnGb2_Init, + EnGb2_Destroy, + EnGb2_Update, + EnGb2_Draw, }; typedef struct { diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index cbc8511b73..5fd73ebb67 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -21,10 +21,10 @@ ActorInit En_Ge1_InitVars = { FLAGS, OBJECT_GE1, sizeof(EnGe1), - (ActorFunc)EnGe1_Init, - (ActorFunc)EnGe1_Destroy, - (ActorFunc)EnGe1_Update, - (ActorFunc)EnGe1_Draw, + EnGe1_Init, + EnGe1_Destroy, + EnGe1_Update, + EnGe1_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index 4659c4aa95..110a644599 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -33,10 +33,10 @@ ActorInit En_Ge2_InitVars = { FLAGS, OBJECT_GLA, sizeof(EnGe2), - (ActorFunc)EnGe2_Init, - (ActorFunc)EnGe2_Destroy, - (ActorFunc)EnGe2_Update, - (ActorFunc)EnGe2_Draw, + EnGe2_Init, + EnGe2_Destroy, + EnGe2_Update, + EnGe2_Draw, }; // static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index 1f680e9e88..989a88fda1 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -22,10 +22,10 @@ ActorInit En_Ge3_InitVars = { FLAGS, OBJECT_GELDB, sizeof(EnGe3), - (ActorFunc)EnGe3_Init, - (ActorFunc)EnGe3_Destroy, - (ActorFunc)EnGe3_Update, - (ActorFunc)EnGe3_Draw, + EnGe3_Init, + EnGe3_Destroy, + EnGe3_Update, + EnGe3_Draw, }; // static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Geg/z_en_geg.c b/src/overlays/actors/ovl_En_Geg/z_en_geg.c index 1da6c1a612..93f14fe33e 100644 --- a/src/overlays/actors/ovl_En_Geg/z_en_geg.c +++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.c @@ -43,10 +43,10 @@ ActorInit En_Geg_InitVars = { FLAGS, OBJECT_OF1D_MAP, sizeof(EnGeg), - (ActorFunc)EnGeg_Init, - (ActorFunc)EnGeg_Destroy, - (ActorFunc)EnGeg_Update, - (ActorFunc)EnGeg_Draw, + EnGeg_Init, + EnGeg_Destroy, + EnGeg_Update, + EnGeg_Draw, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Gg/z_en_gg.c b/src/overlays/actors/ovl_En_Gg/z_en_gg.c index a6c2a31ec3..0239867dc3 100644 --- a/src/overlays/actors/ovl_En_Gg/z_en_gg.c +++ b/src/overlays/actors/ovl_En_Gg/z_en_gg.c @@ -32,10 +32,10 @@ ActorInit En_Gg_InitVars = { FLAGS, OBJECT_GG, sizeof(EnGg), - (ActorFunc)EnGg_Init, - (ActorFunc)EnGg_Destroy, - (ActorFunc)EnGg_Update, - (ActorFunc)EnGg_Draw, + EnGg_Init, + EnGg_Destroy, + EnGg_Update, + EnGg_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c index 6da3b1378a..8c550e24ec 100644 --- a/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c +++ b/src/overlays/actors/ovl_En_Gg2/z_en_gg2.c @@ -33,10 +33,10 @@ ActorInit En_Gg2_InitVars = { FLAGS, OBJECT_GG, sizeof(EnGg2), - (ActorFunc)EnGg2_Init, - (ActorFunc)EnGg2_Destroy, - (ActorFunc)EnGg2_Update, - (ActorFunc)EnGg2_Draw, + EnGg2_Init, + EnGg2_Destroy, + EnGg2_Update, + EnGg2_Draw, }; AnimationInfo D_80B3BF00[] = { diff --git a/src/overlays/actors/ovl_En_Giant/z_en_giant.c b/src/overlays/actors/ovl_En_Giant/z_en_giant.c index dbd1803591..e49cd5c7c2 100644 --- a/src/overlays/actors/ovl_En_Giant/z_en_giant.c +++ b/src/overlays/actors/ovl_En_Giant/z_en_giant.c @@ -78,10 +78,10 @@ ActorInit En_Giant_InitVars = { FLAGS, OBJECT_GIANT, sizeof(EnGiant), - (ActorFunc)EnGiant_Init, - (ActorFunc)EnGiant_Destroy, - (ActorFunc)EnGiant_Update, - (ActorFunc)EnGiant_Draw, + EnGiant_Init, + EnGiant_Destroy, + EnGiant_Update, + EnGiant_Draw, }; static AnimationHeader* sAnimations[] = { diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c index 88d55dc14c..0519d16bc0 100644 --- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c +++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c @@ -36,10 +36,10 @@ ActorInit En_Ginko_Man_InitVars = { FLAGS, OBJECT_BOJ, sizeof(EnGinkoMan), - (ActorFunc)EnGinkoMan_Init, - (ActorFunc)EnGinkoMan_Destroy, - (ActorFunc)EnGinkoMan_Update, - (ActorFunc)EnGinkoMan_Draw, + EnGinkoMan_Init, + EnGinkoMan_Destroy, + EnGinkoMan_Update, + EnGinkoMan_Draw, }; typedef enum { diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index 65df46284d..b42837c93a 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -57,10 +57,10 @@ ActorInit En_GirlA_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnGirlA), - (ActorFunc)EnGirlA_Init, - (ActorFunc)EnGirlA_Destroy, - (ActorFunc)EnGirlA_Update, - (ActorFunc)NULL, + EnGirlA_Init, + EnGirlA_Destroy, + EnGirlA_Update, + NULL, }; static ShopItemEntry sShopItemEntries[] = { diff --git a/src/overlays/actors/ovl_En_Gk/z_en_gk.c b/src/overlays/actors/ovl_En_Gk/z_en_gk.c index 6f2f3c09cf..b3940a2d06 100644 --- a/src/overlays/actors/ovl_En_Gk/z_en_gk.c +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.c @@ -39,10 +39,10 @@ ActorInit En_Gk_InitVars = { FLAGS, OBJECT_GK, sizeof(EnGk), - (ActorFunc)EnGk_Init, - (ActorFunc)EnGk_Destroy, - (ActorFunc)EnGk_Update, - (ActorFunc)EnGk_Draw, + EnGk_Init, + EnGk_Destroy, + EnGk_Update, + EnGk_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index aaaf0ef3dc..d8bfeb4643 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -161,10 +161,10 @@ ActorInit En_Gm_InitVars = { FLAGS, OBJECT_IN2, sizeof(EnGm), - (ActorFunc)EnGm_Init, - (ActorFunc)EnGm_Destroy, - (ActorFunc)EnGm_Update, - (ActorFunc)EnGm_Draw, + EnGm_Init, + EnGm_Destroy, + EnGm_Update, + EnGm_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index 9d772cc289..d22ae1e193 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -84,10 +84,10 @@ ActorInit En_Go_InitVars = { FLAGS, OBJECT_OF1D_MAP, sizeof(EnGo), - (ActorFunc)EnGo_Init, - (ActorFunc)EnGo_Destroy, - (ActorFunc)EnGo_Update, - (ActorFunc)NULL, + EnGo_Init, + EnGo_Destroy, + EnGo_Update, + NULL, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index 98d27f735c..ce8daa1b02 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -39,10 +39,10 @@ ActorInit En_Goroiwa_InitVars = { FLAGS, OBJECT_GOROIWA, sizeof(EnGoroiwa), - (ActorFunc)EnGoroiwa_Init, - (ActorFunc)EnGoroiwa_Destroy, - (ActorFunc)EnGoroiwa_Update, - (ActorFunc)EnGoroiwa_Draw, + EnGoroiwa_Init, + EnGoroiwa_Destroy, + EnGoroiwa_Update, + EnGoroiwa_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c index eb7948ffb2..e98b047659 100644 --- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c +++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c @@ -143,10 +143,10 @@ ActorInit En_Grasshopper_InitVars = { FLAGS, OBJECT_GRASSHOPPER, sizeof(EnGrasshopper), - (ActorFunc)EnGrasshopper_Init, - (ActorFunc)EnGrasshopper_Destroy, - (ActorFunc)EnGrasshopper_Update, - (ActorFunc)EnGrasshopper_Draw, + EnGrasshopper_Init, + EnGrasshopper_Destroy, + EnGrasshopper_Update, + EnGrasshopper_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[2] = { diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index 93d7e3f88d..904c2ec1a1 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -43,10 +43,10 @@ ActorInit En_Gs_InitVars = { FLAGS, OBJECT_GS, sizeof(EnGs), - (ActorFunc)EnGs_Init, - (ActorFunc)EnGs_Destroy, - (ActorFunc)EnGs_Update, - (ActorFunc)EnGs_Draw, + EnGs_Init, + EnGs_Destroy, + EnGs_Update, + EnGs_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c index b13bca1dd5..f23e4f3f5b 100644 --- a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c +++ b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c @@ -31,10 +31,10 @@ ActorInit En_Guard_Nuts_InitVars = { FLAGS, OBJECT_DNK, sizeof(EnGuardNuts), - (ActorFunc)EnGuardNuts_Init, - (ActorFunc)EnGuardNuts_Destroy, - (ActorFunc)EnGuardNuts_Update, - (ActorFunc)EnGuardNuts_Draw, + EnGuardNuts_Init, + EnGuardNuts_Destroy, + EnGuardNuts_Update, + EnGuardNuts_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c index f7eddbe6fe..886c06bedf 100644 --- a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c +++ b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c @@ -33,10 +33,10 @@ ActorInit En_Guruguru_InitVars = { FLAGS, OBJECT_FU, sizeof(EnGuruguru), - (ActorFunc)EnGuruguru_Init, - (ActorFunc)EnGuruguru_Destroy, - (ActorFunc)EnGuruguru_Update, - (ActorFunc)EnGuruguru_Draw, + EnGuruguru_Init, + EnGuruguru_Destroy, + EnGuruguru_Update, + EnGuruguru_Draw, }; static u16 textIDs[] = { 0x292A, 0x292B, 0x292C, 0x292D, 0x292E, 0x292F, 0x2930, 0x2931, diff --git a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c index 0e1d2f050d..9181ca6c21 100644 --- a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c +++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c @@ -38,10 +38,10 @@ ActorInit En_Hakurock_InitVars = { FLAGS, OBJECT_BOSS_HAKUGIN, sizeof(EnHakurock), - (ActorFunc)EnHakurock_Init, - (ActorFunc)EnHakurock_Destroy, - (ActorFunc)EnHakurock_Update, - (ActorFunc)NULL, + EnHakurock_Init, + EnHakurock_Destroy, + EnHakurock_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c index 507bf9deb9..b49ac5ea91 100644 --- a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c +++ b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c @@ -27,10 +27,10 @@ ActorInit En_Hanabi_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnHanabi), - (ActorFunc)EnHanabi_Init, - (ActorFunc)EnHanabi_Destroy, - (ActorFunc)EnHanabi_Update, - (ActorFunc)NULL, + EnHanabi_Init, + EnHanabi_Destroy, + EnHanabi_Update, + NULL, }; Vec3s D_80B23AA0[] = { diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c index 4a01b663ef..b0394ec09a 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -22,10 +22,10 @@ ActorInit En_Hata_InitVars = { FLAGS, OBJECT_HATA, sizeof(EnHata), - (ActorFunc)EnHata_Init, - (ActorFunc)EnHata_Destroy, - (ActorFunc)EnHata_Update, - (ActorFunc)EnHata_Draw, + EnHata_Init, + EnHata_Destroy, + EnHata_Update, + EnHata_Draw, }; void EnHata_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c index 756f37eb84..187ff16c9e 100644 --- a/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c +++ b/src/overlays/actors/ovl_En_Heishi/z_en_heishi.c @@ -34,10 +34,10 @@ ActorInit En_Heishi_InitVars = { FLAGS, OBJECT_SDN, sizeof(EnHeishi), - (ActorFunc)EnHeishi_Init, - (ActorFunc)EnHeishi_Destroy, - (ActorFunc)EnHeishi_Update, - (ActorFunc)EnHeishi_Draw, + EnHeishi_Init, + EnHeishi_Destroy, + EnHeishi_Update, + EnHeishi_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Hg/z_en_hg.c b/src/overlays/actors/ovl_En_Hg/z_en_hg.c index e100a2de30..26f17923a3 100644 --- a/src/overlays/actors/ovl_En_Hg/z_en_hg.c +++ b/src/overlays/actors/ovl_En_Hg/z_en_hg.c @@ -53,10 +53,10 @@ ActorInit En_Hg_InitVars = { FLAGS, OBJECT_HARFGIBUD, sizeof(EnHg), - (ActorFunc)EnHg_Init, - (ActorFunc)EnHg_Destroy, - (ActorFunc)EnHg_Update, - (ActorFunc)EnHg_Draw, + EnHg_Init, + EnHg_Destroy, + EnHg_Update, + EnHg_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c index f7a9df82ab..e6bca20a29 100644 --- a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c +++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c @@ -54,10 +54,10 @@ ActorInit En_Hgo_InitVars = { FLAGS, OBJECT_HARFGIBUD, sizeof(EnHgo), - (ActorFunc)EnHgo_Init, - (ActorFunc)EnHgo_Destroy, - (ActorFunc)EnHgo_Update, - (ActorFunc)EnHgo_Draw, + EnHgo_Init, + EnHgo_Destroy, + EnHgo_Update, + EnHgo_Draw, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c index d8df99887b..c5f6955b18 100644 --- a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c +++ b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c @@ -37,10 +37,10 @@ ActorInit En_Hidden_Nuts_InitVars = { FLAGS, OBJECT_HINTNUTS, sizeof(EnHiddenNuts), - (ActorFunc)EnHiddenNuts_Init, - (ActorFunc)EnHiddenNuts_Destroy, - (ActorFunc)EnHiddenNuts_Update, - (ActorFunc)EnHiddenNuts_Draw, + EnHiddenNuts_Init, + EnHiddenNuts_Destroy, + EnHiddenNuts_Update, + EnHiddenNuts_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c index c07bbc5da1..005864a4cf 100644 --- a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c +++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c @@ -45,10 +45,10 @@ ActorInit En_Hint_Skb_InitVars = { FLAGS, OBJECT_SKB, sizeof(EnHintSkb), - (ActorFunc)EnHintSkb_Init, - (ActorFunc)EnHintSkb_Destroy, - (ActorFunc)EnHintSkb_Update, - (ActorFunc)EnHintSkb_Draw, + EnHintSkb_Init, + EnHintSkb_Destroy, + EnHintSkb_Update, + EnHintSkb_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[2] = { diff --git a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c index c76d921064..96c9a082d5 100644 --- a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c +++ b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c @@ -22,10 +22,10 @@ ActorInit En_Hit_Tag_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnHitTag), - (ActorFunc)EnHitTag_Init, - (ActorFunc)EnHitTag_Destroy, - (ActorFunc)EnHitTag_Update, - (ActorFunc)NULL, + EnHitTag_Init, + EnHitTag_Destroy, + EnHitTag_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index e7615d25fd..40fc316808 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -63,10 +63,10 @@ ActorInit En_Holl_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnHoll), - (ActorFunc)EnHoll_Init, - (ActorFunc)EnHoll_Destroy, - (ActorFunc)EnHoll_Update, - (ActorFunc)EnHoll_Draw, + EnHoll_Init, + EnHoll_Destroy, + EnHoll_Update, + EnHoll_Draw, }; #include "overlays/ovl_En_Holl/ovl_En_Holl.c" diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index d57fb078ba..856d23572a 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -37,10 +37,10 @@ ActorInit En_Honotrap_InitVars = { FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(EnHonotrap), - (ActorFunc)EnHonotrap_Init, - (ActorFunc)EnHonotrap_Destroy, - (ActorFunc)EnHonotrap_Update, - (ActorFunc)EnHonotrap_Draw, + EnHonotrap_Init, + EnHonotrap_Destroy, + EnHonotrap_Update, + EnHonotrap_Draw, }; // static ColliderTrisElementInit sTrisElementsInit[2] = { diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index 2c7eec6072..cf8ed1fc41 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -150,10 +150,10 @@ ActorInit En_Horse_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnHorse), - (ActorFunc)EnHorse_Init, - (ActorFunc)EnHorse_Destroy, - (ActorFunc)EnHorse_Update, - (ActorFunc)EnHorse_Draw, + EnHorse_Init, + EnHorse_Destroy, + EnHorse_Update, + EnHorse_Draw, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index b2e745cadd..873afec6c7 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -41,10 +41,10 @@ ActorInit En_Horse_Game_Check_InitVars = { FLAGS, OBJECT_HORSE_GAME_CHECK, sizeof(EnHorseGameCheck), - (ActorFunc)EnHorseGameCheck_Init, - (ActorFunc)EnHorseGameCheck_Destroy, - (ActorFunc)EnHorseGameCheck_Update, - (ActorFunc)EnHorseGameCheck_Draw, + EnHorseGameCheck_Init, + EnHorseGameCheck_Destroy, + EnHorseGameCheck_Update, + EnHorseGameCheck_Draw, }; #include "overlays/ovl_En_Horse_Game_Check/ovl_En_Horse_Game_Check.c" diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index a10504720b..427d288d94 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -32,10 +32,10 @@ ActorInit En_Horse_Link_Child_InitVars = { FLAGS, OBJECT_HORSE_LINK_CHILD, sizeof(EnHorseLinkChild), - (ActorFunc)EnHorseLinkChild_Init, - (ActorFunc)EnHorseLinkChild_Destroy, - (ActorFunc)EnHorseLinkChild_Update, - (ActorFunc)EnHorseLinkChild_Draw, + EnHorseLinkChild_Init, + EnHorseLinkChild_Destroy, + EnHorseLinkChild_Update, + EnHorseLinkChild_Draw, }; AnimationHeader* D_808DFEC0[] = { &object_horse_link_child_Anim_006D44, &object_horse_link_child_Anim_007468 }; diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index 2eb1c71a65..b2c42e1ee9 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -29,10 +29,10 @@ ActorInit En_Hs_InitVars = { FLAGS, OBJECT_HS, sizeof(EnHs), - (ActorFunc)EnHs_Init, - (ActorFunc)EnHs_Destroy, - (ActorFunc)EnHs_Update, - (ActorFunc)EnHs_Draw, + EnHs_Init, + EnHs_Destroy, + EnHs_Update, + EnHs_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index 8273d87894..0d21109813 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -23,10 +23,10 @@ ActorInit En_Hs2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnHs2), - (ActorFunc)EnHs2_Init, - (ActorFunc)EnHs2_Destroy, - (ActorFunc)EnHs2_Update, - (ActorFunc)EnHs2_Draw, + EnHs2_Init, + EnHs2_Destroy, + EnHs2_Update, + EnHs2_Draw, }; void EnHs2_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.c b/src/overlays/actors/ovl_En_Ig/z_en_ig.c index 8f0ae949d9..a3bac52989 100644 --- a/src/overlays/actors/ovl_En_Ig/z_en_ig.c +++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.c @@ -95,10 +95,10 @@ ActorInit En_Ig_InitVars = { FLAGS, OBJECT_DAI, sizeof(EnIg), - (ActorFunc)EnIg_Init, - (ActorFunc)EnIg_Destroy, - (ActorFunc)EnIg_Update, - (ActorFunc)EnIg_Draw, + EnIg_Init, + EnIg_Destroy, + EnIg_Update, + EnIg_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 4188f44c4b..5442785078 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -80,10 +80,10 @@ ActorInit En_Ik_InitVars = { FLAGS, OBJECT_IK, sizeof(EnIk), - (ActorFunc)EnIk_Init, - (ActorFunc)EnIk_Destroy, - (ActorFunc)EnIk_Update, - (ActorFunc)EnIk_Draw, + EnIk_Init, + EnIk_Destroy, + EnIk_Update, + EnIk_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index a51cae5563..6372213df9 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -28,10 +28,10 @@ ActorInit En_In_InitVars = { FLAGS, OBJECT_IN, sizeof(EnIn), - (ActorFunc)EnIn_Init, - (ActorFunc)EnIn_Destroy, - (ActorFunc)EnIn_Update, - (ActorFunc)EnIn_Draw, + EnIn_Init, + EnIn_Destroy, + EnIn_Update, + EnIn_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 9eae19437c..9c30151193 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -38,10 +38,10 @@ ActorInit En_Insect_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnInsect), - (ActorFunc)EnInsect_Init, - (ActorFunc)EnInsect_Destroy, - (ActorFunc)EnInsect_Update, - (ActorFunc)EnInsect_Draw, + EnInsect_Init, + EnInsect_Destroy, + EnInsect_Update, + EnInsect_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c index bf2b37bca3..4377e745b7 100644 --- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c +++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c @@ -184,10 +184,10 @@ ActorInit En_Invadepoh_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnInvadepoh), - (ActorFunc)EnInvadepoh_Init, - (ActorFunc)EnInvadepoh_Destroy, - (ActorFunc)EnInvadepoh_Update, - (ActorFunc)NULL, + EnInvadepoh_Init, + EnInvadepoh_Destroy, + EnInvadepoh_Update, + NULL, }; static ColliderCylinderInit sCylinderInitAlien = { diff --git a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c index 6a73eceecb..6c12ad5ff3 100644 --- a/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c +++ b/src/overlays/actors/ovl_En_Invadepoh_Demo/z_en_invadepoh_demo.c @@ -29,10 +29,10 @@ ActorInit En_Invadepoh_Demo_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnInvadepohDemo), - (ActorFunc)EnInvadepohDemo_Init, - (ActorFunc)EnInvadepohDemo_Destroy, - (ActorFunc)EnInvadepohDemo_Update, - (ActorFunc)EnInvadepohDemo_Draw, + EnInvadepohDemo_Init, + EnInvadepohDemo_Destroy, + EnInvadepohDemo_Update, + EnInvadepohDemo_Draw, }; // static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c index 70f77b18a3..04c729e4c1 100644 --- a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c +++ b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c @@ -24,10 +24,10 @@ ActorInit En_Invisible_Ruppe_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnInvisibleRuppe), - (ActorFunc)EnInvisibleRuppe_Init, - (ActorFunc)EnInvisibleRuppe_Destroy, - (ActorFunc)EnInvisibleRuppe_Update, - (ActorFunc)NULL, + EnInvisibleRuppe_Init, + EnInvisibleRuppe_Destroy, + EnInvisibleRuppe_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index f911bc4f4f..3c3706a8f4 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -50,10 +50,10 @@ ActorInit En_Ishi_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnIshi), - (ActorFunc)EnIshi_Init, - (ActorFunc)EnIshi_Destroy, - (ActorFunc)EnIshi_Update, - (ActorFunc)NULL, + EnIshi_Init, + EnIshi_Destroy, + EnIshi_Update, + NULL, }; static f32 D_8095F6B8[] = { 0.1f, 0.4f }; diff --git a/src/overlays/actors/ovl_En_Ja/z_en_ja.c b/src/overlays/actors/ovl_En_Ja/z_en_ja.c index 9a82f24adf..a1391a2fb5 100644 --- a/src/overlays/actors/ovl_En_Ja/z_en_ja.c +++ b/src/overlays/actors/ovl_En_Ja/z_en_ja.c @@ -56,10 +56,10 @@ ActorInit En_Ja_InitVars = { FLAGS, OBJECT_BOJ, sizeof(EnJa), - (ActorFunc)EnJa_Init, - (ActorFunc)EnJa_Destroy, - (ActorFunc)EnJa_Update, - (ActorFunc)EnJa_Draw, + EnJa_Init, + EnJa_Destroy, + EnJa_Update, + EnJa_Draw, }; Vec3f D_80BC36AC = { -10.0f, 56.0f, 25.0f }; diff --git a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c index 9bafd7ea60..01970f39f2 100644 --- a/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c +++ b/src/overlays/actors/ovl_En_Jc_Mato/z_en_jc_mato.c @@ -26,10 +26,10 @@ ActorInit En_Jc_Mato_InitVars = { FLAGS, OBJECT_TRU, sizeof(EnJcMato), - (ActorFunc)EnJcMato_Init, - (ActorFunc)EnJcMato_Destroy, - (ActorFunc)EnJcMato_Update, - (ActorFunc)EnJcMato_Draw, + EnJcMato_Init, + EnJcMato_Destroy, + EnJcMato_Update, + EnJcMato_Draw, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Jg/z_en_jg.c b/src/overlays/actors/ovl_En_Jg/z_en_jg.c index e7c2ad78d0..7363ec14b7 100644 --- a/src/overlays/actors/ovl_En_Jg/z_en_jg.c +++ b/src/overlays/actors/ovl_En_Jg/z_en_jg.c @@ -70,10 +70,10 @@ ActorInit En_Jg_InitVars = { FLAGS, OBJECT_JG, sizeof(EnJg), - (ActorFunc)EnJg_Init, - (ActorFunc)EnJg_Destroy, - (ActorFunc)EnJg_Update, - (ActorFunc)EnJg_Draw, + EnJg_Init, + EnJg_Destroy, + EnJg_Update, + EnJg_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c index 8e82716588..eb15d1666a 100644 --- a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c +++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c @@ -42,10 +42,10 @@ ActorInit En_Jgame_Tsn_InitVars = { FLAGS, OBJECT_TSN, sizeof(EnJgameTsn), - (ActorFunc)EnJgameTsn_Init, - (ActorFunc)EnJgameTsn_Destroy, - (ActorFunc)EnJgameTsn_Update, - (ActorFunc)EnJgameTsn_Draw, + EnJgameTsn_Init, + EnJgameTsn_Destroy, + EnJgameTsn_Update, + EnJgameTsn_Draw, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index d36bbb6c33..b86c01a2c0 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -33,10 +33,10 @@ ActorInit En_Js_InitVars = { FLAGS, OBJECT_OB, sizeof(EnJs), - (ActorFunc)EnJs_Init, - (ActorFunc)EnJs_Destroy, - (ActorFunc)EnJs_Update, - (ActorFunc)EnJs_Draw, + EnJs_Init, + EnJs_Destroy, + EnJs_Update, + EnJs_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Jso/z_en_jso.c b/src/overlays/actors/ovl_En_Jso/z_en_jso.c index f36629d279..2e273bae6b 100644 --- a/src/overlays/actors/ovl_En_Jso/z_en_jso.c +++ b/src/overlays/actors/ovl_En_Jso/z_en_jso.c @@ -75,10 +75,10 @@ ActorInit En_Jso_InitVars = { FLAGS, OBJECT_JSO, sizeof(EnJso), - (ActorFunc)EnJso_Init, - (ActorFunc)EnJso_Destroy, - (ActorFunc)EnJso_Update, - (ActorFunc)NULL, + EnJso_Init, + EnJso_Destroy, + EnJso_Update, + NULL, }; // static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c index b7ad94d936..521ac17b15 100644 --- a/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c +++ b/src/overlays/actors/ovl_En_Jso2/z_en_jso2.c @@ -77,10 +77,10 @@ ActorInit En_Jso2_InitVars = { FLAGS, OBJECT_JSO, sizeof(EnJso2), - (ActorFunc)EnJso2_Init, - (ActorFunc)EnJso2_Destroy, - (ActorFunc)EnJso2_Update, - (ActorFunc)EnJso2_Draw, + EnJso2_Init, + EnJso2_Destroy, + EnJso2_Update, + EnJso2_Draw, }; // static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c index da327642b4..e035fd23a0 100644 --- a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c +++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c @@ -155,10 +155,10 @@ ActorInit En_Kaizoku_InitVars = { FLAGS, OBJECT_KZ, sizeof(EnKaizoku), - (ActorFunc)EnKaizoku_Init, - (ActorFunc)EnKaizoku_Destroy, - (ActorFunc)EnKaizoku_Update, - (ActorFunc)NULL, + EnKaizoku_Init, + EnKaizoku_Destroy, + EnKaizoku_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index 4cd82df43f..ac938fee4e 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -73,10 +73,10 @@ ActorInit En_Kakasi_InitVars = { FLAGS, OBJECT_KA, sizeof(EnKakasi), - (ActorFunc)EnKakasi_Init, - (ActorFunc)EnKakasi_Destroy, - (ActorFunc)EnKakasi_Update, - (ActorFunc)EnKakasi_Draw, + EnKakasi_Init, + EnKakasi_Destroy, + EnKakasi_Update, + EnKakasi_Draw, }; Vec3f D_80971DCC[] = { diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.c b/src/overlays/actors/ovl_En_Kame/z_en_kame.c index 6e021186ff..9b2b0da407 100644 --- a/src/overlays/actors/ovl_En_Kame/z_en_kame.c +++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.c @@ -47,10 +47,10 @@ ActorInit En_Kame_InitVars = { FLAGS, OBJECT_TL, sizeof(EnKame), - (ActorFunc)EnKame_Init, - (ActorFunc)EnKame_Destroy, - (ActorFunc)EnKame_Update, - (ActorFunc)EnKame_Draw, + EnKame_Init, + EnKame_Destroy, + EnKame_Update, + EnKame_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index 54df1bcd70..d16eb39d45 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -23,10 +23,10 @@ ActorInit En_Kanban_InitVars = { FLAGS, OBJECT_KANBAN, sizeof(EnKanban), - (ActorFunc)EnKanban_Init, - (ActorFunc)EnKanban_Destroy, - (ActorFunc)EnKanban_Update, - (ActorFunc)EnKanban_Draw, + EnKanban_Init, + EnKanban_Destroy, + EnKanban_Update, + EnKanban_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index 46ad2c30b7..6060ded7a2 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -46,10 +46,10 @@ ActorInit En_Karebaba_InitVars = { FLAGS, OBJECT_DEKUBABA, sizeof(EnKarebaba), - (ActorFunc)EnKarebaba_Init, - (ActorFunc)EnKarebaba_Destroy, - (ActorFunc)EnKarebaba_Update, - (ActorFunc)EnKarebaba_Draw, + EnKarebaba_Init, + EnKarebaba_Destroy, + EnKarebaba_Update, + EnKarebaba_Draw, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c index d2847a39d0..1f5a4be029 100644 --- a/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c +++ b/src/overlays/actors/ovl_En_Kbt/z_en_kbt.c @@ -28,10 +28,10 @@ ActorInit En_Kbt_InitVars = { FLAGS, OBJECT_KBT, sizeof(EnKbt), - (ActorFunc)EnKbt_Init, - (ActorFunc)EnKbt_Destroy, - (ActorFunc)EnKbt_Update, - (ActorFunc)EnKbt_Draw, + EnKbt_Init, + EnKbt_Destroy, + EnKbt_Update, + EnKbt_Draw, }; void EnKbt_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c index 7a28cf0fc3..95327591d7 100644 --- a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c +++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c @@ -43,10 +43,10 @@ ActorInit En_Kendo_Js_InitVars = { FLAGS, OBJECT_JS, sizeof(EnKendoJs), - (ActorFunc)EnKendoJs_Init, - (ActorFunc)EnKendoJs_Destroy, - (ActorFunc)EnKendoJs_Update, - (ActorFunc)EnKendoJs_Draw, + EnKendoJs_Init, + EnKendoJs_Destroy, + EnKendoJs_Update, + EnKendoJs_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c index f188e1df08..1f210a55f6 100644 --- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c +++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c @@ -37,10 +37,10 @@ ActorInit En_Kgy_InitVars = { FLAGS, OBJECT_KGY, sizeof(EnKgy), - (ActorFunc)EnKgy_Init, - (ActorFunc)EnKgy_Destroy, - (ActorFunc)EnKgy_Update, - (ActorFunc)EnKgy_Draw, + EnKgy_Init, + EnKgy_Destroy, + EnKgy_Update, + EnKgy_Draw, }; void EnKgy_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c index c9d40c1e73..822471737d 100644 --- a/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c +++ b/src/overlays/actors/ovl_En_Kitan/z_en_kitan.c @@ -21,10 +21,10 @@ ActorInit En_Kitan_InitVars = { FLAGS, OBJECT_KITAN, sizeof(EnKitan), - (ActorFunc)EnKitan_Init, - (ActorFunc)EnKitan_Destroy, - (ActorFunc)EnKitan_Update, - (ActorFunc)NULL, + EnKitan_Init, + EnKitan_Destroy, + EnKitan_Update, + NULL, }; // static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Knight/z_en_knight.c b/src/overlays/actors/ovl_En_Knight/z_en_knight.c index 0d80d60206..25b452c383 100644 --- a/src/overlays/actors/ovl_En_Knight/z_en_knight.c +++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.c @@ -199,10 +199,10 @@ ActorInit En_Knight_InitVars = { FLAGS, OBJECT_KNIGHT, sizeof(EnKnight), - (ActorFunc)EnKnight_Init, - (ActorFunc)EnKnight_Destroy, - (ActorFunc)EnKnight_Update, - (ActorFunc)EnKnight_Draw, + EnKnight_Init, + EnKnight_Destroy, + EnKnight_Update, + EnKnight_Draw, }; #endif diff --git a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c index 511a5dc468..4501ee4b09 100644 --- a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c +++ b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c @@ -40,10 +40,10 @@ ActorInit En_Kujiya_InitVars = { FLAGS, OBJECT_KUJIYA, sizeof(EnKujiya), - (ActorFunc)EnKujiya_Init, - (ActorFunc)EnKujiya_Destroy, - (ActorFunc)EnKujiya_Update, - (ActorFunc)EnKujiya_Draw, + EnKujiya_Init, + EnKujiya_Destroy, + EnKujiya_Update, + EnKujiya_Draw, }; #define CHECK_LOTTERY_NUMBERS \ diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index eaf5ea96af..053b085df6 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -63,10 +63,10 @@ ActorInit En_Kusa_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnKusa), - (ActorFunc)EnKusa_Init, - (ActorFunc)EnKusa_Destroy, - (ActorFunc)EnKusa_Update, - (ActorFunc)NULL, + EnKusa_Init, + EnKusa_Destroy, + EnKusa_Update, + NULL, }; static s16 objectIds[] = { GAMEPLAY_FIELD_KEEP, OBJECT_KUSA, OBJECT_KUSA, OBJECT_KUSA }; diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c index 626ab3f3bf..24d7b3fb60 100644 --- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c +++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c @@ -59,10 +59,10 @@ ActorInit En_Kusa2_InitVars = { FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(EnKusa2), - (ActorFunc)EnKusa2_Init, - (ActorFunc)EnKusa2_Destroy, - (ActorFunc)EnKusa2_Update, - (ActorFunc)EnKusa2_Draw, + EnKusa2_Init, + EnKusa2_Destroy, + EnKusa2_Update, + EnKusa2_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c index f6647cc0b0..978e6792d2 100644 --- a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c +++ b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c @@ -55,10 +55,10 @@ ActorInit En_Lift_Nuts_InitVars = { FLAGS, OBJECT_DNT, sizeof(EnLiftNuts), - (ActorFunc)EnLiftNuts_Init, - (ActorFunc)EnLiftNuts_Destroy, - (ActorFunc)EnLiftNuts_Update, - (ActorFunc)EnLiftNuts_Draw, + EnLiftNuts_Init, + EnLiftNuts_Destroy, + EnLiftNuts_Update, + EnLiftNuts_Draw, }; static AnimationInfo sAnimations[] = { diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c index b988fcce32..5631d2ad95 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -24,10 +24,10 @@ ActorInit En_Light_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnLight), - (ActorFunc)EnLight_Init, - (ActorFunc)EnLight_Destroy, - (ActorFunc)EnLight_Update, - (ActorFunc)EnLight_Draw, + EnLight_Init, + EnLight_Destroy, + EnLight_Update, + EnLight_Draw, }; typedef struct { diff --git a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c index ac376bb166..8f0300f5e9 100644 --- a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c +++ b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c @@ -30,10 +30,10 @@ ActorInit En_Look_Nuts_InitVars = { FLAGS, OBJECT_DNK, sizeof(EnLookNuts), - (ActorFunc)EnLookNuts_Init, - (ActorFunc)EnLookNuts_Destroy, - (ActorFunc)EnLookNuts_Update, - (ActorFunc)EnLookNuts_Draw, + EnLookNuts_Init, + EnLookNuts_Destroy, + EnLookNuts_Update, + EnLookNuts_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c index 14a9c4add9..31e5302c71 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c @@ -20,10 +20,10 @@ ActorInit En_M_Fire1_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnMFire1), - (ActorFunc)EnMFire1_Init, - (ActorFunc)EnMFire1_Destroy, - (ActorFunc)EnMFire1_Update, - (ActorFunc)NULL, + EnMFire1_Init, + EnMFire1_Destroy, + EnMFire1_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index 3d97839a07..3f29259bf8 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -35,10 +35,10 @@ ActorInit En_M_Thunder_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnMThunder), - (ActorFunc)EnMThunder_Init, - (ActorFunc)EnMThunder_Destroy, - (ActorFunc)EnMThunder_Update, - (ActorFunc)EnMThunder_Draw, + EnMThunder_Init, + EnMThunder_Destroy, + EnMThunder_Update, + EnMThunder_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c index efe7546625..28b6db3847 100644 --- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c @@ -60,10 +60,10 @@ ActorInit En_Ma4_InitVars = { FLAGS, OBJECT_MA1, sizeof(EnMa4), - (ActorFunc)EnMa4_Init, - (ActorFunc)EnMa4_Destroy, - (ActorFunc)EnMa4_Update, - (ActorFunc)EnMa4_Draw, + EnMa4_Init, + EnMa4_Destroy, + EnMa4_Update, + EnMa4_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c index c9ba0f34d5..7ea9fdf3fa 100644 --- a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c +++ b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c @@ -75,10 +75,10 @@ ActorInit En_Ma_Yto_InitVars = { FLAGS, OBJECT_MA2, sizeof(EnMaYto), - (ActorFunc)EnMaYto_Init, - (ActorFunc)EnMaYto_Destroy, - (ActorFunc)EnMaYto_Update, - (ActorFunc)EnMaYto_Draw, + EnMaYto_Init, + EnMaYto_Destroy, + EnMaYto_Update, + EnMaYto_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c index 64a6d138cb..7d8ba9eb3f 100644 --- a/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c +++ b/src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c @@ -35,10 +35,10 @@ ActorInit En_Ma_Yts_InitVars = { FLAGS, OBJECT_MA1, sizeof(EnMaYts), - (ActorFunc)EnMaYts_Init, - (ActorFunc)EnMaYts_Destroy, - (ActorFunc)EnMaYts_Update, - (ActorFunc)EnMaYts_Draw, + EnMaYts_Init, + EnMaYts_Destroy, + EnMaYts_Update, + EnMaYts_Draw, }; void EnMaYts_UpdateEyes(EnMaYts* this) { diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index 3a72258cca..adf9197424 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -91,10 +91,10 @@ ActorInit En_Mag_InitVars = { FLAGS, OBJECT_MAG, sizeof(EnMag), - (ActorFunc)EnMag_Init, - (ActorFunc)EnMag_Destroy, - (ActorFunc)EnMag_Update, - (ActorFunc)EnMag_Draw, + EnMag_Init, + EnMag_Destroy, + EnMag_Update, + EnMag_Draw, }; void EnMag_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c index 65e3d8b387..39a5f60080 100644 --- a/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c +++ b/src/overlays/actors/ovl_En_Maruta/z_en_maruta.c @@ -42,10 +42,10 @@ ActorInit En_Maruta_InitVars = { FLAGS, OBJECT_MARUTA, sizeof(EnMaruta), - (ActorFunc)EnMaruta_Init, - (ActorFunc)EnMaruta_Destroy, - (ActorFunc)EnMaruta_Update, - (ActorFunc)EnMaruta_Draw, + EnMaruta_Init, + EnMaruta_Destroy, + EnMaruta_Update, + EnMaruta_Draw, }; Gfx* D_80B386A0[] = { diff --git a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c index d47992114f..3ec0a63cdb 100644 --- a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c +++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c @@ -35,10 +35,10 @@ ActorInit En_Minideath_InitVars = { FLAGS, OBJECT_DEATH, sizeof(EnMinideath), - (ActorFunc)EnMinideath_Init, - (ActorFunc)EnMinideath_Destroy, - (ActorFunc)EnMinideath_Update, - (ActorFunc)NULL, + EnMinideath_Init, + EnMinideath_Destroy, + EnMinideath_Update, + NULL, }; // static ColliderJntSphElementInit sJntSphElementsInit[3] = { diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c index f459a6a416..e880a4b872 100644 --- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c @@ -32,10 +32,10 @@ ActorInit En_Minifrog_InitVars = { FLAGS, OBJECT_FR, sizeof(EnMinifrog), - (ActorFunc)EnMinifrog_Init, - (ActorFunc)EnMinifrog_Destroy, - (ActorFunc)EnMinifrog_Update, - (ActorFunc)EnMinifrog_Draw, + EnMinifrog_Init, + EnMinifrog_Destroy, + EnMinifrog_Update, + EnMinifrog_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c index 1ab5f2cc64..376140cf79 100644 --- a/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c +++ b/src/overlays/actors/ovl_En_Minislime/z_en_minislime.c @@ -47,10 +47,10 @@ ActorInit En_Minislime_InitVars = { FLAGS, OBJECT_BIGSLIME, sizeof(EnMinislime), - (ActorFunc)EnMinislime_Init, - (ActorFunc)EnMinislime_Destroy, - (ActorFunc)EnMinislime_Update, - (ActorFunc)NULL, + EnMinislime_Init, + EnMinislime_Destroy, + EnMinislime_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index 894d73a6fe..ace47381bf 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -29,10 +29,10 @@ ActorInit En_Mk_InitVars = { FLAGS, OBJECT_MK, sizeof(EnMk), - (ActorFunc)EnMk_Init, - (ActorFunc)EnMk_Destroy, - (ActorFunc)EnMk_Update, - (ActorFunc)EnMk_Draw, + EnMk_Init, + EnMk_Destroy, + EnMk_Update, + EnMk_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c index cbbaffca9d..a4a6f6a5dc 100644 --- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c +++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c @@ -41,10 +41,10 @@ ActorInit En_Mkk_InitVars = { FLAGS, OBJECT_MKK, sizeof(EnMkk), - (ActorFunc)EnMkk_Init, - (ActorFunc)EnMkk_Destroy, - (ActorFunc)EnMkk_Update, - (ActorFunc)EnMkk_Draw, + EnMkk_Init, + EnMkk_Destroy, + EnMkk_Update, + EnMkk_Draw, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c index d9b0bf5076..f180cb2662 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -27,10 +27,10 @@ ActorInit En_Mm_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnMm), - (ActorFunc)EnMm_Init, - (ActorFunc)EnMm_Destroy, - (ActorFunc)EnMm_Update, - (ActorFunc)EnMm_Draw, + EnMm_Init, + EnMm_Destroy, + EnMm_Update, + EnMm_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index 14c8d11702..1304c2b1d3 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -24,10 +24,10 @@ ActorInit En_Mm2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnMm2), - (ActorFunc)EnMm2_Init, - (ActorFunc)EnMm2_Destroy, - (ActorFunc)EnMm2_Update, - (ActorFunc)EnMm2_Draw, + EnMm2_Init, + EnMm2_Destroy, + EnMm2_Update, + EnMm2_Draw, }; #include "overlays/ovl_En_Mm2/ovl_En_Mm2.c" diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c index 3e58691cc7..5f398e1669 100644 --- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c @@ -35,10 +35,10 @@ ActorInit En_Mm3_InitVars = { FLAGS, OBJECT_MM, sizeof(EnMm3), - (ActorFunc)EnMm3_Init, - (ActorFunc)EnMm3_Destroy, - (ActorFunc)EnMm3_Update, - (ActorFunc)EnMm3_Draw, + EnMm3_Init, + EnMm3_Destroy, + EnMm3_Update, + EnMm3_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c index ef064969eb..62f08cbf23 100644 --- a/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c +++ b/src/overlays/actors/ovl_En_Mnk/z_en_mnk.c @@ -22,10 +22,10 @@ ActorInit En_Mnk_InitVars = { FLAGS, OBJECT_MNK, sizeof(EnMnk), - (ActorFunc)EnMnk_Init, - (ActorFunc)EnMnk_Destroy, - (ActorFunc)EnMnk_Update, - (ActorFunc)EnMnk_Draw, + EnMnk_Init, + EnMnk_Destroy, + EnMnk_Update, + EnMnk_Draw, }; // static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 6aac1355db..4277de78a3 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -27,10 +27,10 @@ ActorInit En_Ms_InitVars = { FLAGS, OBJECT_MS, sizeof(EnMs), - (ActorFunc)EnMs_Init, - (ActorFunc)EnMs_Destroy, - (ActorFunc)EnMs_Update, - (ActorFunc)EnMs_Draw, + EnMs_Init, + EnMs_Destroy, + EnMs_Update, + EnMs_Draw, }; static ColliderCylinderInitType1 sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c index 8d6b75fbdd..6158545ceb 100644 --- a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c +++ b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c @@ -34,10 +34,10 @@ ActorInit En_Mt_tag_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnMttag), - (ActorFunc)EnMttag_Init, - (ActorFunc)EnMttag_Destroy, - (ActorFunc)EnMttag_Update, - (ActorFunc)NULL, + EnMttag_Init, + EnMttag_Destroy, + EnMttag_Update, + NULL, }; static s32 sStartingCheckpointPerSceneExitIndex[] = { diff --git a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c index c10244e552..3ed19dbf3d 100644 --- a/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c +++ b/src/overlays/actors/ovl_En_Mushi2/z_en_mushi2.c @@ -38,10 +38,10 @@ ActorInit En_Mushi2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnMushi2), - (ActorFunc)EnMushi2_Init, - (ActorFunc)EnMushi2_Destroy, - (ActorFunc)EnMushi2_Update, - (ActorFunc)EnMushi2_Draw, + EnMushi2_Init, + EnMushi2_Destroy, + EnMushi2_Update, + EnMushi2_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Muto/z_en_muto.c b/src/overlays/actors/ovl_En_Muto/z_en_muto.c index f9d17ca963..e1b504e042 100644 --- a/src/overlays/actors/ovl_En_Muto/z_en_muto.c +++ b/src/overlays/actors/ovl_En_Muto/z_en_muto.c @@ -30,10 +30,10 @@ ActorInit En_Muto_InitVars = { FLAGS, OBJECT_TORYO, sizeof(EnMuto), - (ActorFunc)EnMuto_Init, - (ActorFunc)EnMuto_Destroy, - (ActorFunc)EnMuto_Update, - (ActorFunc)EnMuto_Draw, + EnMuto_Init, + EnMuto_Destroy, + EnMuto_Update, + EnMuto_Draw, }; static u16 sTextIds[] = { 0x2ABD, 0x2ABB, 0x0624, 0x0623, 0x2AC6 }; diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index 572364bbdf..b59326a284 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -116,10 +116,10 @@ ActorInit En_Nb_InitVars = { FLAGS, OBJECT_NB, sizeof(EnNb), - (ActorFunc)EnNb_Init, - (ActorFunc)EnNb_Destroy, - (ActorFunc)EnNb_Update, - (ActorFunc)EnNb_Draw, + EnNb_Init, + EnNb_Destroy, + EnNb_Update, + EnNb_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c index 86099a2141..7800c78a61 100644 --- a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c +++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c @@ -42,10 +42,10 @@ ActorInit En_Neo_Reeba_InitVars = { FLAGS, OBJECT_RB, sizeof(EnNeoReeba), - (ActorFunc)EnNeoReeba_Init, - (ActorFunc)EnNeoReeba_Destroy, - (ActorFunc)EnNeoReeba_Update, - (ActorFunc)EnNeoReeba_Draw, + EnNeoReeba_Init, + EnNeoReeba_Destroy, + EnNeoReeba_Update, + EnNeoReeba_Draw, }; typedef enum { diff --git a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c index abaf6c3e07..ea2fb06b7b 100644 --- a/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c +++ b/src/overlays/actors/ovl_En_Nimotsu/z_en_nimotsu.c @@ -24,10 +24,10 @@ ActorInit En_Nimotsu_InitVars = { FLAGS, OBJECT_BOJ, sizeof(EnNimotsu), - (ActorFunc)EnNimotsu_Init, - (ActorFunc)EnNimotsu_Destroy, - (ActorFunc)EnNimotsu_Update, - (ActorFunc)EnNimotsu_Draw, + EnNimotsu_Init, + EnNimotsu_Destroy, + EnNimotsu_Update, + EnNimotsu_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 1c9212a63a..7b09d7cacf 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -54,10 +54,10 @@ ActorInit En_Niw_InitVars = { FLAGS, OBJECT_NIW, sizeof(EnNiw), - (ActorFunc)EnNiw_Init, - (ActorFunc)EnNiw_Destroy, - (ActorFunc)EnNiw_Update, - (ActorFunc)EnNiw_Draw, + EnNiw_Init, + EnNiw_Destroy, + EnNiw_Update, + EnNiw_Draw, }; static f32 sHeadRotations[] = { 5000.0f, -5000.0f }; diff --git a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c index 0187e1c88b..6c8cda2375 100644 --- a/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c +++ b/src/overlays/actors/ovl_En_Nnh/z_en_nnh.c @@ -27,10 +27,10 @@ ActorInit En_Nnh_InitVars = { FLAGS, OBJECT_NNH, sizeof(EnNnh), - (ActorFunc)EnNnh_Init, - (ActorFunc)EnNnh_Destroy, - (ActorFunc)EnNnh_Update, - (ActorFunc)EnNnh_Draw, + EnNnh_Init, + EnNnh_Destroy, + EnNnh_Update, + EnNnh_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index ad872cd210..107bd3a630 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -25,10 +25,10 @@ ActorInit En_Nutsball_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnNutsball), - (ActorFunc)EnNutsball_Init, - (ActorFunc)EnNutsball_Destroy, - (ActorFunc)EnNutsball_Update, - (ActorFunc)EnNutsball_Draw, + EnNutsball_Init, + EnNutsball_Destroy, + EnNutsball_Update, + EnNutsball_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index 74ac78b5f4..42d8b90067 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -47,10 +47,10 @@ ActorInit En_Nwc_InitVars = { FLAGS, OBJECT_NWC, sizeof(EnNwc), - (ActorFunc)EnNwc_Init, - (ActorFunc)EnNwc_Destroy, - (ActorFunc)EnNwc_Update, - (ActorFunc)EnNwc_Draw, + EnNwc_Init, + EnNwc_Destroy, + EnNwc_Update, + EnNwc_Draw, }; Color_RGBA8 sPrimColor = { 255, 255, 255, 255 }; diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c index df778f1a74..16098e3cc3 100644 --- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c @@ -25,10 +25,10 @@ ActorInit En_Okarina_Effect_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnOkarinaEffect), - (ActorFunc)EnOkarinaEffect_Init, - (ActorFunc)EnOkarinaEffect_Destroy, - (ActorFunc)EnOkarinaEffect_Update, - (ActorFunc)NULL, + EnOkarinaEffect_Init, + EnOkarinaEffect_Destroy, + EnOkarinaEffect_Update, + NULL, }; void EnOkarinaEffect_SetupAction(EnOkarinaEffect* this, EnOkarinaEffectActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index d4d3db017c..ae6066556b 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -23,10 +23,10 @@ ActorInit En_Okarina_Tag_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnOkarinaTag), - (ActorFunc)EnOkarinaTag_Init, - (ActorFunc)EnOkarinaTag_Destroy, - (ActorFunc)EnOkarinaTag_Update, - (ActorFunc)NULL, + EnOkarinaTag_Init, + EnOkarinaTag_Destroy, + EnOkarinaTag_Update, + NULL, }; void EnOkarinaTag_Destroy(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index 8241c7e5c7..9907f67d51 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -34,10 +34,10 @@ ActorInit En_Okuta_InitVars = { FLAGS, OBJECT_OKUTA, sizeof(EnOkuta), - (ActorFunc)EnOkuta_Init, - (ActorFunc)EnOkuta_Destroy, - (ActorFunc)EnOkuta_Update, - (ActorFunc)EnOkuta_Draw, + EnOkuta_Init, + EnOkuta_Destroy, + EnOkuta_Update, + EnOkuta_Draw, }; // static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c index df18de3e73..c659186279 100644 --- a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c +++ b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c @@ -22,10 +22,10 @@ ActorInit En_Onpuman_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnOnpuman), - (ActorFunc)EnOnpuman_Init, - (ActorFunc)EnOnpuman_Destroy, - (ActorFunc)EnOnpuman_Update, - (ActorFunc)NULL, + EnOnpuman_Init, + EnOnpuman_Destroy, + EnOnpuman_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Osk/z_en_osk.c b/src/overlays/actors/ovl_En_Osk/z_en_osk.c index ac3c5ef6b2..f950491065 100644 --- a/src/overlays/actors/ovl_En_Osk/z_en_osk.c +++ b/src/overlays/actors/ovl_En_Osk/z_en_osk.c @@ -28,10 +28,10 @@ ActorInit En_Osk_InitVars = { FLAGS, OBJECT_IKN_DEMO, sizeof(EnOsk), - (ActorFunc)EnOsk_Init, - (ActorFunc)EnOsk_Destroy, - (ActorFunc)EnOsk_Update, - (ActorFunc)EnOsk_Draw, + EnOsk_Init, + EnOsk_Destroy, + EnOsk_Update, + EnOsk_Draw, }; AnimationHeader* D_80BF6FA0[] = { diff --git a/src/overlays/actors/ovl_En_Osn/z_en_osn.c b/src/overlays/actors/ovl_En_Osn/z_en_osn.c index 7df9d843d5..6775716725 100644 --- a/src/overlays/actors/ovl_En_Osn/z_en_osn.c +++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.c @@ -84,10 +84,10 @@ ActorInit En_Osn_InitVars = { FLAGS, OBJECT_OSN, sizeof(EnOsn), - (ActorFunc)EnOsn_Init, - (ActorFunc)EnOsn_Destroy, - (ActorFunc)EnOsn_Update, - (ActorFunc)EnOsn_Draw, + EnOsn_Init, + EnOsn_Destroy, + EnOsn_Update, + EnOsn_Draw, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 789c96cf07..2a0c9cde67 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -98,10 +98,10 @@ ActorInit En_Ossan_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnOssan), - (ActorFunc)EnOssan_Init, - (ActorFunc)EnOssan_Destroy, - (ActorFunc)EnOssan_Update, - (ActorFunc)NULL, + EnOssan_Init, + EnOssan_Destroy, + EnOssan_Update, + NULL, }; static AnimationInfoS sCuriosityShopManAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.c b/src/overlays/actors/ovl_En_Ot/z_en_ot.c index 928d4e5783..781a857211 100644 --- a/src/overlays/actors/ovl_En_Ot/z_en_ot.c +++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.c @@ -69,10 +69,10 @@ ActorInit En_Ot_InitVars = { FLAGS, OBJECT_OT, sizeof(EnOt), - (ActorFunc)EnOt_Init, - (ActorFunc)EnOt_Destroy, - (ActorFunc)EnOt_Update, - (ActorFunc)EnOt_Draw, + EnOt_Init, + EnOt_Destroy, + EnOt_Update, + EnOt_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index 8d7b92b69e..5365d16e05 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -54,10 +54,10 @@ ActorInit En_Owl_InitVars = { FLAGS, OBJECT_OWL, sizeof(EnOwl), - (ActorFunc)EnOwl_Init, - (ActorFunc)EnOwl_Destroy, - (ActorFunc)EnOwl_Update, - (ActorFunc)EnOwl_Draw, + EnOwl_Init, + EnOwl_Destroy, + EnOwl_Update, + EnOwl_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c index 2b0aae48a0..318944eaf0 100644 --- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c +++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c @@ -75,10 +75,10 @@ ActorInit En_Pamera_InitVars = { FLAGS, OBJECT_PAMERA, sizeof(EnPamera), - (ActorFunc)EnPamera_Init, - (ActorFunc)EnPamera_Destroy, - (ActorFunc)EnPamera_Update, - (ActorFunc)EnPamera_Draw, + EnPamera_Init, + EnPamera_Destroy, + EnPamera_Update, + EnPamera_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c index 82b4246577..a1c4704afa 100644 --- a/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c +++ b/src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c @@ -73,10 +73,10 @@ ActorInit En_Pametfrog_InitVars = { FLAGS, OBJECT_BIGSLIME, sizeof(EnPametfrog), - (ActorFunc)EnPametfrog_Init, - (ActorFunc)EnPametfrog_Destroy, - (ActorFunc)EnPametfrog_Update, - (ActorFunc)EnPametfrog_Draw, + EnPametfrog_Init, + EnPametfrog_Destroy, + EnPametfrog_Update, + EnPametfrog_Draw, }; typedef enum { diff --git a/src/overlays/actors/ovl_En_Paper/z_en_paper.c b/src/overlays/actors/ovl_En_Paper/z_en_paper.c index 47d97e1c2f..8d23ba0138 100644 --- a/src/overlays/actors/ovl_En_Paper/z_en_paper.c +++ b/src/overlays/actors/ovl_En_Paper/z_en_paper.c @@ -29,10 +29,10 @@ ActorInit En_Paper_InitVars = { FLAGS, OBJECT_BAL, sizeof(EnPaper), - (ActorFunc)EnPaper_Init, - (ActorFunc)EnPaper_Destroy, - (ActorFunc)EnPaper_Update, - (ActorFunc)EnPaper_Draw, + EnPaper_Init, + EnPaper_Destroy, + EnPaper_Update, + EnPaper_Draw, }; Vec3f D_80C1FC60 = { 0.0f, 0.0f, 1.0f }; diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c index 527a91b3dd..6c9890d68b 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -25,10 +25,10 @@ ActorInit En_Part_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnPart), - (ActorFunc)EnPart_Init, - (ActorFunc)EnPart_Destroy, - (ActorFunc)EnPart_Update, - (ActorFunc)EnPart_Draw, + EnPart_Init, + EnPart_Destroy, + EnPart_Update, + EnPart_Draw, }; void EnPart_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index 3e2fdcface..6944cb2a6a 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -44,10 +44,10 @@ ActorInit En_Peehat_InitVars = { FLAGS, OBJECT_PH, sizeof(EnPeehat), - (ActorFunc)EnPeehat_Init, - (ActorFunc)EnPeehat_Destroy, - (ActorFunc)EnPeehat_Update, - (ActorFunc)EnPeehat_Draw, + EnPeehat_Init, + EnPeehat_Destroy, + EnPeehat_Update, + EnPeehat_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.c b/src/overlays/actors/ovl_En_Pm/z_en_pm.c index 24fcc34f9f..02d6f7d692 100644 --- a/src/overlays/actors/ovl_En_Pm/z_en_pm.c +++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.c @@ -478,10 +478,10 @@ ActorInit En_Pm_InitVars = { FLAGS, OBJECT_MM, sizeof(EnPm), - (ActorFunc)EnPm_Init, - (ActorFunc)EnPm_Destroy, - (ActorFunc)EnPm_Update, - (ActorFunc)EnPm_Draw, + EnPm_Init, + EnPm_Destroy, + EnPm_Update, + EnPm_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c index 6d14ca25a1..43158df9ce 100644 --- a/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c +++ b/src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c @@ -34,10 +34,10 @@ ActorInit En_Po_Composer_InitVars = { FLAGS, OBJECT_PO_COMPOSER, sizeof(EnPoComposer), - (ActorFunc)EnPoComposer_Init, - (ActorFunc)EnPoComposer_Destroy, - (ActorFunc)EnPoComposer_Update, - (ActorFunc)EnPoComposer_Draw, + EnPoComposer_Init, + EnPoComposer_Destroy, + EnPoComposer_Update, + EnPoComposer_Draw, }; // static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c index a9fcf95e3f..bdf0e8c60c 100644 --- a/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c +++ b/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.c @@ -31,10 +31,10 @@ ActorInit En_Po_Fusen_InitVars = { FLAGS, OBJECT_PO_FUSEN, sizeof(EnPoFusen), - (ActorFunc)EnPoFusen_Init, - (ActorFunc)EnPoFusen_Destroy, - (ActorFunc)EnPoFusen_Update, - (ActorFunc)EnPoFusen_Draw, + EnPoFusen_Init, + EnPoFusen_Destroy, + EnPoFusen_Update, + EnPoFusen_Draw, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index a89a55d9e9..3db1730741 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -67,10 +67,10 @@ ActorInit En_Po_Sisters_InitVars = { FLAGS, OBJECT_PO_SISTERS, sizeof(EnPoSisters), - (ActorFunc)EnPoSisters_Init, - (ActorFunc)EnPoSisters_Destroy, - (ActorFunc)EnPoSisters_Update, - (ActorFunc)EnPoSisters_Draw, + EnPoSisters_Init, + EnPoSisters_Destroy, + EnPoSisters_Update, + EnPoSisters_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index f1b0f74d46..c2d976050d 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -52,10 +52,10 @@ ActorInit En_Poh_InitVars = { FLAGS, OBJECT_PO, sizeof(EnPoh), - (ActorFunc)EnPoh_Init, - (ActorFunc)EnPoh_Destroy, - (ActorFunc)EnPoh_Update, - (ActorFunc)EnPoh_Draw, + EnPoh_Init, + EnPoh_Destroy, + EnPoh_Update, + EnPoh_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.c b/src/overlays/actors/ovl_En_Pp/z_en_pp.c index fad487e621..b01c1c43f4 100644 --- a/src/overlays/actors/ovl_En_Pp/z_en_pp.c +++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.c @@ -121,10 +121,10 @@ ActorInit En_Pp_InitVars = { FLAGS, OBJECT_PP, sizeof(EnPp), - (ActorFunc)EnPp_Init, - (ActorFunc)EnPp_Destroy, - (ActorFunc)EnPp_Update, - (ActorFunc)EnPp_Draw, + EnPp_Init, + EnPp_Destroy, + EnPp_Update, + EnPp_Draw, }; static ColliderJntSphElementInit sMaskColliderJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Pr/z_en_pr.c b/src/overlays/actors/ovl_En_Pr/z_en_pr.c index 5068c96ee8..33d9d256b1 100644 --- a/src/overlays/actors/ovl_En_Pr/z_en_pr.c +++ b/src/overlays/actors/ovl_En_Pr/z_en_pr.c @@ -74,10 +74,10 @@ ActorInit En_Pr_InitVars = { FLAGS, OBJECT_PR, sizeof(EnPr), - (ActorFunc)EnPr_Init, - (ActorFunc)EnPr_Destroy, - (ActorFunc)EnPr_Update, - (ActorFunc)EnPr_Draw, + EnPr_Init, + EnPr_Destroy, + EnPr_Update, + EnPr_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c index 0cc6dc1340..43d80d48e3 100644 --- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c +++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c @@ -87,10 +87,10 @@ ActorInit En_Pr2_InitVars = { FLAGS, OBJECT_PR, sizeof(EnPr2), - (ActorFunc)EnPr2_Init, - (ActorFunc)EnPr2_Destroy, - (ActorFunc)EnPr2_Update, - (ActorFunc)EnPr2_Draw, + EnPr2_Init, + EnPr2_Destroy, + EnPr2_Update, + EnPr2_Draw, }; static AnimationHeader* sAnimations[] = { diff --git a/src/overlays/actors/ovl_En_Prz/z_en_prz.c b/src/overlays/actors/ovl_En_Prz/z_en_prz.c index dad8fc1263..ebd5cf4290 100644 --- a/src/overlays/actors/ovl_En_Prz/z_en_prz.c +++ b/src/overlays/actors/ovl_En_Prz/z_en_prz.c @@ -88,10 +88,10 @@ ActorInit En_Prz_InitVars = { FLAGS, OBJECT_PR, sizeof(EnPrz), - (ActorFunc)EnPrz_Init, - (ActorFunc)EnPrz_Destroy, - (ActorFunc)EnPrz_Update, - (ActorFunc)EnPrz_Draw, + EnPrz_Init, + EnPrz_Destroy, + EnPrz_Update, + EnPrz_Draw, }; AnimationHeader* D_80A77240[] = { &object_pr_Anim_004340, &object_pr_Anim_004274 }; diff --git a/src/overlays/actors/ovl_En_Pst/z_en_pst.c b/src/overlays/actors/ovl_En_Pst/z_en_pst.c index c498527462..444a6ef01f 100644 --- a/src/overlays/actors/ovl_En_Pst/z_en_pst.c +++ b/src/overlays/actors/ovl_En_Pst/z_en_pst.c @@ -124,10 +124,10 @@ ActorInit En_Pst_InitVars = { FLAGS, OBJECT_PST, sizeof(EnPst), - (ActorFunc)EnPst_Init, - (ActorFunc)EnPst_Destroy, - (ActorFunc)EnPst_Update, - (ActorFunc)EnPst_Draw, + EnPst_Init, + EnPst_Destroy, + EnPst_Update, + EnPst_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c index 0caa2f8caf..b63637b800 100644 --- a/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c +++ b/src/overlays/actors/ovl_En_Racedog/z_en_racedog.c @@ -77,10 +77,10 @@ ActorInit En_Racedog_InitVars = { FLAGS, OBJECT_DOG, sizeof(EnRacedog), - (ActorFunc)EnRacedog_Init, - (ActorFunc)EnRacedog_Destroy, - (ActorFunc)EnRacedog_Update, - (ActorFunc)EnRacedog_Draw, + EnRacedog_Init, + EnRacedog_Destroy, + EnRacedog_Update, + EnRacedog_Draw, }; static s16 sNumberOfDogsFinished = 0; diff --git a/src/overlays/actors/ovl_En_Raf/z_en_raf.c b/src/overlays/actors/ovl_En_Raf/z_en_raf.c index 8421b20ac5..d70b80d598 100644 --- a/src/overlays/actors/ovl_En_Raf/z_en_raf.c +++ b/src/overlays/actors/ovl_En_Raf/z_en_raf.c @@ -73,10 +73,10 @@ ActorInit En_Raf_InitVars = { FLAGS, OBJECT_RAF, sizeof(EnRaf), - (ActorFunc)EnRaf_Init, - (ActorFunc)EnRaf_Destroy, - (ActorFunc)EnRaf_Update, - (ActorFunc)EnRaf_Draw, + EnRaf_Init, + EnRaf_Destroy, + EnRaf_Update, + EnRaf_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c index 073f2045af..b23ab4b87a 100644 --- a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c +++ b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c @@ -56,10 +56,10 @@ ActorInit En_Rail_Skb_InitVars = { FLAGS, OBJECT_SKB, sizeof(EnRailSkb), - (ActorFunc)EnRailSkb_Init, - (ActorFunc)EnRailSkb_Destroy, - (ActorFunc)EnRailSkb_Update, - (ActorFunc)EnRailSkb_Draw, + EnRailSkb_Init, + EnRailSkb_Destroy, + EnRailSkb_Update, + EnRailSkb_Draw, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c index 50a203c81a..acd8610f80 100644 --- a/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c +++ b/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c @@ -90,10 +90,10 @@ ActorInit En_Railgibud_InitVars = { FLAGS, OBJECT_RD, sizeof(EnRailgibud), - (ActorFunc)EnRailgibud_Init, - (ActorFunc)EnRailgibud_Destroy, - (ActorFunc)EnRailgibud_Update, - (ActorFunc)EnRailgibud_Draw, + EnRailgibud_Init, + EnRailgibud_Destroy, + EnRailgibud_Update, + EnRailgibud_Draw, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.c b/src/overlays/actors/ovl_En_Rat/z_en_rat.c index da0b27e6d1..bff06d4db6 100644 --- a/src/overlays/actors/ovl_En_Rat/z_en_rat.c +++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.c @@ -41,10 +41,10 @@ ActorInit En_Rat_InitVars = { FLAGS, OBJECT_RAT, sizeof(EnRat), - (ActorFunc)EnRat_Init, - (ActorFunc)EnRat_Destroy, - (ActorFunc)EnRat_Update, - (ActorFunc)EnRat_Draw, + EnRat_Init, + EnRat_Destroy, + EnRat_Update, + EnRat_Draw, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 3e46c9f04a..ce508c0d07 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -103,10 +103,10 @@ ActorInit En_Rd_InitVars = { FLAGS, OBJECT_RD, sizeof(EnRd), - (ActorFunc)EnRd_Init, - (ActorFunc)EnRd_Destroy, - (ActorFunc)EnRd_Update, - (ActorFunc)EnRd_Draw, + EnRd_Init, + EnRd_Destroy, + EnRd_Update, + EnRd_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c index 051cc8b334..2aff8a6346 100644 --- a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c +++ b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c @@ -27,10 +27,10 @@ ActorInit En_Recepgirl_InitVars = { FLAGS, OBJECT_BG, sizeof(EnRecepgirl), - (ActorFunc)EnRecepgirl_Init, - (ActorFunc)EnRecepgirl_Destroy, - (ActorFunc)EnRecepgirl_Update, - (ActorFunc)EnRecepgirl_Draw, + EnRecepgirl_Init, + EnRecepgirl_Destroy, + EnRecepgirl_Update, + EnRecepgirl_Draw, }; static TexturePtr sEyeTextures[] = { object_bg_Tex_00F8F0, object_bg_Tex_00FCF0, object_bg_Tex_0100F0, diff --git a/src/overlays/actors/ovl_En_Rg/z_en_rg.c b/src/overlays/actors/ovl_En_Rg/z_en_rg.c index 7f6d39886c..49d13b0efc 100644 --- a/src/overlays/actors/ovl_En_Rg/z_en_rg.c +++ b/src/overlays/actors/ovl_En_Rg/z_en_rg.c @@ -28,10 +28,10 @@ ActorInit En_Rg_InitVars = { FLAGS, OBJECT_OF1D_MAP, sizeof(EnRg), - (ActorFunc)EnRg_Init, - (ActorFunc)EnRg_Destroy, - (ActorFunc)EnRg_Update, - (ActorFunc)EnRg_Draw, + EnRg_Init, + EnRg_Destroy, + EnRg_Update, + EnRg_Draw, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c index 0fd1007d0d..c52fda9892 100644 --- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c @@ -20,10 +20,10 @@ ActorInit En_River_Sound_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnRiverSound), - (ActorFunc)EnRiverSound_Init, - (ActorFunc)Actor_Noop, - (ActorFunc)EnRiverSound_Update, - (ActorFunc)EnRiverSound_Draw, + EnRiverSound_Init, + Actor_Noop, + EnRiverSound_Update, + EnRiverSound_Draw, }; void EnRiverSound_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index 6c7ac273c0..78c0c7adbb 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -34,10 +34,10 @@ ActorInit En_Rr_InitVars = { FLAGS, OBJECT_RR, sizeof(EnRr), - (ActorFunc)EnRr_Init, - (ActorFunc)EnRr_Destroy, - (ActorFunc)EnRr_Update, - (ActorFunc)EnRr_Draw, + EnRr_Init, + EnRr_Destroy, + EnRr_Update, + EnRr_Draw, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c index 4f6dd1dc14..9bb2e0794e 100644 --- a/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c +++ b/src/overlays/actors/ovl_En_Rsn/z_en_rsn.c @@ -24,10 +24,10 @@ ActorInit En_Rsn_InitVars = { FLAGS, OBJECT_RS, sizeof(EnRsn), - (ActorFunc)EnRsn_Init, - (ActorFunc)EnRsn_Destroy, - (ActorFunc)EnRsn_Update, - (ActorFunc)EnRsn_Draw, + EnRsn_Init, + EnRsn_Destroy, + EnRsn_Update, + EnRsn_Draw, }; static AnimationInfo sAnimationInfo[] = { { &gBombShopkeeperSwayAnim, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, 0.0f } }; diff --git a/src/overlays/actors/ovl_En_Ru/z_en_ru.c b/src/overlays/actors/ovl_En_Ru/z_en_ru.c index 042f2e46f8..ccd473e59d 100644 --- a/src/overlays/actors/ovl_En_Ru/z_en_ru.c +++ b/src/overlays/actors/ovl_En_Ru/z_en_ru.c @@ -23,10 +23,10 @@ ActorInit En_Ru_InitVars = { FLAGS, OBJECT_RU2, sizeof(EnRu), - (ActorFunc)EnRu_Init, - (ActorFunc)EnRu_Destroy, - (ActorFunc)EnRu_Update, - (ActorFunc)EnRu_Draw, + EnRu_Init, + EnRu_Destroy, + EnRu_Update, + EnRu_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c index f77993e5d6..50f4486653 100644 --- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c +++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c @@ -46,10 +46,10 @@ ActorInit En_Ruppecrow_InitVars = { FLAGS, OBJECT_CROW, sizeof(EnRuppecrow), - (ActorFunc)EnRuppecrow_Init, - (ActorFunc)EnRuppecrow_Destroy, - (ActorFunc)EnRuppecrow_Update, - (ActorFunc)EnRuppecrow_Draw, + EnRuppecrow_Init, + EnRuppecrow_Destroy, + EnRuppecrow_Update, + EnRuppecrow_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Rz/z_en_rz.c b/src/overlays/actors/ovl_En_Rz/z_en_rz.c index 108d880234..b2a460a847 100644 --- a/src/overlays/actors/ovl_En_Rz/z_en_rz.c +++ b/src/overlays/actors/ovl_En_Rz/z_en_rz.c @@ -55,10 +55,10 @@ ActorInit En_Rz_InitVars = { FLAGS, OBJECT_RZ, sizeof(EnRz), - (ActorFunc)EnRz_Init, - (ActorFunc)EnRz_Destroy, - (ActorFunc)EnRz_Update, - (ActorFunc)EnRz_Draw, + EnRz_Init, + EnRz_Destroy, + EnRz_Update, + EnRz_Draw, }; static TexturePtr sEyeTextures[] = { diff --git a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c index cc3cd2455d..df7386e109 100644 --- a/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c +++ b/src/overlays/actors/ovl_En_S_Goro/z_en_s_goro.c @@ -100,10 +100,10 @@ ActorInit En_S_Goro_InitVars = { FLAGS, OBJECT_OF1D_MAP, sizeof(EnSGoro), - (ActorFunc)EnSGoro_Init, - (ActorFunc)EnSGoro_Destroy, - (ActorFunc)EnSGoro_Update, - (ActorFunc)EnSGoro_Draw, + EnSGoro_Init, + EnSGoro_Destroy, + EnSGoro_Update, + EnSGoro_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index 868b489230..f81f2155d5 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -31,10 +31,10 @@ ActorInit En_Sb_InitVars = { FLAGS, OBJECT_SB, sizeof(EnSb), - (ActorFunc)EnSb_Init, - (ActorFunc)EnSb_Destroy, - (ActorFunc)EnSb_Update, - (ActorFunc)EnSb_Draw, + EnSb_Init, + EnSb_Destroy, + EnSb_Update, + EnSb_Draw, }; static ColliderCylinderInitType1 sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c index fa017af877..8a0a12209e 100644 --- a/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c +++ b/src/overlays/actors/ovl_En_Sc_Ruppe/z_en_sc_ruppe.c @@ -29,10 +29,10 @@ ActorInit En_Sc_Ruppe_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnScRuppe), - (ActorFunc)EnScRuppe_Init, - (ActorFunc)EnScRuppe_Destroy, - (ActorFunc)EnScRuppe_Update, - (ActorFunc)EnScRuppe_Draw, + EnScRuppe_Init, + EnScRuppe_Destroy, + EnScRuppe_Update, + EnScRuppe_Draw, }; RuppeInfo sRupeeInfo[] = { diff --git a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c index d2a9d525ed..29469d6409 100644 --- a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c +++ b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c @@ -22,10 +22,10 @@ ActorInit En_Scopecoin_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnScopecoin), - (ActorFunc)EnScopecoin_Init, - (ActorFunc)EnScopecoin_Destroy, - (ActorFunc)EnScopecoin_Update, - (ActorFunc)EnScopecoin_Draw, + EnScopecoin_Init, + EnScopecoin_Destroy, + EnScopecoin_Update, + EnScopecoin_Draw, }; void EnScopecoin_Spin(EnScopecoin* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c index b37190ee1f..7523c06222 100644 --- a/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c +++ b/src/overlays/actors/ovl_En_Scopecrow/z_en_scopecrow.c @@ -24,10 +24,10 @@ ActorInit En_Scopecrow_InitVars = { FLAGS, OBJECT_CROW, sizeof(EnScopecrow), - (ActorFunc)EnScopecrow_Init, - (ActorFunc)EnScopecrow_Destroy, - (ActorFunc)EnScopecrow_Update, - (ActorFunc)EnScopecrow_Draw, + EnScopecrow_Init, + EnScopecrow_Destroy, + EnScopecrow_Update, + EnScopecrow_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[] = { diff --git a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c index 4f82070461..9546acee11 100644 --- a/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c +++ b/src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c @@ -39,10 +39,10 @@ ActorInit En_Scopenuts_InitVars = { FLAGS, OBJECT_DNT, sizeof(EnScopenuts), - (ActorFunc)EnScopenuts_Init, - (ActorFunc)EnScopenuts_Destroy, - (ActorFunc)EnScopenuts_Update, - (ActorFunc)EnScopenuts_Draw, + EnScopenuts_Init, + EnScopenuts_Destroy, + EnScopenuts_Update, + EnScopenuts_Draw, }; static ColliderCylinderInitType1 sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c index 8835d92dae..a3eaa5ad20 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -26,10 +26,10 @@ ActorInit En_Sda_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnSda), - (ActorFunc)EnSda_Init, - (ActorFunc)EnSda_Destroy, - (ActorFunc)EnSda_Update, - (ActorFunc)EnSda_Draw, + EnSda_Init, + EnSda_Destroy, + EnSda_Update, + EnSda_Draw, }; Vec3f D_80947A60 = { 0.0f, 0.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c index 88fab32987..2c433b68f8 100644 --- a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c +++ b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c @@ -30,10 +30,10 @@ ActorInit En_Sekihi_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnSekihi), - (ActorFunc)EnSekihi_Init, - (ActorFunc)EnSekihi_Destroy, - (ActorFunc)EnSekihi_Update, - (ActorFunc)NULL, + EnSekihi_Init, + EnSekihi_Destroy, + EnSekihi_Update, + NULL, }; static s16 sObjectIds[] = { OBJECT_SEKIHIL, OBJECT_SEKIHIG, OBJECT_SEKIHIN, OBJECT_SEKIHIZ, OBJECT_ZOG }; diff --git a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c index b16153a53d..e036d039f1 100644 --- a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c +++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c @@ -55,10 +55,10 @@ ActorInit En_Sellnuts_InitVars = { FLAGS, OBJECT_DNT, sizeof(EnSellnuts), - (ActorFunc)EnSellnuts_Init, - (ActorFunc)EnSellnuts_Destroy, - (ActorFunc)EnSellnuts_Update, - (ActorFunc)EnSellnuts_Draw, + EnSellnuts_Init, + EnSellnuts_Destroy, + EnSellnuts_Update, + EnSellnuts_Draw, }; static ColliderCylinderInitType1 sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Shn/z_en_shn.c b/src/overlays/actors/ovl_En_Shn/z_en_shn.c index d606e17f40..65472f22de 100644 --- a/src/overlays/actors/ovl_En_Shn/z_en_shn.c +++ b/src/overlays/actors/ovl_En_Shn/z_en_shn.c @@ -57,10 +57,10 @@ ActorInit En_Shn_InitVars = { FLAGS, OBJECT_SHN, sizeof(EnShn), - (ActorFunc)EnShn_Init, - (ActorFunc)EnShn_Destroy, - (ActorFunc)EnShn_Update, - (ActorFunc)EnShn_Draw, + EnShn_Init, + EnShn_Destroy, + EnShn_Update, + EnShn_Draw, }; void func_80AE6130(EnShn* this) { diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index 5f7e111a4b..87e6f80b5f 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -25,10 +25,10 @@ ActorInit En_Si_InitVars = { FLAGS, OBJECT_ST, sizeof(EnSi), - (ActorFunc)EnSi_Init, - (ActorFunc)EnSi_Destroy, - (ActorFunc)EnSi_Update, - (ActorFunc)EnSi_Draw, + EnSi_Init, + EnSi_Destroy, + EnSi_Update, + EnSi_Draw, }; // static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index bb1fb7e0bb..5951a1a36f 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -151,10 +151,10 @@ ActorInit En_Skb_InitVars = { FLAGS, OBJECT_SKB, sizeof(EnSkb), - (ActorFunc)EnSkb_Init, - (ActorFunc)EnSkb_Destroy, - (ActorFunc)EnSkb_Update, - (ActorFunc)EnSkb_Draw, + EnSkb_Init, + EnSkb_Destroy, + EnSkb_Update, + EnSkb_Draw, }; void func_809947B0(PlayState* play, EnSkb* this, Vec3f* inPos) { diff --git a/src/overlays/actors/ovl_En_Slime/z_en_slime.c b/src/overlays/actors/ovl_En_Slime/z_en_slime.c index 2b8e5f4c6e..318cc93552 100644 --- a/src/overlays/actors/ovl_En_Slime/z_en_slime.c +++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.c @@ -39,10 +39,10 @@ ActorInit En_Slime_InitVars = { FLAGS, OBJECT_SLIME, sizeof(EnSlime), - (ActorFunc)EnSlime_Init, - (ActorFunc)EnSlime_Destroy, - (ActorFunc)EnSlime_Update, - (ActorFunc)EnSlime_Draw, + EnSlime_Init, + EnSlime_Destroy, + EnSlime_Update, + EnSlime_Draw, }; // static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c index 994115f892..64ea1e6559 100644 --- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c +++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c @@ -67,10 +67,10 @@ ActorInit En_Snowman_InitVars = { FLAGS, OBJECT_SNOWMAN, sizeof(EnSnowman), - (ActorFunc)EnSnowman_Init, - (ActorFunc)EnSnowman_Destroy, - (ActorFunc)EnSnowman_Update, - (ActorFunc)EnSnowman_Draw, + EnSnowman_Init, + EnSnowman_Destroy, + EnSnowman_Update, + EnSnowman_Draw, }; static ColliderCylinderInit sEenoCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c index 48a1cfea08..166fd6924d 100644 --- a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c +++ b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c @@ -24,10 +24,10 @@ ActorInit En_Snowwd_InitVars = { FLAGS, OBJECT_SNOWWD, sizeof(EnSnowwd), - (ActorFunc)EnSnowwd_Init, - (ActorFunc)EnSnowwd_Destroy, - (ActorFunc)EnSnowwd_Update, - (ActorFunc)EnSnowwd_Draw, + EnSnowwd_Init, + EnSnowwd_Destroy, + EnSnowwd_Update, + EnSnowwd_Draw, }; // static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c index 1fa9b2059c..05ec4439d8 100644 --- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c +++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c @@ -70,10 +70,10 @@ ActorInit En_Sob1_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnSob1), - (ActorFunc)EnSob1_Init, - (ActorFunc)EnSob1_Destroy, - (ActorFunc)EnSob1_Update, - (ActorFunc)NULL, + EnSob1_Init, + EnSob1_Destroy, + EnSob1_Update, + NULL, }; static s16 sObjectIds[][3] = { diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 7494695fa3..87fa6cb959 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -31,10 +31,10 @@ ActorInit En_Ssh_InitVars = { FLAGS, OBJECT_SSH, sizeof(EnSsh), - (ActorFunc)EnSsh_Init, - (ActorFunc)EnSsh_Destroy, - (ActorFunc)EnSsh_Update, - (ActorFunc)EnSsh_Draw, + EnSsh_Init, + EnSsh_Destroy, + EnSsh_Update, + EnSsh_Draw, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index 14e0c1cb52..6571209ad1 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -29,10 +29,10 @@ ActorInit En_St_InitVars = { FLAGS, OBJECT_ST, sizeof(EnSt), - (ActorFunc)EnSt_Init, - (ActorFunc)EnSt_Destroy, - (ActorFunc)EnSt_Update, - (ActorFunc)NULL, + EnSt_Init, + EnSt_Destroy, + EnSt_Update, + NULL, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 5d1bd14714..8959ee7dd8 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -33,10 +33,10 @@ ActorInit En_Sth_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnSth), - (ActorFunc)EnSth_Init, - (ActorFunc)EnSth_Destroy, - (ActorFunc)EnSth_Update, - (ActorFunc)NULL, + EnSth_Init, + EnSth_Destroy, + EnSth_Update, + NULL, }; #include "overlays/ovl_En_Sth/ovl_En_Sth.c" diff --git a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c index ac615a8dd8..33306210be 100644 --- a/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c +++ b/src/overlays/actors/ovl_En_Sth2/z_en_sth2.c @@ -24,10 +24,10 @@ ActorInit En_Sth2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnSth2), - (ActorFunc)EnSth2_Init, - (ActorFunc)EnSth2_Destroy, - (ActorFunc)EnSth2_Update, - (ActorFunc)NULL, + EnSth2_Init, + EnSth2_Destroy, + EnSth2_Update, + NULL, }; #include "overlays/ovl_En_Sth2/ovl_En_Sth2.c" diff --git a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c index 36dd9398e0..520a288e27 100644 --- a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c +++ b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c @@ -33,10 +33,10 @@ ActorInit En_Stone_heishi_InitVars = { FLAGS, OBJECT_SDN, sizeof(EnStoneheishi), - (ActorFunc)EnStoneheishi_Init, - (ActorFunc)EnStoneheishi_Destroy, - (ActorFunc)EnStoneheishi_Update, - (ActorFunc)EnStoneheishi_Draw, + EnStoneheishi_Init, + EnStoneheishi_Destroy, + EnStoneheishi_Update, + EnStoneheishi_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c index c4d56b70ad..4807d2af6a 100644 --- a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c +++ b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c @@ -26,10 +26,10 @@ ActorInit En_Stop_heishi_InitVars = { FLAGS, OBJECT_SDN, sizeof(EnStopheishi), - (ActorFunc)EnStopheishi_Init, - (ActorFunc)EnStopheishi_Destroy, - (ActorFunc)EnStopheishi_Update, - (ActorFunc)EnStopheishi_Draw, + EnStopheishi_Init, + EnStopheishi_Destroy, + EnStopheishi_Update, + EnStopheishi_Draw, }; // static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/src/overlays/actors/ovl_En_Stream/z_en_stream.c index 11e5ce7d60..25f1e87e2c 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -24,10 +24,10 @@ ActorInit En_Stream_InitVars = { FLAGS, OBJECT_STREAM, sizeof(EnStream), - (ActorFunc)EnStream_Init, - (ActorFunc)EnStream_Destroy, - (ActorFunc)EnStream_Update, - (ActorFunc)EnStream_Draw, + EnStream_Init, + EnStream_Destroy, + EnStream_Update, + EnStream_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c index 2f33a9aac7..b1b0e93910 100644 --- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c +++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c @@ -44,10 +44,10 @@ ActorInit En_Suttari_InitVars = { FLAGS, OBJECT_BOJ, sizeof(EnSuttari), - (ActorFunc)EnSuttari_Init, - (ActorFunc)EnSuttari_Destroy, - (ActorFunc)EnSuttari_Update, - (ActorFunc)EnSuttari_Draw, + EnSuttari_Init, + EnSuttari_Destroy, + EnSuttari_Update, + EnSuttari_Draw, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index d8dd72923b..95e981ec64 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -34,10 +34,10 @@ ActorInit En_Sw_InitVars = { FLAGS, OBJECT_ST, sizeof(EnSw), - (ActorFunc)EnSw_Init, - (ActorFunc)EnSw_Destroy, - (ActorFunc)EnSw_Update, - (ActorFunc)EnSw_Draw, + EnSw_Init, + EnSw_Destroy, + EnSw_Update, + EnSw_Draw, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c index 1a2f8b685a..da421cd1eb 100644 --- a/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c +++ b/src/overlays/actors/ovl_En_Syateki_Crow/z_en_syateki_crow.c @@ -31,10 +31,10 @@ ActorInit En_Syateki_Crow_InitVars = { FLAGS, OBJECT_CROW, sizeof(EnSyatekiCrow), - (ActorFunc)EnSyatekiCrow_Init, - (ActorFunc)EnSyatekiCrow_Destroy, - (ActorFunc)EnSyatekiCrow_Update, - (ActorFunc)EnSyatekiCrow_Draw, + EnSyatekiCrow_Init, + EnSyatekiCrow_Destroy, + EnSyatekiCrow_Update, + EnSyatekiCrow_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c index 601095cfd7..f6c3997c13 100644 --- a/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c +++ b/src/overlays/actors/ovl_En_Syateki_Dekunuts/z_en_syateki_dekunuts.c @@ -45,10 +45,10 @@ ActorInit En_Syateki_Dekunuts_InitVars = { FLAGS, OBJECT_DEKUNUTS, sizeof(EnSyatekiDekunuts), - (ActorFunc)EnSyatekiDekunuts_Init, - (ActorFunc)EnSyatekiDekunuts_Destroy, - (ActorFunc)EnSyatekiDekunuts_Update, - (ActorFunc)EnSyatekiDekunuts_Draw, + EnSyatekiDekunuts_Init, + EnSyatekiDekunuts_Destroy, + EnSyatekiDekunuts_Update, + EnSyatekiDekunuts_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 3234941735..14de920706 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -65,10 +65,10 @@ ActorInit En_Syateki_Man_InitVars = { FLAGS, OBJECT_SHN, sizeof(EnSyatekiMan), - (ActorFunc)EnSyatekiMan_Init, - (ActorFunc)EnSyatekiMan_Destroy, - (ActorFunc)EnSyatekiMan_Update, - (ActorFunc)EnSyatekiMan_Draw, + EnSyatekiMan_Init, + EnSyatekiMan_Destroy, + EnSyatekiMan_Update, + EnSyatekiMan_Draw, }; typedef enum { diff --git a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c index 5358d44cf5..4aae49e9a4 100644 --- a/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c +++ b/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c @@ -34,10 +34,10 @@ ActorInit En_Syateki_Okuta_InitVars = { FLAGS, OBJECT_OKUTA, sizeof(EnSyatekiOkuta), - (ActorFunc)EnSyatekiOkuta_Init, - (ActorFunc)EnSyatekiOkuta_Destroy, - (ActorFunc)EnSyatekiOkuta_Update, - (ActorFunc)EnSyatekiOkuta_Draw, + EnSyatekiOkuta_Init, + EnSyatekiOkuta_Destroy, + EnSyatekiOkuta_Update, + EnSyatekiOkuta_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c index 20871efb29..9852fb6b41 100644 --- a/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c +++ b/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c @@ -107,10 +107,10 @@ ActorInit En_Syateki_Wf_InitVars = { FLAGS, OBJECT_WF, sizeof(EnSyatekiWf), - (ActorFunc)EnSyatekiWf_Init, - (ActorFunc)EnSyatekiWf_Destroy, - (ActorFunc)EnSyatekiWf_Update, - (ActorFunc)EnSyatekiWf_Draw, + EnSyatekiWf_Init, + EnSyatekiWf_Destroy, + EnSyatekiWf_Update, + EnSyatekiWf_Draw, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Tab/z_en_tab.c b/src/overlays/actors/ovl_En_Tab/z_en_tab.c index 86de69140a..b6cf822102 100644 --- a/src/overlays/actors/ovl_En_Tab/z_en_tab.c +++ b/src/overlays/actors/ovl_En_Tab/z_en_tab.c @@ -72,10 +72,10 @@ ActorInit En_Tab_InitVars = { FLAGS, OBJECT_TAB, sizeof(EnTab), - (ActorFunc)EnTab_Init, - (ActorFunc)EnTab_Destroy, - (ActorFunc)EnTab_Update, - (ActorFunc)EnTab_Draw, + EnTab_Init, + EnTab_Destroy, + EnTab_Update, + EnTab_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c index 2cc547e9aa..e22ac0b4b8 100644 --- a/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c +++ b/src/overlays/actors/ovl_En_Tag_Obj/z_en_tag_obj.c @@ -40,10 +40,10 @@ ActorInit En_Tag_Obj_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTagObj), - (ActorFunc)EnTagObj_Init, - (ActorFunc)EnTagObj_Destroy, - (ActorFunc)EnTagObj_Update, - (ActorFunc)NULL, + EnTagObj_Init, + EnTagObj_Destroy, + EnTagObj_Update, + NULL, }; void EnTagObj_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c index 9bc0cd1b93..7fd52d5660 100644 --- a/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c +++ b/src/overlays/actors/ovl_En_Takaraya/z_en_takaraya.c @@ -22,10 +22,10 @@ ActorInit En_Takaraya_InitVars = { FLAGS, OBJECT_BG, sizeof(EnTakaraya), - (ActorFunc)EnTakaraya_Init, - (ActorFunc)EnTakaraya_Destroy, - (ActorFunc)EnTakaraya_Update, - (ActorFunc)EnTakaraya_Draw, + EnTakaraya_Init, + EnTakaraya_Destroy, + EnTakaraya_Update, + EnTakaraya_Draw, }; // static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_En_Talk/z_en_talk.c b/src/overlays/actors/ovl_En_Talk/z_en_talk.c index 4f9b2a53de..5e117f68b9 100644 --- a/src/overlays/actors/ovl_En_Talk/z_en_talk.c +++ b/src/overlays/actors/ovl_En_Talk/z_en_talk.c @@ -22,10 +22,10 @@ ActorInit En_Talk_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTalk), - (ActorFunc)EnTalk_Init, - (ActorFunc)EnTalk_Destroy, - (ActorFunc)EnTalk_Update, - (ActorFunc)NULL, + EnTalk_Init, + EnTalk_Destroy, + EnTalk_Update, + NULL, }; void EnTalk_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c index a840596342..6e13ef4a3d 100644 --- a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c +++ b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c @@ -108,10 +108,10 @@ ActorInit En_Talk_Gibud_InitVars = { FLAGS, OBJECT_RD, sizeof(EnTalkGibud), - (ActorFunc)EnTalkGibud_Init, - (ActorFunc)EnTalkGibud_Destroy, - (ActorFunc)EnTalkGibud_Update, - (ActorFunc)EnTalkGibud_Draw, + EnTalkGibud_Init, + EnTalkGibud_Destroy, + EnTalkGibud_Update, + EnTalkGibud_Draw, }; static AnimationInfo sAnimationInfo[] = { diff --git a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c index fec6a2d3ba..44393ac176 100644 --- a/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c +++ b/src/overlays/actors/ovl_En_Tanron1/z_en_tanron1.c @@ -24,10 +24,10 @@ ActorInit En_Tanron1_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTanron1), - (ActorFunc)EnTanron1_Init, - (ActorFunc)EnTanron1_Destroy, - (ActorFunc)EnTanron1_Update, - (ActorFunc)EnTanron1_Draw, + EnTanron1_Init, + EnTanron1_Destroy, + EnTanron1_Update, + EnTanron1_Draw, }; static u64 sPad = { 0 }; diff --git a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c index 3325604033..ad99c9ce54 100644 --- a/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c +++ b/src/overlays/actors/ovl_En_Tanron2/z_en_tanron2.c @@ -36,10 +36,10 @@ ActorInit En_Tanron2_InitVars = { FLAGS, OBJECT_BOSS04, sizeof(EnTanron2), - (ActorFunc)EnTanron2_Init, - (ActorFunc)EnTanron2_Destroy, - (ActorFunc)EnTanron2_Update, - (ActorFunc)EnTanron2_Draw, + EnTanron2_Init, + EnTanron2_Destroy, + EnTanron2_Update, + EnTanron2_Draw, }; static DamageTable sDamageTable = { diff --git a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c index d991ab323f..81e3eecdb7 100644 --- a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c +++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c @@ -37,10 +37,10 @@ ActorInit En_Tanron3_InitVars = { FLAGS, OBJECT_BOSS03, sizeof(EnTanron3), - (ActorFunc)EnTanron3_Init, - (ActorFunc)EnTanron3_Destroy, - (ActorFunc)EnTanron3_Update, - (ActorFunc)EnTanron3_Draw, + EnTanron3_Init, + EnTanron3_Destroy, + EnTanron3_Update, + EnTanron3_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c index b533439312..1a91989f75 100644 --- a/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c +++ b/src/overlays/actors/ovl_En_Tanron4/z_en_tanron4.c @@ -37,10 +37,10 @@ ActorInit En_Tanron4_InitVars = { FLAGS, OBJECT_TANRON4, sizeof(EnTanron4), - (ActorFunc)EnTanron4_Init, - (ActorFunc)EnTanron4_Destroy, - (ActorFunc)EnTanron4_Update, - (ActorFunc)EnTanron4_Draw, + EnTanron4_Init, + EnTanron4_Destroy, + EnTanron4_Update, + EnTanron4_Draw, }; void EnTanron4_Init(Actor* thisx, PlayState* play2) { diff --git a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c index c052c33090..7966b97aa8 100644 --- a/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c +++ b/src/overlays/actors/ovl_En_Tanron5/z_en_tanron5.c @@ -29,10 +29,10 @@ ActorInit En_Tanron5_InitVars = { FLAGS, OBJECT_BOSS02, sizeof(EnTanron5), - (ActorFunc)EnTanron5_Init, - (ActorFunc)EnTanron5_Destroy, - (ActorFunc)EnTanron5_Update, - (ActorFunc)EnTanron5_Draw, + EnTanron5_Init, + EnTanron5_Destroy, + EnTanron5_Update, + EnTanron5_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c index 4faa072f90..2d63f454bf 100644 --- a/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c +++ b/src/overlays/actors/ovl_En_Tanron6/z_en_tanron6.c @@ -24,10 +24,10 @@ ActorInit En_Tanron6_InitVars = { FLAGS, OBJECT_TANRON5, sizeof(EnTanron6), - (ActorFunc)EnTanron6_Init, - (ActorFunc)EnTanron6_Destroy, - (ActorFunc)EnTanron6_Update, - (ActorFunc)EnTanron6_Draw, + EnTanron6_Init, + EnTanron6_Destroy, + EnTanron6_Update, + EnTanron6_Draw, }; static DamageTable sDamageTable = { diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index 7f0a3e9715..2ca2c05b45 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -22,10 +22,10 @@ ActorInit En_Test_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTest), - (ActorFunc)EnTest_Init, - (ActorFunc)EnTest_Destroy, - (ActorFunc)EnTest_Update, - (ActorFunc)EnTest_Draw, + EnTest_Init, + EnTest_Destroy, + EnTest_Update, + EnTest_Draw, }; void func_80862B70(EnTestStruct* arg0) { diff --git a/src/overlays/actors/ovl_En_Test2/z_en_test2.c b/src/overlays/actors/ovl_En_Test2/z_en_test2.c index 257aea2838..bf7f2c365c 100644 --- a/src/overlays/actors/ovl_En_Test2/z_en_test2.c +++ b/src/overlays/actors/ovl_En_Test2/z_en_test2.c @@ -33,10 +33,10 @@ ActorInit En_Test2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTest2), - (ActorFunc)EnTest2_Init, - (ActorFunc)Actor_Noop, - (ActorFunc)EnTest2_Update, - (ActorFunc)NULL, + EnTest2_Init, + Actor_Noop, + EnTest2_Update, + NULL, }; static EnTest2ModelInfo sModelInfo[] = { diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.c b/src/overlays/actors/ovl_En_Test3/z_en_test3.c index 26cc07dc25..060121b5f4 100644 --- a/src/overlays/actors/ovl_En_Test3/z_en_test3.c +++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.c @@ -174,10 +174,10 @@ ActorInit En_Test3_InitVars = { FLAGS, OBJECT_TEST3, sizeof(EnTest3), - (ActorFunc)EnTest3_Init, - (ActorFunc)EnTest3_Destroy, - (ActorFunc)EnTest3_Update, - (ActorFunc)NULL, + EnTest3_Init, + EnTest3_Destroy, + EnTest3_Update, + NULL, }; static struct_80A4168C D_80A4168C[] = { diff --git a/src/overlays/actors/ovl_En_Test4/z_en_test4.c b/src/overlays/actors/ovl_En_Test4/z_en_test4.c index b7994cf046..88b0c23781 100644 --- a/src/overlays/actors/ovl_En_Test4/z_en_test4.c +++ b/src/overlays/actors/ovl_En_Test4/z_en_test4.c @@ -26,10 +26,10 @@ ActorInit En_Test4_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTest4), - (ActorFunc)EnTest4_Init, - (ActorFunc)EnTest4_Destroy, - (ActorFunc)EnTest4_Update, - (ActorFunc)NULL, + EnTest4_Init, + EnTest4_Destroy, + EnTest4_Update, + NULL, }; static s32 sIsLoaded = false; diff --git a/src/overlays/actors/ovl_En_Test5/z_en_test5.c b/src/overlays/actors/ovl_En_Test5/z_en_test5.c index 83451fa022..61f54c0906 100644 --- a/src/overlays/actors/ovl_En_Test5/z_en_test5.c +++ b/src/overlays/actors/ovl_En_Test5/z_en_test5.c @@ -22,10 +22,10 @@ ActorInit En_Test5_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTest5), - (ActorFunc)EnTest5_Init, - (ActorFunc)EnTest5_Destroy, - (ActorFunc)EnTest5_Update, - (ActorFunc)NULL, + EnTest5_Init, + EnTest5_Destroy, + EnTest5_Update, + NULL, }; void EnTest5_SetupAction(EnTest5* this, EnTest5ActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_En_Test6/z_en_test6.c b/src/overlays/actors/ovl_En_Test6/z_en_test6.c index c0915fce61..437799b538 100644 --- a/src/overlays/actors/ovl_En_Test6/z_en_test6.c +++ b/src/overlays/actors/ovl_En_Test6/z_en_test6.c @@ -48,10 +48,10 @@ ActorInit En_Test6_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTest6), - (ActorFunc)EnTest6_Init, - (ActorFunc)EnTest6_Destroy, - (ActorFunc)EnTest6_Update, - (ActorFunc)EnTest6_Draw, + EnTest6_Init, + EnTest6_Destroy, + EnTest6_Update, + EnTest6_Draw, }; u8 D_80A93E80[] = { diff --git a/src/overlays/actors/ovl_En_Test7/z_en_test7.c b/src/overlays/actors/ovl_En_Test7/z_en_test7.c index 43facd8312..cb60f9772b 100644 --- a/src/overlays/actors/ovl_En_Test7/z_en_test7.c +++ b/src/overlays/actors/ovl_En_Test7/z_en_test7.c @@ -40,10 +40,10 @@ ActorInit En_Test7_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTest7), - (ActorFunc)EnTest7_Init, - (ActorFunc)EnTest7_Destroy, - (ActorFunc)EnTest7_Update, - (ActorFunc)EnTest7_Draw, + EnTest7_Init, + EnTest7_Destroy, + EnTest7_Update, + EnTest7_Draw, }; void EnTest7_SetupAction(EnTest7* this, EnTest7ActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c index 947f97b627..70c2d04664 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -27,10 +27,10 @@ ActorInit En_Tg_InitVars = { FLAGS, OBJECT_MU, sizeof(EnTg), - (ActorFunc)EnTg_Init, - (ActorFunc)EnTg_Destroy, - (ActorFunc)EnTg_Update, - (ActorFunc)EnTg_Draw, + EnTg_Init, + EnTg_Destroy, + EnTg_Update, + EnTg_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c index 58f44d468b..6a6a682d37 100644 --- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c @@ -39,10 +39,10 @@ ActorInit En_Thiefbird_InitVars = { FLAGS, OBJECT_THIEFBIRD, sizeof(EnThiefbird), - (ActorFunc)EnThiefbird_Init, - (ActorFunc)EnThiefbird_Destroy, - (ActorFunc)EnThiefbird_Update, - (ActorFunc)EnThiefbird_Draw, + EnThiefbird_Init, + EnThiefbird_Destroy, + EnThiefbird_Update, + EnThiefbird_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[3] = { diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c index 4e09f01a9a..d5a84f3aa7 100644 --- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c +++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c @@ -36,10 +36,10 @@ ActorInit En_Time_Tag_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTimeTag), - (ActorFunc)EnTimeTag_Init, - (ActorFunc)EnTimeTag_Destroy, - (ActorFunc)EnTimeTag_Update, - (ActorFunc)NULL, + EnTimeTag_Init, + EnTimeTag_Destroy, + EnTimeTag_Update, + NULL, }; void EnTimeTag_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index eb005b2246..b80215761f 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -52,10 +52,10 @@ ActorInit En_Tite_InitVars = { FLAGS, OBJECT_TITE, sizeof(EnTite), - (ActorFunc)EnTite_Init, - (ActorFunc)EnTite_Destroy, - (ActorFunc)EnTite_Update, - (ActorFunc)EnTite_Draw, + EnTite_Init, + EnTite_Destroy, + EnTite_Update, + EnTite_Draw, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index a0b59be8a7..b59f440bac 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -75,10 +75,10 @@ ActorInit En_Tk_InitVars = { FLAGS, OBJECT_TK, sizeof(EnTk), - (ActorFunc)EnTk_Init, - (ActorFunc)EnTk_Destroy, - (ActorFunc)EnTk_Update, - (ActorFunc)EnTk_Draw, + EnTk_Init, + EnTk_Destroy, + EnTk_Update, + EnTk_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.c b/src/overlays/actors/ovl_En_Torch/z_en_torch.c index 00335577bc..21d7f2f3d4 100644 --- a/src/overlays/actors/ovl_En_Torch/z_en_torch.c +++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.c @@ -15,7 +15,7 @@ void EnTorch_Init(Actor* thisx, PlayState* play); ActorInit En_Torch_InitVars = { ACTOR_EN_TORCH, ACTORCAT_ITEMACTION, FLAGS, GAMEPLAY_KEEP, sizeof(EnTorch), - (ActorFunc)EnTorch_Init, (ActorFunc)NULL, (ActorFunc)NULL, (ActorFunc)NULL, + EnTorch_Init, NULL, NULL, NULL, }; static u8 sChestContents[] = { diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index 75f966a3c8..6b84db1571 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -25,10 +25,10 @@ ActorInit En_Torch2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnTorch2), - (ActorFunc)EnTorch2_Init, - (ActorFunc)EnTorch2_Destroy, - (ActorFunc)EnTorch2_Update, - (ActorFunc)EnTorch2_Draw, + EnTorch2_Init, + EnTorch2_Destroy, + EnTorch2_Update, + EnTorch2_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Toto/z_en_toto.c b/src/overlays/actors/ovl_En_Toto/z_en_toto.c index aefa6383fc..366e6fe21c 100644 --- a/src/overlays/actors/ovl_En_Toto/z_en_toto.c +++ b/src/overlays/actors/ovl_En_Toto/z_en_toto.c @@ -56,10 +56,10 @@ ActorInit En_Toto_InitVars = { FLAGS, OBJECT_ZM, sizeof(EnToto), - (ActorFunc)EnToto_Init, - (ActorFunc)EnToto_Destroy, - (ActorFunc)EnToto_Update, - (ActorFunc)EnToto_Draw, + EnToto_Init, + EnToto_Destroy, + EnToto_Update, + EnToto_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Trt/z_en_trt.c b/src/overlays/actors/ovl_En_Trt/z_en_trt.c index a8ffe6ea1a..a459923135 100644 --- a/src/overlays/actors/ovl_En_Trt/z_en_trt.c +++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.c @@ -96,10 +96,10 @@ ActorInit En_Trt_InitVars = { FLAGS, OBJECT_TRT, sizeof(EnTrt), - (ActorFunc)EnTrt_Init, - (ActorFunc)EnTrt_Destroy, - (ActorFunc)EnTrt_Update, - (ActorFunc)EnTrt_Draw, + EnTrt_Init, + EnTrt_Destroy, + EnTrt_Update, + EnTrt_Draw, }; static f32 sActorScale = 0.008f; diff --git a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c index 4018a5021c..a2665dd00c 100644 --- a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c +++ b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c @@ -58,10 +58,10 @@ ActorInit En_Trt2_InitVars = { FLAGS, OBJECT_TRT, sizeof(EnTrt2), - (ActorFunc)EnTrt2_Init, - (ActorFunc)EnTrt2_Destroy, - (ActorFunc)EnTrt2_Update, - (ActorFunc)NULL, + EnTrt2_Init, + EnTrt2_Destroy, + EnTrt2_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Tru/z_en_tru.c b/src/overlays/actors/ovl_En_Tru/z_en_tru.c index 733ea0c576..9cae39d262 100644 --- a/src/overlays/actors/ovl_En_Tru/z_en_tru.c +++ b/src/overlays/actors/ovl_En_Tru/z_en_tru.c @@ -82,10 +82,10 @@ ActorInit En_Tru_InitVars = { FLAGS, OBJECT_TRU, sizeof(EnTru), - (ActorFunc)EnTru_Init, - (ActorFunc)EnTru_Destroy, - (ActorFunc)EnTru_Update, - (ActorFunc)EnTru_Draw, + EnTru_Init, + EnTru_Destroy, + EnTru_Update, + EnTru_Draw, }; #include "overlays/ovl_En_Tru/ovl_En_Tru.c" diff --git a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c index d90b83a570..9f2791fd75 100644 --- a/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c +++ b/src/overlays/actors/ovl_En_Tru_Mt/z_en_tru_mt.c @@ -46,10 +46,10 @@ ActorInit En_Tru_Mt_InitVars = { FLAGS, OBJECT_TRU, sizeof(EnTruMt), - (ActorFunc)EnTruMt_Init, - (ActorFunc)EnTruMt_Destroy, - (ActorFunc)EnTruMt_Update, - (ActorFunc)EnTruMt_Draw, + EnTruMt_Init, + EnTruMt_Destroy, + EnTruMt_Update, + EnTruMt_Draw, }; static ColliderSphereInit sSphereInit = { diff --git a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c index a9631d96b3..703526ed09 100644 --- a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c +++ b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c @@ -35,10 +35,10 @@ ActorInit En_Tsn_InitVars = { FLAGS, OBJECT_TSN, sizeof(EnTsn), - (ActorFunc)EnTsn_Init, - (ActorFunc)EnTsn_Destroy, - (ActorFunc)EnTsn_Update, - (ActorFunc)EnTsn_Draw, + EnTsn_Init, + EnTsn_Destroy, + EnTsn_Update, + EnTsn_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index 4f7b8b720a..7795556b8f 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -45,10 +45,10 @@ ActorInit En_Tubo_Trap_InitVars = { FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(EnTuboTrap), - (ActorFunc)EnTuboTrap_Init, - (ActorFunc)EnTuboTrap_Destroy, - (ActorFunc)EnTuboTrap_Update, - (ActorFunc)EnTuboTrap_Draw, + EnTuboTrap_Init, + EnTuboTrap_Destroy, + EnTuboTrap_Update, + EnTuboTrap_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_En_Twig/z_en_twig.c b/src/overlays/actors/ovl_En_Twig/z_en_twig.c index 31af7f8b6c..bfd7b3a9a2 100644 --- a/src/overlays/actors/ovl_En_Twig/z_en_twig.c +++ b/src/overlays/actors/ovl_En_Twig/z_en_twig.c @@ -31,10 +31,10 @@ ActorInit En_Twig_InitVars = { FLAGS, OBJECT_TWIG, sizeof(EnTwig), - (ActorFunc)EnTwig_Init, - (ActorFunc)EnTwig_Destroy, - (ActorFunc)EnTwig_Update, - (ActorFunc)EnTwig_Draw, + EnTwig_Init, + EnTwig_Destroy, + EnTwig_Update, + EnTwig_Draw, }; static s32 sCurrentRing; diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index 34551dac90..6cf5d7b7fa 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -29,10 +29,10 @@ ActorInit En_Viewer_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnViewer), - (ActorFunc)EnViewer_Init, - (ActorFunc)EnViewer_Destroy, - (ActorFunc)EnViewer_Update, - (ActorFunc)EnViewer_Draw, + EnViewer_Init, + EnViewer_Destroy, + EnViewer_Update, + EnViewer_Draw, }; u32 D_8089F4D0; diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index 50109f8879..1ad72c54b1 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -35,10 +35,10 @@ ActorInit En_Vm_InitVars = { FLAGS, OBJECT_VM, sizeof(EnVm), - (ActorFunc)EnVm_Init, - (ActorFunc)EnVm_Destroy, - (ActorFunc)EnVm_Update, - (ActorFunc)EnVm_Draw, + EnVm_Init, + EnVm_Destroy, + EnVm_Update, + EnVm_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[] = { diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 74bd4fec6b..ec50f83615 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -49,10 +49,10 @@ ActorInit En_Wallmas_InitVars = { FLAGS, OBJECT_WALLMASTER, sizeof(EnWallmas), - (ActorFunc)EnWallmas_Init, - (ActorFunc)EnWallmas_Destroy, - (ActorFunc)EnWallmas_Update, - (ActorFunc)EnWallmas_Draw, + EnWallmas_Init, + EnWallmas_Destroy, + EnWallmas_Update, + EnWallmas_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c index 32038c4117..a72c717d2c 100644 --- a/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c +++ b/src/overlays/actors/ovl_En_Warp_Uzu/z_en_warp_uzu.c @@ -27,10 +27,10 @@ ActorInit En_Warp_Uzu_InitVars = { FLAGS, OBJECT_WARP_UZU, sizeof(EnWarpUzu), - (ActorFunc)EnWarpUzu_Init, - (ActorFunc)EnWarpUzu_Destroy, - (ActorFunc)EnWarpUzu_Update, - (ActorFunc)EnWarpUzu_Draw, + EnWarpUzu_Init, + EnWarpUzu_Destroy, + EnWarpUzu_Update, + EnWarpUzu_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c index 77b857c145..6e2e69e7e4 100644 --- a/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c +++ b/src/overlays/actors/ovl_En_Warp_tag/z_en_warp_tag.c @@ -30,10 +30,10 @@ ActorInit En_Warp_tag_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnWarptag), - (ActorFunc)EnWarptag_Init, - (ActorFunc)EnWarptag_Destroy, - (ActorFunc)EnWarptag_Update, - (ActorFunc)NULL, + EnWarptag_Init, + EnWarptag_Destroy, + EnWarptag_Update, + NULL, }; // this appears to be unused, as the code never accesses it in known vanilla cases diff --git a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c index 94890bd39a..b4e63001e0 100644 --- a/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c +++ b/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.c @@ -36,10 +36,10 @@ ActorInit En_Water_Effect_InitVars = { FLAGS, OBJECT_WATER_EFFECT, sizeof(EnWaterEffect), - (ActorFunc)EnWaterEffect_Init, - (ActorFunc)EnWaterEffect_Destroy, - (ActorFunc)EnWaterEffect_Update, - (ActorFunc)EnWaterEffect_Draw, + EnWaterEffect_Init, + EnWaterEffect_Destroy, + EnWaterEffect_Update, + EnWaterEffect_Draw, }; static Vec3f D_80A5AFB0 = { 0.0f, 0.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c index 83cf472919..25ce4df249 100644 --- a/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c +++ b/src/overlays/actors/ovl_En_Wdhand/z_en_wdhand.c @@ -22,10 +22,10 @@ ActorInit En_Wdhand_InitVars = { FLAGS, OBJECT_WDHAND, sizeof(EnWdhand), - (ActorFunc)EnWdhand_Init, - (ActorFunc)EnWdhand_Destroy, - (ActorFunc)EnWdhand_Update, - (ActorFunc)EnWdhand_Draw, + EnWdhand_Init, + EnWdhand_Destroy, + EnWdhand_Update, + EnWdhand_Draw, }; // static ColliderJntSphElementInit sJntSphElementsInit[7] = { diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index ea95cc6d02..13657901c1 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -41,10 +41,10 @@ ActorInit En_Weather_Tag_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(EnWeatherTag), - (ActorFunc)EnWeatherTag_Init, - (ActorFunc)EnWeatherTag_Destroy, - (ActorFunc)EnWeatherTag_Update, - (ActorFunc)EnWeatherTag_Draw, + EnWeatherTag_Init, + EnWeatherTag_Destroy, + EnWeatherTag_Update, + EnWeatherTag_Draw, }; extern f32 D_801F4E74; diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index bc505ee530..ca1bb7600f 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -61,10 +61,10 @@ ActorInit En_Wf_InitVars = { FLAGS, OBJECT_WF, sizeof(EnWf), - (ActorFunc)EnWf_Init, - (ActorFunc)EnWf_Destroy, - (ActorFunc)EnWf_Update, - (ActorFunc)EnWf_Draw, + EnWf_Init, + EnWf_Destroy, + EnWf_Update, + EnWf_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[4] = { diff --git a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c index ee2f3d158a..4c09b72ffb 100644 --- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c +++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c @@ -86,10 +86,10 @@ ActorInit En_Wiz_InitVars = { FLAGS, OBJECT_WIZ, sizeof(EnWiz), - (ActorFunc)EnWiz_Init, - (ActorFunc)EnWiz_Destroy, - (ActorFunc)EnWiz_Update, - (ActorFunc)EnWiz_Draw, + EnWiz_Init, + EnWiz_Destroy, + EnWiz_Update, + EnWiz_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[10] = { diff --git a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c index f2d88759ea..3d8f8b06fd 100644 --- a/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c +++ b/src/overlays/actors/ovl_En_Wiz_Brock/z_en_wiz_brock.c @@ -27,10 +27,10 @@ ActorInit En_Wiz_Brock_InitVars = { FLAGS, OBJECT_WIZ, sizeof(EnWizBrock), - (ActorFunc)EnWizBrock_Init, - (ActorFunc)EnWizBrock_Destroy, - (ActorFunc)EnWizBrock_Update, - (ActorFunc)EnWizBrock_Draw, + EnWizBrock_Init, + EnWizBrock_Destroy, + EnWizBrock_Update, + EnWizBrock_Draw, }; void EnWizBrock_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c index 4ed3333fdb..8cc6ce4af2 100644 --- a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c +++ b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c @@ -43,10 +43,10 @@ ActorInit En_Wiz_Fire_InitVars = { FLAGS, OBJECT_WIZ, sizeof(EnWizFire), - (ActorFunc)EnWizFire_Init, - (ActorFunc)EnWizFire_Destroy, - (ActorFunc)EnWizFire_Update, - (ActorFunc)EnWizFire_Draw, + EnWizFire_Init, + EnWizFire_Destroy, + EnWizFire_Update, + EnWizFire_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index ba63b30212..797a68c69e 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -44,10 +44,10 @@ ActorInit En_Wood02_InitVars = { FLAGS, OBJECT_WOOD02, sizeof(EnWood02), - (ActorFunc)EnWood02_Init, - (ActorFunc)EnWood02_Destroy, - (ActorFunc)EnWood02_Update, - (ActorFunc)EnWood02_Draw, + EnWood02_Init, + EnWood02_Destroy, + EnWood02_Update, + EnWood02_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Yb/z_en_yb.c b/src/overlays/actors/ovl_En_Yb/z_en_yb.c index 2310a2eef3..c811bd0818 100644 --- a/src/overlays/actors/ovl_En_Yb/z_en_yb.c +++ b/src/overlays/actors/ovl_En_Yb/z_en_yb.c @@ -38,10 +38,10 @@ ActorInit En_Yb_InitVars = { FLAGS, OBJECT_YB, sizeof(EnYb), - (ActorFunc)EnYb_Init, - (ActorFunc)EnYb_Destroy, - (ActorFunc)EnYb_Update, - (ActorFunc)EnYb_Draw, + EnYb_Init, + EnYb_Destroy, + EnYb_Update, + EnYb_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index e77aace23d..d8c4e774a9 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -21,10 +21,10 @@ ActorInit En_Zl1_InitVars = { FLAGS, OBJECT_ZL1, sizeof(EnZl1), - (ActorFunc)EnZl1_Init, - (ActorFunc)EnZl1_Destroy, - (ActorFunc)EnZl1_Update, - (ActorFunc)EnZl1_Draw, + EnZl1_Init, + EnZl1_Destroy, + EnZl1_Update, + EnZl1_Draw, }; void EnZl1_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index 3dffe0a6f6..55a0b04a64 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -24,10 +24,10 @@ ActorInit En_Zl4_InitVars = { FLAGS, OBJECT_STK, sizeof(EnZl4), - (ActorFunc)EnZl4_Init, - (ActorFunc)EnZl4_Destroy, - (ActorFunc)EnZl4_Update, - (ActorFunc)EnZl4_Draw, + EnZl4_Init, + EnZl4_Destroy, + EnZl4_Update, + EnZl4_Draw, }; #endif diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index a16b828f9e..c10c8ec4ab 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -25,10 +25,10 @@ ActorInit En_Zo_InitVars = { FLAGS, OBJECT_ZO, sizeof(EnZo), - (ActorFunc)EnZo_Init, - (ActorFunc)EnZo_Destroy, - (ActorFunc)EnZo_Update, - (ActorFunc)EnZo_Draw, + EnZo_Init, + EnZo_Destroy, + EnZo_Update, + EnZo_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Zob/z_en_zob.c b/src/overlays/actors/ovl_En_Zob/z_en_zob.c index 58dd246d8b..9c27096ca5 100644 --- a/src/overlays/actors/ovl_En_Zob/z_en_zob.c +++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.c @@ -43,10 +43,10 @@ ActorInit En_Zob_InitVars = { FLAGS, OBJECT_ZOB, sizeof(EnZob), - (ActorFunc)EnZob_Init, - (ActorFunc)EnZob_Destroy, - (ActorFunc)EnZob_Update, - (ActorFunc)EnZob_Draw, + EnZob_Init, + EnZob_Destroy, + EnZob_Update, + EnZob_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Zod/z_en_zod.c b/src/overlays/actors/ovl_En_Zod/z_en_zod.c index 83a5dda4b9..02c5b5f7ce 100644 --- a/src/overlays/actors/ovl_En_Zod/z_en_zod.c +++ b/src/overlays/actors/ovl_En_Zod/z_en_zod.c @@ -22,10 +22,10 @@ ActorInit En_Zod_InitVars = { FLAGS, OBJECT_ZOD, sizeof(EnZod), - (ActorFunc)EnZod_Init, - (ActorFunc)EnZod_Destroy, - (ActorFunc)EnZod_Update, - (ActorFunc)EnZod_Draw, + EnZod_Init, + EnZod_Destroy, + EnZod_Update, + EnZod_Draw, }; // static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Zog/z_en_zog.c b/src/overlays/actors/ovl_En_Zog/z_en_zog.c index a165d91feb..506ea90f93 100644 --- a/src/overlays/actors/ovl_En_Zog/z_en_zog.c +++ b/src/overlays/actors/ovl_En_Zog/z_en_zog.c @@ -39,10 +39,10 @@ ActorInit En_Zog_InitVars = { FLAGS, OBJECT_ZOG, sizeof(EnZog), - (ActorFunc)EnZog_Init, - (ActorFunc)EnZog_Destroy, - (ActorFunc)EnZog_Update, - (ActorFunc)EnZog_Draw, + EnZog_Init, + EnZog_Destroy, + EnZog_Update, + EnZog_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c index 2f6f0e7917..7bb51217b6 100644 --- a/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c +++ b/src/overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.c @@ -44,10 +44,10 @@ ActorInit En_Zoraegg_InitVars = { FLAGS, OBJECT_ZORAEGG, sizeof(EnZoraegg), - (ActorFunc)EnZoraegg_Init, - (ActorFunc)EnZoraegg_Destroy, - (ActorFunc)EnZoraegg_Update, - (ActorFunc)EnZoraegg_Draw, + EnZoraegg_Init, + EnZoraegg_Destroy, + EnZoraegg_Update, + EnZoraegg_Draw, }; void func_80B31590(EnZoraegg* this) { diff --git a/src/overlays/actors/ovl_En_Zos/z_en_zos.c b/src/overlays/actors/ovl_En_Zos/z_en_zos.c index ba37c3ffe3..c9458a3d7f 100644 --- a/src/overlays/actors/ovl_En_Zos/z_en_zos.c +++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.c @@ -56,10 +56,10 @@ ActorInit En_Zos_InitVars = { FLAGS, OBJECT_ZOS, sizeof(EnZos), - (ActorFunc)EnZos_Init, - (ActorFunc)EnZos_Destroy, - (ActorFunc)EnZos_Update, - (ActorFunc)EnZos_Draw, + EnZos_Init, + EnZos_Destroy, + EnZos_Update, + EnZos_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Zot/z_en_zot.c b/src/overlays/actors/ovl_En_Zot/z_en_zot.c index 417a6388e9..13ea8cd8e1 100644 --- a/src/overlays/actors/ovl_En_Zot/z_en_zot.c +++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.c @@ -38,10 +38,10 @@ ActorInit En_Zot_InitVars = { FLAGS, OBJECT_ZO, sizeof(EnZot), - (ActorFunc)EnZot_Init, - (ActorFunc)EnZot_Destroy, - (ActorFunc)EnZot_Update, - (ActorFunc)EnZot_Draw, + EnZot_Init, + EnZot_Destroy, + EnZot_Update, + EnZot_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.c b/src/overlays/actors/ovl_En_Zov/z_en_zov.c index 851214b5d3..85a386f192 100644 --- a/src/overlays/actors/ovl_En_Zov/z_en_zov.c +++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.c @@ -34,10 +34,10 @@ ActorInit En_Zov_InitVars = { FLAGS, OBJECT_ZOV, sizeof(EnZov), - (ActorFunc)EnZov_Init, - (ActorFunc)EnZov_Destroy, - (ActorFunc)EnZov_Update, - (ActorFunc)EnZov_Draw, + EnZov_Init, + EnZov_Destroy, + EnZov_Update, + EnZov_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_En_Zow/z_en_zow.c b/src/overlays/actors/ovl_En_Zow/z_en_zow.c index 7e37091623..004939230e 100644 --- a/src/overlays/actors/ovl_En_Zow/z_en_zow.c +++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.c @@ -28,10 +28,10 @@ ActorInit En_Zow_InitVars = { FLAGS, OBJECT_ZO, sizeof(EnZow), - (ActorFunc)EnZow_Init, - (ActorFunc)EnZow_Destroy, - (ActorFunc)EnZow_Update, - (ActorFunc)EnZow_Draw, + EnZow_Init, + EnZow_Destroy, + EnZow_Update, + EnZow_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c index c4d72a8f18..88c699b347 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c @@ -24,10 +24,10 @@ ActorInit Item_B_Heart_InitVars = { FLAGS, OBJECT_GI_HEARTS, sizeof(ItemBHeart), - (ActorFunc)ItemBHeart_Init, - (ActorFunc)ItemBHeart_Destroy, - (ActorFunc)ItemBHeart_Update, - (ActorFunc)ItemBHeart_Draw, + ItemBHeart_Init, + ItemBHeart_Destroy, + ItemBHeart_Update, + ItemBHeart_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index e327dc3f4e..e2654d489c 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -26,10 +26,10 @@ ActorInit Item_Etcetera_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ItemEtcetera), - (ActorFunc)ItemEtcetera_Init, - (ActorFunc)ItemEtcetera_Destroy, - (ActorFunc)ItemEtcetera_Update, - (ActorFunc)NULL, + ItemEtcetera_Init, + ItemEtcetera_Destroy, + ItemEtcetera_Update, + NULL, }; static s16 sObjectIds[] = { diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c index 0599e117dc..c3ed46fe21 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c @@ -23,10 +23,10 @@ ActorInit Item_Inbox_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ItemInbox), - (ActorFunc)ItemInbox_Init, - (ActorFunc)ItemInbox_Destroy, - (ActorFunc)ItemInbox_Update, - (ActorFunc)ItemInbox_Draw, + ItemInbox_Init, + ItemInbox_Destroy, + ItemInbox_Update, + ItemInbox_Draw, }; void ItemInbox_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 4880a326eb..53c5740616 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -47,10 +47,10 @@ ActorInit Mir_Ray_InitVars = { FLAGS, OBJECT_MIR_RAY, sizeof(MirRay), - (ActorFunc)MirRay_Init, - (ActorFunc)MirRay_Destroy, - (ActorFunc)MirRay_Update, - (ActorFunc)MirRay_Draw, + MirRay_Init, + MirRay_Destroy, + MirRay_Update, + MirRay_Draw, }; u8 D_808E3BF0 = false; diff --git a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c index a552e35ab1..3dd97a8c29 100644 --- a/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c +++ b/src/overlays/actors/ovl_Mir_Ray2/z_mir_ray2.c @@ -21,10 +21,10 @@ ActorInit Mir_Ray2_InitVars = { FLAGS, OBJECT_MIR_RAY, sizeof(MirRay2), - (ActorFunc)MirRay2_Init, - (ActorFunc)MirRay2_Destroy, - (ActorFunc)MirRay2_Update, - (ActorFunc)MirRay2_Draw, + MirRay2_Init, + MirRay2_Destroy, + MirRay2_Update, + MirRay2_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c index 8f6fcbfe90..f359a07ca4 100644 --- a/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c +++ b/src/overlays/actors/ovl_Mir_Ray3/z_mir_ray3.c @@ -22,10 +22,10 @@ ActorInit Mir_Ray3_InitVars = { FLAGS, OBJECT_MIR_RAY, sizeof(MirRay3), - (ActorFunc)MirRay3_Init, - (ActorFunc)MirRay3_Destroy, - (ActorFunc)MirRay3_Update, - (ActorFunc)MirRay3_Draw, + MirRay3_Init, + MirRay3_Destroy, + MirRay3_Update, + MirRay3_Draw, }; static ColliderQuadInit sQuadInit = { diff --git a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c index acea3daf10..b2235745b8 100644 --- a/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c +++ b/src/overlays/actors/ovl_Obj_Aqua/z_obj_aqua.c @@ -30,10 +30,10 @@ ActorInit Obj_Aqua_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjAqua), - (ActorFunc)ObjAqua_Init, - (ActorFunc)ObjAqua_Destroy, - (ActorFunc)ObjAqua_Update, - (ActorFunc)ObjAqua_Draw, + ObjAqua_Init, + ObjAqua_Destroy, + ObjAqua_Update, + ObjAqua_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c index 565c995046..6d8d2e539e 100644 --- a/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c +++ b/src/overlays/actors/ovl_Obj_Armos/z_obj_armos.c @@ -29,10 +29,10 @@ ActorInit Obj_Armos_InitVars = { FLAGS, OBJECT_AM, sizeof(ObjArmos), - (ActorFunc)ObjArmos_Init, - (ActorFunc)ObjArmos_Destroy, - (ActorFunc)ObjArmos_Update, - (ActorFunc)ObjArmos_Draw, + ObjArmos_Init, + ObjArmos_Destroy, + ObjArmos_Update, + ObjArmos_Draw, }; s16 D_809A5BB0[] = { 1, -1, 0, 0 }; diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index 35f37d5d8a..d319371311 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -66,10 +66,10 @@ ActorInit Obj_Bean_InitVars = { FLAGS, OBJECT_MAMENOKI, sizeof(ObjBean), - (ActorFunc)ObjBean_Init, - (ActorFunc)ObjBean_Destroy, - (ActorFunc)ObjBean_Update, - (ActorFunc)NULL, + ObjBean_Init, + ObjBean_Destroy, + ObjBean_Update, + NULL, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c index f8534afea7..24c4790f55 100644 --- a/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c +++ b/src/overlays/actors/ovl_Obj_Bell/z_obj_bell.c @@ -25,10 +25,10 @@ ActorInit Obj_Bell_InitVars = { FLAGS, OBJECT_F52_OBJ, sizeof(ObjBell), - (ActorFunc)ObjBell_Init, - (ActorFunc)ObjBell_Destroy, - (ActorFunc)ObjBell_Update, - (ActorFunc)ObjBell_Draw, + ObjBell_Init, + ObjBell_Destroy, + ObjBell_Update, + ObjBell_Draw, }; // Bell Post? diff --git a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c index 4b7e9f4714..8a9b8c9a31 100644 --- a/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c +++ b/src/overlays/actors/ovl_Obj_Bigicicle/z_obj_bigicicle.c @@ -30,10 +30,10 @@ ActorInit Obj_Bigicicle_InitVars = { FLAGS, OBJECT_BIGICICLE, sizeof(ObjBigicicle), - (ActorFunc)ObjBigicicle_Init, - (ActorFunc)ObjBigicicle_Destroy, - (ActorFunc)ObjBigicicle_Update, - (ActorFunc)ObjBigicicle_Draw, + ObjBigicicle_Init, + ObjBigicicle_Destroy, + ObjBigicicle_Update, + ObjBigicicle_Draw, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c index 437f0c2346..a87d0e6750 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c @@ -23,10 +23,10 @@ ActorInit Obj_Blockstop_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjBlockstop), - (ActorFunc)ObjBlockstop_Init, - (ActorFunc)Actor_Noop, - (ActorFunc)ObjBlockstop_Update, - (ActorFunc)NULL, + ObjBlockstop_Init, + Actor_Noop, + ObjBlockstop_Update, + NULL, }; void ObjBlockstop_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c index c48ff332ce..b0188d145b 100644 --- a/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c +++ b/src/overlays/actors/ovl_Obj_Boat/z_obj_boat.c @@ -24,10 +24,10 @@ ActorInit Obj_Boat_InitVars = { FLAGS, OBJECT_KAIZOKU_OBJ, sizeof(ObjBoat), - (ActorFunc)ObjBoat_Init, - (ActorFunc)ObjBoat_Destroy, - (ActorFunc)ObjBoat_Update, - (ActorFunc)ObjBoat_Draw, + ObjBoat_Init, + ObjBoat_Destroy, + ObjBoat_Update, + ObjBoat_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index 84b2abc634..60dc984b85 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -30,10 +30,10 @@ ActorInit Obj_Bombiwa_InitVars = { FLAGS, OBJECT_BOMBIWA, sizeof(ObjBombiwa), - (ActorFunc)ObjBombiwa_Init, - (ActorFunc)ObjBombiwa_Destroy, - (ActorFunc)ObjBombiwa_Update, - (ActorFunc)NULL, + ObjBombiwa_Init, + ObjBombiwa_Destroy, + ObjBombiwa_Update, + NULL, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c index cfecbdad05..550be1da63 100644 --- a/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c +++ b/src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c @@ -24,10 +24,10 @@ ActorInit Obj_Boyo_InitVars = { FLAGS, OBJECT_BOYO, sizeof(ObjBoyo), - (ActorFunc)ObjBoyo_Init, - (ActorFunc)ObjBoyo_Destroy, - (ActorFunc)ObjBoyo_Update, - (ActorFunc)ObjBoyo_Draw, + ObjBoyo_Init, + ObjBoyo_Destroy, + ObjBoyo_Update, + ObjBoyo_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c index 27f5cc2736..c751fbaa1f 100644 --- a/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c +++ b/src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c @@ -34,10 +34,10 @@ ActorInit Obj_Chan_InitVars = { FLAGS, OBJECT_OBJ_CHAN, sizeof(ObjChan), - (ActorFunc)ObjChan_Init, - (ActorFunc)ObjChan_Destroy, - (ActorFunc)ObjChan_Update, - (ActorFunc)ObjChan_Draw, + ObjChan_Init, + ObjChan_Destroy, + ObjChan_Update, + ObjChan_Draw, }; static ColliderCylinderInit sObjChanCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c index 0c888a4ac6..70d1817db6 100644 --- a/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c +++ b/src/overlays/actors/ovl_Obj_Chikuwa/z_obj_chikuwa.c @@ -23,10 +23,10 @@ ActorInit Obj_Chikuwa_InitVars = { FLAGS, OBJECT_D_LIFT, sizeof(ObjChikuwa), - (ActorFunc)ObjChikuwa_Init, - (ActorFunc)ObjChikuwa_Destroy, - (ActorFunc)ObjChikuwa_Update, - (ActorFunc)ObjChikuwa_Draw, + ObjChikuwa_Init, + ObjChikuwa_Destroy, + ObjChikuwa_Update, + ObjChikuwa_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index b033447080..77f02ec5e8 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -28,10 +28,10 @@ ActorInit Obj_Comb_InitVars = { FLAGS, OBJECT_COMB, sizeof(ObjComb), - (ActorFunc)ObjComb_Init, - (ActorFunc)ObjComb_Destroy, - (ActorFunc)ObjComb_Update, - (ActorFunc)ObjComb_Draw, + ObjComb_Init, + ObjComb_Destroy, + ObjComb_Update, + ObjComb_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c index 9daa20badb..c9529c8531 100644 --- a/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c +++ b/src/overlays/actors/ovl_Obj_Danpeilift/z_obj_danpeilift.c @@ -27,10 +27,10 @@ ActorInit Obj_Danpeilift_InitVars = { FLAGS, OBJECT_OBJ_DANPEILIFT, sizeof(ObjDanpeilift), - (ActorFunc)ObjDanpeilift_Init, - (ActorFunc)ObjDanpeilift_Destroy, - (ActorFunc)ObjDanpeilift_Update, - (ActorFunc)ObjDanpeilift_Draw, + ObjDanpeilift_Init, + ObjDanpeilift_Destroy, + ObjDanpeilift_Update, + ObjDanpeilift_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c index 060e793ca8..84761f9a7f 100644 --- a/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c +++ b/src/overlays/actors/ovl_Obj_Demo/z_obj_demo.c @@ -23,10 +23,10 @@ ActorInit Obj_Demo_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjDemo), - (ActorFunc)ObjDemo_Init, - (ActorFunc)Actor_Noop, - (ActorFunc)ObjDemo_Update, - (ActorFunc)NULL, + ObjDemo_Init, + Actor_Noop, + ObjDemo_Update, + NULL, }; void ObjDemo_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c index fce6d99ece..aebc5b7372 100644 --- a/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c +++ b/src/overlays/actors/ovl_Obj_Dhouse/z_obj_dhouse.c @@ -34,10 +34,10 @@ ActorInit Obj_Dhouse_InitVars = { FLAGS, OBJECT_DHOUSE, sizeof(ObjDhouse), - (ActorFunc)ObjDhouse_Init, - (ActorFunc)ObjDhouse_Destroy, - (ActorFunc)ObjDhouse_Update, - (ActorFunc)ObjDhouse_Draw, + ObjDhouse_Init, + ObjDhouse_Destroy, + ObjDhouse_Update, + ObjDhouse_Draw, }; ObjDhouseStruct3 D_80B13E90[] = { diff --git a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c index 5a9ef2d05a..872b07488e 100644 --- a/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c +++ b/src/overlays/actors/ovl_Obj_Dinner/z_obj_dinner.c @@ -22,10 +22,10 @@ ActorInit Obj_Dinner_InitVars = { FLAGS, OBJECT_OBJ_DINNER, sizeof(ObjDinner), - (ActorFunc)ObjDinner_Init, - (ActorFunc)ObjDinner_Destroy, - (ActorFunc)ObjDinner_Update, - (ActorFunc)ObjDinner_Draw, + ObjDinner_Init, + ObjDinner_Destroy, + ObjDinner_Update, + ObjDinner_Draw, }; void ObjDinner_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c index 9b6c812663..2b8f814273 100644 --- a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c +++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c @@ -41,10 +41,10 @@ ActorInit Obj_Dora_InitVars = { FLAGS, OBJECT_DORA, sizeof(ObjDora), - (ActorFunc)ObjDora_Init, - (ActorFunc)ObjDora_Destroy, - (ActorFunc)ObjDora_Update, - (ActorFunc)ObjDora_Draw, + ObjDora_Init, + ObjDora_Destroy, + ObjDora_Update, + ObjDora_Draw, }; static ColliderTrisElementInit sTrisElementsInit[6] = { diff --git a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c index 01675c173b..ae76b4c3ce 100644 --- a/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c +++ b/src/overlays/actors/ovl_Obj_Dowsing/z_obj_dowsing.c @@ -23,10 +23,10 @@ ActorInit Obj_Dowsing_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjDowsing), - (ActorFunc)ObjDowsing_Init, - (ActorFunc)ObjDowsing_Destroy, - (ActorFunc)ObjDowsing_Update, - (ActorFunc)NULL, + ObjDowsing_Init, + ObjDowsing_Destroy, + ObjDowsing_Update, + NULL, }; s32 ObjDowsing_GetFlag(ObjDowsing* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c index f0eaaf25ac..dbf3f1d5f9 100644 --- a/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c +++ b/src/overlays/actors/ovl_Obj_Driftice/z_obj_driftice.c @@ -31,10 +31,10 @@ ActorInit Obj_Driftice_InitVars = { FLAGS, OBJECT_DRIFTICE, sizeof(ObjDriftice), - (ActorFunc)ObjDriftice_Init, - (ActorFunc)ObjDriftice_Destroy, - (ActorFunc)ObjDriftice_Update, - (ActorFunc)ObjDriftice_Draw, + ObjDriftice_Init, + ObjDriftice_Destroy, + ObjDriftice_Update, + ObjDriftice_Draw, }; static f32 D_80A67620[][3] = { diff --git a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c index fd2bf4c022..a06ac4c208 100644 --- a/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c +++ b/src/overlays/actors/ovl_Obj_Ending/z_obj_ending.c @@ -21,10 +21,10 @@ ActorInit Obj_Ending_InitVars = { FLAGS, OBJECT_ENDING_OBJ, sizeof(ObjEnding), - (ActorFunc)ObjEnding_Init, - (ActorFunc)Actor_Noop, - (ActorFunc)ObjEnding_Update, - (ActorFunc)ObjEnding_Draw, + ObjEnding_Init, + Actor_Noop, + ObjEnding_Update, + ObjEnding_Draw, }; static ObjEndingModelInfo sModelInfo[] = { diff --git a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c index 723dfcf3e0..727eb3dc1c 100644 --- a/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c +++ b/src/overlays/actors/ovl_Obj_Entotu/z_obj_entotu.c @@ -22,10 +22,10 @@ ActorInit Obj_Entotu_InitVars = { FLAGS, OBJECT_F53_OBJ, sizeof(ObjEntotu), - (ActorFunc)ObjEntotu_Init, - (ActorFunc)ObjEntotu_Destroy, - (ActorFunc)ObjEntotu_Update, - (ActorFunc)ObjEntotu_Draw, + ObjEntotu_Init, + ObjEntotu_Destroy, + ObjEntotu_Update, + ObjEntotu_Draw, }; #include "overlays/ovl_Obj_Entotu/ovl_Obj_Entotu.c" diff --git a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c index ceedeb6c49..eb9d1e3552 100644 --- a/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c +++ b/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c @@ -26,10 +26,10 @@ ActorInit Obj_Etcetera_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjEtcetera), - (ActorFunc)ObjEtcetera_Init, - (ActorFunc)ObjEtcetera_Destroy, - (ActorFunc)ObjEtcetera_Update, - (ActorFunc)NULL, + ObjEtcetera_Init, + ObjEtcetera_Destroy, + ObjEtcetera_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c index a4c4e21d21..e2d27e1a95 100644 --- a/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c +++ b/src/overlays/actors/ovl_Obj_Fireshield/z_obj_fireshield.c @@ -28,10 +28,10 @@ ActorInit Obj_Fireshield_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjFireshield), - (ActorFunc)ObjFireshield_Init, - (ActorFunc)ObjFireshield_Destroy, - (ActorFunc)ObjFireshield_Update, - (ActorFunc)ObjFireshield_Draw, + ObjFireshield_Init, + ObjFireshield_Destroy, + ObjFireshield_Update, + ObjFireshield_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c index 49e8ac9342..87a387f0ac 100644 --- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c +++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c @@ -37,10 +37,10 @@ ActorInit Obj_Flowerpot_InitVars = { FLAGS, OBJECT_FLOWERPOT, sizeof(ObjFlowerpot), - (ActorFunc)ObjFlowerpot_Init, - (ActorFunc)ObjFlowerpot_Destroy, - (ActorFunc)ObjFlowerpot_Update, - (ActorFunc)ObjFlowerpot_Draw, + ObjFlowerpot_Init, + ObjFlowerpot_Destroy, + ObjFlowerpot_Update, + ObjFlowerpot_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[2] = { diff --git a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c index c3d4d1398e..25cff388f5 100644 --- a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c +++ b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c @@ -16,8 +16,8 @@ void ObjFunen_Draw(Actor* thisx, PlayState* play); ActorInit Obj_Funen_InitVars = { ACTOR_OBJ_FUNEN, ACTORCAT_PROP, FLAGS, - OBJECT_FUNEN, sizeof(ObjFunen), (ActorFunc)ObjFunen_Init, - (ActorFunc)Actor_Noop, (ActorFunc)Actor_Noop, (ActorFunc)ObjFunen_Draw, + OBJECT_FUNEN, sizeof(ObjFunen), ObjFunen_Init, + Actor_Noop, Actor_Noop, ObjFunen_Draw, }; f32 D_80A198D0[] = { 0.1f, 0.024390244f }; diff --git a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c index 0581706d5d..48faa330dc 100644 --- a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c +++ b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c @@ -30,10 +30,10 @@ ActorInit Obj_Ghaka_InitVars = { FLAGS, OBJECT_GHAKA, sizeof(ObjGhaka), - (ActorFunc)ObjGhaka_Init, - (ActorFunc)ObjGhaka_Destroy, - (ActorFunc)ObjGhaka_Update, - (ActorFunc)ObjGhaka_Draw, + ObjGhaka_Init, + ObjGhaka_Destroy, + ObjGhaka_Update, + ObjGhaka_Draw, }; static Vec3f D_80B3C960 = { 0.0f, 0.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c index 3414aaafad..1d96275fc3 100644 --- a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c +++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c @@ -32,10 +32,10 @@ ActorInit Obj_Grass_InitVars = { FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(ObjGrass), - (ActorFunc)ObjGrass_Init, - (ActorFunc)ObjGrass_Destroy, - (ActorFunc)ObjGrass_Update, - (ActorFunc)ObjGrass_Draw, + ObjGrass_Init, + ObjGrass_Destroy, + ObjGrass_Update, + ObjGrass_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c index 9872fb0b71..4785057b5e 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c +++ b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c @@ -35,10 +35,10 @@ ActorInit Obj_Grass_Carry_InitVars = { FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(ObjGrassCarry), - (ActorFunc)ObjGrassCarry_Init, - (ActorFunc)ObjGrassCarry_Destroy, - (ActorFunc)ObjGrassCarry_Update, - (ActorFunc)NULL, + ObjGrassCarry_Init, + ObjGrassCarry_Destroy, + ObjGrassCarry_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c index c57ed608fc..1b29222090 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c +++ b/src/overlays/actors/ovl_Obj_Grass_Unit/z_obj_grass_unit.c @@ -19,10 +19,10 @@ ActorInit Obj_Grass_Unit_InitVars = { FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(ObjGrassUnit), - (ActorFunc)ObjGrassUnit_Init, - (ActorFunc)Actor_Noop, - (ActorFunc)Actor_Noop, - (ActorFunc)NULL, + ObjGrassUnit_Init, + Actor_Noop, + Actor_Noop, + NULL, }; #endif diff --git a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c index 9c38849c9a..572075eb37 100644 --- a/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c +++ b/src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.c @@ -43,10 +43,10 @@ ActorInit Obj_Hakaisi_InitVars = { FLAGS, OBJECT_HAKAISI, sizeof(ObjHakaisi), - (ActorFunc)ObjHakaisi_Init, - (ActorFunc)ObjHakaisi_Destroy, - (ActorFunc)ObjHakaisi_Update, - (ActorFunc)ObjHakaisi_Draw, + ObjHakaisi_Init, + ObjHakaisi_Destroy, + ObjHakaisi_Update, + ObjHakaisi_Draw, }; Vec3f D_80B155B0 = { 0.0f, 25.0f, 30.0f }; diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index 752b669cff..592b7cf39d 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -22,10 +22,10 @@ ActorInit Obj_Hamishi_InitVars = { FLAGS, GAMEPLAY_FIELD_KEEP, sizeof(ObjHamishi), - (ActorFunc)ObjHamishi_Init, - (ActorFunc)ObjHamishi_Destroy, - (ActorFunc)ObjHamishi_Update, - (ActorFunc)ObjHamishi_Draw, + ObjHamishi_Init, + ObjHamishi_Destroy, + ObjHamishi_Update, + ObjHamishi_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c index 97fbbec3d9..6dae1b3aed 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -22,10 +22,10 @@ ActorInit Obj_Hana_InitVars = { FLAGS, OBJECT_HANA, sizeof(ObjHana), - (ActorFunc)ObjHana_Init, - (ActorFunc)ObjHana_Destroy, - (ActorFunc)ObjHana_Update, - (ActorFunc)ObjHana_Draw, + ObjHana_Init, + ObjHana_Destroy, + ObjHana_Update, + ObjHana_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c index 1c33af7fe4..cfcfd6afbf 100644 --- a/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c +++ b/src/overlays/actors/ovl_Obj_Hariko/z_obj_hariko.c @@ -29,10 +29,10 @@ ActorInit Obj_Hariko_InitVars = { FLAGS, OBJECT_HARIKO, sizeof(ObjHariko), - (ActorFunc)ObjHariko_Init, - (ActorFunc)ObjHariko_Destroy, - (ActorFunc)ObjHariko_Update, - (ActorFunc)ObjHariko_Draw, + ObjHariko_Init, + ObjHariko_Destroy, + ObjHariko_Update, + ObjHariko_Draw, }; void ObjHariko_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c index e3972be180..13bfc5d606 100644 --- a/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c +++ b/src/overlays/actors/ovl_Obj_Hgdoor/z_obj_hgdoor.c @@ -32,10 +32,10 @@ ActorInit Obj_Hgdoor_InitVars = { FLAGS, OBJECT_HGDOOR, sizeof(ObjHgdoor), - (ActorFunc)ObjHgdoor_Init, - (ActorFunc)ObjHgdoor_Destroy, - (ActorFunc)ObjHgdoor_Update, - (ActorFunc)ObjHgdoor_Draw, + ObjHgdoor_Init, + ObjHgdoor_Destroy, + ObjHgdoor_Update, + ObjHgdoor_Draw, }; static s16 sOpenFlag = 0; diff --git a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c index ae047f0292..eac1ba50e1 100644 --- a/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c +++ b/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.c @@ -27,10 +27,10 @@ ActorInit Obj_HsStump_InitVars = { FLAGS, OBJECT_HSSTUMP, sizeof(ObjHsStump), - (ActorFunc)ObjHsStump_Init, - (ActorFunc)ObjHsStump_Destroy, - (ActorFunc)ObjHsStump_Update, - (ActorFunc)ObjHsStump_Draw, + ObjHsStump_Init, + ObjHsStump_Destroy, + ObjHsStump_Update, + ObjHsStump_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index 26d89f00df..dd1618dfca 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -29,10 +29,10 @@ ActorInit Obj_Hsblock_InitVars = { FLAGS, OBJECT_D_HSBLOCK, sizeof(ObjHsblock), - (ActorFunc)ObjHsblock_Init, - (ActorFunc)ObjHsblock_Destroy, - (ActorFunc)ObjHsblock_Update, - (ActorFunc)ObjHsblock_Draw, + ObjHsblock_Init, + ObjHsblock_Destroy, + ObjHsblock_Update, + ObjHsblock_Draw, }; static f32 sFocusHeights[] = { 85.0f, 85.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c index cade13522e..0b29654586 100644 --- a/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c +++ b/src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c @@ -34,10 +34,10 @@ ActorInit Obj_Hugebombiwa_InitVars = { FLAGS, OBJECT_BOMBIWA, sizeof(ObjHugebombiwa), - (ActorFunc)ObjHugebombiwa_Init, - (ActorFunc)ObjHugebombiwa_Destroy, - (ActorFunc)ObjHugebombiwa_Update, - (ActorFunc)ObjHugebombiwa_Draw, + ObjHugebombiwa_Init, + ObjHugebombiwa_Destroy, + ObjHugebombiwa_Update, + ObjHugebombiwa_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c index f35d270a03..ff67174e94 100644 --- a/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c +++ b/src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.c @@ -52,10 +52,10 @@ ActorInit Obj_Hunsui_InitVars = { FLAGS, OBJECT_HUNSUI, sizeof(ObjHunsui), - (ActorFunc)ObjHunsui_Init, - (ActorFunc)ObjHunsui_Destroy, - (ActorFunc)ObjHunsui_Update, - (ActorFunc)ObjHunsui_Draw, + ObjHunsui_Init, + ObjHunsui_Destroy, + ObjHunsui_Update, + ObjHunsui_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c index 13f49fd1f8..f83ec9e813 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -28,10 +28,10 @@ ActorInit Obj_Ice_Poly_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjIcePoly), - (ActorFunc)ObjIcePoly_Init, - (ActorFunc)ObjIcePoly_Destroy, - (ActorFunc)ObjIcePoly_Update, - (ActorFunc)ObjIcePoly_Draw, + ObjIcePoly_Init, + ObjIcePoly_Destroy, + ObjIcePoly_Update, + ObjIcePoly_Draw, }; static ColliderCylinderInit sCylinderInit1 = { diff --git a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c index 8c88c35eee..55118ef729 100644 --- a/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c +++ b/src/overlays/actors/ovl_Obj_Iceblock/z_obj_iceblock.c @@ -51,10 +51,10 @@ ActorInit Obj_Iceblock_InitVars = { FLAGS, OBJECT_ICE_BLOCK, sizeof(ObjIceblock), - (ActorFunc)ObjIceblock_Init, - (ActorFunc)ObjIceblock_Destroy, - (ActorFunc)ObjIceblock_Update, - (ActorFunc)ObjIceblock_Draw, + ObjIceblock_Init, + ObjIceblock_Destroy, + ObjIceblock_Update, + ObjIceblock_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c index 0f4f835039..6c0e5fa7eb 100644 --- a/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c +++ b/src/overlays/actors/ovl_Obj_Jg_Gakki/z_obj_jg_gakki.c @@ -22,10 +22,10 @@ ActorInit Obj_Jg_Gakki_InitVars = { FLAGS, OBJECT_JG, sizeof(ObjJgGakki), - (ActorFunc)ObjJgGakki_Init, - (ActorFunc)ObjJgGakki_Destroy, - (ActorFunc)ObjJgGakki_Update, - (ActorFunc)ObjJgGakki_Draw, + ObjJgGakki_Init, + ObjJgGakki_Destroy, + ObjJgGakki_Update, + ObjJgGakki_Draw, }; void ObjJgGakki_Init(Actor* thisx, PlayState* play2) { diff --git a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c index af05f0ba34..200ff752a1 100644 --- a/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c +++ b/src/overlays/actors/ovl_Obj_Jgame_Light/z_obj_jgame_light.c @@ -33,10 +33,10 @@ ActorInit Obj_Jgame_Light_InitVars = { FLAGS, OBJECT_SYOKUDAI, sizeof(ObjJgameLight), - (ActorFunc)ObjJgameLight_Init, - (ActorFunc)ObjJgameLight_Destroy, - (ActorFunc)ObjJgameLight_Update, - (ActorFunc)ObjJgameLight_Draw, + ObjJgameLight_Init, + ObjJgameLight_Destroy, + ObjJgameLight_Update, + ObjJgameLight_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c index 3942fff76e..3801f0d0b0 100644 --- a/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c +++ b/src/overlays/actors/ovl_Obj_Kendo_Kanban/z_obj_kendo_kanban.c @@ -50,10 +50,10 @@ ActorInit Obj_Kendo_Kanban_InitVars = { FLAGS, OBJECT_DORA, sizeof(ObjKendoKanban), - (ActorFunc)ObjKendoKanban_Init, - (ActorFunc)ObjKendoKanban_Destroy, - (ActorFunc)ObjKendoKanban_Update, - (ActorFunc)ObjKendoKanban_Draw, + ObjKendoKanban_Init, + ObjKendoKanban_Destroy, + ObjKendoKanban_Update, + ObjKendoKanban_Draw, }; // Directly applied to the velocity of the actor upon object creation. diff --git a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c index abd9b25771..cb47a3d4cb 100644 --- a/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c +++ b/src/overlays/actors/ovl_Obj_Kepn_Koya/z_obj_kepn_koya.c @@ -22,10 +22,10 @@ ActorInit Obj_Kepn_Koya_InitVars = { FLAGS, OBJECT_KEPN_KOYA, sizeof(ObjKepnKoya), - (ActorFunc)ObjKepnKoya_Init, - (ActorFunc)ObjKepnKoya_Destroy, - (ActorFunc)ObjKepnKoya_Update, - (ActorFunc)ObjKepnKoya_Draw, + ObjKepnKoya_Init, + ObjKepnKoya_Destroy, + ObjKepnKoya_Update, + ObjKepnKoya_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index 36927b2629..c8142a3545 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -42,10 +42,10 @@ ActorInit Obj_Kibako_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjKibako), - (ActorFunc)ObjKibako_Init, - (ActorFunc)ObjKibako_Destroy, - (ActorFunc)ObjKibako_Update, - (ActorFunc)NULL, + ObjKibako_Init, + ObjKibako_Destroy, + ObjKibako_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index 06af2a8e31..35554928dc 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -25,10 +25,10 @@ ActorInit Obj_Kibako2_InitVars = { FLAGS, OBJECT_KIBAKO2, sizeof(ObjKibako2), - (ActorFunc)ObjKibako2_Init, - (ActorFunc)ObjKibako2_Destroy, - (ActorFunc)ObjKibako2_Update, - (ActorFunc)ObjKibako2_Draw, + ObjKibako2_Init, + ObjKibako2_Destroy, + ObjKibako2_Update, + ObjKibako2_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c index 9c9215b24f..ca1fb48e52 100644 --- a/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c +++ b/src/overlays/actors/ovl_Obj_Kinoko/z_obj_kinoko.c @@ -22,10 +22,10 @@ ActorInit Obj_Kinoko_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjKinoko), - (ActorFunc)ObjKinoko_Init, - (ActorFunc)ObjKinoko_Destroy, - (ActorFunc)ObjKinoko_Update, - (ActorFunc)ObjKinoko_Draw, + ObjKinoko_Init, + ObjKinoko_Destroy, + ObjKinoko_Update, + ObjKinoko_Draw, }; void ObjKinoko_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c index 9ceff660e4..f7d253eced 100644 --- a/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c +++ b/src/overlays/actors/ovl_Obj_Kzsaku/z_obj_kzsaku.c @@ -29,10 +29,10 @@ ActorInit Obj_Kzsaku_InitVars = { FLAGS, OBJECT_KZSAKU, sizeof(ObjKzsaku), - (ActorFunc)ObjKzsaku_Init, - (ActorFunc)ObjKzsaku_Destroy, - (ActorFunc)ObjKzsaku_Update, - (ActorFunc)ObjKzsaku_Draw, + ObjKzsaku_Init, + ObjKzsaku_Destroy, + ObjKzsaku_Update, + ObjKzsaku_Draw, }; void ObjKzsaku_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c index aff88964b1..a917a09058 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -33,10 +33,10 @@ ActorInit Obj_Lift_InitVars = { FLAGS, OBJECT_D_LIFT, sizeof(ObjLift), - (ActorFunc)ObjLift_Init, - (ActorFunc)ObjLift_Destroy, - (ActorFunc)ObjLift_Update, - (ActorFunc)ObjLift_Draw, + ObjLift_Init, + ObjLift_Destroy, + ObjLift_Update, + ObjLift_Draw, }; static s16 D_8093DD50[] = { 0, 10, 20, 30, 40, 50, 60 }; diff --git a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c index 16a628fa25..81c2f3bf8a 100644 --- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c +++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c @@ -28,10 +28,10 @@ ActorInit Obj_Lightblock_InitVars = { FLAGS, OBJECT_LIGHTBLOCK, sizeof(ObjLightblock), - (ActorFunc)ObjLightblock_Init, - (ActorFunc)ObjLightblock_Destroy, - (ActorFunc)ObjLightblock_Update, - (ActorFunc)ObjLightblock_Draw, + ObjLightblock_Init, + ObjLightblock_Destroy, + ObjLightblock_Update, + ObjLightblock_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index f2946d5362..b8fc4fc542 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -33,10 +33,10 @@ ActorInit Obj_Lightswitch_InitVars = { FLAGS, OBJECT_LIGHTSWITCH, sizeof(ObjLightswitch), - (ActorFunc)ObjLightswitch_Init, - (ActorFunc)ObjLightswitch_Destroy, - (ActorFunc)ObjLightswitch_Update, - (ActorFunc)ObjLightswitch_Draw, + ObjLightswitch_Init, + ObjLightswitch_Destroy, + ObjLightswitch_Update, + ObjLightswitch_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c index 6620c51166..f6d1928458 100644 --- a/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c +++ b/src/overlays/actors/ovl_Obj_Lupygamelift/z_obj_lupygamelift.c @@ -27,10 +27,10 @@ ActorInit Obj_Lupygamelift_InitVars = { FLAGS, OBJECT_RAILLIFT, sizeof(ObjLupygamelift), - (ActorFunc)ObjLupygamelift_Init, - (ActorFunc)ObjLupygamelift_Destroy, - (ActorFunc)ObjLupygamelift_Update, - (ActorFunc)ObjLupygamelift_Draw, + ObjLupygamelift_Init, + ObjLupygamelift_Destroy, + ObjLupygamelift_Update, + ObjLupygamelift_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index c46821ac15..71d5c55104 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -24,10 +24,10 @@ ActorInit Obj_Makekinsuta_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjMakekinsuta), - (ActorFunc)ObjMakekinsuta_Init, - (ActorFunc)ObjMakekinsuta_Destroy, - (ActorFunc)ObjMakekinsuta_Update, - (ActorFunc)NULL, + ObjMakekinsuta_Init, + ObjMakekinsuta_Destroy, + ObjMakekinsuta_Update, + NULL, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index bb7d30f694..b054c3d294 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -19,10 +19,10 @@ ActorInit Obj_Makeoshihiki_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjMakeoshihiki), - (ActorFunc)ObjMakeoshihiki_Init, - (ActorFunc)Actor_Noop, - (ActorFunc)ObjMakeoshihiki_Update, - (ActorFunc)NULL, + ObjMakeoshihiki_Init, + Actor_Noop, + ObjMakeoshihiki_Update, + NULL, }; s32 ObjMakeoshihiki_GetChildSpawnPointIndex(ObjMakeoshihiki* this, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c index 8ff6e84559..a9bf58f354 100644 --- a/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c +++ b/src/overlays/actors/ovl_Obj_Milk_Bin/z_obj_milk_bin.c @@ -22,10 +22,10 @@ ActorInit Obj_Milk_Bin_InitVars = { FLAGS, OBJECT_OBJ_MILK_BIN, sizeof(ObjMilkBin), - (ActorFunc)ObjMilkBin_Init, - (ActorFunc)ObjMilkBin_Destroy, - (ActorFunc)ObjMilkBin_Update, - (ActorFunc)ObjMilkBin_Draw, + ObjMilkBin_Init, + ObjMilkBin_Destroy, + ObjMilkBin_Update, + ObjMilkBin_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c index 556f72b678..78b3fbe6b1 100644 --- a/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c +++ b/src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c @@ -22,10 +22,10 @@ ActorInit Obj_Mine_InitVars = { FLAGS, OBJECT_NY, sizeof(ObjMine), - (ActorFunc)ObjMine_Init, - (ActorFunc)ObjMine_Destroy, - (ActorFunc)ObjMine_Update, - (ActorFunc)ObjMine_Draw, + ObjMine_Init, + ObjMine_Destroy, + ObjMine_Update, + ObjMine_Draw, }; // static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c index 18c36f87ee..fcdab04739 100644 --- a/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c +++ b/src/overlays/actors/ovl_Obj_Moon_Stone/z_obj_moon_stone.c @@ -31,10 +31,10 @@ ActorInit Obj_Moon_Stone_InitVars = { FLAGS, OBJECT_GI_RESERVE00, sizeof(ObjMoonStone), - (ActorFunc)ObjMoonStone_Init, - (ActorFunc)ObjMoonStone_Destroy, - (ActorFunc)ObjMoonStone_Update, - (ActorFunc)ObjMoonStone_Draw, + ObjMoonStone_Init, + ObjMoonStone_Destroy, + ObjMoonStone_Update, + ObjMoonStone_Draw, }; void ObjMoonStone_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c index e2750e6392..64d848da75 100644 --- a/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c +++ b/src/overlays/actors/ovl_Obj_Mu_Pict/z_obj_mu_pict.c @@ -31,10 +31,10 @@ ActorInit Obj_Mu_Pict_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjMuPict), - (ActorFunc)ObjMuPict_Init, - (ActorFunc)ObjMuPict_Destroy, - (ActorFunc)ObjMuPict_Update, - (ActorFunc)ObjMuPict_Draw, + ObjMuPict_Init, + ObjMuPict_Destroy, + ObjMuPict_Update, + ObjMuPict_Draw, }; void ObjMuPict_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c index 815c15af80..e3a13f8406 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -26,10 +26,10 @@ ActorInit Obj_Mure_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjMure), - (ActorFunc)ObjMure_Init, - (ActorFunc)ObjMure_Destroy, - (ActorFunc)ObjMure_Update, - (ActorFunc)NULL, + ObjMure_Init, + ObjMure_Destroy, + ObjMure_Update, + NULL, }; static f32 sZClip[] = { diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index bda4dc2585..9c9c6dc39c 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -24,10 +24,10 @@ ActorInit Obj_Mure2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjMure2), - (ActorFunc)ObjMure2_Init, - (ActorFunc)Actor_Noop, - (ActorFunc)ObjMure2_Update, - (ActorFunc)NULL, + ObjMure2_Init, + Actor_Noop, + ObjMure2_Update, + NULL, }; // static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c index 00f0cc5d74..7ec5c79c17 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -27,10 +27,10 @@ ActorInit Obj_Mure3_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjMure3), - (ActorFunc)ObjMure3_Init, - (ActorFunc)ObjMure3_Destroy, - (ActorFunc)ObjMure3_Update, - (ActorFunc)NULL, + ObjMure3_Init, + ObjMure3_Destroy, + ObjMure3_Update, + NULL, }; static s16 sRupeeCounts[] = { 5, 5, 7, 0 }; diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c index 933ea06d26..f5f81e6ecf 100644 --- a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c +++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c @@ -38,10 +38,10 @@ ActorInit Obj_Nozoki_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjNozoki), - (ActorFunc)ObjNozoki_Init, - (ActorFunc)ObjNozoki_Destroy, - (ActorFunc)ObjNozoki_Update, - (ActorFunc)NULL, + ObjNozoki_Init, + ObjNozoki_Destroy, + ObjNozoki_Update, + NULL, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c index 3a25ef4020..4a51236b13 100644 --- a/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c +++ b/src/overlays/actors/ovl_Obj_Ocarinalift/z_obj_ocarinalift.c @@ -37,10 +37,10 @@ ActorInit Obj_Ocarinalift_InitVars = { FLAGS, OBJECT_RAILLIFT, sizeof(ObjOcarinalift), - (ActorFunc)ObjOcarinalift_Init, - (ActorFunc)ObjOcarinalift_Destroy, - (ActorFunc)ObjOcarinalift_Update, - (ActorFunc)ObjOcarinalift_Draw, + ObjOcarinalift_Init, + ObjOcarinalift_Destroy, + ObjOcarinalift_Update, + ObjOcarinalift_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index 1d7762c445..bb09c6891c 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -31,10 +31,10 @@ ActorInit Obj_Oshihiki_InitVars = { FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(ObjOshihiki), - (ActorFunc)ObjOshihiki_Init, - (ActorFunc)ObjOshihiki_Destroy, - (ActorFunc)ObjOshihiki_Update, - (ActorFunc)ObjOshihiki_Draw, + ObjOshihiki_Init, + ObjOshihiki_Destroy, + ObjOshihiki_Update, + ObjOshihiki_Draw, }; static f32 sScales[] = { 0.1f, 0.2f, 0.4f, 0.1f, 0.2f, 0.4f }; diff --git a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c index ee26937da8..e37b7d0291 100644 --- a/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c +++ b/src/overlays/actors/ovl_Obj_Purify/z_obj_purify.c @@ -47,10 +47,10 @@ ActorInit Obj_Purify_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjPurify), - (ActorFunc)ObjPurify_Init, - (ActorFunc)ObjPurify_Destroy, - (ActorFunc)ObjPurify_Update, - (ActorFunc)NULL, + ObjPurify_Init, + ObjPurify_Destroy, + ObjPurify_Update, + NULL, }; ObjPurifyInfo sObjPurifyInfo[] = { diff --git a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c index 3aca23bcad..46a4c89ca7 100644 --- a/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c +++ b/src/overlays/actors/ovl_Obj_Pzlblock/z_obj_pzlblock.c @@ -31,10 +31,10 @@ ActorInit Obj_Pzlblock_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjPzlblock), - (ActorFunc)ObjPzlblock_Init, - (ActorFunc)ObjPzlblock_Destroy, - (ActorFunc)ObjPzlblock_Update, - (ActorFunc)NULL, + ObjPzlblock_Init, + ObjPzlblock_Destroy, + ObjPzlblock_Update, + NULL, }; s16 D_809A4050[] = { 1, -1, 0, 0 }; diff --git a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c index d0a705cf26..97631eec9a 100644 --- a/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c +++ b/src/overlays/actors/ovl_Obj_Raillift/z_obj_raillift.c @@ -34,10 +34,10 @@ ActorInit Obj_Raillift_InitVars = { FLAGS, OBJECT_RAILLIFT, sizeof(ObjRaillift), - (ActorFunc)ObjRaillift_Init, - (ActorFunc)ObjRaillift_Destroy, - (ActorFunc)ObjRaillift_Update, - (ActorFunc)ObjRaillift_Draw, + ObjRaillift_Init, + ObjRaillift_Destroy, + ObjRaillift_Update, + ObjRaillift_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c index 154f662f8c..3be57a8fd5 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -24,10 +24,10 @@ ActorInit Obj_Roomtimer_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjRoomtimer), - (ActorFunc)ObjRoomtimer_Init, - (ActorFunc)ObjRoomtimer_Destroy, - (ActorFunc)ObjRoomtimer_Update, - (ActorFunc)NULL, + ObjRoomtimer_Init, + ObjRoomtimer_Destroy, + ObjRoomtimer_Update, + NULL, }; void ObjRoomtimer_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c index ce18a68b0a..02b64a1f6c 100644 --- a/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c +++ b/src/overlays/actors/ovl_Obj_Rotlift/z_obj_rotlift.c @@ -31,10 +31,10 @@ ActorInit Obj_Rotlift_InitVars = { FLAGS, OBJECT_ROTLIFT, sizeof(ObjRotlift), - (ActorFunc)ObjRotlift_Init, - (ActorFunc)ObjRotlift_Destroy, - (ActorFunc)ObjRotlift_Update, - (ActorFunc)ObjRotlift_Draw, + ObjRotlift_Init, + ObjRotlift_Destroy, + ObjRotlift_Update, + ObjRotlift_Draw, }; struct ObjRotliftModelInfo sModelInfo[] = { diff --git a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c index 6f93935b21..a08aa86183 100644 --- a/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c +++ b/src/overlays/actors/ovl_Obj_Shutter/z_obj_shutter.c @@ -22,10 +22,10 @@ ActorInit Obj_Shutter_InitVars = { FLAGS, OBJECT_F53_OBJ, sizeof(ObjShutter), - (ActorFunc)ObjShutter_Init, - (ActorFunc)ObjShutter_Destroy, - (ActorFunc)ObjShutter_Update, - (ActorFunc)ObjShutter_Draw, + ObjShutter_Init, + ObjShutter_Destroy, + ObjShutter_Update, + ObjShutter_Draw, }; void ObjShutter_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c index 6a469eea02..e251bca909 100644 --- a/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c +++ b/src/overlays/actors/ovl_Obj_Skateblock/z_obj_skateblock.c @@ -33,10 +33,10 @@ ActorInit Obj_Skateblock_InitVars = { FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(ObjSkateblock), - (ActorFunc)ObjSkateblock_Init, - (ActorFunc)ObjSkateblock_Destroy, - (ActorFunc)ObjSkateblock_Update, - (ActorFunc)ObjSkateblock_Draw, + ObjSkateblock_Init, + ObjSkateblock_Destroy, + ObjSkateblock_Update, + ObjSkateblock_Draw, }; s32 D_80A22A10 = 0; diff --git a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c index dd02f6c1be..be38ec613d 100644 --- a/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c +++ b/src/overlays/actors/ovl_Obj_Smork/z_obj_smork.c @@ -22,10 +22,10 @@ ActorInit Obj_Smork_InitVars = { FLAGS, OBJECT_F53_OBJ, sizeof(ObjSmork), - (ActorFunc)ObjSmork_Init, - (ActorFunc)ObjSmork_Destroy, - (ActorFunc)ObjSmork_Update, - (ActorFunc)ObjSmork_Draw, + ObjSmork_Init, + ObjSmork_Destroy, + ObjSmork_Update, + ObjSmork_Draw, }; #include "overlays/ovl_Obj_Smork/ovl_Obj_Smork.c" diff --git a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c index 068be3ea07..5021d57822 100644 --- a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c +++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c @@ -39,10 +39,10 @@ ActorInit Obj_Snowball_InitVars = { FLAGS, OBJECT_GOROIWA, sizeof(ObjSnowball), - (ActorFunc)ObjSnowball_Init, - (ActorFunc)ObjSnowball_Destroy, - (ActorFunc)ObjSnowball_Update, - (ActorFunc)ObjSnowball_Draw, + ObjSnowball_Init, + ObjSnowball_Destroy, + ObjSnowball_Update, + ObjSnowball_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c index d62002e731..bd8337ff4b 100644 --- a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c +++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c @@ -32,10 +32,10 @@ ActorInit Obj_Snowball2_InitVars = { FLAGS, OBJECT_GOROIWA, sizeof(ObjSnowball2), - (ActorFunc)ObjSnowball2_Init, - (ActorFunc)ObjSnowball2_Destroy, - (ActorFunc)ObjSnowball2_Update, - (ActorFunc)ObjSnowball2_Draw, + ObjSnowball2_Init, + ObjSnowball2_Destroy, + ObjSnowball2_Update, + ObjSnowball2_Draw, }; static ColliderJntSphElementInit sJntSphElementsInit[1] = { diff --git a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c index 42c2bcc954..eb86d26b40 100644 --- a/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c +++ b/src/overlays/actors/ovl_Obj_Sound/z_obj_sound.c @@ -21,10 +21,10 @@ ActorInit Obj_Sound_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjSound), - (ActorFunc)ObjSound_Init, - (ActorFunc)ObjSound_Destroy, - (ActorFunc)ObjSound_Update, - (ActorFunc)NULL, + ObjSound_Init, + ObjSound_Destroy, + ObjSound_Update, + NULL, }; #endif diff --git a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c index 4708062da4..c115030159 100644 --- a/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c +++ b/src/overlays/actors/ovl_Obj_Spidertent/z_obj_spidertent.c @@ -29,10 +29,10 @@ ActorInit Obj_Spidertent_InitVars = { FLAGS, OBJECT_SPIDERTENT, sizeof(ObjSpidertent), - (ActorFunc)ObjSpidertent_Init, - (ActorFunc)ObjSpidertent_Destroy, - (ActorFunc)ObjSpidertent_Update, - (ActorFunc)ObjSpidertent_Draw, + ObjSpidertent_Init, + ObjSpidertent_Destroy, + ObjSpidertent_Update, + ObjSpidertent_Draw, }; static ColliderTrisElementInit sTrisElementsInit1[] = { diff --git a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c index 83959e1680..5fbf180d79 100644 --- a/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c +++ b/src/overlays/actors/ovl_Obj_Spinyroll/z_obj_spinyroll.c @@ -34,10 +34,10 @@ ActorInit Obj_Spinyroll_InitVars = { FLAGS, OBJECT_SPINYROLL, sizeof(ObjSpinyroll), - (ActorFunc)ObjSpinyroll_Init, - (ActorFunc)ObjSpinyroll_Destroy, - (ActorFunc)ObjSpinyroll_Update, - (ActorFunc)ObjSpinyroll_Draw, + ObjSpinyroll_Init, + ObjSpinyroll_Destroy, + ObjSpinyroll_Update, + ObjSpinyroll_Draw, }; static ColliderTrisElementInit sTrisElementsInit[] = { diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index ada5eadd31..67450b6c3f 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -77,10 +77,10 @@ ActorInit Obj_Switch_InitVars = { FLAGS, GAMEPLAY_DANGEON_KEEP, sizeof(ObjSwitch), - (ActorFunc)ObjSwitch_Init, - (ActorFunc)ObjSwitch_Destroy, - (ActorFunc)ObjSwitch_Update, - (ActorFunc)ObjSwitch_Draw, + ObjSwitch_Init, + ObjSwitch_Destroy, + ObjSwitch_Update, + ObjSwitch_Draw, }; static f32 sHeights[] = { 10.0f, 10.0f, 0.0f, 30.0f, 30.0f, 15.0f }; diff --git a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c index 5782442373..745c0b1591 100644 --- a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c +++ b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c @@ -29,10 +29,10 @@ ActorInit Obj_Swprize_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjSwprize), - (ActorFunc)ObjSwprize_Init, - (ActorFunc)ObjSwprize_Destroy, - (ActorFunc)ObjSwprize_Update, - (ActorFunc)NULL, + ObjSwprize_Init, + ObjSwprize_Destroy, + ObjSwprize_Update, + NULL, }; s16 D_80C257F0[] = { 2, 0x14, 1, 8 }; diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index 96716d107a..0649b5ceb1 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -24,10 +24,10 @@ ActorInit Obj_Syokudai_InitVars = { FLAGS, OBJECT_SYOKUDAI, sizeof(ObjSyokudai), - (ActorFunc)ObjSyokudai_Init, - (ActorFunc)ObjSyokudai_Destroy, - (ActorFunc)ObjSyokudai_Update, - (ActorFunc)ObjSyokudai_Draw, + ObjSyokudai_Init, + ObjSyokudai_Destroy, + ObjSyokudai_Update, + ObjSyokudai_Draw, }; static ColliderCylinderInit sStandColliderInit = { diff --git a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c index b8ab34df00..db3b13f180 100644 --- a/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c +++ b/src/overlays/actors/ovl_Obj_Takaraya_Wall/z_obj_takaraya_wall.c @@ -24,10 +24,10 @@ ActorInit Obj_Takaraya_Wall_InitVars = { FLAGS, OBJECT_TAKARAYA_OBJECTS, sizeof(ObjTakarayaWall), - (ActorFunc)ObjTakarayaWall_Init, - (ActorFunc)ObjTakarayaWall_Destroy, - (ActorFunc)ObjTakarayaWall_Update, - (ActorFunc)ObjTakarayaWall_Draw, + ObjTakarayaWall_Init, + ObjTakarayaWall_Destroy, + ObjTakarayaWall_Update, + ObjTakarayaWall_Draw, }; // static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c index 791564b579..cae9ba563b 100644 --- a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c +++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c @@ -30,10 +30,10 @@ ActorInit Obj_Taru_InitVars = { FLAGS, OBJECT_TARU, sizeof(ObjTaru), - (ActorFunc)ObjTaru_Init, - (ActorFunc)ObjTaru_Destroy, - (ActorFunc)ObjTaru_Update, - (ActorFunc)ObjTaru_Draw, + ObjTaru_Init, + ObjTaru_Destroy, + ObjTaru_Update, + ObjTaru_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c index 306ca70292..d6dcb25498 100644 --- a/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c +++ b/src/overlays/actors/ovl_Obj_Toge/z_obj_toge.c @@ -29,10 +29,10 @@ ActorInit Obj_Toge_InitVars = { FLAGS, OBJECT_TRAP, sizeof(ObjToge), - (ActorFunc)ObjToge_Init, - (ActorFunc)ObjToge_Destroy, - (ActorFunc)ObjToge_Update, - (ActorFunc)ObjToge_Draw, + ObjToge_Init, + ObjToge_Destroy, + ObjToge_Update, + ObjToge_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c index 694a5ac592..87b8e58556 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Step/z_obj_tokei_step.c @@ -34,10 +34,10 @@ ActorInit Obj_Tokei_Step_InitVars = { FLAGS, OBJECT_TOKEI_STEP, sizeof(ObjTokeiStep), - (ActorFunc)ObjTokeiStep_Init, - (ActorFunc)ObjTokeiStep_Destroy, - (ActorFunc)ObjTokeiStep_Update, - (ActorFunc)ObjTokeiStep_Draw, + ObjTokeiStep_Init, + ObjTokeiStep_Destroy, + ObjTokeiStep_Update, + ObjTokeiStep_Draw, }; static f32 sPanelXOffsets[] = { -105.0f, -90.0f, -75.0f, -60.0f, -45.0f, -30.0f, -15.0f }; diff --git a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c index 0c81ec0288..2f3dc5a624 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Tobira/z_obj_tokei_tobira.c @@ -22,10 +22,10 @@ ActorInit Obj_Tokei_Tobira_InitVars = { FLAGS, OBJECT_TOKEI_TOBIRA, sizeof(ObjTokeiTobira), - (ActorFunc)ObjTokeiTobira_Init, - (ActorFunc)ObjTokeiTobira_Destroy, - (ActorFunc)ObjTokeiTobira_Update, - (ActorFunc)ObjTokeiTobira_Draw, + ObjTokeiTobira_Init, + ObjTokeiTobira_Destroy, + ObjTokeiTobira_Update, + ObjTokeiTobira_Draw, }; // static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c index 3dc8b3297e..4a1135a500 100644 --- a/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c +++ b/src/overlays/actors/ovl_Obj_Tokei_Turret/z_obj_tokei_turret.c @@ -22,10 +22,10 @@ ActorInit Obj_Tokei_Turret_InitVars = { FLAGS, OBJECT_TOKEI_TURRET, sizeof(ObjTokeiTurret), - (ActorFunc)ObjTokeiTurret_Init, - (ActorFunc)ObjTokeiTurret_Destroy, - (ActorFunc)ObjTokeiTurret_Update, - (ActorFunc)ObjTokeiTurret_Draw, + ObjTokeiTurret_Init, + ObjTokeiTurret_Destroy, + ObjTokeiTurret_Update, + ObjTokeiTurret_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c index 704bc58c34..376e2fca6b 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -68,10 +68,10 @@ ActorInit Obj_Tokeidai_InitVars = { FLAGS, OBJECT_OBJ_TOKEIDAI, sizeof(ObjTokeidai), - (ActorFunc)ObjTokeidai_Init, - (ActorFunc)ObjTokeidai_Destroy, - (ActorFunc)ObjTokeidai_Update, - (ActorFunc)ObjTokeidai_Draw, + ObjTokeidai_Init, + ObjTokeidai_Destroy, + ObjTokeidai_Update, + ObjTokeidai_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c index 07561b8cd1..d100f8cd27 100644 --- a/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c +++ b/src/overlays/actors/ovl_Obj_Toudai/z_obj_toudai.c @@ -22,10 +22,10 @@ ActorInit Obj_Toudai_InitVars = { FLAGS, OBJECT_F53_OBJ, sizeof(ObjToudai), - (ActorFunc)ObjToudai_Init, - (ActorFunc)ObjToudai_Destroy, - (ActorFunc)ObjToudai_Update, - (ActorFunc)ObjToudai_Draw, + ObjToudai_Init, + ObjToudai_Destroy, + ObjToudai_Update, + ObjToudai_Draw, }; #include "assets/overlays/ovl_Obj_Toudai/ovl_Obj_Toudai.c" diff --git a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c index 4dcfd4f748..ca242a10ee 100644 --- a/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c +++ b/src/overlays/actors/ovl_Obj_Tree/z_obj_tree.c @@ -26,10 +26,10 @@ ActorInit Obj_Tree_InitVars = { FLAGS, OBJECT_TREE, sizeof(ObjTree), - (ActorFunc)ObjTree_Init, - (ActorFunc)ObjTree_Destroy, - (ActorFunc)ObjTree_Update, - (ActorFunc)ObjTree_Draw, + ObjTree_Init, + ObjTree_Destroy, + ObjTree_Update, + ObjTree_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index 33b4932373..3a6e4fa7f3 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -47,10 +47,10 @@ ActorInit Obj_Tsubo_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjTsubo), - (ActorFunc)ObjTsubo_Init, - (ActorFunc)ObjTsubo_Destroy, - (ActorFunc)ObjTsubo_Update, - (ActorFunc)NULL, + ObjTsubo_Init, + ObjTsubo_Destroy, + ObjTsubo_Update, + NULL, }; typedef struct { diff --git a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c index 93a110a081..ba2b9f62e8 100644 --- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c @@ -67,10 +67,10 @@ ActorInit Obj_Um_InitVars = { FLAGS, OBJECT_UM, sizeof(ObjUm), - (ActorFunc)ObjUm_Init, - (ActorFunc)ObjUm_Destroy, - (ActorFunc)ObjUm_Update, - (ActorFunc)ObjUm_Draw, + ObjUm_Init, + ObjUm_Destroy, + ObjUm_Update, + ObjUm_Draw, }; static TexturePtr sEyeTextures[] = { diff --git a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c index 24e816644a..83381f34d0 100644 --- a/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c +++ b/src/overlays/actors/ovl_Obj_Usiyane/z_obj_usiyane.c @@ -22,10 +22,10 @@ ActorInit Obj_Usiyane_InitVars = { FLAGS, OBJECT_OBJ_USIYANE, sizeof(ObjUsiyane), - (ActorFunc)ObjUsiyane_Init, - (ActorFunc)ObjUsiyane_Destroy, - (ActorFunc)ObjUsiyane_Update, - (ActorFunc)ObjUsiyane_Draw, + ObjUsiyane_Init, + ObjUsiyane_Destroy, + ObjUsiyane_Update, + ObjUsiyane_Draw, }; PosRot D_80C08660[] = { diff --git a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c index 4b0a797f6e..58416da7b6 100644 --- a/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c +++ b/src/overlays/actors/ovl_Obj_Visiblock/z_obj_visiblock.c @@ -21,10 +21,10 @@ ActorInit Obj_Visiblock_InitVars = { FLAGS, OBJECT_VISIBLOCK, sizeof(ObjVisiblock), - (ActorFunc)ObjVisiblock_Init, - (ActorFunc)ObjVisiblock_Destroy, - (ActorFunc)Actor_Noop, - (ActorFunc)ObjVisiblock_Draw, + ObjVisiblock_Init, + ObjVisiblock_Destroy, + Actor_Noop, + ObjVisiblock_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c index b7a1e59be5..c4491f16d2 100644 --- a/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c +++ b/src/overlays/actors/ovl_Obj_Vspinyroll/z_obj_vspinyroll.c @@ -33,10 +33,10 @@ ActorInit Obj_Vspinyroll_InitVars = { FLAGS, OBJECT_SPINYROLL, sizeof(ObjVspinyroll), - (ActorFunc)ObjVspinyroll_Init, - (ActorFunc)ObjVspinyroll_Destroy, - (ActorFunc)ObjVspinyroll_Update, - (ActorFunc)ObjVspinyroll_Draw, + ObjVspinyroll_Init, + ObjVspinyroll_Destroy, + ObjVspinyroll_Update, + ObjVspinyroll_Draw, }; f32 D_80A3D450[] = { 1.0f, 2.0f }; diff --git a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c index 3fa3260fdd..5e037d5981 100644 --- a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c +++ b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c @@ -28,10 +28,10 @@ ActorInit Obj_Warpstone_InitVars = { FLAGS, OBJECT_SEK, sizeof(ObjWarpstone), - (ActorFunc)ObjWarpstone_Init, - (ActorFunc)ObjWarpstone_Destroy, - (ActorFunc)ObjWarpstone_Update, - (ActorFunc)ObjWarpstone_Draw, + ObjWarpstone_Init, + ObjWarpstone_Destroy, + ObjWarpstone_Update, + ObjWarpstone_Draw, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c index 5f53030f32..9915df1288 100644 --- a/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c +++ b/src/overlays/actors/ovl_Obj_Wind/z_obj_wind.c @@ -22,10 +22,10 @@ ActorInit Obj_Wind_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjWind), - (ActorFunc)ObjWind_Init, - (ActorFunc)ObjWind_Destroy, - (ActorFunc)ObjWind_Update, - (ActorFunc)ObjWind_Draw, + ObjWind_Init, + ObjWind_Destroy, + ObjWind_Update, + ObjWind_Draw, }; // static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c index 184fed3d67..1522dbaed1 100644 --- a/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c +++ b/src/overlays/actors/ovl_Obj_Wturn/z_obj_wturn.c @@ -24,8 +24,8 @@ void func_808A7C78(ObjWturn* this, PlayState* play); ActorInit Obj_Wturn_InitVars = { ACTOR_OBJ_WTURN, ACTORCAT_ITEMACTION, FLAGS, - GAMEPLAY_KEEP, sizeof(ObjWturn), (ActorFunc)ObjWturn_Init, - (ActorFunc)Actor_Noop, (ActorFunc)ObjWturn_Update, (ActorFunc)NULL, + GAMEPLAY_KEEP, sizeof(ObjWturn), ObjWturn_Init, + Actor_Noop, ObjWturn_Update, NULL, }; void ObjWturn_Init(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c index 9399940d88..255af285a9 100644 --- a/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c +++ b/src/overlays/actors/ovl_Obj_Y2lift/z_obj_y2lift.c @@ -22,10 +22,10 @@ ActorInit Obj_Y2lift_InitVars = { FLAGS, OBJECT_KAIZOKU_OBJ, sizeof(ObjY2lift), - (ActorFunc)ObjY2lift_Init, - (ActorFunc)ObjY2lift_Destroy, - (ActorFunc)ObjY2lift_Update, - (ActorFunc)ObjY2lift_Draw, + ObjY2lift_Init, + ObjY2lift_Destroy, + ObjY2lift_Update, + ObjY2lift_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c index 9d35288c59..d5c89e4e62 100644 --- a/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c +++ b/src/overlays/actors/ovl_Obj_Y2shutter/z_obj_y2shutter.c @@ -35,10 +35,10 @@ ActorInit Obj_Y2shutter_InitVars = { FLAGS, OBJECT_KAIZOKU_OBJ, sizeof(ObjY2shutter), - (ActorFunc)ObjY2shutter_Init, - (ActorFunc)ObjY2shutter_Destroy, - (ActorFunc)ObjY2shutter_Update, - (ActorFunc)ObjY2shutter_Draw, + ObjY2shutter_Init, + ObjY2shutter_Destroy, + ObjY2shutter_Update, + ObjY2shutter_Draw, }; ShutterInfo sShutterInfo[] = { diff --git a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c index b4a78851a9..9636b34f90 100644 --- a/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c +++ b/src/overlays/actors/ovl_Obj_Yado/z_obj_yado.c @@ -23,10 +23,10 @@ ActorInit Obj_Yado_InitVars = { FLAGS, OBJECT_YADO_OBJ, sizeof(ObjYado), - (ActorFunc)ObjYado_Init, - (ActorFunc)ObjYado_Destroy, - (ActorFunc)ObjYado_Update, - (ActorFunc)ObjYado_Draw, + ObjYado_Init, + ObjYado_Destroy, + ObjYado_Update, + ObjYado_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c index 5af34152a7..a976afc75f 100644 --- a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c +++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c @@ -24,10 +24,10 @@ ActorInit Obj_Yasi_InitVars = { FLAGS, OBJECT_OBJ_YASI, sizeof(ObjYasi), - (ActorFunc)ObjYasi_Init, - (ActorFunc)ObjYasi_Destroy, - (ActorFunc)ObjYasi_Update, - (ActorFunc)ObjYasi_Draw, + ObjYasi_Init, + ObjYasi_Destroy, + ObjYasi_Update, + ObjYasi_Draw, }; static InitChainEntry sInitChain[] = { diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index db78f579b5..0508938262 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -33,10 +33,10 @@ ActorInit Object_Kankyo_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ObjectKankyo), - (ActorFunc)ObjectKankyo_Init, - (ActorFunc)ObjectKankyo_Destroy, - (ActorFunc)ObjectKankyo_Update, - (ActorFunc)ObjectKankyo_Draw, + ObjectKankyo_Init, + ObjectKankyo_Destroy, + ObjectKankyo_Update, + ObjectKankyo_Draw, }; static u16 D_808DE340 = 0; diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index a19cb276aa..fcfd0f76db 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -27,10 +27,10 @@ ActorInit Oceff_Spot_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffSpot), - (ActorFunc)OceffSpot_Init, - (ActorFunc)OceffSpot_Destroy, - (ActorFunc)OceffSpot_Update, - (ActorFunc)OceffSpot_Draw, + OceffSpot_Init, + OceffSpot_Destroy, + OceffSpot_Update, + OceffSpot_Draw, }; #include "assets/overlays/ovl_Oceff_Spot/ovl_Oceff_Spot.c" diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index 96d76f8070..7c4b8fdd36 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -25,10 +25,10 @@ ActorInit Oceff_Storm_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffStorm), - (ActorFunc)OceffStorm_Init, - (ActorFunc)OceffStorm_Destroy, - (ActorFunc)OceffStorm_Update, - (ActorFunc)OceffStorm_Draw, + OceffStorm_Init, + OceffStorm_Destroy, + OceffStorm_Update, + OceffStorm_Draw, }; void OceffStorm_SetupAction(OceffStorm* this, OceffStormActionFunc actionFunc) { diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index 42bf6c7039..a1ada249cb 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -21,10 +21,10 @@ ActorInit Oceff_Wipe_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe), - (ActorFunc)OceffWipe_Init, - (ActorFunc)OceffWipe_Destroy, - (ActorFunc)OceffWipe_Update, - (ActorFunc)OceffWipe_Draw, + OceffWipe_Init, + OceffWipe_Destroy, + OceffWipe_Update, + OceffWipe_Draw, }; UNK_TYPE4 D_80977200; diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index 3d8004c5c7..0e457966b6 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -21,10 +21,10 @@ ActorInit Oceff_Wipe2_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe2), - (ActorFunc)OceffWipe2_Init, - (ActorFunc)OceffWipe2_Destroy, - (ActorFunc)OceffWipe2_Update, - (ActorFunc)OceffWipe2_Draw, + OceffWipe2_Init, + OceffWipe2_Destroy, + OceffWipe2_Update, + OceffWipe2_Draw, }; #include "assets/overlays/ovl_Oceff_Wipe2/ovl_Oceff_Wipe2.c" diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index 52031ce000..778091ef46 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -22,10 +22,10 @@ ActorInit Oceff_Wipe3_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe3), - (ActorFunc)OceffWipe3_Init, - (ActorFunc)OceffWipe3_Destroy, - (ActorFunc)OceffWipe3_Update, - (ActorFunc)OceffWipe3_Draw, + OceffWipe3_Init, + OceffWipe3_Destroy, + OceffWipe3_Update, + OceffWipe3_Draw, }; #include "assets/overlays/ovl_Oceff_Wipe3/ovl_Oceff_Wipe3.c" diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index 3554bc78aa..4b8b763f0d 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -21,10 +21,10 @@ ActorInit Oceff_Wipe4_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe4), - (ActorFunc)OceffWipe4_Init, - (ActorFunc)OceffWipe4_Destroy, - (ActorFunc)OceffWipe4_Update, - (ActorFunc)OceffWipe4_Draw, + OceffWipe4_Init, + OceffWipe4_Destroy, + OceffWipe4_Update, + OceffWipe4_Draw, }; #include "assets/overlays/ovl_Oceff_Wipe4/ovl_Oceff_Wipe4.c" diff --git a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c index 0d0db63858..4a8745762a 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c +++ b/src/overlays/actors/ovl_Oceff_Wipe5/z_oceff_wipe5.c @@ -21,10 +21,10 @@ ActorInit Oceff_Wipe5_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe5), - (ActorFunc)OceffWipe5_Init, - (ActorFunc)OceffWipe5_Destroy, - (ActorFunc)OceffWipe5_Update, - (ActorFunc)OceffWipe5_Draw, + OceffWipe5_Init, + OceffWipe5_Destroy, + OceffWipe5_Update, + OceffWipe5_Draw, }; UNK_TYPE4 D_80BC9260; diff --git a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c index 87dbe27521..d170e9d92d 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c +++ b/src/overlays/actors/ovl_Oceff_Wipe6/z_oceff_wipe6.c @@ -21,10 +21,10 @@ ActorInit Oceff_Wipe6_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe6), - (ActorFunc)OceffWipe6_Init, - (ActorFunc)OceffWipe6_Destroy, - (ActorFunc)OceffWipe6_Update, - (ActorFunc)OceffWipe6_Draw, + OceffWipe6_Init, + OceffWipe6_Destroy, + OceffWipe6_Update, + OceffWipe6_Draw, }; #include "overlays/ovl_Oceff_Wipe6/ovl_Oceff_Wipe6.c" diff --git a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c index f269a89a5e..523d57ab81 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c +++ b/src/overlays/actors/ovl_Oceff_Wipe7/z_oceff_wipe7.c @@ -21,10 +21,10 @@ ActorInit Oceff_Wipe7_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(OceffWipe7), - (ActorFunc)OceffWipe7_Init, - (ActorFunc)OceffWipe7_Destroy, - (ActorFunc)OceffWipe7_Update, - (ActorFunc)OceffWipe7_Draw, + OceffWipe7_Init, + OceffWipe7_Destroy, + OceffWipe7_Update, + OceffWipe7_Draw, }; #include "assets/overlays/ovl_Oceff_Wipe7/ovl_Oceff_Wipe7.c" diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index dea819c7dd..5b52615561 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -25,10 +25,10 @@ ActorInit Shot_Sun_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(ShotSun), - (ActorFunc)ShotSun_Init, - (ActorFunc)ShotSun_Destroy, - (ActorFunc)ShotSun_Update, - (ActorFunc)NULL, + ShotSun_Init, + ShotSun_Destroy, + ShotSun_Update, + NULL, }; static ColliderCylinderInit sCylinderInit = { diff --git a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c index 8c1e98bedd..150ccc5d3b 100644 --- a/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c +++ b/src/overlays/actors/ovl_TG_Sw/z_tg_sw.c @@ -24,10 +24,10 @@ ActorInit TG_Sw_InitVars = { FLAGS, GAMEPLAY_KEEP, sizeof(TGSw), - (ActorFunc)TGSw_Init, - (ActorFunc)TGSw_Destroy, - (ActorFunc)TGSw_Update, - (ActorFunc)TGSw_Draw, + TGSw_Init, + TGSw_Destroy, + TGSw_Update, + TGSw_Draw, }; void TGSw_ActionDecider(TGSw* this, PlayState* play) {