From 950b8b00057fa79797c16ee69746e0eb94d713c7 Mon Sep 17 00:00:00 2001 From: Thar0 <17233964+Thar0@users.noreply.github.com> Date: Tue, 5 Jul 2022 03:01:22 +0100 Subject: [PATCH 01/14] UNUSED attribute for variables and parameters in static segments and for all stack padding variables --- include/functions.h | 263 ++++++++---------- include/macros.h | 14 +- include/sched.h | 3 +- include/z64curve.h | 11 +- src/boot/is_debug.c | 4 +- src/boot/yaz0.c | 2 +- src/boot/z_std_dma.c | 8 +- src/code/PreRender.c | 6 +- src/code/__osMalloc.c | 4 +- src/code/audioMgr.c | 2 +- src/code/audio_effects.c | 2 +- src/code/audio_heap.c | 8 +- src/code/audio_load.c | 56 ++-- src/code/audio_playback.c | 6 +- src/code/audio_seqplayer.c | 6 +- src/code/audio_synthesis.c | 25 +- src/code/code_80097A00.c | 2 +- src/code/code_800A9F30.c | 2 +- src/code/code_800ACE70.c | 2 +- src/code/code_800AD920.c | 2 +- src/code/code_800E4FE0.c | 12 +- src/code/code_800EC960.c | 29 +- src/code/code_800F7260.c | 5 +- src/code/code_800F9280.c | 6 +- src/code/db_camera.c | 15 +- src/code/fault.c | 12 +- src/code/flg_set.c | 2 +- src/code/game.c | 4 +- src/code/gfxprint.c | 2 +- src/code/graph.c | 10 +- src/code/irqmgr.c | 2 +- src/code/jpegdecoder.c | 2 +- src/code/load.c | 2 +- src/code/mempak.c | 24 +- src/code/relocation.c | 2 +- src/code/sched.c | 4 +- src/code/speed_meter.c | 12 +- src/code/sys_math3d.c | 10 +- src/code/sys_matrix.c | 4 +- src/code/title_setup.c | 2 +- src/code/ucode_disas.c | 8 +- src/code/z_actor.c | 64 ++--- src/code/z_actor_dlftbls.c | 2 +- src/code/z_bgcheck.c | 73 +++-- src/code/z_camera.c | 132 ++++----- src/code/z_collision_check.c | 150 +++++----- src/code/z_construct.c | 4 +- src/code/z_debug.c | 4 +- src/code/z_demo.c | 36 +-- src/code/z_draw.c | 52 ++-- src/code/z_eff_blure.c | 12 +- src/code/z_eff_spark.c | 2 +- src/code/z_eff_ss_dead.c | 4 +- src/code/z_effect.c | 4 +- src/code/z_effect_soft_sprite.c | 2 +- src/code/z_effect_soft_sprite_old_init.c | 6 +- src/code/z_en_a_keep.c | 30 +- src/code/z_en_item00.c | 24 +- src/code/z_fbdemo.c | 8 +- src/code/z_fbdemo_circle.c | 5 +- src/code/z_fbdemo_fade.c | 2 +- src/code/z_fbdemo_triforce.c | 6 +- src/code/z_fbdemo_wipe1.c | 4 +- src/code/z_fcurve_data_skelanime.c | 16 +- src/code/z_horse.c | 6 +- src/code/z_jpeg.c | 2 +- src/code/z_kaleido_setup.c | 2 +- src/code/z_kanfont.c | 2 +- src/code/z_kankyo.c | 38 +-- src/code/z_lifemeter.c | 4 +- src/code/z_lights.c | 12 +- src/code/z_map_exp.c | 4 +- src/code/z_map_mark.c | 2 +- src/code/z_message_PAL.c | 15 +- src/code/z_moji.c | 2 +- src/code/z_onepointdemo.c | 2 +- src/code/z_parameter.c | 17 +- src/code/z_play.c | 10 +- src/code/z_player_lib.c | 20 +- src/code/z_prenmi.c | 2 +- src/code/z_quake.c | 6 +- src/code/z_room.c | 8 +- src/code/z_sample.c | 2 +- src/code/z_scene.c | 6 +- src/code/z_scene_table.c | 2 +- src/code/z_skelanime.c | 40 +-- src/code/z_skin.c | 8 +- src/code/z_skin_awb.c | 6 +- src/code/z_skin_matrix.c | 4 +- src/code/z_sram.c | 4 +- src/code/z_view.c | 4 +- src/code/z_vimode.c | 2 +- src/code/z_vismono.c | 4 +- src/code/z_vr_box.c | 8 +- src/code/z_vr_box_draw.c | 2 +- src/libultra/io/sptask.c | 2 +- src/libultra/rmon/xldtob.c | 2 +- .../actors/ovl_Arms_Hook/z_arms_hook.c | 6 +- .../actors/ovl_Arrow_Fire/z_arrow_fire.c | 2 +- .../actors/ovl_Arrow_Ice/z_arrow_ice.c | 4 +- .../actors/ovl_Arrow_Light/z_arrow_light.c | 4 +- .../ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c | 2 +- .../ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c | 10 +- .../actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c | 2 +- .../actors/ovl_Bg_Bombwall/z_bg_bombwall.c | 6 +- .../actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c | 8 +- .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c | 6 +- .../actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c | 2 +- .../actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c | 2 +- .../actors/ovl_Bg_Dodoago/z_bg_dodoago.c | 2 +- .../ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c | 2 +- .../ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c | 2 +- .../ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c | 4 +- .../ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c | 8 +- .../ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c | 4 +- src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c | 4 +- .../actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c | 6 +- .../actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c | 2 +- .../ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c | 2 +- .../actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c | 4 +- .../actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c | 4 +- .../actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c | 4 +- .../ovl_Bg_Haka_Water/z_bg_haka_water.c | 4 +- .../actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c | 4 +- .../ovl_Bg_Heavy_Block/z_bg_heavy_block.c | 10 +- .../ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c | 4 +- .../ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c | 2 +- .../z_bg_hidan_firewall.c | 2 +- .../ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c | 4 +- .../ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c | 6 +- .../ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c | 12 +- .../ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c | 4 +- .../z_bg_hidan_kowarerukabe.c | 10 +- .../ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c | 6 +- .../z_bg_hidan_rsekizou.c | 6 +- .../ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c | 4 +- .../ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c | 6 +- .../ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c | 2 +- .../ovl_Bg_Ice_Objects/z_bg_ice_objects.c | 8 +- .../ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c | 14 +- .../ovl_Bg_Ice_Turara/z_bg_ice_turara.c | 2 +- .../actors/ovl_Bg_Ingate/z_bg_ingate.c | 2 +- .../ovl_Bg_Jya_1flift/z_bg_jya_1flift.c | 4 +- .../z_bg_jya_amishutter.c | 4 +- .../actors/ovl_Bg_Jya_Block/z_bg_jya_block.c | 2 +- .../z_bg_jya_bombchuiwa.c | 2 +- .../ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c | 6 +- .../actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c | 12 +- .../ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c | 4 +- .../ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c | 10 +- .../ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c | 6 +- .../ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c | 6 +- .../actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c | 2 +- .../ovl_Bg_Jya_Megami/z_bg_jya_megami.c | 8 +- .../z_bg_jya_zurerukabe.c | 4 +- .../ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c | 2 +- .../z_bg_menkuri_kaiten.c | 2 +- .../ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c | 8 +- .../ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c | 12 +- .../actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c | 4 +- .../ovl_Bg_Mizu_Water/z_bg_mizu_water.c | 6 +- .../ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c | 14 +- .../ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c | 6 +- .../ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c | 14 +- .../ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c | 12 +- .../ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c | 8 +- .../z_bg_mori_kaitenkabe.c | 8 +- .../z_bg_mori_rakkatenjo.c | 10 +- .../actors/ovl_Bg_Po_Event/z_bg_po_event.c | 10 +- .../ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c | 4 +- .../actors/ovl_Bg_Pushbox/z_bg_pushbox.c | 6 +- .../ovl_Bg_Relay_Objects/z_bg_relay_objects.c | 2 +- .../ovl_Bg_Spot00_Break/z_bg_spot00_break.c | 2 +- .../z_bg_spot00_hanebasi.c | 4 +- .../z_bg_spot01_idohashira.c | 10 +- .../z_bg_spot01_idosoko.c | 4 +- .../z_bg_spot01_objects2.c | 2 +- .../z_bg_spot02_objects.c | 6 +- .../ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c | 4 +- .../ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c | 4 +- .../z_bg_spot06_objects.c | 12 +- .../ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c | 2 +- .../z_bg_spot08_bakudankabe.c | 6 +- .../z_bg_spot08_iceblock.c | 8 +- .../ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c | 4 +- .../z_bg_spot11_bakudankabe.c | 4 +- .../ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c | 2 +- .../ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c | 6 +- .../ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c | 4 +- .../ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c | 4 +- .../ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c | 4 +- .../z_bg_spot16_bombstone.c | 8 +- .../z_bg_spot16_doughnut.c | 2 +- .../z_bg_spot16_doughnut.h | 2 +- .../z_bg_spot17_bakudankabe.c | 6 +- .../ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c | 2 +- .../ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c | 6 +- .../ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c | 2 +- .../ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c | 4 +- .../z_bg_spot18_shutter.c | 2 +- .../actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c | 6 +- .../ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c | 4 +- .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c | 4 +- .../actors/ovl_Bg_Treemouth/z_bg_treemouth.c | 4 +- .../actors/ovl_Bg_Umajump/z_bg_umajump.c | 2 +- .../actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c | 6 +- .../actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c | 2 +- .../ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c | 2 +- src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c | 2 +- .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 20 +- src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 10 +- src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c | 8 +- .../actors/ovl_Boss_Ganon/z_boss_ganon.c | 42 +-- .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 36 +-- .../ovl_Boss_Ganondrof/z_boss_ganondrof.c | 14 +- .../actors/ovl_Boss_Goma/z_boss_goma.c | 8 +- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 42 +-- src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 14 +- src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 28 +- src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 18 +- src/overlays/actors/ovl_Demo_6K/z_demo_6k.c | 14 +- src/overlays/actors/ovl_Demo_Du/z_demo_du.c | 22 +- src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c | 14 +- .../actors/ovl_Demo_Effect/z_demo_effect.c | 16 +- .../actors/ovl_Demo_Geff/z_demo_geff.c | 4 +- src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 20 +- src/overlays/actors/ovl_Demo_Go/z_demo_go.c | 10 +- src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c | 104 +++---- src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c | 14 +- src/overlays/actors/ovl_Demo_Im/z_demo_im.c | 16 +- .../actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 12 +- .../actors/ovl_Demo_Kekkai/z_demo_kekkai.c | 10 +- src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c | 16 +- src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c | 2 +- .../actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c | 4 +- .../actors/ovl_Door_Gerudo/z_door_gerudo.c | 2 +- .../actors/ovl_Door_Shutter/z_door_shutter.c | 6 +- .../actors/ovl_Door_Toki/z_door_toki.c | 2 +- .../actors/ovl_Door_Warp1/z_door_warp1.c | 8 +- .../actors/ovl_Efc_Erupc/z_efc_erupc.c | 2 +- src/overlays/actors/ovl_En_Am/z_en_am.c | 16 +- src/overlays/actors/ovl_En_Ani/z_en_ani.c | 8 +- .../actors/ovl_En_Anubice/z_en_anubice.c | 2 +- .../ovl_En_Anubice_Fire/z_en_anubice_fire.c | 8 +- src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 4 +- .../ovl_En_Attack_Niw/z_en_attack_niw.c | 4 +- src/overlays/actors/ovl_En_Ba/z_en_ba.c | 6 +- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 6 +- .../actors/ovl_En_Bdfire/z_en_bdfire.c | 4 +- .../actors/ovl_En_Bigokuta/z_en_bigokuta.c | 2 +- .../actors/ovl_En_Blkobj/z_en_blkobj.c | 8 +- src/overlays/actors/ovl_En_Bom/z_en_bom.c | 4 +- .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 2 +- .../actors/ovl_En_Bom_Chu/z_en_bom_chu.c | 2 +- src/overlays/actors/ovl_En_Bombf/z_en_bombf.c | 12 +- src/overlays/actors/ovl_En_Boom/z_en_boom.c | 4 +- src/overlays/actors/ovl_En_Box/z_en_box.c | 4 +- src/overlays/actors/ovl_En_Brob/z_en_brob.c | 2 +- .../actors/ovl_En_Bubble/z_en_bubble.c | 4 +- src/overlays/actors/ovl_En_Bw/z_en_bw.c | 4 +- src/overlays/actors/ovl_En_Bx/z_en_bx.c | 4 +- .../actors/ovl_En_Clear_Tag/z_en_clear_tag.c | 4 +- src/overlays/actors/ovl_En_Cow/z_en_cow.c | 4 +- src/overlays/actors/ovl_En_Crow/z_en_crow.c | 2 +- src/overlays/actors/ovl_En_Cs/z_en_cs.c | 12 +- src/overlays/actors/ovl_En_Daiku/z_en_daiku.c | 10 +- .../z_en_daiku_kakariko.c | 8 +- .../actors/ovl_En_Dekubaba/z_en_dekubaba.c | 2 +- .../actors/ovl_En_Dekubaba/z_en_dekubaba.h | 2 +- .../actors/ovl_En_Dekunuts/z_en_dekunuts.c | 6 +- src/overlays/actors/ovl_En_Dh/z_en_dh.c | 12 +- src/overlays/actors/ovl_En_Dha/z_en_dha.c | 10 +- .../ovl_En_Diving_Game/z_en_diving_game.c | 2 +- src/overlays/actors/ovl_En_Dns/z_en_dns.c | 2 +- .../actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c | 4 +- .../actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c | 4 +- .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c | 8 +- .../actors/ovl_En_Dodojr/z_en_dodojr.c | 2 +- .../actors/ovl_En_Dodongo/z_en_dodongo.c | 16 +- src/overlays/actors/ovl_En_Dog/z_en_dog.c | 4 +- src/overlays/actors/ovl_En_Dog/z_en_dog.h | 4 +- src/overlays/actors/ovl_En_Door/z_en_door.c | 4 +- src/overlays/actors/ovl_En_Du/z_en_du.c | 4 +- .../actors/ovl_En_Dy_Extra/z_en_dy_extra.c | 2 +- src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c | 6 +- src/overlays/actors/ovl_En_Elf/z_en_elf.c | 22 +- .../actors/ovl_En_Encount1/z_en_encount1.c | 4 +- .../actors/ovl_En_Encount2/z_en_encount2.c | 2 +- .../actors/ovl_En_Ex_Item/z_en_ex_item.c | 8 +- .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 4 +- src/overlays/actors/ovl_En_Fd/z_en_fd.c | 6 +- .../actors/ovl_En_Fd_Fire/z_en_fd_fire.c | 6 +- .../actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c | 8 +- .../actors/ovl_En_Fire_Rock/z_en_fire_rock.c | 2 +- src/overlays/actors/ovl_En_Fish/z_en_fish.c | 28 +- .../actors/ovl_En_Floormas/z_en_floormas.c | 8 +- src/overlays/actors/ovl_En_Fr/z_en_fr.c | 4 +- src/overlays/actors/ovl_En_Fu/z_en_fu.c | 8 +- src/overlays/actors/ovl_En_Fz/z_en_fz.c | 4 +- .../actors/ovl_En_G_Switch/z_en_g_switch.c | 14 +- .../ovl_En_Ganon_Mant/z_en_ganon_mant.c | 6 +- src/overlays/actors/ovl_En_Gb/z_en_gb.c | 6 +- src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 10 +- src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 10 +- src/overlays/actors/ovl_En_Ge3/z_en_ge3.c | 6 +- src/overlays/actors/ovl_En_GeldB/z_en_geldb.c | 18 +- src/overlays/actors/ovl_En_Gm/z_en_gm.c | 4 +- src/overlays/actors/ovl_En_Go/z_en_go.c | 4 +- src/overlays/actors/ovl_En_Go2/z_en_go2.c | 4 +- src/overlays/actors/ovl_En_Goma/z_en_goma.c | 4 +- .../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 20 +- src/overlays/actors/ovl_En_Guest/z_en_guest.c | 6 +- src/overlays/actors/ovl_En_Hata/z_en_hata.c | 2 +- .../actors/ovl_En_Heishi1/z_en_heishi1.c | 8 +- .../actors/ovl_En_Heishi2/z_en_heishi2.c | 10 +- .../actors/ovl_En_Heishi3/z_en_heishi3.c | 2 +- .../actors/ovl_En_Heishi4/z_en_heishi4.c | 2 +- .../actors/ovl_En_Hintnuts/z_en_hintnuts.c | 4 +- .../actors/ovl_En_Honotrap/z_en_honotrap.c | 20 +- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 14 +- .../z_en_horse_game_check.c | 6 +- .../ovl_En_Horse_Ganon/z_en_horse_ganon.c | 4 +- .../z_en_horse_link_child.c | 4 +- .../ovl_En_Horse_Normal/z_en_horse_normal.c | 12 +- .../ovl_En_Horse_Zelda/z_en_horse_zelda.c | 8 +- src/overlays/actors/ovl_En_Hs/z_en_hs.c | 4 +- src/overlays/actors/ovl_En_Hs2/z_en_hs2.c | 4 +- src/overlays/actors/ovl_En_Hy/z_en_hy.c | 4 +- .../actors/ovl_En_Ice_Hono/z_en_ice_hono.c | 6 +- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 18 +- .../actors/ovl_En_Insect/z_en_insect.c | 18 +- src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 8 +- src/overlays/actors/ovl_En_It/z_en_it.c | 2 +- src/overlays/actors/ovl_En_Js/z_en_js.c | 6 +- .../actors/ovl_En_Jsjutan/z_en_jsjutan.c | 4 +- .../actors/ovl_En_Kakasi/z_en_kakasi.c | 2 +- .../actors/ovl_En_Kakasi2/z_en_kakasi2.c | 2 +- .../actors/ovl_En_Kakasi3/z_en_kakasi3.c | 2 +- .../actors/ovl_En_Kanban/z_en_kanban.c | 2 +- .../actors/ovl_En_Karebaba/z_en_karebaba.c | 2 +- src/overlays/actors/ovl_En_Ko/z_en_ko.c | 4 +- src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 8 +- src/overlays/actors/ovl_En_Kz/z_en_kz.c | 4 +- src/overlays/actors/ovl_En_Light/z_en_light.c | 2 +- .../actors/ovl_En_Lightbox/z_en_lightbox.c | 2 +- .../actors/ovl_En_M_Fire1/z_en_m_fire1.c | 4 +- src/overlays/actors/ovl_En_Ma1/z_en_ma1.c | 6 +- src/overlays/actors/ovl_En_Ma2/z_en_ma2.c | 6 +- src/overlays/actors/ovl_En_Ma3/z_en_ma3.c | 6 +- src/overlays/actors/ovl_En_Mag/z_en_mag.c | 8 +- src/overlays/actors/ovl_En_Mb/z_en_mb.c | 16 +- src/overlays/actors/ovl_En_Md/z_en_md.c | 4 +- src/overlays/actors/ovl_En_Mk/z_en_mk.c | 2 +- src/overlays/actors/ovl_En_Mm/z_en_mm.c | 10 +- src/overlays/actors/ovl_En_Mm2/z_en_mm2.c | 2 +- src/overlays/actors/ovl_En_Ms/z_en_ms.c | 4 +- src/overlays/actors/ovl_En_Mu/z_en_mu.c | 4 +- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 40 +-- src/overlays/actors/ovl_En_Niw/z_en_niw.c | 12 +- .../actors/ovl_En_Niw_Girl/z_en_niw_girl.c | 6 +- .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c | 10 +- .../actors/ovl_En_Nutsball/z_en_nutsball.c | 6 +- src/overlays/actors/ovl_En_Nwc/z_en_nwc.c | 8 +- src/overlays/actors/ovl_En_Ny/z_en_ny.c | 2 +- src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 8 +- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 20 +- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 4 +- .../actors/ovl_En_Peehat/z_en_peehat.c | 2 +- .../actors/ovl_En_Po_Desert/z_en_po_desert.c | 4 +- .../actors/ovl_En_Po_Field/z_en_po_field.c | 12 +- .../actors/ovl_En_Po_Relay/z_en_po_relay.c | 6 +- .../ovl_En_Po_Sisters/z_en_po_sisters.c | 14 +- src/overlays/actors/ovl_En_Poh/z_en_poh.c | 10 +- src/overlays/actors/ovl_En_Rd/z_en_rd.c | 16 +- src/overlays/actors/ovl_En_Reeba/z_en_reeba.c | 6 +- src/overlays/actors/ovl_En_Rl/z_en_rl.c | 8 +- src/overlays/actors/ovl_En_Rr/z_en_rr.c | 8 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 66 ++--- src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 16 +- src/overlays/actors/ovl_En_Sa/z_en_sa.c | 6 +- src/overlays/actors/ovl_En_Sb/z_en_sb.c | 4 +- .../ovl_En_Scene_Change/z_en_scene_change.c | 4 +- src/overlays/actors/ovl_En_Sda/z_en_sda.c | 4 +- .../actors/ovl_En_Siofuki/z_en_siofuki.c | 2 +- src/overlays/actors/ovl_En_Skb/z_en_skb.c | 6 +- src/overlays/actors/ovl_En_Skj/z_en_skj.c | 14 +- .../actors/ovl_En_Skjneedle/z_en_skjneedle.c | 2 +- src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 12 +- src/overlays/actors/ovl_En_St/z_en_st.c | 6 +- src/overlays/actors/ovl_En_Sth/z_en_sth.c | 8 +- .../actors/ovl_En_Stream/z_en_stream.c | 8 +- src/overlays/actors/ovl_En_Sw/z_en_sw.c | 20 +- .../ovl_En_Syateki_Itm/z_en_syateki_itm.c | 2 +- .../ovl_En_Syateki_Man/z_en_syateki_man.c | 6 +- .../ovl_En_Syateki_Niw/z_en_syateki_niw.c | 4 +- src/overlays/actors/ovl_En_Ta/z_en_ta.c | 4 +- src/overlays/actors/ovl_En_Test/z_en_test.c | 20 +- src/overlays/actors/ovl_En_Tg/z_en_tg.c | 2 +- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 2 +- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 4 +- .../actors/ovl_En_Torch2/z_en_torch2.c | 10 +- src/overlays/actors/ovl_En_Toryo/z_en_toryo.c | 6 +- src/overlays/actors/ovl_En_Tp/z_en_tp.c | 8 +- src/overlays/actors/ovl_En_Tr/z_en_tr.c | 4 +- src/overlays/actors/ovl_En_Trap/z_en_trap.c | 2 +- .../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 2 +- src/overlays/actors/ovl_En_Vali/z_en_vali.c | 6 +- .../actors/ovl_En_Vb_Ball/z_en_vb_ball.c | 8 +- .../actors/ovl_En_Viewer/z_en_viewer.c | 4 +- src/overlays/actors/ovl_En_Vm/z_en_vm.c | 4 +- .../actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c | 2 +- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 4 +- .../ovl_En_Weather_Tag/z_en_weather_tag.c | 4 +- .../actors/ovl_En_Weiyer/z_en_weiyer.c | 2 +- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 16 +- .../ovl_En_Wonder_Item/z_en_wonder_item.c | 6 +- .../ovl_En_Wonder_Talk2/z_en_wonder_talk2.c | 4 +- .../actors/ovl_En_Wood02/z_en_wood02.c | 2 +- src/overlays/actors/ovl_En_Xc/z_en_xc.c | 62 ++--- .../ovl_En_Yabusame_Mark/z_en_yabusame_mark.c | 2 +- .../actors/ovl_En_Yukabyun/z_en_yukabyun.c | 2 +- src/overlays/actors/ovl_En_Zf/z_en_zf.c | 20 +- src/overlays/actors/ovl_En_Zl1/z_en_zl1.c | 26 +- src/overlays/actors/ovl_En_Zl2/z_en_zl2.c | 28 +- src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 62 ++--- src/overlays/actors/ovl_En_Zl4/z_en_zl4.c | 6 +- src/overlays/actors/ovl_En_Zo/z_en_zo.c | 2 +- src/overlays/actors/ovl_En_fHG/z_en_fhg.c | 12 +- .../actors/ovl_End_Title/z_end_title.c | 2 +- src/overlays/actors/ovl_Fishing/z_fishing.c | 28 +- .../ovl_Item_Etcetera/z_item_etcetera.c | 2 +- .../actors/ovl_Item_Shield/z_item_shield.c | 2 +- .../actors/ovl_Magic_Dark/z_magic_dark.c | 8 +- .../actors/ovl_Magic_Fire/z_magic_fire.c | 6 +- .../actors/ovl_Magic_Wind/z_magic_wind.c | 2 +- src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c | 6 +- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 6 +- .../ovl_Obj_Blockstop/z_obj_blockstop.c | 2 +- .../actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c | 2 +- .../actors/ovl_Obj_Dekujr/z_obj_dekujr.c | 4 +- .../actors/ovl_Obj_Elevator/z_obj_elevator.c | 4 +- .../actors/ovl_Obj_Hamishi/z_obj_hamishi.c | 2 +- .../actors/ovl_Obj_Hsblock/z_obj_hsblock.c | 4 +- .../actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c | 8 +- .../actors/ovl_Obj_Kibako/z_obj_kibako.c | 12 +- .../actors/ovl_Obj_Kibako2/z_obj_kibako2.c | 4 +- src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c | 10 +- .../ovl_Obj_Lightswitch/z_obj_lightswitch.c | 6 +- src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c | 2 +- .../actors/ovl_Obj_Mure3/z_obj_mure3.c | 2 +- .../actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c | 14 +- .../actors/ovl_Obj_Switch/z_obj_switch.c | 12 +- .../actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 10 +- .../ovl_Obj_Timeblock/z_obj_timeblock.c | 4 +- .../actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 8 +- .../ovl_Obj_Warp2block/z_obj_warp2block.c | 2 +- .../ovl_Object_Kankyo/z_object_kankyo.c | 8 +- .../actors/ovl_Oceff_Spot/z_oceff_spot.c | 6 +- .../actors/ovl_Oceff_Wipe/z_oceff_wipe.c | 2 +- .../actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c | 2 +- .../actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c | 2 +- .../actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c | 2 +- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 4 +- .../actors/ovl_player_actor/z_player.c | 46 +-- .../ovl_Effect_Ss_Blast/z_eff_ss_blast.c | 2 +- .../ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c | 2 +- .../ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c | 4 +- .../ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c | 2 +- .../ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c | 2 +- .../ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c | 6 +- .../ovl_Effect_Ss_Dust/z_eff_ss_dust.c | 2 +- .../ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c | 2 +- .../ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c | 2 +- .../ovl_Effect_Ss_Extra/z_eff_ss_extra.c | 4 +- .../ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c | 2 +- .../z_eff_ss_fhg_flash.c | 6 +- .../z_eff_ss_fire_tail.c | 2 +- .../z_eff_ss_g_magma2.c | 4 +- .../z_eff_ss_g_ripple.c | 4 +- .../ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c | 2 +- .../ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c | 4 +- .../ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c | 2 +- .../z_eff_ss_ice_piece.c | 2 +- .../z_eff_ss_ice_smoke.c | 4 +- .../ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c | 2 +- .../ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c | 2 +- .../z_eff_ss_kirakira.c | 2 +- .../z_eff_ss_lightning.c | 2 +- .../ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c | 2 +- .../z_eff_ss_solder_srch_ball.c | 2 +- .../ovl_Effect_Ss_Stick/z_eff_ss_stick.c | 2 +- .../ovl_file_choose/z_file_choose.c | 6 +- src/overlays/gamestates/ovl_select/z_select.c | 4 +- src/overlays/gamestates/ovl_title/z_title.c | 6 +- .../ovl_kaleido_scope/z_kaleido_collect.c | 4 +- .../misc/ovl_kaleido_scope/z_kaleido_debug.c | 2 +- .../ovl_kaleido_scope/z_kaleido_equipment.c | 4 +- .../ovl_kaleido_scope/z_kaleido_scope_PAL.c | 4 +- 498 files changed, 2197 insertions(+), 2232 deletions(-) diff --git a/include/functions.h b/include/functions.h index 2efde4a706e..abe1ed34580 100644 --- a/include/functions.h +++ b/include/functions.h @@ -28,8 +28,8 @@ void DmaMgr_Error(DmaRequest* req, const char* file, const char* errorName, cons const char* DmaMgr_GetFileNameImpl(u32 vrom); const char* DmaMgr_GetFileName(u32 vrom); void DmaMgr_ProcessMsg(DmaRequest* req); -void DmaMgr_ThreadEntry(void* arg); -s32 DmaMgr_SendRequestImpl(DmaRequest* req, void* ram, u32 vrom, u32 size, u32 unk, OSMesgQueue* queue, OSMesg msg); +void DmaMgr_ThreadEntry(UNUSED void* arg); +s32 DmaMgr_SendRequestImpl(DmaRequest* req, void* ram, u32 vrom, u32 size, UNUSED u32 unk, OSMesgQueue* queue, OSMesg msg); s32 DmaMgr_SendRequest0(void* ram, u32 vrom, u32 size); void DmaMgr_Init(void); s32 DmaMgr_SendRequest2(DmaRequest* req, void* ram, u32 vrom, u32 size, u32 unk5, OSMesgQueue* queue, OSMesg msg, @@ -49,7 +49,7 @@ void isPrintfInit(void); void osSyncPrintfUnused(const char* fmt, ...); void osSyncPrintf(const char* fmt, ...); void rmonPrintf(const char* fmt, ...); -void* is_proutSyncPrintf(void* arg, const char* str, u32 count); +void* is_proutSyncPrintf(UNUSED void* arg, const char* str, u32 count); void func_80002384(const char* exp, const char* file, u32 line); OSPiHandle* osDriveRomInit(void); void Mio0_Decompress(Yaz0Header* hdr, u8* dst); @@ -165,7 +165,7 @@ void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2); void EffectBlure_AddSpace(EffectBlure* this); void EffectBlure_Init1(void* thisx, void* initParamsx); void EffectBlure_Init2(void* thisx, void* initParamsx); -void EffectBlure_Destroy(void* thisx); +void EffectBlure_Destroy(UNUSED void* thisx); s32 EffectBlure_Update(void* thisx); void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx); void EffectShieldParticle_Init(void* thisx, void* initParamsx); @@ -173,7 +173,7 @@ void EffectShieldParticle_Destroy(void* thisx); s32 EffectShieldParticle_Update(void* thisx); void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx); void EffectSpark_Init(void* thisx, void* initParamsx); -void EffectSpark_Destroy(void* thisx); +void EffectSpark_Destroy(UNUSED void* thisx); s32 EffectSpark_Update(void* thisx); void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx); void func_80026230(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3); @@ -188,10 +188,10 @@ void Effect_InitContext(PlayState* play); void Effect_Add(PlayState* play, s32* pIndex, s32 type, u8 arg3, u8 arg4, void* initParams); void Effect_DrawAll(GraphicsContext* gfxCtx); void Effect_UpdateAll(PlayState* play); -void Effect_Delete(PlayState* play, s32 index); -void Effect_DeleteAll(PlayState* play); +void Effect_Delete(UNUSED PlayState* play, s32 index); +void Effect_DeleteAll(UNUSED PlayState* play); void EffectSs_InitInfo(PlayState* play, s32 tableSize); -void EffectSs_ClearAll(PlayState* play); +void EffectSs_ClearAll(UNUSED PlayState* play); void EffectSs_Delete(EffectSs* effectSs); void EffectSs_Reset(EffectSs* effectSs); void EffectSs_Insert(PlayState* play, EffectSs* effectSs); @@ -363,7 +363,7 @@ void Flags_SetTempClear(PlayState* play, s32 flag); void Flags_UnsetTempClear(PlayState* play, s32 flag); s32 Flags_GetCollectible(PlayState* play, s32 flag); void Flags_SetCollectible(PlayState* play, s32 flag); -void TitleCard_InitBossName(PlayState* play, TitleCardContext* titleCtx, void* texture, s16 x, s16 y, u8 width, +void TitleCard_InitBossName(UNUSED PlayState* play, TitleCardContext* titleCtx, void* texture, s16 x, s16 y, u8 width, u8 height); void TitleCard_InitPlaceName(PlayState* play, TitleCardContext* titleCtx, void* texture, s32 x, s32 y, s32 width, s32 height, s32 delay); @@ -395,8 +395,8 @@ s32 func_8002DD78(Player* player); s32 func_8002DDE4(PlayState* play); s32 func_8002DDF4(PlayState* play); void func_8002DE04(PlayState* play, Actor* actorA, Actor* actorB); -void func_8002DE74(PlayState* play, Player* player); -void Actor_MountHorse(PlayState* play, Player* player, Actor* horse); +void func_8002DE74(PlayState* play, UNUSED Player* player); +void Actor_MountHorse(UNUSED PlayState* play, Player* player, Actor* horse); s32 func_8002DEEC(Player* player); void func_8002DF18(PlayState* play, Player* player); s32 func_8002DF38(PlayState* play, Actor* actor, u8 csMode); @@ -419,25 +419,25 @@ PosRot* Actor_GetFocus(PosRot* dest, Actor* actor); PosRot* Actor_GetWorld(PosRot* dest, Actor* actor); PosRot* Actor_GetWorldPosShapeRot(PosRot* arg0, Actor* actor); s32 func_8002F0C8(Actor* actor, Player* player, s32 flag); -u32 Actor_ProcessTalkRequest(Actor* actor, PlayState* play); +u32 Actor_ProcessTalkRequest(Actor* actor, UNUSED PlayState* play); s32 func_8002F1C4(Actor* actor, PlayState* play, f32 arg2, f32 arg3, u32 exchangeItemId); s32 func_8002F298(Actor* actor, PlayState* play, f32 arg2, u32 exchangeItemId); s32 func_8002F2CC(Actor* actor, PlayState* play, f32 arg2); s32 func_8002F2F4(Actor* actor, PlayState* play); -u32 Actor_TextboxIsClosing(Actor* actor, PlayState* play); +u32 Actor_TextboxIsClosing(UNUSED Actor* actor, PlayState* play); s8 func_8002F368(PlayState* play); void Actor_GetScreenPos(PlayState* play, Actor* actor, s16* x, s16* y); -u32 Actor_HasParent(Actor* actor, PlayState* play); +u32 Actor_HasParent(Actor* actor, UNUSED PlayState* play); s32 func_8002F434(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange, f32 yRange); void func_8002F554(Actor* actor, PlayState* play, s32 getItemId); void func_8002F580(Actor* actor, PlayState* play); -u32 Actor_HasNoParent(Actor* actor, PlayState* play); -void func_8002F5C4(Actor* actorA, Actor* actorB, PlayState* play); +u32 Actor_HasNoParent(Actor* actor, UNUSED PlayState* play); +void func_8002F5C4(Actor* actorA, Actor* actorB, UNUSED PlayState* play); void func_8002F5F0(Actor* actor, PlayState* play); -s32 Actor_IsMounted(PlayState* play, Actor* horse); +s32 Actor_IsMounted(UNUSED PlayState* play, Actor* horse); u32 Actor_SetRideActor(PlayState* play, Actor* horse, s32 mountSide); -s32 Actor_NotMounted(PlayState* play, Actor* horse); -void func_8002F698(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6); +s32 Actor_NotMounted(UNUSED PlayState* play, Actor* horse); +void func_8002F698(PlayState* play, UNUSED Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6); void func_8002F6D4(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5); void func_8002F71C(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4); void func_8002F758(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5); @@ -454,7 +454,7 @@ s32 func_8002F9EC(PlayState* play, Actor* actor, CollisionPoly* poly, s32 bgId, void Actor_DisableLens(PlayState* play); void func_800304DC(PlayState* play, ActorContext* actorCtx, ActorEntry* actorEntry); void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx); -s32 func_800314D4(PlayState* play, Actor* actor, Vec3f* arg2, f32 arg3); +s32 func_800314D4(UNUSED PlayState* play, Actor* actor, Vec3f* arg2, f32 arg3); void func_800315AC(PlayState* play, ActorContext* actorCtx); void func_80031A28(PlayState* play, ActorContext* actorCtx); void func_80031B14(PlayState* play, ActorContext* actorCtx); @@ -470,7 +470,7 @@ Actor* func_80032AF0(PlayState* play, ActorContext* actorCtx, Actor** actorPtr, Actor* Actor_Find(ActorContext* actorCtx, s32 actorId, s32 actorCategory); void Enemy_StartFinishingBlow(PlayState* play, Actor* actor); s16 func_80032CB4(s16* arg0, s16 arg1, s16 arg2, s16 arg3); -void BodyBreak_Alloc(BodyBreak* bodyBreak, s32 count, PlayState* play); +void BodyBreak_Alloc(BodyBreak* bodyBreak, s32 count, UNUSED PlayState* play); void BodyBreak_SetInfo(BodyBreak* bodyBreak, s32 limbIndex, s32 minLimbIndex, s32 maxLimbIndex, u32 count, Gfx** dList, s16 objectId); s32 BodyBreak_SpawnParts(Actor* actor, BodyBreak* bodyBreak, PlayState* play, s16 type); @@ -478,7 +478,7 @@ void Actor_SpawnFloorDustRing(PlayState* play, Actor* actor, Vec3f* posXZ, f32 r f32 randAccelWeight, s16 scale, s16 scaleStep, u8 useLighting); void func_80033480(PlayState* play, Vec3f* posBase, f32 randRangeDiameter, s32 amountMinusOne, s16 scaleBase, s16 scaleStep, u8 arg6); -Actor* Actor_GetCollidedExplosive(PlayState* play, Collider* collider); +Actor* Actor_GetCollidedExplosive(UNUSED PlayState* play, Collider* collider); Actor* func_80033684(PlayState* play, Actor* explosiveActor); Actor* Actor_GetProjectileActor(PlayState* play, Actor* refActor, f32 radius); void Actor_ChangeCategory(PlayState* play, ActorContext* actorCtx, Actor* actor, u8 actorCategory); @@ -509,7 +509,7 @@ void func_80034CC4(PlayState* play, SkelAnime* skelAnime, OverrideLimbDraw overr s16 func_80034DD4(Actor* actor, PlayState* play, s16 arg2, f32 arg3); void Animation_ChangeByInfo(SkelAnime* skelAnime, AnimationInfo* animationInfo, s32 index); void func_80034F54(PlayState* play, s16* arg1, s16* arg2, s32 arg3); -void Actor_Noop(Actor* actor, PlayState* play); +void Actor_Noop(UNUSED Actor* actor, UNUSED PlayState* play); void Gfx_DrawDListOpa(PlayState* play, Gfx* dlist); void Gfx_DrawDListXlu(PlayState* play, Gfx* dlist); Actor* Actor_FindNearby(PlayState* play, Actor* refActor, s16 actorId, u8 actorCategory, f32 range); @@ -521,7 +521,7 @@ u8 Actor_ApplyDamage(Actor* actor); void Actor_SetDropFlag(Actor* actor, ColliderInfo* colInfo, s32 freezeFlag); void Actor_SetDropFlagJntSph(Actor* actor, ColliderJntSph* jntSph, s32 freezeFlag); void func_80035844(Vec3f* arg0, Vec3f* arg1, Vec3s* arg2, s32 arg3); -Actor* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, s32 timer, s16* unused, +Actor* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, s32 timer, UNUSED s16* arg5, PlayState* play, s16 params, Gfx* dList); void func_800359B8(Actor* actor, s16 arg1, Vec3s* arg2); s32 Flags_GetEventChkInf(s32 flag); @@ -605,13 +605,13 @@ u16 SSNodeList_GetNextNodeIdx(SSNodeList* this); s32 DynaPoly_IsBgIdBgActor(s32 bgId); void DynaPoly_Init(PlayState* play, DynaCollisionContext* dyna); void DynaPoly_Alloc(PlayState* play, DynaCollisionContext* dyna); -void DynaPoly_DisableCollision(PlayState* play, DynaCollisionContext* dyna, s32 bgId); -void DynaPoly_EnableCollision(PlayState* play, DynaCollisionContext* dyna, s32 bgId); -void DynaPoly_DisableCeilingCollision(PlayState* play, DynaCollisionContext* dyna, s32 bgId); -s32 DynaPoly_SetBgActor(PlayState* play, DynaCollisionContext* dyna, Actor* actor, CollisionHeader* colHeader); +void DynaPoly_DisableCollision(UNUSED PlayState* play, DynaCollisionContext* dyna, s32 bgId); +void DynaPoly_EnableCollision(UNUSED PlayState* play, DynaCollisionContext* dyna, s32 bgId); +void DynaPoly_DisableCeilingCollision(UNUSED PlayState* play, DynaCollisionContext* dyna, s32 bgId); +s32 DynaPoly_SetBgActor(UNUSED PlayState* play, DynaCollisionContext* dyna, Actor* actor, CollisionHeader* colHeader); DynaPolyActor* DynaPoly_GetActor(CollisionContext* colCtx, s32 bgId); void DynaPoly_DeleteBgActor(PlayState* play, DynaCollisionContext* dyna, s32 bgId); -void DynaPoly_InvalidateLookup(PlayState* play, DynaCollisionContext* dyna); +void DynaPoly_InvalidateLookup(UNUSED PlayState* play, DynaCollisionContext* dyna); void DynaPoly_UnsetAllInteractFlags(PlayState* play, DynaCollisionContext* dyna, Actor* actor); void DynaPoly_UpdateContext(PlayState* play, DynaCollisionContext* dyna); void DynaPoly_UpdateBgActorTransforms(PlayState* play, DynaCollisionContext* dyna); @@ -623,7 +623,7 @@ s32 BgCheck_CheckDynaCeiling(CollisionContext* colCtx, u16 xpFlags, f32* outY, V s32 BgCheck_CheckLineAgainstDyna(CollisionContext* colCtx, u16 xpFlags, Vec3f* posA, Vec3f* posB, Vec3f* posResult, CollisionPoly** outPoly, f32* distSq, s32* outBgId, Actor* actor, f32 chkDist, s32 bccFlags); -s32 BgCheck_SphVsFirstDynaPoly(CollisionContext* colCtx, u16 xpFlags, CollisionPoly** outPoly, s32* outBgId, +s32 BgCheck_SphVsFirstDynaPoly(CollisionContext* colCtx, u16 xpFlags, CollisionPoly** outPoly, UNUSED s32* outBgId, Vec3f* center, f32 radius, Actor* actor, u16 bciFlags); void CollisionHeader_GetVirtual(void* colHeader, CollisionHeader** dest); void func_800418D0(CollisionContext* colCtx, PlayState* play); @@ -662,9 +662,9 @@ s32 WaterBox_GetSurface2(PlayState* play, CollisionContext* colCtx, Vec3f* pos, WaterBox** outWaterBox); s32 WaterBox_GetSurfaceImpl(PlayState* play, CollisionContext* colCtx, f32 x, f32 z, f32* ySurface, WaterBox** outWaterBox); -u32 WaterBox_GetBgCamIndex(CollisionContext* colCtx, WaterBox* waterBox); +u32 WaterBox_GetBgCamIndex(UNUSED CollisionContext* colCtx, WaterBox* waterBox); u16 WaterBox_GetBgCamSetting(CollisionContext* colCtx, WaterBox* waterBox); -u32 WaterBox_GetLightSettingIndex(CollisionContext* colCtx, WaterBox* waterBox); +u32 WaterBox_GetLightSettingIndex(UNUSED CollisionContext* colCtx, WaterBox* waterBox); s32 func_80042708(CollisionPoly* polyA, CollisionPoly* polyB, Vec3f* point, Vec3f* closestPoint); s32 func_800427B4(CollisionPoly* polyA, CollisionPoly* polyB, Vec3f* pointA, Vec3f* pointB, Vec3f* closestPoint); void BgCheck_DrawDynaCollision(PlayState*, CollisionContext*); @@ -682,7 +682,7 @@ s32 DynaPolyActor_IsPlayerOnTop(DynaPolyActor* dynaActor); s32 DynaPolyActor_IsPlayerAbove(DynaPolyActor* dynaActor); s32 func_800435B4(DynaPolyActor* dynaActor); s32 func_800435D8(PlayState* play, DynaPolyActor* dynaActor, s16 arg2, s16 arg3, s16 arg4); -void Camera_Init(Camera* camera, View* view, CollisionContext* colCtx, PlayState* play); +void Camera_Init(Camera* camera, UNUSED View* view, UNUSED CollisionContext* colCtx, PlayState* play); void Camera_InitPlayerSettings(Camera* camera, Player* player); s16 Camera_ChangeStatus(Camera* camera, s16 status); Vec3s Camera_Update(Camera* camera); @@ -695,7 +695,7 @@ s16 Camera_GetInputDirYaw(Camera* camera); Vec3s* Camera_GetCamDir(Vec3s* dst, Camera* camera); s16 Camera_GetCamDirPitch(Camera* camera); s16 Camera_GetCamDirYaw(Camera* camera); -s32 Camera_AddQuake(Camera* camera, s32 arg1, s16 y, s32 countdown); +s32 Camera_AddQuake(Camera* camera, UNUSED s32 arg1, s16 y, s32 countdown); s32 Camera_SetParam(Camera* camera, s32 param, void* value); s32 func_8005AC48(Camera* camera, s16 arg1); s16 func_8005ACFC(Camera* camera, s16 arg1); @@ -703,12 +703,12 @@ s16 func_8005AD1C(Camera* camera, s16 arg1); s32 Camera_ResetAnim(Camera* camera); s32 Camera_SetCSParams(Camera* camera, CutsceneCameraPoint* atPoints, CutsceneCameraPoint* eyePoints, Player* player, s16 relativeToPlayer); -s32 Camera_ChangeDoorCam(Camera* camera, Actor* doorActor, s16 bgCamIndex, f32 arg3, s16 timer1, s16 timer2, +s32 Camera_ChangeDoorCam(Camera* camera, Actor* doorActor, s16 bgCamIndex, UNUSED f32 arg3, s16 timer1, s16 timer2, s16 timer3); s32 Camera_Copy(Camera* dstCamera, Camera* srcCamera); Vec3f* Camera_GetSkyboxOffset(Vec3f* dst, Camera* camera); void Camera_SetCameraData(Camera* camera, s16 setDataFlags, void* data0, void* data1, s16 data2, s16 data3, - UNK_TYPE arg6); + UNUSED UNK_TYPE arg6); s32 func_8005B198(void); s16 func_8005B1A4(Camera* camera); DamageTable* DamageTable_Get(s32 index); @@ -804,7 +804,7 @@ u8 CollisionCheck_GetSwordDamage(s32 dmgFlags); void SaveContext_Init(void); s32 func_800635D0(s32); void func_800636C0(void); -void func_8006375C(s32 arg0, s32 arg1, const char* text); +void func_8006375C(UNUSED s32 arg0, UNUSED s32 arg1, UNUSED const char* text); void func_8006376C(u8 x, u8 y, u8 colorId, const char* text); // ? func_80063828(?); void func_8006390C(Input* input); @@ -815,9 +815,9 @@ DebugDispObject* DebugDisplay_AddObject(f32 posX, f32 posY, f32 posZ, s16 rotX, f32 scaleY, f32 scaleZ, u8 red, u8 green, u8 blue, u8 alpha, s16 type, GraphicsContext* gfxCtx); void DebugDisplay_DrawObjects(PlayState* play); -void func_8006450C(PlayState* play, CutsceneContext* csCtx); -void func_80064520(PlayState* play, CutsceneContext* csCtx); -void func_80064534(PlayState* play, CutsceneContext* csCtx); +void func_8006450C(UNUSED PlayState* play, CutsceneContext* csCtx); +void func_80064520(UNUSED PlayState* play, CutsceneContext* csCtx); +void func_80064534(UNUSED PlayState* play, CutsceneContext* csCtx); void func_80064558(PlayState* play, CutsceneContext* csCtx); void func_800645A0(PlayState* play, CutsceneContext* csCtx); void Cutscene_HandleEntranceTriggers(PlayState* play); @@ -836,8 +836,8 @@ void Flags_SetEnv(PlayState* play, s16 flag); void Flags_UnsetEnv(PlayState* play, s16 flag); s32 Flags_GetEnv(PlayState* play, s16 flag); s32 func_8006CFC0(s32 scene); -void func_8006D074(PlayState* play); -void func_8006D0AC(PlayState* play); +void func_8006D074(UNUSED PlayState* play); +void func_8006D0AC(UNUSED PlayState* play); void func_8006D0EC(PlayState* play, Player* player); void func_8006D684(PlayState* play, Player* player); void func_8006DC68(PlayState* play, Player* player); @@ -845,15 +845,15 @@ void func_8006DD9C(Actor* actor, Vec3f* arg1, s16 arg2); s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize); void KaleidoSetup_Update(PlayState* play); void KaleidoSetup_Init(PlayState* play); -void KaleidoSetup_Destroy(PlayState* play); -void func_8006EE50(Font* font, u16 arg1, u16 arg2); +void KaleidoSetup_Destroy(UNUSED PlayState* play); +void func_8006EE50(UNUSED Font* font, UNUSED u16 arg1, UNUSED u16 arg2); void Font_LoadChar(Font* font, u8 character, u16 codePointIndex); void Font_LoadMessageBoxIcon(Font* font, u16 icon); void Font_LoadOrderedFont(Font* font); s32 Environment_ZBufValToFixedPoint(s32 zBufferVal); u16 Environment_GetPixelDepth(s32 x, s32 y); -void Environment_GraphCallback(GraphicsContext* gfxCtx, void* param); -void Environment_Init(PlayState* play2, EnvironmentContext* envCtx, s32 unused); +void Environment_GraphCallback(UNUSED GraphicsContext* gfxCtx, void* param); +void Environment_Init(PlayState* play2, EnvironmentContext* envCtx, UNUSED s32 arg2); u8 Environment_SmoothStepToU8(u8* pvalue, u8 target, u8 scale, u8 step, u8 minStep); u8 Environment_SmoothStepToS8(s8* pvalue, s8 target, u8 scale, u8 step, u8 minStep); f32 Environment_LerpWeight(u16 max, u16 min, u16 val); @@ -863,19 +863,19 @@ void Environment_EnableUnderwaterLights(PlayState* play, s32 waterLightsIndex); void Environment_DisableUnderwaterLights(PlayState* play); void Environment_Update(PlayState* play, EnvironmentContext* envCtx, LightContext* lightCtx, PauseContext* pauseCtx, MessageContext* msgCtx, GameOverContext* gameOverCtx, - GraphicsContext* gfxCtx); + UNUSED GraphicsContext* gfxCtx); void Environment_DrawSunAndMoon(PlayState* play); -void Environment_DrawSunLensFlare(PlayState* play, EnvironmentContext* envCtx, View* view, - GraphicsContext* gfxCtx, Vec3f pos, s32 unused); +void Environment_DrawSunLensFlare(PlayState* play, UNUSED EnvironmentContext* envCtx, UNUSED View* view, + UNUSED GraphicsContext* gfxCtx, Vec3f pos, UNUSED s32 arg5); void Environment_DrawLensFlare(PlayState* play, EnvironmentContext* envCtx, View* view, - GraphicsContext* gfxCtx, Vec3f pos, s32 unused, s16 scale, f32 colorIntensity, + GraphicsContext* gfxCtx, Vec3f pos, UNUSED s32 arg5, s16 scale, f32 colorIntensity, s16 glareStrength, u8 isSun); void Environment_DrawRain(PlayState* play, View* view, GraphicsContext* gfxCtx); void Environment_ChangeLightSetting(PlayState* play, u32 lightSetting); void Environment_DrawSkyboxFilters(PlayState* play); void Environment_UpdateLightningStrike(PlayState* play); -void Environment_AddLightningBolts(PlayState* play, u8 num); -void Environment_DrawLightning(PlayState* play, s32 unused); +void Environment_AddLightningBolts(UNUSED PlayState* play, u8 num); +void Environment_DrawLightning(PlayState* play, UNUSED s32 arg1); void Environment_PlaySceneSequence(PlayState* play); void Environment_DrawCustomLensFlare(PlayState* play); void Environment_InitGameOverLights(PlayState* play); @@ -944,10 +944,10 @@ void LightContext_Init(PlayState* play, LightContext* lightCtx); void LightContext_SetAmbientColor(LightContext* lightCtx, u8 r, u8 g, u8 b); void LightContext_SetFog(LightContext* lightCtx, u8 r, u8 g, u8 b, s16 fogNear, s16 fogFar); Lights* LightContext_NewLights(LightContext* lightCtx, GraphicsContext* gfxCtx); -void LightContext_InitList(PlayState* play, LightContext* lightCtx); +void LightContext_InitList(UNUSED PlayState* play, LightContext* lightCtx); void LightContext_DestroyList(PlayState* play, LightContext* lightCtx); -LightNode* LightContext_InsertLight(PlayState* play, LightContext* lightCtx, LightInfo* info); -void LightContext_RemoveLight(PlayState* play, LightContext* lightCtx, LightNode* node); +LightNode* LightContext_InsertLight(UNUSED PlayState* play, LightContext* lightCtx, LightInfo* info); +void LightContext_RemoveLight(UNUSED PlayState* play, LightContext* lightCtx, LightNode* node); Lights* Lights_NewAndDraw(GraphicsContext* gfxCtx, u8 ambientR, u8 ambientG, u8 ambientB, u8 numLights, u8 r, u8 g, u8 b, s8 x, s8 y, s8 z); Lights* Lights_New(GraphicsContext* gfxCtx, u8 ambientR, u8 ambientG, u8 ambientB); @@ -970,7 +970,7 @@ void ZeldaArena_Init(void* start, u32 size); void ZeldaArena_Cleanup(void); u8 ZeldaArena_IsInitalized(void); void MapMark_Init(PlayState* play); -void MapMark_ClearPointers(PlayState* play); +void MapMark_ClearPointers(UNUSED PlayState* play); void MapMark_Draw(PlayState* play); void PreNmiBuff_Init(PreNmiBuff* this); void PreNmiBuff_SetReset(PreNmiBuff* this); @@ -993,7 +993,7 @@ s32 OnePointCutscene_AttentionSetSfx(PlayState* play, Actor* actor, s32 sfxId); void OnePointCutscene_EnableAttention(void); void OnePointCutscene_DisableAttention(void); s32 OnePointCutscene_CheckForCategory(PlayState* play, s32 actorCategory); -void OnePointCutscene_Noop(PlayState* play, s32 arg1); +void OnePointCutscene_Noop(UNUSED PlayState* play, UNUSED s32 arg1); void Map_SavePlayerInitialInfo(PlayState* play); void Map_SetFloorPalettesData(PlayState* play, s16 floor); void Map_InitData(PlayState* play, s16 room); @@ -1021,14 +1021,14 @@ s32 Inventory_ConsumeFairy(PlayState* play); void Interface_SetDoAction(PlayState* play, u16 action); void Interface_SetNaviCall(PlayState* play, u16 naviCallState); void Interface_LoadActionLabelB(PlayState* play, u16 action); -s32 Health_ChangeBy(PlayState* play, s16 amount); +s32 Health_ChangeBy(UNUSED PlayState* play, s16 amount); void Rupees_ChangeBy(s16 rupeeChange); void Inventory_ChangeAmmo(s16 item, s16 ammoChange); -void Magic_Fill(PlayState* play); -void Magic_Reset(PlayState* play); +void Magic_Fill(UNUSED PlayState* play); +void Magic_Reset(UNUSED PlayState* play); s32 Magic_RequestChange(PlayState* play, s16 amount, s16 type); void func_80088AA0(s16 arg0); -void func_80088AF0(PlayState* play); +void func_80088AF0(UNUSED PlayState* play); void func_80088B34(s16 arg0); void Interface_Draw(PlayState* play); void Interface_Update(PlayState* play); @@ -1059,18 +1059,18 @@ u8 Player_GetMask(PlayState* play); Player* Player_UnsetMask(PlayState* play); s32 Player_HasMirrorShieldEquipped(PlayState* play); s32 Player_HasMirrorShieldSetToDraw(PlayState* play); -s32 Player_ActionToMagicSpell(Player* this, s32 actionParam); +s32 Player_ActionToMagicSpell(UNUSED Player* this, s32 actionParam); s32 Player_HoldsHookshot(Player* this); s32 func_8008F128(Player* this); s32 Player_ActionToMeleeWeapon(s32 actionParam); s32 Player_GetMeleeWeaponHeld(Player* this); s32 Player_HoldsTwoHandedWeapon(Player* this); s32 Player_HoldsBrokenKnife(Player* this); -s32 Player_ActionToBottle(Player* this, s32 actionParam); +s32 Player_ActionToBottle(UNUSED Player* this, s32 actionParam); s32 Player_GetBottleHeld(Player* this); -s32 Player_ActionToExplosive(Player* this, s32 actionParam); +s32 Player_ActionToExplosive(UNUSED Player* this, s32 actionParam); s32 Player_GetExplosiveHeld(Player* this); -s32 func_8008F2BC(Player* this, s32 actionParam); +s32 func_8008F2BC(UNUSED Player* this, s32 actionParam); s32 func_8008F2F8(PlayState* play); void Player_DrawImpl(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListCount, s32 lod, s32 tunic, s32 boots, s32 face, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, @@ -1085,7 +1085,7 @@ s32 Player_OverrideLimbDrawGameplay_80090440(PlayState* play, s32 limbIndex, Gfx void* thisx); u8 func_80090480(PlayState* play, ColliderQuad* collider, WeaponInfo* weaponInfo, Vec3f* newTip, Vec3f* newBase); void Player_DrawGetItem(PlayState* play, Player* this); -void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx); +void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, UNUSED Vec3s* rot, void* thisx); u32 func_80091738(PlayState* play, u8* segment, SkelAnime* skelAnime); void Player_DrawPause(PlayState* play, u8* segment, SkelAnime* skelAnime, Vec3f* pos, Vec3s* rot, f32 scale, s32 sword, s32 tunic, s32 shield, s32 boots); @@ -1161,16 +1161,16 @@ Gfx* Gfx_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1 Gfx* Gfx_EnvColor(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a); void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b); void func_80095974(GraphicsContext* gfxCtx); -void func_80095AA0(PlayState* play, Room* room, Input* arg2, UNK_TYPE arg3); +void func_80095AA0(UNUSED PlayState* play, UNUSED Room* room, UNUSED Input* arg2, UNUSED UNK_TYPE arg3); void func_8009638C(Gfx** displayList, void* source, void* tlut, u16 width, u16 height, u8 fmt, u8 siz, u16 mode0, u16 tlutCount, f32 frameX, f32 frameY); -void func_80096FD4(PlayState* play, Room* room); +void func_80096FD4(UNUSED PlayState* play, Room* room); u32 func_80096FE8(PlayState* play, RoomContext* roomCtx); s32 func_8009728C(PlayState* play, RoomContext* roomCtx, s32 roomNum); s32 func_800973FC(PlayState* play, RoomContext* roomCtx); void Room_Draw(PlayState* play, Room* room, u32 flags); void func_80097534(PlayState* play, RoomContext* roomCtx); -void Sample_Destroy(GameState* thisx); +void Sample_Destroy(UNUSED GameState* thisx); void Sample_Init(GameState* thisx); void Inventory_ChangeEquipment(s16 equipment, u16 value); u8 Inventory_DeleteEquipment(PlayState* play, s16 equipment); @@ -1182,7 +1182,7 @@ s32 Object_GetIndex(ObjectContext* objectCtx, s16 objectId); s32 Object_IsLoaded(ObjectContext* objectCtx, s32 bankIndex); void func_800981B8(ObjectContext* objectCtx); s32 Scene_ExecuteCommands(PlayState* play, SceneCmd* sceneCmd); -void TransitionActor_InitContext(GameState* state, TransitionActorContext* transiActorCtx); +void TransitionActor_InitContext(UNUSED GameState* state, TransitionActorContext* transiActorCtx); void Scene_SetTransitionForNextEntrance(PlayState* play); void Scene_Draw(PlayState* play); void SkelAnime_DrawLod(PlayState* play, void** skeleton, Vec3s* jointTable, @@ -1205,8 +1205,8 @@ Gfx* SkelAnime_DrawFlex(PlayState* play, void** skeleton, Vec3s* jointTable, s32 OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, void* arg, Gfx* gfx); void SkelAnime_InterpFrameTable(s32 limbCount, Vec3s* dst, Vec3s* start, Vec3s* target, f32 weight); void AnimationContext_Reset(AnimationContext* animationCtx); -void AnimationContext_SetNextQueue(PlayState* play); -void AnimationContext_DisableQueue(PlayState* play); +void AnimationContext_SetNextQueue(UNUSED PlayState* play); +void AnimationContext_DisableQueue(UNUSED PlayState* play); void AnimationContext_SetLoadFrame(PlayState* play, LinkAnimationHeader* animation, s32 frame, s32 limbCount, Vec3s* frameTable); void AnimationContext_SetCopyAll(PlayState* play, s32 vecCount, Vec3s* dst, Vec3s* src); @@ -1221,7 +1221,7 @@ void SkelAnime_InitLink(PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeade void LinkAnimation_SetUpdateFunction(SkelAnime* skelAnime); s32 LinkAnimation_Update(PlayState* play, SkelAnime* skelAnime); void LinkAnimation_AnimateFrame(PlayState* play, SkelAnime* skelAnime); -void Animation_SetMorph(PlayState* play, SkelAnime* skelAnime, f32 morphFrames); +void Animation_SetMorph(UNUSED PlayState* play, SkelAnime* skelAnime, f32 morphFrames); void LinkAnimation_Change(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation, f32 playSpeed, f32 startFrame, f32 endFrame, u8 mode, f32 morphFrames); void LinkAnimation_PlayOnce(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation); @@ -1245,11 +1245,11 @@ void LinkAnimation_BlendToMorph(PlayState* play, SkelAnime* skelAnime, LinkAnima Vec3s* blendTable); void LinkAnimation_EndLoop(SkelAnime* skelAnime); s32 LinkAnimation_OnFrame(SkelAnime* skelAnime, f32 frame); -BAD_RETURN(s32) SkelAnime_Init(PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, +BAD_RETURN(s32) SkelAnime_Init(UNUSED PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, AnimationHeader* animation, Vec3s* jointTable, Vec3s* morphTable, s32 limbCount); -BAD_RETURN(s32) SkelAnime_InitFlex(PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeader* skeletonHeaderSeg, +BAD_RETURN(s32) SkelAnime_InitFlex(UNUSED PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeader* skeletonHeaderSeg, AnimationHeader* animation, Vec3s* jointTable, Vec3s* morphTable, s32 limbCount); -BAD_RETURN(s32) SkelAnime_InitSkin(PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, +BAD_RETURN(s32) SkelAnime_InitSkin(UNUSED PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, AnimationHeader* animation); s32 SkelAnime_Update(SkelAnime* skelAnime); void Animation_ChangeImpl(SkelAnime* skelAnime, AnimationHeader* animation, f32 playSpeed, f32 startFrame, f32 endFrame, @@ -1268,12 +1268,12 @@ void SkelAnime_CopyFrameTableTrue(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src, void SkelAnime_CopyFrameTableFalse(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src, u8* copyFlag); void SkelAnime_UpdateTranslation(SkelAnime* skelAnime, Vec3f* diff, s16 angle); s32 Animation_OnFrame(SkelAnime* skelAnime, f32 frame); -void SkelAnime_Free(SkelAnime* skelAnime, PlayState* play); +void SkelAnime_Free(SkelAnime* skelAnime, UNUSED PlayState* play); void SkelAnime_CopyFrameTable(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src); void Skin_UpdateVertices(MtxF* mtx, SkinVertex* skinVertices, SkinLimbModif* modifEntry, Vtx* vtxBuf, Vec3f* pos); void Skin_DrawAnimatedLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, s32 arg3, s32 drawFlags); -void Skin_DrawLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, Gfx* dlistOverride, s32 drawFlags); +void Skin_DrawLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, Gfx* dlistOverride, UNUSED s32 drawFlags); void func_800A6330(Actor* actor, PlayState* play, Skin* skin, SkinPostDraw postDraw, s32 setTranslation); void func_800A6360(Actor* actor, PlayState* play, Skin* skin, SkinPostDraw postDraw, SkinOverrideLimbDraw overrideLimbDraw, s32 setTranslation); @@ -1304,7 +1304,7 @@ void SkinMatrix_SetRotateAxis(MtxF* mf, s16 angle, f32 axisX, f32 axisY, f32 axi void Sram_InitNewSave(void); void Sram_InitDebugSave(void); void Sram_OpenSave(SramContext* sramCtx); -void Sram_WriteSave(SramContext* sramCtx); +void Sram_WriteSave(UNUSED SramContext* sramCtx); void Sram_VerifyAndLoadAllSaves(FileSelectState* fileSelect, SramContext* sramCtx); void Sram_InitSave(FileSelectState* fileSelect, SramContext* sramCtx); void Sram_EraseSave(FileSelectState* fileSelect, SramContext* sramCtx); @@ -1312,12 +1312,12 @@ void Sram_CopySave(FileSelectState* fileSelect, SramContext* sramCtx); void Sram_WriteSramHeader(SramContext* sramCtx); void Sram_InitSram(GameState* gameState, SramContext* sramCtx); void Sram_Alloc(GameState* gameState, SramContext* sramCtx); -void Sram_Init(PlayState* play, SramContext* sramCtx); +void Sram_Init(UNUSED PlayState* play, UNUSED SramContext* sramCtx); void SsSram_Init(u32 addr, u8 handleType, u8 handleDomain, u8 handleLatency, u8 handlePageSize, u8 handleRelDuration, u8 handlePulse, u32 handleSpeed); void SsSram_Dma(void* dramAddr, size_t size, s32 direction); void SsSram_ReadWrite(u32 addr, void* dramAddr, size_t size, s32 direction); -void func_800A9F30(PadMgr*, s32); +void func_800A9F30(PadMgr*, UNUSED s32); void func_800A9F6C(f32, u8, u8, u8); void func_800AA000(f32, u8, u8, u8); void func_800AA0B4(void); @@ -1358,22 +1358,22 @@ void ViMode_Configure(ViMode* viMode, s32 mode, s32 type, s32 unk_70, s32 unk_74 void ViMode_Save(ViMode* viMode); void ViMode_Load(ViMode* viMode); void ViMode_Init(ViMode* viMode); -void ViMode_Destroy(ViMode* viMode); +void ViMode_Destroy(UNUSED ViMode* viMode); void ViMode_ConfigureFeatures(ViMode* viMode, s32 viFeatures); void ViMode_Update(ViMode* viMode, Input* input); void func_800ACE70(struct_801664F0* this); -void func_800ACE90(struct_801664F0* this); +void func_800ACE90(UNUSED struct_801664F0* this); void func_800ACE98(struct_801664F0* this, Gfx** gfxp); void VisMono_Init(VisMono* this); void VisMono_Destroy(VisMono* this); void VisMono_Draw(VisMono* this, Gfx** gfxp); void func_800AD920(struct_80166500* this); -void func_800AD950(struct_80166500* this); +void func_800AD950(UNUSED struct_80166500* this); void func_800AD958(struct_80166500* this, Gfx** gfxp); void Skybox_Init(GameState* state, SkyboxContext* skyboxCtx, s16 skyboxId); Mtx* SkyboxDraw_UpdateMatrix(SkyboxContext* skyboxCtx, f32 x, f32 y, f32 z); void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId, s16 blend, f32 x, f32 y, f32 z); -void SkyboxDraw_Update(SkyboxContext* skyboxCtx); +void SkyboxDraw_Update(UNUSED SkyboxContext* skyboxCtx); void PlayerCall_InitFuncPtrs(void); void TransitionUnk_InitGraphics(TransitionUnk* this); void TransitionUnk_InitData(TransitionUnk* this); @@ -1381,10 +1381,10 @@ void TransitionUnk_Destroy(TransitionUnk* this); TransitionUnk* TransitionUnk_Init(TransitionUnk* this, s32 row, s32 col); void TransitionUnk_SetData(TransitionUnk* this); void TransitionUnk_Draw(TransitionUnk* this, Gfx**); -void func_800B23E8(TransitionUnk* this); +void func_800B23E8(UNUSED TransitionUnk* this); void TransitionTriforce_Start(void* thisx); void* TransitionTriforce_Init(void* thisx); -void TransitionTriforce_Destroy(void* thisx); +void TransitionTriforce_Destroy(UNUSED void* thisx); void TransitionTriforce_Update(void* thisx, s32 updateRate); void TransitionTriforce_SetColor(void* thisx, u32 color); void TransitionTriforce_SetType(void* thisx, s32 type); @@ -1392,7 +1392,7 @@ void TransitionTriforce_Draw(void* thisx, Gfx** gfxP); s32 TransitionTriforce_IsDone(void* thisx); void TransitionWipe_Start(void* thisx); void* TransitionWipe_Init(void* thisx); -void TransitionWipe_Destroy(void* thisx); +void TransitionWipe_Destroy(UNUSED void* thisx); void TransitionWipe_Update(void* thisx, s32 updateRate); void TransitionWipe_Draw(void* thisx, Gfx** gfxP); s32 TransitionWipe_IsDone(void* thisx); @@ -1400,7 +1400,7 @@ void TransitionWipe_SetType(void* thisx, s32 type); void TransitionWipe_SetColor(void* thisx, u32 color); void TransitionCircle_Start(void* thisx); void* TransitionCircle_Init(void* thisx); -void TransitionCircle_Destroy(void* thisx); +void TransitionCircle_Destroy(UNUSED void* thisx); void TransitionCircle_Update(void* thisx, s32 updateRate); void TransitionCircle_Draw(void* thisx, Gfx** gfxP); s32 TransitionCircle_IsDone(void* thisx); @@ -1409,7 +1409,7 @@ void TransitionCircle_SetColor(void* thisx, u32 color); void TransitionCircle_SetUnkColor(void* thisx, u32 unkColor); void TransitionFade_Start(void* thisx); void* TransitionFade_Init(void* thisx); -void TransitionFade_Destroy(void* thisx); +void TransitionFade_Destroy(UNUSED void* thisx); void TransitionFade_Update(void* thisx, s32 updateRate); void TransitionFade_Draw(void* thisx, Gfx** gfxP); s32 TransitionFade_IsDone(void* thisx); @@ -1422,49 +1422,20 @@ u32 ShrinkWindow_GetCurrentVal(void); void ShrinkWindow_Init(void); void ShrinkWindow_Destroy(void); void ShrinkWindow_Update(s32 updateRate); -// ? DbCamera_AddVecSph(?); -// ? DbCamera_CalcUpFromPitchYawRoll(?); -// ? DbCamera_SetTextValue(?); -// ? DbCamera_Vec3SToF(?); -// ? DbCamera_Vec3FToS(?); -// ? DbCamera_CopyVec3f(?); -// ? DbCamera_Vec3SToF2(?); -// ? func_800B3F94(?); -// ? func_800B3FF4(?); -// ? func_800B404C(?); -// ? func_800B4088(?); -// ? func_800B41DC(?); -// ? func_800B42C0(?); -// ? func_800B4370(?); -// ? func_800B44E0(?); -// ? DbCamera_PrintPoints(?); -// ? DbCamera_PrintF32Bytes(?); -// ? DbCamera_PrintU16Bytes(?); -// ? DbCamera_PrintS16Bytes(?); -// ? DbCamera_PrintCutBytes(?); void DbCamera_Init(DbCamera* dbCamera, Camera* cameraPtr); void DbgCamera_Enable(DbCamera* dbCamera, Camera* cam); void DbCamera_Update(DbCamera* dbCamera, Camera* cam); -// ? DbCamera_GetFirstAvailableLetter(?); -// ? DbCamera_InitCut(?); -// ? DbCamera_ResetCut(?); -// ? DbCamera_CalcMempakAllocSize(?); -// ? DbCamera_GetMempakAllocSize(?); -// ? DbCamera_DrawSlotLetters(?); -// ? DbCamera_PrintAllCuts(?); -// ? func_800B91B0(?); -void DbCamera_Reset(Camera* cam, DbCamera* dbCam); -// ? DbCamera_UpdateDemoControl(?); +void DbCamera_Reset(UNUSED Camera* cam, DbCamera* dbCam); void func_800BB0A0(f32 u, Vec3f* pos, f32* roll, f32* viewAngle, f32* point0, f32* point1, f32* point2, f32* point3); s32 func_800BB2B4(Vec3f* pos, f32* roll, f32* fov, CutsceneCameraPoint* point, s16* keyFrame, f32* curFrame); s32 Mempak_Init(s32 controllerNb); -s32 Mempak_GetFreeBytes(s32 controllerNb); -s32 Mempak_FindFile(s32 controllerNb, char start, char end); -s32 Mempak_Write(s32 controllerNb, char idx, void* buffer, s32 offset, s32 size); -s32 Mempak_Read(s32 controllerNb, char idx, void* buffer, s32 offset, s32 size); -s32 Mempak_Alloc(s32 controllerNb, char* idx, s32 size); -s32 Mempak_DeleteFile(s32 controllerNb, char idx); -s32 Mempak_GetFileSize(s32 controllerNb, char idx); +s32 Mempak_GetFreeBytes(UNUSED s32 controllerNb); +s32 Mempak_FindFile(UNUSED s32 controllerNb, char start, char end); +s32 Mempak_Write(UNUSED s32 controllerNb, char idx, void* buffer, s32 offset, s32 size); +s32 Mempak_Read(UNUSED s32 controllerNb, char idx, void* buffer, s32 offset, s32 size); +s32 Mempak_Alloc(UNUSED s32 controllerNb, char* idx, s32 size); +s32 Mempak_DeleteFile(UNUSED s32 controllerNb, char idx); +s32 Mempak_GetFileSize(UNUSED s32 controllerNb, char idx); void KaleidoManager_LoadOvl(KaleidoMgrOverlay* ovl); void KaleidoManager_ClearOvl(KaleidoMgrOverlay* ovl); void KaleidoManager_Init(PlayState* play); @@ -1560,7 +1531,7 @@ void THA_Dt(TwoHeadArena* tha); void func_800C3C20(void); void func_800C3C80(AudioMgr* audioMgr); void AudioMgr_HandleRetrace(AudioMgr* audioMgr); -void AudioMgr_HandlePreNMI(AudioMgr* audioMgr); +void AudioMgr_HandlePreNMI(UNUSED AudioMgr* audioMgr); void AudioMgr_ThreadEntry(void* arg0); void AudioMgr_Unlock(AudioMgr* audioMgr); void AudioMgr_Init(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, Scheduler* sched, IrqMgr* irqMgr); @@ -1592,10 +1563,10 @@ void Graph_UCodeFaultClient(Gfx* workBuf); void Graph_InitTHGA(GraphicsContext* gfxCtx); GameStateOverlay* Graph_GetNextGameState(GameState* gameState); void Graph_Init(GraphicsContext* gfxCtx); -void Graph_Destroy(GraphicsContext* gfxCtx); +void Graph_Destroy(UNUSED GraphicsContext* gfxCtx); void Graph_TaskSet00(GraphicsContext* gfxCtx); void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState); -void Graph_ThreadEntry(void*); +void Graph_ThreadEntry(UNUSED void* arg); void* Graph_Alloc(GraphicsContext* gfxCtx, size_t size); void* Graph_Alloc2(GraphicsContext* gfxCtx, size_t size); void Graph_OpenDisps(Gfx** dispRefs, GraphicsContext* gfxCtx, const char* file, s32 line); @@ -1626,12 +1597,12 @@ void PadMgr_HandlePreNMI(PadMgr* padMgr); void PadMgr_Init(PadMgr* padMgr, OSMesgQueue* serialEventQueue, IrqMgr* irqMgr, OSId id, OSPri priority, void* stack); void SpeedMeter_InitImpl(SpeedMeter* this, u32 arg1, u32 y); void SpeedMeter_Init(SpeedMeter* this); -void SpeedMeter_Destroy(SpeedMeter* this); +void SpeedMeter_Destroy(UNUSED SpeedMeter* this); void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx); void SpeedMeter_InitAllocEntry(SpeedMeterAllocEntry* this, u32 maxval, u32 val, u16 backColor, u16 foreColor, u32 ulx, u32 lrx, u32 uly, u32 lry); void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxCtx); -void SpeedMeter_DrawAllocEntries(SpeedMeter* meter, GraphicsContext* gfxCtx, GameState* state); +void SpeedMeter_DrawAllocEntries(UNUSED SpeedMeter* meter, GraphicsContext* gfxCtx, GameState* state); void SysCfb_Init(s32 n64dd); u32 SysCfb_GetFbPtr(s32 idx); u32 SysCfb_GetFbEnd(void); @@ -1705,8 +1676,8 @@ s32 Math3D_TriVsTriIntersect(TriNorm* ta, TriNorm* tb, Vec3f* intersect); s32 Math3D_XZInSphere(Sphere16* sphere, f32 x, f32 z); s32 Math3D_XYInSphere(Sphere16* sphere, f32 x, f32 y); s32 Math3D_YZInSphere(Sphere16* sphere, f32 y, f32 z); -void Math3D_DrawSphere(PlayState* play, Sphere16* sph); -void Math3D_DrawCylinder(PlayState* play, Cylinder16* cyl); +void Math3D_DrawSphere(UNUSED PlayState* play, UNUSED Sphere16* sph); +void Math3D_DrawCylinder(UNUSED PlayState* play, UNUSED Cylinder16* cyl); s16 Math_Atan2S(f32 x, f32 y); f32 Math_Atan2F(f32 x, f32 y); void Matrix_Init(GameState* gameState); @@ -1766,7 +1737,7 @@ void DebugArena_Init(void* start, u32 size); void DebugArena_Cleanup(void); u8 DebugArena_IsInitalized(void); void UCodeDisas_Init(UCodeDisas*); -void UCodeDisas_Destroy(UCodeDisas*); +void UCodeDisas_Destroy(UNUSED UCodeDisas*); // void UCodeDisas_Disassemble(UCodeDisas*, Gfx*); void UCodeDisas_RegisterUCode(UCodeDisas*, s32, UCodeInfo*); void UCodeDisas_SetCurUCode(UCodeDisas*, void*); @@ -1797,16 +1768,16 @@ void* AudioHeap_AllocSampleCache(u32 size, s32 fontId, void* sampleAddr, s8 medi void AudioHeap_ApplySampleBankCache(s32 sampleBankId); void AudioLoad_DecreaseSampleDmaTtls(void); void* AudioLoad_DmaSampleData(u32 devAddr, u32 size, s32 arg2, u8* dmaIndexRef, s32 medium); -void AudioLoad_InitSampleDmaBuffers(s32 numNotes); +void AudioLoad_InitSampleDmaBuffers(UNUSED s32 numNotes); s32 AudioLoad_IsFontLoadComplete(s32 fontId); s32 AudioLoad_IsSeqLoadComplete(s32 seqId); void AudioLoad_SetFontLoadStatus(s32 fontId, s32 loadStatus); void AudioLoad_SetSeqLoadStatus(s32 seqId, s32 loadStatus); void AudioLoad_SyncLoadSeqParts(s32 seqId, s32 arg1); s32 AudioLoad_SyncLoadInstrument(s32 fontId, s32 instId, s32 drumId); -void AudioLoad_AsyncLoadSeq(s32 seqId, s32 arg1, s32 retData, OSMesgQueue* retQueue); -void AudioLoad_AsyncLoadSampleBank(s32 sampleBankId, s32 arg1, s32 retData, OSMesgQueue* retQueue); -void AudioLoad_AsyncLoadFont(s32 fontId, s32 arg1, s32 retData, OSMesgQueue* retQueue); +void AudioLoad_AsyncLoadSeq(s32 seqId, UNUSED s32 arg1, s32 retData, OSMesgQueue* retQueue); +void AudioLoad_AsyncLoadSampleBank(s32 sampleBankId, UNUSED s32 arg1, s32 retData, OSMesgQueue* retQueue); +void AudioLoad_AsyncLoadFont(s32 fontId, UNUSED s32 arg1, s32 retData, OSMesgQueue* retQueue); u8* AudioLoad_GetFontsForSequence(s32 seqId, u32* outNumFonts); void AudioLoad_DiscardSeqFonts(s32 seqId); s32 AudioLoad_SyncInitSeqPlayer(s32 playerIdx, s32 seqId, s32 arg2); @@ -1878,7 +1849,7 @@ f32 Audio_GetVibratoFreqScale(VibratoState* vib); void Audio_NoteVibratoUpdate(Note* note); void Audio_NoteVibratoInit(Note* note); void Audio_NotePortamentoInit(Note* note); -void Audio_AdsrInit(AdsrState* adsr, EnvelopePoint* envelope, s16* volOut); +void Audio_AdsrInit(AdsrState* adsr, EnvelopePoint* envelope, UNUSED s16* volOut); f32 Audio_AdsrUpdate(AdsrState* adsr); void AudioSeq_SequenceChannelDisable(SequenceChannel* channel); void AudioSeq_SequencePlayerDisableAsFinished(SequencePlayer* seqPlayer); @@ -1967,7 +1938,7 @@ void Audio_PlayNatureAmbienceSequence(u8 natureAmbienceId); void Audio_Init(void); void Audio_InitSound(void); void func_800F7170(void); -void func_800F71BC(s32 arg0); +void func_800F71BC(UNUSED s32 arg0); void Audio_SetSoundBanksMute(u16 muteMask); void Audio_QueueSeqCmdMute(u8 channelIdx); void Audio_ClearBGMMute(u8 channelIdx); @@ -2006,7 +1977,7 @@ void GfxPrint_SetPosPx(GfxPrint* this, s32 x, s32 y); void GfxPrint_SetPos(GfxPrint* this, s32 x, s32 y); void GfxPrint_SetBasePosPx(GfxPrint* this, s32 x, s32 y); void GfxPrint_Init(GfxPrint* this); -void GfxPrint_Destroy(GfxPrint* this); +void GfxPrint_Destroy(UNUSED GfxPrint* this); void GfxPrint_Open(GfxPrint* this, Gfx* dList); Gfx* GfxPrint_Close(GfxPrint* this); s32 GfxPrint_Printf(GfxPrint* this, const char* fmt, ...); @@ -2110,7 +2081,7 @@ void __osFree(Arena* arena, void* ptr); void __osFree_NoLockDebug(Arena* arena, void* ptr, const char* file, s32 line); void __osFreeDebug(Arena* arena, void* ptr, const char* file, s32 line); void* __osRealloc(Arena* arena, void* ptr, u32 newSize); -void* __osReallocDebug(Arena* arena, void* ptr, u32 newSize, const char* file, s32 line); +void* __osReallocDebug(Arena* arena, void* ptr, u32 newSize, UNUSED const char* file, UNUSED s32 line); void ArenaImpl_GetSizes(Arena* arena, u32* outMaxFree, u32* outFree, u32* outAlloc); void __osDisplayArena(Arena* arena); void ArenaImpl_FaultClient(Arena* arena); @@ -2141,7 +2112,7 @@ f32 sinf(f32); s16 sins(u16); OSTask* _VirtualToPhysicalTask(OSTask* intp); void osSpTaskLoad(OSTask* intp); -void osSpTaskStartGo(OSTask* tp); +void osSpTaskStartGo(UNUSED OSTask* tp); void __osSiCreateAccessQueue(void); void __osSiGetAccess(void); void __osSiRelAccess(void); @@ -2259,10 +2230,10 @@ void GameOver_Update(PlayState* play); void func_80110990(PlayState* play); void func_801109B0(PlayState* play); void Message_Init(PlayState* play); -void func_80112098(PlayState* play); +void func_80112098(UNUSED PlayState* play); void Setup_Init(GameState* thisx); -void Setup_Destroy(GameState* thisx); +void Setup_Destroy(UNUSED GameState* thisx); void ConsoleLogo_Init(GameState* thisx); void ConsoleLogo_Destroy(GameState* thisx); void MapSelect_Init(GameState* thisx); diff --git a/include/macros.h b/include/macros.h index 09dddd40d87..c216eb37825 100644 --- a/include/macros.h +++ b/include/macros.h @@ -141,7 +141,7 @@ } \ (void)0 -extern GraphicsContext* __gfxCtx; +extern struct GraphicsContext* __gfxCtx; #define WORK_DISP __gfxCtx->work.p #define POLY_OPA_DISP __gfxCtx->polyOpa.p @@ -150,12 +150,12 @@ extern GraphicsContext* __gfxCtx; // __gfxCtx shouldn't be used directly. // Use the DISP macros defined above when writing to display buffers. -#define OPEN_DISPS(gfxCtx, file, line) \ - { \ - GraphicsContext* __gfxCtx; \ - Gfx* dispRefs[4]; \ - __gfxCtx = gfxCtx; \ - (void)__gfxCtx; \ +#define OPEN_DISPS(gfxCtx, file, line) \ + { \ + struct GraphicsContext* __gfxCtx; \ + Gfx* dispRefs[4]; \ + __gfxCtx = gfxCtx; \ + (void)__gfxCtx; \ Graph_OpenDisps(dispRefs, gfxCtx, file, line) #define CLOSE_DISPS(gfxCtx, file, line) \ diff --git a/include/sched.h b/include/sched.h index 48ecc7b245f..c3fd06e965a 100644 --- a/include/sched.h +++ b/include/sched.h @@ -3,6 +3,7 @@ #include "ultra64.h" #include "irqmgr.h" +#include "macros.h" #define OS_SC_NEEDS_RDP 0x0001 // Task uses the RDP #define OS_SC_NEEDS_RSP 0x0002 // Task uses the RSP @@ -65,6 +66,6 @@ typedef struct { } Scheduler; // size = 0x258 void Sched_Notify(Scheduler* sc); -void Sched_Init(Scheduler* sc, void* stack, OSPri priority, UNK_TYPE arg3, UNK_TYPE arg4, IrqMgr* irqMgr); +void Sched_Init(Scheduler* sc, void* stack, OSPri priority, UNUSED UNK_TYPE arg3, UNUSED UNK_TYPE arg4, IrqMgr* irqMgr); #endif diff --git a/include/z64curve.h b/include/z64curve.h index a526effcb8f..c340c2a6bf0 100644 --- a/include/z64curve.h +++ b/include/z64curve.h @@ -3,6 +3,7 @@ #include "ultra64/types.h" #include "z64math.h" +#include "macros.h" struct PlayState; @@ -50,13 +51,13 @@ typedef void (*PostCurveLimbDraw)(struct PlayState* play, SkelCurve* skelCuve, s f32 Curve_Interpolate(f32 x, CurveInterpKnot* knots, s32 knotCount); void SkelCurve_Clear(SkelCurve* skelCurve); -s32 SkelCurve_Init(struct PlayState* play, SkelCurve* skelCurve, CurveSkeletonHeader* skeletonHeaderSeg, - CurveAnimationHeader* animation); -void SkelCurve_Destroy(struct PlayState* play, SkelCurve* skelCurve); +s32 SkelCurve_Init(UNUSED struct PlayState* play, SkelCurve* skelCurve, CurveSkeletonHeader* skeletonHeaderSeg, + UNUSED CurveAnimationHeader* animation); +void SkelCurve_Destroy(UNUSED struct PlayState* play, SkelCurve* skelCurve); void SkelCurve_SetAnim(SkelCurve* skelCurve, CurveAnimationHeader* animation, f32 arg2, f32 endFrame, f32 curFrame, f32 playSpeed); -s32 SkelCurve_Update(struct PlayState* play, SkelCurve* skelCurve); -void SkelCurve_Draw(Actor* actor, struct PlayState* play, SkelCurve* skelCurve, OverrideCurveLimbDraw overrideLimbDraw, +s32 SkelCurve_Update(UNUSED struct PlayState* play, SkelCurve* skelCurve); +void SkelCurve_Draw(UNUSED Actor* actor, struct PlayState* play, SkelCurve* skelCurve, OverrideCurveLimbDraw overrideLimbDraw, PostCurveLimbDraw postLimbDraw, s32 lod, void* data); // ZAPD compatibility typedefs diff --git a/src/boot/is_debug.c b/src/boot/is_debug.c index c064c43a300..b21e3219ff4 100644 --- a/src/boot/is_debug.c +++ b/src/boot/is_debug.c @@ -40,7 +40,7 @@ void rmonPrintf(const char* fmt, ...) { va_end(args); } -void* is_proutSyncPrintf(void* arg, const char* str, u32 count) { +void* is_proutSyncPrintf(UNUSED void* arg, const char* str, u32 count) { u32 data; s32 pos; s32 start; @@ -69,7 +69,7 @@ void* is_proutSyncPrintf(void* arg, const char* str, u32 count) { u32 addr = (u32)&gISVDbgPrnAdrs->data + (start & 0xFFFFFFC); s32 shift = ((3 - (start & 3)) * 8); - if (*str) { + if (*str != '\0') { osEPiReadIo(sISVHandle, addr, &data); osEPiWriteIo(sISVHandle, addr, (*str << shift) | (data & ~(0xFF << shift))); diff --git a/src/boot/yaz0.c b/src/boot/yaz0.c index 63ead5b47e0..63c6ab27226 100644 --- a/src/boot/yaz0.c +++ b/src/boot/yaz0.c @@ -7,7 +7,7 @@ u32 sYaz0CurSize; u8* sYaz0MaxPtr; void* Yaz0_FirstDMA(void) { - s32 pad[2]; + UNUSED s32 pad[2]; u32 dmaSize; u32 bufferSize; diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 7fcc811f623..cddf40f511f 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -49,7 +49,7 @@ s32 DmaMgr_DmaRomToRam(u32 rom, void* ram, u32 size) { OSMesg msg; s32 ret; u32 buffSize = gDmaMgrDmaBuffSize; - s32 pad[2]; + UNUSED s32 pad[2]; if (buffSize == 0) { buffSize = 0x2000; @@ -309,7 +309,7 @@ void DmaMgr_ProcessMsg(DmaRequest* req) { } } -void DmaMgr_ThreadEntry(void* arg) { +void DmaMgr_ThreadEntry(UNUSED void* arg) { OSMesg msg; DmaRequest* req; @@ -336,7 +336,7 @@ void DmaMgr_ThreadEntry(void* arg) { osSyncPrintf("ＤＭＡマネージャスレッド実行終了\n"); } -s32 DmaMgr_SendRequestImpl(DmaRequest* req, void* ram, u32 vrom, u32 size, u32 unk, OSMesgQueue* queue, OSMesg msg) { +s32 DmaMgr_SendRequestImpl(DmaRequest* req, void* ram, u32 vrom, u32 size, UNUSED u32 unk, OSMesgQueue* queue, OSMesg msg) { static s32 sDmaMgrQueueFullLogged = 0; if ((1 && (ram == NULL)) || (osMemSize < OS_K0_TO_PHYSICAL(ram) + size) || (vrom & 1) || (vrom > 0x4000000) || @@ -439,7 +439,7 @@ s32 DmaMgr_SendRequest1(void* ram, u32 vrom, u32 size, const char* file, s32 lin s32 ret; OSMesgQueue queue; OSMesg msg; - s32 pad; + UNUSED s32 pad; req.filename = file; req.line = line; diff --git a/src/code/PreRender.c b/src/code/PreRender.c index 3983361e866..949fbf03789 100644 --- a/src/code/PreRender.c +++ b/src/code/PreRender.c @@ -358,7 +358,7 @@ void func_800C2500(PreRender* this, s32 x, s32 y) { s32 buffB[3 * 5]; s32 x1; s32 y1; - s32 pad; + UNUSED s32 pad; s32 pxR; s32 pxG; s32 pxB; @@ -472,11 +472,11 @@ void func_800C2500(PreRender* this, s32 x, s32 y) { void func_800C2FE4(PreRender* this) { s32 x; s32 y; - s32 pad1; + UNUSED s32 pad1; u8* buffR = alloca(this->width); u8* buffG = alloca(this->width); u8* buffB = alloca(this->width); - s32 pad2[3]; + UNUSED s32 pad2[3]; s32 pxR; s32 pxG; s32 pxB; diff --git a/src/code/__osMalloc.c b/src/code/__osMalloc.c index 19de34a8bee..675dd943640 100644 --- a/src/code/__osMalloc.c +++ b/src/code/__osMalloc.c @@ -560,7 +560,7 @@ void* __osRealloc(Arena* arena, void* ptr, u32 newSize) { ArenaNode* overNext2; ArenaNode localCopy; u32 blockSize; - s32 pad; + UNUSED s32 pad; newSize = ALIGN16(newSize); osSyncPrintf("__osRealloc(%08x, %d)\n", ptr, newSize); @@ -645,7 +645,7 @@ void* __osRealloc(Arena* arena, void* ptr, u32 newSize) { return ptr; } -void* __osReallocDebug(Arena* arena, void* ptr, u32 newSize, const char* file, s32 line) { +void* __osReallocDebug(Arena* arena, void* ptr, u32 newSize, UNUSED const char* file, UNUSED s32 line) { return __osRealloc(arena, ptr, newSize); } diff --git a/src/code/audioMgr.c b/src/code/audioMgr.c index 840b2549000..8707d4bf912 100644 --- a/src/code/audioMgr.c +++ b/src/code/audioMgr.c @@ -42,7 +42,7 @@ void AudioMgr_HandleRetrace(AudioMgr* audioMgr) { audioMgr->rspTask = rspTask; } -void AudioMgr_HandlePreNMI(AudioMgr* audioMgr) { +void AudioMgr_HandlePreNMI(UNUSED AudioMgr* audioMgr) { // "Audio manager received OS_SC_PRE_NMI_MSG" osSyncPrintf("オーディオマネージャが OS_SC_PRE_NMI_MSG を受け取りました\n"); Audio_PreNMI(); diff --git a/src/code/audio_effects.c b/src/code/audio_effects.c index 5faf49a374f..f4e640a2591 100644 --- a/src/code/audio_effects.c +++ b/src/code/audio_effects.c @@ -215,7 +215,7 @@ void Audio_NotePortamentoInit(Note* note) { note->playbackState.portamento = note->playbackState.parentLayer->portamento; } -void Audio_AdsrInit(AdsrState* adsr, EnvelopePoint* envelope, s16* volOut) { +void Audio_AdsrInit(AdsrState* adsr, EnvelopePoint* envelope, UNUSED s16* volOut) { adsr->action.asByte = 0; adsr->delay = 0; adsr->envelope = envelope; diff --git a/src/code/audio_heap.c b/src/code/audio_heap.c index 0f5abc44250..f264633e442 100644 --- a/src/code/audio_heap.c +++ b/src/code/audio_heap.c @@ -733,7 +733,7 @@ void AudioHeap_LoadFilter(s16* filter, s32 lowPassCutoff, s32 highPassCutoff) { } } -void AudioHeap_UpdateReverb(SynthesisReverb* reverb) { +void AudioHeap_UpdateReverb(UNUSED SynthesisReverb* reverb) { } void AudioHeap_UpdateReverbs(void) { @@ -847,7 +847,7 @@ s32 AudioHeap_ResetStep(void) { } void AudioHeap_Init(void) { - s32 pad1[4]; + UNUSED s32 pad1[4]; s16* ramAddr; s32 persistentSize; s32 temporarySize; @@ -856,7 +856,7 @@ void AudioHeap_Init(void) { OSIntMask intMask; s32 i; s32 j; - s32 pad2; + UNUSED s32 pad2; AudioSpec* spec = &gAudioSpecs[gAudioContext.audioResetSpecIdToLoad]; // Audio Specifications gAudioContext.sampleDmaCount = 0; @@ -1396,7 +1396,7 @@ void AudioHeap_ApplySampleBankCacheInternal(s32 apply, s32 sampleBankId) { Instrument* inst; SoundEffect* soundEffect; u32* fakematch; - s32 pad[4]; + UNUSED s32 pad[4]; sampleBankTable = gAudioContext.sampleBankTable; numFonts = gAudioContext.soundFontTable->numEntries; diff --git a/src/code/audio_load.c b/src/code/audio_load.c index c1ef5b947e8..6913fb00407 100644 --- a/src/code/audio_load.c +++ b/src/code/audio_load.c @@ -27,11 +27,11 @@ typedef struct { typedef void SoundFontData; /* forward declarations */ -s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2); +s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, UNUSED s32 arg2); SoundFontData* AudioLoad_SyncLoadFont(u32 fontId); Sample* AudioLoad_GetFontSample(s32 fontId, s32 instId); void AudioLoad_ProcessAsyncLoads(s32 resetStatus); -void AudioLoad_ProcessAsyncLoadUnkMedium(AudioAsyncLoad* asyncLoad, s32 resetStatus); +void AudioLoad_ProcessAsyncLoadUnkMedium(UNUSED AudioAsyncLoad* asyncLoad, UNUSED s32 resetStatus); void AudioLoad_ProcessAsyncLoad(AudioAsyncLoad* asyncLoad, s32 resetStatus); void AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, SoundFontData* fontData, SampleBankRelocInfo* sampleBankReloc, s32 isAsync); @@ -43,16 +43,16 @@ u32 AudioLoad_GetRealTableIndex(s32 tableType, u32 id); void* AudioLoad_SearchCaches(s32 tableType, s32 id); AudioTable* AudioLoad_GetLoadTable(s32 tableType); void AudioLoad_SyncDma(u32 devAddr, u8* ramAddr, u32 size, s32 medium); -void AudioLoad_SyncDmaUnkMedium(u32 devAddr, u8* addr, u32 size, s32 unkMediumParam); +void AudioLoad_SyncDmaUnkMedium(UNUSED u32 devAddr, UNUSED u8* addr, UNUSED u32 size, UNUSED s32 unkMediumParam); s32 AudioLoad_Dma(OSIoMesg* mesg, u32 priority, s32 direction, u32 devAddr, void* ramAddr, u32 size, - OSMesgQueue* reqQueue, s32 medium, const char* dmaFuncType); + OSMesgQueue* reqQueue, s32 medium, UNUSED const char* dmaFuncType); void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData, OSMesgQueue* retQueue); AudioAsyncLoad* AudioLoad_StartAsyncLoadUnkMedium(s32 unkMediumParam, u32 devAddr, void* ramAddr, s32 size, s32 medium, s32 nChunks, OSMesgQueue* retQueue, s32 retMsg); AudioAsyncLoad* AudioLoad_StartAsyncLoad(u32 devAddr, void* ramAddr, u32 size, s32 medium, s32 nChunks, OSMesgQueue* retQueue, s32 retMsg); void AudioLoad_AsyncDma(AudioAsyncLoad* asyncLoad, u32 size); -void AudioLoad_AsyncDmaUnkMedium(u32 devAddr, void* ramAddr, u32 size, s16 arg3); +void AudioLoad_AsyncDmaUnkMedium(UNUSED u32 devAddr, UNUSED void* ramAddr, UNUSED u32 size, UNUSED s16 arg3); u8* AudioLoad_SyncLoadSeq(s32 seqId); s32 AudioLoad_ProcessSamplePreloads(s32 resetStatus); void AudioLoad_DmaSlowCopy(AudioSlowLoad* slowLoad, s32 size); @@ -105,11 +105,11 @@ void AudioLoad_DecreaseSampleDmaTtls(void) { } void* AudioLoad_DmaSampleData(u32 devAddr, u32 size, s32 arg2, u8* dmaIndexRef, s32 medium) { - s32 pad1; + UNUSED s32 pad1; SampleDma* dma; s32 hasDma = false; u32 dmaDevAddr; - u32 pad2; + UNUSED s32 pad2; u32 dmaIndex; u32 transfer; s32 bufferPos; @@ -202,7 +202,7 @@ void* AudioLoad_DmaSampleData(u32 devAddr, u32 size, s32 arg2, u8* dmaIndexRef, return (devAddr - dmaDevAddr) + dma->ramAddr; } -void AudioLoad_InitSampleDmaBuffers(s32 numNotes) { +void AudioLoad_InitSampleDmaBuffers(UNUSED s32 numNotes) { SampleDma* dma; s32 i; s32 t2; @@ -356,12 +356,12 @@ void AudioLoad_InitTable(AudioTable* table, u32 romAddr, u16 unkMediumParam) { } SoundFontData* AudioLoad_SyncLoadSeqFonts(s32 seqId, u32* outDefaultFontId) { - s32 pad[2]; + UNUSED s32 pad[2]; s32 index; SoundFontData* fontData; s32 numFonts; s32 fontId; - s32 i; + UNUSED s32 pad1; if (seqId >= gAudioContext.numSequences) { return NULL; @@ -382,7 +382,7 @@ SoundFontData* AudioLoad_SyncLoadSeqFonts(s32 seqId, u32* outDefaultFontId) { } void AudioLoad_SyncLoadSeqParts(s32 seqId, s32 arg1) { - s32 pad; + UNUSED s32 pad; u32 defaultFontId; if (seqId < gAudioContext.numSequences) { @@ -449,15 +449,15 @@ void AudioLoad_AsyncLoad(s32 tableType, s32 id, s32 nChunks, s32 retData, OSMesg } } -void AudioLoad_AsyncLoadSeq(s32 seqId, s32 arg1, s32 retData, OSMesgQueue* retQueue) { +void AudioLoad_AsyncLoadSeq(s32 seqId, UNUSED s32 arg1, s32 retData, OSMesgQueue* retQueue) { AudioLoad_AsyncLoad(SEQUENCE_TABLE, seqId, 0, retData, retQueue); } -void AudioLoad_AsyncLoadSampleBank(s32 sampleBankId, s32 arg1, s32 retData, OSMesgQueue* retQueue) { +void AudioLoad_AsyncLoadSampleBank(s32 sampleBankId, UNUSED s32 arg1, s32 retData, OSMesgQueue* retQueue) { AudioLoad_AsyncLoad(SAMPLE_TABLE, sampleBankId, 0, retData, retQueue); } -void AudioLoad_AsyncLoadFont(s32 fontId, s32 arg1, s32 retData, OSMesgQueue* retQueue) { +void AudioLoad_AsyncLoadFont(s32 fontId, UNUSED s32 arg1, s32 retData, OSMesgQueue* retQueue) { AudioLoad_AsyncLoad(FONT_TABLE, fontId, 0, retData, retQueue); } @@ -530,7 +530,7 @@ s32 AudioLoad_SyncInitSeqPlayerSkipTicks(s32 playerIdx, s32 seqId, s32 skipTicks // Missing return, see above. } -s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) { +s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, UNUSED s32 arg2) { SequencePlayer* seqPlayer = &gAudioContext.seqPlayers[playerIdx]; u8* seqData; s32 index; @@ -573,7 +573,7 @@ s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) { } u8* AudioLoad_SyncLoadSeq(s32 seqId) { - s32 pad; + UNUSED s32 pad; s32 didAllocate; if (gAudioContext.seqLoadStatus[AudioLoad_GetRealTableIndex(SEQUENCE_TABLE, seqId)] == LOAD_STATUS_IN_PROGRESS) { @@ -661,7 +661,7 @@ SoundFontData* AudioLoad_SyncLoadFont(u32 fontId) { void* AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate) { u32 size; AudioTable* table; - s32 pad; + UNUSED s32 pad; u32 medium; s32 loadStatus; u32 romAddr; @@ -943,11 +943,11 @@ void AudioLoad_SyncDma(u32 devAddr, u8* ramAddr, u32 size, s32 medium) { } } -void AudioLoad_SyncDmaUnkMedium(u32 devAddr, u8* addr, u32 size, s32 unkMediumParam) { +void AudioLoad_SyncDmaUnkMedium(UNUSED u32 devAddr, UNUSED u8* addr, UNUSED u32 size, UNUSED s32 unkMediumParam) { } s32 AudioLoad_Dma(OSIoMesg* mesg, u32 priority, s32 direction, u32 devAddr, void* ramAddr, u32 size, - OSMesgQueue* reqQueue, s32 medium, const char* dmaFuncType) { + OSMesgQueue* reqQueue, s32 medium, UNUSED const char* dmaFuncType) { OSPiHandle* handle; if (gAudioContext.resetTimer > 16) { @@ -1000,7 +1000,7 @@ void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData, s8 cachePolicy; u32 devAddr; s32 loadStatus; - s32 pad; + UNUSED s32 pad; u32 realId = AudioLoad_GetRealTableIndex(tableType, id); switch (tableType) { @@ -1124,7 +1124,7 @@ void AudioLoad_InitSoundFont(s32 fontId) { } void AudioLoad_Init(void* heap, u32 heapSize) { - s32 pad[18]; + UNUSED s32 pad[18]; s32 numFonts; void* ramAddr; s32 i; @@ -1398,7 +1398,7 @@ void AudioLoad_DmaSlowCopy(AudioSlowLoad* slowLoad, s32 size) { &slowLoad->msgQueue, slowLoad->medium, "SLOWCOPY"); } -void AudioLoad_DmaSlowCopyUnkMedium(s32 devAddr, u8* ramAddr, s32 size, s32 arg3) { +void AudioLoad_DmaSlowCopyUnkMedium(UNUSED s32 devAddr, UNUSED u8* ramAddr, UNUSED s32 size, UNUSED s32 arg3) { } s32 AudioLoad_SlowLoadSeq(s32 seqId, u8* ramAddr, s8* status) { @@ -1537,13 +1537,13 @@ void AudioLoad_ProcessAsyncLoads(s32 resetStatus) { } } -void AudioLoad_ProcessAsyncLoadUnkMedium(AudioAsyncLoad* asyncLoad, s32 resetStatus) { +void AudioLoad_ProcessAsyncLoadUnkMedium(UNUSED AudioAsyncLoad* asyncLoad, UNUSED s32 resetStatus) { } void AudioLoad_FinishAsyncLoad(AudioAsyncLoad* asyncLoad) { u32 retMsg = asyncLoad->retMsg; u32 fontId; - u32 pad; + UNUSED s32 pad; OSMesg doneMsg; u32 sampleBankId1; u32 sampleBankId2; @@ -1636,7 +1636,7 @@ void AudioLoad_AsyncDma(AudioAsyncLoad* asyncLoad, u32 size) { &asyncLoad->msgQueue, asyncLoad->medium, "BGCOPY"); } -void AudioLoad_AsyncDmaUnkMedium(u32 devAddr, void* ramAddr, u32 size, s16 arg3) { +void AudioLoad_AsyncDmaUnkMedium(UNUSED u32 devAddr, UNUSED void* ramAddr, UNUSED u32 size, UNUSED s16 arg3) { } /** @@ -1814,7 +1814,7 @@ s32 AudioLoad_ProcessSamplePreloads(s32 resetStatus) { u32 preloadIndex; u32 key; u32 nChunks; - s32 pad; + UNUSED s32 pad; if (gAudioContext.preloadSampleStackTop > 0) { if (resetStatus != 0) { @@ -2064,10 +2064,10 @@ void AudioLoad_PreloadSamplesForFont(s32 fontId, s32 async, SampleBankRelocInfo* } void AudioLoad_LoadPermanentSamples(void) { - s32 pad; + UNUSED s32 pad; u32 fontId; AudioTable* sampleBankTable; - s32 pad2; + UNUSED s32 pad2; s32 i; sampleBankTable = AudioLoad_GetLoadTable(SAMPLE_TABLE); diff --git a/src/code/audio_playback.c b/src/code/audio_playback.c index 030b9a888b6..138e9678e69 100644 --- a/src/code/audio_playback.c +++ b/src/code/audio_playback.c @@ -3,7 +3,7 @@ void Audio_InitNoteSub(Note* note, NoteSubEu* sub, NoteSubAttributes* attrs) { f32 volRight, volLeft; s32 smallPanIndex; - u64 pad; + UNUSED u64 pad; u8 strongLeft; u8 strongRight; f32 vel; @@ -151,7 +151,7 @@ void Audio_NoteDisable(Note* note) { } void Audio_ProcessNotes(void) { - s32 pad[2]; + UNUSED s32 pad[2]; NoteAttributes* attrs; NoteSubEu* noteSubEu2; NoteSubEu* noteSubEu; @@ -757,7 +757,7 @@ Note* Audio_FindNodeWithPrioLessThan(AudioListItem* list, s32 limit) { } void Audio_NoteInitForLayer(Note* note, SequenceLayer* layer) { - s32 pad[3]; + UNUSED s32 pad[3]; s16 instId; NotePlaybackState* playback = ¬e->playbackState; NoteSubEu* sub = ¬e->noteSubEu; diff --git a/src/code/audio_seqplayer.c b/src/code/audio_seqplayer.c index bfa0d749492..54961136f39 100644 --- a/src/code/audio_seqplayer.c +++ b/src/code/audio_seqplayer.c @@ -306,7 +306,7 @@ void AudioSeq_InitSequenceChannel(SequenceChannel* channel) { s32 AudioSeq_SeqChannelSetLayer(SequenceChannel* channel, s32 layerIndex) { SequenceLayer* layer; - s32 pad; + UNUSED s32 pad; if (channel->layers[layerIndex] == NULL) { layer = AudioSeq_AudioListPopBack(&gAudioContext.layerFreeList); @@ -400,7 +400,7 @@ void AudioSeq_SequencePlayerSetupChannels(SequencePlayer* seqPlayer, u16 channel } } -void AudioSeq_SequencePlayerDisableChannels(SequencePlayer* seqPlayer, u16 channelBitsUnused) { +void AudioSeq_SequencePlayerDisableChannels(SequencePlayer* seqPlayer, UNUSED u16 channelBits) { SequenceChannel* channel; s32 i; @@ -1721,7 +1721,7 @@ void AudioSeq_SequencePlayerProcessSequence(SequencePlayer* seqPlayer) { u8* data; u8* data2; u8* data3; - s32 pad; + UNUSED s32 pad; s32 dummy; s32 delay; diff --git a/src/code/audio_synthesis.c b/src/code/audio_synthesis.c index 2cebdef8554..bcad3fd0fc1 100644 --- a/src/code/audio_synthesis.c +++ b/src/code/audio_synthesis.c @@ -21,13 +21,13 @@ Acmd* AudioSynth_LoadRingBufferPart(Acmd* cmd, u16 dmem, u16 startPos, s32 lengt Acmd* AudioSynth_SaveBufferOffset(Acmd* cmd, u16 dmem, u16 offset, s32 length, s16* buf); Acmd* AudioSynth_SaveRingBufferPart(Acmd* cmd, u16 dmem, u16 startPos, s32 length, SynthesisReverb* reverb); Acmd* AudioSynth_DoOneAudioUpdate(s16* aiBuf, s32 aiBufLen, Acmd* cmd, s32 updateIndex); -Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s16* aiBuf, +Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, UNUSED s16* aiBuf, s32 aiBufLen, Acmd* cmd, s32 updateIndex); Acmd* AudioSynth_LoadWaveSamples(Acmd* cmd, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s32 numSamplesToLoad); Acmd* AudioSynth_NoteApplyHeadsetPanEffects(Acmd* cmd, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s32 bufLen, s32 flags, s32 side); Acmd* AudioSynth_ProcessEnvelope(Acmd* cmd, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s32 aiBufLen, - u16 inBuf, s32 headsetPanSettings, s32 flags); + u16 inBuf, s32 headsetPanSettings, UNUSED s32 flags); Acmd* AudioSynth_FinalResample(Acmd* cmd, NoteSynthesisState* synthState, s32 count, u16 pitch, u16 inpDmem, s32 resampleFlags); @@ -49,7 +49,7 @@ u8 sNumSamplesPerWavePeriod[] = { void AudioSynth_InitNextRingBuf(s32 chunkLen, s32 updateIndex, s32 reverbIndex) { ReverbRingBufferItem* bufItem; - s32 pad[3]; + UNUSED s32 pad[3]; SynthesisReverb* reverb = &gAudioContext.synthesisReverbs[reverbIndex]; s32 temp_a0_2; s32 temp_a0_4; @@ -144,7 +144,7 @@ Acmd* AudioSynth_Update(Acmd* cmdStart, s32* cmdCnt, s16* aiStart, s32 aiBufLen) Acmd* cmdP; s32 i; s32 j; - SynthesisReverb* reverb; + UNUSED SynthesisReverb* reverb; cmdP = cmdStart; for (i = gAudioContext.audioBufferParameters.updatesPerFrame; i > 0; i--) { @@ -467,7 +467,7 @@ void AudioSynth_LoadFilterCount(Acmd* cmd, s32 count, void* addr) { aFilter(cmd, 2, count, addr); } -Acmd* AudioSynth_LoadRingBuffer1(Acmd* cmd, s32 aiBufLen, SynthesisReverb* reverb, s16 updateIndex) { +Acmd* AudioSynth_LoadRingBuffer1(Acmd* cmd, UNUSED s32 aiBufLen, SynthesisReverb* reverb, s16 updateIndex) { ReverbRingBufferItem* ringBufferItem = &reverb->items[reverb->curFrame][updateIndex]; cmd = @@ -481,7 +481,7 @@ Acmd* AudioSynth_LoadRingBuffer1(Acmd* cmd, s32 aiBufLen, SynthesisReverb* rever return cmd; } -Acmd* AudioSynth_LoadRingBuffer2(Acmd* cmd, s32 aiBufLen, SynthesisReverb* reverb, s16 updateIndex) { +Acmd* AudioSynth_LoadRingBuffer2(Acmd* cmd, UNUSED s32 aiBufLen, SynthesisReverb* reverb, s16 updateIndex) { ReverbRingBufferItem* bufItem = &reverb->items2[reverb->curFrame][updateIndex]; cmd = AudioSynth_LoadRingBufferPart(cmd, DMEM_WET_LEFT_CH, bufItem->startPos, bufItem->lengthA, reverb); @@ -689,9 +689,9 @@ Acmd* AudioSynth_DoOneAudioUpdate(s16* aiBuf, s32 aiBufLen, Acmd* cmd, s32 updat return cmd; } -Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s16* aiBuf, +Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, UNUSED s16* aiBuf, s32 aiBufLen, Acmd* cmd, s32 updateIndex) { - s32 pad1[3]; + UNUSED s32 pad1[3]; Sample* sample; AdpcmLoop* loopInfo; s32 nSamplesUntilLoopEnd; @@ -705,7 +705,7 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS s32 gain; s32 frameIndex; s32 skipBytes; - s32 temp_v1_6; + UNUSED s32 pad; void* buf; s32 nSamplesToDecode; u32 sampleAddr; @@ -716,7 +716,7 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS s32 nSamplesToProcess; s32 phi_s4; s32 nFirstFrameSamplesToIgnore; - s32 pad2[7]; + UNUSED s32 pad2[7]; s32 frameSize; s32 nFramesToDecode; s32 skipInitialSamples; @@ -740,7 +740,6 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS s32 finished; s32 aligned; s16 addr; - u16 unused; bookOffset = noteSubEu->bitField1.bookOffset; finished = noteSubEu->bitField0.finished; @@ -1116,7 +1115,7 @@ Acmd* AudioSynth_FinalResample(Acmd* cmd, NoteSynthesisState* synthState, s32 co } Acmd* AudioSynth_ProcessEnvelope(Acmd* cmd, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s32 aiBufLen, - u16 inBuf, s32 headsetPanSettings, s32 flags) { + u16 inBuf, s32 headsetPanSettings, UNUSED s32 flags) { u32 phi_a1; u16 curVolLeft; u16 targetVolLeft; @@ -1128,7 +1127,7 @@ Acmd* AudioSynth_ProcessEnvelope(Acmd* cmd, NoteSubEu* noteSubEu, NoteSynthesisS s16 rampReverb; s16 sourceReverbVol; u16 targetVolRight; - s32 pad; + UNUSED s32 pad; curVolLeft = synthState->curVolLeft; targetVolLeft = noteSubEu->targetVolLeft; diff --git a/src/code/code_80097A00.c b/src/code/code_80097A00.c index 4acd8b4b8b2..4d309dcacc1 100644 --- a/src/code/code_80097A00.c +++ b/src/code/code_80097A00.c @@ -231,7 +231,7 @@ void Inventory_ChangeEquipment(s16 equipment, u16 value) { u8 Inventory_DeleteEquipment(PlayState* play, s16 equipment) { Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; u16 equipValue = gSaveContext.equips.equipment & gEquipMasks[equipment]; // "Erasing equipment item = %d zzz=%d" diff --git a/src/code/code_800A9F30.c b/src/code/code_800A9F30.c index b8f4e1ce8da..529abf94ab6 100644 --- a/src/code/code_800A9F30.c +++ b/src/code/code_800A9F30.c @@ -2,7 +2,7 @@ UnkRumbleStruct D_80160FD0; -void func_800A9F30(PadMgr* a, s32 b) { +void func_800A9F30(PadMgr* a, UNUSED s32 b) { func_800D2E30(&D_80160FD0); PadMgr_RumbleSet(a, D_80160FD0.rumbleEnable); } diff --git a/src/code/code_800ACE70.c b/src/code/code_800ACE70.c index e2216277798..5fafd60a582 100644 --- a/src/code/code_800ACE70.c +++ b/src/code/code_800ACE70.c @@ -60,7 +60,7 @@ void func_800ACE70(struct_801664F0* this) { } // Destroy -void func_800ACE90(struct_801664F0* this) { +void func_800ACE90(UNUSED struct_801664F0* this) { } // Draw diff --git a/src/code/code_800AD920.c b/src/code/code_800AD920.c index 2f60901a10c..42c01c0c774 100644 --- a/src/code/code_800AD920.c +++ b/src/code/code_800AD920.c @@ -20,7 +20,7 @@ void func_800AD920(struct_80166500* this) { } // Destroy -void func_800AD950(struct_80166500* this) { +void func_800AD950(UNUSED struct_80166500* this) { } // Draw diff --git a/src/code/code_800E4FE0.c b/src/code/code_800E4FE0.c index 4e7fd9eb445..f76a178c7bd 100644 --- a/src/code/code_800E4FE0.c +++ b/src/code/code_800E4FE0.c @@ -43,7 +43,7 @@ AudioTask* func_800E5000(void) { static AudioTask* sWaitingAudioTask = NULL; u32 samplesRemainingInAi; s32 abiCmdCnt; - s32 pad; + UNUSED s32 pad; s32 j; s32 sp5C; s16* currAiBuffer; @@ -215,9 +215,9 @@ AudioTask* func_800E5000(void) { void func_800E5584(AudioCmd* cmd) { s32 i; - s32 pad; - s32 pad2; - u32 temp_a1_5; + UNUSED s32 pad; + UNUSED s32 pad2; + UNUSED s32 pad3; u32 temp_t7; switch (cmd->op) { @@ -527,7 +527,7 @@ void Audio_GetSampleBankIdsOfFont(s32 fontId, u32* sampleBankId1, u32* sampleBan } s32 func_800E5EDC(void) { - s32 pad; + UNUSED s32 pad; s32 sp18; if (osRecvMesg(gAudioContext.audioResetQueueP, (OSMesg*)&sp18, OS_MESG_NOBLOCK) == -1) { @@ -549,7 +549,7 @@ void func_800E5F34(void) { s32 func_800E5F88(s32 resetPreloadID) { s32 resetStatus; OSMesg msg; - s32 pad; + UNUSED s32 pad; func_800E5F34(); resetStatus = gAudioContext.resetStatus; diff --git a/src/code/code_800EC960.c b/src/code/code_800EC960.c index 631014d096e..c94d3a893c4 100644 --- a/src/code/code_800EC960.c +++ b/src/code/code_800EC960.c @@ -1477,9 +1477,9 @@ void AudioOcarina_CheckIfStartedSong(void) { */ void AudioOcarina_CheckSongsWithMusicStaff(void) { u16 curOcarinaSongFlag; - u16 pad; + UNUSED u16 pad; u8 noNewValidInput = false; - u16 pad2; + UNUSED u16 pad2; s8 staffOcarinaPlayingPosOffset = 0; u8 songIndex; OcarinaNote* curNote; @@ -1652,7 +1652,7 @@ void AudioOcarina_CheckSongsWithoutMusicStaff(void) { } // This unused argument is used in Majora's Mask as a u8 -void AudioOcarina_PlayControllerInput(u8 unused) { +void AudioOcarina_PlayControllerInput(UNUSED u8 arg0) { u32 ocarinaBtnsHeld; // Prevents two different ocarina notes from being played on two consecutive frames @@ -1924,13 +1924,12 @@ void AudioOcarina_PlaybackSong(void) { void AudioOcarina_SetRecordingSong(u8 isRecordingComplete) { u16 i; - u16 i2; - u16 pad; + UNUSED u16 pad[2]; u8 pitch; - OcarinaNote* note; + UNUSED s32 pad1; u8 j; u8 k; - s32 t; + UNUSED s32 pad2; OcarinaNote* recordedSong; if (sRecordingState == OCARINA_RECORD_SCARECROW_LONG) { @@ -2398,7 +2397,7 @@ char* AudioDebug_ToStringBinary(u32 num, u8 bits) { } void AudioDebug_Draw(GfxPrint* printer) { - s32 pad[3]; + UNUSED s32 pad[3]; u8 i; u8 j; u8 ctr; @@ -3724,10 +3723,10 @@ void func_800F3054(void) { } } -void func_800F3138(UNK_TYPE arg0) { +void func_800F3138(UNUSED UNK_TYPE arg0) { } -void func_800F3140(UNK_TYPE arg0, UNK_TYPE arg1) { +void func_800F3140(UNUSED UNK_TYPE arg0, UNUSED UNK_TYPE arg1) { } void func_800F314C(s8 arg0) { @@ -3812,7 +3811,7 @@ s8 Audio_ComputeSoundReverb(u8 bankId, u8 entryIdx, u8 channelIdx) { return reverb; } -s8 Audio_ComputeSoundPanSigned(f32 x, f32 z, u8 token) { +s8 Audio_ComputeSoundPanSigned(f32 x, f32 z, UNUSED u8 token) { f32 absX; f32 absZ; f32 pan; @@ -3955,7 +3954,7 @@ u8 func_800F37B8(f32 behindScreenZ, SoundBankEntry* arg1, s8 arg2) { return (phi_v1 * 0x10) + (u8)((phi_f0 * phi_f12) / (10000.0f / 5.2f)); } -s8 func_800F3990(f32 arg0, u16 sfxParams) { +s8 func_800F3990(f32 arg0, UNUSED u16 sfxParams) { s8 ret = 0; if (arg0 >= 0.0f) { @@ -4768,7 +4767,7 @@ void Audio_PlayFanfare(u16 seqId) { void func_800F5CF8(void) { u16 sp26; - u16 pad; + UNUSED u16 pad; u16 sp22; if (D_8016B9F4 != 0) { @@ -4903,7 +4902,7 @@ void Audio_SetBgmEnemyVolume(f32 dist) { } void func_800F6268(f32 dist, u16 arg1) { - s8 pad; + UNUSED s8 pad; s8 phi_v1; s16 temp_a0; @@ -5283,7 +5282,7 @@ void func_800F7170(void) { Audio_QueueCmdS32(0xF8000000, 0); } -void func_800F71BC(s32 arg0) { +void func_800F71BC(UNUSED s32 arg0) { D_80133418 = 1; func_800F6C34(); AudioOcarina_ResetStaffs(); diff --git a/src/code/code_800F7260.c b/src/code/code_800F7260.c index 680648138b6..7c8aa625e86 100644 --- a/src/code/code_800F7260.c +++ b/src/code/code_800F7260.c @@ -352,7 +352,7 @@ void Audio_ChooseActiveSounds(u8 bankId) { SoundBankEntry* entry; ActiveSound chosenSounds[MAX_CHANNELS_PER_BANK]; ActiveSound* activeSound; - s32 pad; + UNUSED s32 pad; numChosenSounds = 0; for (i = 0; i < MAX_CHANNELS_PER_BANK; i++) { @@ -555,7 +555,7 @@ void Audio_PlayActiveSounds(u8 bankId) { void Audio_StopSfxByBank(u8 bankId) { SoundBankEntry* entry; - s32 pad; + UNUSED s32 pad; SoundBankEntry cmp; u8 entryIndex = gSoundBanks[bankId][0].next; @@ -750,7 +750,6 @@ u8 Audio_IsSfxPlaying(u32 sfxId) { void Audio_ResetSounds(void) { u8 bankId; u8 i; - u8 entryIndex; sSoundRequestWriteIndex = 0; sSoundRequestReadIndex = 0; diff --git a/src/code/code_800F9280.c b/src/code/code_800F9280.c index a139b254f83..40f7e6f34da 100644 --- a/src/code/code_800F9280.c +++ b/src/code/code_800F9280.c @@ -40,7 +40,7 @@ u8 D_80133418 = 0; void func_800F9280(u8 playerIdx, u8 seqId, u8 arg2, u16 fadeTimer) { u8 i; u16 dur; - s32 pad; + UNUSED s32 pad; if (D_80133408 == 0 || playerIdx == SEQ_PLAYER_SFX) { arg2 &= 0x7F; @@ -101,7 +101,7 @@ typedef enum { } SeqCmdType; void Audio_ProcessSeqCmd(u32 cmd) { - s32 pad; + UNUSED s32 pad; u16 fadeTimer; u16 channelMask; u32 channelMaskReversed; @@ -442,7 +442,7 @@ void func_800FA3DC(void) { u8 temp_s1; u8 temp_s0_3; u8 temp_a3_3; - s32 pad[3]; + UNUSED s32 pad[3]; u32 dummy; f32 phi_f0; u8 phi_t0; diff --git a/src/code/db_camera.c b/src/code/db_camera.c index 3d0f2927bf9..e312f656417 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -436,7 +436,7 @@ void DbCamera_PrintF32Bytes(f32 value) { } void DbCamera_PrintU16Bytes(u16 value) { - u16 pad; + UNUSED u16 pad; u16 b = value; char* a = (char*)&b; @@ -444,7 +444,7 @@ void DbCamera_PrintU16Bytes(u16 value) { } void DbCamera_PrintS16Bytes(s16 value) { - u16 pad; + UNUSED u16 pad; s16 b = value; char* a = (char*)&b; @@ -578,7 +578,7 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) { UNUSED Vec3f* at; Vec3f* phi_s0; Vec3f spD8; - s32 pad; + UNUSED s32 pad; Vec3f* sp90; Vec3f* sp80; Vec3f* sp7C; @@ -1644,7 +1644,7 @@ s32 DbCamera_LoadCallback(char* c) { } s32 DbCamera_SaveCallback(char* c) { - s32 pad[2]; + UNUSED s32 pad[2]; s32 ret; u32 freeSize; s32 off; @@ -1714,7 +1714,7 @@ void DbCamera_DrawSlotLetters(char* str, s16 y, s16 x, s32 colorId) { func_8006376C(x + 0x14, y, colorId, str + 0x14); } -void DbCamera_PrintAllCuts(Camera* cam) { +void DbCamera_PrintAllCuts(UNUSED Camera* cam) { s32 i; Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, @@ -1744,8 +1744,7 @@ char D_8012D128[] = GFXP_KATAKANA "ﾄ-ﾀﾙ "; char D_8012D13C[] = GFXP_KATAKANA "ｷ- / "; s32 func_800B91B0(Camera* cam, DbCamera* dbCamera) { - s32 pointCount; - s32 curPoint; + UNUSED s32 pad[2]; while (sDbCameraCuts[D_8016110C].letter == '?') { D_8016110C++; @@ -1815,7 +1814,7 @@ s32 func_800B91B0(Camera* cam, DbCamera* dbCamera) { return D_8016110C | 0x8000; } -void DbCamera_Reset(Camera* cam, DbCamera* dbCam) { +void DbCamera_Reset(UNUSED Camera* cam, DbCamera* dbCam) { s32 i; D_801612EA = '*'; diff --git a/src/code/fault.c b/src/code/fault.c index 6edb90b555d..8c0738bcb13 100644 --- a/src/code/fault.c +++ b/src/code/fault.c @@ -635,7 +635,7 @@ OSThread* Fault_FindFaultedThread(void) { } void Fault_Wait5Seconds(void) { - s32 pad; + UNUSED s32 pad; OSTime start = osGetTime(); do { @@ -795,7 +795,7 @@ void Fault_WaitForButtonCombo(void) { } } -void Fault_DrawMemDumpContents(const char* title, uintptr_t addr, u32 arg2) { +void Fault_DrawMemDumpContents(const char* title, uintptr_t addr, UNUSED u32 arg2) { uintptr_t alignedAddr = addr; u32* writeAddr; s32 y; @@ -1075,7 +1075,7 @@ void Fault_LogStackTrace(OSThread* thread, s32 height) { uintptr_t ra = thread->context.ra; uintptr_t pc = thread->context.pc; uintptr_t addr; - s32 pad; + UNUSED s32 pad; osSyncPrintf("STACK TRACE\nSP PC (VPC)\n"); for (line = 1; line < height && (ra != 0 || sp != 0) && pc != (uintptr_t)__osCleanupThread; line++) { @@ -1151,10 +1151,10 @@ void Fault_UpdatePad(void) { #define FAULT_MSG_FAULT ((OSMesg)2) #define FAULT_MSG_UNK ((OSMesg)3) -void Fault_ThreadEntry(void* arg) { +void Fault_ThreadEntry(UNUSED void* arg) { OSMesg msg; OSThread* faultedThread; - s32 pad; + UNUSED s32 pad; // Direct OS event messages to the fault event queue osSetEventMesg(OS_EVENT_CPU_BREAK, &sFaultInstance->queue, FAULT_MSG_CPU_BREAK); @@ -1290,7 +1290,7 @@ void Fault_HungupFaultClient(const char* exp1, const char* exp2) { */ void Fault_AddHungupAndCrashImpl(const char* exp1, const char* exp2) { FaultClient client; - s32 pad; + UNUSED s32 pad; Fault_AddClient(&client, Fault_HungupFaultClient, (void*)exp1, (void*)exp2); *(u32*)0x11111111 = 0; // trigger an exception via unaligned memory access diff --git a/src/code/flg_set.c b/src/code/flg_set.c index 8d7814cfa37..72fc0c3e2d2 100644 --- a/src/code/flg_set.c +++ b/src/code/flg_set.c @@ -44,7 +44,7 @@ void FlagSet_Update(PlayState* play) { { GfxPrint printer; - s32 pad; + UNUSED s32 pad; polyOpa = POLY_OPA_DISP; gfx = Graph_GfxPlusOne(polyOpa); diff --git a/src/code/game.c b/src/code/game.c index 34a7c59b46d..0c280982fa6 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -157,7 +157,7 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) { } if (R_ENABLE_AUDIO_DBG & 1) { - s32 pad; + UNUSED s32 pad; GfxPrint printer; GfxPrint_Init(&printer); @@ -168,7 +168,7 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) { } if (R_ENABLE_ARENA_DBG < 0) { - s32 pad; + UNUSED s32 pad; DebugArena_Display(); SystemArena_Display(); diff --git a/src/code/gfxprint.c b/src/code/gfxprint.c index 397e330e8af..993935d41e0 100644 --- a/src/code/gfxprint.c +++ b/src/code/gfxprint.c @@ -332,7 +332,7 @@ void GfxPrint_Init(GfxPrint* this) { } } -void GfxPrint_Destroy(GfxPrint* this) { +void GfxPrint_Destroy(UNUSED GfxPrint* this) { } void GfxPrint_Open(GfxPrint* this, Gfx* dList) { diff --git a/src/code/graph.c b/src/code/graph.c index fc41f1a6100..cd49eda2ea2 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -138,7 +138,7 @@ void Graph_Init(GraphicsContext* gfxCtx) { Fault_AddClient(&sGraphFaultClient, Graph_FaultClient, NULL, NULL); } -void Graph_Destroy(GraphicsContext* gfxCtx) { +void Graph_Destroy(UNUSED GraphicsContext* gfxCtx) { func_800D3210(); Fault_RemoveClient(&sGraphFaultClient); } @@ -153,7 +153,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) { OSTask_t* task = &gfxCtx->task.list.t; OSScTask* scTask = &gfxCtx->task; CfbInfo* cfb; - s32 pad1; + UNUSED s32 pad1; D_8016A528 = osGetTime() - sGraphSetTaskTime - D_8016A558; @@ -215,7 +215,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) { task->data_size = (uintptr_t)WORK_DISP - (uintptr_t)gfxCtx->workBuffer; CLOSE_DISPS(gfxCtx, "../graph.c", 830); - { s32 pad2; } // Necessary to match stack usage + { UNUSED s32 pad2; } // Necessary to match stack usage task->yield_data_ptr = gGfxSPTaskYieldBuffer; task->yield_data_size = sizeof(gGfxSPTaskYieldBuffer); @@ -367,7 +367,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { { OSTime time = osGetTime(); - s32 pad[4]; + UNUSED s32 pad[4]; D_8016A538 = gRSPGFXTotalTime; D_8016A530 = gRSPAudioTotalTime; @@ -397,7 +397,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { } } -void Graph_ThreadEntry(void* arg0) { +void Graph_ThreadEntry(UNUSED void* arg) { GraphicsContext gfxCtx; GameState* gameState; u32 size; diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c index 39e17b8ed18..bda0c536905 100644 --- a/src/code/irqmgr.c +++ b/src/code/irqmgr.c @@ -216,7 +216,7 @@ void IrqMgr_HandlePreNMI480(IrqMgr* irqMgr) { } } -void IrqMgr_HandlePreNMI500(IrqMgr* irqMgr) { +void IrqMgr_HandlePreNMI500(UNUSED IrqMgr* irqMgr) { IrqMgr_CheckStacks(); } diff --git a/src/code/jpegdecoder.c b/src/code/jpegdecoder.c index 3301817d0f9..dffb0705037 100644 --- a/src/code/jpegdecoder.c +++ b/src/code/jpegdecoder.c @@ -7,7 +7,7 @@ u8 sJpegBitStreamDontSkip; u32 sJpegBitStreamCurWord; s32 JpegDecoder_Decode(JpegDecoder* decoder, u16* mcuBuff, s32 count, u8 isFollowing, JpegDecoderState* state) { - s16 pad; + UNUSED s16 pad; s16 unk0; s16 unk1; s16 unk2; diff --git a/src/code/load.c b/src/code/load.c index a629a16f586..7d0c109e6c2 100644 --- a/src/code/load.c +++ b/src/code/load.c @@ -1,7 +1,7 @@ #include "global.h" s32 Overlay_Load(uintptr_t vRomStart, uintptr_t vRomEnd, void* vRamStart, void* vRamEnd, void* allocatedVRamAddr) { - s32 pad[3]; + UNUSED s32 pad[3]; uintptr_t end; OverlayRelocationSection* ovl; u32 ovlOffset; diff --git a/src/code/mempak.c b/src/code/mempak.c index e423c6666da..65cf87461fa 100644 --- a/src/code/mempak.c +++ b/src/code/mempak.c @@ -14,7 +14,7 @@ u8 sMempakExtName[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; s32 Mempak_Init(s32 controllerNb) { OSMesgQueue* mq; - s32 pad; + UNUSED s32 pad; s32 ret = false; mq = PadMgr_LockSerialMesgQueue(&gPadMgr); @@ -29,11 +29,11 @@ s32 Mempak_Init(s32 controllerNb) { return ret; } -s32 Mempak_GetFreeBytes(s32 controllerNb) { +s32 Mempak_GetFreeBytes(UNUSED s32 controllerNb) { return sMempakFreeBytes; } -s32 Mempak_FindFile(s32 controllerNb, char start, char end) { +s32 Mempak_FindFile(UNUSED s32 controllerNb, char start, char end) { OSMesgQueue* mq; s32 error; char idx; @@ -63,11 +63,11 @@ s32 Mempak_FindFile(s32 controllerNb, char start, char end) { return flag; } -s32 Mempak_Write(s32 controllerNb, char idx, void* buffer, s32 offset, s32 size) { +s32 Mempak_Write(UNUSED s32 controllerNb, char idx, void* buffer, s32 offset, s32 size) { OSMesgQueue* mq; s32 error; s32 ret = false; - s32 pad; + UNUSED s32 pad; mq = PadMgr_LockSerialMesgQueue(&gPadMgr); @@ -83,11 +83,11 @@ s32 Mempak_Write(s32 controllerNb, char idx, void* buffer, s32 offset, s32 size) return ret; } -s32 Mempak_Read(s32 controllerNb, char idx, void* buffer, s32 offset, s32 size) { +s32 Mempak_Read(UNUSED s32 controllerNb, char idx, void* buffer, s32 offset, s32 size) { OSMesgQueue* mq; s32 error; s32 ret = false; - s32 pad; + UNUSED s32 pad; mq = PadMgr_LockSerialMesgQueue(&gPadMgr); @@ -102,12 +102,12 @@ s32 Mempak_Read(s32 controllerNb, char idx, void* buffer, s32 offset, s32 size) return ret; } -s32 Mempak_Alloc(s32 controllerNb, char* idx, s32 size) { +s32 Mempak_Alloc(UNUSED s32 controllerNb, char* idx, s32 size) { OSMesgQueue* mq; s32 error; s32 ret = 0; s32 i; - s32 pad; + UNUSED s32 pad; mq = PadMgr_LockSerialMesgQueue(&gPadMgr); @@ -154,7 +154,7 @@ s32 Mempak_Alloc(s32 controllerNb, char* idx, s32 size) { return ret; } -s32 Mempak_DeleteFile(s32 controllerNb, char idx) { +s32 Mempak_DeleteFile(UNUSED s32 controllerNb, char idx) { OSMesgQueue* mq; s32 error; s32 ret = false; @@ -172,11 +172,11 @@ s32 Mempak_DeleteFile(s32 controllerNb, char idx) { return ret; } -s32 Mempak_GetFileSize(s32 controllerNb, char idx) { +s32 Mempak_GetFileSize(UNUSED s32 controllerNb, char idx) { OSMesgQueue* mq = PadMgr_LockSerialMesgQueue(&gPadMgr); OSPfsState state; s32 error = osPfsFileState(&sMempakPfsHandle, sMempakFiles[idx - 'A'], &state); - s32 pad; + UNUSED s32 pad; PadMgr_UnlockSerialMesgQueue(&gPadMgr, mq); diff --git a/src/code/relocation.c b/src/code/relocation.c index 96b80685858..659c148600b 100644 --- a/src/code/relocation.c +++ b/src/code/relocation.c @@ -17,7 +17,7 @@ void Overlay_Relocate(void* allocatedVRamAddress, OverlayRelocationSection* over uintptr_t allocu32 = (uintptr_t)allocatedVRamAddress; u32* regValP; u32 isLoNeg; - s32 pad; + UNUSED s32 pad; relocOffset = 0; relocatedValue = 0; diff --git a/src/code/sched.c b/src/code/sched.c index 99ce8099fb5..30b73c5524c 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -140,7 +140,7 @@ void Sched_HandlePreNMI(Scheduler* sc) { } } -void Sched_HandleNMI(Scheduler* sc) { +void Sched_HandleNMI(UNUSED Scheduler* sc) { // black the screen and reset the VI y scale just in time for NMI reset ViConfig_UpdateVi(true); } @@ -650,7 +650,7 @@ void Sched_ThreadEntry(void* arg) { } } -void Sched_Init(Scheduler* sc, void* stack, OSPri priority, UNK_TYPE arg3, UNK_TYPE arg4, IrqMgr* irqMgr) { +void Sched_Init(Scheduler* sc, void* stack, OSPri priority, UNUSED UNK_TYPE arg3, UNUSED UNK_TYPE arg4, IrqMgr* irqMgr) { bzero(sc, sizeof(Scheduler)); sc->isFirstSwap = true; diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index d94a92387c2..649bd80a4c5 100644 --- a/src/code/speed_meter.c +++ b/src/code/speed_meter.c @@ -38,18 +38,18 @@ void SpeedMeter_Init(SpeedMeter* this) { SpeedMeter_InitImpl(this, 32, 22); } -void SpeedMeter_Destroy(SpeedMeter* this) { +void SpeedMeter_Destroy(UNUSED SpeedMeter* this) { } void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx) { - s32 pad[2]; + UNUSED s32 pad[2]; u32 baseX = 32; s32 temp; s32 i; s32 uly; s32 lry; View view; - u32 pad2[3]; + UNUSED s32 pad2[3]; Gfx* gfx; uly = this->y; @@ -150,12 +150,12 @@ void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxC } } -void SpeedMeter_DrawAllocEntries(SpeedMeter* meter, GraphicsContext* gfxCtx, GameState* state) { - s32 pad[2]; +void SpeedMeter_DrawAllocEntries(UNUSED SpeedMeter* meter, GraphicsContext* gfxCtx, GameState* state) { + UNUSED s32 pad[2]; u32 ulx = 30; u32 lrx = 290; SpeedMeterAllocEntry entry; - u32 temp; + UNUSED s32 pad1; s32 y; TwoHeadGfxArena* thga; u32 zeldaFreeMax; diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 62dd7b4359c..fc046589b27 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -151,7 +151,7 @@ void Math3D_FindPointOnPlaneIntersect(f32 planeAAxis1Norm, f32 planeAAxis2Norm, */ s32 Math3D_PlaneVsPlaneNewLine(f32 planeAA, f32 planeAB, f32 planeAC, f32 planeADist, f32 planeBA, f32 planeBB, f32 planeBC, f32 planeBDist, InfiniteLine* intersect) { - char pad[4]; + UNUSED s32 pad; Vec3f planeANormal; Vec3f planeBNormal; f32 dirX; @@ -1631,7 +1631,7 @@ s32 Math3D_CylVsLineSeg(Cylinder16* cyl, Vec3f* linePointA, Vec3f* linePointB, V f32 fracB; f32 fracBase; f32 zero = 0.0f; - f32 pad; + UNUSED s32 pad; f32 cylRadiusSq; f32 radSqDiff; f32 distCent2; @@ -1824,7 +1824,7 @@ s32 Math3D_CylTriVsIntersect(Cylinder16* cyl, TriNorm* tri, Vec3f* intersect) { Vec3f midpointv0v1; Vec3f diffMidpointIntersect; f32 distFromCylYIntersectTov0v1; - s32 pad; + UNUSED s32 pad; cylBottom = (f32)cyl->pos.y + cyl->yShift; cylTop = cyl->height + cylBottom; @@ -2147,8 +2147,8 @@ s32 Math3D_YZInSphere(Sphere16* sphere, f32 y, f32 z) { return false; } -void Math3D_DrawSphere(PlayState* play, Sphere16* sph) { +void Math3D_DrawSphere(UNUSED PlayState* play, UNUSED Sphere16* sph) { } -void Math3D_DrawCylinder(PlayState* play, Cylinder16* cyl) { +void Math3D_DrawCylinder(UNUSED PlayState* play, UNUSED Cylinder16* cyl) { } diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index d4b457ef698..a508772695f 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -764,7 +764,7 @@ void Matrix_MtxFToYXZRotS(MtxF* mf, Vec3s* rotDest, s32 flag) { f32 temp; f32 temp2; f32 temp3; - f32 temp4; + UNUSED f32 temp4; temp = mf->xz; temp *= temp; @@ -817,7 +817,7 @@ void Matrix_MtxFToZYXRotS(MtxF* mf, Vec3s* rotDest, s32 flag) { f32 temp; f32 temp2; f32 temp3; - f32 temp4; + UNUSED f32 temp4; temp = mf->xx; temp *= temp; diff --git a/src/code/title_setup.c b/src/code/title_setup.c index 2dcee7ce9d9..9e06cc9c4a1 100644 --- a/src/code/title_setup.c +++ b/src/code/title_setup.c @@ -7,7 +7,7 @@ void Setup_InitImpl(SetupState* this) { SET_NEXT_GAMESTATE(&this->state, ConsoleLogo_Init, ConsoleLogoState); } -void Setup_Destroy(GameState* thisx) { +void Setup_Destroy(UNUSED GameState* thisx) { } void Setup_Init(GameState* thisx) { diff --git a/src/code/ucode_disas.c b/src/code/ucode_disas.c index 539e290f3e4..63d592983c4 100644 --- a/src/code/ucode_disas.c +++ b/src/code/ucode_disas.c @@ -144,7 +144,7 @@ void UCodeDisas_Init(UCodeDisas* this) { } } -void UCodeDisas_Destroy(UCodeDisas* this) { +void UCodeDisas_Destroy(UNUSED UCodeDisas* this) { } void UCodeDisas_SetCurUCodeImpl(UCodeDisas* this, void* ptr) { @@ -446,7 +446,7 @@ typedef union { } GfxMod; void UCodeDisas_Disassemble(UCodeDisas* this, GfxMod* ptr) { - u32 pad; + UNUSED s32 pad; u32 addr; u32 rdpHalf; u16 linkDlLow; @@ -1127,7 +1127,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, GfxMod* ptr) { } case G_MOVEWORD: { - u32 pad; + UNUSED s32 pad; Gdma dma = ptr->dma; Gmovewd movewd = ptr->movewd; @@ -1312,7 +1312,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, GfxMod* ptr) { } break; case G_MOVEWORD: { - u32 pad[2]; + UNUSED u32 pad[2]; Gmovewd movewd = ptr->movewd; switch (movewd.index) { diff --git a/src/code/z_actor.c b/src/code/z_actor.c index f51414eabee..93bf1f7d309 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -17,7 +17,7 @@ void ActorShape_Init(ActorShape* shape, f32 yOffset, ActorShadowFunc shadowDraw, shape->shadowAlpha = 255; } -void ActorShadow_Draw(Actor* actor, Lights* lights, PlayState* play, Gfx* dlist, Color_RGBA8* color) { +void ActorShadow_Draw(Actor* actor, UNUSED Lights* lights, PlayState* play, Gfx* dlist, Color_RGBA8* color) { f32 temp1; f32 temp2; MtxF sp60; @@ -77,9 +77,9 @@ void ActorShadow_DrawHorse(Actor* actor, Lights* lights, PlayState* play) { } void ActorShadow_DrawFoot(PlayState* play, Light* light, MtxF* arg2, s32 arg3, f32 arg4, f32 arg5, f32 arg6) { - s32 pad1; + UNUSED s32 pad1; f32 sp58; - s32 pad2[2]; + UNUSED s32 pad2[2]; OPEN_DISPS(play->state.gfxCtx, "../z_actor.c", 1661); @@ -267,7 +267,7 @@ void func_8002BE98(TargetContext* targetCtx, s32 actorCategory, PlayState* play) } } -void Actor_SetNaviToActor(TargetContext* targetCtx, Actor* actor, s32 actorCategory, PlayState* play) { +void Actor_SetNaviToActor(TargetContext* targetCtx, Actor* actor, s32 actorCategory, UNUSED PlayState* play) { NaviColor* naviColor = &sNaviColorList[actorCategory]; targetCtx->naviRefPos.x = actor->focus.pos.x; targetCtx->naviRefPos.y = actor->focus.pos.y + (actor->targetArrowOffset * actor->scale.y); @@ -303,7 +303,7 @@ void func_8002C124(TargetContext* targetCtx, PlayState* play) { TargetContextEntry* entry; Player* player; s16 spCE; - f32 temp1; + UNUSED s32 pad; Vec3f projTargetCenter; s32 spB8; f32 projTargetCappedInvW; @@ -412,7 +412,7 @@ void func_8002C124(TargetContext* targetCtx, PlayState* play) { } void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, PlayState* play) { - s32 pad; + UNUSED s32 pad; Actor* unkActor; s32 actorCategory; Vec3f projectedFocusPos; @@ -657,11 +657,11 @@ void Flags_SetCollectible(PlayState* play, s32 flag) { } } -void TitleCard_Init(PlayState* play, TitleCardContext* titleCtx) { +void TitleCard_Init(UNUSED PlayState* play, TitleCardContext* titleCtx) { titleCtx->durationTimer = titleCtx->delayTimer = titleCtx->intensity = titleCtx->alpha = 0; } -void TitleCard_InitBossName(PlayState* play, TitleCardContext* titleCtx, void* texture, s16 x, s16 y, u8 width, +void TitleCard_InitBossName(UNUSED PlayState* play, TitleCardContext* titleCtx, void* texture, s16 x, s16 y, u8 width, u8 height) { titleCtx->texture = texture; titleCtx->x = x; @@ -690,7 +690,7 @@ void TitleCard_InitPlaceName(PlayState* play, TitleCardContext* titleCtx, void* titleCtx->delayTimer = delay; } -void TitleCard_Update(PlayState* play, TitleCardContext* titleCtx) { +void TitleCard_Update(UNUSED PlayState* play, TitleCardContext* titleCtx) { if (DECR(titleCtx->delayTimer) == 0) { if (DECR(titleCtx->durationTimer) == 0) { Math_StepToS(&titleCtx->alpha, 0, 30); @@ -705,7 +705,7 @@ void TitleCard_Update(PlayState* play, TitleCardContext* titleCtx) { void TitleCard_Draw(PlayState* play, TitleCardContext* titleCtx) { s32 width; s32 height; - s32 unused; + UNUSED s32 pad; s32 titleX; s32 doubleWidth; s32 titleY; @@ -1007,13 +1007,13 @@ void func_8002DE04(PlayState* play, Actor* actorA, Actor* actorB) { actorA->flags &= ~ACTOR_FLAG_13; } -void func_8002DE74(PlayState* play, Player* player) { +void func_8002DE74(PlayState* play, UNUSED Player* player) { if ((play->roomCtx.curRoom.behaviorType1 != ROOM_BEHAVIOR_TYPE1_4) && Play_CamIsNotFixed(play)) { Camera_ChangeSetting(Play_GetCamera(play, CAM_ID_MAIN), CAM_SET_HORSE); } } -void Actor_MountHorse(PlayState* play, Player* player, Actor* horse) { +void Actor_MountHorse(UNUSED PlayState* play, Player* player, Actor* horse) { player->rideActor = horse; player->stateFlags1 |= PLAYER_STATE1_23; horse->child = &player->actor; @@ -1226,7 +1226,7 @@ s32 func_8002E2AC(PlayState* play, Actor* actor, Vec3f* arg2, s32 arg3) { void Actor_UpdateBgCheckInfo(PlayState* play, Actor* actor, f32 wallCheckHeight, f32 wallCheckRadius, f32 ceilingCheckHeight, s32 flags) { f32 sp74; - s32 pad; + UNUSED s32 pad; Vec3f sp64; s32 bgId; CollisionPoly* wallPoly; @@ -1495,7 +1495,7 @@ s32 func_8002F0C8(Actor* actor, Player* player, s32 flag) { return false; } -u32 Actor_ProcessTalkRequest(Actor* actor, PlayState* play) { +u32 Actor_ProcessTalkRequest(Actor* actor, UNUSED PlayState* play) { if (actor->flags & ACTOR_FLAG_8) { actor->flags &= ~ACTOR_FLAG_8; return true; @@ -1535,7 +1535,7 @@ s32 func_8002F2F4(Actor* actor, PlayState* play) { return func_8002F2CC(actor, play, var1); } -u32 Actor_TextboxIsClosing(Actor* actor, PlayState* play) { +u32 Actor_TextboxIsClosing(UNUSED Actor* actor, PlayState* play) { if (Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) { return true; } else { @@ -1558,7 +1558,7 @@ void Actor_GetScreenPos(PlayState* play, Actor* actor, s16* x, s16* y) { *y = projectedPos.y * cappedInvW * -(SCREEN_HEIGHT / 2) + (SCREEN_HEIGHT / 2); } -u32 Actor_HasParent(Actor* actor, PlayState* play) { +u32 Actor_HasParent(Actor* actor, UNUSED PlayState* play) { if (actor->parent != NULL) { return true; } else { @@ -1600,7 +1600,7 @@ void func_8002F580(Actor* actor, PlayState* play) { func_8002F554(actor, play, GI_NONE); } -u32 Actor_HasNoParent(Actor* actor, PlayState* play) { +u32 Actor_HasNoParent(Actor* actor, UNUSED PlayState* play) { if (actor->parent == NULL) { return true; } else { @@ -1608,7 +1608,7 @@ u32 Actor_HasNoParent(Actor* actor, PlayState* play) { } } -void func_8002F5C4(Actor* actorA, Actor* actorB, PlayState* play) { +void func_8002F5C4(Actor* actorA, Actor* actorB, UNUSED PlayState* play) { Actor* parent = actorA->parent; if (parent->id == ACTOR_PLAYER) { @@ -1631,7 +1631,7 @@ void func_8002F5F0(Actor* actor, PlayState* play) { } } -s32 Actor_IsMounted(PlayState* play, Actor* horse) { +s32 Actor_IsMounted(UNUSED PlayState* play, Actor* horse) { if (horse->child != NULL) { return true; } else { @@ -1653,7 +1653,7 @@ u32 Actor_SetRideActor(PlayState* play, Actor* horse, s32 mountSide) { return false; } -s32 Actor_NotMounted(PlayState* play, Actor* horse) { +s32 Actor_NotMounted(UNUSED PlayState* play, Actor* horse) { if (horse->child == NULL) { return true; } else { @@ -1661,7 +1661,7 @@ s32 Actor_NotMounted(PlayState* play, Actor* horse) { } } -void func_8002F698(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6) { +void func_8002F698(PlayState* play, UNUSED Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6) { Player* player = GET_PLAYER(play); player->unk_8A0 = arg6; @@ -2363,7 +2363,7 @@ s32 func_800314B0(PlayState* play, Actor* actor) { return func_800314D4(play, actor, &actor->projectedPos, actor->projectedW); } -s32 func_800314D4(PlayState* play, Actor* actor, Vec3f* arg2, f32 arg3) { +s32 func_800314D4(UNUSED PlayState* play, Actor* actor, Vec3f* arg2, f32 arg3) { f32 var; if ((arg2->z > -actor->uncullZoneScale) && (arg2->z < (actor->uncullZoneForward + actor->uncullZoneScale))) { @@ -2498,7 +2498,7 @@ void func_80031A28(PlayState* play, ActorContext* actorCtx) { u8 sEnemyActorCategories[] = { ACTORCAT_ENEMY, ACTORCAT_BOSS }; -void Actor_FreezeAllEnemies(PlayState* play, ActorContext* actorCtx, s32 duration) { +void Actor_FreezeAllEnemies(UNUSED PlayState* play, ActorContext* actorCtx, s32 duration) { Actor* actor; s32 i; @@ -2657,7 +2657,7 @@ void Actor_FreeOverlay(ActorOverlay* actorOverlay) { Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 posX, f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, s16 params) { - s32 pad; + UNUSED s32 pad; Actor* actor; ActorInit* actorInit; s32 objBankIndex; @@ -3065,7 +3065,7 @@ s16 func_80032D60(s16* arg0, s16 arg1, s16 arg2, s16 arg3) { return arg0[0]; } -void BodyBreak_Alloc(BodyBreak* bodyBreak, s32 count, PlayState* play) { +void BodyBreak_Alloc(BodyBreak* bodyBreak, s32 count, UNUSED PlayState* play) { u32 matricesSize; u32 dListsSize; u32 objectIdsSize; @@ -3231,7 +3231,7 @@ void func_80033480(PlayState* play, Vec3f* posBase, f32 randRangeDiameter, s32 a } } -Actor* Actor_GetCollidedExplosive(PlayState* play, Collider* collider) { +Actor* Actor_GetCollidedExplosive(UNUSED PlayState* play, Collider* collider) { if ((collider->acFlags & AC_HIT) && (collider->ac->category == ACTORCAT_EXPLOSIVE)) { collider->acFlags &= ~AC_HIT; return collider->ac; @@ -3755,7 +3755,7 @@ s16 func_800347E8(s16 arg0) { } s16 func_80034810(Actor* actor, struct_80034A14_arg1* arg1, f32 arg2, s16 arg3, s16 arg4) { - s32 pad; + UNUSED s32 pad; s16 var; s16 abs_var; @@ -3930,7 +3930,7 @@ void func_80034F54(PlayState* play, s16* arg1, s16* arg2, s32 arg3) { } } -void Actor_Noop(Actor* actor, PlayState* play) { +void Actor_Noop(UNUSED Actor* actor, UNUSED PlayState* play) { } s32 func_80035124(Actor* actor, PlayState* play) { @@ -4142,7 +4142,7 @@ void func_80035844(Vec3f* arg0, Vec3f* arg1, Vec3s* arg2, s32 arg3) { /** * Spawns En_Part (Dissipating Flames) actor as a child of the given actor. */ -Actor* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, s32 timer, s16* unused, PlayState* play, +Actor* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, s32 timer, UNUSED s16* arg5, PlayState* play, s16 params, Gfx* dList) { EnPart* spawnedEnPart; @@ -4173,7 +4173,7 @@ void func_800359B8(Actor* actor, s16 arg1, Vec3s* arg2) { f32 sp28; f32 sp24; CollisionPoly* floorPoly; - s32 pad; + UNUSED s32 pad; if (actor->floorPoly != NULL) { floorPoly = actor->floorPoly; @@ -5427,12 +5427,12 @@ u16 func_80037C30(PlayState* play, s16 arg1) { return func_80035BFC(play, arg1); } -s32 func_80037C5C(PlayState* play, s16 arg1, u16 textId) { +s32 func_80037C5C(UNUSED PlayState* play, s16 arg1, u16 textId) { func_80036E50(textId, arg1); return false; } -s32 func_80037C94(PlayState* play, Actor* actor, s32 arg2) { +s32 func_80037C94(PlayState* play, Actor* actor, UNUSED s32 arg2) { return func_800374E0(play, actor, actor->textId); } diff --git a/src/code/z_actor_dlftbls.c b/src/code/z_actor_dlftbls.c index 331e900afd8..2dbeb0db197 100644 --- a/src/code/z_actor_dlftbls.c +++ b/src/code/z_actor_dlftbls.c @@ -65,7 +65,7 @@ void ActorOverlayTable_LogPrint(void) { } } -void ActorOverlayTable_FaultPrint(void* arg0, void* arg1) { +void ActorOverlayTable_FaultPrint(UNUSED void* arg0, UNUSED void* arg1) { ActorOverlay* overlayEntry; u32 overlaySize; s32 i; diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index 55ee74b8aad..e0f331ef268 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -93,7 +93,7 @@ void DynaSSNodeList_SetSSListHead(DynaSSNodeList* nodeList, SSList* ssList, s16* /** * Initialize DynaSSNodeList */ -void DynaSSNodeList_Initialize(PlayState* play, DynaSSNodeList* nodeList) { +void DynaSSNodeList_Initialize(UNUSED PlayState* play, DynaSSNodeList* nodeList) { nodeList->tbl = NULL; nodeList->count = 0; } @@ -195,7 +195,7 @@ void func_80038A28(CollisionPoly* poly, f32 tx, f32 ty, f32 tz, MtxF* dest) { f32 nx; f32 ny; f32 nz; - s32 pad; + UNUSED s32 pad; f32 xx; f32 zz; f32 yz; @@ -606,7 +606,7 @@ f32 BgCheck_RaycastFloorStatic(StaticLookup* lookup, CollisionContext* colCtx, u * returns true if `wallPolyPtr` was changed * `invXZlength` is 1 / sqrt( sq(poly.normal.x) + sq(poly.normal.z) ) */ -s32 BgCheck_ComputeWallDisplacement(CollisionContext* colCtx, CollisionPoly* poly, f32* posX, f32* posZ, f32 nx, f32 ny, +s32 BgCheck_ComputeWallDisplacement(CollisionContext* colCtx, CollisionPoly* poly, f32* posX, f32* posZ, f32 nx, UNUSED f32 ny, f32 nz, f32 invXZlength, f32 planeDist, f32 radius, CollisionPoly** wallPolyPtr) { CollisionPoly* wallPoly; u32 surfaceData; @@ -641,8 +641,7 @@ s32 BgCheck_ComputeWallDisplacement(CollisionContext* colCtx, CollisionPoly* pol s32 BgCheck_SphVsStaticWall(StaticLookup* lookup, CollisionContext* colCtx, u16 xpFlags, f32* outX, f32* outZ, Vec3f* pos, f32 radius, CollisionPoly** outPoly) { Vec3f resultPos; - f32 temp_f2; - f32 temp_f2_2; + UNUSED s32 pad[2]; f32 planeDist; f32 intersect; s32 result; @@ -659,7 +658,7 @@ s32 BgCheck_SphVsStaticWall(StaticLookup* lookup, CollisionContext* colCtx, u16 f32 nz; f32 temp_f16; Vec3s* vtxList; - u16 pad; + UNUSED u16 pad1; f32 zMin; f32 zMax; @@ -851,7 +850,7 @@ s32 BgCheck_SphVsStaticWall(StaticLookup* lookup, CollisionContext* colCtx, u16 s32 BgCheck_CheckStaticCeiling(StaticLookup* lookup, u16 xpFlags, CollisionContext* colCtx, f32* outY, Vec3f* pos, f32 checkHeight, CollisionPoly** outPoly) { s32 result = false; - u16 nextId; + UNUSED s32 pad; CollisionPoly* curPoly; CollisionPoly* polyList; f32 ceilingY; @@ -1012,7 +1011,7 @@ s32 BgCheck_SphVsFirstStaticPolyList(SSNode* node, u16 xpFlags, CollisionContext CollisionPoly* polyList = colCtx->colHeader->polyList; Vec3s* vtxList = colCtx->colHeader->vtxList; CollisionPoly* curPoly; - u16 nextId; + UNUSED s16 pad; s16 curPolyId; while (true) { @@ -1344,7 +1343,7 @@ s32 BgCheck_PolyIntersectsSubdivision(Vec3f* min, Vec3f* max, CollisionPoly* pol * Initialize StaticLookup Table * returns size of table, in bytes */ -u32 BgCheck_InitializeStaticLookup(CollisionContext* colCtx, PlayState* play, StaticLookup* lookupTbl) { +u32 BgCheck_InitializeStaticLookup(CollisionContext* colCtx, UNUSED PlayState* play, StaticLookup* lookupTbl) { Vec3s* vtxList; CollisionPoly* polyList; s32 polyMax; @@ -1499,7 +1498,7 @@ void BgCheck_Allocate(CollisionContext* colCtx, PlayState* play, CollisionHeader u32 tblMax; u32 memSize; u32 lookupTblMemSize; - SSNodeList* nodeList; + UNUSED s32 pad; s32 useCustomSubdivisions; u32 customMemSize; s32 customNodeListMax; @@ -1656,7 +1655,7 @@ f32 BgCheck_RaycastFloorImpl(PlayState* play, CollisionContext* colCtx, u16 xpFl s32* outBgId, Vec3f* pos, Actor* actor, u32 arg7, f32 chkDist) { f32 yIntersectDyna; - s32* temp_a0; + UNUSED s32 pad; StaticLookup* lookupTbl; Vec3f checkPos; StaticLookup* lookup; @@ -2353,7 +2352,7 @@ s32 BgCheck_AnyLineTest3(CollisionContext* colCtx, Vec3f* posA, Vec3f* posB, Vec * ignores `actor` dyna poly * returns true if any poly intersects the sphere, else false * `outPoly` returns the pointer of the first poly found that intersects - * `outBgId` returns the bgId of the entity that owns `outPoly` + * @bug `outBgId` always returns BGCHECK_SCENE due to a bug in `BgCheck_SphVsFirstDynaPoly` */ s32 BgCheck_SphVsFirstPolyImpl(CollisionContext* colCtx, u16 xpFlags, CollisionPoly** outPoly, s32* outBgId, Vec3f* center, f32 radius, Actor* actor, u16 bciFlags) { @@ -2507,7 +2506,7 @@ void DynaLookup_ResetVtxStartIndex(u16* vtxStartIndex) { /** * Initialize BgActor */ -void BgActor_Initialize(PlayState* play, BgActor* bgActor) { +void BgActor_Initialize(UNUSED PlayState* play, BgActor* bgActor) { bgActor->actor = NULL; bgActor->colHeader = NULL; ScaleRotPos_Initialize(&bgActor->prevTransform); @@ -2573,7 +2572,7 @@ void DynaPoly_AllocVtxList(PlayState* play, Vec3s** vtxList, s32 numVtx) { /** * Update BgActor's prevTransform */ -void DynaPoly_SetBgActorPrevTransform(PlayState* play, BgActor* bgActor) { +void DynaPoly_SetBgActorPrevTransform(UNUSED PlayState* play, BgActor* bgActor) { bgActor->prevTransform = bgActor->curTransform; } @@ -2621,7 +2620,7 @@ void DynaPoly_Alloc(PlayState* play, DynaCollisionContext* dyna) { * Set BgActor * original name: DynaPolyInfo_setActor */ -s32 DynaPoly_SetBgActor(PlayState* play, DynaCollisionContext* dyna, Actor* actor, CollisionHeader* colHeader) { +s32 DynaPoly_SetBgActor(UNUSED PlayState* play, DynaCollisionContext* dyna, Actor* actor, CollisionHeader* colHeader) { s32 bgId; s32 foundSlot = false; @@ -2662,28 +2661,28 @@ DynaPolyActor* DynaPoly_GetActor(CollisionContext* colCtx, s32 bgId) { return (DynaPolyActor*)colCtx->dyna.bgActors[bgId].actor; } -void DynaPoly_DisableCollision(PlayState* play, DynaCollisionContext* dyna, s32 bgId) { +void DynaPoly_DisableCollision(UNUSED PlayState* play, DynaCollisionContext* dyna, s32 bgId) { if (DynaPoly_IsBgIdBgActor(bgId)) { dyna->bgActorFlags[bgId] |= BGACTOR_COLLISION_DISABLED; dyna->bitFlag |= DYNAPOLY_INVALIDATE_LOOKUP; } } -void DynaPoly_EnableCollision(PlayState* play, DynaCollisionContext* dyna, s32 bgId) { +void DynaPoly_EnableCollision(UNUSED PlayState* play, DynaCollisionContext* dyna, s32 bgId) { if (DynaPoly_IsBgIdBgActor(bgId)) { dyna->bgActorFlags[bgId] &= ~BGACTOR_COLLISION_DISABLED; dyna->bitFlag |= DYNAPOLY_INVALIDATE_LOOKUP; } } -void DynaPoly_DisableCeilingCollision(PlayState* play, DynaCollisionContext* dyna, s32 bgId) { +void DynaPoly_DisableCeilingCollision(UNUSED PlayState* play, DynaCollisionContext* dyna, s32 bgId) { if (DynaPoly_IsBgIdBgActor(bgId)) { dyna->bgActorFlags[bgId] |= BGACTOR_CEILING_COLLISION_DISABLED; dyna->bitFlag |= DYNAPOLY_INVALIDATE_LOOKUP; } } -void DynaPoly_EnableCeilingCollision(PlayState* play, DynaCollisionContext* dyna, s32 bgId) { +void DynaPoly_EnableCeilingCollision(UNUSED PlayState* play, DynaCollisionContext* dyna, s32 bgId) { if (DynaPoly_IsBgIdBgActor(bgId)) { dyna->bgActorFlags[bgId] &= ~BGACTOR_CEILING_COLLISION_DISABLED; dyna->bitFlag |= DYNAPOLY_INVALIDATE_LOOKUP; @@ -2727,25 +2726,24 @@ void DynaPoly_DeleteBgActor(PlayState* play, DynaCollisionContext* dyna, s32 bgI } } -void DynaPoly_InvalidateLookup(PlayState* play, DynaCollisionContext* dyna) { +void DynaPoly_InvalidateLookup(UNUSED PlayState* play, DynaCollisionContext* dyna) { dyna->bitFlag |= DYNAPOLY_INVALIDATE_LOOKUP; } /** * original name: DynaPolyInfo_expandSRT */ -void DynaPoly_AddBgActorToLookup(PlayState* play, DynaCollisionContext* dyna, s32 bgId, s32* vtxStartIndex, +void DynaPoly_AddBgActorToLookup(UNUSED PlayState* play, DynaCollisionContext* dyna, s32 bgId, s32* vtxStartIndex, s32* polyStartIndex) { MtxF mtx; Actor* actor; - s32 pad; - s32 pad2; + UNUSED s32 pad[2]; f32 numVtxInverse; s32 i; Vec3f pos; Sphere16* sphere; Vec3s* dVtxList; - Vec3s* point; + UNUSED s32 pad1; Vec3f newCenterPoint; f32 newRadiusSq; CollisionHeader* pbgdata; @@ -3063,7 +3061,7 @@ f32 BgCheck_RaycastFloorDyna(DynaRaycast* dynaRaycast) { s32 i2; s32 pauseState; DynaPolyActor* dynaActor; - s32 pad; + UNUSED s32 pad; Vec3f polyVtx[3]; Vec3f polyNorm; u32 polyIndex; @@ -3184,7 +3182,7 @@ f32 BgCheck_RaycastFloorDyna(DynaRaycast* dynaRaycast) { s32 BgCheck_SphVsDynaWallInBgActor(CollisionContext* colCtx, u16 xpFlags, DynaCollisionContext* dyna, SSList* ssList, f32* outX, f32* outZ, CollisionPoly** outPoly, s32* outBgId, Vec3f* pos, f32 radius, s32 bgId) { - f32 temp; + UNUSED s32 pad; f32 intersect; s32 result = false; CollisionPoly* poly; @@ -3200,7 +3198,7 @@ s32 BgCheck_SphVsDynaWallInBgActor(CollisionContext* colCtx, u16 xpFlags, DynaCo f32 invNormalXZ; f32 planeDist; f32 temp_f18; - f32 zIntersectDist; + UNUSED s32 pad1; f32 xIntersectDist; f32 zMin; f32 zMax; @@ -3427,7 +3425,7 @@ s32 BgCheck_SphVsDynaWall(CollisionContext* colCtx, u16 xpFlags, f32* outX, f32* * `outPoly` returns the poly collided with * `outY` returns the y coordinate needed to not collide with `outPoly` */ -s32 BgCheck_CheckDynaCeilingList(CollisionContext* colCtx, u16 xpFlags, DynaCollisionContext* dyna, SSList* ssList, +s32 BgCheck_CheckDynaCeilingList(UNUSED CollisionContext* colCtx, u16 xpFlags, DynaCollisionContext* dyna, SSList* ssList, f32* outY, Vec3f* pos, f32 checkHeight, CollisionPoly** outPoly) { s16 polyId; SSNode* curNode; @@ -3440,7 +3438,7 @@ s32 BgCheck_CheckDynaCeilingList(CollisionContext* colCtx, u16 xpFlags, DynaColl f32 nz; s32 result = false; f32 intersectDist; - u16 padding; + UNUSED u16 padding; if (ssList->head == SS_NULL) { return false; @@ -3500,7 +3498,7 @@ s32 BgCheck_CheckDynaCeiling(CollisionContext* colCtx, u16 xpFlags, f32* outY, V s32 result = false; f32 resultY; f32 tempY = chkDist + pos->y; - BgActor* bgActor; + UNUSED s32 pad; CollisionPoly* poly; resultY = tempY; @@ -3633,7 +3631,7 @@ s32 BgCheck_CheckLineAgainstBgActor(CollisionContext* colCtx, u16 xpFlags, Vec3f s32 BgCheck_CheckLineAgainstDyna(CollisionContext* colCtx, u16 xpFlags, Vec3f* posA, Vec3f* posB, Vec3f* posResult, CollisionPoly** outPoly, f32* distSq, s32* outBgId, Actor* actor, f32 chkDist, s32 bccFlags) { - s32 pad; + UNUSED s32 pad; s32 i; s32 result = false; Linef line; @@ -3737,9 +3735,10 @@ s32 BgCheck_SphVsFirstDynaPolyInBgActor(CollisionContext* colCtx, u16 xpFlags, C /** * Gets first dyna poly intersecting sphere `center` `radius` * returns true if poly detected, else false - * `outPoly` returns the first intersecting poly, while `outBgId` returns the BgActor index of that poly + * `outPoly` returns the first intersecting poly + * @bug the bg ID is never written out to `outBgId` */ -s32 BgCheck_SphVsFirstDynaPoly(CollisionContext* colCtx, u16 xpFlags, CollisionPoly** outPoly, s32* outBgId, +s32 BgCheck_SphVsFirstDynaPoly(CollisionContext* colCtx, u16 xpFlags, CollisionPoly** outPoly, UNUSED s32* outBgId, Vec3f* center, f32 radius, Actor* actor, u16 bciFlags) { s32 i = 0; Sphere16 testSphere; @@ -4246,7 +4245,7 @@ s32 WaterBox_GetSurface2(PlayState* play, CollisionContext* colCtx, Vec3f* pos, s32 room; s32 i; WaterBox* waterBox; - WaterBox* waterBoxList = colHeader->waterBoxes; // unused, needed for matching + UNUSED WaterBox* waterBoxList = colHeader->waterBoxes; // needed for matching if (colHeader->numWaterBoxes == 0 || colHeader->waterBoxes == SEGMENTED_TO_VIRTUAL(NULL)) { *outWaterBox = NULL; @@ -4282,7 +4281,7 @@ s32 WaterBox_GetSurface2(PlayState* play, CollisionContext* colCtx, Vec3f* pos, /** * WaterBox get BgCam index */ -u32 WaterBox_GetBgCamIndex(CollisionContext* colCtx, WaterBox* waterBox) { +u32 WaterBox_GetBgCamIndex(UNUSED CollisionContext* colCtx, WaterBox* waterBox) { u32 prop = waterBox->properties >> 0; return prop & 0xFF; @@ -4305,7 +4304,7 @@ u16 WaterBox_GetBgCamSetting(CollisionContext* colCtx, WaterBox* waterBox) { /** * WaterBox get lighting settings */ -u32 WaterBox_GetLightSettingIndex(CollisionContext* colCtx, WaterBox* waterBox) { +u32 WaterBox_GetLightSettingIndex(UNUSED CollisionContext* colCtx, WaterBox* waterBox) { u32 prop = waterBox->properties >> 8; return prop & 0x1F; @@ -4385,7 +4384,7 @@ s32 func_800427B4(CollisionPoly* polyA, CollisionPoly* polyB, Vec3f* pointA, Vec /** * Draw a list of dyna polys, specified by `ssList` */ -void BgCheck_DrawDynaPolyList(PlayState* play, CollisionContext* colCtx, DynaCollisionContext* dyna, SSList* ssList, +void BgCheck_DrawDynaPolyList(PlayState* play, UNUSED CollisionContext* colCtx, DynaCollisionContext* dyna, SSList* ssList, u8 r, u8 g, u8 b) { s16 curPolyId; CollisionPoly* poly; diff --git a/src/code/z_camera.c b/src/code/z_camera.c index b38a1d0cc5c..fafd08a2e4a 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -342,7 +342,7 @@ s32 func_80043F94(Camera* camera, Vec3f* from, CamColChk* to) { void func_80044340(Camera* camera, Vec3f* arg1, Vec3f* arg2) { CamColChk sp20; - Vec3s unused; + UNUSED s32 pad[2]; sp20.pos = *arg2; func_80043F94(camera, arg1, &sp20); @@ -353,9 +353,9 @@ void func_80044340(Camera* camera, Vec3f* arg1, Vec3f* arg2) { * Checks if `from` to `to` is looking from the outside of a poly towards the front */ s32 Camera_CheckOOB(Camera* camera, Vec3f* from, Vec3f* to) { - s32 pad; + UNUSED s32 pad; Vec3f intersect; - s32 pad2; + UNUSED s32 pad2; s32 bgId; CollisionPoly* poly; CollisionContext* colCtx = &camera->play->colCtx; @@ -375,7 +375,7 @@ s32 Camera_CheckOOB(Camera* camera, Vec3f* from, Vec3f* to) { * and bgId to `bgId`. If no floor is found, then the normal is a flat surface pointing upwards. */ f32 Camera_GetFloorYNorm(Camera* camera, Vec3f* floorNorm, Vec3f* chkPos, s32* bgId) { - s32 pad; + UNUSED s32 pad; CollisionPoly* floorPoly; f32 floorY = BgCheck_EntityRaycastFloor3(&camera->play->colCtx, &floorPoly, bgId, chkPos); @@ -485,7 +485,7 @@ s32 Camera_GetBgCamIndex(Camera* camera, s32* bgId, CollisionPoly* poly) { */ Vec3s* Camera_GetBgCamFuncDataUnderPlayer(Camera* camera, u16* bgCamCount) { CollisionPoly* floorPoly; - s32 pad; + UNUSED s32 pad; s32 bgId; PosRot playerPosShape; @@ -649,7 +649,7 @@ Vec3f* Camera_CalcUpFromPitchYawRoll(Vec3f* dest, s16 pitch, s16 yaw, s16 roll) f32 sinNegRoll; f32 cosNegRoll; Vec3f spA4; - f32 pad; + UNUSED s32 pad; f32 sp54; f32 sp4C; f32 cosPitchCosYawSinRoll; @@ -908,7 +908,7 @@ s32 Camera_CalcAtDefault(Camera* camera, VecSph* eyeAtDir, f32 extraYOffset, s16 Vec3f* at = &camera->at; Vec3f posOffsetTarget; Vec3f atTarget; - s32 pad2; + UNUSED s32 pad2; PosRot* playerPosRot = &camera->playerPosRot; f32 yOffset; @@ -942,7 +942,7 @@ s32 func_800458D4(Camera* camera, VecSph* eyeAtDir, f32 arg2, f32* arg3, s16 arg f32 eyeAtAngle; PosRot* playerPosRot = &camera->playerPosRot; f32 deltaY; - s32 pad[2]; + UNUSED s32 pad[2]; posOffsetTarget.y = Player_GetHeight(camera->player) + arg2; posOffsetTarget.x = 0.0f; @@ -981,7 +981,7 @@ s32 func_80045B08(Camera* camera, VecSph* eyeAtDir, f32 yExtra, s16 arg3) { f32 phi_f2; Vec3f posOffsetTarget; Vec3f atTarget; - f32 pad; + UNUSED s32 pad; f32 temp_ret; PosRot* playerPosRot = &camera->playerPosRot; @@ -1188,8 +1188,8 @@ s32 Camera_CalcAtForHorse(Camera* camera, VecSph* eyeAtDir, f32 yOffset, f32* yP Vec3f* at = &camera->at; Vec3f posOffsetTarget; Vec3f atTarget; - s32 pad; - s32 pad2; + UNUSED s32 pad; + UNUSED s32 pad2; f32 playerHeight; Player* player; PosRot horsePosRot; @@ -1417,7 +1417,7 @@ void func_80046E20(Camera* camera, VecSph* eyeAdjustment, f32 minDist, f32 arg3, } } -s32 Camera_Noop(Camera* camera) { +s32 Camera_Noop(UNUSED Camera* camera) { return true; } @@ -1435,7 +1435,7 @@ s32 Camera_Normal1(Camera* camera) { VecSph eyeAdjustment; VecSph atEyeGeo; VecSph atEyeNextGeo; - PosRot* playerPosRot = &camera->playerPosRot; + UNUSED PosRot* playerPosRot = &camera->playerPosRot; Normal1ReadOnlyData* roData = &camera->paramData.norm1.roData; Normal1ReadWriteData* rwData = &camera->paramData.norm1.rwData; f32 playerHeight; @@ -1671,7 +1671,7 @@ s32 Camera_Normal2(Camera* camera) { PosRot* playerPosRot = &camera->playerPosRot; Normal2ReadOnlyData* roData = &camera->paramData.norm2.roData; Normal2ReadWriteData* rwData = &camera->paramData.norm2.rwData; - s32 pad; + UNUSED s32 pad; BgCamFuncData* bgCamFuncData; f32 playerHeight; f32 yNormal; @@ -1836,7 +1836,7 @@ s32 Camera_Normal3(Camera* camera) { VecSph sp74; PosRot* playerPosRot = &camera->playerPosRot; f32 temp_f0; - f32 temp_f6; + UNUSED s32 pad; s16 phi_a0; s16 t2; Normal3ReadOnlyData* roData = &camera->paramData.norm3.roData; @@ -1993,7 +1993,7 @@ s32 Camera_Parallel1(Camera* camera) { Parallel1ReadWriteData* rwData = &camera->paramData.para1.rwData; f32 pad2; f32 playerHeight; - s32 pad3; + UNUSED s32 pad3; playerHeight = Player_GetHeight(camera->player); if (RELOAD_PARAMS(camera) || R_RELOAD_CAM_PARAMS) { @@ -2191,7 +2191,7 @@ s32 Camera_Jump1(Camera* camera) { Vec3f* eye = &camera->eye; Vec3f* at = &camera->at; Vec3f* eyeNext = &camera->eyeNext; - s32 pad2; + UNUSED s32 pad2; f32 spA4; Vec3f newEye; VecSph eyeAtOffset; @@ -2200,10 +2200,10 @@ s32 Camera_Jump1(Camera* camera) { VecSph eyeDiffTarget; PosRot* playerPosRot = &camera->playerPosRot; PosRot playerhead; - s16 tangle; + UNUSED s16 pad1; Jump1ReadOnlyData* roData = &camera->paramData.jump1.roData; Jump1ReadWriteData* rwData = &camera->paramData.jump1.rwData; - s32 pad; + UNUSED s32 pad; f32 playerHeight; playerHeight = Player_GetHeight(camera->player); @@ -2535,8 +2535,8 @@ s32 Camera_Jump3(Camera* camera) { Jump3ReadOnlyData* roData = &camera->paramData.jump3.roData; VecSph eyeAtOffset; VecSph eyeNextAtOffset; - s32 pad; - s32 pad2; + UNUSED s32 pad; + UNUSED s32 pad2; CameraModeValue* values; f32 t2; f32 phi_f0; @@ -2544,9 +2544,9 @@ s32 Camera_Jump3(Camera* camera) { f32 playerHeight; PosRot playerhead; f32 yNormal; - f32 temp_f18; + UNUSED s32 pad3; s32 modeSwitch; - f32 temp_f2_2; + UNUSED s32 pad1; Jump3ReadWriteData* rwData = &camera->paramData.jump3.rwData; playerHeight = Player_GetHeight(camera->player); @@ -2724,7 +2724,7 @@ s32 Camera_Battle1(Camera* camera) { Vec3f targetPos; f32 var3; f32 var2; - f32 temp_f0_2; + UNUSED s32 pad1; f32 temp_f12_2; f32 spFC; f32 spF8; @@ -2751,7 +2751,7 @@ s32 Camera_Battle1(Camera* camera) { f32 fov; Battle1ReadOnlyData* roData = &camera->paramData.batt1.roData; Battle1ReadWriteData* rwData = &camera->paramData.batt1.rwData; - s32 pad; + UNUSED s32 pad; f32 playerHeight; skipEyeAtCalc = false; @@ -2994,7 +2994,7 @@ s32 Camera_Battle4(Camera* camera) { VecSph eyeNextAtOffset; Battle4ReadOnlyData* roData = &camera->paramData.batt4.roData; Battle4ReadWriteData* rwData = &camera->paramData.batt4.rwData; - s32 pad; + UNUSED s32 pad; f32 playerHeight; playerHeight = Player_GetHeight(camera->player); @@ -3094,7 +3094,7 @@ s32 Camera_KeepOn1(Camera* camera) { s16 sp80; KeepOn1ReadOnlyData* roData = &camera->paramData.keep1.roData; KeepOn1ReadWriteData* rwData = &camera->paramData.keep1.rwData; - s16 t3; + UNUSED s32 pad; f32 playerHeight; sp88 = 0; @@ -3494,7 +3494,7 @@ s32 Camera_KeepOn3(Camera* camera) { s32 Camera_KeepOn4(Camera* camera) { static Vec3f D_8015BD50; - static Vec3f D_8015BD60; + UNUSED static Vec3f D_8015BD60; static Vec3f D_8015BD70; Vec3f* eye = &camera->eye; Vec3f* at = &camera->at; @@ -3514,7 +3514,7 @@ s32 Camera_KeepOn4(Camera* camera) { PosRot* playerPosRot = &camera->playerPosRot; KeepOn4ReadOnlyData* roData = &camera->paramData.keep4.roData; KeepOn4ReadWriteData* rwData = &camera->paramData.keep4.rwData; - s32 pad; + UNUSED s32 pad; f32 playerHeight; Player* player = GET_PLAYER(camera->play); s16 angleCnt; @@ -3797,7 +3797,7 @@ s32 Camera_KeepOn0(Camera* camera) { VecSph eyeAtOffset; KeepOn0ReadOnlyData* roData = &camera->paramData.keep0.roData; KeepOn0ReadWriteData* rwData = &camera->paramData.keep0.rwData; - s32 pad; + UNUSED s32 pad; BgCamFuncData* bgCamFuncData; UNUSED Vec3s bgCamRot; s16 fov; @@ -3867,10 +3867,10 @@ s32 Camera_KeepOn0(Camera* camera) { s32 Camera_Fixed1(Camera* camera) { Fixed1ReadOnlyData* roData = &camera->paramData.fixd1.roData; Fixed1ReadWriteData* rwData = &camera->paramData.fixd1.rwData; - s32 pad; + UNUSED s32 pad; VecSph eyeOffset; VecSph eyeAtOffset; - s32 pad2; + UNUSED s32 pad2; Vec3f adjustedPos; BgCamFuncData* bgCamFuncData; Vec3f* eye = &camera->eye; @@ -3948,7 +3948,7 @@ s32 Camera_Fixed2(Camera* camera) { BgCamFuncData* bgCamFuncData; Fixed2ReadOnlyData* roData = &camera->paramData.fixd2.roData; Fixed2ReadWriteData* rwData = &camera->paramData.fixd2.rwData; - s32 pad; + UNUSED s32 pad; f32 playerHeight; playerHeight = Player_GetHeight(camera->player); @@ -4029,7 +4029,7 @@ s32 Camera_Fixed3(Camera* camera) { VecSph eyeAtOffset; Fixed3ReadOnlyData* roData = &camera->paramData.fixd3.roData; Fixed3ReadWriteData* rwData = &camera->paramData.fixd3.rwData; - s32 pad; + UNUSED s32 pad; bgCamFuncData = (BgCamFuncData*)Camera_GetBgCamFuncData(camera); @@ -4103,7 +4103,7 @@ s32 Camera_Fixed4(Camera* camera) { VecSph atTargetEyeNextOffset; PosRot* playerPosRot = &camera->playerPosRot; BgCamFuncData* bgCamFuncData; - Vec3f* posOffset = &camera->posOffset; + UNUSED Vec3f* posOffset = &camera->posOffset; Fixed4ReadOnlyData* roData = &camera->paramData.fixd4.roData; Fixed4ReadWriteData* rwData = &camera->paramData.fixd4.rwData; f32 playerYOffset; @@ -4327,13 +4327,13 @@ s32 Camera_Subj4(Camera* camera) { Vec3f sp98; Vec3f sp8C; f32 sp88; - s16 pad2; + UNUSED s16 pad2; f32 temp_f16; PosRot sp6C; VecSph sp64; VecSph sp5C; s16 temp_a0; - f32 tx; + UNUSED s32 pad; Player* player; PosRot* playerPosRot = &camera->playerPosRot; Subj4ReadOnlyData* roData = &camera->paramData.subj4.roData; @@ -4467,7 +4467,7 @@ s32 Camera_Data3(Camera* camera) { } s32 Camera_Data4(Camera* camera) { - s32 pad2[2]; + UNUSED s32 pad2[2]; Data4ReadOnlyData* roData = &camera->paramData.data4.roData; VecSph eyeAtOffset; VecSph atOffset; @@ -4482,7 +4482,7 @@ s32 Camera_Data4(Camera* camera) { Vec3f* eye = &camera->eye; f32 playerHeight; Vec3f* at = &camera->at; - s32 pad; + UNUSED s32 pad; playerHeight = Player_GetHeight(camera->player); @@ -4557,9 +4557,9 @@ s32 Camera_Unique1(Camera* camera) { PosRot playerhead; Unique1ReadOnlyData* roData = &camera->paramData.uniq1.roData; Unique1ReadWriteData* rwData = &camera->paramData.uniq1.rwData; - s32 pad; + UNUSED s32 pad; f32 playerHeight; - s32 pad2; + UNUSED s32 pad2; playerHeight = Player_GetHeight(camera->player); if (RELOAD_PARAMS(camera) || R_RELOAD_CAM_PARAMS) { @@ -4645,11 +4645,11 @@ s32 Camera_Unique2(Camera* camera) { Vec3f playerPos; VecSph eyeOffset; VecSph eyeAtOffset; - s32 pad; + UNUSED s32 pad; f32 lerpRateFactor; Unique2ReadOnlyData* roData = &camera->paramData.uniq2.roData; Unique2ReadWriteData* rwData = &camera->paramData.uniq2.rwData; - s32 pad2; + UNUSED s32 pad2; f32 playerHeight; playerHeight = Player_GetHeight(camera->player); @@ -5016,7 +5016,7 @@ s32 Camera_Unique6(Camera* camera) { * camera rotates to follow player */ s32 Camera_Unique7(Camera* camera) { - s32 pad; + UNUSED s32 pad; Unique7ReadOnlyData* roData = &camera->paramData.uniq7.roData; CameraModeValue* values; VecSph playerPosEyeOffset; @@ -5092,7 +5092,7 @@ s32 Camera_Unique9(Camera* camera) { s16 action; s16 atInitFlags; s16 eyeInitFlags; - s16 pad2; + UNUSED s16 pad2; PosRot targethead; PosRot playerhead; PosRot playerPosRot; @@ -5600,7 +5600,7 @@ void Camera_RotateAroundPoint(PosRot* at, Vec3f* pos, Vec3f* dst) { * until all keyFrames have been exhausted. */ s32 Camera_Demo1(Camera* camera) { - s32 pad; + UNUSED s32 pad; Demo1ReadOnlyData* roData = &camera->paramData.demo1.roData; CameraModeValue* values; Vec3f* at = &camera->at; @@ -5688,13 +5688,13 @@ s32 Camera_Demo3(Camera* camera) { Vec3f sp68; Vec3f sp5C; f32 temp_f0; - s32 pad; + UNUSED s32 pad; u8 skipUpdateEye = false; f32 yOffset = Player_GetHeight(camera->player); s16 angle; Demo3ReadOnlyData* roData = &camera->paramData.demo3.roData; Demo3ReadWriteData* rwData = &camera->paramData.demo3.rwData; - s32 pad2; + UNUSED s32 pad2; camera->unk_14C &= ~0x10; @@ -5905,7 +5905,7 @@ s32 Camera_Demo5(Camera* camera) { VecSph eyePlayerGeo; s16 targetScreenPosX; s16 targetScreenPosY; - s32 pad1; + UNUSED s32 pad1; PosRot playerhead; PosRot targethead; Player* player; @@ -5913,7 +5913,7 @@ s32 Camera_Demo5(Camera* camera) { s32 framesDiff; s32 temp_v0; s16 t; - s32 pad2; + UNUSED s32 pad2; Actor_GetFocus(&playerhead, &camera->player->actor); player = camera->player; @@ -6227,7 +6227,7 @@ s32 Camera_Demo8(Camera* camera) { * to be relative to the main camera's player, the current camera's player, or the main camera's target */ s32 Camera_Demo9(Camera* camera) { - s32 pad; + UNUSED s32 pad; s32 finishAction; s16 onePointTimer; OnePointCamData* onePointCamData = &camera->paramData.demo9.onePointCamData; @@ -6241,7 +6241,7 @@ s32 Camera_Demo9(Camera* camera) { Vec3f* eye = &camera->eye; PosRot* mainCamPlayerPosRot; PosRot focusPosRot; - s32 pad3; + UNUSED s32 pad3; Vec3f* eyeNext = &camera->eyeNext; Demo9ReadOnlyData* roData = &camera->paramData.demo9.roData; Vec3f* at = &camera->at; @@ -6469,7 +6469,7 @@ s32 Camera_Special5(Camera* camera) { Vec3f* at = &camera->at; Vec3f* eyeNext = &camera->eyeNext; PosRot spA8; - s16 pad; + UNUSED s16 pad; s16 spA4; CamColChk sp7C; VecSph sp74; @@ -6623,12 +6623,12 @@ s32 Camera_Special6(Camera* camera) { BgCamFuncData* bgCamFuncData; Vec3s bgCamRot; s16 fov; - f32 sp54; + UNUSED s32 sp54; f32 timerF; f32 timerDivisor; Special6ReadOnlyData* roData = &camera->paramData.spec6.roData; Special6ReadWriteData* rwData = &camera->paramData.spec6.rwData; - s32 pad; + UNUSED s32 pad; if (RELOAD_PARAMS(camera) || R_RELOAD_CAM_PARAMS) { CameraModeValue* values = sCameraSettings[camera->setting].cameraModes[camera->mode].values; @@ -6717,7 +6717,7 @@ s32 Camera_Special8(Camera* camera) { } s32 Camera_Special9(Camera* camera) { - s32 pad; + UNUSED s32 pad; Vec3f* eye = &camera->eye; Vec3f* at = &camera->at; Vec3f* eyeNext = &camera->eyeNext; @@ -6725,14 +6725,14 @@ s32 Camera_Special9(Camera* camera) { VecSph eyeAdjustment; VecSph atEyeOffsetGeo; f32 playerYOffset; - s32 pad3; + UNUSED s32 pad3; PosRot* playerPosRot = &camera->playerPosRot; PosRot adjustedPlayerPosRot; f32 yNormal; DoorParams* doorParams = &camera->paramData.doorParams; Special9ReadOnlyData* roData = &camera->paramData.spec9.roData; Special9ReadWriteData* rwData = &camera->paramData.spec9.rwData; - s32 pad4; + UNUSED s32 pad4; BgCamFuncData* bgCamFuncData; playerYOffset = Player_GetHeight(camera->player); @@ -6885,7 +6885,7 @@ void Camera_Destroy(Camera* camera) { } } -void Camera_Init(Camera* camera, View* view, CollisionContext* colCtx, PlayState* play) { +void Camera_Init(Camera* camera, UNUSED View* view, UNUSED CollisionContext* colCtx, PlayState* play) { Camera* camP; s32 i; s16 curUID; @@ -6992,7 +6992,7 @@ void func_80057FC4(Camera* camera) { } } -void Camera_Stub80058140(Camera* camera) { +void Camera_Stub80058140(UNUSED Camera* camera) { } void Camera_InitPlayerSettings(Camera* camera, Player* player) { @@ -7331,7 +7331,7 @@ void Camera_UpdateDistortion(Camera* camera) { f32 speedFactor; f32 depthPhaseStep; f32 screenPlanePhaseStep; - s32 pad[5]; + UNUSED s32 pad[5]; f32 xScale; f32 yScale; f32 zScale; @@ -7993,7 +7993,7 @@ s16 Camera_GetCamDirYaw(Camera* camera) { return camDir.y; } -s32 Camera_AddQuake(Camera* camera, s32 arg1, s16 y, s32 countdown) { +s32 Camera_AddQuake(Camera* camera, UNUSED s32 arg1, s16 y, s32 countdown) { s16 quakeIdx; quakeIdx = Quake_Add(camera, 3); @@ -8007,7 +8007,7 @@ s32 Camera_AddQuake(Camera* camera, s32 arg1, s16 y, s32 countdown) { } s32 Camera_SetParam(Camera* camera, s32 param, void* value) { - s32 pad[3]; + UNUSED s32 pad[3]; if (value != NULL) { switch (param) { @@ -8099,7 +8099,7 @@ s16 func_8005AD1C(Camera* camera, s16 arg1) { * A bgCamIndex of -1 uses the default door camera setting (CAM_SET_DOORC) * Otherwise, change the door camera setting by reading the bgCam indexed at bgCamIndex */ -s32 Camera_ChangeDoorCam(Camera* camera, Actor* doorActor, s16 bgCamIndex, f32 arg3, s16 timer1, s16 timer2, +s32 Camera_ChangeDoorCam(Camera* camera, Actor* doorActor, s16 bgCamIndex, UNUSED f32 arg3, s16 timer1, s16 timer2, s16 timer3) { DoorParams* doorParams = &camera->paramData.doorParams; @@ -8139,7 +8139,7 @@ s32 Camera_ChangeDoorCam(Camera* camera, Actor* doorActor, s16 bgCamIndex, f32 a } s32 Camera_Copy(Camera* dstCamera, Camera* srcCamera) { - s32 pad; + UNUSED s32 pad; dstCamera->posOffset.x = 0.0f; dstCamera->posOffset.y = 0.0f; @@ -8176,7 +8176,7 @@ Vec3f* Camera_GetSkyboxOffset(Vec3f* dst, Camera* camera) { } void Camera_SetCameraData(Camera* camera, s16 setDataFlags, void* data0, void* data1, s16 data2, s16 data3, - UNK_TYPE arg6) { + UNUSED UNK_TYPE arg6) { if (setDataFlags & 0x1) { camera->data0 = data0; } diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index dc889c79423..b75f4efb3f8 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -100,7 +100,7 @@ void Collider_DrawPoly(GraphicsContext* gfxCtx, Vec3f* vA, Vec3f* vB, Vec3f* vC, CLOSE_DISPS(gfxCtx, "../z_collision_check.c", 757); } -s32 Collider_InitBase(PlayState* play, Collider* collider) { +s32 Collider_InitBase(UNUSED PlayState* play, Collider* collider) { static Collider init = { NULL, NULL, NULL, NULL, AT_NONE, AC_NONE, OC1_NONE, OC2_NONE, COLTYPE_HIT3, COLSHAPE_MAX, }; @@ -109,14 +109,14 @@ s32 Collider_InitBase(PlayState* play, Collider* collider) { return true; } -s32 Collider_DestroyBase(PlayState* play, Collider* collider) { +s32 Collider_DestroyBase(UNUSED PlayState* play, UNUSED Collider* collider) { return true; } /** * Uses default OC2_TYPE_1 and COLTYPE_HIT0 */ -s32 Collider_SetBaseToActor(PlayState* play, Collider* collider, ColliderInitToActor* src) { +s32 Collider_SetBaseToActor(UNUSED PlayState* play, Collider* collider, ColliderInitToActor* src) { collider->actor = src->actor; collider->atFlags = src->atFlags; collider->acFlags = src->acFlags; @@ -129,7 +129,7 @@ s32 Collider_SetBaseToActor(PlayState* play, Collider* collider, ColliderInitToA /** * Uses default OC2_TYPE_1 */ -s32 Collider_SetBaseType1(PlayState* play, Collider* collider, Actor* actor, ColliderInitType1* src) { +s32 Collider_SetBaseType1(UNUSED PlayState* play, Collider* collider, Actor* actor, ColliderInitType1* src) { collider->actor = actor; collider->colType = src->colType; collider->atFlags = src->atFlags; @@ -140,7 +140,7 @@ s32 Collider_SetBaseType1(PlayState* play, Collider* collider, Actor* actor, Col return true; } -s32 Collider_SetBase(PlayState* play, Collider* collider, Actor* actor, ColliderInit* src) { +s32 Collider_SetBase(UNUSED PlayState* play, Collider* collider, Actor* actor, ColliderInit* src) { collider->actor = actor; collider->colType = src->colType; collider->atFlags = src->atFlags; @@ -151,55 +151,55 @@ s32 Collider_SetBase(PlayState* play, Collider* collider, Actor* actor, Collider return true; } -void Collider_ResetATBase(PlayState* play, Collider* collider) { +void Collider_ResetATBase(UNUSED PlayState* play, Collider* collider) { collider->at = NULL; collider->atFlags &= ~(AT_HIT | AT_BOUNCED); } -void Collider_ResetACBase(PlayState* play, Collider* collider) { +void Collider_ResetACBase(UNUSED PlayState* play, Collider* collider) { collider->ac = NULL; collider->acFlags &= ~(AC_HIT | AC_BOUNCED); } -void Collider_ResetOCBase(PlayState* play, Collider* collider) { +void Collider_ResetOCBase(UNUSED PlayState* play, Collider* collider) { collider->oc = NULL; collider->ocFlags1 &= ~OC1_HIT; collider->ocFlags2 &= ~OC2_HIT_PLAYER; } -s32 Collider_InitTouch(PlayState* play, ColliderTouch* touch) { +s32 Collider_InitTouch(UNUSED PlayState* play, ColliderTouch* touch) { static ColliderTouch init = { 0x00000000, 0, 0 }; *touch = init; return true; } -s32 Collider_DestroyTouch(PlayState* play, ColliderTouch* touch) { +s32 Collider_DestroyTouch(UNUSED PlayState* play, UNUSED ColliderTouch* touch) { return true; } -s32 Collider_SetTouch(PlayState* play, ColliderTouch* dest, ColliderTouch* src) { +s32 Collider_SetTouch(UNUSED PlayState* play, ColliderTouch* dest, ColliderTouch* src) { dest->dmgFlags = src->dmgFlags; dest->effect = src->effect; dest->damage = src->damage; return true; } -void Collider_ResetATInfo_Unk(PlayState* play, ColliderInfo* info) { +void Collider_ResetATInfo_Unk(UNUSED PlayState* play, UNUSED ColliderInfo* info) { } -s32 Collider_InitBump(PlayState* play, ColliderBump* bump) { +s32 Collider_InitBump(UNUSED PlayState* play, ColliderBump* bump) { static ColliderBump init = { 0xFFCFFFFF, 0, 0, { 0, 0, 0 } }; *bump = init; return true; } -s32 Collider_DestroyBump(PlayState* play, ColliderBump* bump) { +s32 Collider_DestroyBump(UNUSED PlayState* play, UNUSED ColliderBump* bump) { return true; } -s32 Collider_SetBump(PlayState* play, ColliderBump* bump, ColliderBumpInit* init) { +s32 Collider_SetBump(UNUSED PlayState* play, ColliderBump* bump, ColliderBumpInit* init) { bump->dmgFlags = init->dmgFlags; bump->effect = init->effect; bump->defense = init->defense; @@ -245,7 +245,7 @@ void Collider_ResetATInfo(PlayState* play, ColliderInfo* info) { Collider_ResetATInfo_Unk(play, info); } -void Collider_ResetACInfo(PlayState* play, ColliderInfo* info) { +void Collider_ResetACInfo(UNUSED PlayState* play, ColliderInfo* info) { info->bumper.hitPos.x = info->bumper.hitPos.y = info->bumper.hitPos.z = 0; info->bumperFlags &= ~BUMP_HIT; info->bumperFlags &= ~BUMP_DRAW_HITMARK; @@ -253,11 +253,11 @@ void Collider_ResetACInfo(PlayState* play, ColliderInfo* info) { info->acHitInfo = NULL; } -void Collider_ResetOCInfo(PlayState* play, ColliderInfo* info) { +void Collider_ResetOCInfo(UNUSED PlayState* play, ColliderInfo* info) { info->ocElemFlags &= ~OCELEM_HIT; } -s32 Collider_InitJntSphElementDim(PlayState* play, ColliderJntSphElementDim* dim) { +s32 Collider_InitJntSphElementDim(UNUSED PlayState* play, ColliderJntSphElementDim* dim) { static ColliderJntSphElementDim init = { { { 0, 0, 0 }, 0 }, { { 0, 0, 0 }, 0 }, @@ -268,11 +268,11 @@ s32 Collider_InitJntSphElementDim(PlayState* play, ColliderJntSphElementDim* dim return true; } -s32 Collider_DestroyJntSphElementDim(PlayState* play, ColliderJntSphElementDim* element) { +s32 Collider_DestroyJntSphElementDim(UNUSED PlayState* play, UNUSED ColliderJntSphElementDim* element) { return true; } -s32 Collider_SetJntSphElementDim(PlayState* play, ColliderJntSphElementDim* dest, ColliderJntSphElementDimInit* src) { +s32 Collider_SetJntSphElementDim(UNUSED PlayState* play, ColliderJntSphElementDim* dest, ColliderJntSphElementDimInit* src) { dest->limb = src->limb; dest->modelSphere = src->modelSphere; dest->scale = src->scale * 0.01f; @@ -505,18 +505,18 @@ s32 Collider_ResetJntSphOC(PlayState* play, Collider* collider) { return true; } -s32 Collider_InitCylinderDim(PlayState* play, Cylinder16* dim) { +s32 Collider_InitCylinderDim(UNUSED PlayState* play, Cylinder16* dim) { Cylinder16 init = { 0, 0, 0, { 0, 0, 0 } }; *dim = init; return true; } -s32 Collider_DestroyCylinderDim(PlayState* play, Cylinder16* dim) { +s32 Collider_DestroyCylinderDim(UNUSED PlayState* play, UNUSED Cylinder16* dim) { return true; } -s32 Collider_SetCylinderDim(PlayState* play, Cylinder16* dest, Cylinder16* src) { +s32 Collider_SetCylinderDim(UNUSED PlayState* play, Cylinder16* dest, Cylinder16* src) { *dest = *src; return true; } @@ -606,7 +606,7 @@ s32 Collider_ResetCylinderOC(PlayState* play, Collider* collider) { return true; } -s32 Collider_InitTrisElementDim(PlayState* play, TriNorm* dim) { +s32 Collider_InitTrisElementDim(UNUSED PlayState* play, TriNorm* dim) { static TriNorm init = { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } }, { { 0.0f, 0.0f, 0.0f }, 0.0f }, @@ -616,11 +616,11 @@ s32 Collider_InitTrisElementDim(PlayState* play, TriNorm* dim) { return true; } -s32 Collider_DestroyTrisElementDim(PlayState* play, TriNorm* dim) { +s32 Collider_DestroyTrisElementDim(UNUSED PlayState* play, UNUSED TriNorm* dim) { return true; } -s32 Collider_SetTrisElementDim(PlayState* play, TriNorm* dest, ColliderTrisElementDimInit* src) { +s32 Collider_SetTrisElementDim(UNUSED PlayState* play, TriNorm* dest, ColliderTrisElementDimInit* src) { Vec3f* destVtx; Vec3f* srcVtx; f32 nx; @@ -837,7 +837,7 @@ s32 Collider_ResetTrisOC(PlayState* play, Collider* collider) { return true; } -s32 Collider_InitQuadDim(PlayState* play, ColliderQuadDim* dim) { +s32 Collider_InitQuadDim(UNUSED PlayState* play, ColliderQuadDim* dim) { static ColliderQuadDim init = { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } }, { 0, 0, 0 }, @@ -849,11 +849,11 @@ s32 Collider_InitQuadDim(PlayState* play, ColliderQuadDim* dim) { return true; } -s32 Collider_DestroyQuadDim(PlayState* play, ColliderQuadDim* dim) { +s32 Collider_DestroyQuadDim(UNUSED PlayState* play, UNUSED ColliderQuadDim* dim) { return true; } -s32 Collider_ResetQuadACDist(PlayState* play, ColliderQuadDim* dim) { +s32 Collider_ResetQuadACDist(UNUSED PlayState* play, ColliderQuadDim* dim) { dim->acDistSq = 1.0e38f; return true; } @@ -867,7 +867,7 @@ void Collider_SetQuadMidpoints(ColliderQuadDim* dim) { dim->baMid.z = (dim->quad[1].z + dim->quad[0].z) * 0.5f; } -s32 Collider_SetQuadDim(PlayState* play, ColliderQuadDim* dest, ColliderQuadDimInit* src) { +s32 Collider_SetQuadDim(UNUSED PlayState* play, ColliderQuadDim* dest, ColliderQuadDimInit* src) { dest->quad[0] = src->quad[0]; dest->quad[1] = src->quad[1]; dest->quad[2] = src->quad[2]; @@ -980,7 +980,7 @@ s32 Collider_QuadSetNearestAC(PlayState* play, ColliderQuad* quad, Vec3f* hitPos * Initializes an OcLine to default values * OcLines are entirely unused. */ -s32 Collider_InitLine(PlayState* play, OcLine* line) { +s32 Collider_InitLine(UNUSED PlayState* play, OcLine* line) { Vec3f init = { 0.0f, 0.0f, 0.0f }; Math_Vec3f_Copy(&line->line.a, &init); @@ -992,7 +992,7 @@ s32 Collider_InitLine(PlayState* play, OcLine* line) { * Destroys an OcLine * OcLines are entirely unused. */ -s32 Collider_DestroyLine(PlayState* play, OcLine* line) { +s32 Collider_DestroyLine(UNUSED PlayState* play, UNUSED OcLine* line) { return true; } @@ -1000,7 +1000,7 @@ s32 Collider_DestroyLine(PlayState* play, OcLine* line) { * Sets up an OcLine with endpoints a and b. * OcLines are entirely unused. */ -s32 Collider_SetLinePoints(PlayState* play, OcLine* ocLine, Vec3f* a, Vec3f* b) { +s32 Collider_SetLinePoints(UNUSED PlayState* play, OcLine* ocLine, Vec3f* a, Vec3f* b) { Math_Vec3f_Copy(&ocLine->line.a, a); Math_Vec3f_Copy(&ocLine->line.b, b); return true; @@ -1020,7 +1020,7 @@ s32 Collider_SetLine(PlayState* play, OcLine* dest, OcLine* src) { * Resets the OcLine's collision flags. * OcLines are entirely unused. */ -s32 Collider_ResetLineOC(PlayState* play, OcLine* line) { +s32 Collider_ResetLineOC(UNUSED PlayState* play, OcLine* line) { line->ocFlags &= ~OCLINE_HIT; return true; } @@ -1036,13 +1036,13 @@ void CollisionCheck_InitContext(PlayState* play, CollisionCheckContext* colChkCt AREG(23) = true; } -void CollisionCheck_DestroyContext(PlayState* play, CollisionCheckContext* colChkCtx) { +void CollisionCheck_DestroyContext(UNUSED PlayState* play, UNUSED CollisionCheckContext* colChkCtx) { } /** * Clears all collider lists in CollisionCheckContext when not in SAC mode. */ -void CollisionCheck_ClearContext(PlayState* play, CollisionCheckContext* colChkCtx) { +void CollisionCheck_ClearContext(UNUSED PlayState* play, CollisionCheckContext* colChkCtx) { Collider** col; OcLine** line; @@ -1072,14 +1072,14 @@ void CollisionCheck_ClearContext(PlayState* play, CollisionCheckContext* colChkC /** * Enables SAC, an alternate collision check mode that allows direct management of collider lists. Unused. */ -void CollisionCheck_EnableSAC(PlayState* play, CollisionCheckContext* colChkCtx) { +void CollisionCheck_EnableSAC(UNUSED PlayState* play, CollisionCheckContext* colChkCtx) { colChkCtx->sacFlags |= SAC_ENABLE; } /** * Disables SAC, an alternate collision check mode that allows direct management of collider lists. Unused. */ -void CollisionCheck_DisableSAC(PlayState* play, CollisionCheckContext* colChkCtx) { +void CollisionCheck_DisableSAC(UNUSED PlayState* play, CollisionCheckContext* colChkCtx) { colChkCtx->sacFlags &= ~SAC_ENABLE; } @@ -1421,14 +1421,14 @@ s32 CollisionCheck_NoSharedFlags(ColliderInfo* atInfo, ColliderInfo* acInfo) { * Spawns no blood drops. * Used by collider types HIT1, HIT3, HIT5, METAL, NONE, WOOD, HARD, and TREE */ -void CollisionCheck_NoBlood(PlayState* play, Collider* collider, Vec3f* v) { +void CollisionCheck_NoBlood(UNUSED PlayState* play, UNUSED Collider* collider, UNUSED Vec3f* v) { } /** * Spawns blue blood drops. * Used by collider types HIT0 and HIT8. */ -void CollisionCheck_BlueBlood(PlayState* play, Collider* collider, Vec3f* v) { +void CollisionCheck_BlueBlood(PlayState* play, UNUSED Collider* collider, Vec3f* v) { static EffectSparkInit sparkInit; s32 effectIndex; @@ -1481,7 +1481,7 @@ void CollisionCheck_BlueBlood(PlayState* play, Collider* collider, Vec3f* v) { * Spawns green blood drops. * Used by collider types HIT2 and HIT6. No actor has type HIT2. */ -void CollisionCheck_GreenBlood(PlayState* play, Collider* collider, Vec3f* v) { +void CollisionCheck_GreenBlood(PlayState* play, UNUSED Collider* collider, Vec3f* v) { static EffectSparkInit sparkInit; s32 effectIndex; @@ -1534,7 +1534,7 @@ void CollisionCheck_GreenBlood(PlayState* play, Collider* collider, Vec3f* v) { * Spawns a burst of water. * Used by collider type HIT4, which no actor has. */ -void CollisionCheck_WaterBurst(PlayState* play, Collider* collider, Vec3f* pos) { +void CollisionCheck_WaterBurst(PlayState* play, UNUSED Collider* collider, Vec3f* pos) { EffectSsSibuki_SpawnBurst(play, pos); CollisionCheck_SpawnWaterDroplets(play, pos); } @@ -1543,7 +1543,7 @@ void CollisionCheck_WaterBurst(PlayState* play, Collider* collider, Vec3f* pos) * Spawns red blood drops. * Used by collider type HIT7, which no actor has. */ -void CollisionCheck_RedBlood(PlayState* play, Collider* collider, Vec3f* v) { +void CollisionCheck_RedBlood(PlayState* play, UNUSED Collider* collider, Vec3f* v) { CollisionCheck_SpawnRedBlood(play, v); } @@ -1551,7 +1551,7 @@ void CollisionCheck_RedBlood(PlayState* play, Collider* collider, Vec3f* v) { * Spawns red blood drops. * Unused. */ -void CollisionCheck_RedBloodUnused(PlayState* play, Collider* collider, Vec3f* v) { +void CollisionCheck_RedBloodUnused(PlayState* play, UNUSED Collider* collider, Vec3f* v) { CollisionCheck_SpawnRedBlood(play, v); } @@ -1685,8 +1685,8 @@ void CollisionCheck_SetBounce(Collider* at, Collider* ac) { /** * Performs the AC collision between the AT element and AC element that collided. */ -s32 CollisionCheck_SetATvsAC(PlayState* play, Collider* at, ColliderInfo* atInfo, Vec3f* atPos, Collider* ac, - ColliderInfo* acInfo, Vec3f* acPos, Vec3f* hitPos) { +s32 CollisionCheck_SetATvsAC(PlayState* play, Collider* at, ColliderInfo* atInfo, UNUSED Vec3f* atPos, Collider* ac, + ColliderInfo* acInfo, UNUSED Vec3f* acPos, Vec3f* hitPos) { if (ac->acFlags & AC_HARD && at->actor != NULL && ac->actor != NULL) { CollisionCheck_SetBounce(at, ac); } @@ -1724,7 +1724,7 @@ s32 CollisionCheck_SetATvsAC(PlayState* play, Collider* at, ColliderInfo* atInfo /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_JntSphVsJntSph(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, +void CollisionCheck_AC_JntSphVsJntSph(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { ColliderJntSph* at = (ColliderJntSph*)colAT; ColliderJntSphElement* atItem; @@ -1780,7 +1780,7 @@ void CollisionCheck_AC_JntSphVsJntSph(PlayState* play, CollisionCheckContext* co /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_JntSphVsCyl(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, +void CollisionCheck_AC_JntSphVsCyl(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { ColliderJntSph* at = (ColliderJntSph*)colAT; ColliderJntSphElement* atItem; @@ -1833,7 +1833,7 @@ void CollisionCheck_AC_JntSphVsCyl(PlayState* play, CollisionCheckContext* colCh /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_CylVsJntSph(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, +void CollisionCheck_AC_CylVsJntSph(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { ColliderCylinder* at = (ColliderCylinder*)colAT; ColliderJntSph* ac = (ColliderJntSph*)colAC; @@ -1888,7 +1888,7 @@ void CollisionCheck_AC_CylVsJntSph(PlayState* play, CollisionCheckContext* colCh /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_JntSphVsTris(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, +void CollisionCheck_AC_JntSphVsTris(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { ColliderJntSph* at = (ColliderJntSph*)colAT; ColliderJntSphElement* atSph; @@ -1930,7 +1930,7 @@ void CollisionCheck_AC_JntSphVsTris(PlayState* play, CollisionCheckContext* colC /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_TrisVsJntSph(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, +void CollisionCheck_AC_TrisVsJntSph(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { ColliderTris* at = (ColliderTris*)colAT; ColliderTrisElement* atItem; @@ -1972,7 +1972,7 @@ void CollisionCheck_AC_TrisVsJntSph(PlayState* play, CollisionCheckContext* colC /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_JntSphVsQuad(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, +void CollisionCheck_AC_JntSphVsQuad(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { static TriNorm tri1; static TriNorm tri2; @@ -2015,7 +2015,7 @@ void CollisionCheck_AC_JntSphVsQuad(PlayState* play, CollisionCheckContext* colC /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_QuadVsJntSph(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, +void CollisionCheck_AC_QuadVsJntSph(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { static TriNorm tri1; static TriNorm tri2; @@ -2067,7 +2067,7 @@ void CollisionCheck_AC_QuadVsJntSph(PlayState* play, CollisionCheckContext* colC /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_CylVsCyl(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_CylVsCyl(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { ColliderCylinder* at = (ColliderCylinder*)colAT; ColliderCylinder* ac = (ColliderCylinder*)colAC; f32 deadSpace; @@ -2107,7 +2107,7 @@ void CollisionCheck_AC_CylVsCyl(PlayState* play, CollisionCheckContext* colChkCt /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_CylVsTris(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_CylVsTris(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { ColliderCylinder* at = (ColliderCylinder*)colAT; ColliderTris* ac = (ColliderTris*)colAC; ColliderTrisElement* acElem; @@ -2143,7 +2143,7 @@ void CollisionCheck_AC_CylVsTris(PlayState* play, CollisionCheckContext* colChkC /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_TrisVsCyl(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_TrisVsCyl(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { static Vec3f hitPos; ColliderTris* at = (ColliderTris*)colAT; ColliderTrisElement* atItem; @@ -2178,7 +2178,7 @@ void CollisionCheck_AC_TrisVsCyl(PlayState* play, CollisionCheckContext* colChkC /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_CylVsQuad(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_CylVsQuad(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { static TriNorm tri1; static TriNorm tri2; static Vec3f hitPos; @@ -2222,7 +2222,7 @@ static s8 sBssDummy1; /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_QuadVsCyl(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_QuadVsCyl(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { static TriNorm tri1; static TriNorm tri2; static Vec3f hitPos; @@ -2274,7 +2274,7 @@ static s8 sBssDummy6; /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_TrisVsTris(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_TrisVsTris(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { static Vec3f hitPos; ColliderTris* at = (ColliderTris*)colAT; ColliderTrisElement* atItem; @@ -2320,7 +2320,7 @@ static s8 sBssDummy10; /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_TrisVsQuad(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_TrisVsQuad(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { static Vec3f hitPos; static TriNorm tri1; static TriNorm tri2; @@ -2362,7 +2362,7 @@ void CollisionCheck_AC_TrisVsQuad(PlayState* play, CollisionCheckContext* colChk /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_QuadVsTris(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_QuadVsTris(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { static Vec3f hitPos; static TriNorm tri1; static TriNorm tri2; @@ -2410,7 +2410,7 @@ void CollisionCheck_AC_QuadVsTris(PlayState* play, CollisionCheckContext* colChk /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_QuadVsQuad(PlayState* play, CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_QuadVsQuad(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { static TriNorm acTris[2]; static Vec3f hitPos; static TriNorm atTris[2]; @@ -2464,7 +2464,7 @@ void CollisionCheck_AC_QuadVsQuad(PlayState* play, CollisionCheckContext* colChk /** * Sets a ColliderJntSph's hit effects */ -void CollisionCheck_SetJntSphHitFX(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider) { +void CollisionCheck_SetJntSphHitFX(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* collider) { ColliderJntSph* jntSph = (ColliderJntSph*)collider; ColliderJntSphElement* element; Vec3f hitPos; @@ -2484,7 +2484,7 @@ void CollisionCheck_SetJntSphHitFX(PlayState* play, CollisionCheckContext* colCh /** * Sets a ColliderCylinder's hit effects */ -void CollisionCheck_SetCylHitFX(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider) { +void CollisionCheck_SetCylHitFX(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* collider) { ColliderCylinder* cylinder = (ColliderCylinder*)collider; Vec3f hitPos; @@ -2500,7 +2500,7 @@ void CollisionCheck_SetCylHitFX(PlayState* play, CollisionCheckContext* colChkCt /** * Sets a ColliderTris's hit effects */ -void CollisionCheck_SetTrisHitFX(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider) { +void CollisionCheck_SetTrisHitFX(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* collider) { ColliderTris* tris = (ColliderTris*)collider; ColliderTrisElement* element; Vec3f hitPos; @@ -2520,7 +2520,7 @@ void CollisionCheck_SetTrisHitFX(PlayState* play, CollisionCheckContext* colChkC /** * Sets a ColliderQuad's hit effects */ -void CollisionCheck_SetQuadHitFX(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider) { +void CollisionCheck_SetQuadHitFX(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* collider) { ColliderQuad* quad = (ColliderQuad*)collider; Vec3f hitPos; @@ -2636,7 +2636,7 @@ s32 CollisionCheck_GetMassType(u8 mass) { */ void CollisionCheck_SetOCvsOC(Collider* left, ColliderInfo* leftInfo, Vec3f* leftPos, Collider* right, ColliderInfo* rightInfo, Vec3f* rightPos, f32 overlap) { - f32 pad; + UNUSED s32 pad; f32 leftDispRatio; f32 rightDispRatio; f32 xzDist; @@ -2727,7 +2727,7 @@ void CollisionCheck_SetOCvsOC(Collider* left, ColliderInfo* leftInfo, Vec3f* lef /** * OC overlap check for two JntSphs */ -void CollisionCheck_OC_JntSphVsJntSph(PlayState* play, CollisionCheckContext* colChkCtx, Collider* l, Collider* r) { +void CollisionCheck_OC_JntSphVsJntSph(UNUSED PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* l, Collider* r) { ColliderJntSph* left = (ColliderJntSph*)l; ColliderJntSphElement* leftElem; ColliderJntSph* right = (ColliderJntSph*)r; @@ -2760,7 +2760,7 @@ void CollisionCheck_OC_JntSphVsJntSph(PlayState* play, CollisionCheckContext* co /** * OC overlap check for a JntSph and Cylinder */ -void CollisionCheck_OC_JntSphVsCyl(PlayState* play, CollisionCheckContext* colChkCtx, Collider* l, Collider* r) { +void CollisionCheck_OC_JntSphVsCyl(UNUSED PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* l, Collider* r) { ColliderJntSph* left = (ColliderJntSph*)l; ColliderJntSphElement* leftElem; ColliderCylinder* right = (ColliderCylinder*)r; @@ -2796,7 +2796,7 @@ void CollisionCheck_OC_CylVsJntSph(PlayState* play, CollisionCheckContext* colCh /** * OC overlap check for two Cylinders */ -void CollisionCheck_OC_CylVsCyl(PlayState* play, CollisionCheckContext* colChkCtx, Collider* l, Collider* r) { +void CollisionCheck_OC_CylVsCyl(UNUSED PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* l, Collider* r) { ColliderCylinder* left = (ColliderCylinder*)l; ColliderCylinder* right = (ColliderCylinder*)r; f32 deadSpace; @@ -2950,7 +2950,7 @@ void CollisionCheck_SetInfoGetDamageTable(CollisionCheckInfo* info, s32 index, C /** * Apply AC damage effect */ -void CollisionCheck_ApplyDamage(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider, +void CollisionCheck_ApplyDamage(UNUSED PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* collider, ColliderInfo* info) { DamageTable* tbl; f32 damage; @@ -3059,7 +3059,7 @@ void CollisionCheck_Damage(PlayState* play, CollisionCheckContext* colChkCtx) { /** * Checks if the line ab intersects any of the ColliderJntSph's elements */ -s32 CollisionCheck_LineOC_JntSph(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider, Vec3f* a, +s32 CollisionCheck_LineOC_JntSph(UNUSED PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* collider, Vec3f* a, Vec3f* b) { static Linef lineSeg; ColliderJntSph* jntSph = (ColliderJntSph*)collider; @@ -3083,7 +3083,7 @@ s32 CollisionCheck_LineOC_JntSph(PlayState* play, CollisionCheckContext* colChkC /** * Checks if the line segment ab intersects the ColliderCylinder */ -s32 CollisionCheck_LineOC_Cyl(PlayState* play, CollisionCheckContext* colChkCtx, Collider* collider, Vec3f* a, +s32 CollisionCheck_LineOC_Cyl(UNUSED PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* collider, Vec3f* a, Vec3f* b) { static Vec3f intersectA; static Vec3f intersectB; @@ -3470,8 +3470,8 @@ s32 CollisionCheck_CylSideVsLineSeg(f32 radius, f32 height, f32 offset, Vec3f* a f32 actorDotItemXZ; f32 zero = 0.0f; f32 closeDist; - s32 pad1; - s32 pad2; + UNUSED s32 pad1; + UNUSED s32 pad2; actorToItem.x = itemPos->x - actorPos->x; actorToItem.y = itemPos->y - actorPos->y - offset; diff --git a/src/code/z_construct.c b/src/code/z_construct.c index adc90a41094..85306aaced2 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -166,7 +166,7 @@ void func_801109B0(PlayState* play) { void Message_Init(PlayState* play) { MessageContext* msgCtx = &play->msgCtx; - s32 pad; + UNUSED s32 pad; Message_SetTables(); @@ -600,6 +600,6 @@ void func_80111070(void) { VREG(92) = -63; } -void func_80112098(PlayState* play) { +void func_80112098(UNUSED PlayState* play) { func_80111070(); } diff --git a/src/code/z_debug.c b/src/code/z_debug.c index c3d4f8cc8aa..72fe57d6424 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -50,7 +50,7 @@ void func_800636C0(void) { // Called when free movement is active. // 8011D394 to enable camera debugger -void func_8006375C(s32 arg0, s32 arg1, const char* text) { +void func_8006375C(UNUSED s32 arg0, UNUSED s32 arg1, UNUSED const char* text) { } // Copy Camera Debugger Text @@ -186,7 +186,7 @@ void func_80063C04(GfxPrint* printer) { s32 i; s32 page = (gGameInfo->regPage * REG_PER_PAGE) - REG_PER_PAGE; s32 regGroup = (gGameInfo->regGroup * REG_PAGES + gGameInfo->regPage) * REG_PER_PAGE - REG_PER_PAGE; - s32 pad; + UNUSED s32 pad; char name[3]; // set up register name string diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 04fde14899b..bcf81797271 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -34,7 +34,7 @@ u16 D_8011E1C4 = 0; typedef void (*CutsceneStateHandler)(PlayState*, CutsceneContext*); -void func_80064720(PlayState* play, CutsceneContext* csCtx); +void func_80064720(UNUSED PlayState* play, UNUSED CutsceneContext* csCtx); void func_80064760(PlayState* play, CutsceneContext* csCtx); void func_800647C0(PlayState* play, CutsceneContext* csCtx); void func_80068C3C(PlayState* play, CutsceneContext* csCtx); @@ -105,9 +105,9 @@ u8 D_8015FCE4; // only written to, never read void func_80068ECC(PlayState* play, CutsceneContext* csCtx); -void Cutscene_DrawDebugInfo(PlayState* play, Gfx** dlist, CutsceneContext* csCtx) { +void Cutscene_DrawDebugInfo(UNUSED PlayState* play, Gfx** dlist, CutsceneContext* csCtx) { GfxPrint printer; - s32 pad[2]; + UNUSED s32 pad[2]; GfxPrint_Init(&printer); GfxPrint_Open(&printer, *dlist); @@ -125,17 +125,17 @@ void Cutscene_DrawDebugInfo(PlayState* play, Gfx** dlist, CutsceneContext* csCtx GfxPrint_Destroy(&printer); } -void func_8006450C(PlayState* play, CutsceneContext* csCtx) { +void func_8006450C(UNUSED PlayState* play, CutsceneContext* csCtx) { csCtx->state = CS_STATE_IDLE; csCtx->unk_0C = 0.0f; } -void func_80064520(PlayState* play, CutsceneContext* csCtx) { +void func_80064520(UNUSED PlayState* play, CutsceneContext* csCtx) { csCtx->state = CS_STATE_SKIPPABLE_INIT; csCtx->linkAction = NULL; } -void func_80064534(PlayState* play, CutsceneContext* csCtx) { +void func_80064534(UNUSED PlayState* play, CutsceneContext* csCtx) { if (csCtx->state != CS_STATE_UNSKIPPABLE_EXEC) { csCtx->state = CS_STATE_UNSKIPPABLE_INIT; } @@ -180,10 +180,10 @@ void func_800645A0(PlayState* play, CutsceneContext* csCtx) { } } -void func_80064720(PlayState* play, CutsceneContext* csCtx) { +void func_80064720(UNUSED PlayState* play, UNUSED CutsceneContext* csCtx) { } -u32 func_8006472C(PlayState* play, CutsceneContext* csCtx, f32 target) { +u32 func_8006472C(UNUSED PlayState* play, CutsceneContext* csCtx, f32 target) { return Math_StepToF(&csCtx->unk_0C, target, 0.1f); } @@ -435,21 +435,21 @@ void Cutscene_Command_SetLighting(PlayState* play, CutsceneContext* csCtx, CsCmd } // Command 0x56: Play Background Music -void Cutscene_Command_PlayBGM(PlayState* play, CutsceneContext* csCtx, CsCmdMusicChange* cmd) { +void Cutscene_Command_PlayBGM(UNUSED PlayState* play, CutsceneContext* csCtx, CsCmdMusicChange* cmd) { if (csCtx->frames == cmd->startFrame) { func_800F595C(cmd->sequence - 1); } } // Command 0x57: Stop Background Music -void Cutscene_Command_StopBGM(PlayState* play, CutsceneContext* csCtx, CsCmdMusicChange* cmd) { +void Cutscene_Command_StopBGM(UNUSED PlayState* play, CutsceneContext* csCtx, CsCmdMusicChange* cmd) { if (csCtx->frames == cmd->startFrame) { func_800F59E8(cmd->sequence - 1); } } // Command 0x7C: Fade Background Music over duration -void Cutscene_Command_FadeBGM(PlayState* play, CutsceneContext* csCtx, CsCmdMusicFade* cmd) { +void Cutscene_Command_FadeBGM(UNUSED PlayState* play, CutsceneContext* csCtx, CsCmdMusicFade* cmd) { u8 var1; if ((csCtx->frames == cmd->startFrame) && (csCtx->frames < cmd->endFrame)) { @@ -464,14 +464,14 @@ void Cutscene_Command_FadeBGM(PlayState* play, CutsceneContext* csCtx, CsCmdMusi } // Command 9: ? -void Cutscene_Command_09(PlayState* play, CutsceneContext* csCtx, CsCmdUnknown9* cmd) { +void Cutscene_Command_09(UNUSED PlayState* play, CutsceneContext* csCtx, CsCmdUnknown9* cmd) { if (csCtx->frames == cmd->startFrame) { func_800AA000(0.0f, cmd->unk_06, cmd->unk_07, cmd->unk_08); } } // Command 0x8C: Set Time of Day & Environment Time -void func_80065134(PlayState* play, CutsceneContext* csCtx, CsCmdDayTime* cmd) { +void func_80065134(UNUSED PlayState* play, CutsceneContext* csCtx, CsCmdDayTime* cmd) { s16 temp1; s16 temp2; @@ -1405,7 +1405,7 @@ s32 Cutscene_Command_CameraLookAtPoints(PlayState* play, CutsceneContext* csCtx, } // Command 0x7: ? (Related to camera positons) -s32 Cutscene_Command_07(PlayState* play, CutsceneContext* csCtx, u8* cmd, u8 unused) { +s32 Cutscene_Command_07(PlayState* play, CutsceneContext* csCtx, u8* cmd, UNUSED u8 arg3) { CsCmdBase* cmdBase = (CsCmdBase*)cmd; s32 size; Vec3f sp3C; @@ -1448,13 +1448,13 @@ s32 Cutscene_Command_07(PlayState* play, CutsceneContext* csCtx, u8* cmd, u8 unu } // Command 0x8: ? (Related to camera focus points) -s32 Cutscene_Command_08(PlayState* play, CutsceneContext* csCtx, u8* cmd, u8 unused) { +s32 Cutscene_Command_08(PlayState* play, CutsceneContext* csCtx, u8* cmd, UNUSED u8 arg3) { CsCmdBase* cmdBase = (CsCmdBase*)cmd; s32 size; Vec3f sp3C; Vec3f sp30; Camera* subCam; - f32 sp28; + UNUSED f32 sp28; cmd += 8; size = 8; @@ -2031,7 +2031,7 @@ void func_80068ECC(PlayState* play, CutsceneContext* csCtx) { } } -void func_80069048(PlayState* play) { +void func_80069048(UNUSED PlayState* play) { s16 i; D_8015FCCC = 0; @@ -2041,7 +2041,7 @@ void func_80069048(PlayState* play) { D_8015FCE4 = 0; } -void func_8006907C(PlayState* play) { +void func_8006907C(UNUSED PlayState* play) { if (D_8015FCCC != 0) { D_8015FCCC = 0; } diff --git a/src/code/z_draw.c b/src/code/z_draw.c index 0b541ec17e4..efc27276d0c 100644 --- a/src/code/z_draw.c +++ b/src/code/z_draw.c @@ -380,7 +380,7 @@ void GetItem_Draw(PlayState* play, s16 drawId) { // All remaining functions in this file are draw functions referenced in the table and called by the function above void GetItem_DrawMaskOrBombchu(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 556); @@ -392,7 +392,7 @@ void GetItem_DrawMaskOrBombchu(PlayState* play, s16 drawId) { } void GetItem_DrawSoldOut(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 572); @@ -404,7 +404,7 @@ void GetItem_DrawSoldOut(PlayState* play, s16 drawId) { } void GetItem_DrawBlueFire(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 588); @@ -427,7 +427,7 @@ void GetItem_DrawBlueFire(PlayState* play, s16 drawId) { } void GetItem_DrawPoes(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 628); @@ -452,7 +452,7 @@ void GetItem_DrawPoes(PlayState* play, s16 drawId) { } void GetItem_DrawFairy(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 670); @@ -476,7 +476,7 @@ void GetItem_DrawFairy(PlayState* play, s16 drawId) { } void GetItem_DrawMirrorShield(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 712); @@ -496,7 +496,7 @@ void GetItem_DrawMirrorShield(PlayState* play, s16 drawId) { } void GetItem_DrawSkullToken(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 742); @@ -515,7 +515,7 @@ void GetItem_DrawSkullToken(PlayState* play, s16 drawId) { } void GetItem_DrawEggOrMedallion(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 772); @@ -528,7 +528,7 @@ void GetItem_DrawEggOrMedallion(PlayState* play, s16 drawId) { } void GetItem_DrawCompass(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 811); @@ -544,7 +544,7 @@ void GetItem_DrawCompass(PlayState* play, s16 drawId) { } void GetItem_DrawPotion(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 834); @@ -567,7 +567,7 @@ void GetItem_DrawPotion(PlayState* play, s16 drawId) { } void GetItem_DrawGoronSword(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 868); @@ -582,7 +582,7 @@ void GetItem_DrawGoronSword(PlayState* play, s16 drawId) { } void GetItem_DrawDekuNuts(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 890); @@ -597,7 +597,7 @@ void GetItem_DrawDekuNuts(PlayState* play, s16 drawId) { } void GetItem_DrawRecoveryHeart(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 913); @@ -612,7 +612,7 @@ void GetItem_DrawRecoveryHeart(PlayState* play, s16 drawId) { } void GetItem_DrawFish(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 936); @@ -627,7 +627,7 @@ void GetItem_DrawFish(PlayState* play, s16 drawId) { } void GetItem_DrawOpa0(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 959); @@ -639,7 +639,7 @@ void GetItem_DrawOpa0(PlayState* play, s16 drawId) { } void GetItem_DrawOpa0Xlu1(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 975); @@ -655,7 +655,7 @@ void GetItem_DrawOpa0Xlu1(PlayState* play, s16 drawId) { } void GetItem_DrawXlu01(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 998); @@ -668,7 +668,7 @@ void GetItem_DrawXlu01(PlayState* play, s16 drawId) { } void GetItem_DrawOpa10Xlu2(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1015); @@ -685,7 +685,7 @@ void GetItem_DrawOpa10Xlu2(PlayState* play, s16 drawId) { } void GetItem_DrawMagicArrow(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1039); @@ -702,7 +702,7 @@ void GetItem_DrawMagicArrow(PlayState* play, s16 drawId) { } void GetItem_DrawMagicSpell(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1063); @@ -719,7 +719,7 @@ void GetItem_DrawMagicSpell(PlayState* play, s16 drawId) { } void GetItem_DrawOpa1023(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1088); @@ -734,7 +734,7 @@ void GetItem_DrawOpa1023(PlayState* play, s16 drawId) { } void GetItem_DrawOpa10Xlu32(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1108); @@ -752,7 +752,7 @@ void GetItem_DrawOpa10Xlu32(PlayState* play, s16 drawId) { } void GetItem_DrawSmallRupee(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1133); @@ -772,7 +772,7 @@ void GetItem_DrawSmallRupee(PlayState* play, s16 drawId) { } void GetItem_DrawScale(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1162); @@ -790,7 +790,7 @@ void GetItem_DrawScale(PlayState* play, s16 drawId) { } void GetItem_DrawBulletBag(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1188); @@ -809,7 +809,7 @@ void GetItem_DrawBulletBag(PlayState* play, s16 drawId) { } void GetItem_DrawWallet(PlayState* play, s16 drawId) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1214); diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index 89cbe5d7e6c..4b1d22f5b68 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -186,7 +186,7 @@ void EffectBlure_Init2(void* thisx, void* initParamsx) { } } -void EffectBlure_Destroy(void* thisx) { +void EffectBlure_Destroy(UNUSED void* thisx) { } s32 EffectBlure_Update(void* thisx) { @@ -379,7 +379,7 @@ void EffectBlure_GetComputedValues(EffectBlure* this, s32 index, f32 ratio, Vec3 } } -void EffectBlure_SetupSmooth(EffectBlure* this, GraphicsContext* gfxCtx) { +void EffectBlure_SetupSmooth(UNUSED EffectBlure* this, GraphicsContext* gfxCtx) { OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 809); POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, SETUPDL_38); @@ -608,8 +608,8 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem f32 temp_f22 = temp_f2 - 2.0f * temp_f0 + temp_f28; // t^3 - 2t^2 + t f32 temp_f24 = 2.0f * temp_f2 - temp_f0 * 3.0f + 1.0f; // 2t^3 - 3t^2 + 1 f32 temp_f26 = temp_f0 * 3.0f - 2.0f * temp_f2; // 3t^2 - 2t^3 - s32 pad1; - s32 pad2; + UNUSED s32 pad1; + UNUSED s32 pad2; // p = (2t^3 - 3t^2 + 1)p0 + (3t^2 - 2t^3)p1 + (t^3 - 2t^2 + t)m0 + (t^3 - t^2)m1 spE0.x = (temp_f24 * sp1CC.x) + (temp_f26 * sp18C.x) + (temp_f22 * sp1B4.x) + (temp_f20 * sp174.x); @@ -711,7 +711,7 @@ void EffectBlure_DrawSmooth(EffectBlure* this2, GraphicsContext* gfxCtx) { CLOSE_DISPS(gfxCtx, "../z_eff_blure.c", 1263); } -void EffectBlure_SetupSimple(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vtx) { +void EffectBlure_SetupSimple(GraphicsContext* gfxCtx, UNUSED EffectBlure* this, UNUSED Vtx* vtx) { OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 1280); POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, SETUPDL_38); @@ -719,7 +719,7 @@ void EffectBlure_SetupSimple(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vt CLOSE_DISPS(gfxCtx, "../z_eff_blure.c", 1285); } -void EffectBlure_SetupSimpleAlt(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vtx) { +void EffectBlure_SetupSimpleAlt(GraphicsContext* gfxCtx, EffectBlure* this, UNUSED Vtx* vtx) { OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 1294); gDPPipeSync(POLY_XLU_DISP++); diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c index ad147c4288e..e184c0955b4 100644 --- a/src/code/z_eff_spark.c +++ b/src/code/z_eff_spark.c @@ -93,7 +93,7 @@ void EffectSpark_Init(void* thisx, void* initParamsx) { } } -void EffectSpark_Destroy(void* thisx) { +void EffectSpark_Destroy(UNUSED void* thisx) { } // original name: "EffectSparkInfo_proc" diff --git a/src/code/z_eff_ss_dead.c b/src/code/z_eff_ss_dead.c index 444712d6b76..301a75dc9b5 100644 --- a/src/code/z_eff_ss_dead.c +++ b/src/code/z_eff_ss_dead.c @@ -51,7 +51,7 @@ void func_80026400(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3) { } void func_80026608(PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_eff_ss_dead.c", 159); @@ -110,7 +110,7 @@ void func_80026860(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3) { } void func_80026A6C(PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_eff_ss_dead.c", 217); diff --git a/src/code/z_effect.c b/src/code/z_effect.c index a72fbc4947a..98397d77fcd 100644 --- a/src/code/z_effect.c +++ b/src/code/z_effect.c @@ -209,7 +209,7 @@ void Effect_UpdateAll(PlayState* play) { } } -void Effect_Delete(PlayState* play, s32 index) { +void Effect_Delete(UNUSED PlayState* play, s32 index) { if (index == TOTAL_EFFECT_COUNT) { return; } @@ -235,7 +235,7 @@ void Effect_Delete(PlayState* play, s32 index) { } } -void Effect_DeleteAll(PlayState* play) { +void Effect_DeleteAll(UNUSED PlayState* play) { s32 i; osSyncPrintf("エフェクト総て解放\n"); // "All effect release" diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index 004f4af02ed..433a0c26c19 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -31,7 +31,7 @@ void EffectSs_InitInfo(PlayState* play, s32 tableSize) { } } -void EffectSs_ClearAll(PlayState* play) { +void EffectSs_ClearAll(UNUSED PlayState* play) { u32 i; EffectSs* effectSs; EffectSsOverlay* overlay; diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index 37ee824502a..55ff0e25bad 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -47,7 +47,7 @@ void EffectSs_DrawGEffect(PlayState* play, EffectSs* this, void* texture) { MtxF mfScale; MtxF mfResult; MtxF mfTrans11DA0; - s32 pad1; + UNUSED s32 pad1; Mtx* mtx; void* object = play->objectCtx.status[this->rgObjBankIdx].segment; @@ -653,8 +653,8 @@ void EffectSsSibuki_Spawn(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* a void EffectSsSibuki_SpawnBurst(PlayState* play, Vec3f* pos) { s16 i; - Vec3f unusedZeroVec1 = { 0.0f, 0.0f, 0.0f }; - Vec3f unusedZeroVec2 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f zeroVec1 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f zeroVec2 = { 0.0f, 0.0f, 0.0f }; Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; s16 randDirection = Rand_ZeroOne() * 1.99f; diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 190619c12fa..8d36cf39b57 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -12,14 +12,14 @@ void EnAObj_Draw(Actor* thisx, PlayState* play); void EnAObj_WaitFinishedTalking(EnAObj* this, PlayState* play); void EnAObj_WaitTalk(EnAObj* this, PlayState* play); -void EnAObj_BlockRot(EnAObj* this, PlayState* play); -void EnAObj_BoulderFragment(EnAObj* this, PlayState* play); -void EnAObj_Block(EnAObj* this, PlayState* play); +void EnAObj_BlockRot(EnAObj* this, UNUSED PlayState* play); +void EnAObj_BoulderFragment(EnAObj* this, UNUSED PlayState* play); +void EnAObj_Block(EnAObj* this, UNUSED PlayState* play); -void EnAObj_SetupWaitTalk(EnAObj* this, s16 type); -void EnAObj_SetupBlockRot(EnAObj* this, s16 type); -void EnAObj_SetupBoulderFragment(EnAObj* this, s16 type); -void EnAObj_SetupBlock(EnAObj* this, s16 type); +void EnAObj_SetupWaitTalk(EnAObj* this, UNUSED s16 type); +void EnAObj_SetupBlockRot(EnAObj* this, UNUSED s16 type); +void EnAObj_SetupBoulderFragment(EnAObj* this, UNUSED s16 type); +void EnAObj_SetupBlock(EnAObj* this, UNUSED s16 type); const ActorInit En_A_Obj_InitVars = { ACTOR_EN_A_OBJ, @@ -77,7 +77,7 @@ void EnAObj_SetupAction(EnAObj* this, EnAObjActionFunc actionFunc) { void EnAObj_Init(Actor* thisx, PlayState* play) { CollisionHeader* colHeader = NULL; - s32 pad; + UNUSED s32 pad; EnAObj* this = (EnAObj*)thisx; f32 shadowScale = 6.0f; @@ -194,7 +194,7 @@ void EnAObj_WaitFinishedTalking(EnAObj* this, PlayState* play) { } } -void EnAObj_SetupWaitTalk(EnAObj* this, s16 type) { +void EnAObj_SetupWaitTalk(EnAObj* this, UNUSED s16 type) { EnAObj_SetupAction(this, EnAObj_WaitTalk); } @@ -214,7 +214,7 @@ void EnAObj_WaitTalk(EnAObj* this, PlayState* play) { } } -void EnAObj_SetupBlockRot(EnAObj* this, s16 type) { +void EnAObj_SetupBlockRot(EnAObj* this, UNUSED s16 type) { this->rotateState = 0; this->rotateWaitTimer = 10; this->dyna.actor.world.rot.y = 0; @@ -222,7 +222,7 @@ void EnAObj_SetupBlockRot(EnAObj* this, s16 type) { EnAObj_SetupAction(this, EnAObj_BlockRot); } -void EnAObj_BlockRot(EnAObj* this, PlayState* play) { +void EnAObj_BlockRot(EnAObj* this, UNUSED PlayState* play) { if (this->rotateState == 0) { if (this->dyna.interactFlags != 0) { this->rotateState++; @@ -261,11 +261,11 @@ void EnAObj_BlockRot(EnAObj* this, PlayState* play) { } } -void EnAObj_SetupBoulderFragment(EnAObj* this, s16 type) { +void EnAObj_SetupBoulderFragment(EnAObj* this, UNUSED s16 type) { EnAObj_SetupAction(this, EnAObj_BoulderFragment); } -void EnAObj_BoulderFragment(EnAObj* this, PlayState* play) { +void EnAObj_BoulderFragment(EnAObj* this, UNUSED PlayState* play) { Math_SmoothStepToF(&this->dyna.actor.speedXZ, 1.0f, 1.0f, 0.5f, 0.0f); this->dyna.actor.shape.rot.x += this->dyna.actor.world.rot.x >> 1; this->dyna.actor.shape.rot.z += this->dyna.actor.world.rot.z >> 1; @@ -288,13 +288,13 @@ void EnAObj_BoulderFragment(EnAObj* this, PlayState* play) { } } -void EnAObj_SetupBlock(EnAObj* this, s16 type) { +void EnAObj_SetupBlock(EnAObj* this, UNUSED s16 type) { this->dyna.actor.uncullZoneDownward = 1200.0f; this->dyna.actor.uncullZoneScale = 720.0f; EnAObj_SetupAction(this, EnAObj_Block); } -void EnAObj_Block(EnAObj* this, PlayState* play) { +void EnAObj_Block(EnAObj* this, UNUSED PlayState* play) { this->dyna.actor.speedXZ += this->dyna.unk_150; this->dyna.actor.world.rot.y = this->dyna.unk_158; this->dyna.actor.speedXZ = CLAMP(this->dyna.actor.speedXZ, -2.5f, 2.5f); diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index e4d09def76b..017ae63162a 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -10,7 +10,7 @@ void EnItem00_Destroy(Actor* thisx, PlayState* play); void EnItem00_Update(Actor* thisx, PlayState* play); void EnItem00_Draw(Actor* thisx, PlayState* play); -void func_8001DFC8(EnItem00* this, PlayState* play); +void func_8001DFC8(EnItem00* this, UNUSED PlayState* play); void func_8001E1C8(EnItem00* this, PlayState* play); void func_8001E304(EnItem00* this, PlayState* play); void EnItem00_Collected(EnItem00* this, PlayState* play); @@ -138,12 +138,12 @@ void EnItem00_SetupAction(EnItem00* this, EnItem00ActionFunc actionFunc) { void EnItem00_Init(Actor* thisx, PlayState* play) { EnItem00* this = (EnItem00*)thisx; - s32 pad; + UNUSED s32 pad; f32 yOffset = 980.0f; f32 shadowScale = 6.0f; s32 getItemId = GI_NONE; s16 spawnParam8000 = this->actor.params & 0x8000; - s32 pad1; + UNUSED s32 pad1; this->collectibleFlag = (this->actor.params & 0x3F00) >> 8; @@ -364,7 +364,7 @@ void EnItem00_Destroy(Actor* thisx, PlayState* play) { Collider_DestroyCylinder(play, &this->collider); } -void func_8001DFC8(EnItem00* this, PlayState* play) { +void func_8001DFC8(EnItem00* this, UNUSED PlayState* play) { if ((this->actor.params <= ITEM00_RUPEE_RED) || ((this->actor.params == ITEM00_HEART) && (this->despawnTimer < 0)) || (this->actor.params == ITEM00_HEART_PIECE)) { @@ -440,7 +440,7 @@ void func_8001E1C8(EnItem00* this, PlayState* play) { } void func_8001E304(EnItem00* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f pos; s32 rotOffset; @@ -537,7 +537,7 @@ void EnItem00_Update(Actor* thisx, PlayState* play) { s16 i; u32* temp; EnItem00* this = (EnItem00*)thisx; - s32 pad; + UNUSED s32 pad; if (this->despawnTimer > 0) { this->despawnTimer--; @@ -817,7 +817,7 @@ void EnItem00_Draw(Actor* thisx, PlayState* play) { * Draw Function used for Rupee types of En_Item00. */ void EnItem00_DrawRupee(EnItem00* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 texIndex; OPEN_DISPS(play->state.gfxCtx, "../z_en_item00.c", 1546); @@ -872,7 +872,7 @@ void EnItem00_DrawCollectible(EnItem00* this, PlayState* play) { * Draw Function used for the Heart Container type of En_Item00. */ void EnItem00_DrawHeartContainer(EnItem00* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_item00.c", 1623); @@ -895,7 +895,7 @@ void EnItem00_DrawHeartContainer(EnItem00* this, PlayState* play) { * Draw Function used for the Piece of Heart type of En_Item00. */ void EnItem00_DrawHeartPiece(EnItem00* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_item00.c", 1658); @@ -945,7 +945,7 @@ s16 func_8001F404(s16 dropId) { // External functions used by other actors to drop collectibles, which usually results in spawning an En_Item00 actor. EnItem00* Item_DropCollectible(PlayState* play, Vec3f* spawnPos, s16 params) { - s32 pad[2]; + UNUSED s32 pad[2]; EnItem00* spawnedActor = NULL; s16 param4000 = params & 0x4000; s16 param8000 = params & 0x8000; @@ -989,7 +989,7 @@ EnItem00* Item_DropCollectible(PlayState* play, Vec3f* spawnPos, s16 params) { EnItem00* Item_DropCollectible2(PlayState* play, Vec3f* spawnPos, s16 params) { EnItem00* spawnedActor = NULL; - s32 pad; + UNUSED s32 pad; s16 param4000 = params & 0x4000; s16 param8000 = params & 0x8000; s16 param3F00 = params & 0x3F00; @@ -1021,7 +1021,7 @@ EnItem00* Item_DropCollectible2(PlayState* play, Vec3f* spawnPos, s16 params) { } void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnPos, s16 params) { - s32 pad; + UNUSED s32 pad; EnItem00* spawnedActor; s16 dropQuantity; s16 param8000; diff --git a/src/code/z_fbdemo.c b/src/code/z_fbdemo.c index c15255fc2d7..26cf9042a0d 100644 --- a/src/code/z_fbdemo.c +++ b/src/code/z_fbdemo.c @@ -27,8 +27,8 @@ Gfx D_8012B000[] = { void TransitionUnk_InitGraphics(TransitionUnk* this) { s32 row2; - s32 pad2; - s32 pad3; + UNUSED s32 pad2; + UNUSED s32 pad3; Vtx_t* vtx2; s32 frame; s32 rowTex; @@ -222,9 +222,9 @@ void TransitionUnk_Update(TransitionUnk* this) { } } -void func_800B23E8(TransitionUnk* this) { +void func_800B23E8(UNUSED TransitionUnk* this) { } -s32 func_800B23F0(TransitionUnk* this) { +s32 func_800B23F0(UNUSED TransitionUnk* this) { return 0; } diff --git a/src/code/z_fbdemo_circle.c b/src/code/z_fbdemo_circle.c index 4057d71d189..c4b103e189c 100644 --- a/src/code/z_fbdemo_circle.c +++ b/src/code/z_fbdemo_circle.c @@ -96,13 +96,12 @@ void* TransitionCircle_Init(void* thisx) { return this; } -void TransitionCircle_Destroy(void* thisx) { +void TransitionCircle_Destroy(UNUSED void* thisx) { } void TransitionCircle_Update(void* thisx, s32 updateRate) { TransitionCircle* this = (TransitionCircle*)thisx; - s32 temp_t2; - s32 temp_t3; + UNUSED s32 pad[2]; if (this->direction != 0) { if (this->texY == 0) { diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c index 5d633d96db4..c3bc62b8d6c 100644 --- a/src/code/z_fbdemo_fade.c +++ b/src/code/z_fbdemo_fade.c @@ -36,7 +36,7 @@ void* TransitionFade_Init(void* thisx) { return this; } -void TransitionFade_Destroy(void* thisx) { +void TransitionFade_Destroy(UNUSED void* thisx) { } void TransitionFade_Update(void* thisx, s32 updateRate) { diff --git a/src/code/z_fbdemo_triforce.c b/src/code/z_fbdemo_triforce.c index fe7068f26bc..2fcd73be7c8 100644 --- a/src/code/z_fbdemo_triforce.c +++ b/src/code/z_fbdemo_triforce.c @@ -26,12 +26,12 @@ void* TransitionTriforce_Init(void* thisx) { return this; } -void TransitionTriforce_Destroy(void* thisx) { +void TransitionTriforce_Destroy(UNUSED void* thisx) { } void TransitionTriforce_Update(void* thisx, s32 updateRate) { TransitionTriforce* this = (TransitionTriforce*)thisx; - f32 temp_f0; + UNUSED s32 pad; s32 i; for (i = updateRate; i > 0; i--) { @@ -71,7 +71,7 @@ void TransitionTriforce_Draw(void* thisx, Gfx** gfxP) { Mtx* modelView; f32 scale; TransitionTriforce* this = (TransitionTriforce*)thisx; - s32 pad; + UNUSED s32 pad; f32 rotation = this->transPos * 360.0f; modelView = this->modelView[this->frame]; diff --git a/src/code/z_fbdemo_wipe1.c b/src/code/z_fbdemo_wipe1.c index 6a4d094477d..e8e4f4f14fa 100644 --- a/src/code/z_fbdemo_wipe1.c +++ b/src/code/z_fbdemo_wipe1.c @@ -58,7 +58,7 @@ void* TransitionWipe_Init(void* thisx) { return this; } -void TransitionWipe_Destroy(void* thisx) { +void TransitionWipe_Destroy(UNUSED void* thisx) { } void TransitionWipe_Update(void* thisx, s32 updateRate) { @@ -83,7 +83,7 @@ void TransitionWipe_Draw(void* thisx, Gfx** gfxP) { Gfx* gfx = *gfxP; Mtx* modelView; TransitionWipe* this = (TransitionWipe*)thisx; - s32 pad[4]; + UNUSED s32 pad[4]; Gfx* tex; modelView = this->modelView[this->frame]; diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c index 20e8aa25997..a8b4e2ef819 100644 --- a/src/code/z_fcurve_data_skelanime.c +++ b/src/code/z_fcurve_data_skelanime.c @@ -44,9 +44,9 @@ void SkelCurve_Clear(SkelCurve* skelCurve) { * * @return bool always true */ -s32 SkelCurve_Init(PlayState* play, SkelCurve* skelCurve, CurveSkeletonHeader* skeletonHeaderSeg, - CurveAnimationHeader* animation) { - SkelCurveLimb** limbs; +s32 SkelCurve_Init(UNUSED PlayState* play, SkelCurve* skelCurve, CurveSkeletonHeader* skeletonHeaderSeg, + UNUSED CurveAnimationHeader* animation) { + UNUSED s32 pad; CurveSkeletonHeader* skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); skelCurve->limbCount = skeletonHeader->limbCount; @@ -62,7 +62,7 @@ s32 SkelCurve_Init(PlayState* play, SkelCurve* skelCurve, CurveSkeletonHeader* s /** * Frees the joint table. */ -void SkelCurve_Destroy(PlayState* play, SkelCurve* skelCurve) { +void SkelCurve_Destroy(UNUSED PlayState* play, SkelCurve* skelCurve) { if (skelCurve->jointTable != NULL) { ZeldaArena_FreeDebug(skelCurve->jointTable, "../z_fcurve_data_skelanime.c", 146); } @@ -92,7 +92,7 @@ typedef enum { * * @return bool true when the animation has finished. */ -s32 SkelCurve_Update(PlayState* play, SkelCurve* skelCurve) { +s32 SkelCurve_Update(UNUSED PlayState* play, SkelCurve* skelCurve) { s16* jointData; u8* knotCounts; CurveAnimationHeader* animation; @@ -188,7 +188,7 @@ void SkelCurve_DrawLimb(PlayState* play, s32 limbIndex, SkelCurve* skelCurve, Ov Matrix_Scale(scale.x, scale.y, scale.z, MTXMODE_APPLY); if (lod == 0) { - s32 pad1; + UNUSED s32 pad1; dList = limb->dList[0]; if (dList != NULL) { @@ -197,7 +197,7 @@ void SkelCurve_DrawLimb(PlayState* play, s32 limbIndex, SkelCurve* skelCurve, Ov gSPDisplayList(POLY_OPA_DISP++, dList); } } else if (lod == 1) { - s32 pad2; + UNUSED s32 pad2; dList = limb->dList[0]; if (dList != NULL) { @@ -234,7 +234,7 @@ void SkelCurve_DrawLimb(PlayState* play, s32 limbIndex, SkelCurve* skelCurve, Ov CLOSE_DISPS(play->state.gfxCtx, "../z_fcurve_data_skelanime.c", 371); } -void SkelCurve_Draw(Actor* actor, PlayState* play, SkelCurve* skelCurve, OverrideCurveLimbDraw overrideLimbDraw, +void SkelCurve_Draw(UNUSED Actor* actor, PlayState* play, SkelCurve* skelCurve, OverrideCurveLimbDraw overrideLimbDraw, PostCurveLimbDraw postLimbDraw, s32 lod, void* data) { if (skelCurve->jointTable != NULL) { SkelCurve_DrawLimb(play, 0, skelCurve, overrideLimbDraw, postLimbDraw, lod, data); diff --git a/src/code/z_horse.c b/src/code/z_horse.c index 0a0186a561a..00f8ff14609 100644 --- a/src/code/z_horse.c +++ b/src/code/z_horse.c @@ -15,7 +15,7 @@ s32 func_8006CFC0(s32 scene) { return 0; } -void func_8006D074(PlayState* play) { +void func_8006D074(UNUSED PlayState* play) { gSaveContext.horseData.scene = SCENE_SPOT00; gSaveContext.horseData.pos.x = -1840; gSaveContext.horseData.pos.y = 72; @@ -23,7 +23,7 @@ void func_8006D074(PlayState* play) { gSaveContext.horseData.angle = -27353; } -void func_8006D0AC(PlayState* play) { +void func_8006D0AC(UNUSED PlayState* play) { if (gSaveContext.horseData.scene == SCENE_SPOT06) { gSaveContext.horseData.scene = SCENE_SPOT06; gSaveContext.horseData.pos.x = -2065; @@ -126,7 +126,7 @@ typedef struct { } struct_8011F9B8; void func_8006D684(PlayState* play, Player* player) { - s32 pad; + UNUSED s32 pad; s32 i; Vec3s spawnPos; diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c index 9e8925264c0..155b0faa76f 100644 --- a/src/code/z_jpeg.c +++ b/src/code/z_jpeg.c @@ -38,7 +38,7 @@ void Jpeg_ScheduleDecoderTask(JpegContext* ctx) { }; JpegWork* workBuf = ctx->workBuf; - s32 pad[2]; + UNUSED s32 pad[2]; workBuf->taskData.address = VIRTUAL_TO_PHYSICAL(&workBuf->data); workBuf->taskData.mode = ctx->mode; diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index b6314ece31a..5f01e63a85b 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -118,5 +118,5 @@ void KaleidoSetup_Init(PlayState* play) { View_Init(&pauseCtx->view, play->state.gfxCtx); } -void KaleidoSetup_Destroy(PlayState* play) { +void KaleidoSetup_Destroy(UNUSED PlayState* play) { } diff --git a/src/code/z_kanfont.c b/src/code/z_kanfont.c index 9c706516141..eee878f9065 100644 --- a/src/code/z_kanfont.c +++ b/src/code/z_kanfont.c @@ -1,7 +1,7 @@ #include "global.h" #include "message_data_static.h" -void func_8006EE50(Font* font, u16 arg1, u16 arg2) { +void func_8006EE50(UNUSED Font* font, UNUSED u16 arg1, UNUSED u16 arg2) { } /** diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index e5ba7904ebb..b88dd520f7d 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -238,14 +238,14 @@ u16 Environment_GetPixelDepth(s32 x, s32 y) { return pixelDepth; } -void Environment_GraphCallback(GraphicsContext* gfxCtx, void* param) { +void Environment_GraphCallback(UNUSED GraphicsContext* gfxCtx, void* param) { PlayState* play = (PlayState*)param; sSunScreenDepth = Environment_GetPixelDepth(sSunDepthTestX, sSunDepthTestY); Lights_GlowCheck(play); } -void Environment_Init(PlayState* play2, EnvironmentContext* envCtx, s32 unused) { +void Environment_Init(PlayState* play2, EnvironmentContext* envCtx, UNUSED s32 arg2) { u8 i; PlayState* play = play2; @@ -586,7 +586,7 @@ f32 Environment_LerpWeightAccelDecel(u16 endFrame, u16 startFrame, u16 curFrame, return ret; } -void Environment_UpdateStorm(EnvironmentContext* envCtx, u8 unused) { +void Environment_UpdateStorm(EnvironmentContext* envCtx, UNUSED u8 arg1) { if (envCtx->stormRequest != STORM_REQUEST_NONE) { switch (envCtx->stormState) { case STORM_STATE_OFF: @@ -813,9 +813,9 @@ void Environment_DisableUnderwaterLights(PlayState* play) { } } -void Environment_PrintDebugInfo(PlayState* play, Gfx** gfx) { +void Environment_PrintDebugInfo(UNUSED PlayState* play, Gfx** gfx) { GfxPrint printer; - s32 pad[2]; + UNUSED s32 pad[2]; GfxPrint_Init(&printer); GfxPrint_Open(&printer, *gfx); @@ -872,7 +872,7 @@ void Environment_PlayTimeBasedSequence(PlayState* play); void Environment_UpdateRain(PlayState* play); void Environment_Update(PlayState* play, EnvironmentContext* envCtx, LightContext* lightCtx, PauseContext* pauseCtx, - MessageContext* msgCtx, GameOverContext* gameOverCtx, GraphicsContext* gfxCtx) { + MessageContext* msgCtx, GameOverContext* gameOverCtx, UNUSED GraphicsContext* gfxCtx) { f32 sp8C; f32 sp88 = 0.0f; u16 i; @@ -1449,8 +1449,8 @@ void Environment_DrawSunAndMoon(PlayState* play) { CLOSE_DISPS(play->state.gfxCtx, "../z_kankyo.c", 2429); } -void Environment_DrawSunLensFlare(PlayState* play, EnvironmentContext* envCtx, View* view, GraphicsContext* gfxCtx, - Vec3f pos, s32 unused) { +void Environment_DrawSunLensFlare(PlayState* play, UNUSED EnvironmentContext* envCtx, UNUSED View* view, UNUSED GraphicsContext* gfxCtx, + Vec3f pos, UNUSED s32 arg5) { if ((play->envCtx.precipitation[PRECIP_RAIN_CUR] == 0) && (play->envCtx.skyboxConfig == 0)) { Environment_DrawLensFlare(play, &play->envCtx, &play->view, play->state.gfxCtx, pos, 2000, 370, Math_CosS(((void)0, gSaveContext.dayTime) - CLOCK_TIME(12, 0)) * 120.0f, 400, true); @@ -1466,7 +1466,7 @@ typedef enum { } LensFlareType; void Environment_DrawLensFlare(PlayState* play, EnvironmentContext* envCtx, View* view, GraphicsContext* gfxCtx, - Vec3f pos, s32 unused, s16 scale, f32 colorIntensity, s16 glareStrength, u8 isSun) { + Vec3f pos, UNUSED s32 arg5, s16 scale, f32 colorIntensity, s16 glareStrength, u8 isSun) { s16 i; f32 tempX; f32 tempY; @@ -1486,7 +1486,7 @@ void Environment_DrawLensFlare(PlayState* play, EnvironmentContext* envCtx, View f32 halfPosY; f32 halfPosZ; f32 cosAngle; - s32 pad; + UNUSED s32 pad; f32 lensFlareAlphaScaleTarget; u32 isOffScreen = false; f32 alpha; @@ -1676,7 +1676,7 @@ f32 Environment_RandCentered(void) { void Environment_DrawRain(PlayState* play, View* view, GraphicsContext* gfxCtx) { s16 i; - s32 pad; + UNUSED s32 pad; Vec3f vec; f32 temp1; f32 temp2; @@ -1689,7 +1689,7 @@ void Environment_DrawRain(PlayState* play, View* view, GraphicsContext* gfxCtx) f32 z50; f32 x280; f32 z280; - Vec3f unused = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; Vec3f windDirection = { 0.0f, 0.0f, 0.0f }; Player* player = GET_PLAYER(play); @@ -1930,7 +1930,7 @@ void Environment_UpdateLightningStrike(PlayState* play) { * Request the number of lightning bolts specified by `num` * Note: only 3 lightning bolts can be active at the same time. */ -void Environment_AddLightningBolts(PlayState* play, u8 num) { +void Environment_AddLightningBolts(UNUSED PlayState* play, u8 num) { s16 boltsAdded = 0; s16 i; @@ -1949,7 +1949,7 @@ void Environment_AddLightningBolts(PlayState* play, u8 num) { /** * Draw any active lightning bolt entries contained in `sLightningBolts` */ -void Environment_DrawLightning(PlayState* play, s32 unused) { +void Environment_DrawLightning(PlayState* play, UNUSED s32 arg1) { static void* lightningTextures[] = { gEffLightning1Tex, gEffLightning2Tex, gEffLightning3Tex, gEffLightning4Tex, gEffLightning5Tex, gEffLightning6Tex, @@ -1960,9 +1960,9 @@ void Environment_DrawLightning(PlayState* play, s32 unused) { f32 dz; f32 x; f32 z; - s32 pad[2]; - Vec3f unused1 = { 0.0f, 0.0f, 0.0f }; - Vec3f unused2 = { 0.0f, 0.0f, 0.0f }; + UNUSED s32 pad[2]; + UNUSED Vec3f zeroVec1 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f zeroVec2 = { 0.0f, 0.0f, 0.0f }; OPEN_DISPS(play->state.gfxCtx, "../z_kankyo.c", 3253); @@ -2193,7 +2193,7 @@ void Environment_DrawCustomLensFlare(PlayState* play) { } void Environment_InitGameOverLights(PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); sGameOverLightsIntensity = 0; @@ -2353,7 +2353,7 @@ void Environment_DrawSandstorm(PlayState* play, u8 sandstormState) { s32 envA = play->envCtx.sandstormEnvA; Color_RGBA8 primColor; Color_RGBA8 envColor; - s32 pad; + UNUSED s32 pad; f32 sp98; u16 sp96; u16 sp94; diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index 0614d6fc5d7..7a2b1437525 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -296,7 +296,7 @@ static void* sHeartDDTextures[] = { }; void Health_DrawMeter(PlayState* play) { - s32 pad[5]; + UNUSED s32 pad[5]; void* heartBgImg; u32 curColorSet; f32 offsetX; @@ -312,7 +312,7 @@ void Health_DrawMeter(PlayState* play) { s32 curHeartFraction = gSaveContext.health % 0x10; s16 totalHeartCount = gSaveContext.healthCapacity / 0x10; s16 fullHeartCount = gSaveContext.health / 0x10; - s32 pad2; + UNUSED s32 pad2; f32 beatingHeartPulsingSize = interfaceCtx->beatingHeartOscillator * 0.1f; s32 curCombineModeSet = 0; u8* curBgImgLoaded = NULL; diff --git a/src/code/z_lights.c b/src/code/z_lights.c index 4557b63342e..be44a0abeea 100644 --- a/src/code/z_lights.c +++ b/src/code/z_lights.c @@ -129,7 +129,7 @@ void Lights_BindPoint(Lights* lights, LightParams* params, Vec3f* vec) { } } -void Lights_BindDirectional(Lights* lights, LightParams* params, Vec3f* vec) { +void Lights_BindDirectional(Lights* lights, LightParams* params, UNUSED Vec3f* vec) { Light* light = Lights_FindSlot(lights); if (light != NULL) { @@ -223,7 +223,7 @@ Lights* LightContext_NewLights(LightContext* lightCtx, GraphicsContext* gfxCtx) return Lights_New(gfxCtx, lightCtx->ambientColor[0], lightCtx->ambientColor[1], lightCtx->ambientColor[2]); } -void LightContext_InitList(PlayState* play, LightContext* lightCtx) { +void LightContext_InitList(UNUSED PlayState* play, LightContext* lightCtx) { lightCtx->listHead = NULL; } @@ -240,7 +240,7 @@ void LightContext_DestroyList(PlayState* play, LightContext* lightCtx) { * Note: Due to the limited number of slots in a Lights group, inserting too many lights in the * list may result in older entries not being bound to a Light when calling Lights_BindAll */ -LightNode* LightContext_InsertLight(PlayState* play, LightContext* lightCtx, LightInfo* info) { +LightNode* LightContext_InsertLight(UNUSED PlayState* play, LightContext* lightCtx, LightInfo* info) { LightNode* node; node = Lights_FindBufSlot(); @@ -260,7 +260,7 @@ LightNode* LightContext_InsertLight(PlayState* play, LightContext* lightCtx, Lig return node; } -void LightContext_RemoveLight(PlayState* play, LightContext* lightCtx, LightNode* node) { +void LightContext_RemoveLight(UNUSED PlayState* play, LightContext* lightCtx, LightNode* node) { if (node != NULL) { if (node->prev != NULL) { node->prev->next = node->next; @@ -357,7 +357,7 @@ void Lights_GlowCheck(PlayState* play) { } void Lights_DrawGlow(PlayState* play) { - s32 pad; + UNUSED s32 pad; LightNode* node; node = play->lightCtx.listHead; @@ -373,7 +373,7 @@ void Lights_DrawGlow(PlayState* play) { LightInfo* info; LightPoint* params; f32 scale; - s32 pad[4]; + UNUSED s32 pad[4]; info = node->info; params = &info->params.point; diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index cd826c6e570..ec6c5999c27 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -309,7 +309,7 @@ void Map_Init(PlayState* play) { } void Minimap_DrawCompassIcons(PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); s16 tempX, tempZ; @@ -358,7 +358,7 @@ void Minimap_DrawCompassIcons(PlayState* play) { } void Minimap_Draw(PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; InterfaceContext* interfaceCtx = &play->interfaceCtx; s32 mapIndex = gSaveContext.mapIndex; diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index a267f7e5673..8da256f5327 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -69,7 +69,7 @@ void MapMark_Init(PlayState* play) { : NULL); } -void MapMark_ClearPointers(PlayState* play) { +void MapMark_ClearPointers(UNUSED PlayState* play) { sMapMarkDataOvl.loadedRamAddr = NULL; sLoadedMarkDataTable = NULL; } diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c index 08e2c7aec46..f919d4a928e 100644 --- a/src/code/z_message_PAL.c +++ b/src/code/z_message_PAL.c @@ -738,7 +738,7 @@ f32 sFontWidths[144] = { }; u16 Message_DrawItemIcon(PlayState* play, u16 itemId, Gfx** p, u16 i) { - s32 pad; + UNUSED s32 pad; Gfx* gfx = *p; MessageContext* msgCtx = &play->msgCtx; @@ -2005,14 +2005,14 @@ void Message_DrawMain(PlayState* play, Gfx** p) { MessageContext* msgCtx = &play->msgCtx; u16 buttonIndexPos; Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; Gfx* gfx = *p; s16 r; s16 g; s16 b; u16 i; u16 notePosX; - u16 pad1; + UNUSED u16 pad1; u16 j; gSPSegment(gfx++, 0x02, play->interfaceCtx.parameterSegment); @@ -2956,7 +2956,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { void Message_DrawDebugVariableChanged(s16* var, GraphicsContext* gfxCtx) { static s16 sVarLastValue = 0; static s16 sFillTimer = 0; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(gfxCtx, "../z_message_PAL.c", 3485); @@ -2983,9 +2983,9 @@ void Message_DrawDebugVariableChanged(s16* var, GraphicsContext* gfxCtx) { } void Message_DrawDebugText(PlayState* play, Gfx** p) { - s32 pad; + UNUSED s32 pad; GfxPrint printer; - s32 pad1; + UNUSED s32 pad1; GfxPrint_Init(&printer); GfxPrint_Open(&printer, *p); @@ -3043,8 +3043,7 @@ void Message_Update(PlayState* play) { static s16 sTextboxEndIconYOffset[] = { 59, 59, 59, 59, 34, 59, }; - static s16 D_80153D3C[] = { - // additional unreferenced data + UNUSED static s16 D_80153D3C[] = { 0x0400, 0x0400, 0x0200, 0x0000, 0x1038, 0x0008, 0x200A, 0x088B, 0x0007, 0x0009, 0x000A, 0x107E, 0x2008, 0x2007, 0x0015, 0x0016, 0x0017, 0x0003, 0x0000, 0x270B, 0x00C8, 0x012C, 0x012D, 0xFFDA, 0x0014, 0x0016, 0x0014, 0x0016, }; diff --git a/src/code/z_moji.c b/src/code/z_moji.c index 2709082378b..7c83ef4cd55 100644 --- a/src/code/z_moji.c +++ b/src/code/z_moji.c @@ -60,7 +60,7 @@ void Moji_SetPosition(s32 gridX, s32 gridY) { } void Moji_DrawChar(GraphicsContext* gfxCtx, char c) { - s32 pad[2]; + UNUSED s32 pad[2]; OPEN_DISPS(gfxCtx, "../z_moji.c", 86); diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index 0f61caee182..fa74af61473 100644 --- a/src/code/z_onepointdemo.c +++ b/src/code/z_onepointdemo.c @@ -1373,5 +1373,5 @@ s32 OnePointCutscene_CheckForCategory(PlayState* play, s32 actorCategory) { } // unused, also empty. -void OnePointCutscene_Noop(PlayState* play, s32 arg1) { +void OnePointCutscene_Noop(UNUSED PlayState* play, UNUSED s32 arg1) { } diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 2e9af7c2dc2..4753511a9b4 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -2158,7 +2158,7 @@ void Interface_LoadActionLabelB(PlayState* play, u16 action) { /** * @return false if player is out of health */ -s32 Health_ChangeBy(PlayState* play, s16 amount) { +s32 Health_ChangeBy(UNUSED PlayState* play, s16 amount) { u16 heartCount; u16 healthLevel; @@ -2272,7 +2272,7 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange) { osSyncPrintf("合計 = (%d)\n", AMMO(item)); // "Total = (%d)" } -void Magic_Fill(PlayState* play) { +void Magic_Fill(UNUSED PlayState* play) { if (gSaveContext.isMagicAcquired) { gSaveContext.prevMagicState = gSaveContext.magicState; gSaveContext.magicFillTarget = (gSaveContext.isDoubleMagicAcquired + 1) * MAGIC_NORMAL_METER; @@ -2280,7 +2280,7 @@ void Magic_Fill(PlayState* play) { } } -void Magic_Reset(PlayState* play) { +void Magic_Reset(UNUSED PlayState* play) { if ((gSaveContext.magicState != MAGIC_STATE_STEP_CAPACITY) && (gSaveContext.magicState != MAGIC_STATE_FILL)) { if (gSaveContext.magicState == MAGIC_STATE_ADD) { gSaveContext.prevMagicState = gSaveContext.magicState; @@ -2683,7 +2683,7 @@ void func_80088AA0(s16 arg0) { } } -void func_80088AF0(PlayState* play) { +void func_80088AF0(UNUSED PlayState* play) { if (gSaveContext.timer2State != 0) { if (GET_EVENTINF(EVENTINF_10)) { gSaveContext.timer2Value = 239; @@ -3060,15 +3060,14 @@ void Interface_Draw(PlayState* play) { static s16 magicArrowEffectsB[] = { 0, 255, 100 }; static s16 timerDigitLeftPos[] = { 16, 25, 34, 42, 51 }; static s16 digitWidth[] = { 9, 9, 8, 9, 9 }; - // unused, most likely colors - static s16 D_80125B1C[][3] = { + UNUSED static s16 D_80125B1C[][3] = { // most likely colors { 0, 150, 0 }, { 100, 255, 0 }, { 255, 255, 255 }, { 0, 0, 0 }, { 255, 255, 255 }, }; static s16 rupeeDigitsFirst[] = { 1, 0, 0 }; static s16 rupeeDigitsCount[] = { 2, 3, 3 }; static s16 spoilingItemEntrances[] = { ENTR_SPOT10_2, ENTR_SPOT07_3, ENTR_SPOT07_3 }; - static f32 D_80125B54[] = { -40.0f, -35.0f }; // unused - static s16 D_80125B5C[] = { 91, 91 }; // unused + UNUSED static f32 D_80125B54[] = { -40.0f, -35.0f }; + UNUSED static s16 D_80125B5C[] = { 91, 91 }; static s16 D_8015FFE0; static s16 D_8015FFE2; static s16 D_8015FFE4; @@ -3081,7 +3080,7 @@ void Interface_Draw(PlayState* play) { s16 svar1; s16 svar2; s16 svar3; - s16 svar4; + UNUSED s16 pad; s16 svar5; s16 svar6; diff --git a/src/code/z_play.c b/src/code/z_play.c index 2905e4ba03e..7b59b669f25 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -223,7 +223,7 @@ void Play_Init(GameState* thisx) { s32 playerStartBgCamIndex; s32 i; u8 tempSetupIndex; - s32 pad[2]; + UNUSED s32 pad[2]; if (gSaveContext.entranceIndex == ENTR_LOAD_OPENING) { gSaveContext.entranceIndex = 0; @@ -440,11 +440,11 @@ void Play_Init(GameState* thisx) { } void Play_Update(PlayState* this) { - s32 pad1; + UNUSED s32 pad1; s32 sp80; Input* input; u32 i; - s32 pad2; + UNUSED s32 pad2; input = this->state.input; @@ -977,7 +977,7 @@ void Play_Update(PlayState* this) { PLAY_LOG(3801); if ((sp80 == 0) || gDbgCamEnabled) { - s32 pad3[5]; + UNUSED s32 pad3[5]; s32 i; this->nextCamId = this->activeCamId; @@ -1324,7 +1324,7 @@ f32 func_800BFCB8(PlayState* this, MtxF* mf, Vec3f* vec) { f32 nx; f32 ny; f32 nz; - s32 pad[5]; + UNUSED s32 pad[5]; floorY = BgCheck_AnyRaycastFloor1(&this->colCtx, &poly, vec); diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 5217f1283d9..aebac439592 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -643,7 +643,7 @@ s32 func_8008EF44(PlayState* play, s32 ammo) { s32 Player_IsBurningStickInRange(PlayState* play, Vec3f* pos, f32 xzRange, f32 yRange) { Player* this = GET_PLAYER(play); Vec3f diff; - s32 pad; + UNUSED s32 pad; if ((this->heldItemActionParam == PLAYER_AP_STICK) && (this->unk_860 != 0)) { Math_Vec3f_Diff(&this->meleeWeaponInfo[0].tip, pos, &diff); @@ -691,7 +691,7 @@ s32 Player_HasMirrorShieldSetToDraw(PlayState* play) { return (this->rightHandType == PLAYER_MODELTYPE_RH_SHIELD) && (this->currentShield == PLAYER_SHIELD_MIRROR); } -s32 Player_ActionToMagicSpell(Player* this, s32 actionParam) { +s32 Player_ActionToMagicSpell(UNUSED Player* this, s32 actionParam) { s32 magicSpell = actionParam - PLAYER_AP_MAGIC_SPELL_15; if ((magicSpell >= 0) && (magicSpell < 6)) { @@ -735,7 +735,7 @@ s32 Player_HoldsBrokenKnife(Player* this) { return (this->heldItemActionParam == PLAYER_AP_SWORD_BGS) && (gSaveContext.swordHealth <= 0.0f); } -s32 Player_ActionToBottle(Player* this, s32 actionParam) { +s32 Player_ActionToBottle(UNUSED Player* this, s32 actionParam) { s32 bottle = actionParam - PLAYER_AP_BOTTLE; if ((bottle >= 0) && (bottle < 13)) { @@ -749,7 +749,7 @@ s32 Player_GetBottleHeld(Player* this) { return Player_ActionToBottle(this, this->heldItemActionParam); } -s32 Player_ActionToExplosive(Player* this, s32 actionParam) { +s32 Player_ActionToExplosive(UNUSED Player* this, s32 actionParam) { s32 explosive = actionParam - PLAYER_AP_BOMB; if ((explosive >= 0) && (explosive < 2)) { @@ -763,7 +763,7 @@ s32 Player_GetExplosiveHeld(Player* this) { return Player_ActionToExplosive(this, this->heldItemActionParam); } -s32 func_8008F2BC(Player* this, s32 actionParam) { +s32 func_8008F2BC(UNUSED Player* this, s32 actionParam) { s32 sword = 0; if (actionParam != PLAYER_AP_LAST_USED) { @@ -980,7 +980,7 @@ void func_8008F87C(PlayState* play, Player* this, SkelAnime* skelAnime, Vec3f* p if ((this->actor.scale.y >= 0.0f) && !(this->stateFlags1 & PLAYER_STATE1_7) && (Player_ActionToMagicSpell(this, this->itemActionParam) < 0)) { - s32 pad; + UNUSED s32 pad; sp7C = D_80126058[(void)0, gSaveContext.linkAge]; sp78 = D_80126060[(void)0, gSaveContext.linkAge]; @@ -1441,7 +1441,7 @@ Vec3f sLeftRightFootLimbModelFootPos[] = { { 200.0f, 200.0f, 0.0f }, }; -void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { +void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, UNUSED Vec3s* rot, void* thisx) { Player* this = (Player*)thisx; if (*dList != NULL) { @@ -1586,7 +1586,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Ve if (heldActor != NULL) { MtxF sp44; - s32 pad; + UNUSED s32 pad; Matrix_MultVec3f(&D_80126190, &heldActor->world.pos); Matrix_RotateZYX(0, -0x4000, -0x4000, MTXMODE_APPLY); @@ -1672,7 +1672,7 @@ u8 sPauseModelGroupBySword[] = { PLAYER_MODELGROUP_BGS, // PLAYER_SWORD_BGS }; -s32 Player_OverrideLimbDrawPause(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* arg) { +s32 Player_OverrideLimbDrawPause(UNUSED PlayState* play, s32 limbIndex, Gfx** dList, UNUSED Vec3f* pos, UNUSED Vec3s* rot, void* arg) { u8* playerSwordAndShield = arg; //! @bug `playerSwordAndShield[0]` can be 0 (`PLAYER_SWORD_NONE`), which indexes `sPauseModelGroupBySword[-1]`. //! The result happens to be 0 (`PLAYER_MODELGROUP_0`) in vanilla, but weird values are likely to cause a crash. @@ -1732,7 +1732,7 @@ void Player_DrawPauseImpl(PlayState* play, void* gameplayKeep, void* linkObject, OPEN_DISPS(play->state.gfxCtx, "../z_player_lib.c", 3129); - { s32 pad[2]; } + { UNUSED s32 pad[2]; } opaRef = POLY_OPA_DISP; POLY_OPA_DISP++; diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c index 1c7869ffa1d..4e71c6b66f3 100644 --- a/src/code/z_prenmi.c +++ b/src/code/z_prenmi.c @@ -50,7 +50,7 @@ void PreNMI_Main(GameState* thisx) { this->state.unk_A0 = 1; } -void PreNMI_Destroy(GameState* thisx) { +void PreNMI_Destroy(UNUSED GameState* thisx) { } void PreNMI_Init(GameState* thisx) { diff --git a/src/code/z_quake.c b/src/code/z_quake.c index 02fb8e63d46..768553fc8d1 100644 --- a/src/code/z_quake.c +++ b/src/code/z_quake.c @@ -62,7 +62,7 @@ void Quake_UpdateShakeInfo(QuakeRequest* req, ShakeInfo* shake, f32 y, f32 x) { } s16 Quake_Callback1(QuakeRequest* req, ShakeInfo* shake) { - s32 pad; + UNUSED s32 pad; if (req->countdown > 0) { f32 a = Math_SinS(req->speed * req->countdown); @@ -84,7 +84,7 @@ s16 Quake_Callback5(QuakeRequest* req, ShakeInfo* shake) { } s16 Quake_Callback6(QuakeRequest* req, ShakeInfo* shake) { - s32 pad; + UNUSED s32 pad; f32 a; req->countdown--; @@ -312,7 +312,7 @@ s16 Quake_Calc(Camera* camera, QuakeCamCalc* camData) { ShakeInfo shake; f32 absSpeedDiv; s16* temp; - u32 pad2; + UNUSED s32 pad2; s32 idx; s32 ret; u32 eq; diff --git a/src/code/z_room.c b/src/code/z_room.c index c43450f624d..3f3e127027c 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -28,7 +28,7 @@ void (*sRoomDrawHandlers[MESH_HEADER_TYPE_MAX])(PlayState* play, Room* room, u32 Room_Draw2, }; -void func_80095AA0(PlayState* play, Room* room, Input* arg2, UNK_TYPE arg3) { +void func_80095AA0(UNUSED PlayState* play, UNUSED Room* room, UNUSED Input* arg2, UNUSED UNK_TYPE arg3) { } void Room_Draw0(PlayState* play, Room* room, u32 flags) { @@ -85,14 +85,14 @@ void Room_Draw2(PlayState* play, Room* room, u32 flags) { struct_80095D04* spB4 = NULL; struct_80095D04* spB0 = NULL; struct_80095D04* iter; - s32 pad; + UNUSED s32 pad; struct_80095D04* spA4; s32 j; s32 i; Vec3f pos; Vec3f projectedPos; f32 projectedW; - s32 pad2; + UNUSED s32 pad2; MeshHeader2Entry* meshHeader2Entries; MeshHeader2Entry* meshHeader2EntryIter; f32 temp_f2; @@ -463,7 +463,7 @@ void Room_Draw1(PlayState* play, Room* room, u32 flags) { } } -void func_80096FD4(PlayState* play, Room* room) { +void func_80096FD4(UNUSED PlayState* play, Room* room) { room->num = -1; room->segment = NULL; } diff --git a/src/code/z_sample.c b/src/code/z_sample.c index e0863c96ed6..ad349221c6d 100644 --- a/src/code/z_sample.c +++ b/src/code/z_sample.c @@ -46,7 +46,7 @@ void Sample_Main(GameState* thisx) { Sample_HandleStateChange(this); } -void Sample_Destroy(GameState* thisx) { +void Sample_Destroy(UNUSED GameState* thisx) { } void Sample_SetupView(SampleState* this) { diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 1e82f2d5d78..52aeaae01bd 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -316,7 +316,7 @@ void Scene_CommandTransitionActorList(PlayState* play, SceneCmd* cmd) { play->transiActorCtx.list = SEGMENTED_TO_VIRTUAL(cmd->transiActorList.data); } -void TransitionActor_InitContext(GameState* state, TransitionActorContext* transiActorCtx) { +void TransitionActor_InitContext(UNUSED GameState* state, TransitionActorContext* transiActorCtx) { transiActorCtx->numActors = 0; } @@ -389,7 +389,7 @@ void Scene_CommandExitList(PlayState* play, SceneCmd* cmd) { play->setupExitList = SEGMENTED_TO_VIRTUAL(cmd->exitList.data); } -void Scene_CommandUndefined9(PlayState* play, SceneCmd* cmd) { +void Scene_CommandUndefined9(UNUSED PlayState* play, UNUSED SceneCmd* cmd) { } void Scene_CommandSoundSettings(PlayState* play, SceneCmd* cmd) { @@ -406,7 +406,7 @@ void Scene_CommandEchoSettings(PlayState* play, SceneCmd* cmd) { } void Scene_CommandAlternateHeaderList(PlayState* play, SceneCmd* cmd) { - s32 pad; + UNUSED s32 pad; SceneCmd* altHeader; osSyncPrintf("\n[ZU]sceneset age =[%X]", ((void)0, gSaveContext.linkAge)); diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index 91fc9d360c7..553bfe12787 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -154,7 +154,7 @@ void* sDCLavaFloorTextures[] = { void Scene_DrawConfigDdan(PlayState* play) { u32 gameplayFrames; - s32 pad; + UNUSED s32 pad; Gfx* displayListHead = Graph_Alloc(play->state.gfxCtx, 2 * sizeof(Gfx[3])); OPEN_DISPS(play->state.gfxCtx, "../z_scene_table.c", 4905); diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 1398b8a52cf..05fda68ee0e 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -70,7 +70,7 @@ void SkelAnime_DrawLimbLod(PlayState* play, s32 limbIndex, void** skeleton, Vec3 void SkelAnime_DrawLod(PlayState* play, void** skeleton, Vec3s* jointTable, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, void* arg, s32 lod) { LodLimb* rootLimb; - s32 pad; + UNUSED s32 pad; Gfx* dList; Vec3f pos; Vec3s rot; @@ -180,7 +180,7 @@ void SkelAnime_DrawFlexLimbLod(PlayState* play, s32 limbIndex, void** skeleton, void SkelAnime_DrawFlexLod(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListCount, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, void* arg, s32 lod) { LodLimb* rootLimb; - s32 pad; + UNUSED s32 pad; Gfx* newDList; Gfx* limbDList; Vec3f pos; @@ -287,7 +287,7 @@ void SkelAnime_DrawLimbOpa(PlayState* play, s32 limbIndex, void** skeleton, Vec3 void SkelAnime_DrawOpa(PlayState* play, void** skeleton, Vec3s* jointTable, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, void* arg) { StandardLimb* rootLimb; - s32 pad; + UNUSED s32 pad; Gfx* dList; Vec3f pos; Vec3s rot; @@ -397,7 +397,7 @@ void SkelAnime_DrawFlexLimbOpa(PlayState* play, s32 limbIndex, void** skeleton, void SkelAnime_DrawFlexOpa(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListCount, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, void* arg) { StandardLimb* rootLimb; - s32 pad; + UNUSED s32 pad; Gfx* newDList; Gfx* limbDList; Vec3f pos; @@ -550,7 +550,7 @@ Gfx* SkelAnime_DrawLimb(PlayState* play, s32 limbIndex, void** skeleton, Vec3s* Gfx* SkelAnime_Draw(PlayState* play, void** skeleton, Vec3s* jointTable, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, void* arg, Gfx* gfx) { StandardLimb* rootLimb; - s32 pad; + UNUSED s32 pad; Gfx* dList; Vec3f pos; Vec3s rot; @@ -657,7 +657,7 @@ Gfx* SkelAnime_DrawFlexLimb(PlayState* play, s32 limbIndex, void** skeleton, Vec Gfx* SkelAnime_DrawFlex(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListCount, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, void* arg, Gfx* gfx) { StandardLimb* rootLimb; - s32 pad; + UNUSED s32 pad; Gfx* newDList; Gfx* limbDList; Vec3f pos; @@ -804,14 +804,14 @@ void AnimationContext_Reset(AnimationContext* animationCtx) { /** * Shifts the queue flag to the next queue */ -void AnimationContext_SetNextQueue(PlayState* play) { +void AnimationContext_SetNextQueue(UNUSED PlayState* play) { sAnimQueueFlags <<= 1; } /** * Disables the current animation queue. Only load and move actor requests will be processed for that queue. */ -void AnimationContext_DisableQueue(PlayState* play) { +void AnimationContext_DisableQueue(UNUSED PlayState* play) { sDisableAnimQueueFlags |= sAnimQueueFlags; } @@ -838,7 +838,7 @@ void AnimationContext_SetLoadFrame(PlayState* play, LinkAnimationHeader* animati if (entry != NULL) { LinkAnimationHeader* linkAnimHeader = SEGMENTED_TO_VIRTUAL(animation); - s32 pad; + UNUSED s32 pad; osCreateMesgQueue(&entry->data.load.msgQueue, &entry->data.load.msg, 1); DmaMgr_SendRequest2(&entry->data.load.req, frameTable, @@ -923,7 +923,7 @@ void AnimationContext_SetMoveActor(PlayState* play, Actor* actor, SkelAnime* ske /** * Receives the request for Link's animation frame data */ -void AnimationContext_LoadFrame(PlayState* play, AnimationEntryData* data) { +void AnimationContext_LoadFrame(UNUSED PlayState* play, AnimationEntryData* data) { AnimEntryLoadFrame* entry = &data->load; osRecvMesg(&entry->msgQueue, NULL, OS_MESG_BLOCK); @@ -932,7 +932,7 @@ void AnimationContext_LoadFrame(PlayState* play, AnimationEntryData* data) { /** * If the entry's queue is enabled, copies all vectors from src frame table to dst frame table */ -void AnimationContext_CopyAll(PlayState* play, AnimationEntryData* data) { +void AnimationContext_CopyAll(UNUSED PlayState* play, AnimationEntryData* data) { AnimEntryCopyAll* entry = &data->copy; if (!(entry->queueFlag & sDisableAnimQueueFlags)) { @@ -949,7 +949,7 @@ void AnimationContext_CopyAll(PlayState* play, AnimationEntryData* data) { /** * If the entry's queue is enabled, interpolates between the base and mod frame tables, placing the result in base */ -void AnimationContext_Interp(PlayState* play, AnimationEntryData* data) { +void AnimationContext_Interp(UNUSED PlayState* play, AnimationEntryData* data) { AnimEntryInterp* entry = &data->interp; if (!(entry->queueFlag & sDisableAnimQueueFlags)) { @@ -960,7 +960,7 @@ void AnimationContext_Interp(PlayState* play, AnimationEntryData* data) { /** * If the entry's queue is enabled, copies all vectors from src frame table to dst frame table whose copy flag is true */ -void AnimationContext_CopyTrue(PlayState* play, AnimationEntryData* data) { +void AnimationContext_CopyTrue(UNUSED PlayState* play, AnimationEntryData* data) { AnimEntryCopyTrue* entry = &data->copy1; if (!(entry->queueFlag & sDisableAnimQueueFlags)) { @@ -980,7 +980,7 @@ void AnimationContext_CopyTrue(PlayState* play, AnimationEntryData* data) { /** * If the entry's queue is enabled, copies all vectors from src frame table to dst frame table whose copy flag is false */ -void AnimationContext_CopyFalse(PlayState* play, AnimationEntryData* data) { +void AnimationContext_CopyFalse(UNUSED PlayState* play, AnimationEntryData* data) { AnimEntryCopyFalse* entry = &data->copy0; if (!(entry->queueFlag & sDisableAnimQueueFlags)) { @@ -1000,7 +1000,7 @@ void AnimationContext_CopyFalse(PlayState* play, AnimationEntryData* data) { /** * Moves an actor according to the translation of its root limb */ -void AnimationContext_MoveActor(PlayState* play, AnimationEntryData* data) { +void AnimationContext_MoveActor(UNUSED PlayState* play, AnimationEntryData* data) { AnimEntryMoveActor* entry = &data->move; Actor* actor = entry->actor; Vec3f diff; @@ -1181,7 +1181,7 @@ s32 LinkAnimation_Once(PlayState* play, SkelAnime* skelAnime) { /** * Sets a new morph and resets the morph weight for the current animation. */ -void Animation_SetMorph(PlayState* play, SkelAnime* skelAnime, f32 morphFrames) { +void Animation_SetMorph(UNUSED PlayState* play, SkelAnime* skelAnime, f32 morphFrames) { skelAnime->morphWeight = 1.0f; skelAnime->morphRate = 1.0f / morphFrames; } @@ -1370,7 +1370,7 @@ s32 LinkAnimation_OnFrame(SkelAnime* skelAnime, f32 frame) { * Initializes a normal skeleton to a looping animation, dynamically allocating the frame tables if not provided. */ BAD_RETURN(s32) -SkelAnime_Init(PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, AnimationHeader* animation, +SkelAnime_Init(UNUSED PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, AnimationHeader* animation, Vec3s* jointTable, Vec3s* morphTable, s32 limbCount) { SkeletonHeader* skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); @@ -1401,7 +1401,7 @@ SkelAnime_Init(PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHe * Initializes a flex skeleton to a looping animation, dynamically allocating the frame tables if not given. */ BAD_RETURN(s32) -SkelAnime_InitFlex(PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeader* skeletonHeaderSeg, +SkelAnime_InitFlex(UNUSED PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeader* skeletonHeaderSeg, AnimationHeader* animation, Vec3s* jointTable, Vec3s* morphTable, s32 limbCount) { FlexSkeletonHeader* skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); @@ -1436,7 +1436,7 @@ SkelAnime_InitFlex(PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeader* sk * Initializes a skeleton with SkinLimbs to a looping animation, dynamically allocating the frame tables. */ BAD_RETURN(s32) -SkelAnime_InitSkin(PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, +SkelAnime_InitSkin(UNUSED PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, AnimationHeader* animation) { SkeletonHeader* skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); @@ -1831,7 +1831,7 @@ s32 Animation_OnFrame(SkelAnime* skelAnime, f32 frame) { /** * Frees the frame tables for a skelAnime with dynamically allocated tables. */ -void SkelAnime_Free(SkelAnime* skelAnime, PlayState* play) { +void SkelAnime_Free(SkelAnime* skelAnime, UNUSED PlayState* play) { if (skelAnime->jointTable != NULL) { ZeldaArena_FreeDebug(skelAnime->jointTable, "../z_skelanime.c", 3729); } else { diff --git a/src/code/z_skin.c b/src/code/z_skin.c index e61ed3d09d4..e1bf0ed9e00 100644 --- a/src/code/z_skin.c +++ b/src/code/z_skin.c @@ -45,7 +45,7 @@ void Skin_UpdateVertices(MtxF* mtx, SkinVertex* skinVertices, SkinLimbModif* mod void Skin_ApplyLimbModifications(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, s32 arg3) { s32 modifCount; SkinLimb** skeleton; - SkinLimb* limb; + UNUSED s32 pad; SkinAnimatedLimbData* data; SkinLimbModif* modif; SkinLimbVtx* vtxEntry; @@ -158,10 +158,10 @@ void Skin_DrawAnimatedLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, s /** * Draw a limb of type SKIN_LIMB_TYPE_NORMAL, of the skeleton `skin` at index `limbIndex` */ -void Skin_DrawLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, Gfx* dlistOverride, s32 drawFlags) { +void Skin_DrawLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, Gfx* dlistOverride, UNUSED s32 drawFlags) { Gfx* gfx = dlistOverride; SkinLimb** skeleton; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(gfxCtx, "../z_skin.c", 395); @@ -191,7 +191,7 @@ void Skin_DrawImpl(Actor* actor, PlayState* play, Skin* skin, SkinPostDraw postD s32 segmentType; SkinLimb** skeleton; GraphicsContext* gfxCtx = play->state.gfxCtx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(gfxCtx, "../z_skin.c", 471); diff --git a/src/code/z_skin_awb.c b/src/code/z_skin_awb.c index e16556ca6a3..4c87ae7e576 100644 --- a/src/code/z_skin_awb.c +++ b/src/code/z_skin_awb.c @@ -4,7 +4,7 @@ /** * Initialises the Vtx buffers used for limb at index `limbIndex` */ -void Skin_InitAnimatedLimb(PlayState* play, Skin* skin, s32 limbIndex) { +void Skin_InitAnimatedLimb(UNUSED PlayState* play, Skin* skin, s32 limbIndex) { s32 i; SkinLimb** skeleton = SEGMENTED_TO_VIRTUAL(skin->skeletonHeader->segment); SkinAnimatedLimbData* animatedLimbData = @@ -108,7 +108,7 @@ void Skin_Free(PlayState* play, Skin* skin) { } s32 func_800A698C(Skin* skin, SkinLimb** skeleton, MtxF* limbMatrices, u8 parentIndex, u8 limbIndex) { - s32 pad; + UNUSED s32 pad; SkinLimb* limb = SEGMENTED_TO_VIRTUAL(skeleton[limbIndex]); MtxF* mtx; s32 ret; @@ -145,7 +145,7 @@ s32 func_800A698C(Skin* skin, SkinLimb** skeleton, MtxF* limbMatrices, u8 parent */ s32 Skin_ApplyAnimTransformations(Skin* skin, MtxF* limbMatrices, Actor* actor, s32 setTranslation) { s32 i; - s32 pad; + UNUSED s32 pad; f32 yRot; f32 xRot; f32 zRot; diff --git a/src/code/z_skin_matrix.c b/src/code/z_skin_matrix.c index bc6aa432c1a..2fe3ae2a42b 100644 --- a/src/code/z_skin_matrix.c +++ b/src/code/z_skin_matrix.c @@ -237,7 +237,7 @@ void SkinMatrix_MtxFCopy(MtxF* src, MtxF* dest) { s32 SkinMatrix_Invert(MtxF* src, MtxF* dest) { MtxF mfCopy; s32 i; - s32 pad; + UNUSED s32 pad; f32 temp2; f32 temp1; s32 thisCol; @@ -616,7 +616,7 @@ void SkinMatrix_SetRotateAxis(MtxF* mf, s16 angle, f32 axisX, f32 axisY, f32 axi f32 xy; f32 yz; f32 xz; - f32 pad; + UNUSED s32 pad; sinA = Math_SinS(angle); cosA = Math_CosS(angle); diff --git a/src/code/z_sram.c b/src/code/z_sram.c index 4afaff30676..12e8fa5c074 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -474,7 +474,7 @@ void Sram_OpenSave(SramContext* sramCtx) { * Write the contents of the Save Context to a main and backup slot in SRAM. * Note: The whole Save Context is written even though only the `save` substruct is read back later */ -void Sram_WriteSave(SramContext* sramCtx) { +void Sram_WriteSave(UNUSED SramContext* sramCtx) { u16 offset; u16 checksum; u16 j; @@ -885,5 +885,5 @@ void Sram_Alloc(GameState* gameState, SramContext* sramCtx) { ASSERT(sramCtx->readBuff != NULL, "sram->read_buff != NULL", "../z_sram.c", 1295); } -void Sram_Init(PlayState* play, SramContext* sramCtx) { +void Sram_Init(UNUSED PlayState* play, UNUSED SramContext* sramCtx) { } diff --git a/src/code/z_view.c b/src/code/z_view.c index 0a847ef49d2..d0a8969fb95 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -138,7 +138,7 @@ void View_GetViewport(View* view, Viewport* viewport) { void View_ApplyShrinkWindow(View* view) { s32 varY; s32 varX; - s32 pad; + UNUSED s32 pad; s32 ulx; s32 uly; s32 lrx; @@ -463,7 +463,7 @@ s32 View_ApplyOrthoToOverlay(View* view) { * Apply scissor, viewport, view and projection (perspective) to OVERLAY_DISP. */ s32 View_ApplyPerspectiveToOverlay(View* view) { - s32 pad[2]; + UNUSED s32 pad[2]; f32 aspect; s32 width; s32 height; diff --git a/src/code/z_vimode.c b/src/code/z_vimode.c index f7f81bca92c..c5db1f3ac07 100644 --- a/src/code/z_vimode.c +++ b/src/code/z_vimode.c @@ -202,7 +202,7 @@ void ViMode_Init(ViMode* viMode) { ViMode_Save(viMode); } -void ViMode_Destroy(ViMode* viMode) { +void ViMode_Destroy(UNUSED ViMode* viMode) { } void ViMode_ConfigureFeatures(ViMode* viMode, s32 viFeatures) { diff --git a/src/code/z_vismono.c b/src/code/z_vismono.c index de065988e91..feec1c98fdb 100644 --- a/src/code/z_vismono.c +++ b/src/code/z_vismono.c @@ -42,7 +42,7 @@ void VisMono_Destroy(VisMono* this) { SystemArena_FreeDebug(this->dList, "../z_vismono.c", 137); } -void VisMono_DesaturateTLUT(VisMono* this, u16* tlut) { +void VisMono_DesaturateTLUT(UNUSED VisMono* this, u16* tlut) { s32 i; for (i = 0; i < 256; i++) { @@ -63,7 +63,7 @@ void VisMono_DesaturateTLUT(VisMono* this, u16* tlut) { } } -Gfx* VisMono_DesaturateDList(VisMono* this, Gfx* gfx) { +Gfx* VisMono_DesaturateDList(UNUSED VisMono* this, Gfx* gfx) { s32 y; s32 height = VISMONO_CFBFRAG_HEIGHT; u16* cfbFrag = D_0F000000; diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index ff88ed50492..3d5a521180a 100644 --- a/src/code/z_vr_box.c +++ b/src/code/z_vr_box.c @@ -81,8 +81,8 @@ Struct_8012AF0C D_8012AF0C[6] = { s32 func_800ADBB0(SkyboxContext* skyboxCtx, Vtx* roomVtx, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { - u32 pad42C; - s32 pad428; + UNUSED s32 pad42C; + UNUSED s32 pad428; s32 sp424; s32 i; s32 j; @@ -98,7 +98,7 @@ s32 func_800ADBB0(SkyboxContext* skyboxCtx, Vtx* roomVtx, s32 arg2, s32 arg3, s3 s32 sp1F0[9 * 5]; s32 sp13C[9 * 5]; s32 sp88[9 * 5]; - s32 pad; + UNUSED s32 pad; switch (arg8) { case 0: @@ -209,7 +209,7 @@ s32 func_800AE2C0(SkyboxContext* skyboxCtx, Vtx* roomVtx, s32 arg2, s32 arg3, s3 s32 sp1EC[5 * 5]; s32 sp188[5 * 5]; s32 sp124[5 * 5]; - s32 pad; + UNUSED s32 pad; switch (arg8) { case 0: diff --git a/src/code/z_vr_box_draw.c b/src/code/z_vr_box_draw.c index a9728c3c5a5..804f76dd050 100644 --- a/src/code/z_vr_box_draw.c +++ b/src/code/z_vr_box_draw.c @@ -80,5 +80,5 @@ void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyb CLOSE_DISPS(gfxCtx, "../z_vr_box_draw.c", 125); } -void SkyboxDraw_Update(SkyboxContext* skyboxCtx) { +void SkyboxDraw_Update(UNUSED SkyboxContext* skyboxCtx) { } diff --git a/src/libultra/io/sptask.c b/src/libultra/io/sptask.c index bd9b5fdf2f4..256fc3da236 100644 --- a/src/libultra/io/sptask.c +++ b/src/libultra/io/sptask.c @@ -52,7 +52,7 @@ void osSpTaskLoad(OSTask* intp) { } } -void osSpTaskStartGo(OSTask* tp) { +void osSpTaskStartGo(UNUSED OSTask* tp) { while (__osSpDeviceBusy()) { ; } diff --git a/src/libultra/rmon/xldtob.c b/src/libultra/rmon/xldtob.c index cc518a44b28..d5e503b2934 100644 --- a/src/libultra/rmon/xldtob.c +++ b/src/libultra/rmon/xldtob.c @@ -43,7 +43,7 @@ const f64 D_800122E0[] = { 10e0L, 10e1L, 10e3L, 10e7L, 10e15L, 10e31L, 10e63L, 1 void _Ldtob(_Pft* args, u8 type) { u8 buff[BUFF_LEN]; u8* ptr = buff; - u32 sp70; + UNUSED s32 pad; f64 val = args->v.ld; /* maybe struct? */ s16 err; 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 01e8e6ea5fd..cb3c1593498 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -148,7 +148,7 @@ void ArmsHook_Shoot(ArmsHook* this, PlayState* play) { DynaPolyActor* dynaPolyActor; f32 curGrabbedDist; f32 grabbedDist; - s32 pad; + UNUSED s32 pad; CollisionPoly* poly; s32 bgId; Vec3f intersectPos; @@ -157,7 +157,7 @@ void ArmsHook_Shoot(ArmsHook* this, PlayState* play) { f32 polyNormalX; f32 polyNormalZ; f32 velocity; - s32 pad1; + UNUSED s32 pad1; if ((this->actor.parent == NULL) || (!Player_HoldsHookshot(player))) { ArmsHook_DetachHookFromActor(this); @@ -296,7 +296,7 @@ void ArmsHook_Update(Actor* thisx, PlayState* play) { } void ArmsHook_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; ArmsHook* this = (ArmsHook*)thisx; Player* player = GET_PLAYER(play); Vec3f sp78; 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 913f973a911..f0d5ff7fbdd 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -146,7 +146,7 @@ void ArrowFire_Hit(ArrowFire* this, PlayState* play) { void ArrowFire_Fly(ArrowFire* this, PlayState* play) { EnArrow* arrow; f32 distanceScaled; - s32 pad; + UNUSED s32 pad; arrow = (EnArrow*)this->actor.parent; if ((arrow == NULL) || (arrow->actor.update == NULL)) { 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 73d8b65b340..1a776040aab 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -147,7 +147,7 @@ void ArrowIce_Hit(ArrowIce* this, PlayState* play) { void ArrowIce_Fly(ArrowIce* this, PlayState* play) { EnArrow* arrow; f32 distanceScaled; - s32 pad; + UNUSED s32 pad; arrow = (EnArrow*)this->actor.parent; if ((arrow == NULL) || (arrow->actor.update == NULL)) { @@ -194,7 +194,7 @@ void ArrowIce_Update(Actor* thisx, PlayState* play) { void ArrowIce_Draw(Actor* thisx, PlayState* play) { ArrowIce* this = (ArrowIce*)thisx; - s32 pad; + UNUSED s32 pad; Actor* transform; u32 stateFrames = play->state.frames; EnArrow* arrow = (EnArrow*)this->actor.parent; 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 414bb1343ca..7462c15eaae 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -146,7 +146,7 @@ void ArrowLight_Hit(ArrowLight* this, PlayState* play) { void ArrowLight_Fly(ArrowLight* this, PlayState* play) { EnArrow* arrow = (EnArrow*)this->actor.parent; f32 distanceScaled; - s32 pad; + UNUSED s32 pad; if ((arrow == NULL) || (arrow->actor.update == NULL)) { Actor_Kill(&this->actor); @@ -192,7 +192,7 @@ void ArrowLight_Update(Actor* thisx, PlayState* play) { void ArrowLight_Draw(Actor* thisx, PlayState* play) { ArrowLight* this = (ArrowLight*)thisx; - s32 pad; + UNUSED s32 pad; u32 stateFrames = play->state.frames; EnArrow* arrow = (EnArrow*)this->actor.parent; Actor* transform; diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index 471cf5fbfeb..20b143149f7 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -105,7 +105,7 @@ void BgBdanObjects_SetContactRu1(BgBdanObjects* this, s32 arg1) { } void BgBdanObjects_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgBdanObjects* this = (BgBdanObjects*)thisx; CollisionHeader* colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index e5aed1b8feb..cda3034bec2 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -90,9 +90,9 @@ static InitChainEntry sInitChain[] = { static Vec3f D_8086E0E0 = { 0.0f, 140.0f, 0.0f }; void BgBdanSwitch_InitDynaPoly(BgBdanSwitch* this, PlayState* play, CollisionHeader* collision, s32 flag) { - s16 pad1; + UNUSED s16 pad1; CollisionHeader* colHeader = NULL; - s16 pad2; + UNUSED s16 pad2; DynaPolyActor_Init(&this->dyna, flag); CollisionHeader_GetVirtual(collision, &colHeader); @@ -135,7 +135,7 @@ void func_8086D0EC(BgBdanSwitch* this) { void BgBdanSwitch_Init(Actor* thisx, PlayState* play) { BgBdanSwitch* this = (BgBdanSwitch*)thisx; - s32 pad; + UNUSED s32 pad; s16 type; s32 flag; @@ -217,7 +217,7 @@ void BgBdanSwitch_Destroy(Actor* thisx, PlayState* play) { } void func_8086D4B4(BgBdanSwitch* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 type; if (!Flags_GetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F)) { @@ -481,7 +481,7 @@ void func_8086DDC0(BgBdanSwitch* this, PlayState* play) { } void BgBdanSwitch_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgBdanSwitch* this = (BgBdanSwitch*)thisx; s32 type; diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c index 39c597f49cd..5e09f0be4ea 100644 --- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c +++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c @@ -35,7 +35,7 @@ void BgBomGuard_SetupAction(BgBomGuard* this, BgBomGuardActionFunc actionFunc) { void BgBomGuard_Init(Actor* thisx, PlayState* play) { BgBomGuard* this = (BgBomGuard*)thisx; - s32 pad[2]; + UNUSED s32 pad[2]; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c index 22404a818ee..03654fde10f 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c @@ -82,8 +82,8 @@ const ActorInit Bg_Bombwall_InitVars = { }; void BgBombwall_InitDynapoly(BgBombwall* this, PlayState* play) { - s32 pad; - s32 pad2; + UNUSED s32 pad; + UNUSED s32 pad2; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); @@ -114,7 +114,7 @@ void BgBombwall_Init(Actor* thisx, PlayState* play) { s32 j; Vec3f vecs[3]; Vec3f sp80; - s32 pad; + UNUSED s32 pad; BgBombwall* this = (BgBombwall*)thisx; f32 sin = Math_SinS(this->dyna.actor.shape.rot.y); f32 cos = Math_CosS(this->dyna.actor.shape.rot.y); diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index 26b9b8faa0c..7686d052865 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -46,8 +46,8 @@ static s16 sTargetRot[] = { 0x0000, 0x0000, 0x3FFF, -0x3FFF }; void BgBowlWall_Init(Actor* thisx, PlayState* play) { BgBowlWall* this = (BgBowlWall*)thisx; - s32 pad1; - s32 pad2; + UNUSED s32 pad1; + UNUSED s32 pad2; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); @@ -73,7 +73,7 @@ void BgBowlWall_Destroy(Actor* thisx, PlayState* play) { } void BgBowlWall_SpawnBullseyes(BgBowlWall* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnWallTubo* bullseye; Actor* lookForGirl; s16 type; @@ -118,7 +118,7 @@ void BgBowlWall_WaitForHit(BgBowlWall* this, PlayState* play) { } void BgBowlWall_FallDoEffects(BgBowlWall* this, PlayState* play) { - s16 pad; + UNUSED s16 pad; Vec3f effectAccel = { 0.0f, 0.1f, 0.0f }; Vec3f effectVelocity = { 0.0f, 0.0f, 0.0f }; Vec3f effectPos; 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 6e34546e270..be5392a6178 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -78,7 +78,7 @@ void BgBreakwall_SetupAction(BgBreakwall* this, BgBreakwallActionFunc actionFunc void BgBreakwall_Init(Actor* thisx, PlayState* play) { BgBreakwall* this = (BgBreakwall*)thisx; - s32 pad; + UNUSED s32 pad; s32 wallType = ((this->dyna.actor.params >> 13) & 3) & 0xFF; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); @@ -146,7 +146,7 @@ Actor* BgBreakwall_SpawnFragments(PlayState* play, BgBreakwall* this, Vec3f* pos { { -40.0f, 14.0f, 0.0f }, { -50.0f, 57.0f, 0.0f }, { -30.0f, 57.0f, 0.0f }, { -40.0f, 70.0f, 0.0f } }, { { -55.0f, -15.0f, 0.0f }, { -55.0f, -32.0f, 0.0f }, { -30.0f, -32.0f, 0.0f }, { -20.0f, -10.0f, 0.0f } }, }; - s32 pad; + UNUSED s32 pad; for (k = 3; k >= 0; k--) { if ((k == 0) || (k == 3)) { @@ -290,7 +290,7 @@ static Vec3f sColQuadList[][4] = { }; void BgBreakwall_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgBreakwall* this = (BgBreakwall*)thisx; if (this->bombableWallDList != NULL) { diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c index f5d84f45a28..dc139d1b5ac 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c @@ -51,7 +51,7 @@ typedef enum { #define SHORTCUT_Y_SPEED 5 void BgDdanJd_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgDdanJd* this = (BgDdanJd*)thisx; CollisionHeader* colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index bc77673f668..accc76bd2f9 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c @@ -63,7 +63,7 @@ void BgDdanKd_SetupAction(BgDdanKd* this, BgDdanKdActionFunc actionFunc) { void BgDdanKd_Init(Actor* thisx, PlayState* play) { BgDdanKd* this = (BgDdanKd*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; this->prevExplosive = NULL; diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index 043d4dd68f5..fc13018f3ba 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -109,7 +109,7 @@ static InitChainEntry sInitChain[] = { void BgDodoago_Init(Actor* thisx, PlayState* play) { BgDodoago* this = (BgDodoago*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index f1ade5dc203..06b01594d34 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -34,7 +34,7 @@ const ActorInit Bg_Gate_Shutter_InitVars = { void BgGateShutter_Init(Actor* thisx, PlayState* play) { BgGateShutter* this = (BgGateShutter*)thisx; - s32 pad[2]; + UNUSED s32 pad[2]; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index 3bc57deb0bb..23cc15fbee8 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -38,7 +38,7 @@ static InitChainEntry sInitChain[] = { void BgGjyoBridge_Init(Actor* thisx, PlayState* play) { BgGjyoBridge* this = (BgGjyoBridge*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader; colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c index b2530a3ec45..9bb4ffcf0d3 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c @@ -31,7 +31,7 @@ const ActorInit Bg_Gnd_Firemeiro_InitVars = { }; void BgGndFiremeiro_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgGndFiremeiro* this = (BgGndFiremeiro*)thisx; CollisionHeader* colHeader = NULL; @@ -82,7 +82,7 @@ void BgGndFiremeiro_Sink(BgGndFiremeiro* this, PlayState* play) { } void BgGndFiremeiro_Shake(BgGndFiremeiro* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 randSign; if (DynaPolyActor_IsPlayerOnTop(&this->dyna)) { diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c index 98e7404aa9c..b857fe7d1bc 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c @@ -45,7 +45,7 @@ static InitChainEntry sInitChain[] = { static u8 sBlockPositions[2]; void BgGndIceblock_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgGndIceblock* this = (BgGndIceblock*)thisx; CollisionHeader* colHeader = NULL; @@ -68,7 +68,7 @@ void BgGndIceblock_Init(Actor* thisx, PlayState* play) { } void BgGndIceblock_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgGndIceblock* this = (BgGndIceblock*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -344,14 +344,14 @@ void BgGndIceblock_Slide(BgGndIceblock* this, PlayState* play) { } void BgGndIceblock_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgGndIceblock* this = (BgGndIceblock*)thisx; this->actionFunc(this, play); } void BgGndIceblock_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgGndIceblock* this = (BgGndIceblock*)thisx; Gfx_DrawDListOpa(play, gWaterTrialIceBlockDL); diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c index ea30922849e..17db3194418 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c @@ -59,7 +59,7 @@ static InitChainEntry sInitChain[] = { }; void BgGndSoulmeiro_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgGndSoulmeiro* this = (BgGndSoulmeiro*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -157,7 +157,7 @@ void func_8087AF38(BgGndSoulmeiro* this, PlayState* play) { } void func_8087B284(BgGndSoulmeiro* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; if (!Flags_GetSwitch(play, (this->actor.params >> 8) & 0x3F)) { this->actor.draw = BgGndSoulmeiro_Draw; diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c index 0c840197938..723d1fed9bc 100644 --- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c +++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c @@ -39,7 +39,7 @@ static InitChainEntry sInitChain[] = { void BgHaka_Init(Actor* thisx, PlayState* play) { BgHaka* this = (BgHaka*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); @@ -124,7 +124,7 @@ void func_8087BAAC(BgHaka* this, PlayState* play) { void func_8087BAE4(BgHaka* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; if (this->dyna.actor.params != 0) { this->dyna.actor.params -= 1; diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index d390f5f3b25..21b6a05de1b 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -69,7 +69,7 @@ static InitChainEntry sInitChain[] = { }; void BgHakaGate_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgHakaGate* this = (BgHakaGate*)thisx; CollisionHeader* colHeader = NULL; @@ -134,7 +134,7 @@ void BgHakaGate_Init(Actor* thisx, PlayState* play) { } void BgHakaGate_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgHakaGate* this = (BgHakaGate*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -299,7 +299,7 @@ void BgHakaGate_FalseSkull(BgHakaGate* this, PlayState* play) { } void BgHakaGate_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgHakaGate* this = (BgHakaGate*)thisx; this->actionFunc(this, play); diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c index 3408efe8ff9..75f0b244777 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c +++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c @@ -41,7 +41,7 @@ static InitChainEntry sInitChain[] = { void BgHakaHuta_Init(Actor* thisx, PlayState* play) { BgHakaHuta* this = (BgHakaHuta*)thisx; - s16 pad; + UNUSED s16 pad; CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(thisx, sInitChain); diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c index 3942b8adbfd..df848618f64 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c @@ -54,7 +54,7 @@ static Gfx* D_8087E410[] = { }; void BgHakaMeganeBG_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgHakaMeganeBG* this = (BgHakaMeganeBG*)thisx; CollisionHeader* colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c index 6df4947f3b2..c5d3994ebb5 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c +++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c @@ -39,7 +39,7 @@ static InitChainEntry sInitChain[] = { void BgHakaShip_Init(Actor* thisx, PlayState* play) { BgHakaShip* this = (BgHakaShip*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); @@ -222,7 +222,7 @@ void BgHakaShip_Draw(Actor* thisx, PlayState* play) { } CLOSE_DISPS(play->state.gfxCtx, "../z_bg_haka_ship.c", 568); if (this->actionFunc == BgHakaShip_CutsceneStationary || this->actionFunc == BgHakaShip_Move) { - s32 pad; + UNUSED s32 pad; Vec3f sp2C; sp2C.x = this->dyna.actor.world.pos.x + -367.0f; diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index 45b5651df52..886a8d73ed2 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -108,7 +108,7 @@ static InitChainEntry sInitChain[] = { void BgHakaTrap_Init(Actor* thisx, PlayState* play) { static UNK_TYPE D_80881014 = 0; BgHakaTrap* this = (BgHakaTrap*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(thisx, sInitChain); @@ -520,7 +520,7 @@ void BgHakaTrap_Draw(Actor* thisx, PlayState* play) { }; static Color_RGBA8 D_8088103C = { 0, 0, 0, 0 }; BgHakaTrap* this = (BgHakaTrap*)thisx; - s32 pad; + UNUSED s32 pad; Vec3f sp2C; if (this->actionFunc == func_808802D8) { diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index 4e7ea78857e..dd2cfc66730 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -78,7 +78,7 @@ static InitChainEntry sInitChain[] = { void BgHakaTubo_Init(Actor* thisx, PlayState* play) { BgHakaTubo* this = (BgHakaTubo*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); @@ -219,7 +219,7 @@ void BgHakaTubo_Update(Actor* thisx, PlayState* play) { } void BgHakaTubo_DrawFlameCircle(BgHakaTubo* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_bg_haka_tubo.c", 476); diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c index 6c1a7bdadd1..a976cce25ed 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c +++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c @@ -107,9 +107,9 @@ void BgHakaWater_Update(Actor* thisx, PlayState* play) { void BgHakaWater_Draw(Actor* thisx, PlayState* play) { BgHakaWater* this = (BgHakaWater*)thisx; - s32 pad; + UNUSED s32 pad; f32 temp; - s32 pad2; + UNUSED s32 pad2; OPEN_DISPS(play->state.gfxCtx, "../z_bg_haka_water.c", 287); Gfx_SetupDL_25Xlu(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c index 3b64228ef8b..12b58c5cd06 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c @@ -72,7 +72,7 @@ static InitChainEntry sInitChain[] = { }; void BgHakaZou_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgHakaZou* this = (BgHakaZou*)thisx; Actor_ProcessInitChain(thisx, sInitChain); @@ -226,7 +226,7 @@ void func_80882CC4(BgHakaZou* this, PlayState* play) { Vec3f actorSpawnPos; f32 sin; f32 cos; - s32 pad; + UNUSED s32 pad; sin = Math_SinS(this->dyna.actor.shape.rot.y - 0x4000) * 40.0f; cos = Math_CosS(this->dyna.actor.shape.rot.y - 0x4000) * 40.0f; diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index 4e0649851ba..c064120e356 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -73,7 +73,7 @@ void BgHeavyBlock_InitPiece(BgHeavyBlock* this, f32 scale) { } void BgHeavyBlock_SetupDynapoly(BgHeavyBlock* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; CollisionHeader* colHeader = NULL; this->dyna.actor.flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_17; DynaPolyActor_Init(&this->dyna, DPM_UNK); @@ -284,7 +284,7 @@ void BgHeavyBlock_SpawnPieces(BgHeavyBlock* this, PlayState* play) { { 0.0f, 300.0f, -20.0f }, { 50.0f, 200.0f, -20.0f }, { -50.0f, 200.0f, -20.0f }, { 0.0f, 100.0f, 30.0f }, { 0.0f, 100.0f, -70.0f }, { 0.0f, 0.0f, -20.0f }, }; - s32 pad; + UNUSED s32 pad; Vec3f pos; f32 sinPitch; f32 cosPitch; @@ -341,7 +341,7 @@ void BgHeavyBlock_Wait(BgHeavyBlock* this, PlayState* play) { void BgHeavyBlock_LiftedUp(BgHeavyBlock* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; f32 cosYaw; f32 zOffset; f32 sinYaw; @@ -447,7 +447,7 @@ void BgHeavyBlock_DoNothing(BgHeavyBlock* this, PlayState* play) { } void BgHeavyBlock_Land(BgHeavyBlock* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; if (Math_SmoothStepToS(&this->dyna.actor.shape.rot.x, 0x8AD0, 6, 2000, 100) != 0) { Math_StepToF(&this->dyna.actor.speedXZ, 0.0f, 20.0f); @@ -484,7 +484,7 @@ void BgHeavyBlock_Draw(Actor* thisx, PlayState* play) { static Vec3f D_80884EC8 = { 0.0f, 0.0f, 0.0f }; static Vec3f D_80884ED4 = { 0.0f, 400.0f, 0.0f }; BgHeavyBlock* this = (BgHeavyBlock*)thisx; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); OPEN_DISPS(play->state.gfxCtx, "../z_bg_heavy_block.c", 904); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index 6815631d60d..203d178a0be 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -66,7 +66,7 @@ const ActorInit Bg_Hidan_Curtain_InitVars = { }; void BgHidanCurtain_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgHidanCurtain* this = (BgHidanCurtain*)thisx; BgHidanCurtainParams* hcParams; @@ -117,7 +117,7 @@ void BgHidanCurtain_Init(Actor* thisx, PlayState* play) { } void BgHidanCurtain_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgHidanCurtain* this = (BgHidanCurtain*)thisx; Collider_DestroyCylinder(play, &this->collider); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c index 3b823951921..56521e7bd0e 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c @@ -96,7 +96,7 @@ static InitChainEntry sInitChain[] = { void BgHidanDalm_Init(Actor* thisx, PlayState* play) { BgHidanDalm* this = (BgHidanDalm*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(thisx, sInitChain); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c index ebe407b191c..c7ae558f311 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c @@ -175,7 +175,7 @@ void BgHidanFirewall_ColliderFollowPlayer(BgHidanFirewall* this, PlayState* play void BgHidanFirewall_Update(Actor* thisx, PlayState* play) { BgHidanFirewall* this = (BgHidanFirewall*)thisx; - s32 pad; + UNUSED s32 pad; this->unk_150 = (this->unk_150 + 1) % 8; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c index c3ff87e241b..9cfee76f015 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c @@ -38,10 +38,10 @@ static InitChainEntry sInitChain[] = { }; void BgHidanFslift_Init(Actor* thisx, PlayState* play) { - s32 pad1; + UNUSED s32 pad1; BgHidanFslift* this = (BgHidanFslift*)thisx; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_PLAYER); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c index 7e5c9cb5d99..ba3f6ee7151 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c @@ -105,7 +105,7 @@ void BgHidanFwbig_Init(Actor* thisx, PlayState* play2) { } void BgHidanFwbig_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgHidanFwbig* this = (BgHidanFwbig*)thisx; Collider_DestroyCylinder(play, &this->collider); @@ -217,7 +217,7 @@ void BgHidanFwbig_MoveCollider(BgHidanFwbig* this, PlayState* play) { } void BgHidanFwbig_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgHidanFwbig* this = (BgHidanFwbig*)thisx; if (this->collider.base.atFlags & AT_HIT) { @@ -247,7 +247,7 @@ void BgHidanFwbig_Update(Actor* thisx, PlayState* play) { } void BgHidanFwbig_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 height; OPEN_DISPS(play->state.gfxCtx, "../z_bg_hidan_fwbig.c", 630); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c index 36e7c643b29..ffccedaa00e 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c @@ -127,7 +127,7 @@ s32 BgHidanHamstep_SpawnChildren(BgHidanHamstep* this, PlayState* play2) { void BgHidanHamstep_Init(Actor* thisx, PlayState* play) { BgHidanHamstep* this = (BgHidanHamstep*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; Vec3f sp48[3]; s32 i; @@ -289,8 +289,8 @@ void func_808887C4(BgHidanHamstep* this, PlayState* play) { } void func_80888860(BgHidanHamstep* this, PlayState* play) { - s32 pad; - s32 pad2; + UNUSED s32 pad; + UNUSED s32 pad2; s32 quakeIndex; Actor_MoveForward(&this->dyna.actor); @@ -322,7 +322,7 @@ void func_80888860(BgHidanHamstep* this, PlayState* play) { } void func_808889B8(BgHidanHamstep* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgHidanHamstep* parent = (BgHidanHamstep*)this->dyna.actor.parent; func_80888734(this); @@ -339,8 +339,8 @@ void func_808889B8(BgHidanHamstep* this, PlayState* play) { } void func_80888A58(BgHidanHamstep* this, PlayState* play) { - s32 pad; - s32 pad2; + UNUSED s32 pad; + UNUSED s32 pad2; s32 quakeIndex; Actor_MoveForward(&this->dyna.actor); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c index 89b616a7e7a..f377fc097be 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c @@ -64,7 +64,7 @@ void BgHidanKousi_SetupAction(BgHidanKousi* this, BgHidanKousiActionFunc actionF void BgHidanKousi_Init(Actor* thisx, PlayState* play) { BgHidanKousi* this = (BgHidanKousi*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); @@ -94,7 +94,7 @@ void BgHidanKousi_Destroy(Actor* thisx, PlayState* play) { } void func_80889ACC(BgHidanKousi* this) { - s32 pad[2]; + UNUSED s32 pad[2]; Vec3s* rot = &this->dyna.actor.world.rot; f32 temp1 = D_80889E40[this->dyna.actor.params & 0xFF] * Math_SinS(rot->y); f32 temp2 = D_80889E40[this->dyna.actor.params & 0xFF] * Math_CosS(rot->y); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index 4d718685f09..e491c305a2a 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -73,9 +73,9 @@ void BgHidanKowarerukabe_InitDynaPoly(BgHidanKowarerukabe* this, PlayState* play &gFireTempleBombableWallCol, &gFireTempleLargeBombableWallCol, }; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; if (collisionHeaders[this->dyna.actor.params & 0xFF] != NULL) { DynaPolyActor_Init(&this->dyna, DPM_UNK); @@ -89,7 +89,7 @@ void BgHidanKowarerukabe_InitDynaPoly(BgHidanKowarerukabe* this, PlayState* play void BgHidanKowarerukabe_InitColliderSphere(BgHidanKowarerukabe* this, PlayState* play) { static s16 sphereRadii[] = { 80, 45, 80 }; static s16 sphereYPositions[] = { 0, 500, 500 }; - s32 pad; + UNUSED s32 pad; Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->dyna.actor, &sJntSphInit, this->colliderItems); @@ -145,7 +145,7 @@ void BgHidanKowarerukabe_Destroy(Actor* thisx, PlayState* play) { } void BgHidanKowarerukabe_SpawnDust(BgHidanKowarerukabe* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f pos; pos = this->dyna.actor.world.pos; @@ -300,7 +300,7 @@ void BgHidanKowarerukabe_Break(BgHidanKowarerukabe* this, PlayState* play) { void BgHidanKowarerukabe_Update(Actor* thisx, PlayState* play) { BgHidanKowarerukabe* this = (BgHidanKowarerukabe*)thisx; - s32 pad; + UNUSED s32 pad; if (Actor_GetCollidedExplosive(play, &this->collider.base) != NULL) { BgHidanKowarerukabe_Break(this, play); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c index d2d218a43d3..0d9add95536 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c @@ -68,7 +68,7 @@ static InitChainEntry sInitChain[] = { void BgHidanRock_Init(Actor* thisx, PlayState* play) { BgHidanRock* this = (BgHidanRock*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(thisx, sInitChain); @@ -349,7 +349,7 @@ static void* sVerticalFlamesTexs[] = { }; void func_8088BC40(PlayState* play, BgHidanRock* this) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_bg_hidan_rock.c", 808); @@ -378,7 +378,7 @@ void func_8088BC40(PlayState* play, BgHidanRock* this) { void BgHidanRock_Draw(Actor* thisx, PlayState* play) { BgHidanRock* this = (BgHidanRock*)thisx; - s32 pad; + UNUSED s32 pad; if (this->type == 0) { Gfx_DrawDListOpa(play, gFireTempleStoneBlock1DL); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c index 9aab264ccb4..dc89d4dfc3a 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c @@ -122,7 +122,7 @@ static void* sFireballsTexs[] = { void BgHidanRsekizou_Init(Actor* thisx, PlayState* play) { BgHidanRsekizou* this = (BgHidanRsekizou*)thisx; s32 i; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader; colHeader = NULL; @@ -150,7 +150,7 @@ void BgHidanRsekizou_Update(Actor* thisx, PlayState* play) { BgHidanRsekizou* this = (BgHidanRsekizou*)thisx; s32 i; ColliderJntSphElement* sphere; - s32 pad; + UNUSED s32 pad; f32 yawSine; f32 yawCosine; @@ -225,7 +225,7 @@ Gfx* BgHidanRsekizou_DrawFireball(PlayState* play, BgHidanRsekizou* this, s16 fr void BgHidanRsekizou_Draw(Actor* thisx, PlayState* play) { BgHidanRsekizou* this = (BgHidanRsekizou*)thisx; s32 i; - s32 pad; + UNUSED s32 pad; MtxF mf; OPEN_DISPS(play->state.gfxCtx, "../z_bg_hidan_rsekizou.c", 564); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c index d904c2216b7..8c22ce09d31 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c @@ -145,7 +145,7 @@ void func_8088CEC0(BgHidanSekizou* this, s32 arg1, s16 arg2) { } void BgHidanSekizou_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgHidanSekizou* this = (BgHidanSekizou*)thisx; s32 i; CollisionHeader* colHeader = NULL; @@ -328,7 +328,7 @@ Gfx* func_8088D9F4(PlayState* play, BgHidanSekizou* this, s16 arg2, MtxF* arg3, } Gfx* func_8088DC50(PlayState* play, BgHidanSekizou* this, s16 arg2, s16 arg3, Gfx* arg4) { - s32 pad; + UNUSED s32 pad; s16 temp_v1; s32 phi_s1; s32 phi_s2; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c index 023385e0b9e..5b73411203d 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c @@ -82,7 +82,7 @@ static void* sFireballsTexs[] = { void BgHidanSima_Init(Actor* thisx, PlayState* play) { BgHidanSima* this = (BgHidanSima*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; s32 i; @@ -207,7 +207,7 @@ void func_8088E90C(BgHidanSima* this) { void BgHidanSima_Update(Actor* thisx, PlayState* play) { BgHidanSima* this = (BgHidanSima*)thisx; - s32 pad; + UNUSED s32 pad; this->actionFunc(this, play); if (this->dyna.actor.params != 0) { @@ -231,7 +231,7 @@ Gfx* func_8088EB54(PlayState* play, BgHidanSima* this, Gfx* gfx) { s32 v0; f32 cos; f32 sin; - s32 pad[2]; + UNUSED s32 pad[2]; Matrix_MtxFCopy(&mtxF, &gMtxFClear); cos = Math_CosS(this->dyna.actor.world.rot.y + 0x8000); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c index a8d48f1640d..b78d3816041 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c @@ -35,7 +35,7 @@ static InitChainEntry sInitChain[] = { }; void BgHidanSyoku_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgHidanSyoku* this = (BgHidanSyoku*)thisx; CollisionHeader* colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c index 66bf6fb509f..b5c282ab796 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c @@ -40,7 +40,7 @@ static InitChainEntry sInitChain[] = { }; void BgIceObjects_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgIceObjects* this = (BgIceObjects*)thisx; CollisionHeader* colHeader = NULL; @@ -54,7 +54,7 @@ void BgIceObjects_Init(Actor* thisx, PlayState* play) { } void BgIceObjects_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgIceObjects* this = (BgIceObjects*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -223,14 +223,14 @@ void BgIceObjects_Stuck(BgIceObjects* this, PlayState* play) { } void BgIceObjects_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgIceObjects* this = (BgIceObjects*)thisx; this->actionFunc(this, play); } void BgIceObjects_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgIceObjects* this = (BgIceObjects*)thisx; Gfx_DrawDListOpa(play, object_ice_objects_DL_000190); diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index bc6d8774894..6b46b63d4c1 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -74,7 +74,7 @@ static ColliderCylinderInit D_80891738 = { void func_80890740(BgIceShelter* this, PlayState* play) { static s16 cylinderRadii[] = { 47, 33, 44, 41, 100 }; static s16 cylinderHeights[] = { 80, 54, 90, 60, 200 }; - s32 pad; + UNUSED s32 pad; s32 type = (this->dyna.actor.params >> 8) & 7; Collider_InitCylinder(play, &this->cylinder1); @@ -99,9 +99,9 @@ void func_80890740(BgIceShelter* this, PlayState* play) { } void func_80890874(BgIceShelter* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; DynaPolyActor_Init(&this->dyna, moveFlag); CollisionHeader_GetVirtual(collision, &colHeader); @@ -202,7 +202,7 @@ void func_80890B8C(BgIceShelter* this, PlayState* play, f32 chance, f32 scale) { s16 angle; s16 frames; s32 i; - s32 pad[2]; + UNUSED s32 pad[2]; Vec3f dustPos; Vec3f dustVel; Vec3f dustAccel; @@ -241,7 +241,7 @@ void func_80890E00(BgIceShelter* this, PlayState* play, f32 chance, f32 arg3) { static f32 D_808917B4[] = { -1.0f, 1.0f }; Vec3f* icePos; s16 frames; - s32 pad[2]; + UNUSED s32 pad[2]; Vec3f dustPos; Vec3f dustVel; Vec3f dustAccel; @@ -283,7 +283,7 @@ void func_80891064(BgIceShelter* this) { } void func_8089107C(BgIceShelter* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 type = (this->dyna.actor.params >> 8) & 7; if (type == 4) { @@ -333,7 +333,7 @@ static void (*sEffSpawnFuncs[])(BgIceShelter* this, PlayState* play, f32 chance, void func_808911D4(BgIceShelter* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 type = (this->dyna.actor.params >> 8) & 7; f32 phi_f0; diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c index b21f0b0dd20..e0d1fe1be30 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c @@ -61,7 +61,7 @@ static InitChainEntry sInitChain[] = { void BgIceTurara_Init(Actor* thisx, PlayState* play) { BgIceTurara* this = (BgIceTurara*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); 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 c9c77e5e2af..8e07ecd9343 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -36,7 +36,7 @@ void BgInGate_SetupAction(BgInGate* this, BgInGateActionFunc actionFunc) { void BgInGate_Init(Actor* thisx, PlayState* play) { BgInGate* this = (BgInGate*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index cae20779c5c..71a54914fb8 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -67,9 +67,9 @@ static InitChainEntry sInitChain[] = { }; void BgJya1flift_InitDynapoly(BgJya1flift* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; DynaPolyActor_Init(&this->dyna, moveFlag); CollisionHeader_GetVirtual(collision, &colHeader); diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c index 084f0b1b368..bfddfea979e 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c @@ -43,9 +43,9 @@ static InitChainEntry sInitChain[] = { }; void BgJyaAmishutter_InitDynaPoly(BgJyaAmishutter* this, PlayState* play, CollisionHeader* collision, s32 flag) { - s32 pad1; + UNUSED s32 pad1; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; DynaPolyActor_Init(&this->dyna, flag); CollisionHeader_GetVirtual(collision, &colHeader); diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c index 03512650dab..7a4b362f2bb 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c @@ -34,7 +34,7 @@ static InitChainEntry sInitChain[] = { }; void BgJyaBlock_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgJyaBlock* this = (BgJyaBlock*)thisx; CollisionHeader* colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index 27b244307cc..4b2cd26adcc 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -62,7 +62,7 @@ static InitChainEntry sInitChain[] = { }; void BgJyaBombchuiwa_SetupCollider(BgJyaBombchuiwa* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->actor, &sJntSphInit, &this->colliderItems); diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index 2eb87acb550..fb081a6b3a9 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -63,9 +63,9 @@ static InitChainEntry sInitChain[] = { }; void BgJyaBombiwa_SetupDynaPoly(BgJyaBombiwa* this, PlayState* play, CollisionHeader* collision, s32 flag) { - s16 pad1; + UNUSED s16 pad1; CollisionHeader* colHeader = NULL; - s16 pad2; + UNUSED s16 pad2; DynaPolyActor_Init(&this->dyna, flag); CollisionHeader_GetVirtual(collision, &colHeader); @@ -79,7 +79,7 @@ void BgJyaBombiwa_SetupDynaPoly(BgJyaBombiwa* this, PlayState* play, CollisionHe } void BgJyaBombiwa_InitCollider(BgJyaBombiwa* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->dyna.actor, &sJntSphInit, this->colliderItems); diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index 83fcf3750b8..7833776bfc4 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -116,9 +116,9 @@ void func_808958F0(Vec3f* dest, Vec3f* src, f32 arg2, f32 arg3) { } void BgJyaCobra_InitDynapoly(BgJyaCobra* this, PlayState* play, CollisionHeader* collision, s32 flags) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; DynaPolyActor_Init(&this->dyna, flags); CollisionHeader_GetVirtual(collision, &colHeader); @@ -142,7 +142,7 @@ void BgJyaCobra_SpawnRay(BgJyaCobra* this, PlayState* play) { } void func_80895A70(BgJyaCobra* this) { - s32 pad; + UNUSED s32 pad; BgJyaBigmirror* mirror = (BgJyaBigmirror*)this->dyna.actor.parent; MirRay* mirRay; @@ -190,7 +190,7 @@ void func_80895A70(BgJyaCobra* this) { void func_80895BEC(BgJyaCobra* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; Vec3f sp2C; func_808958F0(&sp2C, &this->unk_174, Math_SinS(this->unk_170), Math_CosS(this->unk_170)); @@ -536,7 +536,7 @@ void func_80896CB4(PlayState* play) { } void func_80896D78(BgJyaCobra* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3s sp44; OPEN_DISPS(play->state.gfxCtx, "../z_bg_jya_cobra.c", 924); @@ -557,7 +557,7 @@ void func_80896D78(BgJyaCobra* this, PlayState* play) { } void BgJyaCobra_DrawShadow(BgJyaCobra* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 params = this->dyna.actor.params & 3; Vec3f sp64; Vec3s* phi_a3; diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c index 718d8e10127..bf9a9361ae9 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c @@ -80,7 +80,7 @@ void BgJyaGoroiwa_UpdateCollider(BgJyaGoroiwa* this) { } void BgJyaGoroiwa_InitCollider(BgJyaGoroiwa* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->actor, &sJntSphInit, &this->colliderItem); @@ -194,7 +194,7 @@ void BgJyaGoroiwa_Wait(BgJyaGoroiwa* this, PlayState* play) { } void BgJyaGoroiwa_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgJyaGoroiwa* this = (BgJyaGoroiwa*)thisx; Player* player = GET_PLAYER(play); s32 bgId; diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c index 88cc8753c0e..e9741b68eca 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c @@ -76,7 +76,7 @@ static Vec3f D_808987A0[] = { 0.0f, 14.0f, 0.0f }; static Vec3f D_808987AC[] = { 0.0f, 8.0f, 0.0f }; void BgJyaHaheniron_ColliderInit(BgJyaHaheniron* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->actor, &sJntSphInit, this->colliderItems); @@ -116,7 +116,7 @@ void BgJyaHaheniron_SpawnFragments(PlayState* play, Vec3f* vec1, Vec3f* vec2) { } void BgJyaHaheniron_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgJyaHaheniron* this = (BgJyaHaheniron*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -133,7 +133,7 @@ void BgJyaHaheniron_Init(Actor* thisx, PlayState* play) { } void BgJyaHaheniron_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgJyaHaheniron* this = (BgJyaHaheniron*)thisx; if (this->actor.params == 0) { @@ -196,7 +196,7 @@ void BgJyaHaheniron_RubbleCollide(BgJyaHaheniron* this, PlayState* play) { } void BgJyaHaheniron_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgJyaHaheniron* this = (BgJyaHaheniron*)thisx; this->timer++; @@ -209,7 +209,7 @@ void BgJyaHaheniron_Draw(Actor* thisx, PlayState* play) { gObjectJyaIronDL_000AE0, gObjectJyaIronDL_000600, }; - s32 pad; + UNUSED s32 pad; BgJyaHaheniron* this = (BgJyaHaheniron*)thisx; if (this->actor.params == 0) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c index e096cfd046a..e5e7f4fa7de 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c @@ -104,7 +104,7 @@ void BgJyaIronobj_SpawnPillarParticles(BgJyaIronobj* this, PlayState* play, EnIk f32 coss; s16 rotY; f32 sins; - s32 pad[2]; + UNUSED s32 pad[2]; if (enIk->unk_2FF <= 0 || enIk->unk_2FF >= 4) { osSyncPrintf("Error 攻撃方法が分からない(%s %d)\n", "../z_bg_jya_ironobj.c", 233, enIk->unk_2FF); @@ -167,7 +167,7 @@ void BgJyaIronobj_SpawnThroneParticles(BgJyaIronobj* this, PlayState* play, EnIk f32 coss; s16 rotY; f32 sins; - s32 pad[2]; + UNUSED s32 pad[2]; if (enIk->unk_2FF <= 0 || enIk->unk_2FF >= 4) { osSyncPrintf("Error 攻撃方法が分からない(%s %d)\n", "../z_bg_jya_ironobj.c", 362, enIk->unk_2FF); @@ -215,7 +215,7 @@ void BgJyaIronobj_SpawnThroneParticles(BgJyaIronobj* this, PlayState* play, EnIk void BgJyaIronobj_Init(Actor* thisx, PlayState* play) { BgJyaIronobj* this = (BgJyaIronobj*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, 0); diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index ff740731d93..134f405023f 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -40,9 +40,9 @@ static InitChainEntry sInitChain[] = { }; void BgJyaKanaami_InitDynaPoly(BgJyaKanaami* this, PlayState* play, CollisionHeader* collision, s32 flag) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; DynaPolyActor_Init(&this->dyna, flag); CollisionHeader_GetVirtual(collision, &colHeader); @@ -95,7 +95,7 @@ void func_8089993C(BgJyaKanaami* this) { } void func_80899950(BgJyaKanaami* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s32 quakeId; this->unk_168 += 0x20; diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index 73c46dcdd25..ab6e110b62c 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -42,7 +42,7 @@ static InitChainEntry sInitChain[] = { }; void BgJyaLift_InitDynapoly(BgJyaLift* this, PlayState* play, CollisionHeader* collisionHeader, s32 moveFlag) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, moveFlag); diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index def39665a80..d0b11931a9f 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -111,7 +111,7 @@ static InitChainEntry sInitChain[] = { }; void BgJyaMegami_InitDynaPoly(BgJyaMegami* this, PlayState* play, CollisionHeader* collision, s32 flag) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, flag); @@ -120,7 +120,7 @@ void BgJyaMegami_InitDynaPoly(BgJyaMegami* this, PlayState* play, CollisionHeade } void BgJyaMegami_InitCollider(BgJyaMegami* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->dyna.actor, &sJntSphInit, &this->colliderItem); @@ -232,7 +232,7 @@ void BgJyaMegami_Explode(BgJyaMegami* this, PlayState* play) { u32 i; Vec3f sp8C; BgJyaMegamiPieceInit* temp2; - s32 pad; + UNUSED s32 pad; this->explosionTimer++; if (this->explosionTimer == 30) { @@ -321,7 +321,7 @@ static Gfx* sDLists[] = { }; void BgJyaMegami_DrawExplode(BgJyaMegami* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgJyaMegamiPiece* piece; u32 i; diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index 3e6a7458f82..bc067b50abd 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -60,9 +60,9 @@ static InitChainEntry sInitChain[] = { }; void BgJyaZurerukabe_InitDynaPoly(BgJyaZurerukabe* this, PlayState* play, CollisionHeader* collision, s32 flag) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; DynaPolyActor_Init(&this->dyna, flag); CollisionHeader_GetVirtual(collision, &colHeader); diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c index 18950ecb1ed..b78e9861dcf 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c @@ -119,7 +119,7 @@ void BgMenkuriEye_Update(Actor* thisx, PlayState* play) { void BgMenkuriEye_Draw(Actor* thisx, PlayState* play) { BgMenkuriEye* this = (BgMenkuriEye*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_bg_menkuri_eye.c", 292); Gfx_SetupDL_25Xlu(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c index eb4fe0f171e..129fef91a0d 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c @@ -32,7 +32,7 @@ static InitChainEntry sInitChain[] = { void BgMenkuriKaiten_Init(Actor* thisx, PlayState* play) { BgMenkuriKaiten* this = (BgMenkuriKaiten*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index 75e9167b400..2a4868cec4a 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -170,7 +170,7 @@ void BgMizuBwall_RotateVec3f(Vec3f* out, Vec3f* in, f32 sin, f32 cos) { } void BgMizuBwall_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMizuBwall* this = (BgMizuBwall*)thisx; CollisionHeader* colHeader = NULL; @@ -369,7 +369,7 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) { } void BgMizuBwall_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMizuBwall* this = (BgMizuBwall*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -413,7 +413,7 @@ void BgMizuBwall_SetAlpha(BgMizuBwall* this, PlayState* play) { void BgMizuBwall_SpawnDebris(BgMizuBwall* this, PlayState* play) { s32 i; - s32 pad; + UNUSED s32 pad; s16 rand1; s16 rand2; Vec3f* thisPos = &this->dyna.actor.world.pos; @@ -491,7 +491,7 @@ void BgMizuBwall_DoNothing(BgMizuBwall* this, PlayState* play) { } void BgMizuBwall_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMizuBwall* this = (BgMizuBwall*)thisx; this->actionFunc(this, play); diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c index 31e60f51be3..918ccb47de9 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c @@ -45,11 +45,11 @@ static InitChainEntry sInitChain[] = { }; void BgMizuShutter_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMizuShutter* this = (BgMizuShutter*)thisx; - s32 pad2; + UNUSED s32 pad2; CollisionHeader* colHeader = NULL; - s32 pad3; + UNUSED s32 pad3; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); this->displayList = sDisplayLists[BGMIZUSHUTTER_SIZE_PARAM(&this->dyna.actor)]; @@ -85,7 +85,7 @@ void BgMizuShutter_Init(Actor* thisx, PlayState* play) { } void BgMizuShutter_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMizuShutter* this = (BgMizuShutter*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -148,14 +148,14 @@ void BgMizuShutter_WaitForTimer(BgMizuShutter* this, PlayState* play) { } void BgMizuShutter_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMizuShutter* this = (BgMizuShutter*)thisx; this->actionFunc(this, play); } void BgMizuShutter_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMizuShutter* this = (BgMizuShutter*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mizu_shutter.c", 410); diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c index ccfd9ed875a..f2536583383 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c @@ -35,10 +35,10 @@ static InitChainEntry sInitChain[] = { }; void BgMizuUzu_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMizuUzu* this = (BgMizuUzu*)thisx; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_UNK); diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index ab73a8b9056..f8719e49d38 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -164,7 +164,7 @@ void BgMizuWater_Destroy(Actor* thisx, PlayState* play) { } void BgMizuWater_WaitForAction(BgMizuWater* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 waterLevelActionIndex; s16 prevSwitchFlag; @@ -213,7 +213,7 @@ void BgMizuWater_WaitForAction(BgMizuWater* this, PlayState* play) { } void BgMizuWater_ChangeWaterLevel(BgMizuWater* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 prevSwitchFlag; s32 waterLevelActionIndex; WaterBox* waterBoxes; @@ -295,7 +295,7 @@ void BgMizuWater_Update(Actor* thisx, PlayState* play) { s32 posY; s32 unk0; s32 unk1; - s32 pad; + UNUSED s32 pad; if (bREG(15) == 0) { osSyncPrintf("%x %x %x\n", Flags_GetSwitch(play, WATER_TEMPLE_WATER_F1_FLAG), diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index 4873c2c9e1f..d1a1540102f 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -50,9 +50,9 @@ void BgMoriBigst_SetupAction(BgMoriBigst* this, BgMoriBigstActionFunc actionFunc } void BgMoriBigst_InitDynapoly(BgMoriBigst* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; DynaPolyActor_Init(&this->dyna, moveFlag); CollisionHeader_GetVirtual(collision, &colHeader); @@ -66,7 +66,7 @@ void BgMoriBigst_InitDynapoly(BgMoriBigst* this, PlayState* play, CollisionHeade } void BgMoriBigst_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriBigst* this = (BgMoriBigst*)thisx; // "mori (bigST.keyceiling)" @@ -94,7 +94,7 @@ void BgMoriBigst_Init(Actor* thisx, PlayState* play) { } void BgMoriBigst_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriBigst* this = (BgMoriBigst*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -168,7 +168,7 @@ void BgMoriBigst_Fall(BgMoriBigst* this, PlayState* play) { } void BgMoriBigst_SetupLanding(BgMoriBigst* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 quake; BgMoriBigst_SetupAction(this, BgMoriBigst_Landing); @@ -224,7 +224,7 @@ void BgMoriBigst_SetupDone(BgMoriBigst* this, PlayState* play) { } void BgMoriBigst_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriBigst* this = (BgMoriBigst*)thisx; Actor_SetFocus(&this->dyna.actor, 50.0f); @@ -240,7 +240,7 @@ void BgMoriBigst_Update(Actor* thisx, PlayState* play) { } void BgMoriBigst_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriBigst* this = (BgMoriBigst*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mori_bigst.c", 541); diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c index 206e7a89e6e..850f53c6854 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c @@ -83,7 +83,7 @@ void func_808A18FC(BgMoriElevator* this, f32 distTo) { void BgMoriElevator_Init(Actor* thisx, PlayState* play) { BgMoriElevator* this = (BgMoriElevator*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; this->unk_172 = sIsSpawned; @@ -191,7 +191,7 @@ void BgMoriElevator_SetupSetPosition(BgMoriElevator* this) { } void BgMoriElevator_SetPosition(BgMoriElevator* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; if (BgMoriElevator_IsPlayerRiding(this, play)) { if (play->roomCtx.curRoom.num == 2) { @@ -249,7 +249,7 @@ void BgMoriElevator_Update(Actor* thisx, PlayState* play) { } void BgMoriElevator_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriElevator* this = (BgMoriElevator*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mori_elevator.c", 575); diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index 812e8c79c66..9f89af9767f 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -77,9 +77,9 @@ static InitChainEntry sInitChainLadder[] = { }; void BgMoriHashigo_InitDynapoly(BgMoriHashigo* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader; - s32 pad2; + UNUSED s32 pad2; colHeader = NULL; DynaPolyActor_Init(&this->dyna, moveFlag); @@ -94,7 +94,7 @@ void BgMoriHashigo_InitDynapoly(BgMoriHashigo* this, PlayState* play, CollisionH } void BgMoriHashigo_InitCollider(BgMoriHashigo* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->dyna.actor, &sJntSphInit, this->colliderItems); @@ -150,7 +150,7 @@ s32 BgMoriHashigo_InitLadder(BgMoriHashigo* this, PlayState* play) { } void BgMoriHashigo_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriHashigo* this = (BgMoriHashigo*)thisx; if (this->dyna.actor.params == HASHIGO_CLASP) { @@ -178,7 +178,7 @@ void BgMoriHashigo_Init(Actor* thisx, PlayState* play) { } void BgMoriHashigo_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriHashigo* this = (BgMoriHashigo*)thisx; if (this->dyna.actor.params == HASHIGO_LADDER) { @@ -267,7 +267,7 @@ void BgMoriHashigo_SetupLadderRest(BgMoriHashigo* this) { } void BgMoriHashigo_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriHashigo* this = (BgMoriHashigo*)thisx; if (this->hitTimer > 0) { @@ -279,7 +279,7 @@ void BgMoriHashigo_Update(Actor* thisx, PlayState* play) { } void BgMoriHashigo_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriHashigo* this = (BgMoriHashigo*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mori_hashigo.c", 516); diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c index f2df07d496d..a1b315d9c06 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c @@ -49,9 +49,9 @@ void BgMoriHashira4_SetupAction(BgMoriHashira4* this, BgMoriHashira4ActionFunc a } void BgMoriHashira4_InitDynaPoly(BgMoriHashira4* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader; - s32 pad2; + UNUSED s32 pad2; colHeader = NULL; DynaPolyActor_Init(&this->dyna, moveFlag); @@ -66,7 +66,7 @@ void BgMoriHashira4_InitDynaPoly(BgMoriHashira4* this, PlayState* play, Collisio } void BgMoriHashira4_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriHashira4* this = (BgMoriHashira4*)thisx; this->switchFlag = (this->dyna.actor.params >> 8) & 0x3F; @@ -98,7 +98,7 @@ void BgMoriHashira4_Init(Actor* thisx, PlayState* play) { } void BgMoriHashira4_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriHashira4* this = (BgMoriHashira4*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -148,7 +148,7 @@ void BgMoriHashira4_GateOpen(BgMoriHashira4* this, PlayState* play) { } void BgMoriHashira4_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriHashira4* this = (BgMoriHashira4*)thisx; if (this->actionFunc != NULL) { @@ -157,7 +157,7 @@ void BgMoriHashira4_Update(Actor* thisx, PlayState* play) { } void BgMoriHashira4_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriHashira4* this = (BgMoriHashira4*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mori_hashira4.c", 339); diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c index 1e01c5b5ab3..894206e9c6a 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c @@ -46,7 +46,7 @@ void BgMoriIdomizu_SetWaterLevel(PlayState* play, s16 waterLevel) { } void BgMoriIdomizu_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriIdomizu* this = (BgMoriIdomizu*)thisx; if (sIsSpawned) { @@ -83,7 +83,7 @@ void BgMoriIdomizu_Init(Actor* thisx, PlayState* play) { } void BgMoriIdomizu_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriIdomizu* this = (BgMoriIdomizu*)thisx; if (this->isLoaded) { @@ -149,7 +149,7 @@ void BgMoriIdomizu_Main(BgMoriIdomizu* this, PlayState* play) { } void BgMoriIdomizu_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriIdomizu* this = (BgMoriIdomizu*)thisx; if (this->actionFunc != NULL) { @@ -158,7 +158,7 @@ void BgMoriIdomizu_Update(Actor* thisx, PlayState* play) { } void BgMoriIdomizu_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriIdomizu* this = (BgMoriIdomizu*)thisx; u32 gameplayFrames = play->gameplayFrames; diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c index d20f7788866..38a49f3dafc 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c @@ -46,7 +46,7 @@ void BgMoriKaitenkabe_CrossProduct(Vec3f* dest, Vec3f* v1, Vec3f* v2) { } void BgMoriKaitenkabe_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriKaitenkabe* this = (BgMoriKaitenkabe*)thisx; CollisionHeader* colHeader = NULL; @@ -67,7 +67,7 @@ void BgMoriKaitenkabe_Init(Actor* thisx, PlayState* play) { } void BgMoriKaitenkabe_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriKaitenkabe* this = (BgMoriKaitenkabe*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -150,14 +150,14 @@ void BgMoriKaitenkabe_Rotate(BgMoriKaitenkabe* this, PlayState* play) { } void BgMoriKaitenkabe_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriKaitenkabe* this = (BgMoriKaitenkabe*)thisx; this->actionFunc(this, play); } void BgMoriKaitenkabe_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriKaitenkabe* this = (BgMoriKaitenkabe*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mori_kaitenkabe.c", 347); diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index d2c542b9eed..fad5ed733b2 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -46,7 +46,7 @@ static InitChainEntry sInitChain[] = { }; void BgMoriRakkatenjo_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriRakkatenjo* this = (BgMoriRakkatenjo*)thisx; CollisionHeader* colHeader = NULL; @@ -78,7 +78,7 @@ void BgMoriRakkatenjo_Init(Actor* thisx, PlayState* play) { } void BgMoriRakkatenjo_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriRakkatenjo* this = (BgMoriRakkatenjo*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -144,7 +144,7 @@ void BgMoriRakkatenjo_SetupFall(BgMoriRakkatenjo* this) { void BgMoriRakkatenjo_Fall(BgMoriRakkatenjo* this, PlayState* play) { static f32 bounceVel[] = { 4.0f, 1.5f, 0.4f, 0.1f }; - s32 pad; + UNUSED s32 pad; Actor* thisx = &this->dyna.actor; s32 quake; @@ -196,7 +196,7 @@ void BgMoriRakkatenjo_Rise(BgMoriRakkatenjo* this, PlayState* play) { } void BgMoriRakkatenjo_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriRakkatenjo* this = (BgMoriRakkatenjo*)thisx; if (this->timer > 0) { @@ -218,7 +218,7 @@ void BgMoriRakkatenjo_Update(Actor* thisx, PlayState* play) { } void BgMoriRakkatenjo_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgMoriRakkatenjo* this = (BgMoriRakkatenjo*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mori_rakkatenjo.c", 497); diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index d569c7e35b6..783419f47f0 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -192,7 +192,7 @@ static InitChainEntry sInitChain[] = { }; void BgPoEvent_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgPoEvent* this = (BgPoEvent*)thisx; Actor_ProcessInitChain(thisx, sInitChain); @@ -219,7 +219,7 @@ void BgPoEvent_Init(Actor* thisx, PlayState* play) { } void BgPoEvent_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgPoEvent* this = (BgPoEvent*)thisx; if (this->type >= 2) { @@ -578,7 +578,7 @@ void BgPoEvent_PaintingBurn(BgPoEvent* this, PlayState* play) { } void BgPoEvent_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgPoEvent* this = (BgPoEvent*)thisx; this->actionFunc(this, play); @@ -592,13 +592,13 @@ void BgPoEvent_Draw(Actor* thisx, PlayState* play) { gPoSistersAmyBlockDL, gPoSistersAmyBethBlockDL, gPoSistersJoellePaintingDL, gPoSistersBethPaintingDL, gPoSistersAmyPaintingDL, }; - s32 pad; + UNUSED s32 pad; BgPoEvent* this = (BgPoEvent*)thisx; u8 alpha; Vec3f sp58; Vec3f sp4C; f32 sp48; - s32 pad2; + UNUSED s32 pad2; OPEN_DISPS(play->state.gfxCtx, "../z_bg_po_event.c", 1481); Gfx_SetupDL_25Opa(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c index 8700d03e726..d934b3c6796 100644 --- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c +++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c @@ -76,7 +76,7 @@ static InitChainEntry sInitChain[] = { void BgPoSyokudai_Init(Actor* thisx, PlayState* play) { BgPoSyokudai* this = (BgPoSyokudai*)thisx; - s32 pad; + UNUSED s32 pad; Actor_ProcessInitChain(thisx, sInitChain); @@ -130,7 +130,7 @@ void BgPoSyokudai_Destroy(Actor* thisx, PlayState* play) { void BgPoSyokudai_Update(Actor* thisx, PlayState* play) { BgPoSyokudai* this = (BgPoSyokudai*)thisx; - s32 pad; + UNUSED s32 pad; CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); diff --git a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c index 10b2d2de370..3caa3d2c0ae 100644 --- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c +++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c @@ -38,10 +38,10 @@ void BgPushbox_SetupAction(BgPushbox* this, BgPushboxActionFunc actionFunc) { } void BgPushbox_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgPushbox* this = (BgPushbox*)thisx; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, DPM_UNK); @@ -78,7 +78,7 @@ void BgPushbox_Update(Actor* thisx, PlayState* play) { } void BgPushbox_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_bg_pushbox.c", 263); diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c index 3d7cd495b87..ca71768e876 100644 --- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c +++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c @@ -46,7 +46,7 @@ static InitChainEntry sInitChain[] = { void BgRelayObjects_Init(Actor* thisx, PlayState* play) { static u32 D_808A9508 = 0; BgRelayObjects* this = (BgRelayObjects*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(thisx, sInitChain); diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c index ef99a66d4f1..1282bbb934e 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c @@ -35,7 +35,7 @@ static InitChainEntry sInitChain[] = { void BgSpot00Break_Init(Actor* thisx, PlayState* play) { BgSpot00Break* this = (BgSpot00Break*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c index e594e36e794..c33171e4ea6 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c @@ -48,7 +48,7 @@ static InitChainEntry sInitChain[] = { void BgSpot00Hanebasi_Init(Actor* thisx, PlayState* play) { BgSpot00Hanebasi* this = (BgSpot00Hanebasi*)thisx; - s32 pad; + UNUSED s32 pad; Vec3f chainPos; CollisionHeader* colHeader = NULL; @@ -204,7 +204,7 @@ void BgSpot00Hanebasi_SetTorchLightInfo(BgSpot00Hanebasi* this, PlayState* play) void BgSpot00Hanebasi_Update(Actor* thisx, PlayState* play) { BgSpot00Hanebasi* this = (BgSpot00Hanebasi*)thisx; - s32 pad; + UNUSED s32 pad; this->actionFunc(this, play); diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index c298f1f0603..43dd95430d5 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -106,7 +106,7 @@ void func_808AAD3C(PlayState* play, Vec3f* vec, u32 arg2) { } void func_808AAE6C(BgSpot01Idohashira* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f sp30 = this->dyna.actor.world.pos; sp30.y += kREG(15); @@ -116,7 +116,7 @@ void func_808AAE6C(BgSpot01Idohashira* this, PlayState* play) { } void func_808AAF34(BgSpot01Idohashira* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; Vec3f dest; Vec3f src; @@ -152,7 +152,7 @@ s32 BgSpot01Idohashira_NotInCsMode(PlayState* play) { } CsCmdActorAction* BgSpot01Idohashira_GetNpcAction(PlayState* play, s32 actionIdx) { - s32 pad[2]; + UNUSED s32 pad[2]; CsCmdActorAction* npcAction = NULL; if (!BgSpot01Idohashira_NotInCsMode(play)) { @@ -189,7 +189,7 @@ s32 func_808AB29C(BgSpot01Idohashira* this, PlayState* play) { Vec3f* thisPos; f32 endX; f32 temp_f0; - s32 pad2; + UNUSED s32 pad2; Vec3f initPos; f32 endZ; f32 tempY; @@ -290,7 +290,7 @@ void BgSpot01Idohashira_Update(Actor* thisx, PlayState* play) { } void BgSpot01Idohashira_Init(Actor* thisx, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; BgSpot01Idohashira* this = (BgSpot01Idohashira*)thisx; CollisionHeader* colHeader; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c index a73f0282886..29360e74acf 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c @@ -37,10 +37,10 @@ void BgSpot01Idosoko_SetupAction(BgSpot01Idosoko* this, BgSpot01IdosokoActionFun } void BgSpot01Idosoko_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgSpot01Idosoko* this = (BgSpot01Idosoko*)thisx; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; DynaPolyActor_Init(&this->dyna, DPM_PLAYER); Actor_ProcessInitChain(&this->dyna.actor, sInitChain); diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c index 6444b24ac2a..73005d163b5 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c @@ -88,7 +88,7 @@ s32 func_808AC22C(Path* pathList, Vec3f* pos, s32 path, s32 waypoint) { void func_808AC2BC(BgSpot01Objects2* this, PlayState* play) { CollisionHeader* colHeader = NULL; Actor* thisx = &this->dyna.actor; - s32 pad; + UNUSED s32 pad; Vec3f position; if (Object_IsLoaded(&play->objectCtx, this->objBankIndex)) { diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index 7694548a715..003445d8d09 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c @@ -48,7 +48,7 @@ static InitChainEntry sInitChain[] = { }; void BgSpot02Objects_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgSpot02Objects* this = (BgSpot02Objects*)thisx; CollisionHeader* colHeader = NULL; @@ -215,7 +215,7 @@ void func_808ACC34(BgSpot02Objects* this, PlayState* play) { void func_808ACCB8(Actor* thisx, PlayState* play) { BgSpot02Objects* this = (BgSpot02Objects*)thisx; f32 rate; - s32 pad; + UNUSED s32 pad; u8 redPrim; u8 greenPrim; u8 bluePrim; @@ -280,7 +280,7 @@ void func_808AD3D4(BgSpot02Objects* this, PlayState* play) { void func_808AD450(Actor* thisx, PlayState* play) { BgSpot02Objects* this = (BgSpot02Objects*)thisx; - s32 pad; + UNUSED s32 pad; f32 lerp; OPEN_DISPS(play->state.gfxCtx, "../z_bg_spot02_objects.c", 736); diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c index a2c1540694d..8d5461c3b99 100644 --- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c @@ -44,7 +44,7 @@ void BgSpot03Taki_ApplyOpeningAlpha(BgSpot03Taki* this, s32 bufferIndex) { void BgSpot03Taki_Init(Actor* thisx, PlayState* play) { BgSpot03Taki* this = (BgSpot03Taki*)thisx; - s16 pad; + UNUSED s16 pad; CollisionHeader* colHeader = NULL; this->switchFlag = (this->dyna.actor.params & 0x3F); @@ -115,7 +115,7 @@ void BgSpot03Taki_Update(Actor* thisx, PlayState* play) { void BgSpot03Taki_Draw(Actor* thisx, PlayState* play) { BgSpot03Taki* this = (BgSpot03Taki*)thisx; - s32 pad; + UNUSED s32 pad; u32 gameplayFrames; OPEN_DISPS(play->state.gfxCtx, "../z_bg_spot03_taki.c", 321); diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c index d6bd8824cdd..44c20ce0bce 100644 --- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c +++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c @@ -39,10 +39,10 @@ static Gfx* sDLists[] = { }; void BgSpot05Soko_Init(Actor* thisx, PlayState* play) { - s32 pad1; + UNUSED s32 pad1; BgSpot05Soko* this = (BgSpot05Soko*)thisx; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; Actor_ProcessInitChain(thisx, sInitChain); this->switchFlag = (thisx->params >> 8) & 0xFF; diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index d603eaab656..f48d6ab5d7f 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -93,7 +93,7 @@ static InitChainEntry sInitChainWaterPlane[] = { void BgSpot06Objects_Init(Actor* thisx, PlayState* play) { BgSpot06Objects* this = (BgSpot06Objects*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; this->switchFlag = thisx->params & 0xFF; @@ -281,9 +281,9 @@ void BgSpot06Objects_LockSpawnBubbles(BgSpot06Objects* this, PlayState* play, s3 * This is where the fish shaped lock waits to be pulled out by the hookshot. Once it does it will spawn bubbles. */ void BgSpot06Objects_LockWait(BgSpot06Objects* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 i; - s32 pad2; + UNUSED s32 pad2; Vec3f effectPos; f32 sin; f32 cos; @@ -346,7 +346,7 @@ void BgSpot06Objects_LockPullOutward(BgSpot06Objects* this, PlayState* play) { */ void BgSpot06Objects_LockSwimToSurface(BgSpot06Objects* this, PlayState* play) { f32 cos; - f32 pad; + UNUSED s32 pad; this->dyna.actor.world.pos.y += this->dyna.actor.velocity.y; @@ -424,7 +424,7 @@ void BgSpot06Objects_Update(Actor* thisx, PlayState* play) { * Draw the Lake Hylia water plane, and scroll its texture */ void BgSpot06Objects_DrawLakeHyliaWater(BgSpot06Objects* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 gameplayFrames; OPEN_DISPS(play->state.gfxCtx, "../z_bg_spot06_objects.c", 844); @@ -491,7 +491,7 @@ void BgSpot06Objects_WaterPlaneCutsceneWait(BgSpot06Objects* this, PlayState* pl * This is where the Lake Hylia water plane rises in the cutscene after the Water Temple is cleared. */ void BgSpot06Objects_WaterPlaneCutsceneRise(BgSpot06Objects* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; this->dyna.actor.world.pos.y = this->lakeHyliaWaterLevel + WATER_LEVEL_RAISED; diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c index 37fc7931654..c72a6281938 100644 --- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c @@ -34,7 +34,7 @@ static InitChainEntry sInitChain[] = { void BgSpot07Taki_Init(Actor* thisx, PlayState* play) { BgSpot07Taki* this = (BgSpot07Taki*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_PLAYER); diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index 4c023b33910..33f8c8f87ba 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -94,14 +94,14 @@ static InitChainEntry sInitChain[] = { }; void func_808B02D0(BgSpot08Bakudankabe* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->dyna.actor, &sJntSphInit, this->colliderItems); } void func_808B0324(BgSpot08Bakudankabe* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s32 i; Vec3f burstDepthY; Vec3f burstDepthX; @@ -158,7 +158,7 @@ void func_808B0324(BgSpot08Bakudankabe* this, PlayState* play) { void BgSpot08Bakudankabe_Init(Actor* thisx, PlayState* play) { BgSpot08Bakudankabe* this = (BgSpot08Bakudankabe*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c index 79d46f99562..91ce8b55565 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c @@ -39,9 +39,9 @@ void BgSpot08Iceblock_SetupAction(BgSpot08Iceblock* this, BgSpot08IceblockAction } void BgSpot08Iceblock_InitDynaPoly(BgSpot08Iceblock* this, PlayState* play, CollisionHeader* collision, s32 flags) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; DynaPolyActor_Init(&this->dyna, flags); CollisionHeader_GetVirtual(collision, &colHeader); @@ -170,7 +170,7 @@ void BgSpot08Iceblock_Roll(BgSpot08Iceblock* this, PlayState* play) { f32 playerCentroidDist; s32 rollDataIndex; MtxF mtx; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); switch (this->dyna.actor.params & 0xFF) { @@ -251,7 +251,7 @@ void BgSpot08Iceblock_Roll(BgSpot08Iceblock* this, PlayState* play) { } void BgSpot08Iceblock_SpawnTwinFloe(BgSpot08Iceblock* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; f32 sin; f32 cos; diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index 19de02b5883..77b709b5e22 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -93,9 +93,9 @@ s32 func_808B1BA0(BgSpot09Obj* this, PlayState* play) { } s32 func_808B1BEC(BgSpot09Obj* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; - s32 pad2[2]; + UNUSED s32 pad2[2]; if (D_808B1F90[this->dyna.actor.params] != NULL) { DynaPolyActor_Init(&this->dyna, DPM_UNK); diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index de547753f89..d151a187598 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -52,7 +52,7 @@ static Vec3f D_808B272C = { 2259.0f, 108.0f, -1550.0f }; static Vec3f D_808B2738 = { 2259.0f, 108.0f, -1550.0f }; void func_808B2180(BgSpot11Bakudankabe* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->dyna.actor, &sCylinderInit); @@ -109,7 +109,7 @@ void func_808B2218(BgSpot11Bakudankabe* this, PlayState* play) { void BgSpot11Bakudankabe_Init(Actor* thisx, PlayState* play) { BgSpot11Bakudankabe* this = (BgSpot11Bakudankabe*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c index 5b5bad82aeb..4c61573b496 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c @@ -123,7 +123,7 @@ void func_808B2AB8(BgSpot11Oasis* this, PlayState* play) { void BgSpot11Oasis_Update(Actor* thisx, PlayState* play) { BgSpot11Oasis* this = (BgSpot11Oasis*)thisx; - s32 pad; + UNUSED s32 pad; u32 gameplayFrames; Vec3f sp30; diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index d8cf6331df5..ec2df3a0c21 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -43,9 +43,9 @@ static InitChainEntry sInitChain[] = { }; void BgSpot12Gate_InitDynaPoly(BgSpot12Gate* this, PlayState* play, CollisionHeader* collision, s32 flags) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; DynaPolyActor_Init(&this->dyna, flags); CollisionHeader_GetVirtual(collision, &colHeader); @@ -103,7 +103,7 @@ void func_808B317C(BgSpot12Gate* this) { } void func_808B318C(BgSpot12Gate* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 var; Math_StepToF(&this->dyna.actor.velocity.y, 1.6f, 0.03f); diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index 1a3dfe511b6..ee3eb2ee883 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -41,9 +41,9 @@ static InitChainEntry sInitChain[] = { }; void func_808B3420(BgSpot12Saku* this, PlayState* play, CollisionHeader* collision, s32 flags) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; DynaPolyActor_Init(&this->dyna, flags); CollisionHeader_GetVirtual(collision, &colHeader); diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index b5ef416397c..07cad39d6b1 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -55,9 +55,9 @@ static Vec3f D_808B45DC[] = { }; void func_808B3960(BgSpot15Rrbox* this, PlayState* play, CollisionHeader* collision, s32 flags) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; - u32 pad2; + UNUSED s32 pad2; DynaPolyActor_Init(&this->dyna, flags); CollisionHeader_GetVirtual(collision, &colHeader); diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c index 3cad81c90ee..09ea4d0c132 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c @@ -31,9 +31,9 @@ const ActorInit Bg_Spot15_Saku_InitVars = { }; void BgSpot15Saku_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgSpot15Saku* this = (BgSpot15Saku*)thisx; - s32 pad2; + UNUSED s32 pad2; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index d9e50a1f2cc..50666c7db26 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -149,7 +149,7 @@ void func_808B4C30(BgSpot16Bombstone* this) { } void func_808B4C4C(BgSpot16Bombstone* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Collider_InitJntSph(play, &this->colliderJntSph); Collider_SetJntSph(play, &this->colliderJntSph, &this->actor, &sJntSphInit, this->colliderElements); @@ -160,7 +160,7 @@ void func_808B4C4C(BgSpot16Bombstone* this, PlayState* play) { } void func_808B4D04(BgSpot16Bombstone* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Collider_InitCylinder(play, &this->colliderCylinder); Collider_SetCylinder(play, &this->colliderCylinder, &this->actor, &sCylinderInit); @@ -428,7 +428,7 @@ void func_808B5934(BgSpot16Bombstone* this) { } void func_808B5950(BgSpot16Bombstone* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; func_808B56BC(this, play); func_808B57E0(this, play); @@ -532,7 +532,7 @@ void BgSpot16Bombstone_Update(Actor* thisx, PlayState* play) { void BgSpot16Bombstone_Draw(Actor* thisx, PlayState* play) { BgSpot16Bombstone* this = (BgSpot16Bombstone*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_bg_spot16_bombstone.c", 1253); diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c index 5ab34704daa..ed96ec7ee78 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c @@ -119,7 +119,7 @@ void BgSpot16Doughnut_UpdateExpanding(Actor* thisx, PlayState* play) { void BgSpot16Doughnut_Draw(Actor* thisx, PlayState* play) { BgSpot16Doughnut* this = (BgSpot16Doughnut*)thisx; u32 scroll = play->gameplayFrames & 0xFFFF; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_bg_spot16_doughnut.c", 210); diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h index 051e45cf587..664ca3b3d2c 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h @@ -9,7 +9,7 @@ struct BgSpot16Doughnut; typedef struct BgSpot16Doughnut { /* 0x0000 */ Actor actor; /* 0x014C */ u16 fireFlag; - /* 0x014E */ char pad[0x02]; + /* 0x014E */ char unk_14E[0x2]; /* 0x0150 */ u8 envColorAlpha; } BgSpot16Doughnut; // size = 0x0154 diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c index 17f014a8228..b729f6ff045 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c @@ -36,7 +36,7 @@ static InitChainEntry sInitChain[] = { }; void func_808B6BC0(BgSpot17Bakudankabe* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s32 i; Vec3f burstDepthY; Vec3f burstDepthX; @@ -92,7 +92,7 @@ void func_808B6BC0(BgSpot17Bakudankabe* this, PlayState* play) { void BgSpot17Bakudankabe_Init(Actor* thisx, PlayState* play) { BgSpot17Bakudankabe* this = (BgSpot17Bakudankabe*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); @@ -123,7 +123,7 @@ void BgSpot17Bakudankabe_Update(Actor* thisx, PlayState* play) { } void BgSpot17Bakudankabe_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; s8 r = coss(play->gameplayFrames * 1500) >> 8; s8 g = coss(play->gameplayFrames * 1500) >> 8; diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c index 9ca92f8a6c1..5a9b1fa567d 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c @@ -52,7 +52,7 @@ void func_808B746C(Actor* thisx, PlayState* play) { } void func_808B7478(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_bg_spot17_funen.c", 153); diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index ad0595cf5f2..20c26ac7694 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -129,7 +129,7 @@ static InitChainEntry sInitChain[] = { }; void BgSpot18Basket_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgSpot18Basket* this = (BgSpot18Basket*)thisx; CollisionHeader* colHeader = NULL; @@ -306,7 +306,7 @@ void func_808B7F74(BgSpot18Basket* this) { } void func_808B7FC0(BgSpot18Basket* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 tempUnk214; f32 tempUnk210; s16 arrayValue; @@ -425,7 +425,7 @@ void func_808B81A0(BgSpot18Basket* this, PlayState* play) { } void BgSpot18Basket_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgSpot18Basket* this = (BgSpot18Basket*)thisx; s32 bgId; diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c index 8404e1565f4..93222df5620 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c @@ -35,7 +35,7 @@ static InitChainEntry sInitChain[] = { void BgSpot18Futa_Init(Actor* thisx, PlayState* play) { BgSpot18Futa* this = (BgSpot18Futa*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index 772b38daf67..311fdf1357b 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -125,7 +125,7 @@ s32 func_808B8A5C(BgSpot18Obj* this, PlayState* play) { } s32 func_808B8A98(BgSpot18Obj* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); @@ -243,7 +243,7 @@ void func_808B8EE0(BgSpot18Obj* this) { } void func_808B8F08(BgSpot18Obj* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); Math_StepToF(&this->dyna.actor.speedXZ, 1.2f, 0.1f); diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c index edaa45269f1..8a1bc307c85 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c @@ -37,7 +37,7 @@ static InitChainEntry sInitChain[] = { }; void BgSpot18Shutter_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgSpot18Shutter* this = (BgSpot18Shutter*)thisx; s32 param = (this->dyna.actor.params >> 8) & 1; CollisionHeader* colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c index 818051fdce9..bb8a0654b3b 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c @@ -33,7 +33,7 @@ static InitChainEntry sInitChain[] = { }; void BgSstFloor_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgSstFloor* this = (BgSstFloor*)thisx; CollisionHeader* colHeader = NULL; @@ -44,14 +44,14 @@ void BgSstFloor_Init(Actor* thisx, PlayState* play) { } void BgSstFloor_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgSstFloor* this = (BgSstFloor*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); } void BgSstFloor_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgSstFloor* this = (BgSstFloor*)thisx; Player* player = GET_PLAYER(play); CollisionHeader* colHeader = SEGMENTED_TO_VIRTUAL(&gBongoDrumCol); diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c index 2b4cc105393..e439905b28d 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c +++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c @@ -82,7 +82,7 @@ void BgTokiHikari_Draw(Actor* thisx, PlayState* play) { } void func_808BA018(BgTokiHikari* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_bg_toki_hikari.c", 246); Gfx_SetupDL_25Opa(play->state.gfxCtx); @@ -131,7 +131,7 @@ void func_808BA274(BgTokiHikari* this, PlayState* play) { } void func_808BA2CC(BgTokiHikari* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; OPEN_DISPS(play->state.gfxCtx, "../z_bg_toki_hikari.c", 350); Matrix_Translate(0.0f, 276.0f, 1122.0f, MTXMODE_NEW); diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index bfbcb9cb86b..b6ef2544df8 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -65,7 +65,7 @@ void BgTokiSwd_SetupAction(BgTokiSwd* this, BgTokiSwdActionFunc actionFunc) { } void BgTokiSwd_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgTokiSwd* this = (BgTokiSwd*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -161,7 +161,7 @@ void BgTokiSwd_Update(Actor* thisx, PlayState* play) { void BgTokiSwd_Draw(Actor* thisx, PlayState* play2) { PlayState* play = play2; BgTokiSwd* this = (BgTokiSwd*)thisx; - s32 pad[3]; + UNUSED s32 pad[3]; OPEN_DISPS(play->state.gfxCtx, "../z_bg_toki_swd.c", 727); diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index 733b4ec7df9..6f4f782dc7a 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -59,7 +59,7 @@ void BgTreemouth_SetupAction(BgTreemouth* this, BgTreemouthActionFunc actionFunc } void BgTreemouth_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgTreemouth* this = (BgTreemouth*)thisx; CollisionHeader* colHeader = NULL; @@ -225,7 +225,7 @@ void BgTreemouth_Update(Actor* thisx, PlayState* play) { } void BgTreemouth_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; u16 alpha = 500; OPEN_DISPS(play->state.gfxCtx, "../z_bg_treemouth.c", 893); 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 5f3d2d366d5..6992e55d888 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -31,7 +31,7 @@ static InitChainEntry sInitChain[] = { }; void BgUmaJump_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgUmaJump* this = (BgUmaJump*)thisx; CollisionHeader* colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c index 911dcc87def..d7b99eb1097 100644 --- a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c +++ b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c @@ -32,7 +32,7 @@ static InitChainEntry sInitChain[] = { }; void BgVbSima_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgVbSima* this = (BgVbSima*)thisx; CollisionHeader* colHeader = NULL; @@ -43,7 +43,7 @@ void BgVbSima_Init(Actor* thisx, PlayState* play) { } void BgVbSima_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgVbSima* this = (BgVbSima*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -69,7 +69,7 @@ void BgVbSima_SpawnEmber(BossFdEffect* effect, Vec3f* position, Vec3f* velocity, void BgVbSima_Update(Actor* thisx, PlayState* play) { static Color_RGBA8 colorYellow = { 255, 255, 0, 255 }; static Color_RGBA8 colorRed = { 255, 10, 0, 255 }; - s32 pad; + UNUSED s32 pad; BgVbSima* this = (BgVbSima*)thisx; BossFd* bossFd = (BossFd*)this->dyna.actor.parent; f32 minus1 = -1.0f; diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c index f1f291a337a..65466044c31 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c @@ -38,7 +38,7 @@ static InitChainEntry sInitChain[] = { }; void BgYdanHasi_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgYdanHasi* this = (BgYdanHasi*)thisx; CollisionHeader* colHeader = NULL; WaterBox* waterBox; diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c index 8a8668d0928..483b9557f77 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c @@ -75,7 +75,7 @@ static InitChainEntry sInitChain[] = { }; void BgYdanMaruta_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BgYdanMaruta* this = (BgYdanMaruta*)thisx; Vec3f sp4C[3]; s32 i; diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c index f8962823739..78f8d906bda 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -97,7 +97,7 @@ void BgZg_Update(Actor* thisx, PlayState* play) { } void BgZg_Init(Actor* thisx, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; BgZg* this = (BgZg*)thisx; CollisionHeader* colHeader; diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 3e298869b8f..f3f20edff80 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -521,7 +521,7 @@ void BossDodongo_Damaged(BossDodongo* this, PlayState* play) { void BossDodongo_Explode(BossDodongo* this, PlayState* play) { static Color_RGBA8 dustPrimColor = { 255, 255, 0, 255 }; static Color_RGBA8 dustEnvColor = { 255, 10, 0, 255 }; - s16 pad; + UNUSED s16 pad; Vec3f dustVel; Vec3f dustAcell; Vec3f dustPos; @@ -598,7 +598,7 @@ void BossDodongo_GetUp(BossDodongo* this, PlayState* play) { } void BossDodongo_BlowFire(BossDodongo* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f unusedZeroVec1 = { 0.0f, 0.0f, 0.0f }; Vec3f unusedZeroVec2 = { 0.0f, 0.0f, 0.0f }; @@ -819,7 +819,7 @@ void BossDodongo_Update(Actor* thisx, PlayState* play2) { s16 i; Player* player = GET_PLAYER(play); Player* player2 = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; this->unk_1E2 = 0; this->unk_19E++; @@ -1088,7 +1088,7 @@ s32 BossDodongo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Ve CLOSE_DISPS(play->state.gfxCtx, "../z_boss_dodongo.c", 3826); } - { s32 pad; } // Required to match + { UNUSED s32 pad; } // Required to match return 1; } @@ -1116,7 +1116,7 @@ void BossDodongo_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s void BossDodongo_Draw(Actor* thisx, PlayState* play) { BossDodongo* this = (BossDodongo*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_boss_dodongo.c", 3922); Gfx_SetupDL_25Opa(play->state.gfxCtx); @@ -1145,7 +1145,7 @@ f32 func_808C4F6C(BossDodongo* this, PlayState* play) { f32 xDiff; f32 zDiff; f32 sp2C; - s32 pad; + UNUSED s32 pad; f32 temp_f2; f32 rotation; Player* player = GET_PLAYER(play); @@ -1168,7 +1168,7 @@ f32 func_808C50A8(BossDodongo* this, PlayState* play) { f32 xDiff; f32 zDiff; f32 sp2C; - s32 pad; + UNUSED s32 pad; f32 temp_f2; f32 rotation; Player* player = GET_PLAYER(play); @@ -1221,7 +1221,7 @@ void BossDodongo_SpawnFire(BossDodongo* this, PlayState* play, s16 params) { } void BossDodongo_UpdateDamage(BossDodongo* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; ColliderInfo* item1; u8 swordDamage; s32 damage; @@ -1553,7 +1553,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) { { -890.0f, 0.0f, -3804.0f }, { -1390.0f, 0.0f, -3304.0f } }; Vec3f* sp78; - s32 pad74; + UNUSED s32 pad74; if (this->unk_1A2 == 0) { sp78 = &spAC[this->unk_1A0]; @@ -1667,7 +1667,7 @@ void BossDodongo_UpdateEffects(PlayState* play) { } void BossDodongo_DrawEffects(PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 i; u8 materialFlag = 0; BossDodongoEffect* eff; diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index 83e22e0b9ef..229d5421cfc 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -171,7 +171,7 @@ void BossFd_UpdateCamera(BossFd* this, PlayState* play) { } void BossFd_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossFd* this = (BossFd*)thisx; s16 i; @@ -224,7 +224,7 @@ void BossFd_Init(Actor* thisx, PlayState* play) { } void BossFd_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossFd* this = (BossFd*)thisx; SkelAnime_Free(&this->skelAnimeHead, play); @@ -1154,7 +1154,7 @@ void BossFd_Effects(BossFd* this, PlayState* play) { Vec3f spawnVel1; Vec3f spawnAccel1; Vec3f spawnPos1; - s32 pad; + UNUSED s32 pad; Audio_PlaySoundGeneral(NA_SE_EN_VALVAISA_APPEAR - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); @@ -1303,7 +1303,7 @@ void BossFd_CollisionCheck(BossFd* this, PlayState* play) { } void BossFd_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossFd* this = (BossFd*)thisx; f32 headGlow; f32 rManeGlow; @@ -1635,7 +1635,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, PlayState* play) { } void BossFd_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossFd* this = (BossFd*)thisx; osSyncPrintf("FD DRAW START\n"); diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index a2e58fe507a..1689957f2e6 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -169,7 +169,7 @@ void BossFd2_SpawnDust(BossFdEffect* effect, Vec3f* position, Vec3f* velocity, V } void BossFd2_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossFd2* this = (BossFd2*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -187,7 +187,7 @@ void BossFd2_Init(Actor* thisx, PlayState* play) { } void BossFd2_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossFd2* this = (BossFd2*)thisx; SkelAnime_Free(&this->skelAnime, play); @@ -1154,7 +1154,7 @@ void BossFd2_UpdateMane(BossFd2* this, PlayState* play, Vec3f* head, Vec3f* pos, } void BossFd2_DrawMane(BossFd2* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossFd* bossFd = (BossFd*)this->actor.parent; s16 i; @@ -1187,7 +1187,7 @@ void BossFd2_DrawMane(BossFd2* this, PlayState* play) { void BossFd2_Draw(Actor* thisx, PlayState* play) { static void* eyeTextures[] = { gHoleVolvagiaEyeOpenTex, gHoleVolvagiaEyeHalfTex, gHoleVolvagiaEyeClosedTex }; - s32 pad; + UNUSED s32 pad; BossFd2* this = (BossFd2*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_boss_fd2.c", 2617); diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index aff26978230..4c99686dd9a 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -472,7 +472,7 @@ void BossGanon_Destroy(Actor* thisx, PlayState* play) { } void BossGanon_SetupIntroCutscene(BossGanon* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 animBankIndex = Object_GetIndex(&play->objectCtx, OBJECT_GANON_ANIME2); if (animBankIndex < 0) { @@ -527,7 +527,7 @@ void BossGanon_SetIntroCsCamera(BossGanon* this, u8 camPosIndex) { void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) { u8 moveCam = false; Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; f32 sin; f32 cos; Camera* mainCam; @@ -1161,7 +1161,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) { } void BossGanon_SetupDeathCutscene(BossGanon* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 animBankIndex = Object_GetIndex(&play->objectCtx, OBJECT_GANON_ANIME2); if (Object_IsLoaded(&play->objectCtx, animBankIndex)) { @@ -1177,7 +1177,7 @@ void BossGanon_SetupDeathCutscene(BossGanon* this, PlayState* play) { } void BossGanon_SetupTowerCutscene(BossGanon* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 animBankIndex = Object_GetIndex(&play->objectCtx, OBJECT_GANON_ANIME2); if (Object_IsLoaded(&play->objectCtx, animBankIndex)) { @@ -1216,7 +1216,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) { s16 i; u8 moveCam = false; Player* player = GET_PLAYER(play); - s16 pad; + UNUSED s16 pad; Vec3f sp98; Vec3f sp8C; Vec3f sp80; @@ -1975,7 +1975,7 @@ void BossGanon_SetupChargeBigMagic(BossGanon* this, PlayState* play) { } void BossGanon_ChargeBigMagic(BossGanon* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 targetPosX; f32 targetPosZ; Vec3f sp80; @@ -2189,7 +2189,7 @@ void BossGanon_SetupWait(BossGanon* this, PlayState* play) { void BossGanon_Wait(BossGanon* this, PlayState* play) { f32 sin; - s32 pad; + UNUSED s32 pad; f32 cos; Player* player = GET_PLAYER(play); @@ -3336,7 +3336,7 @@ f32 BossGanon_RandZeroOne(void) { } void BossGanon_DrawShock(BossGanon* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; GraphicsContext* gfxCtx = play->state.gfxCtx; s16 i; @@ -3392,7 +3392,7 @@ void BossGanon_DrawShock(BossGanon* this, PlayState* play) { } void BossGanon_DrawHandLightBall(BossGanon* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; GraphicsContext* gfxCtx = play->state.gfxCtx; s32 alpha; @@ -3432,7 +3432,7 @@ void BossGanon_DrawHandLightBall(BossGanon* this, PlayState* play) { } void BossGanon_DrawBigMagicCharge(BossGanon* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 yRot; GraphicsContext* gfxCtx = play->state.gfxCtx; s16 i; @@ -3516,7 +3516,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, PlayState* play) { } void BossGanon_DrawTriforce(BossGanon* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; if (this->fwork[GDF_TRIFORCE_PRIM_A] > 0.0f) { OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon.c", 7732); @@ -3568,7 +3568,7 @@ void BossGanon_DrawTriforce(BossGanon* this, PlayState* play) { } void BossGanon_DrawDarkVortex(BossGanon* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; if (this->fwork[GDF_VORTEX_ALPHA] > 0.0f) { OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon.c", 7792); @@ -3748,7 +3748,7 @@ void BossGanon_GenShadowTexture(u8* tex, BossGanon* this, PlayState* play) { } void BossGanon_DrawShadowTexture(void* tex, BossGanon* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 zOffset; GraphicsContext* gfxCtx = play->state.gfxCtx; @@ -3868,9 +3868,9 @@ void BossGanon_LightBall_Update(Actor* thisx, PlayState* play2) { f32 yDistFromGanondorf; f32 zDistFromGanondorf; Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; BossGanon* ganondorf = (BossGanon*)this->actor.parent; - s32 pad1; + UNUSED s32 pad1; this->unk_1A2++; ganondorf->envLightMode = 1; @@ -4123,7 +4123,7 @@ void BossGanon_LightBall_Draw(Actor* thisx, PlayState* play) { BossGanon* this = (BossGanon*)thisx; s16 i; f32 alpha; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon.c", 9849); @@ -4306,7 +4306,7 @@ void func_808E2544(Actor* thisx, PlayState* play) { s16 sp80; BossGanon* this = (BossGanon*)thisx; BossGanon* dorf = (BossGanon*)this->actor.parent; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); ColliderInfo* acHitInfo; Vec3f sp60; @@ -4591,7 +4591,7 @@ void BossGanon_UpdateEffects(PlayState* play) { Player* player = GET_PLAYER(play); GanondorfEffect* eff = play->specialEffects; s16 i; - s32 pad; + UNUSED s32 pad; f32 xDiff; f32 yDiff; f32 zDiff; @@ -4600,8 +4600,8 @@ void BossGanon_UpdateEffects(PlayState* play) { Vec3f spA0; s16 bodyPart; f32 distToPlayer; - s32 pad2; - s32 pad3; + UNUSED s32 pad2; + UNUSED s32 pad3; spA0.x = 0.0f; spA0.y = 0.0f; @@ -4805,7 +4805,7 @@ static u8 sLightningEnvColors[] = { void BossGanon_DrawEffects(PlayState* play) { u8 materialFlag = 0; s16 i; - s32 pad; + UNUSED s32 pad; GraphicsContext* gfxCtx = play->state.gfxCtx; GanondorfEffect* eff = play->specialEffects; GanondorfEffect* effFirst = eff; diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index 2ca2f67746c..6a99c041d7c 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -76,7 +76,7 @@ void func_808FD080(s32 idx, ColliderJntSph* collider, Vec3f* arg2) { } void BossGanon2_SetObjectSegment(BossGanon2* this, PlayState* play, s32 objectId, u8 setRSPSegment) { - s32 pad; + UNUSED s32 pad; s32 objectIdx = Object_GetIndex(&play->objectCtx, objectId); gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.status[objectIdx].segment); @@ -129,7 +129,7 @@ void func_808FD27C(PlayState* play, Vec3f* position, Vec3f* velocity, f32 scale) void BossGanon2_Init(Actor* thisx, PlayState* play) { BossGanon2* this = (BossGanon2*)thisx; - s32 pad; + UNUSED s32 pad; s16 i; play->specialEffects = sEffects; @@ -179,12 +179,12 @@ void func_808FD5C4(BossGanon2* this, PlayState* play) { } void func_808FD5F4(BossGanon2* this, PlayState* play) { - s16 pad; + UNUSED s16 pad; u8 sp8D; Player* player; s32 objectIdx; s32 zero = 0; - s32 pad2; + UNUSED s32 pad2; sp8D = false; player = GET_PLAYER(play); @@ -914,7 +914,7 @@ void func_808FF898(BossGanon2* this, PlayState* play) { if (SQ(this->unk_218.x - gj->dyna.actor.world.pos.x) + SQ(this->unk_218.z - gj->dyna.actor.world.pos.z) < SQ(100.0f)) { - s32 pad; + UNUSED s32 pad; Vec3f sp28; Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y) + 0.5f, MTXMODE_NEW); @@ -1282,7 +1282,7 @@ void func_80900890(BossGanon2* this, PlayState* play) { Player* player; Camera* mainCam2; Camera* mainCam3; - s32 pad; + UNUSED s32 pad; f32 temp_f12; f32 temp_f2; @@ -1959,7 +1959,7 @@ void func_80902524(BossGanon2* this, PlayState* play) { void BossGanon2_Update(Actor* thisx, PlayState* play) { BossGanon2* this = (BossGanon2*)thisx; - s32 pad; + UNUSED s32 pad; s16 i; f32 phi_f2; u16 i2; @@ -2212,7 +2212,7 @@ void func_809034E4(Vec3f* arg0, Vec3f* arg1) { f32 phi_f30; f32 temp_f28; f32 temp_f26; - s32 pad[3]; + UNUSED s32 pad[3]; Vec3f sp18C[20]; Vec3f sp9C[20]; @@ -2411,7 +2411,7 @@ void func_80903F38(BossGanon2* this, PlayState* play) { } void func_80904108(BossGanon2* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; if (this->unk_324 > 0.0f) { OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon2.c", 5131); @@ -2486,7 +2486,7 @@ void func_80904340(BossGanon2* this, PlayState* play) { } void func_8090464C(BossGanon2* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; if (this->unk_1B4 > 0.0f) { OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon2.c", 5264); @@ -2509,7 +2509,7 @@ void func_8090464C(BossGanon2* this, PlayState* play) { } s32 BossGanon2_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { - s32 pad; + UNUSED s32 pad; BossGanon2* this = (BossGanon2*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon2.c", 5355); @@ -2539,7 +2539,7 @@ s32 BossGanon2_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec } void BossGanon2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { - s8 pad; + UNUSED s8 pad; s8 temp_v0; BossGanon2* this = (BossGanon2*)thisx; Vec3f sp4C; @@ -2607,7 +2607,7 @@ void BossGanon2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* } void func_80904D88(BossGanon2* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 i; OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon2.c", 5575); @@ -2638,7 +2638,7 @@ void func_80904D88(BossGanon2* this, PlayState* play) { } void func_80904FC8(BossGanon2* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon2.c", 5632); @@ -2722,7 +2722,7 @@ void BossGanon2_PostLimbDraw2(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s } void func_80905674(BossGanon2* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; if (this->unk_380 > 0.0f) { OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon2.c", 5772); @@ -2802,7 +2802,7 @@ void BossGanon2_Draw(Actor* thisx, PlayState* play) { if ((this->unk_312 != 0) || (D_80907080 != 0)) { func_80903F38(this, play); if (this->unk_312 == 0) { - s32 pad; + UNUSED s32 pad; D_80907080 -= 40; if (D_80907080 <= 0) { @@ -2826,7 +2826,7 @@ void BossGanon2_Draw(Actor* thisx, PlayState* play) { } void BossGanon2_UpdateEffects(BossGanon2* this, PlayState* play) { - s32 pad[5]; + UNUSED s32 pad[5]; Player* player = GET_PLAYER(play); BossGanon2Effect* effect = play->specialEffects; Vec3f sp78; @@ -3053,7 +3053,7 @@ void BossGanon2_GenShadowTexture(void* shadowTexture, BossGanon2* this, PlayStat } void BossGanon2_DrawShadowTexture(void* shadowTexture, BossGanon2* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; GraphicsContext* gfxCtx = play->state.gfxCtx; s16 alpha; diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index c4e7a247287..de3ce16372b 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -274,7 +274,7 @@ void BossGanondrof_SetColliderPos(Vec3f* pos, ColliderCylinder* collider) { } void BossGanondrof_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossGanondrof* this = (BossGanondrof*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -310,7 +310,7 @@ void BossGanondrof_Init(Actor* thisx, PlayState* play) { } void BossGanondrof_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossGanondrof* this = (BossGanondrof*)thisx; osSyncPrintf("DT1\n"); @@ -332,7 +332,7 @@ void BossGanondrof_SetupIntro(BossGanondrof* this, PlayState* play) { void BossGanondrof_Intro(BossGanondrof* this, PlayState* play) { s16 i; - s32 pad; + UNUSED s32 pad; EnfHG* horse = (EnfHG*)this->actor.child; SkelAnime_Update(&this->skelAnime); @@ -941,7 +941,7 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) { u8 bodyDecayLevel = 0; f32 camX; f32 camZ; - f32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); Camera* mainCam = Play_GetCamera(play, CAM_ID_MAIN); @@ -1289,9 +1289,9 @@ void BossGanondrof_Update(Actor* thisx, PlayState* play) { f32 legRotTargetY; f32 legRotTargetZ; f32 legSplitTarget; - s32 pad2; + UNUSED s32 pad2; s16 i; - s32 pad; + UNUSED s32 pad; BossGanondrof* this = (BossGanondrof*)thisx; EnfHG* horse; @@ -1483,7 +1483,7 @@ Gfx* BossGanondrof_EmptyDList(GraphicsContext* gfxCtx) { } void BossGanondrof_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossGanondrof* this = (BossGanondrof*)thisx; EnfHG* horse; diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index 8ed2be93242..d56a6c0f8e7 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -339,7 +339,7 @@ static InitChainEntry sInitChain[] = { }; void BossGoma_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossGoma* this = (BossGoma*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -672,7 +672,7 @@ void BossGoma_SetupEncounterState4(BossGoma* this, PlayState* play) { void BossGoma_Encounter(BossGoma* this, PlayState* play) { Camera* mainCam; Player* player = GET_PLAYER(play); - s32 pad[2]; + UNUSED s32 pad[2]; Math_ApproachZeroF(&this->actor.speedXZ, 0.5f, 2.0f); @@ -1897,7 +1897,7 @@ void BossGoma_UpdateEyeEnvColor(BossGoma* this) { void BossGoma_Update(Actor* thisx, PlayState* play) { BossGoma* this = (BossGoma*)thisx; - s32 pad; + UNUSED s32 pad; this->visualState = VISUALSTATE_DEFAULT; this->frameCount++; @@ -2049,7 +2049,7 @@ void BossGoma_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* r Vec3s childRot; EnGoma* babyGohma; BossGoma* this = (BossGoma*)thisx; - s32 pad; + UNUSED s32 pad; MtxF mtx; if (limbIndex == BOSSGOMA_LIMB_TAIL4) { // tail end/last part diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index ec476e2d034..0dbb002b478 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -390,7 +390,7 @@ void BossMo_Init(Actor* thisx, PlayState* play2) { } void BossMo_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossMo* this = (BossMo*)thisx; if (this->actor.params >= BOSSMO_TENTACLE) { @@ -440,12 +440,12 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { Vec3f sp138; Vec3f sp12C; Vec3f sp120; - s32 pad11C; - s32 pad118; - s32 pad114; - s32 pad110; - s32 pad10C; - s32 pad108; + UNUSED s32 pad11C; + UNUSED s32 pad118; + UNUSED s32 pad114; + UNUSED s32 pad110; + UNUSED s32 pad10C; + UNUSED s32 pad108; Vec3f spFC; Vec3f spF0; f32 padEC; @@ -1196,7 +1196,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) { f32 dz; f32 tempX; f32 tempY; - s32 pad84; + UNUSED s32 pad84; f32 sp80; f32 sp7C; f32 sp78; @@ -1847,19 +1847,19 @@ void BossMo_Core(BossMo* this, PlayState* play) { f32 spD4; f32 spD0; f32 spCC; - s32 padC8; + UNUSED s32 padC8; s32 temp; // not on stack f32 xScaleTarget; // not on stack f32 yScaleTarget; Vec3f effectPos; Vec3f effectVelocity; Vec3f effectAccel; - s32 pad94; - s32 pad90; + UNUSED s32 pad94; + UNUSED s32 pad90; s16 j; s16 index; // not on stack f32 sp88; - s32 pad84; + UNUSED s32 pad84; f32 sp80; f32 sp7C; Vec3f sp70; @@ -2209,7 +2209,7 @@ void BossMo_Core(BossMo* this, PlayState* play) { } void BossMo_UpdateCore(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossMo* this = (BossMo*)thisx; s16 i; Player* player = GET_PLAYER(play); @@ -2256,7 +2256,7 @@ void BossMo_UpdateCore(Actor* thisx, PlayState* play) { void BossMo_UpdateTent(Actor* thisx, PlayState* play) { s16 i; s16 index; - s32 pad; + UNUSED s32 pad; BossMo* this = (BossMo*)thisx; Player* player = GET_PLAYER(play); f32 phi_f0; @@ -2349,7 +2349,7 @@ void BossMo_UpdateTent(Actor* thisx, PlayState* play) { Vec3f sp7C; Vec3f bubblePos; Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; - s32 pad; + UNUSED s32 pad; this->baseBubblesTimer--; sp88.x = 0.0; @@ -2460,8 +2460,8 @@ void BossMo_DrawTentacle(BossMo* this, PlayState* play) { BossMo_InitRand(1, 29100, 9786); for (i = 0; i < 41; i++, matrix++) { - s32 pad; - s32 pad2; + UNUSED s32 pad; + UNUSED s32 pad2; if (i < 2) { Matrix_Push(); @@ -2564,7 +2564,7 @@ void BossMo_DrawTentacle(BossMo* this, PlayState* play) { } void BossMo_DrawWater(BossMo* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_boss_mo.c", 6582); if (1) {} @@ -2594,7 +2594,7 @@ void BossMo_DrawWater(BossMo* this, PlayState* play) { } void BossMo_DrawCore(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossMo* this = (BossMo*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_boss_mo.c", 6688); @@ -2721,7 +2721,7 @@ void BossMo_DrawCore(Actor* thisx, PlayState* play) { } void BossMo_DrawTent(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossMo* this = (BossMo*)thisx; u16 scroll; @@ -2902,7 +2902,7 @@ void BossMo_UpdateEffects(BossMo* this, PlayState* play) { void BossMo_DrawEffects(BossMoEffect* effect, PlayState* play) { u8 materialFlag = 0; s16 i; - s32 pad; + UNUSED s32 pad; GraphicsContext* gfxCtx = play->state.gfxCtx; BossMoEffect* effectHead = effect; diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index 106ce0b2661..86556e18083 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -333,7 +333,7 @@ void BossSst_Init(Actor* thisx, PlayState* play2) { } void BossSst_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossSst* this = (BossSst*)thisx; Collider_DestroyJntSph(play, &this->colliderJntSph); @@ -2567,7 +2567,7 @@ void BossSst_HeadCollisionCheck(BossSst* this, PlayState* play) { } void BossSst_UpdateHand(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossSst* this = (BossSst*)thisx; BossSstHandTrail* trail; @@ -2622,7 +2622,7 @@ void BossSst_UpdateHand(Actor* thisx, PlayState* play) { } void BossSst_UpdateHead(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossSst* this = (BossSst*)thisx; func_8002DBD0(&this->actor, &sHandOffsets[RIGHT], &sHands[RIGHT]->actor.world.pos); @@ -2724,7 +2724,7 @@ void BossSst_DrawHand(Actor* thisx, PlayState* play) { s32 i; s32 idx; s32 end; - s32 pad; + UNUSED s32 pad; Gfx_SetupDL_25Xlu(play->state.gfxCtx); @@ -2852,7 +2852,7 @@ void BossSst_PostHeadDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* ro } void BossSst_DrawHead(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossSst* this = (BossSst*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_boss_sst.c", 6810); @@ -2932,7 +2932,7 @@ void BossSst_SpawnHeadShadow(BossSst* this) { { -160.0f, 0.0f, 250.0f }, { 160.0f, 0.0f, 250.0f }, }; - s32 pad; + UNUSED s32 pad; s32 i; f32 sn; f32 cs; @@ -3144,7 +3144,7 @@ void BossSst_UpdateEffects(Actor* thisx, PlayState* play) { } void BossSst_DrawEffects(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; BossSst* this = (BossSst*)thisx; s32 i; BossSstEffect* effect; diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 6d7d586ab62..a3a052ceae5 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -2314,7 +2314,7 @@ void BossTw_DeathBall(BossTw* this, PlayState* play) { f32 xDiff; f32 yDiff; f32 zDiff; - s32 pad; + UNUSED s32 pad; s16 i; s16 yaw; @@ -2388,9 +2388,9 @@ void BossTw_TwinrovaSetupDeathCS(BossTw* this, PlayState* play) { } void BossTw_DeathCSMsgSfx(BossTw* this, PlayState* play) { - s32 pad; - s32 pad2; - s32 pad3; + UNUSED s32 pad; + UNUSED s32 pad2; + UNUSED s32 pad3; s16 msgId2; s16 msgId1; u8 kotakeAnim; @@ -2851,7 +2851,7 @@ void BossTw_Update(Actor* thisx, PlayState* play) { BossTw* this = (BossTw*)thisx; Player* player = GET_PLAYER(play); s16 i; - s32 pad; + UNUSED s32 pad; this->collider.base.colType = COLTYPE_HIT3; Math_ApproachF(&this->fogR, play->lightCtx.fogColor[0], 1.0f, 10.0f); @@ -3264,7 +3264,7 @@ void BossTw_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot } void func_80941BC0(BossTw* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_boss_tw.c", 6341); @@ -3308,7 +3308,7 @@ void func_80941BC0(BossTw* this, PlayState* play) { } void func_80942180(BossTw* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_boss_tw.c", 6468); @@ -3356,7 +3356,7 @@ void func_80942180(BossTw* this, PlayState* play) { } void func_809426F0(BossTw* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 i; OPEN_DISPS(play->state.gfxCtx, "../z_boss_tw.c", 6587); @@ -3678,7 +3678,7 @@ void BossTw_TwinrovaPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Ve } void BossTw_ShieldChargeDraw(BossTw* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); s16 temp_t0; s16 temp_a0; @@ -3780,7 +3780,7 @@ void BossTw_ShieldChargeDraw(BossTw* this, PlayState* play) { } void BossTw_SpawnPortalDraw(BossTw* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_boss_tw.c", 7546); @@ -3825,7 +3825,7 @@ void BossTw_SpawnPortalDraw(BossTw* this, PlayState* play) { } void func_80944C50(BossTw* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 scale; OPEN_DISPS(play->state.gfxCtx, "../z_boss_tw.c", 7645); @@ -4243,7 +4243,7 @@ void BossTw_BlastIce(BossTw* this, PlayState* play) { Audio_PlayActorSound2(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG); if (this->timers[0] > (sTwinrovaPtr->actionFunc == BossTw_Wait ? 70 : 20)) { - s32 pad; + UNUSED s32 pad; Vec3f pos; Vec3f velocity; Vec3f accel; @@ -4895,7 +4895,7 @@ void BossTw_DrawEffects(PlayState* play) { u8 materialFlag = 0; s16 i; s16 j; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); s16 phi_s4; BossTwEffect* currentEffect = play->specialEffects; @@ -5388,7 +5388,7 @@ void BossTw_TwinrovaFly(BossTw* this, PlayState* play) { f32 xDiff; f32 yDiff; f32 zDiff; - s32 pad; + UNUSED s32 pad; f32 yaw; f32 xzDist; diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index bae9216c0db..e17b3a37e1d 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -1224,7 +1224,7 @@ void BossVa_SetupBodyPhase3(BossVa* this) { } void BossVa_BodyPhase3(BossVa* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); s32 i; s16 sp62; @@ -1917,7 +1917,7 @@ void BossVa_ZapperAttack(BossVa* this, PlayState* play) { s16 sp8E; u32 sp88; Vec3f sp7C; - s32 pad3; + UNUSED s32 pad3; f32 sp74; s32 i; s16 sp6E; @@ -2237,7 +2237,7 @@ void BossVa_SetupZapperEnraged(BossVa* this, PlayState* play) { void BossVa_ZapperEnraged(BossVa* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; s16 tmp16; s16 sp6C; s16 sp6A; @@ -2529,7 +2529,7 @@ void BossVa_BariPhase3Attack(BossVa* this, PlayState* play) { EnBoom* boomerang; Vec3f sp54 = GET_BODY(this)->unk_1D8; s16 sp52; - s32 pad; + UNUSED s32 pad; this->unk_1A4 += Rand_ZeroOne() * 0.5f; sp52 = this->timer2 & 0x1FF; @@ -2618,7 +2618,7 @@ void BossVa_BariPhase2Attack(BossVa* this, PlayState* play) { s16 sp52; s16 sp50; f32 sp4C; - s32 pad; + UNUSED s32 pad; this->unk_1A4 += Rand_ZeroOne() * 0.5f; sp52 = this->timer2 & 0x1FF; @@ -2864,7 +2864,7 @@ void BossVa_Update(Actor* thisx, PlayState* play2) { s32 BossVa_BodyOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { BossVa* this = (BossVa*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_boss_va.c", 4156); @@ -2893,7 +2893,7 @@ s32 BossVa_BodyOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec void BossVa_BodyPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { BossVa* this = (BossVa*)thisx; Vec3f sp78 = { 0.0f, 0.0f, 0.0f }; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_boss_va.c", 4192); @@ -2973,7 +2973,7 @@ s32 BossVa_SupportOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, void BossVa_SupportPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { BossVa* this = (BossVa*)thisx; Vec3f sp20 = { 0.0f, 0.0f, 0.0f }; - s32 pad; + UNUSED s32 pad; if (this->onCeiling) { switch (limbIndex) { @@ -3292,7 +3292,7 @@ void BossVa_UpdateEffects(PlayState* play) { s16 spB6; s16 i; f32 floorY; - s32 padAC; + UNUSED s32 padAC; s16 pitch; s16 yaw; BossVa* refActor2; diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index 82f925a4782..c7fba96c919 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -67,7 +67,7 @@ void Demo6K_SetupAction(Demo6K* this, Demo6KActionFunc actionFunc) { void Demo6K_Init(Actor* thisx, PlayState* play) { Demo6K* this = (Demo6K*)thisx; - s32 pad; + UNUSED s32 pad; s32 params = this->actor.params; s32 objBankIndex; s32 i; @@ -558,7 +558,7 @@ void Demo6K_Update(Actor* thisx, PlayState* play) { void func_80967FFC(Actor* thisx, PlayState* play) { Demo6K* this = (Demo6K*)thisx; - s32 pad; + UNUSED s32 pad; u16 timer1 = this->timer1; OPEN_DISPS(play->state.gfxCtx, "../z_demo_6k.c", 1070); @@ -571,7 +571,7 @@ void func_80967FFC(Actor* thisx, PlayState* play) { { s32 i; - s32 pad; + UNUSED s32 pad; Color_RGB8 colors[6][2] = { { { 255, 170, 255 }, { 255, 0, 100 } }, { { 255, 255, 170 }, { 0, 255, 0 } }, { { 255, 255, 170 }, { 255, 255, 0 } }, { { 255, 170, 255 }, { 50, 0, 255 } }, @@ -600,7 +600,7 @@ void func_80967FFC(Actor* thisx, PlayState* play) { void func_80968298(Actor* thisx, PlayState* play) { static u8 skipIndices[] = { 6, 7, 11, 16, 20, 24, 28, 33, 35, 41, 45, 50, 57, 58, 62, 255 }; Demo6K* this = (Demo6K*)thisx; - s32 pad; + UNUSED s32 pad; u32 timer1 = this->timer1; f32 scale = this->unk_164 * this->unk_168; Vtx* vertices = SEGMENTED_TO_VIRTUAL(object_demo_6kVtx_0035E0); @@ -649,7 +649,7 @@ void func_80968298(Actor* thisx, PlayState* play) { void func_8096865C(Actor* thisx, PlayState* play) { Demo6K* this = (Demo6K*)thisx; - s32 pad; + UNUSED s32 pad; Gfx* displayList; OPEN_DISPS(play->state.gfxCtx, "../z_demo_6k.c", 1208); @@ -718,7 +718,7 @@ void func_809688C4(Actor* thisx, PlayState* play2) { } void func_80968B70(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; Demo6K* this = (Demo6K*)thisx; u32 timer2 = this->timer2; u8 primColor[4]; @@ -772,7 +772,7 @@ void func_80968FB0(Actor* thisx, PlayState* play) { Gfx* displayList = Graph_Alloc(play->state.gfxCtx, 4 * sizeof(Gfx)); u16 frames = play->gameplayFrames; f32 scaleFactor; - s32 pad; + UNUSED s32 pad; if (1) {} diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index 5f709f8092e..89317757542 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -48,7 +48,7 @@ void DemoDu_Destroy(Actor* thisx, PlayState* play) { void DemoDu_UpdateEyes(DemoDu* this) { s16* blinkTimer = &this->blinkTimer; s16* eyeTexIndex = &this->eyeTexIndex; - s32 pad[3]; + UNUSED s32 pad[3]; if (DECR(*blinkTimer) == 0) { *blinkTimer = Rand_S16Offset(60, 60); @@ -129,7 +129,7 @@ s32 DemoDu_IsNpcNotDoingThisAction(DemoDu* this, PlayState* play, u16 action, s3 void DemoDu_MoveToNpcPos(DemoDu* this, PlayState* play, s32 idx) { CsCmdActorAction* npcAction = DemoDu_GetNpcAction(play, idx); - s32 pad; + UNUSED s32 pad; if (npcAction != NULL) { this->actor.world.pos.x = npcAction->startPos.x; @@ -192,7 +192,7 @@ void func_80969FB4(DemoDu* this, PlayState* play) { // Gives the Fire Medallion to Link too. void DemoDu_CsFireMedallion_AdvanceTo01(DemoDu* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; if ((gSaveContext.chamberCutsceneNum == 1) && (gSaveContext.sceneSetupIndex < 4)) { Player* player = GET_PLAYER(play); @@ -317,7 +317,7 @@ void DemoDu_CsPlaySfx_DaruniaFalling(PlayState* play) { // Cutscene: Darunia gives Link the Goron's Ruby. void DemoDu_CsPlaySfx_DaruniaHitsLink(PlayState* play) { Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; func_80078914(&player->actor.projectedPos, NA_SE_EN_DARUNIA_HIT_LINK); Audio_PlaySoundGeneral(NA_SE_VO_LI_DAMAGE_S_KID, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, @@ -376,7 +376,7 @@ void DemoDu_CsGoronsRuby_UpdateFaceTextures(DemoDu* this, PlayState* play) { } void func_8096A630(DemoDu* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f pos = this->actor.world.pos; pos.y += kREG(5); @@ -392,13 +392,13 @@ void DemoDu_CsGoronsRuby_SpawnDustWhenHittingLink(DemoDu* this, PlayState* play) }; if (Animation_OnFrame(&this->skelAnime, 31.0f) || Animation_OnFrame(&this->skelAnime, 41.0f)) { - s32 pad[2]; + UNUSED s32 pad[2]; s32 i; Player* player = GET_PLAYER(play); Vec3f* pos = &player->bodyPartsPos[PLAYER_BODYPART_L_FOREARM]; Vec3f velocity = { 0.0f, 0.0f, 0.0f }; Vec3f accel = { 0.0f, 0.3f, 0.0f }; - s32 pad2; + UNUSED s32 pad2; for (i = 4; i >= 0; --i) { Color_RGBA8 primColor = { 190, 150, 110, 255 }; @@ -434,7 +434,7 @@ void DemoDu_CsGoronsRuby_SpawnDustWhenHittingLink(DemoDu* this, PlayState* play) } void DemoDu_CsGoronsRuby_DaruniaFalling(DemoDu* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; CutsceneContext* csCtx = &play->csCtx; if (csCtx->state != CS_STATE_IDLE) { @@ -699,7 +699,7 @@ void DemoDu_UpdateCs_GR_13(DemoDu* this, PlayState* play) { } void DemoDu_InitCs_AfterGanon(DemoDu* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; f32 lastFrame = Animation_GetLastFrame(&gDaruniaSageFormationAnim); SkelAnime_InitFlex(play, &this->skelAnime, &gDaruniaSkel, NULL, NULL, NULL, 0); @@ -799,7 +799,7 @@ void DemoDu_Draw_02(Actor* thisx, PlayState* play2) { DemoDu* this = (DemoDu*)thisx; s16 eyeTexIndex = this->eyeTexIndex; void* eyeTexture = sEyeTextures[eyeTexIndex]; - s32 pad; + UNUSED s32 pad; s16 mouthTexIndex = this->mouthTexIndex; void* mouthTexture = sMouthTextures[mouthTexIndex]; SkelAnime* skelAnime = &this->skelAnime; @@ -994,7 +994,7 @@ void DemoDu_Draw_01(Actor* thisx, PlayState* play2) { DemoDu* this = (DemoDu*)thisx; s16 eyeTexIndex = this->eyeTexIndex; void* eyeTexture = sEyeTextures[eyeTexIndex]; - s32 pad; + UNUSED s32 pad; s16 mouthTexIndex = this->mouthTexIndex; void* mouthTexture = sMouthTextures[mouthTexIndex]; SkelAnime* skelAnime = &this->skelAnime; diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index 70d38516b87..37868a86343 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -193,7 +193,7 @@ void func_8096D64C(DemoEc* this, PlayState* play) { } void DemoEc_UpdateEyes(DemoEc* this) { - s32 pad[3]; + UNUSED s32 pad[3]; s16* blinkTimer = &this->blinkTimer; s16* eyeTexIndex = &this->eyeTexIndex; @@ -253,7 +253,7 @@ void DemoEc_DrawSkeleton(DemoEc* this, PlayState* play, void* eyeTexture, void* PostLimbDraw postLimbDraw) { GraphicsContext* gfxCtx = play->state.gfxCtx; SkelAnime* skelAnime = &this->skelAnime; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(gfxCtx, "../z_demo_ec.c", 565); @@ -277,7 +277,7 @@ void DemoEc_DrawSkeleton(DemoEc* this, PlayState* play, void* eyeTexture, void* void DemoEc_DrawSkeletonCustomColor(DemoEc* this, PlayState* play, Gfx* arg2, Gfx* arg3, u8* color1, u8* color2, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw) { - s32 pad; + UNUSED s32 pad; GraphicsContext* gfxCtx = play->state.gfxCtx; SkelAnime* skelAnime = &this->skelAnime; @@ -313,7 +313,7 @@ void DemoEc_DrawSkeletonCustomColor(DemoEc* this, PlayState* play, Gfx* arg2, Gf } void DemoEc_UseDrawObject(DemoEc* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s32 drawObjBankIndex = this->drawObjBankIndex; GraphicsContext* gfxCtx = play->state.gfxCtx; @@ -1123,7 +1123,7 @@ void DemoEc_DrawBombchuShopOwner(DemoEc* this, PlayState* play) { } void DemoEc_InitGorons(DemoEc* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; AnimationHeader* animation; f32 goronScale; Vec3f* scale = &this->actor.scale; @@ -1251,10 +1251,10 @@ void DemoEc_InitNpc(DemoEc* this, PlayState* play) { } void DemoEc_InitCommon(DemoEc* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 primary; s32 type; - s16 pad2; + UNUSED s16 pad2; s16 sp28; s32 primaryBankIndex; s32 secondaryBankIndex; 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 a8b9c765505..a05ec7204a0 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -1399,8 +1399,8 @@ void DemoEffect_MoveJewelSplit(PosRot* world, DemoEffect* this) { */ void DemoEffect_MoveJewelSpherical(f32 degrees, f32 frameDivisor, Vec3f startPos, Vec3f endPos, f32 radius, Vec3s rotation, DemoEffect* this) { - s32 pad; - s32 pad2; + UNUSED s32 pad; + UNUSED s32 pad2; f32 distance; f32 xPos; f32 ySpherical; @@ -1795,7 +1795,7 @@ void DemoEffect_DrawFireBall(Actor* thisx, PlayState* play) { */ void DemoEffect_DrawGodLgt(Actor* thisx, PlayState* play) { DemoEffect* this = (DemoEffect*)thisx; - s32 pad; + UNUSED s32 pad; u32 frames = play->gameplayFrames; OPEN_DISPS(play->state.gfxCtx, "../z_demo_effect.c", 2737); @@ -1896,7 +1896,7 @@ void DemoEffect_DrawLightEffect(Actor* thisx, PlayState* play) { */ void DemoEffect_DrawBlueOrb(Actor* thisx, PlayState* play) { DemoEffect* this = (DemoEffect*)thisx; - s32 pad2; + UNUSED s32 pad2; OPEN_DISPS(play->state.gfxCtx, "../z_demo_effect.c", 2892); gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 188, 255, 255, this->blueOrb.alpha); @@ -1916,7 +1916,7 @@ void DemoEffect_DrawBlueOrb(Actor* thisx, PlayState* play) { */ void DemoEffect_DrawLgtShower(Actor* thisx, PlayState* play) { DemoEffect* this = (DemoEffect*)thisx; - s32 pad; + UNUSED s32 pad; u32 frames = play->gameplayFrames; OPEN_DISPS(play->state.gfxCtx, "../z_demo_effect.c", 2921); @@ -1960,7 +1960,7 @@ void DemoEffect_DrawLightRing(Actor* thisx, PlayState* play2) { */ void DemoEffect_DrawTriforceSpot(Actor* thisx, PlayState* play) { DemoEffect* this = (DemoEffect*)thisx; - s32 pad; + UNUSED s32 pad; Vtx* vertices = SEGMENTED_TO_VIRTUAL(gTriforceVtx); u32 frames = play->gameplayFrames; @@ -2039,7 +2039,7 @@ void DemoEffect_DrawGetItem(Actor* thisx, PlayState* play) { * Callback for the SkelCurve system to draw the animated limbs. */ s32 DemoEffect_OverrideLimbDrawTimeWarp(PlayState* play, SkelCurve* skelCurve, s32 limbIndex, void* thisx) { - s32 pad; + UNUSED s32 pad; DemoEffect* this = (DemoEffect*)thisx; u32 frames = play->gameplayFrames; @@ -2087,7 +2087,7 @@ void DemoEffect_DrawTimeWarp(Actor* thisx, PlayState* play) { * Faces/rotates the Actor towards the current cutscene action end point. */ void DemoEffect_FaceToCsEndpoint(DemoEffect* this, Vec3f startPos, Vec3f endPos) { - s32 pad; + UNUSED s32 pad; f32 x = endPos.x - startPos.x; f32 z = endPos.z - startPos.z; f32 xzDistance = sqrtf(SQ(x) + SQ(z)); diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index 3b9b61a6ee7..1f567f7aad1 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -85,7 +85,7 @@ void func_80977EA8(PlayState* play, Gfx* dlist) { } void func_80977F80(DemoGeff* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s32 objBankIndex = this->objBankIndex; GraphicsContext* gfxCtx = play->state.gfxCtx; @@ -190,7 +190,7 @@ void func_809783D4(DemoGeff* this, PlayState* play) { s32 params = thisx->params; s16 objectId = sObjectIDs[params]; s32 objBankIndex = Object_GetIndex(objCtx, objectId); - s32 pad; + UNUSED s32 pad; if (objBankIndex < 0) { osSyncPrintf(VT_FGCOL(RED) "Demo_Geff_main_bank:バンクを読めない arg_data = %d!\n" VT_RST, params); diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index d350ac85825..2f99d8d18b3 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -238,7 +238,7 @@ static InitChainEntry sInitChain[] = { }; void DemoGj_InitCommon(DemoGj* this, PlayState* play, CollisionHeader* header) { - s32 pad[3]; + UNUSED s32 pad[3]; CollisionHeader* newHeader; if (header != NULL) { @@ -281,12 +281,12 @@ void DemoGj_DrawCommon(DemoGj* this, PlayState* play, Gfx* displayList) { } void DemoGj_DrawRotated(DemoGj* this, PlayState* play, Gfx* displayList) { - s32 pad; + UNUSED s32 pad; GraphicsContext* gfxCtx; s16 x = this->rotationVec.x; s16 y = this->rotationVec.y; s16 z = this->rotationVec.z; - s32 pad2; + UNUSED s32 pad2; Mtx* matrix; gfxCtx = play->state.gfxCtx; @@ -986,7 +986,7 @@ void func_8097AEE8(DemoGj* this, PlayState* play) { ColliderCylinder* cylinder1 = &this->cylinders[1]; ColliderCylinder* cylinder2 = &this->cylinders[2]; Vec3f* actorPos = &this->dyna.actor.world.pos; - s32 pad; + UNUSED s32 pad; s16 theta = this->dyna.actor.world.rot.y; f32 cos_theta = Math_CosS(theta); f32 sin_theta = Math_SinS(theta); @@ -1005,11 +1005,11 @@ void func_8097AEE8(DemoGj* this, PlayState* play) { } void DemoGj_SetCylindersAsAC(DemoGj* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; Collider* cylinder0 = &this->cylinders[0].base; Collider* cylinder1 = &this->cylinders[1].base; Collider* cylinder2 = &this->cylinders[2].base; - s32 pad2[3]; + UNUSED s32 pad2[3]; CollisionCheck_SetAC(play, &play->colChkCtx, cylinder0); CollisionCheck_SetAC(play, &play->colChkCtx, cylinder1); @@ -1116,7 +1116,7 @@ void func_8097B450(DemoGj* this, PlayState* play) { ColliderCylinder* cylinder1 = &this->cylinders[1]; ColliderCylinder* cylinder2 = &this->cylinders[2]; Vec3f* actorPos = &this->dyna.actor.world.pos; - s32 pad; + UNUSED s32 pad; s16 theta = this->dyna.actor.world.rot.y; f32 cos_theta = Math_CosS(theta); f32 sin_theta = Math_SinS(theta); @@ -1135,11 +1135,11 @@ void func_8097B450(DemoGj* this, PlayState* play) { } void DemoGj_SetCylindersAsAC2(DemoGj* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; Collider* cylinder0 = &this->cylinders[0].base; Collider* cylinder1 = &this->cylinders[1].base; Collider* cylinder2 = &this->cylinders[2].base; - s32 pad2[3]; + UNUSED s32 pad2[3]; CollisionCheck_SetAC(play, &play->colChkCtx, cylinder0); CollisionCheck_SetAC(play, &play->colChkCtx, cylinder1); @@ -1274,7 +1274,7 @@ void func_8097B9BC(DemoGj* this, PlayState* play) { void func_8097BA48(DemoGj* this, PlayState* play) { Actor* thisx = &this->dyna.actor; ColliderCylinder* cylinder = &this->cylinders[0]; - s32 pad[2]; + UNUSED s32 pad[2]; if (func_809797E4(this, 4)) { Actor_Kill(thisx); diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index 7cc11aa0993..fdfcd50b490 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -88,7 +88,7 @@ void DemoGo_Destroy(Actor* thisx, PlayState* play) { void func_8097C930(DemoGo* this) { s16* something = &this->unk_192; s16* other = &this->unk_190; - s32 pad[3]; + UNUSED s32 pad[3]; if (DECR(*something) == 0) { *something = Rand_S16Offset(60, 60); @@ -104,7 +104,7 @@ void func_8097C9B8(DemoGo* this) { } void func_8097C9DC(DemoGo* this) { - s32 pad[2]; + UNUSED s32 pad[2]; if (Animation_OnFrame(&this->skelAnime, 12.0f) || Animation_OnFrame(&this->skelAnime, 25.0f)) { func_80078914(&this->actor.projectedPos, NA_SE_EN_MORIBLIN_WALK); @@ -116,7 +116,7 @@ void func_8097CA30(DemoGo* this, PlayState* play) { } void func_8097CA78(DemoGo* this, PlayState* play) { - s16 pad; + UNUSED s16 pad; Vec3f vec = this->actor.world.pos; func_80033480(play, &vec, kREG(11) + 100.0f, kREG(12) + 0xA, kREG(13) + 0x12C, kREG(14), 0); func_8097C9B8(this); @@ -128,7 +128,7 @@ void func_8097CB0C(DemoGo* this, PlayState* play) { CutsceneContext* csCtx = &play->csCtx; CsCmdActorAction* npcAction; f32 temp_ret; - s32 pad; + UNUSED s32 pad; Vec3f startPos; Vec3f endPos; @@ -324,7 +324,7 @@ void func_8097D290(DemoGo* this, PlayState* play) { } void func_8097D29C(DemoGo* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 eyeTexIdx = this->unk_190; SkelAnime* skelAnime = &this->skelAnime; void* eyeTexture = sEyeTextures[eyeTexIdx]; diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index 083aa26a623..78aea8c33eb 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -44,13 +44,13 @@ void DemoGt_SpawnDust(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel } void func_8097D7D8(PlayState* play, Vec3f* pos, Vec3f* velOffset, f32 scale, s32 arg4, s32 arg5, s16 life) { - s32 pad; + UNUSED s32 pad; if (!FrameAdvance_IsEnabled(play)) { s32 frames = play->gameplayFrames; if (ABS(frames % arg4) == arg5) { - s32 pad[2]; + UNUSED s32 pad[2]; Vec3f velocity = { 0.0f, 6.0f, 0.0f }; Vec3f accel = { 0.0f, 0.0f, 0.0f }; @@ -78,7 +78,7 @@ Actor* DemoGt_SpawnCloudRing(PlayState* play, Vec3f* pos, s16 params) { } void DemoGt_SpawnExplosionWithSound(PlayState* play, Vec3f* pos, f32 scale) { - s32 pad; + UNUSED s32 pad; Vec3f velocity = { 0.0f, 0.0f, 0.0f }; Vec3f accel = { 0.0f, 0.0f, 0.0f }; @@ -258,7 +258,7 @@ void func_8097E1D4(PlayState* play, Vec3f* arg1, s16 arg2) { void func_8097E454(PlayState* play, Vec3f* spawnerPos, Vec3f* velocity, Vec3f* accel, f32 arg4, f32 scale, s32 arg6, s32 arg7, s16 life) { - s32 pad2[3]; + UNUSED s32 pad2[3]; s16 increment; s32 frames; s32 i; @@ -298,7 +298,7 @@ u8 func_8097E69C(PlayState* play) { } CsCmdActorAction* DemoGt_GetNpcAction(PlayState* play, u32 actionIdx) { - s32 pad[2]; + UNUSED s32 pad[2]; CsCmdActorAction* ret = NULL; if (!func_8097E69C(play)) { @@ -351,7 +351,7 @@ void func_8097E824(DemoGt* this, s32 arg1) { s16 phi_a3; Vec3f* pos = &this->dyna.actor.world.pos; Vec3s* unk16C = &this->unk_16C; - s32 pad; + UNUSED s32 pad; f32 tempf3; f32 tempf2; f32 tempf1; @@ -450,7 +450,7 @@ static InitChainEntry sInitChain[] = { }; void func_8097EDD8(DemoGt* this, PlayState* play, CollisionHeader* collision) { - s32 pad[3]; + UNUSED s32 pad[3]; CollisionHeader* colHeader; if (collision != NULL) { @@ -496,12 +496,12 @@ void func_8097EF34(DemoGt* this, PlayState* play) { void func_8097EF40(DemoGt* this, PlayState* play) { u16 frames = play->csCtx.frames; - s32 pad1[3]; + UNUSED s32 pad1[3]; Vec3f dustPos; Vec3f velocity = { 0.0f, -16.0f, 0.0f }; Vec3f accel = { 0.0f, 1.2f, 0.0f }; Vec3f* pos = &this->dyna.actor.world.pos; - s32 pad; + UNUSED s32 pad; if ((kREG(1) == 20) || (frames == 220)) { dustPos.x = pos->x + 256.0f; @@ -519,12 +519,12 @@ void func_8097EF40(DemoGt* this, PlayState* play) { } void func_8097F0AC(DemoGt* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; Vec3f sp38; - s16 pad1[3]; + UNUSED s16 pad1[3]; Vec3f sp24; u16 frames = play->csCtx.frames; - s32 pad2; + UNUSED s32 pad2; if ((frames == 140) || (kREG(1) == 19)) { sp38.x = this->dyna.actor.world.pos.x + 260.0f; @@ -623,10 +623,10 @@ void DemoGt_Update8(DemoGt* this, PlayState* play) { } void DemoGt_Draw1(DemoGt* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; GraphicsContext* gfxCtx = play->state.gfxCtx; u32 gameplayFrames = play->gameplayFrames; - s16 pad2[2]; + UNUSED s16 pad2[2]; s16 spC6; f32 spC0; f32 spBC; @@ -701,7 +701,7 @@ void func_8097F960(DemoGt* this, PlayState* play) { void func_8097F96C(DemoGt* this, PlayState* play) { static Actor* cloudRing = NULL; - s32 pad[4]; + UNUSED s32 pad[4]; Vec3f pos; Actor* actor; u16 frames = play->csCtx.frames; @@ -723,12 +723,12 @@ void func_8097F96C(DemoGt* this, PlayState* play) { } void func_8097FA1C(DemoGt* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { -12.0f, -17.0, 5.0 }; - s32 pad1[3]; + UNUSED s32 pad1[3]; if (((frames > 502) && !(frames >= 581)) || (kREG(1) == 5)) { dustPos.x = pos->x + 300.0f; @@ -746,7 +746,7 @@ void func_8097FAFC(DemoGt* this, PlayState* play) { static s32 arg6 = 11; static s32 arg7 = 1; static s16 life = 3; - s32 pad[2]; + UNUSED s32 pad[2]; u16 frames = play->csCtx.frames; Vec3f pos; f32 new_var = -200.0; @@ -766,12 +766,12 @@ void func_8097FAFC(DemoGt* this, PlayState* play) { } void func_8097FC1C(DemoGt* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -16.0f, -16.0f }; - s32 pad1[3]; + UNUSED s32 pad1[3]; if (frames > 682 || kREG(1) == 7) { dustPos.x = pos->x + 260.0f; @@ -782,7 +782,7 @@ void func_8097FC1C(DemoGt* this, PlayState* play) { } void func_8097FCE4(DemoGt* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; Vec3f vec; u16 frames = play->csCtx.frames; @@ -849,7 +849,7 @@ void DemoGt_Draw2(DemoGt* this, PlayState* play) { GraphicsContext* gfxCtx = play->state.gfxCtx; s32* unk198; s32* unk178; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(gfxCtx, "../z_demo_gt_part2.c", 470); @@ -882,7 +882,7 @@ void func_80980178(DemoGt* this, PlayState* play) { void func_80980184(DemoGt* this, PlayState* play) { static Actor* cloudRing = NULL; - s32 pad[4]; + UNUSED s32 pad[4]; Vec3f pos; Actor* actor; @@ -904,7 +904,7 @@ void func_80980184(DemoGt* this, PlayState* play) { void func_80980218(DemoGt* this, PlayState* play) { static Actor* cloudRing = NULL; - s32 pad[4]; + UNUSED s32 pad[4]; Vec3f pos; Actor* actor; @@ -925,12 +925,12 @@ void func_80980218(DemoGt* this, PlayState* play) { } void func_809802AC(DemoGt* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 0.0f, 0.0f, -10.0f }; - s32 pad1[3]; + UNUSED s32 pad1[3]; if (frames > 109 && frames < 140) { dustPos.x = pos->x - 100.0f; @@ -941,12 +941,12 @@ void func_809802AC(DemoGt* this, PlayState* play) { } void func_8098036C(DemoGt* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* world = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -3.0f, 0.0f }; - s32 pad1[3]; + UNUSED s32 pad1[3]; if ((frames > 284) && (frames < 421)) { dustPos.x = world->x + 760.0f; @@ -957,12 +957,12 @@ void func_8098036C(DemoGt* this, PlayState* play) { } void func_80980430(DemoGt* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; Vec3f dustPos; s32 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -3.0f, 0.0f }; - s32 pad1[3]; + UNUSED s32 pad1[3]; if (frames > 709 || kREG(1) == 8) { dustPos.x = pos->x + 760.0f; @@ -973,12 +973,12 @@ void func_80980430(DemoGt* this, PlayState* play) { } void func_80980504(DemoGt* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -16.0f, -16.0f }; - s32 pad1[3]; + UNUSED s32 pad1[3]; if ((frames > 704) || kREG(1) == 9) { dustPos.x = pos->x + 830.0f; @@ -989,12 +989,12 @@ void func_80980504(DemoGt* this, PlayState* play) { } void func_809805D8(DemoGt* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* homePos = &this->dyna.actor.home.pos; Vec3f velOffset = { 15.0f, -26.0, 0.0f }; - s32 pad1[3]; + UNUSED s32 pad1[3]; if (((frames > 739) && (frames < 781)) || kREG(1) == 11) { dustPos.x = homePos->x + 550.0f; @@ -1005,12 +1005,12 @@ void func_809805D8(DemoGt* this, PlayState* play) { } void func_809806B8(DemoGt* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -16.0f, -16.0f }; - s32 pad1[3]; + UNUSED s32 pad1[3]; if ((frames > 964) || (kREG(1) == 12)) { dustPos.x = pos->x + 460.0f; @@ -1021,12 +1021,12 @@ void func_809806B8(DemoGt* this, PlayState* play) { } void func_8098078C(DemoGt* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -16.0f, -16.0f }; - s32 pad1[3]; + UNUSED s32 pad1[3]; if ((frames > 939) || (kREG(1) == 14)) { dustPos.x = pos->x + 360.0f; @@ -1037,7 +1037,7 @@ void func_8098078C(DemoGt* this, PlayState* play) { } void func_8098085C(DemoGt* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; Vec3f sp28; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; @@ -1066,12 +1066,12 @@ void func_809809C0(DemoGt* this, PlayState* play2) { s32 gameplayFrames = play->gameplayFrames; u16 frames = play->csCtx.frames; Vec3f sp54; - s16 pad[3]; + UNUSED s16 pad[3]; if (((frames > 469) && (frames < 481)) || (kREG(1) == 3)) { Vec3f sp40 = { 20.0f, 6.0f, 0.0f }; Vec3f sp34 = { 0.0f, 0.0f, 0.0f }; - s16 pad2[3]; + UNUSED s16 pad2[3]; sp54.x = this2->dyna.actor.world.pos.x + 790.0f; sp54.y = this2->dyna.actor.world.pos.y + 60.0f; @@ -1084,7 +1084,7 @@ void func_809809C0(DemoGt* this, PlayState* play2) { } void func_80980AD4(DemoGt* this, PlayState* play) { - s32 pad[4]; + UNUSED s32 pad[4]; Vec3f pos; u16 frames = play->csCtx.frames; @@ -1099,7 +1099,7 @@ void func_80980AD4(DemoGt* this, PlayState* play) { } void func_80980B68(DemoGt* this, PlayState* play) { - s32 pad[4]; + UNUSED s32 pad[4]; Vec3f pos; u16 frames = play->csCtx.frames; @@ -1113,7 +1113,7 @@ void func_80980B68(DemoGt* this, PlayState* play) { } void func_80980BFC(DemoGt* this, PlayState* play) { - s32 pad[4]; + UNUSED s32 pad[4]; Vec3f pos; u16 frames = play->csCtx.frames; @@ -1194,14 +1194,14 @@ void func_80980F58(DemoGt* this, PlayState* play) { } void func_80980F8C(DemoGt* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; Vec3f sp58; Vec3f dustPos; u16 frames = play->csCtx.frames; if ((frames > 259) && (frames < 289)) { Vec3f velOfset = { 0.0f, -17.0f, 0.0f }; - s32 pad[3]; + UNUSED s32 pad[3]; sp58.x = 640.0f; sp58.y = 2100.0f; @@ -1246,13 +1246,13 @@ void DemoGt_Draw4(DemoGt* this, PlayState* play2) { GraphicsContext* gfxCtx; PlayState* play = play2; u16 frames = play->csCtx.frames; - s32 pad; + UNUSED s32 pad; s16 sp76; f32 sp70; f32 sp6C; s16 sp6A; s16 sp68; - s16 pad2; + UNUSED s16 pad2; Mtx* sp60; Vec3f sp54; Vec3f sp48; @@ -1317,14 +1317,14 @@ void func_80981424(DemoGt* this, PlayState* play) { } void func_80981458(DemoGt* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; Vec3f sp58; Vec3f dustPos; u16 frames = play->csCtx.frames; if (((frames > 855) && (frames < 891)) || (kREG(1) == 13)) { Vec3f velOffset = { 0.0f, -30.0f, 0.0f }; - s32 pad1[3]; + UNUSED s32 pad1[3]; sp58.x = 0.0f; sp58.y = 1170.0f; @@ -1367,13 +1367,13 @@ void DemoGt_Update17(DemoGt* this, PlayState* play) { void DemoGt_Draw5(DemoGt* this, PlayState* play) { GraphicsContext* gfxCtx; - s32 pad; + UNUSED s32 pad; s16 sp76; f32 sp70; f32 sp6C; s16 sp6A; s16 sp68; - s16 pad1; + UNUSED s16 pad1; Mtx* sp60; Vec3f sp54; Vec3f sp48; diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c index 5ed9b3216bf..7979c347e65 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -155,7 +155,7 @@ void DemoIk_MoveToStartPos(DemoIk* this, PlayState* play, s32 index) { } void DemoIk_Type1Init(DemoIk* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; SkeletonHeader* skeleton; AnimationHeader* animation; f32 phi_f0; @@ -278,7 +278,7 @@ void DemoIk_Type1PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s } void DemoIk_Type1Draw(DemoIk* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; GraphicsContext* gfxCtx = play->state.gfxCtx; SkelAnime* skelAnime = &this->skelAnime; @@ -294,7 +294,7 @@ void DemoIk_Type1Draw(DemoIk* this, PlayState* play) { } void DemoIk_Type2Init(DemoIk* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; FlexSkeletonHeader* skeleton; AnimationHeader* animation; @@ -445,7 +445,7 @@ void DemoIk_Type2PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s } void DemoIk_Type2Draw(DemoIk* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; GraphicsContext* gfxCtx = play->state.gfxCtx; SkelAnime* skelAnime = &this->skelAnime; @@ -467,7 +467,7 @@ static DemoIkActionFunc sActionFuncs[] = { }; void DemoIk_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; DemoIk* this = (DemoIk*)thisx; if (this->actionMode < 0 || this->actionMode >= ARRAY_COUNT(sActionFuncs) || @@ -489,7 +489,7 @@ static DemoIkDrawFunc sDrawFuncs[] = { }; void DemoIk_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; DemoIk* this = (DemoIk*)thisx; if (this->drawMode < 0 || this->drawMode >= ARRAY_COUNT(sDrawFuncs) || sDrawFuncs[this->drawMode] == NULL) { @@ -513,7 +513,7 @@ const ActorInit Demo_Ik_InitVars = { }; void DemoIk_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; DemoIk* this = (DemoIk*)thisx; if (this->actor.params == 0 || this->actor.params == 1 || this->actor.params == 2) { diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index c27fa42a703..d1d6cc936e7 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -104,7 +104,7 @@ const ActorInit Demo_Im_InitVars = { }; void func_80984BE0(DemoIm* this) { - s32 pad[3]; + UNUSED s32 pad[3]; s16* blinkTimer = &this->blinkTimer; s16* eyeIndex = &this->eyeIndex; @@ -158,14 +158,14 @@ void DemoIm_DestroyCollider(Actor* thisx, PlayState* play) { } void DemoIm_UpdateCollider(DemoIm* this, PlayState* play) { - s32 pad[5]; + UNUSED s32 pad[5]; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); } void func_80984DB8(DemoIm* this) { - s32 pad[2]; + UNUSED s32 pad[2]; Vec3s* vec1 = &this->unk_2D4.unk_08; Vec3s* vec2 = &this->unk_2D4.unk_0E; @@ -223,7 +223,7 @@ s32 DemoIm_IsCsStateIdle(PlayState* play) { } CsCmdActorAction* DemoIm_GetNpcAction(PlayState* play, s32 actionIdx) { - s32 pad[2]; + UNUSED s32 pad[2]; CsCmdActorAction* ret = NULL; if (!DemoIm_IsCsStateIdle(play)) { @@ -323,7 +323,7 @@ void func_80985430(DemoIm* this, PlayState* play) { } void func_8098544C(DemoIm* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; if ((gSaveContext.chamberCutsceneNum == 4) && (gSaveContext.sceneSetupIndex < 4)) { Player* player = GET_PLAYER(play); @@ -516,7 +516,7 @@ void func_80985C94(DemoIm* this, PlayState* play) { } void DemoIm_DrawTranslucent(DemoIm* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s16 eyeIndex = this->eyeIndex; void* eyeTex = sEyeTextures[eyeIndex]; SkelAnime* skelAnime = &this->skelAnime; @@ -726,7 +726,7 @@ void func_80986570(DemoIm* this, PlayState* play) { } void func_809865F8(DemoIm* this, PlayState* play, s32 arg2) { - s32 pad[2]; + UNUSED s32 pad[2]; if (arg2 != 0) { f32* unk_278 = &this->unk_278; @@ -1180,7 +1180,7 @@ void DemoIm_DrawNothing(DemoIm* this, PlayState* play) { } void DemoIm_DrawSolid(DemoIm* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s16 eyeIndex = this->eyeIndex; void* eyeTexture = sEyeTextures[eyeIndex]; SkelAnime* skelAnime = &this->skelAnime; 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 16874e04729..97135cdb29d 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -524,7 +524,7 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) { OPEN_DISPS(play->state.gfxCtx, "../z_demo_kankyo.c", 1186); for (i = 0; i < 30; i++) { - s32 pad[2]; + UNUSED s32 pad[2]; dx = play->view.at.x - play->view.eye.x; dy = play->view.at.y - play->view.eye.y; @@ -595,7 +595,7 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) { Matrix_Scale(sRainScale * 0.001f, sRainScale * 0.001f, sRainScale * 0.001f, MTXMODE_APPLY); for (j = 0; j < 5; j++) { - s32 pad1; + UNUSED s32 pad1; if (play->sceneNum != SCENE_TOKINOMA) { if (this->unk_150[i].unk_0.x >= 0.0f) { @@ -631,7 +631,7 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) { void DemoKankyo_DrawRock(Actor* thisx, PlayState* play) { DemoKankyo* this = (DemoKankyo*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_demo_kankyo.c", 1376); @@ -653,7 +653,7 @@ void DemoKankyo_DrawRock(Actor* thisx, PlayState* play) { void DemoKankyo_DrawClouds(Actor* thisx, PlayState* play) { DemoKankyo* this = (DemoKankyo*)thisx; s16 i; - s32 pad; + UNUSED s32 pad; f32 dx; f32 dy; f32 dz; @@ -689,7 +689,7 @@ void DemoKankyo_DrawClouds(Actor* thisx, PlayState* play) { void DemoKankyo_DrawDoorOfTime(Actor* thisx, PlayState* play) { DemoKankyo* this = (DemoKankyo*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_demo_kankyo.c", 1487); @@ -708,7 +708,7 @@ void DemoKankyo_DrawDoorOfTime(Actor* thisx, PlayState* play) { void DemoKankyo_DrawLightPlane(Actor* thisx, PlayState* play) { DemoKankyo* this = (DemoKankyo*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_demo_kankyo.c", 1514); diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index 8f35f57ad03..6d9e001c2e2 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -74,7 +74,7 @@ s32 DemoKekkai_CheckEventFlag(s32 params) { } void DemoKekkai_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; DemoKekkai* this = (DemoKekkai*)thisx; this->sfxFlag = 0; @@ -125,7 +125,7 @@ void DemoKekkai_Init(Actor* thisx, PlayState* play) { } void DemoKekkai_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; DemoKekkai* this = (DemoKekkai*)thisx; Collider_DestroyCylinder(play, &this->collider1); @@ -204,7 +204,7 @@ void DemoKekkai_Update(Actor* thisx, PlayState* play2) { void DemoKekkai_TrialBarrierDispel(Actor* thisx, PlayState* play) { static u16 csFrames[] = { 0, 280, 280, 280, 280, 280, 280 }; - s32 pad; + UNUSED s32 pad; DemoKekkai* this = (DemoKekkai*)thisx; if (play->csCtx.frames == csFrames[this->actor.params]) { @@ -242,7 +242,7 @@ static CutsceneData* sSageCutscenes[] = { }; void DemoKekkai_TrialBarrierIdle(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; DemoKekkai* this = (DemoKekkai*)thisx; if (this->collider1.base.atFlags & AT_HIT) { @@ -320,7 +320,7 @@ void DemoKekkai_DrawTrialBarrier(Actor* thisx, PlayState* play2) { } void DemoKekkai_DrawTowerBarrier(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; DemoKekkai* this = (DemoKekkai*)thisx; s32 scroll; diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 73e7ccd61e8..7d3c5aa71a4 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -105,7 +105,7 @@ void DemoSa_Destroy(Actor* thisx, PlayState* play) { } void func_8098E480(DemoSa* this) { - s32 pad[2]; + UNUSED s32 pad[2]; s16* eyeIndex = &this->eyeIndex; s16* blinkTimer = &this->blinkTimer; @@ -196,7 +196,7 @@ void func_8098E6EC(DemoSa* this, PlayState* play, s32 actionIdx) { } void func_8098E76C(DemoSa* this, AnimationHeader* animHeaderSeg, u8 arg2, f32 morphFrames, s32 arg4) { - s32 pad[2]; + UNUSED s32 pad[2]; f32 frameCount = Animation_GetLastFrame(animHeaderSeg); f32 playbackSpeed; f32 unk0; @@ -246,7 +246,7 @@ void func_8098E944(DemoSa* this, PlayState* play) { } void func_8098E960(DemoSa* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; Player* player; if ((gSaveContext.chamberCutsceneNum == 0) && (gSaveContext.sceneSetupIndex < 4)) { @@ -349,7 +349,7 @@ void func_8098ECCC(DemoSa* this, PlayState* play) { } void func_8098ECF4(DemoSa* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; SkelAnime* skelAnime = &this->skelAnime; f32 frameCount = Animation_GetLastFrame(&gSariaSealGanonAnim); @@ -454,11 +454,11 @@ void func_8098F16C(DemoSa* this, PlayState* play) { } void DemoSa_DrawXlu(DemoSa* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s16 eyeIndex = this->eyeIndex; void* sp78 = sEyeTextures[eyeIndex]; s16 mouthIndex = this->mouthIndex; - s32 pad2; + UNUSED s32 pad2; void* sp6C = sMouthTextures[mouthIndex]; SkelAnime* skelAnime = &this->skelAnime; @@ -792,10 +792,10 @@ void DemoSa_DrawNothing(DemoSa* this, PlayState* play) { } void DemoSa_DrawOpa(DemoSa* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s16 eyeIndex = this->eyeIndex; void* eyeTex = sEyeTextures[eyeIndex]; - s32 pad2; + UNUSED s32 pad2; s16 mouthIndex = this->mouthIndex; void* mouthTex = sMouthTextures[mouthIndex]; SkelAnime* skelAnime = &this->skelAnime; 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 ab341b403ce..721ed25c569 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -98,7 +98,7 @@ void DemoShd_Update(Actor* thisx, PlayState* play) { void DemoShd_Draw(Actor* thisx, PlayState* play) { DemoShd* this = (DemoShd*)thisx; - s32 pad; + UNUSED s32 pad; u32 unk_14E = this->unk_14E; if (1) {} // Necessary to match, can be anywhere in the function 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 db2921ba287..4d863df382a 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 @@ -81,7 +81,7 @@ void func_8099375C(DemoTreLgt* this, PlayState* play) { void func_809937B4(DemoTreLgt* this, PlayState* play, f32 currentFrame) { SkelCurve* skelCurve = &this->skelCurve; - s32 pad[2]; + UNUSED s32 pad[2]; this->action = DEMO_TRE_LGT_ACTION_ANIMATE; @@ -132,7 +132,7 @@ void DemoTreLgt_Update(Actor* thisx, PlayState* play) { } s32 DemoTreLgt_OverrideLimbDraw(PlayState* play, SkelCurve* skelCurve, s32 limbIndex, void* thisx) { - s32 pad; + UNUSED s32 pad; DemoTreLgt* this = (DemoTreLgt*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_demo_tre_lgt.c", 423); diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c index aee6f349f5b..ec5417672c7 100644 --- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c +++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c @@ -36,7 +36,7 @@ static InitChainEntry sInitChain[] = { }; void DoorGerudo_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; DoorGerudo* this = (DoorGerudo*)thisx; CollisionHeader* colHeader = NULL; 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 1432d8bdc1d..7aebe182a3f 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -221,7 +221,7 @@ void DoorShutter_Init(Actor* thisx, PlayState* play2) { DoorShutter* this = (DoorShutter*)thisx; PlayState* play = play2; s32 phi_a3; - s32 pad; + UNUSED s32 pad; s32 objectIndex; s32 i; @@ -312,7 +312,7 @@ void DoorShutter_SetupType(DoorShutter* this, PlayState* play) { } f32 func_80996840(PlayState* play, DoorShutter* this, f32 arg2, f32 arg3, f32 arg4) { - s32 pad; + UNUSED s32 pad; Vec3f sp28; Vec3f sp1C; Player* player = GET_PLAYER(play); @@ -705,7 +705,7 @@ void DoorShutter_Draw(Actor* thisx, PlayState* play) { if (this->dyna.actor.objBankIndex == this->requiredObjBankIndex && (this->unk_16B == 0 || func_80997A34(this, play) != 0)) { - s32 pad[2]; + UNUSED s32 pad[2]; ShutterInfo* sp70 = &sShutterInfo[this->unk_16C]; OPEN_DISPS(play->state.gfxCtx, "../z_door_shutter.c", 2048); diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c index 1276e01866a..6798a9f7928 100644 --- a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c +++ b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c @@ -30,7 +30,7 @@ static InitChainEntry sInitChain[] = { }; void DoorToki_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; DoorToki* this = (DoorToki*)thisx; CollisionHeader* colHeader = NULL; 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 4621934a126..46648fceaaa 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -875,7 +875,7 @@ void DoorWarp1_Update(Actor* thisx, PlayState* play) { } void DoorWarp1_DrawBlueCrystal(DoorWarp1* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_door_warp1.c", 2078); @@ -893,7 +893,7 @@ void DoorWarp1_DrawBlueCrystal(DoorWarp1* this, PlayState* play) { } void DoorWarp1_DrawPurpleCrystal(DoorWarp1* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; Vec3f eye; eye.x = -(Math_SinS(play->state.frames * 200) * 120.0f) * 80.0f; @@ -917,8 +917,8 @@ void DoorWarp1_DrawPurpleCrystal(DoorWarp1* this, PlayState* play) { } void DoorWarp1_DrawWarp(DoorWarp1* this, PlayState* play) { - s32 pad; - u32 pad1; + UNUSED s32 pad; + UNUSED s32 pad1; u32 spEC = play->state.frames * 10; f32 spE8 = (this->unk_194 >= 1.0f) ? 0.0f : 1.0f - this->unk_194; f32 spE4 = (this->unk_198 >= 1.0f) ? 0.0f : 1.0f - this->unk_198; diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c index 19be1612aab..6811126ee13 100644 --- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c +++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c @@ -162,7 +162,7 @@ void EfcErupc_Draw(Actor* thisx, PlayState* play) { void EfcErupc_DrawEffects(EfcErupcEffect* effect, PlayState* play) { GraphicsContext* gfxCtx = play->state.gfxCtx; s16 i; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(gfxCtx, "../z_efc_erupc.c", 368); for (i = 0; i < EFC_ERUPC_EFFECT_COUNT; i++, effect++) { 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 a0fad6cc7db..3d33c28fbce 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -205,7 +205,7 @@ s32 EnAm_CanMove(EnAm* this, PlayState* play, f32 distance, s16 yaw) { void EnAm_Init(Actor* thisx, PlayState* play) { CollisionHeader* colHeader = NULL; - s32 pad; + UNUSED s32 pad; EnAm* this = (EnAm*)thisx; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); @@ -240,7 +240,7 @@ void EnAm_Init(Actor* thisx, PlayState* play) { } void EnAm_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnAm* this = (EnAm*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -256,7 +256,7 @@ void EnAm_SpawnEffects(EnAm* this, PlayState* play) { Vec3f pos; Color_RGBA8 primColor = { 100, 100, 100, 0 }; Color_RGBA8 envColor = { 40, 40, 40, 0 }; - s32 pad; + UNUSED s32 pad; for (i = 4; i > 0; i--) { pos.x = this->dyna.actor.world.pos.x + ((Rand_ZeroOne() - 0.5f) * 65.0f); @@ -366,7 +366,7 @@ void EnAm_SetupRicochet(EnAm* this, PlayState* play) { void EnAm_Sleep(EnAm* this, PlayState* play) { f32 cos; - s32 pad; + UNUSED s32 pad; f32 rand; f32 sin; Player* player = GET_PLAYER(play); @@ -781,7 +781,7 @@ void EnAm_TransformSwordHitbox(Actor* thisx, PlayState* play) { } void EnAm_UpdateDamage(EnAm* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f sparkPos; if (this->deathTimer == 0) { @@ -831,13 +831,13 @@ void EnAm_Update(Actor* thisx, PlayState* play) { static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; static Color_RGBA8 dustPrimColor = { 150, 150, 150, 255 }; static Color_RGBA8 dustEnvColor = { 100, 100, 100, 150 }; - s32 pad; + UNUSED s32 pad; EnAm* this = (EnAm*)thisx; EnBom* bomb; Vec3f dustPos; s32 i; f32 dustPosScale; - s32 pad1; + UNUSED s32 pad1; if (this->dyna.actor.params != ARMOS_STATUE) { EnAm_UpdateDamage(this, play); @@ -943,7 +943,7 @@ static Vec3f sIcePosOffsets[] = { }; void EnAm_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f sp68; EnAm* this = (EnAm*)thisx; 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 fbc3480229a..a6e19dd2177 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -68,7 +68,7 @@ static InitChainEntry sInitChain[] = { }; void EnAni_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnAni* this = (EnAni*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -172,7 +172,7 @@ void func_809B064C(EnAni* this, PlayState* play) { } void func_809B07F8(EnAni* this, PlayState* play) { - s16 pad; + UNUSED s16 pad; s16 yawDiff; u16 textId; @@ -234,7 +234,7 @@ void func_809B0A6C(EnAni* this, PlayState* play) { void EnAni_Update(Actor* thisx, PlayState* play) { EnAni* this = (EnAni*)thisx; - s32 pad[2]; + UNUSED s32 pad[2]; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); @@ -316,7 +316,7 @@ void EnAni_Draw(Actor* thisx, PlayState* play) { gRoofManEyeClosedTex, }; EnAni* this = (EnAni*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_ani.c", 719); diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c index 09b79234b45..05f8e4d9a59 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -318,7 +318,7 @@ void EnAnubice_Die(EnAnubice* this, PlayState* play) { f32 rotX; Vec3f baseFireEffectPos = { 0.0f, 0.0f, 0.0f }; Vec3f rotatedFireEffectPos = { 0.0f, 0.0f, 0.0f }; - s32 pad; + UNUSED s32 pad; SkelAnime_Update(&this->skelAnime); Math_ApproachZeroF(&this->actor.shape.shadowScale, 0.4f, 0.25f); diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c index c758d48be25..59c51182117 100644 --- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c +++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c @@ -91,7 +91,7 @@ void func_809B26EC(EnAnubiceFire* this, PlayState* play) { } void func_809B27D8(EnAnubiceFire* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f velocity = { 0.0f, 0.0f, 0.0f }; Vec3f accel = { 0.0f, 0.0f, 0.0f }; Vec3f pos; @@ -147,7 +147,7 @@ void func_809B2B48(EnAnubiceFire* this, PlayState* play) { Vec3f pos; Color_RGBA8 primColor = { 255, 255, 0, 255 }; Color_RGBA8 envColor = { 255, 0, 0, 255 }; - s32 pad; + UNUSED s32 pad; s32 i; if (this->unk_15C == 0) { @@ -171,7 +171,7 @@ void func_809B2B48(EnAnubiceFire* this, PlayState* play) { void EnAnubiceFire_Update(Actor* thisx, PlayState* play) { EnAnubiceFire* this = (EnAnubiceFire*)thisx; - s32 pad; + UNUSED s32 pad; s32 i; Actor_SetScale(&this->actor, this->scale); @@ -220,7 +220,7 @@ void EnAnubiceFire_Draw(Actor* thisx, PlayState* play) { gDust4Tex, gDust5Tex, gDust6Tex, gDust7Tex, gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, }; EnAnubiceFire* this = (EnAnubiceFire*)thisx; - s32 pad[2]; + UNUSED s32 pad[2]; s32 i; OPEN_DISPS(play->state.gfxCtx, "../z_en_anubice_fire.c", 503); 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 411edcd259d..4dc9be0a51a 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -385,7 +385,7 @@ void func_809B4640(EnArrow* this, PlayState* play) { } void EnArrow_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnArrow* this = (EnArrow*)thisx; Player* player = GET_PLAYER(play); @@ -449,7 +449,7 @@ void func_809B4800(EnArrow* this, PlayState* play) { } void EnArrow_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnArrow* this = (EnArrow*)thisx; u8 alpha; f32 scale; 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 f1544067bb2..e33df076586 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 @@ -39,7 +39,7 @@ static InitChainEntry sInitChain[] = { void EnAttackNiw_Init(Actor* thisx, PlayState* play) { EnAttackNiw* this = (EnAttackNiw*)thisx; - s32 pad; + UNUSED s32 pad; Actor_ProcessInitChain(&this->actor, sInitChain); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f); @@ -297,7 +297,7 @@ void EnAttackNiw_Update(Actor* thisx, PlayState* play) { EnAttackNiw* this = (EnAttackNiw*)thisx; EnNiw* cucco; Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; Vec3f sp30; PlayState* play2 = play; diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/src/overlays/actors/ovl_En_Ba/z_en_ba.c index 711327f1389..35abebbcc0e 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -91,7 +91,7 @@ static InitChainEntry sInitChain[] = { void EnBa_Init(Actor* thisx, PlayState* play) { EnBa* this = (EnBa*)thisx; Vec3f sp38 = D_809B80E4; - s32 pad; + UNUSED s32 pad; s16 i; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -140,7 +140,7 @@ void EnBa_SetupIdle(EnBa* this) { void EnBa_Idle(EnBa* this, PlayState* play) { Player* player = GET_PLAYER(play); s32 i; - s32 pad; + UNUSED s32 pad; Vec3s sp5C; if ((this->actor.colChkInfo.mass == MASS_IMMOVABLE) && (this->actor.xzDistToPlayer > 175.0f)) { @@ -473,7 +473,7 @@ static void* D_809B8118[] = { void EnBa_Draw(Actor* thisx, PlayState* play) { EnBa* this = (EnBa*)thisx; - s32 pad; + UNUSED s32 pad; s16 i; Mtx* mtx = Graph_Alloc(play->state.gfxCtx, sizeof(Mtx) * 14); Vec3f unused = { 0.0f, 0.0f, 448.0f }; 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 70edb68e6b3..dfad886e55d 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -307,7 +307,7 @@ void EnBb_KillFlameTrail(EnBb* this) { void EnBb_Init(Actor* thisx, PlayState* play) { EffectBlureInit1 blureInit; - s32 pad; + UNUSED s32 pad; EnBb* this = (EnBb*)thisx; Actor_ProcessInitChain(thisx, sInitChain); @@ -399,7 +399,7 @@ void EnBb_Init(Actor* thisx, PlayState* play) { } void EnBb_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnBb* this = (EnBb*)thisx; Collider_DestroyJntSph(play, &this->collider); @@ -1277,7 +1277,7 @@ static Vec3f sFireIceOffsets[] = { }; void EnBb_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnBb* this = (EnBb*)thisx; Vec3f blureBase1 = { 0.0f, 5000.0f, 0.0f }; Vec3f blureBase2 = { 0.0f, 2000.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c index 6731fee916d..9af39298616 100644 --- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c +++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c @@ -40,7 +40,7 @@ void EnbdFire_SetupDraw(EnBdfire* this, EnBdfireDrawFunc drawFunc) { void EnBdfire_Init(Actor* thisx, PlayState* play) { EnBdfire* this = (EnBdfire*)thisx; - s32 pad; + UNUSED s32 pad; Actor_SetScale(&this->actor, 0.6f); EnbdFire_SetupDraw(this, EnBdfire_DrawFire); @@ -191,7 +191,7 @@ void EnBdfire_DrawFire(EnBdfire* this, PlayState* play) { object_kingdodongo_Tex_02C4E0, object_kingdodongo_Tex_02D4E0, }; s16 texIndex; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_bdfire.c", 612); texIndex = this->unk_156 & 7; 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 0fcc1828106..f6b3d6392b6 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -477,7 +477,7 @@ void func_809BDB90(EnBigokuta* this, PlayState* play) { void func_809BDC08(EnBigokuta* this, PlayState* play) { Player* player = GET_PLAYER(play); s16 phi_v0; - s16 pad; + UNUSED s16 pad; s16 phi_v1; Vec3f sp28; diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c index 7378c8ef3d1..1ea4fd5f3d4 100644 --- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c +++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c @@ -54,7 +54,7 @@ void EnBlkobj_SetupAction(EnBlkobj* this, EnBlkobjActionFunc actionFunc) { } void EnBlkobj_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnBlkobj* this = (EnBlkobj*)thisx; CollisionHeader* colHeader = NULL; @@ -71,7 +71,7 @@ void EnBlkobj_Init(Actor* thisx, PlayState* play) { } void EnBlkobj_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnBlkobj* this = (EnBlkobj*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -120,7 +120,7 @@ void EnBlkobj_DoNothing(EnBlkobj* this, PlayState* play) { } void EnBlkobj_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnBlkobj* this = (EnBlkobj*)thisx; this->actionFunc(this, play); @@ -145,7 +145,7 @@ void EnBlkobj_DrawAlpha(PlayState* play, Gfx* dList, s32 alpha) { } void EnBlkobj_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnBlkobj* this = (EnBlkobj*)thisx; s32 illusionAlpha; u32 gameplayFrames; 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 0d3e85b8653..78ddc95917b 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -224,7 +224,7 @@ void EnBom_Update(Actor* thisx, PlayState* play2) { Vec3f effPos; Vec3f dustAccel = { 0.0f, 0.6f, 0.0f }; Color_RGBA8 dustColor = { 255, 255, 255, 255 }; - s32 pad; + UNUSED s32 pad; PlayState* play = play2; EnBom* this = (EnBom*)thisx; @@ -355,7 +355,7 @@ void EnBom_Update(Actor* thisx, PlayState* play2) { } void EnBom_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnBom* this = (EnBom*)thisx; if (1) {} 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 2ea9ea0bedf..96f6b533cb6 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 @@ -380,7 +380,7 @@ static s16 sPrizeRot[] = { 0x4268, 0x4268, -0x03E8, 0x0000, 0x4268, 0x0000 }; void EnBomBowMan_ChooseShowPrize(EnBomBowlMan* this, PlayState* play) { s16 prizeTemp; - s32 pad; + UNUSED s32 pad; SkelAnime_Update(&this->skelAnime); 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 70a11b868e5..e41925ed884 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 @@ -477,7 +477,7 @@ void EnBomChu_Update(Actor* thisx, PlayState* play2) { } void EnBomChu_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnBomChu* this = (EnBomChu*)thisx; f32 colorIntensity; s32 blinkHalfPeriod; 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 a5b05d10b04..5592d71e157 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -86,7 +86,7 @@ void EnBombf_SetupAction(EnBombf* this, EnBombfActionFunc actionFunc) { void EnBombf_Init(Actor* thisx, PlayState* play) { f32 shapeUnk10 = 0.0f; - s32 pad; + UNUSED s32 pad; EnBombf* this = (EnBombf*)thisx; Actor_SetScale(thisx, 0.01f); @@ -143,10 +143,10 @@ void EnBombf_SetupGrowBomb(EnBombf* this, s16 params) { void EnBombf_GrowBomb(EnBombf* this, PlayState* play) { EnBombf* bombFlower; - s32 pad; - s32 pad1; + UNUSED s32 pad; + UNUSED s32 pad1; Player* player = GET_PLAYER(play); - s32 pad2; + UNUSED s32 pad2; if (this->flowerBombScale >= 1.0f) { if (Actor_HasParent(&this->actor, play)) { @@ -317,7 +317,7 @@ void EnBombf_Update(Actor* thisx, PlayState* play) { Vec3f effPos; Vec3f dustAccel = { 0.0f, 0.6f, 0.0f }; Color_RGBA8 dustColor = { 255, 255, 255, 255 }; - s32 pad[2]; + UNUSED s32 pad[2]; EnBombf* this = (EnBombf*)thisx; if ((this->unk_200 != 0) && (this->timer != 0)) { @@ -479,7 +479,7 @@ Gfx* EnBombf_NewMtxDList(GraphicsContext* gfxCtx, PlayState* play) { } void EnBombf_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnBombf* this = (EnBombf*)thisx; if (1) {} 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 2d2fdd40c2c..7227cabb0cf 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -112,13 +112,13 @@ void EnBoom_Fly(EnBoom* this, PlayState* play) { s16 yawDiff; s16 pitchTarget; s16 pitchDiff; - s32 pad1; + UNUSED s32 pad1; f32 distXYZScale; f32 distFromLink; DynaPolyActor* hitActor; s32 hitDynaID; Vec3f hitPoint; - s32 pad2; + UNUSED s32 pad2; player = GET_PLAYER(play); target = this->moveTo; 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 274bbf71da9..8aeee58a22e 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -390,7 +390,7 @@ void EnBox_WaitOpen(EnBox* this, PlayState* play) { f32 frameCount; AnimationHeader* anim; s32 linkAge; - s32 pad; + UNUSED s32 pad; Vec3f sp4C; Player* player; @@ -545,7 +545,7 @@ void EnBox_Update(Actor* thisx, PlayState* play) { void EnBox_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) { EnBox* this = (EnBox*)thisx; - s32 pad; + UNUSED s32 pad; if (limbIndex == 1) { gSPMatrix((*gfx)++, Matrix_NewMtx(play->state.gfxCtx, "../z_en_box.c", 1492), diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.c b/src/overlays/actors/ovl_En_Brob/z_en_brob.c index 4ed81251755..627167dbf9c 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.c +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.c @@ -57,7 +57,7 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit sColChkInfoInit = { 0, 60, 120, MASS_IMMOVABLE }; void EnBrob_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnBrob* this = (EnBrob*)thisx; CollisionHeader* colHeader = NULL; 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 8b0ae2e1908..0a69830bec3 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -331,7 +331,7 @@ void func_809CC774(EnBubble* this) { void EnBubble_Init(Actor* thisx, PlayState* play) { EnBubble* this = (EnBubble*)thisx; - u32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 16.0f, ActorShadow_DrawCircle, 0.2f); Collider_InitJntSph(play, &this->colliderSphere); @@ -407,7 +407,7 @@ void EnBubble_Update(Actor* thisx, PlayState* play) { void EnBubble_Draw(Actor* thisx, PlayState* play) { EnBubble* this = (EnBubble*)thisx; - u32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_bubble.c", 1175); diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index 360cc0f27c9..e3ca207b444 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -154,7 +154,7 @@ void EnBw_Init(Actor* thisx, PlayState* play) { } void EnBw_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnBw* this = (EnBw*)thisx; Collider_DestroyCylinder(play, &this->collider1); @@ -744,7 +744,7 @@ void EnBw_Update(Actor* thisx, PlayState* play2) { EnBw* this = (EnBw*)thisx; Vec3f velocity = { 0.0f, 0.0f, 0.0f }; Vec3f accel = { 0.0f, 0.0f, 0.0f }; - s32 pad[3]; // probably an unused Vec3f + UNUSED s32 pad[3]; // probably an unused Vec3f Color_RGBA8 sp50 = { 255, 200, 0, 255 }; Color_RGBA8 sp4C = { 255, 80, 0, 255 }; Color_RGBA8 sp48 = { 0, 0, 0, 255 }; diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index 3a45a56b097..d85252212ec 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -74,7 +74,7 @@ void EnBx_Init(Actor* thisx, PlayState* play) { ICHAIN_F32(targetArrowOffset, 5300, ICHAIN_STOP), }; s32 i; - s32 pad; + UNUSED s32 pad; Actor_ProcessInitChain(&this->actor, sInitChain); thisx->scale.x = thisx->scale.z = 0.01f; @@ -201,7 +201,7 @@ void EnBx_Draw(Actor* thisx, PlayState* play) { object_bxa_Tex_0029F0, }; EnBx* this = (EnBx*)thisx; - s32 pad; + UNUSED s32 pad; Mtx* mtx = Graph_Alloc(play->state.gfxCtx, 4 * sizeof(Mtx)); s16 i; 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 68bf2f0c310..ef327ce9348 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 @@ -341,7 +341,7 @@ void EnClearTag_Update(Actor* thisx, PlayState* play2) { s16 worldRotationTargetY; f32 loseTargetLockDistance; s16 worldRotationTargetZ; - s32 pad; + UNUSED s32 pad; // Check if the Arwing should crash. if (this->collider.base.acFlags & AC_HIT) { @@ -680,7 +680,7 @@ void EnClearTag_Update(Actor* thisx, PlayState* play2) { * Arwing clear tage types will draw the Arwing, the backfire, and a shadow. */ void EnClearTag_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnClearTag* this = (EnClearTag*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_clear_tag.c", 983); 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 e1e41ff69d9..605e0983a0e 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -103,7 +103,7 @@ void func_809DEF94(EnCow* this) { void EnCow_Init(Actor* thisx, PlayState* play) { EnCow* this = (EnCow*)thisx; - s32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 72.0f); switch (this->actor.params) { @@ -341,7 +341,7 @@ void EnCow_Update(Actor* thisx, PlayState* play2) { void func_809DFE98(Actor* thisx, PlayState* play) { EnCow* this = (EnCow*)thisx; - s32 pad; + UNUSED s32 pad; if (SkelAnime_Update(&this->skelAnime) != 0) { if (this->skelAnime.animation == &gCowTailIdleAnim) { 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 b216014e58e..3e53143a232 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -427,7 +427,7 @@ void EnCrow_UpdateDamage(EnCrow* this, PlayState* play) { void EnCrow_Update(Actor* thisx, PlayState* play) { EnCrow* this = (EnCrow*)thisx; - f32 pad; + UNUSED s32 pad; f32 height; f32 scale; diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c index 4c1281a70c4..4b519a4c860 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c @@ -122,7 +122,7 @@ void EnCs_ChangeAnim(EnCs* this, s32 index, s32* currentIndex) { void EnCs_Init(Actor* thisx, PlayState* play) { EnCs* this = (EnCs*)thisx; - s32 pad; + UNUSED s32 pad; if (!IS_DAY) { Actor_Kill(&this->actor); @@ -163,8 +163,8 @@ void EnCs_Destroy(Actor* thisx, PlayState* play) { } s32 EnCs_GetTalkState(EnCs* this, PlayState* play) { - s32 pad; - s32 pad2; + UNUSED s32 pad; + UNUSED s32 pad2; s32 talkState = 1; switch (Message_GetState(&play->msgCtx)) { @@ -226,7 +226,7 @@ s32 EnCs_GetTextID(EnCs* this, PlayState* play) { } void EnCs_HandleTalking(EnCs* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 sp2A; s16 sp28; @@ -418,7 +418,7 @@ void EnCs_Talk(EnCs* this, PlayState* play) { void EnCs_Update(Actor* thisx, PlayState* play) { static s32 eyeBlinkFrames[] = { 70, 1, 1 }; EnCs* this = (EnCs*)thisx; - s32 pad; + UNUSED s32 pad; if (this->currentAnimIndex == 0) { if (((s32)this->skelAnime.curFrame == 9) || ((s32)this->skelAnime.curFrame == 23)) { @@ -459,7 +459,7 @@ void EnCs_Draw(Actor* thisx, PlayState* play) { gGraveyardKidEyesClosedTex, }; EnCs* this = (EnCs*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_cs.c", 968); 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 5b673d02e66..590977abb50 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -148,7 +148,7 @@ void EnDaiku_ChangeAnim(EnDaiku* this, s32 index, s32* currentIndex) { void EnDaiku_Init(Actor* thisx, PlayState* play) { EnDaiku* this = (EnDaiku*)thisx; - s32 pad; + UNUSED s32 pad; s32 noKill = true; s32 isFree = false; @@ -439,7 +439,7 @@ void EnDaiku_EscapeRotate(EnDaiku* this, PlayState* play) { } void EnDaiku_InitSubCamera(EnDaiku* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f eyePosDeltaLocal; Vec3f eyePosDeltaWorld; @@ -473,7 +473,7 @@ void EnDaiku_InitSubCamera(EnDaiku* this, PlayState* play) { } void EnDaiku_UpdateSubCamera(EnDaiku* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; this->subCamAtNext.x = this->actor.world.pos.x; this->subCamAtNext.y = this->actor.world.pos.y + 60.0f; @@ -513,12 +513,12 @@ void EnDaiku_EscapeSuccess(EnDaiku* this, PlayState* play) { * The carpenter is running away */ void EnDaiku_EscapeRun(EnDaiku* this, PlayState* play) { - s32 pad1; + UNUSED s32 pad1; Path* path; s16 ry; f32 dx; f32 dz; - s32 pad2; + UNUSED s32 pad2; f32 dxz; Vec3s* pointPos; diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index 41a669f023e..85f168bb797 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -126,7 +126,7 @@ void EnDaikuKakariko_ChangeAnim(EnDaikuKakariko* this, s32 index, s32* currentIn void EnDaikuKakariko_Init(Actor* thisx, PlayState* play) { static u16 initFlags[] = { 0x0080, 0x00B0, 0x0070, 0x0470 }; // List of inital values for this->flags EnDaikuKakariko* this = (EnDaikuKakariko*)thisx; - s32 pad; + UNUSED s32 pad; if (LINK_AGE_IN_YEARS == YEARS_CHILD) { switch (play->sceneNum) { @@ -348,7 +348,7 @@ void EnDaikuKakariko_StopRunning(EnDaikuKakariko* this, PlayState* play) { } void EnDaikuKakariko_Run(EnDaikuKakariko* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Path* path; Vec3s* pathPos; f32 xDist; @@ -452,9 +452,9 @@ void EnDaikuKakariko_Run(EnDaikuKakariko* this, PlayState* play) { void EnDaikuKakariko_Update(Actor* thisx, PlayState* play) { EnDaikuKakariko* this = (EnDaikuKakariko*)thisx; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); - s32 pad2; + UNUSED s32 pad2; if (this->currentAnimIndex == 3) { if (((s32)this->skelAnime.curFrame == 6) || ((s32)this->skelAnime.curFrame == 15)) { 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 3696b0a1522..0ff252da0e4 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -1109,7 +1109,7 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) { } void EnDekubaba_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnDekubaba* this = (EnDekubaba*)thisx; if (this->collider.base.atFlags & AT_HIT) { diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h index b6e5243e959..dbe4791f0e1 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h @@ -18,7 +18,7 @@ typedef struct EnDekubaba { /* 0x014C */ Vec3f bodyPartsPos[4]; /* 0x017C */ SkelAnime skelAnime; /* 0x01C0 */ EnDekubabaActionFunc actionFunc; - /* 0x01C4 */ char pad[0x2]; + /* 0x01C4 */ char unk_1C4[0x2]; /* 0x01C6 */ s16 timer; /* 0x01C8 */ s16 targetSwayAngle; /* 0x01CA */ s16 stemSectionAngle[3]; // Used to calculate the position of the stem sections and head with spherical trigonometry 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 6ade12dbea6..1e777c52a9c 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -107,7 +107,7 @@ static InitChainEntry sInitChain[] = { void EnDekunuts_Init(Actor* thisx, PlayState* play) { EnDekunuts* this = (EnDekunuts*)thisx; - s32 pad; + UNUSED s32 pad; Actor_ProcessInitChain(&this->actor, sInitChain); if (thisx->params == DEKUNUTS_FLOWER) { @@ -422,7 +422,7 @@ void EnDekunuts_BeStunned(EnDekunuts* this, PlayState* play) { void EnDekunuts_Die(EnDekunuts* this, PlayState* play) { static Vec3f effectVelAndAccel = { 0.0f, 0.0f, 0.0f }; - s32 pad; + UNUSED s32 pad; Vec3f effectPos; if (SkelAnime_Update(&this->skelAnime)) { @@ -469,7 +469,7 @@ void EnDekunuts_ColliderCheck(EnDekunuts* this, PlayState* play) { void EnDekunuts_Update(Actor* thisx, PlayState* play) { EnDekunuts* this = (EnDekunuts*)thisx; - s32 pad; + UNUSED s32 pad; if (this->actor.params != DEKUNUTS_FLOWER) { EnDekunuts_ColliderCheck(this, play); diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index a8e0eeec6e4..407ee67fe6b 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -157,7 +157,7 @@ void EnDh_Init(Actor* thisx, PlayState* play) { } void EnDh_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnDh* this = (EnDh*)thisx; func_800F5B58(); @@ -296,7 +296,7 @@ void EnDh_SetupAttack(EnDh* this) { } void EnDh_Attack(EnDh* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; if (SkelAnime_Update(&this->skelAnime)) { this->actionState++; @@ -470,7 +470,7 @@ void EnDh_Death(EnDh* this, PlayState* play) { } void EnDh_CollisionCheck(EnDh* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); s32 lastHealth; @@ -501,10 +501,10 @@ void EnDh_CollisionCheck(EnDh* this, PlayState* play) { } void EnDh_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnDh* this = (EnDh*)thisx; Player* player = GET_PLAYER(play); - s32 pad40; + UNUSED s32 pad40; EnDh_CollisionCheck(this, play); this->actionFunc(this, play); @@ -547,7 +547,7 @@ void EnDh_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, } void EnDh_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnDh* this = (EnDh*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_dh.c", 1099); diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index c1464a7153d..56901bc8775 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -172,7 +172,7 @@ void EnDha_Init(Actor* thisx, PlayState* play) { } void EnDha_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnDha* this = (EnDha*)thisx; Collider_DestroyJntSph(play, &this->collider); @@ -193,8 +193,8 @@ void EnDha_Wait(EnDha* this, PlayState* play) { Vec3f armPosMultiplier1 = { 0.0f, 0.0f, 55.0f }; Vec3f armPosMultiplier2 = { 0.0f, 0.0f, -54.0f }; Player* player = GET_PLAYER(play); - s32 pad; - s32 pad2; + UNUSED s32 pad; + UNUSED s32 pad2; Vec3f playerPos = player->actor.world.pos; Vec3s angle; s16 yaw; @@ -402,7 +402,7 @@ void EnDha_UpdateHealth(EnDha* this, PlayState* play) { } void EnDha_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnDha* this = (EnDha*)thisx; if (this->actor.parent == NULL) { @@ -456,7 +456,7 @@ void EnDha_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, } void EnDha_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnDha* this = (EnDha*)thisx; Gfx_SetupDL_25Opa(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index ca952234ef2..0ab1eec6498 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -546,7 +546,7 @@ Gfx* EnDivingGame_EmptyDList(GraphicsContext* gfxCtx) { s32 EnDivingGame_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { EnDivingGame* this = (EnDivingGame*)thisx; - s32 pad; + UNUSED s32 pad; if (limbIndex == 6) { rot->x += this->vec_28A.y; 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 9e14fef5b84..93f94942926 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -473,7 +473,7 @@ void EnDns_Burrow(EnDns* this, PlayState* play) { void EnDns_Update(Actor* thisx, PlayState* play) { EnDns* this = (EnDns*)thisx; - s16 pad; + UNUSED s16 pad; this->dustTimer++; this->actor.textId = D_809F040C[this->actor.params]; diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c index a6983284c37..3987dbc5cc8 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c @@ -72,7 +72,7 @@ void EnDntDemo_Init(Actor* thisx, PlayState* play2) { PlayState* play = play2; EnDntDemo* this = (EnDntDemo*)thisx; s32 i; - s32 pad; + UNUSED s32 pad; osSyncPrintf("\n\n"); // "Deku Scrub mask show start" @@ -314,7 +314,7 @@ void EnDntDemo_Prize(EnDntDemo* this, PlayState* play) { } void EnDntDemo_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnDntDemo* this = (EnDntDemo*)thisx; if (this->unkTimer2 != 0) { diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index 71af59183a4..69f633b0e3f 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -90,7 +90,7 @@ void EnDntJiji_Init(Actor* thisx, PlayState* play) { } void EnDntJiji_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnDntJiji* this = (EnDntJiji*)thisx; Collider_DestroyCylinder(play, &this->collider); @@ -368,7 +368,7 @@ void EnDntJiji_Return(EnDntJiji* this, PlayState* play) { } void EnDntJiji_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnDntJiji* this = (EnDntJiji*)thisx; Actor_SetScale(&this->actor, 0.015f); diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index a11b8be5f09..d4bda081d93 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -115,7 +115,7 @@ static Color_RGBA8 sLeafColors[] = { }; void EnDntNomal_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnDntNomal* this = (EnDntNomal*)thisx; this->type = this->actor.params; @@ -158,7 +158,7 @@ void EnDntNomal_Init(Actor* thisx, PlayState* play) { } void EnDntNomal_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnDntNomal* this = (EnDntNomal*)thisx; if (this->type == ENDNTNOMAL_TARGET) { @@ -735,7 +735,7 @@ void EnDntNomal_StageReturn(EnDntNomal* this, PlayState* play) { } void EnDntNomal_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnDntNomal* this = (EnDntNomal*)thisx; if (this->timer1 != 0) { @@ -850,7 +850,7 @@ void EnDntNomal_DrawStageScrub(Actor* thisx, PlayState* play) { static void* blinkTex[] = { gDntStageEyeOpenTex, gDntStageEyeHalfTex, gDntStageEyeShutTex }; EnDntNomal* this = (EnDntNomal*)thisx; Vec3f dustScale = { 0.25f, 0.25f, 0.25f }; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_dnt_nomal.c", 1790); Gfx_SetupDL_25Opa(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c index 9827a90a49d..c63956ea389 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -276,7 +276,7 @@ s32 func_809F6DD0(EnDodojr* this) { void func_809F6E54(EnDodojr* this, PlayState* play) { f32 angles[] = { 0.0f, 210.0f, 60.0f, 270.0f, 120.0f, 330.0f, 180.0f, 30.0f, 240.0f, 90.0f, 300.0f, 150.0f }; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); Vec3f pos; s16 angleIndex; 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 12d2afc1686..98a27789115 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -239,7 +239,7 @@ void EnDodongo_SetupAction(EnDodongo* this, EnDodongoActionFunc actionFunc) { } void EnDodongo_SpawnBombSmoke(EnDodongo* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f velocity = { 0.0f, 0.0f, 0.0f }; Vec3f accel = { 0.0f, 0.3f, 0.0f }; Vec3f pos = this->headPos; @@ -346,7 +346,7 @@ void EnDodongo_Init(Actor* thisx, PlayState* play) { } void EnDodongo_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnDodongo* this = (EnDodongo*)thisx; Effect_Delete(play, this->blureIdx); @@ -422,11 +422,11 @@ void EnDodongo_EndBreatheFire(EnDodongo* this, PlayState* play) { } void EnDodongo_BreatheFire(EnDodongo* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f velocity = { 0.0f, 0.0f, 0.0f }; Vec3f accel = { 0.0f, 0.0f, 0.0f }; Vec3f pos; - s16 pad2; + UNUSED s16 pad2; s16 fireFrame; if ((s32)this->skelAnime.curFrame == 24) { @@ -456,7 +456,7 @@ void EnDodongo_SwallowBomb(EnDodongo* this, PlayState* play) { Vec3f deathFireAccel = { 0.0f, 1.0f, 0.0f }; s16 i; Vec3f pos; - s32 pad; + UNUSED s32 pad; if (this->actor.child != NULL) { this->actor.child->world.pos = this->mouthPos; @@ -525,7 +525,7 @@ void EnDodongo_SwallowBomb(EnDodongo* this, PlayState* play) { } void EnDodongo_Walk(EnDodongo* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 playbackSpeed; Player* player = GET_PLAYER(play); s16 yawDiff = (s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y); @@ -742,7 +742,7 @@ void EnDodongo_UpdateQuad(EnDodongo* this, PlayState* play) { Vec3f sp88 = { -1000.0f, -200.0f, 1500.0f }; Vec3f sp7C = { -1000.0f, -200.0f, -1500.0f }; Vec3f sp70 = { 0.0f, 0.0f, 0.0f }; - s32 pad4C[9]; // Possibly 3 more Vec3fs? + UNUSED s32 pad4C[9]; // Possibly 3 more Vec3fs? s32 a = 0; s32 b = 1; // These indices are needed to match. s32 c = 2; // Might be a way to quickly test vertex arrangements @@ -763,7 +763,7 @@ void EnDodongo_UpdateQuad(EnDodongo* this, PlayState* play) { } void EnDodongo_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnDodongo* this = (EnDodongo*)thisx; EnDodongo_CollisionCheck(this, play); diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index afd70c7dd0c..8ec4146190a 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -242,7 +242,7 @@ s32 EnDog_Orient(EnDog* this, PlayState* play) { void EnDog_Init(Actor* thisx, PlayState* play) { EnDog* this = (EnDog*)thisx; s16 followingDog; - s32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gDogSkel, NULL, this->jointTable, this->morphTable, 13); @@ -449,7 +449,7 @@ void EnDog_Wait(EnDog* this, PlayState* play) { void EnDog_Update(Actor* thisx, PlayState* play) { EnDog* this = (EnDog*)thisx; - s32 pad; + UNUSED s32 pad; EnDog_PlayAnimAndSFX(this); SkelAnime_Update(&this->skelAnime); diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.h b/src/overlays/actors/ovl_En_Dog/z_en_dog.h index dec2b5c1800..00db7544e8a 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.h +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.h @@ -17,9 +17,9 @@ typedef struct EnDog { /* 0x01E4 */ u8 reverse; /* 0x01E6 */ s16 waypoint; /* 0x01E8 */ s16 unusedAngle; - /* 0x01EA */ s16 pad1; + /* 0x01EA */ char unk_1EA[0x2]; /* 0x01EC */ s16 behaviorTimer; - /* 0x01EE */ s16 pad2; + /* 0x01EE */ char unk_1EE[0x2]; /* 0x01F0 */ s16 nextBehavior; /* 0x01F2 */ s16 behavior; /* 0x01F4 */ Vec3s jointTable[13]; 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 057ef258d82..f409c2eaa5b 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -296,10 +296,10 @@ void EnDoor_Update(Actor* thisx, PlayState* play) { } s32 EnDoor_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { - s32 pad; + UNUSED s32 pad; TransitionActorEntry* transitionEntry; Gfx** doorDLists; - s32 pad2; + UNUSED s32 pad2; s16 rotDiff; s32 doorDListIndex; EnDoor* this = (EnDoor*)thisx; diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c index 12dd021e106..2fbb2c20d08 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.c +++ b/src/overlays/actors/ovl_En_Du/z_en_du.c @@ -278,7 +278,7 @@ void func_809FE104(EnDu* this) { void EnDu_Init(Actor* thisx, PlayState* play) { EnDu* this = (EnDu*)thisx; - s32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gDaruniaSkel, NULL, 0, 0, 0); @@ -535,7 +535,7 @@ void func_809FECE4(EnDu* this, PlayState* play) { void EnDu_Update(Actor* thisx, PlayState* play) { EnDu* this = (EnDu*)thisx; - s32 pad; + UNUSED s32 pad; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); 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 333559abfba..586f4aa18c9 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 @@ -93,7 +93,7 @@ void EnDyExtra_Draw(Actor* thisx, PlayState* play) { static u8 D_809FFC50[] = { 0x02, 0x01, 0x01, 0x02, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x01, 0x02, 0x00 }; EnDyExtra* this = (EnDyExtra*)thisx; - s32 pad; + UNUSED s32 pad; GraphicsContext* gfxCtx = play->state.gfxCtx; Vtx* vertices = SEGMENTED_TO_VIRTUAL(gGreatFairySpiralBeamVtx); s32 i; diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index 201d43237c1..902f22c7c0b 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -117,7 +117,7 @@ static InitChainEntry sInitChain[] = { */ void EnEiyer_Init(Actor* thisx, PlayState* play) { EnEiyer* this = (EnEiyer*)thisx; - s32 pad; + UNUSED s32 pad; Actor_ProcessInitChain(&this->actor, sInitChain); ActorShape_Init(&this->actor.shape, 600.0f, ActorShadow_DrawCircle, 65.0f); @@ -409,7 +409,7 @@ void EnEiyer_Ambush(EnEiyer* this, PlayState* play) { void EnEiyer_Glide(EnEiyer* this, PlayState* play) { f32 curFrame; - s32 pad; + UNUSED s32 pad; s16 yawChange; SkelAnime_Update(&this->skelanime); @@ -635,7 +635,7 @@ void EnEiyer_UpdateDamage(EnEiyer* this, PlayState* play) { void EnEiyer_Update(Actor* thisx, PlayState* play) { EnEiyer* this = (EnEiyer*)thisx; - s32 pad; + UNUSED s32 pad; EnEiyer_UpdateDamage(this, play); this->actionFunc(this, play); 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 6a3f175fcf8..805b7cd47ab 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -313,7 +313,7 @@ f32 EnElf_GetColorValue(s32 colorFlag) { void EnElf_Init(Actor* thisx, PlayState* play) { EnElf* this = (EnElf*)thisx; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); s32 colorConfig; s32 i; @@ -433,7 +433,7 @@ void func_80A029A8(EnElf* this, s16 increment) { } void EnElf_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnElf* this = (EnElf*)thisx; LightContext_RemoveLight(play, &play->lightCtx, this->lightNodeGlow); @@ -537,7 +537,7 @@ void func_80A02F2C(EnElf* this, Vec3f* targetPos) { } void func_80A03018(EnElf* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; Player* player = GET_PLAYER(play); s16 targetYaw; Vec3f* unk_28C = &this->unk_28C; @@ -599,7 +599,7 @@ void func_80A03148(EnElf* this, Vec3f* arg1, f32 arg2, f32 arg3, f32 arg4) { void func_80A0329C(EnElf* this, PlayState* play) { Player* refActor = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); f32 heightDiff; @@ -1185,7 +1185,7 @@ void func_80A0461C(EnElf* this, PlayState* play) { void EnElf_SpawnSparkles(EnElf* this, PlayState* play, s32 sparkleLife) { static Vec3f sparkleVelocity = { 0.0f, -0.05f, 0.0f }; static Vec3f sparkleAccel = { 0.0f, -0.025f, 0.0f }; - s32 pad; + UNUSED s32 pad; Vec3f sparklePos; Color_RGBA8 primColor; Color_RGBA8 envColor; @@ -1207,7 +1207,7 @@ void EnElf_SpawnSparkles(EnElf* this, PlayState* play, s32 sparkleLife) { } void func_80A04D90(EnElf* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 bgId; this->actor.floorHeight = BgCheck_EntityRaycastFloor5(play, &play->colCtx, &this->actor.floorPoly, &bgId, @@ -1373,7 +1373,7 @@ void func_80A052F4(Actor* thisx, PlayState* play) { void func_80A053F0(Actor* thisx, PlayState* play) { u8 unk2C7; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); EnElf* this = (EnElf*)thisx; @@ -1458,7 +1458,7 @@ void func_80A053F0(Actor* thisx, PlayState* play) { } void EnElf_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnElf* this = (EnElf*)thisx; this->actionFunc(this, play); @@ -1473,7 +1473,7 @@ void EnElf_Update(Actor* thisx, PlayState* play) { s32 EnElf_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) { static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; - s32 pad; + UNUSED s32 pad; f32 scale; Vec3f mtxMult; EnElf* this = (EnElf*)thisx; @@ -1502,11 +1502,11 @@ s32 EnElf_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p } void EnElf_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 alphaScale; s32 envAlpha; EnElf* this = (EnElf*)thisx; - s32 pad1; + UNUSED s32 pad1; Gfx* dListHead; Player* player = GET_PLAYER(play); 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 015779aa848..78604747683 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -27,7 +27,7 @@ const ActorInit En_Encount1_InitVars = { }; void EnEncount1_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnEncount1* this = (EnEncount1*)thisx; f32 spawnRange; @@ -313,7 +313,7 @@ void EnEncount1_SpawnStalchildOrWolfos(EnEncount1* this, PlayState* play) { } void EnEncount1_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnEncount1* this = (EnEncount1*)thisx; if (this->timer != 0) { 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 d343a43da9c..c10b93f4b94 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -60,7 +60,7 @@ void EnEncount2_Init(Actor* thisx, PlayState* play) { } void EnEncount2_Wait(EnEncount2* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 quakeIndex; s16 spawnerState; Player* player = GET_PLAYER(play); diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c index 428c83e21dd..06be9389fc1 100644 --- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c +++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c @@ -48,7 +48,7 @@ void EnExItem_Destroy(Actor* thisx, PlayState* play) { } void EnExItem_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnExItem* this = (EnExItem*)thisx; this->actor.flags &= ~ACTOR_FLAG_0; @@ -258,7 +258,7 @@ void EnExItem_WaitForObject(EnExItem* this, PlayState* play) { } void EnExItem_BowlPrize(EnExItem* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 tmpf1; f32 tmpf2; f32 tmpf3; @@ -420,7 +420,7 @@ void EnExItem_TargetPrizeFinish(EnExItem* this, PlayState* play) { } void EnExItem_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnExItem* this = (EnExItem*)thisx; if (this->timer != 0) { @@ -436,7 +436,7 @@ void EnExItem_Update(Actor* thisx, PlayState* play) { } void EnExItem_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnExItem* this = (EnExItem*)thisx; s32 magicType; diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index 3f586eecda6..99870683261 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -247,7 +247,7 @@ void EnExRuppy_EnterWater(EnExRuppy* this, PlayState* play) { void EnExRuppy_Sink(EnExRuppy* this, PlayState* play) { EnDivingGame* divingGame; Vec3f pos; - s32 pad; + UNUSED s32 pad; if ((this->actor.bgCheckFlags & BGCHECKFLAG_WATER) && (this->actor.yDistToWater > 15.0f)) { pos = this->actor.world.pos; @@ -378,7 +378,7 @@ void EnExRuppy_Draw(Actor* thisx, PlayState* play) { static void* rupeeTextures[] = { gRupeeGreenTex, gRupeeBlueTex, gRupeeRedTex, gRupeePinkTex, gRupeeOrangeTex, }; - s32 pad; + UNUSED s32 pad; EnExRuppy* this = (EnExRuppy*)thisx; if (!this->invisible) { diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c index ee6129effa7..240dd93c2a1 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -321,7 +321,7 @@ s32 EnFd_CanSeeActor(EnFd* this, Actor* actor, PlayState* play) { s32 bgId; Vec3f colPoint; s16 angle; - s32 pad; + UNUSED s32 pad; // Check to see if `actor` is within 400 units of `this` if (Math_Vec3f_DistXYZ(&this->actor.world.pos, &actor->world.pos) > 400.0f) { @@ -648,7 +648,7 @@ void EnFd_WaitForCore(EnFd* this, PlayState* play) { void EnFd_Update(Actor* thisx, PlayState* play) { EnFd* this = (EnFd*)thisx; - s32 pad; + UNUSED s32 pad; if (this->firstUpdateFlag) { func_800F5ACC(NA_BGM_MINI_BOSS); @@ -760,7 +760,7 @@ void EnFd_Draw(Actor* thisx, PlayState* play) { { 255, 0, 0, 255 }, }; u32 frames; - s32 pad; + UNUSED s32 pad; frames = play->state.frames; diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c index dd21184ae57..efe9a47fd17 100644 --- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c +++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c @@ -121,7 +121,7 @@ s32 EnFdFire_CheckCollider(EnFdFire* this, PlayState* play) { void EnFdFire_Init(Actor* thisx, PlayState* play) { EnFdFire* this = (EnFdFire*)thisx; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 20.0f); @@ -209,7 +209,7 @@ void EnFdFire_Disappear(EnFdFire* this, PlayState* play) { void EnFdFire_Update(Actor* thisx, PlayState* play) { EnFdFire* this = (EnFdFire*)thisx; - s32 pad; + UNUSED s32 pad; if (this->actionFunc != EnFdFire_Disappear) { if ((this->actor.parent->update == NULL) || EnFdFire_CheckCollider(this, play)) { @@ -237,7 +237,7 @@ void EnFdFire_Draw(Actor* thisx, PlayState* play) { { 255, 10, 0, 255 }, { 0, 10, 255, 255 }, }; - s32 pad; + UNUSED s32 pad; EnFdFire* this = (EnFdFire*)thisx; Vec3f scale = { 0.0f, 0.0f, 0.0f }; Vec3f sp90 = { 0.0f, 0.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index 0045c590d01..17bdbd52a34 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -81,7 +81,7 @@ void EnFhgFire_SetUpdate(EnFhgFire* this, EnFhgFireUpdateFunc updateFunc) { } void EnFhgFire_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnFhgFire* this = (EnFhgFire*)thisx; Player* player = GET_PLAYER(play); @@ -163,7 +163,7 @@ void EnFhgFire_Init(Actor* thisx, PlayState* play) { } void EnFhgFire_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnFhgFire* this = (EnFhgFire*)thisx; if ((this->actor.params == FHGFIRE_LIGHTNING_SHOCK) || (this->actor.params == FHGFIRE_LIGHTNING_BURST) || @@ -681,7 +681,7 @@ void EnFhgFire_PhantomWarp(EnFhgFire* this, PlayState* play) { } void EnFhgFire_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnFhgFire* this = (EnFhgFire*)thisx; this->work[FHGFIRE_VARIANCE_TIMER]++; @@ -701,7 +701,7 @@ static void* sDustTextures[] = { }; void EnFhgFire_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnFhgFire* this = (EnFhgFire*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_fhg_fire.c", 1723); 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 d6ae2420df0..31dba2a4d86 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 @@ -384,7 +384,7 @@ void EnFireRock_Update(Actor* thisx, PlayState* play) { void EnFireRock_Draw(Actor* thisx, PlayState* play) { EnFireRock* this = (EnFireRock*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_fire_rock.c", 747); Matrix_Translate(thisx->world.pos.x + this->relativePos.x, thisx->world.pos.y + this->relativePos.y, 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 d492f232562..6fdf04987b5 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -163,7 +163,7 @@ void EnFish_SetYOffset(EnFish* this) { } s32 EnFish_InBottleRange(EnFish* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); Vec3f sp1C; @@ -226,7 +226,7 @@ void EnFish_Respawning_SetupFollowChild(EnFish* this) { } void EnFish_Respawning_FollowChild(EnFish* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnFish_SetYOffset(this); Math_SmoothStepToF(&this->actor.speedXZ, 1.8f, 0.08f, 0.4f, 0.0f); @@ -262,8 +262,8 @@ void EnFish_Respawning_SetupFleePlayer(EnFish* this) { } void EnFish_Respawning_FleePlayer(EnFish* this, PlayState* play) { - s32 pad; - s16 pad2; + UNUSED s32 pad; + UNUSED s16 pad2; s16 frames; s16 yaw; s16 playerClose; @@ -317,9 +317,9 @@ void EnFish_Respawning_SetupApproachPlayer(EnFish* this) { } void EnFish_Respawning_ApproachPlayer(EnFish* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); - s32 pad2; + UNUSED s32 pad2; Vec3f sp38; s16 yaw; s16 temp_a0_2; @@ -396,7 +396,7 @@ void EnFish_Dropped_Fall(EnFish* this, PlayState* play) { * height and whether the sound should play again. */ void EnFish_Dropped_SetupFlopOnGround(EnFish* this) { - s32 pad; + UNUSED s32 pad; f32 randomFloat; s32 playSound; @@ -431,7 +431,7 @@ void EnFish_Dropped_SetupFlopOnGround(EnFish* this) { } void EnFish_Dropped_FlopOnGround(EnFish* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 frames = play->state.frames; s16 targetXRot; @@ -483,7 +483,7 @@ void EnFish_Dropped_SetupSwimAway(EnFish* this) { } void EnFish_Dropped_SwimAway(EnFish* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Math_SmoothStepToF(&this->actor.speedXZ, 2.8f, 0.1f, 0.4f, 0.0f); @@ -536,9 +536,9 @@ void EnFish_Unique_SwimIdle(EnFish* this, PlayState* play) { f32 playSpeed; u32 frames = play->gameplayFrames; f32* speed; - s32 pad2; + UNUSED s32 pad2; f32 extraPlaySpeed; - s32 pad3; + UNUSED s32 pad3; if (this->actor.xzDistToPlayer < 60.0f) { if (this->timer < 12) { @@ -604,7 +604,7 @@ void EnFish_Cutscene_FlopOnGround(EnFish* this, PlayState* play) { } void EnFish_Cutscene_WiggleFlyingThroughAir(EnFish* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 sp28 = Math_SinS(this->slowPhase); f32 sp24 = Math_SinS(this->fastPhase); @@ -616,8 +616,8 @@ void EnFish_Cutscene_WiggleFlyingThroughAir(EnFish* this, PlayState* play) { } void EnFish_UpdateCutscene(EnFish* this, PlayState* play) { - s32 pad; - s32 pad2; + UNUSED s32 pad; + UNUSED s32 pad2; CsCmdActorAction* csAction = play->csCtx.npcActions[1]; Vec3f startPos; Vec3f endPos; 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 ddf7ca49b23..d753d176b80 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -123,7 +123,7 @@ void EnFloormas_Init(Actor* thisx, PlayState* play2) { EnFloormas* this = (EnFloormas*)thisx; PlayState* play = play2; s32 invisble; - s32 pad; + UNUSED s32 pad; Actor_ProcessInitChain(&this->actor, sInitChain); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 50.0f); @@ -522,7 +522,7 @@ void EnFloormas_Run(EnFloormas* this, PlayState* play) { } void EnFloormas_Turn(EnFloormas* this, PlayState* play) { - char pad[4]; + UNUSED s32 pad; f32 sp30; f32 sp2C; @@ -974,7 +974,7 @@ void EnFloormas_Freeze(EnFloormas* this, PlayState* play) { } void EnFloormas_ColliderCheck(EnFloormas* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 isSmall; if (this->collider.base.acFlags & AC_HIT) { @@ -1020,7 +1020,7 @@ void EnFloormas_ColliderCheck(EnFloormas* this, PlayState* play) { void EnFloormas_Update(Actor* thisx, PlayState* play) { EnFloormas* this = (EnFloormas*)thisx; - s32 pad; + UNUSED s32 pad; if (this->actionFunc != EnFloormas_SmWait) { if (this->collider.base.atFlags & AT_HIT) { 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 dc113140b5c..1b808453e4e 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -273,9 +273,9 @@ void EnFr_DrawActive(EnFr* this) { void EnFr_Update(Actor* thisx, PlayState* play) { EnFr* this = (EnFr*)thisx; - s32 pad; + UNUSED s32 pad; s32 frogIndex; - s32 pad2; + UNUSED s32 pad2; if (Object_IsLoaded(&play->objectCtx, this->objBankIndex)) { this->actor.flags &= ~ACTOR_FLAG_4; 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 c95d2889266..5821087dc22 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -72,7 +72,7 @@ typedef enum { } EnFuFace; void EnFu_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnFu* this = (EnFu*)thisx; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); @@ -234,7 +234,7 @@ void EnFu_WaitAdult(EnFu* this, PlayState* play) { } void EnFu_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnFu* this = (EnFu*)thisx; Collider_UpdateCylinder(&this->actor, &this->collider); @@ -259,7 +259,7 @@ void EnFu_Update(Actor* thisx, PlayState* play) { s32 EnFu_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { EnFu* this = (EnFu*)thisx; - s32 pad; + UNUSED s32 pad; if (limbIndex == FU_LIMB_UNK) { return false; @@ -295,7 +295,7 @@ void EnFu_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void EnFu_Draw(Actor* thisx, PlayState* play) { static void* sEyesSegments[] = { gWindmillManEyeClosedTex, gWindmillManEyeAngryTex }; static void* sMouthSegments[] = { gWindmillManMouthOpenTex, gWindmillManMouthAngryTex }; - s32 pad; + UNUSED s32 pad; EnFu* this = (EnFu*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_fu.c", 773); 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 561b1e6d713..3197051899f 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -661,7 +661,7 @@ static EnFzSpawnIceSmokeFunc iceSmokeSpawnFuncs[] = { void EnFz_Update(Actor* thisx, PlayState* play) { EnFz* this = (EnFz*)thisx; - s32 pad; + UNUSED s32 pad; this->counter++; @@ -710,7 +710,7 @@ void EnFz_Draw(Actor* thisx, PlayState* play) { gFreezardHeadChippedDL, // Entire head chipped off (1 or 2 health) }; EnFz* this = (EnFz*)thisx; - s32 pad; + UNUSED s32 pad; s32 index; index = (6 - this->actor.colChkInfo.health) >> 1; diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index 058a80a5d8e..8d5de81f9b8 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -77,7 +77,7 @@ const ActorInit En_G_Switch_InitVars = { }; void EnGSwitch_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnGSwitch* this = (EnGSwitch*)thisx; this->type = (this->actor.params >> 0xC) & 0xF; @@ -165,7 +165,7 @@ void EnGSwitch_Init(Actor* thisx, PlayState* play) { } void EnGSwitch_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnGSwitch* this = (EnGSwitch*)thisx; Collider_DestroyCylinder(play, &this->collider); @@ -371,7 +371,7 @@ void EnGSwitch_ArcheryPot(EnGSwitch* this, PlayState* play) { f32 rand; s32 phi_s0; s32 scale; - s32 pad; + UNUSED s32 pad; pos.x = sn * 8.0f; pos.y = 10.0f + Rand_CenteredFloat(5.0f); @@ -415,7 +415,7 @@ void EnGSwitch_Kill(EnGSwitch* this, PlayState* play) { } void EnGSwitch_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnGSwitch* this = (EnGSwitch*)thisx; this->actionFunc(this, play); @@ -451,7 +451,7 @@ void EnGSwitch_Update(Actor* thisx, PlayState* play) { } void EnGSwitch_DrawPot(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnGSwitch* this = (EnGSwitch*)thisx; if (!this->broken) { @@ -469,7 +469,7 @@ static void* sRupeeTextures[] = { }; void EnGSwitch_DrawRupee(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnGSwitch* this = (EnGSwitch*)thisx; if (1) {} @@ -549,7 +549,7 @@ void EnGSwitch_DrawEffects(EnGSwitch* this, PlayState* play) { EnGSwitchEffect* effect = this->effects; s16 i; f32 scale; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(gfxCtx, "../z_en_g_switch.c", 1073); Gfx_SetupDL_25Opa(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c index 24c5953582b..7b1d7a0cc48 100644 --- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c +++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c @@ -112,7 +112,7 @@ void EnGanonMant_Destroy(Actor* thisx, PlayState* play) { * Randomly zeros portions of the cloak texture */ void EnGanonMant_Tear(EnGanonMant* this) { - s32 pad; + UNUSED s32 pad; s16 i; s16 areaX; s16 areaY; @@ -157,7 +157,7 @@ void EnGanonMant_UpdateStrand(PlayState* play, EnGanonMant* this, Vec3f* root, V f32 xDiff; f32 zDiff; f32 gravity; - s32 pad[4]; + UNUSED s32 pad[4]; f32 yaw; s16 i; f32 x; @@ -356,7 +356,7 @@ void EnGanonMant_Update(Actor* thisx, PlayState* play) { } void EnGanonMant_DrawCloak(PlayState* play, EnGanonMant* this) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_ganon_mant.c", 564); diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/src/overlays/actors/ovl_En_Gb/z_en_gb.c index cd9536dbb08..80a5c16acce 100644 --- a/src/overlays/actors/ovl_En_Gb/z_en_gb.c +++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.c @@ -150,7 +150,7 @@ void func_80A2F180(EnGb* this) { void EnGb_Init(Actor* thisx, PlayState* play) { EnGb* this = (EnGb*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; s32 i; f32 rand; @@ -420,7 +420,7 @@ void EnGb_Update(Actor* thisx, PlayState* play2) { void EnGb_Draw(Actor* thisx, PlayState* play) { EnGb* this = (EnGb*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_gb.c", 763); @@ -513,7 +513,7 @@ void EnGb_UpdateCagedSouls(EnGb* this, PlayState* play) { } void EnGb_DrawCagedSouls(EnGb* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 i; OPEN_DISPS(play->state.gfxCtx, "../z_en_gb.c", 914); 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 b9e649daf5c..e3e6fb81e48 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -86,7 +86,7 @@ static void* sEyeTextures[] = { }; void EnGe1_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnGe1* this = (EnGe1*)thisx; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); @@ -687,7 +687,7 @@ void EnGe1_Wait_Archery(EnGe1* this, PlayState* play) { // General functions void EnGe1_TurnToFacePlayer(EnGe1* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 angleDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; if (ABS(angleDiff) <= 0x4000) { @@ -718,7 +718,7 @@ void EnGe1_LookAtPlayer(EnGe1* this, PlayState* play) { } void EnGe1_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnGe1* this = (EnGe1*)thisx; Collider_UpdateCylinder(&this->actor, &this->collider); @@ -764,7 +764,7 @@ void EnGe1_StopFidget(EnGe1* this) { } s32 EnGe1_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { - s32 pad; + UNUSED s32 pad; EnGe1* this = (EnGe1*)thisx; if (limbIndex == GE1_LIMB_HEAD) { @@ -800,7 +800,7 @@ void EnGe1_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, } void EnGe1_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnGe1* this = (EnGe1*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_ge1.c", 1442); 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 2248ade02ac..62710dfc9fd 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -112,7 +112,7 @@ void EnGe2_ChangeAction(EnGe2* this, s32 i) { } void EnGe2_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnGe2* this = (EnGe2*)thisx; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); @@ -391,7 +391,7 @@ void EnGe2_Stand(EnGe2* this, PlayState* play) { } void EnGe2_TurnToFacePlayer(EnGe2* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 angleDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; if (ABS(angleDiff) <= 0x4000) { @@ -486,8 +486,8 @@ void EnGe2_SetupCapturePlayer(EnGe2* this, PlayState* play) { } void EnGe2_MaintainColliderAndSetAnimState(EnGe2* this, PlayState* play) { - s32 pad; - s32 pad2; + UNUSED s32 pad; + UNUSED s32 pad2; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); @@ -645,7 +645,7 @@ void EnGe2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void EnGe2_Draw(Actor* thisx, PlayState* play) { static void* eyeTextures[] = { gGerudoPurpleEyeOpenTex, gGerudoPurpleEyeHalfTex, gGerudoPurpleEyeClosedTex }; - s32 pad; + UNUSED s32 pad; EnGe2* this = (EnGe2*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_ge2.c", 1274); 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 e870a592503..f463ff0e7f9 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -92,7 +92,7 @@ void EnGe3_Destroy(Actor* thisx, PlayState* play) { } void EnGe3_TurnToFacePlayer(EnGe3* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 angleDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; if (ABS(angleDiff) <= 0x4000) { @@ -170,8 +170,8 @@ void EnGe3_ForceTalk(EnGe3* this, PlayState* play) { } void EnGe3_UpdateCollision(EnGe3* this, PlayState* play) { - s32 pad; - s32 pad2; + UNUSED s32 pad; + UNUSED s32 pad2; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index 9271920133b..e570db467a7 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -216,7 +216,7 @@ void EnGeldB_SetupAction(EnGeldB* this, EnGeldBActionFunc actionFunc) { } void EnGeldB_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EffectBlureInit1 blureInit; EnGeldB* this = (EnGeldB*)thisx; @@ -259,7 +259,7 @@ void EnGeldB_Init(Actor* thisx, PlayState* play) { } void EnGeldB_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnGeldB* this = (EnGeldB*)thisx; func_800F5B58(); @@ -418,7 +418,7 @@ void EnGeldB_SetupReady(EnGeldB* this) { void EnGeldB_Ready(EnGeldB* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; s16 angleToLink; SkelAnime_Update(&this->skelAnime); @@ -649,7 +649,7 @@ void EnGeldB_Circle(EnGeldB* this, PlayState* play) { s16 phi_v1; s32 afterPrevFrame; s32 prevFrame; - s32 pad; + UNUSED s32 pad; s32 beforeCurFrame; Player* player = GET_PLAYER(play); @@ -763,7 +763,7 @@ void EnGeldB_SetupSpinDodge(EnGeldB* this, PlayState* play) { void EnGeldB_SpinDodge(EnGeldB* this, PlayState* play) { s16 phi_v1; s32 prevFrame; - s32 pad; + UNUSED s32 pad; s32 beforeCurFrame; s32 afterPrevFrame; @@ -1131,7 +1131,7 @@ void EnGeldB_SetupBlock(EnGeldB* this) { void EnGeldB_Block(EnGeldB* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; s16 angleToLink; s16 angleFacingLink; @@ -1357,7 +1357,7 @@ void EnGeldB_TurnHead(EnGeldB* this, PlayState* play) { } void EnGeldB_CollisionCheck(EnGeldB* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnItem00* key; if (this->blockCollider.base.acFlags & AC_BOUNCED) { @@ -1401,7 +1401,7 @@ void EnGeldB_CollisionCheck(EnGeldB* this, PlayState* play) { } void EnGeldB_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnGeldB* this = (EnGeldB*)thisx; EnGeldB_CollisionCheck(this, play); @@ -1557,7 +1557,7 @@ void EnGeldB_Draw(Actor* thisx, PlayState* play) { }; static void* eyeTextures[] = { gGerudoRedEyeOpenTex, gGerudoRedEyeHalfTex, gGerudoRedEyeShutTex, gGerudoRedEyeHalfTex }; - s32 pad; + UNUSED s32 pad; EnGeldB* this = (EnGeldB*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_geldB.c", 2672); 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 d6377f81511..4a04ad5d799 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -191,7 +191,7 @@ void func_80A3DBF4(EnGm* this, PlayState* play) { void func_80A3DC44(EnGm* this, PlayState* play) { f32 dx; f32 dz; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); EnGm_SetTextID(this); @@ -320,7 +320,7 @@ void func_80A3E090(EnGm* this) { void EnGm_Draw(Actor* thisx, PlayState* play) { static void* eyeTextures[] = { gGoronCsEyeOpenTex, gGoronCsEyeHalfTex, gGoronCsEyeClosedTex }; EnGm* this = (EnGm*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_gm.c", 613); 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 de9f51e0901..5a9ef419233 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -620,7 +620,7 @@ void func_80A3F908(EnGo* this, PlayState* play) { void EnGo_Init(Actor* thisx, PlayState* play) { EnGo* this = (EnGo*)thisx; - s32 pad; + UNUSED s32 pad; Vec3f D_80A41B9C = { 0.0f, 0.0f, 0.0f }; // unused Vec3f D_80A41BA8 = { 0.0f, 0.0f, 0.0f }; // unused @@ -1016,7 +1016,7 @@ void func_80A40DCC(EnGo* this, PlayState* play) { } void EnGo_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnGo* this = (EnGo*)thisx; Collider_UpdateCylinder(&this->actor, &this->collider); diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index cd988eb6225..af6898d4ff7 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -1512,7 +1512,7 @@ void EnGo2_BiggoronAnimation(EnGo2* this) { void EnGo2_Init(Actor* thisx, PlayState* play) { EnGo2* this = (EnGo2*)thisx; - s32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 28.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gGoronSkel, NULL, this->jointTable, this->morphTable, 18); @@ -2005,7 +2005,7 @@ s32 EnGo2_DrawCurledUp(EnGo2* this, PlayState* play) { } s32 EnGo2_DrawRolling(EnGo2* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f D_80A48560 = { 0.0f, 0.0f, 0.0f }; f32 speedXZ; diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/src/overlays/actors/ovl_En_Goma/z_en_goma.c index 189ffc7f6bd..80e620a17bd 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -698,7 +698,7 @@ void EnGoma_SetFloorRot(EnGoma* this) { void EnGoma_Update(Actor* thisx, PlayState* play) { EnGoma* this = (EnGoma*)thisx; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); if (this->actionTimer != 0) { @@ -781,7 +781,7 @@ Gfx* EnGoma_NoBackfaceCullingDlist(GraphicsContext* gfxCtx) { void EnGoma_Draw(Actor* thisx, PlayState* play) { EnGoma* this = (EnGoma*)thisx; s32 y; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_goma.c", 2040); Gfx_SetupDL_25Opa(play->state.gfxCtx); 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 9a43bfde939..316dffca259 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -95,7 +95,7 @@ void EnGoroiwa_UpdateCollider(EnGoroiwa* this) { } void EnGoroiwa_InitCollider(EnGoroiwa* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->actor, &sJntSphInit, this->colliderItems); @@ -235,7 +235,7 @@ void EnGoroiwa_InitRotation(EnGoroiwa* this) { } s32 EnGoroiwa_GetAscendDirection(EnGoroiwa* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Path* path = &play->setupPathList[this->actor.params & 0xFF]; Vec3s* nextPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint; Vec3s* currentPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->currentWaypoint; @@ -295,7 +295,7 @@ void EnGoroiwa_SpawnWaterEffects(PlayState* play, Vec3f* contactPos) { s32 EnGoroiwa_MoveAndFall(EnGoroiwa* this, PlayState* play) { Path* path; s32 result; - s32 pad; + UNUSED s32 pad; Vec3s* nextPointPos; Math_StepToF(&this->actor.speedXZ, R_EN_GOROIWA_SPEED * 0.01f, 0.3f); @@ -311,7 +311,7 @@ s32 EnGoroiwa_MoveAndFall(EnGoroiwa* this, PlayState* play) { s32 EnGoroiwa_Move(EnGoroiwa* this, PlayState* play) { Path* path = &play->setupPathList[this->actor.params & 0xFF]; - s32 pad; + UNUSED s32 pad; Vec3s* nextPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint; Vec3s* currentPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->currentWaypoint; s32 nextPointReached; @@ -341,7 +341,7 @@ s32 EnGoroiwa_Move(EnGoroiwa* this, PlayState* play) { } s32 EnGoroiwa_MoveUpToNextWaypoint(EnGoroiwa* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Path* path = &play->setupPathList[this->actor.params & 0xFF]; Vec3s* nextPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint; @@ -352,7 +352,7 @@ s32 EnGoroiwa_MoveUpToNextWaypoint(EnGoroiwa* this, PlayState* play) { } s32 EnGoroiwa_MoveDownToNextWaypoint(EnGoroiwa* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Path* path = &play->setupPathList[this->actor.params & 0xFF]; Vec3s* nextPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint; f32 nextPointY; @@ -362,7 +362,7 @@ s32 EnGoroiwa_MoveDownToNextWaypoint(EnGoroiwa* this, PlayState* play) { CollisionPoly* floorPoly; Vec3f raycastFrom; f32 floorY; - s32 pad2; + UNUSED s32 pad2; s32 floorBgId; Vec3f dustPos; WaterBox* waterBox; @@ -428,7 +428,7 @@ s32 EnGoroiwa_MoveDownToNextWaypoint(EnGoroiwa* this, PlayState* play) { void EnGoroiwa_UpdateRotation(EnGoroiwa* this, PlayState* play) { static Vec3f unitY = { 0.0f, 1.0f, 0.0f }; - s32 pad; + UNUSED s32 pad; Vec3f* rollAxisPtr; f32 rollAngleDiff; Vec3f rollAxis; @@ -488,7 +488,7 @@ void EnGoroiwa_SpawnFragments(EnGoroiwa* this, PlayState* play) { static f32 yOffsets[] = { 0.0f, 59.5f }; s16 angle1; s16 angle2; - s32 pad; + UNUSED s32 pad; Vec3f* thisPos = &this->actor.world.pos; Vec3f effectPos; Vec3f fragmentVelocity; @@ -722,7 +722,7 @@ void EnGoroiwa_MoveDown(EnGoroiwa* this, PlayState* play) { void EnGoroiwa_Update(Actor* thisx, PlayState* play) { EnGoroiwa* this = (EnGoroiwa*)thisx; Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; s32 sp30; if (!(player->stateFlags1 & (PLAYER_STATE1_6 | PLAYER_STATE1_7 | PLAYER_STATE1_28 | PLAYER_STATE1_29))) { diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c index 0051c1bf112..d482886ab39 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -74,7 +74,7 @@ void EnGuest_Destroy(Actor* thisx, PlayState* play) { void EnGuest_Update(Actor* thisx, PlayState* play) { EnGuest* this = (EnGuest*)thisx; - s32 pad; + UNUSED s32 pad; if (Object_IsLoaded(&play->objectCtx, this->osAnimeBankIndex)) { this->actor.flags &= ~ACTOR_FLAG_4; @@ -141,7 +141,7 @@ void func_80A5057C(EnGuest* this, PlayState* play) { void func_80A505CC(Actor* thisx, PlayState* play) { EnGuest* this = (EnGuest*)thisx; - s32 pad; + UNUSED s32 pad; Player* player; player = GET_PLAYER(play); @@ -217,7 +217,7 @@ void EnGuest_Draw(Actor* thisx, PlayState* play) { object_boj_Tex_0007FC, }; EnGuest* this = (EnGuest*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_guest.c", 404); 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 dded1c812d9..da9ffb70e78 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -51,7 +51,7 @@ static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE }; void EnHata_Init(Actor* thisx, PlayState* play) { EnHata* this = (EnHata*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; f32 frameCount = Animation_GetLastFrame(&gFlagpoleFlapAnim); diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index 0726839bb03..89226b76a4a 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -64,7 +64,7 @@ static s32 sBgCamIndices[] = { static s16 sWaypoints[] = { 0, 4, 1, 5, 2, 6, 3, 7 }; void EnHeishi1_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnHeishi1* this = (EnHeishi1*)thisx; Vec3f rupeePos; s32 i; @@ -381,9 +381,9 @@ void EnHeishi1_Update(Actor* thisx, PlayState* play) { EnHeishi1* this = (EnHeishi1*)thisx; s16 path; u8 i; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); - s32 pad2; + UNUSED s32 pad2; Camera* activeCam; this->activeTimer++; @@ -481,7 +481,7 @@ s32 EnHeishi1_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3 } void EnHeishi1_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnHeishi1* this = (EnHeishi1*)thisx; Vec3f matrixScale = { 0.3f, 0.3f, 0.3f }; diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index e7c199911c8..e17778dae90 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -277,7 +277,7 @@ void func_80A535BC(EnHeishi2* this, PlayState* play) { } void func_80A53638(EnHeishi2* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 frameCount = this->skelAnime.curFrame; BgSpot15Saku* actor = (BgSpot15Saku*)play->actorCtx.actorLists[ACTORCAT_ITEMACTION].head; @@ -438,7 +438,7 @@ void func_80A53C90(EnHeishi2* this, PlayState* play) { } void func_80A53D0C(EnHeishi2* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 frameCount; BgGateShutter* gate; @@ -599,7 +599,7 @@ void func_80A54320(EnHeishi2* this, PlayState* play) { } void func_80A543A0(EnHeishi2* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 frameCount = this->skelAnime.curFrame; BgGateShutter* gate = (BgGateShutter*)(play->actorCtx.actorLists[ACTORCAT_ITEMACTION].head); SkelAnime_Update(&this->skelAnime); @@ -644,7 +644,7 @@ void func_80A544AC(EnHeishi2* this, PlayState* play) { } void func_80A5455C(EnHeishi2* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f pos; f32 rotY; EnBom* bomb; @@ -761,7 +761,7 @@ void func_80A549E8(EnHeishi2* this, PlayState* play) { } void EnHeishi2_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnHeishi2* this = (EnHeishi2*)thisx; s32 i; diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index f058f77aa7c..bad10404c71 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -212,7 +212,7 @@ void func_80A55D00(EnHeishi3* this, PlayState* play) { void EnHeishi3_Update(Actor* thisx, PlayState* play) { EnHeishi3* this = (EnHeishi3*)thisx; - s32 pad; + UNUSED s32 pad; Actor_SetFocus(&this->actor, 60.0f); this->unk_274 += 1; diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c index 877baef7b0f..5afd46a7ebc 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -339,7 +339,7 @@ void func_80A56B40(EnHeishi4* this, PlayState* play) { void EnHeishi4_Update(Actor* thisx, PlayState* play) { EnHeishi4* this = (EnHeishi4*)thisx; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); thisx->world.pos.x = this->pos.x; diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index 5a1836045fb..99e9fa9e5fa 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -71,7 +71,7 @@ static InitChainEntry sInitChain[] = { void EnHintnuts_Init(Actor* thisx, PlayState* play) { EnHintnuts* this = (EnHintnuts*)thisx; - s32 pad; + UNUSED s32 pad; Actor_ProcessInitChain(&this->actor, sInitChain); if (this->actor.params == 0xA) { @@ -476,7 +476,7 @@ void EnHintnuts_ColliderCheck(EnHintnuts* this, PlayState* play) { void EnHintnuts_Update(Actor* thisx, PlayState* play) { EnHintnuts* this = (EnHintnuts*)thisx; - s32 pad; + UNUSED s32 pad; if (this->actor.params != 0xA) { EnHintnuts_ColliderCheck(this, play); 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 902be6f05b0..6d56c16b74c 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -126,7 +126,7 @@ static InitChainEntry sInitChain[] = { }; void EnHonotrap_FlameCollisionCheck(EnHonotrap* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; Collider_UpdateCylinder(&this->actor, &this->collider.cyl); CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.cyl.base); @@ -153,7 +153,7 @@ void EnHonotrap_GetNormal(Vec3f* normal, Vec3f* vec) { } void EnHonotrap_InitEye(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnHonotrap* this = (EnHonotrap*)thisx; s32 i; s32 j; @@ -184,7 +184,7 @@ void EnHonotrap_InitEye(Actor* thisx, PlayState* play) { } void EnHonotrap_InitFlame(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnHonotrap* this = (EnHonotrap*)thisx; Actor_SetScale(&this->actor, 0.0001f); @@ -218,7 +218,7 @@ void EnHonotrap_Init(Actor* thisx, PlayState* play) { } void EnHonotrap_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnHonotrap* this = (EnHonotrap*)thisx; if (this->actor.params == HONOTRAP_EYE) { @@ -295,7 +295,7 @@ void EnHonotrap_SetupFlame(EnHonotrap* this) { } void EnHonotrap_Flame(EnHonotrap* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 ready = Math_StepToF(&this->actor.scale.x, (this->actor.params == HONOTRAP_FLAME_MOVE) ? 0.004f : 0.0048f, 0.0006f); @@ -355,7 +355,7 @@ void EnHonotrap_SetupFlameMove(EnHonotrap* this) { } void EnHonotrap_FlameMove(EnHonotrap* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f speed; s32 ready; @@ -410,7 +410,7 @@ void EnHonotrap_SetupFlameChase(EnHonotrap* this) { } void EnHonotrap_FlameChase(EnHonotrap* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Math_ScaledStepToS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 0x300); Math_StepToF(&this->actor.speedXZ, 3.0f, 0.1f); @@ -447,7 +447,7 @@ void EnHonotrap_SetupFlameVanish(EnHonotrap* this) { } void EnHonotrap_FlameVanish(EnHonotrap* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 ready = Math_StepToF(&this->actor.scale.x, 0.0001f, 0.00015f); this->actor.scale.z = this->actor.scale.y = this->actor.scale.x; @@ -463,7 +463,7 @@ void EnHonotrap_FlameVanish(EnHonotrap* this, PlayState* play) { void EnHonotrap_Update(Actor* thisx, PlayState* play) { static Vec3f velocity = { 0.0f, 0.0f, 0.0f }; static Vec3f accel = { 0.0f, 0.1f, 0.0f }; - s32 pad; + UNUSED s32 pad; EnHonotrap* this = (EnHonotrap*)thisx; if (this->timer > 0) { @@ -513,7 +513,7 @@ void EnHonotrap_DrawEye(Actor* thisx, PlayState* play) { } void EnHonotrap_DrawFlame(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnHonotrap* this = (EnHonotrap*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_honotrap.c", 1000); 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 eddf488023a..8b943b8207a 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -2914,7 +2914,7 @@ void EnHorse_CheckFloors(EnHorse* this, PlayState* play) { f32 dist; f32 waterHeight; WaterBox* waterBox; - s32 pad; + UNUSED s32 pad; if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &waterHeight, &waterBox) == 1 && @@ -3015,7 +3015,7 @@ void EnHorse_CheckFloors(EnHorse* this, PlayState* play) { s32 EnHorse_GetMountSide(EnHorse* this, PlayState* play); void EnHorse_MountDismount(EnHorse* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s32 mountSide; Player* player = GET_PLAYER(play); @@ -3109,8 +3109,8 @@ void EnHorse_BgCheckSlowMoving(EnHorse* this, PlayState* play) { } void EnHorse_UpdateBgCheckInfo(EnHorse* this, PlayState* play) { - s32 pad; - s32 pad2; + UNUSED s32 pad; + UNUSED s32 pad2; Vec3f startPos; Vec3f endPos; Vec3f obstaclePos; @@ -3123,7 +3123,7 @@ void EnHorse_UpdateBgCheckInfo(EnHorse* this, PlayState* play) { f32 behindObstacleHeight; f32 ny; s32 movingFast; - s32 pad5; + UNUSED s32 pad5; DynaPolyActor* dynaPoly; Vec3f intersect; Vec3f obstacleTop; @@ -3314,7 +3314,7 @@ void EnHorse_UpdateBgCheckInfo(EnHorse* this, PlayState* play) { void EnHorse_CheckBoost(EnHorse* thisx, PlayState* play2) { EnHorse* this = (EnHorse*)thisx; PlayState* play = play2; - s32 pad; + UNUSED s32 pad; if (this->action == ENHORSE_ACT_MOUNTED_WALK || this->action == ENHORSE_ACT_MOUNTED_TROT || this->action == ENHORSE_ACT_MOUNTED_GALLOP) { @@ -3671,7 +3671,7 @@ void EnHorse_RandomOffset(Vec3f* src, f32 dist, Vec3f* dst) { void EnHorse_PostDraw(Actor* thisx, PlayState* play, Skin* skin) { EnHorse* this = (EnHorse*)thisx; - s32 pad; + UNUSED s32 pad; Vec3f sp94 = { 0.0f, 0.0f, 0.0f }; Vec3f hoofOffset = { 5.0f, -4.0f, 5.0f }; Vec3f riderOffset = { 600.0f, -1670.0f, 0.0f }; 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 339312bc026..7c06279d7ca 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 @@ -441,7 +441,7 @@ static EnHorseGameCheckFunc sUpdateFuncs[] = { }; void EnHorseGameCheck_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnHorseGameCheckBase* this = (EnHorseGameCheckBase*)thisx; if ((play->sceneNum == SCENE_SPOT20) && (Flags_GetEventChkInf(EVENTCHKINF_18) || DREG(1))) { @@ -453,7 +453,7 @@ void EnHorseGameCheck_Init(Actor* thisx, PlayState* play) { } void EnHorseGameCheck_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnHorseGameCheckBase* this = (EnHorseGameCheckBase*)thisx; if (sDestroyFuncs[this->actor.params] != NULL) { @@ -462,7 +462,7 @@ void EnHorseGameCheck_Destroy(Actor* thisx, PlayState* play) { } void EnHorseGameCheck_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnHorseGameCheckBase* this = (EnHorseGameCheckBase*)thisx; if (sUpdateFuncs[this->type] != NULL) { diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c index 210a38a3208..cf56b1c2ed1 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c @@ -269,7 +269,7 @@ void func_80A68DB0(EnHorseGanon* this, PlayState* play) { } void func_80A68E14(EnHorseGanon* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; CollisionPoly* col; f32 temp_ret; Vec3f v; @@ -287,7 +287,7 @@ void func_80A68E14(EnHorseGanon* this, PlayState* play) { void EnHorseGanon_Update(Actor* thisx, PlayState* play) { EnHorseGanon* this = (EnHorseGanon*)thisx; - s32 pad; + UNUSED s32 pad; sActionFuncs[this->action](this, play); Actor_MoveForward(&this->actor); 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 11342764722..69c4c854b18 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 @@ -141,7 +141,7 @@ static InitChainEntry sInitChain[] = { void EnHorseLinkChild_Init(Actor* thisx, PlayState* play) { EnHorseLinkChild* this = (EnHorseLinkChild*)thisx; - s32 pad; + UNUSED s32 pad; Actor_ProcessInitChain(&this->actor, sInitChain); Actor_SetScale(&this->actor, 0.005f); @@ -551,7 +551,7 @@ static u8 sEyeIndexOrder[] = { 0, 1, 2, 1 }; void EnHorseLinkChild_Update(Actor* thisx, PlayState* play) { EnHorseLinkChild* this = (EnHorseLinkChild*)thisx; - s32 pad; + UNUSED s32 pad; sActionFuncs[this->action](this, play); Actor_MoveForward(&this->actor); diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index aa3c7e3bab8..9fa40242220 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -183,7 +183,7 @@ static InitChainEntry sInitChain[] = { void EnHorseNormal_Init(Actor* thisx, PlayState* play) { EnHorseNormal* this = (EnHorseNormal*)thisx; - s32 pad; + UNUSED s32 pad; Actor_ProcessInitChain(&this->actor, sInitChain); Actor_SetScale(&this->actor, 0.01f); @@ -290,7 +290,7 @@ void EnHorseNormal_FollowPath(EnHorseNormal* this, PlayState* play) { Vec3s* pointPos = SEGMENTED_TO_VIRTUAL(path->points); f32 dx; f32 dz; - s32 pad; + UNUSED s32 pad; pointPos += this->waypoint; dx = pointPos->x - this->actor.world.pos.x; @@ -369,7 +369,7 @@ void EnHorseNormal_Wander(EnHorseNormal* this, PlayState* play) { static s32 D_80A6D4F4[] = { 0, 1, 4, 5, 6, 2, 3 }; static s32 D_80A6D510[] = { 0, 0, 2, 2, 1, 1, 1, 3, 3 }; s32 phi_t0 = this->animationIdx; - s32 pad; + UNUSED s32 pad; switch (D_80A6D510[this->animationIdx]) { case 0: @@ -556,9 +556,9 @@ void EnHorseNormal_WaitClone(EnHorseNormal* this, PlayState* play) { } void func_80A6C8E0(EnHorseNormal* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; CollisionPoly* sp38; - s32 pad2; + UNUSED s32 pad2; Vec3f sp28; s32 sp24; @@ -576,7 +576,7 @@ static EnHorseNormalActionFunc sActionFuncs[] = { void EnHorseNormal_Update(Actor* thisx, PlayState* play) { EnHorseNormal* this = (EnHorseNormal*)thisx; - s32 pad; + UNUSED s32 pad; sActionFuncs[this->action](this, play); Actor_MoveForward(&this->actor); diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c index 15d81de394f..d0ece4d21e6 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c @@ -111,7 +111,7 @@ void func_80A6D8D0(unknownStruct* data, s32 index, Vec3f* vec) { } void func_80A6D918(EnHorseZelda* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f sp28; s16 yawDiff; @@ -214,9 +214,9 @@ void func_80A6DDFC(EnHorseZelda* this, PlayState* play) { } void func_80A6DE38(EnHorseZelda* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; CollisionPoly* poly; - s32 pad2; + UNUSED s32 pad2; Vec3f pos; s32 bgId; @@ -229,7 +229,7 @@ void func_80A6DE38(EnHorseZelda* this, PlayState* play) { void EnHorseZelda_Update(Actor* thisx, PlayState* play) { EnHorseZelda* this = (EnHorseZelda*)thisx; - s32 pad; + UNUSED s32 pad; sActionFuncs[this->action](this, play); this->actor.speedXZ = 0.0f; 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 46a135312c3..09a107eca20 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -56,7 +56,7 @@ void func_80A6E3A0(EnHs* this, EnHsActionFunc actionFunc) { void EnHs_Init(Actor* thisx, PlayState* play) { EnHs* this = (EnHs*)thisx; - s32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); SkelAnime_InitFlex(play, &this->skelAnime, &object_hs_Skel_006260, &object_hs_Anim_0005C0, this->jointTable, @@ -228,7 +228,7 @@ void func_80A6E9AC(EnHs* this, PlayState* play) { void EnHs_Update(Actor* thisx, PlayState* play) { EnHs* this = (EnHs*)thisx; - s32 pad; + UNUSED s32 pad; Collider_UpdateCylinder(thisx, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); 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 2a681bc7314..0141a804850 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -50,7 +50,7 @@ static ColliderCylinderInit sCylinderInit = { void EnHs2_Init(Actor* thisx, PlayState* play) { EnHs2* this = (EnHs2*)thisx; - s32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); SkelAnime_InitFlex(play, &this->skelAnime, &object_hs_Skel_006260, &object_hs_Anim_0005C0, this->jointTable, @@ -107,7 +107,7 @@ void func_80A6F1A4(EnHs2* this, PlayState* play) { void EnHs2_Update(Actor* thisx, PlayState* play) { EnHs2* this = (EnHs2*)thisx; - s32 pad; + UNUSED s32 pad; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c index e763ddf2ae4..b7b758f4ca3 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -1092,7 +1092,7 @@ void EnHy_Update(Actor* thisx, PlayState* play) { s32 EnHy_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { EnHy* this = (EnHy*)thisx; - s32 pad; + UNUSED s32 pad; Vec3s sp48; u8 i; void* ptr; @@ -1141,7 +1141,7 @@ s32 EnHy_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* po void EnHy_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { EnHy* this = (EnHy*)thisx; - s32 pad; + UNUSED s32 pad; Vec3f sp3C = { 400.0f, 0.0f, 0.0f }; OPEN_DISPS(play->state.gfxCtx, "../z_en_hy.c", 2255); diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index 83cba8a6f6d..5ae085b1ec2 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -338,9 +338,9 @@ void EnIceHono_SmallFlameMove(EnIceHono* this, PlayState* play) { void EnIceHono_Update(Actor* thisx, PlayState* play) { EnIceHono* this = (EnIceHono*)thisx; - s32 pad1; + UNUSED s32 pad1; f32 intensity; - s32 pad2; + UNUSED s32 pad2; f32 sin154; f32 sin156; @@ -371,7 +371,7 @@ void EnIceHono_Update(Actor* thisx, PlayState* play) { void EnIceHono_Draw(Actor* thisx, PlayState* play) { EnIceHono* this = (EnIceHono*)thisx; - u32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_ice_hono.c", 695); Gfx_SetupDL_25Xlu(play->state.gfxCtx); 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 9c56d5b5ac7..398e8e06802 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -183,7 +183,7 @@ void EnIk_SetupAction(EnIk* this, EnIkActionFunc actionFunc) { void func_80A74398(Actor* thisx, PlayState* play) { EnIk* this = (EnIk*)thisx; - s32 pad; + UNUSED s32 pad; EffectBlureInit1 blureInit; thisx->update = func_80A75FA0; @@ -660,8 +660,8 @@ void func_80A75A38(EnIk* this, PlayState* play) { void func_80A75C38(EnIk* this, PlayState* play) { f32 temp_f0; - u8 pad; - u8 pad2; + UNUSED u8 pad; + UNUSED u8 pad2; u8 prevHealth; s32 temp_v0_3; Vec3f sp38; @@ -743,7 +743,7 @@ void func_80A75C38(EnIk* this, PlayState* play) { void func_80A75FA0(Actor* thisx, PlayState* play) { EnIk* this = (EnIk*)thisx; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); u8 prevInvincibilityTimer; @@ -1002,7 +1002,7 @@ void func_80A76E2C(EnIk* this, PlayState* play, Vec3f* pos) { }; if (this->unk_4D4 == 0) { - s32 pad; + UNUSED s32 pad; Vec3f effectVelocity = { 0.0f, 0.0f, 0.0f }; Vec3f effectAccel = { 0.0f, 0.3f, 0.0f }; s32 i; @@ -1100,7 +1100,7 @@ void func_80A772A4(EnIk* this) { void func_80A772EC(EnIk* this, PlayState* play) { static Vec3f D_80A78FA0; - s32 pad[2]; + UNUSED s32 pad[2]; f32 wDest; SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &this->actor.world.pos, &D_80A78FA0, &wDest); @@ -1109,7 +1109,7 @@ void func_80A772EC(EnIk* this, PlayState* play) { } void func_80A7735C(EnIk* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; f32 frames = Animation_GetLastFrame(&object_ik_Anim_0203D8); SkelAnime_InitFlex(play, &this->skelAnime, &object_ik_Skel_0205C0, NULL, this->jointTable, this->morphTable, 30); @@ -1213,7 +1213,7 @@ void EnIk_PostLimbDraw2(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void func_80A77844(EnIk* this, PlayState* play) { GraphicsContext* gfxCtx = play->state.gfxCtx; SkelAnime* skelAnime = &this->skelAnime; - s32 pad[2]; + UNUSED s32 pad[2]; OPEN_DISPS(gfxCtx, "../z_en_ik_inAwake.c", 322); @@ -1367,7 +1367,7 @@ void func_80A77ED0(EnIk* this, PlayState* play) { void func_80A77EDC(EnIk* this, PlayState* play) { GraphicsContext* gfxCtx = play->state.gfxCtx; SkelAnime* skelAnime = &this->skelAnime; - s32 pad[2]; + UNUSED s32 pad[2]; OPEN_DISPS(gfxCtx, "../z_en_ik_inConfrontion.c", 630); 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 fbe94395a1e..1818e4ed804 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -107,7 +107,7 @@ f32 EnInsect_XZDistanceSquared(Vec3f* v1, Vec3f* v2) { } s32 EnInsect_InBottleRange(EnInsect* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); Vec3f pos; @@ -257,7 +257,7 @@ void EnInsect_SetupSlowDown(EnInsect* this) { } void EnInsect_SlowDown(EnInsect* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s16 type; f32 playSpeed; @@ -294,8 +294,8 @@ void EnInsect_SetupCrawl(EnInsect* this) { } void EnInsect_Crawl(EnInsect* this, PlayState* play) { - s32 pad1; - s32 pad2; + UNUSED s32 pad1; + UNUSED s32 pad2; s16 yaw; s16 type = this->actor.params & 3; @@ -339,9 +339,9 @@ void EnInsect_SetupRunFromPlayer(EnInsect* this) { } void EnInsect_RunFromPlayer(EnInsect* this, PlayState* play) { - s32 pad1; - s32 pad2; - s16 pad3; + UNUSED s32 pad1; + UNUSED s32 pad2; + UNUSED s16 pad3; s16 frames; s16 yaw; s16 playerIsClose = this->actor.xzDistToPlayer < 40.0f; @@ -423,7 +423,7 @@ void EnInsect_SetupDig(EnInsect* this) { void EnInsect_Dig(EnInsect* this, PlayState* play) { static Vec3f accel = { 0.0f, 0.0f, 0.0f }; static Vec3f unused = { 0.0f, 0.0f, 0.0f }; - s32 pad[2]; + UNUSED s32 pad[2]; Vec3f velocity; Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.1f, 0.5f, 0.0f); @@ -465,7 +465,7 @@ void EnInsect_SetupWalkOnWater(EnInsect* this) { void EnInsect_WalkOnWater(EnInsect* this, PlayState* play) { f32 temp_f0; s16 temp_v1; - s16 pad; + UNUSED s16 pad; s16 type; Vec3f ripplePoint; 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 54551d40981..a1d4b9e2983 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -135,7 +135,7 @@ s32 EnIshi_SnapToFloor(EnIshi* this, PlayState* play, f32 arg2) { void EnIshi_SpawnFragmentsSmall(EnIshi* this, PlayState* play) { static s16 scales[] = { 16, 13, 11, 9, 7, 5 }; - s32 pad; + UNUSED s32 pad; Vec3f velocity; Vec3f pos; s16 phi_v0; @@ -346,7 +346,7 @@ void EnIshi_SetupWait(EnIshi* this) { void EnIshi_Wait(EnIshi* this, PlayState* play) { static u16 liftSounds[] = { NA_SE_PL_PULL_UP_ROCK, NA_SE_PL_PULL_UP_BIGROCK }; - s32 pad; + UNUSED s32 pad; s16 type = this->actor.params & 1; if (Actor_HasParent(&this->actor, play)) { @@ -418,9 +418,9 @@ void EnIshi_SetupFly(EnIshi* this) { } void EnIshi_Fly(EnIshi* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 type = this->actor.params & 1; - s32 pad2; + UNUSED s32 pad2; s32 quakeIdx; Vec3f contactPos; diff --git a/src/overlays/actors/ovl_En_It/z_en_it.c b/src/overlays/actors/ovl_En_It/z_en_it.c index aaa75343a6f..b4fdd50abaf 100644 --- a/src/overlays/actors/ovl_En_It/z_en_it.c +++ b/src/overlays/actors/ovl_En_It/z_en_it.c @@ -63,7 +63,7 @@ void EnIt_Destroy(Actor* thisx, PlayState* play) { void EnIt_Update(Actor* thisx, PlayState* play) { EnIt* this = (EnIt*)thisx; - s32 pad; + UNUSED s32 pad; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); 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 f67805f08e2..063855b2d8c 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -54,7 +54,7 @@ void En_Js_SetupAction(EnJs* this, EnJsActionFunc actionFunc) { void EnJs_Init(Actor* thisx, PlayState* play) { EnJs* this = (EnJs*)thisx; - s32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, NULL, 36.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gCarpetMerchantSkel, &gCarpetMerchantSlappingKneeAnim, this->jointTable, @@ -165,8 +165,8 @@ void func_80A89304(EnJs* this, PlayState* play) { void EnJs_Update(Actor* thisx, PlayState* play) { EnJs* this = (EnJs*)thisx; - s32 pad; - s32 pad2; + UNUSED s32 pad; + UNUSED s32 pad2; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c index 44f0cdafbe0..89259a91d23 100644 --- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c +++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c @@ -37,7 +37,7 @@ static s32 sUnused[2] = { 0, 0 }; void EnJsjutan_Init(Actor* thisx, PlayState* play) { EnJsjutan* this = (EnJsjutan*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* header = NULL; this->dyna.actor.flags &= ~ACTOR_FLAG_0; @@ -322,7 +322,7 @@ void func_80A89A6C(EnJsjutan* this, PlayState* play) { for (i = 0; i < ARRAY_COUNT(sCarpetOddVtx); i++, carpetVtx++) { f32 rotX; f32 rotZ; - s32 pad; + UNUSED s32 pad; // Carpet size is 12x12. if ((i % 12) == 11) { // Last column. 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 d17e8ad0b98..b45e27916c1 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -314,7 +314,7 @@ void func_80A8FBB8(EnKakasi* this, PlayState* play) { void EnKakasi_Update(Actor* thisx, PlayState* play) { EnKakasi* this = (EnKakasi*)thisx; - s32 pad; + UNUSED s32 pad; s32 i; this->unk_198++; diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index 8430270c895..db469359e41 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -55,7 +55,7 @@ const ActorInit En_Kakasi2_InitVars = { void EnKakasi2_Init(Actor* thisx, PlayState* play) { EnKakasi2* this = (EnKakasi2*)thisx; - s32 pad; + UNUSED s32 pad; f32 spawnRangeY; f32 spawnRangeXZ; diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c index e9ad97ef0ed..0a142951a3c 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -405,7 +405,7 @@ void func_80A91A90(EnKakasi3* this, PlayState* play) { void EnKakasi3_Update(Actor* thisx, PlayState* play) { EnKakasi3* this = (EnKakasi3*)thisx; - s32 pad; + UNUSED s32 pad; s32 i; if (BREG(2) != 0) { 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 8d652851172..cf1c33cd412 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -234,7 +234,7 @@ void EnKanban_Init(Actor* thisx, PlayState* play) { } void EnKanban_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnKanban* this = (EnKanban*)thisx; if (this->actionState == ENKANBAN_SIGN) { 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 36e287ea8e8..b3ff171fff7 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -409,7 +409,7 @@ void EnKarebaba_Regrow(EnKarebaba* this, PlayState* play) { } void EnKarebaba_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnKarebaba* this = (EnKarebaba*)thisx; f32 height; diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c index 0726fad1b2a..7e974fd29e4 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -1240,7 +1240,7 @@ void func_80A995CC(EnKo* this, PlayState* play) { void EnKo_Update(Actor* thisx, PlayState* play) { ColliderCylinder* collider; EnKo* this = (EnKo*)thisx; - s32 pad; + UNUSED s32 pad; if (this->actionFunc != func_80A99048) { if ((s32)this->modelAlpha != 0) { @@ -1273,7 +1273,7 @@ s32 EnKo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* po void* eyeTexture; Vec3s sp40; u8 headId; - s32 pad; + UNUSED s32 pad; if (limbIndex == 15) { gSPSegment((*gfx)++, 0x06, play->objectCtx.status[this->headObjectBankIdx].segment); 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 091b36db148..77c1a2ed271 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -98,7 +98,7 @@ void EnKusa_SetupAction(EnKusa* this, EnKusaActionFunc actionFunc) { } s32 EnKusa_SnapToFloor(EnKusa* this, PlayState* play, f32 yOffset) { - s32 pad; + UNUSED s32 pad; CollisionPoly* poly; Vec3f pos; s32 bgId; @@ -173,7 +173,7 @@ void EnKusa_SpawnFragments(EnKusa* this, PlayState* play) { s32 i; s32 scaleIndex; Vec3f* dir; - s32 pad; + UNUSED s32 pad; for (i = 0; i < ARRAY_COUNT(sUnitDirections); i++) { dir = &sUnitDirections[i]; @@ -296,7 +296,7 @@ void EnKusa_SetupMain(EnKusa* this) { } void EnKusa_Main(EnKusa* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; if (Actor_HasParent(&this->actor, play)) { EnKusa_SetupLiftedUp(this); @@ -370,7 +370,7 @@ void EnKusa_SetupFall(EnKusa* this) { } void EnKusa_Fall(EnKusa* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f contactPos; if (this->actor.bgCheckFlags & (BGCHECKFLAG_GROUND | BGCHECKFLAG_GROUND_TOUCH | BGCHECKFLAG_WALL)) { diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index 2d9afe326e2..b3f198c08cf 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -318,7 +318,7 @@ s32 EnKz_SetMovedPos(EnKz* this, PlayState* play) { void EnKz_Init(Actor* thisx, PlayState* play) { EnKz* this = (EnKz*)thisx; - s32 pad; + UNUSED s32 pad; SkelAnime_InitFlex(play, &this->skelanime, &gKzSkel, NULL, this->jointTable, this->morphTable, 12); ActorShape_Init(&this->actor.shape, 0.0, NULL, 0.0); @@ -451,7 +451,7 @@ void EnKz_StartTimer(EnKz* this, PlayState* play) { void EnKz_Update(Actor* thisx, PlayState* play) { EnKz* this = (EnKz*)thisx; - s32 pad; + UNUSED s32 pad; if (LINK_IS_ADULT && !GET_INFTABLE(INFTABLE_138)) { SET_INFTABLE(INFTABLE_138); 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 bf85d4619ef..926749a7970 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -150,7 +150,7 @@ void EnLight_UpdateSwitch(Actor* thisx, PlayState* play) { void EnLight_Draw(Actor* thisx, PlayState* play) { EnLight* this = (EnLight*)thisx; - s32 pad; + UNUSED s32 pad; FlameParams* flameParams; Gfx* dList; diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c index e3624a384e4..30523721bd1 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c @@ -29,7 +29,7 @@ const ActorInit En_Lightbox_InitVars = { void EnLightbox_Init(Actor* thisx, PlayState* play) { CollisionHeader* colHeader = NULL; EnLightbox* this = (EnLightbox*)thisx; - s32 pad[4]; + UNUSED s32 pad[4]; switch (thisx->params) { case 0: 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 989103908d0..b4d6c506344 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 @@ -46,7 +46,7 @@ static ColliderCylinderInit sCylinderInit = { void EnMFire1_Init(Actor* thisx, PlayState* play) { EnMFire1* this = (EnMFire1*)thisx; - s32 pad; + UNUSED s32 pad; if (this->actor.params < 0) { Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_ITEMACTION); @@ -64,7 +64,7 @@ void EnMFire1_Destroy(Actor* thisx, PlayState* play) { void EnMFire1_Update(Actor* thisx, PlayState* play) { EnMFire1* this = (EnMFire1*)thisx; - s32 pad; + UNUSED s32 pad; if (Math_StepToF(&this->timer, 1.0f, 0.2f)) { Actor_Kill(&this->actor); diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index c02d28eb954..d44300fb0de 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -262,7 +262,7 @@ void func_80AA0B74(EnMa1* this) { void EnMa1_Init(Actor* thisx, PlayState* play) { EnMa1* this = (EnMa1*)thisx; - s32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gMalonChildSkel, NULL, NULL, NULL, 0); @@ -398,7 +398,7 @@ void EnMa1_DoNothing(EnMa1* this, PlayState* play) { void EnMa1_Update(Actor* thisx, PlayState* play) { EnMa1* this = (EnMa1*)thisx; - s32 pad; + UNUSED s32 pad; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); @@ -448,7 +448,7 @@ void EnMa1_Draw(Actor* thisx, PlayState* play) { EnMa1* this = (EnMa1*)thisx; Camera* activeCam; f32 distFromCamera; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_ma1.c", 1226); diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index eb31c401930..0c8fc6f59e3 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -211,7 +211,7 @@ void func_80AA1DB4(EnMa2* this, PlayState* play) { void EnMa2_Init(Actor* thisx, PlayState* play) { EnMa2* this = (EnMa2*)thisx; - s32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gMalonAdultSkel, NULL, NULL, NULL, 0); @@ -310,7 +310,7 @@ void func_80AA21C8(EnMa2* this, PlayState* play) { void EnMa2_Update(Actor* thisx, PlayState* play) { EnMa2* this = (EnMa2*)thisx; - s32 pad; + UNUSED s32 pad; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); @@ -375,7 +375,7 @@ void EnMa2_Draw(Actor* thisx, PlayState* play) { EnMa2* this = (EnMa2*)thisx; Camera* activeCam; f32 someFloat; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_ma2.c", 955); diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index d23aeef5f56..f16753d7a62 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -244,7 +244,7 @@ void EnMa3_ChangeAnim(EnMa3* this, s32 index) { void EnMa3_Init(Actor* thisx, PlayState* play) { EnMa3* this = (EnMa3*)thisx; - s32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gMalonAdultSkel, NULL, NULL, NULL, 0); @@ -287,7 +287,7 @@ void func_80AA3200(EnMa3* this, PlayState* play) { void EnMa3_Update(Actor* thisx, PlayState* play) { EnMa3* this = (EnMa3*)thisx; - s32 pad; + UNUSED s32 pad; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); @@ -358,7 +358,7 @@ void EnMa3_Draw(Actor* thisx, PlayState* play) { EnMa3* this = (EnMa3*)thisx; Camera* activeCam; f32 someFloat; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_ma3.c", 978); 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 9d43794d927..f0bb9e7d340 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -102,7 +102,7 @@ void EnMag_Destroy(Actor* thisx, PlayState* play) { } void EnMag_Update(Actor* thisx, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; EnMag* this = (EnMag*)thisx; if (gSaveContext.fileNum != 0xFEDC) { @@ -305,7 +305,7 @@ void EnMag_DrawImageRGBA32(Gfx** gfxp, s16 centerX, s16 centerY, u8* source, u32 u32 textureHeight; s32 remainingSize; s32 textureSize; - s32 pad; + UNUSED s32 pad; s32 i; Gfx_SetupDL_56Ptr(&gfx); @@ -387,7 +387,7 @@ void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxp) { }; EnMag* this = (EnMag*)thisx; Font* font = &this->font; - s32 pad; + UNUSED s32 pad; Gfx* gfx = *gfxp; u16 i, j, k; u16 rectLeft; @@ -562,7 +562,7 @@ void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxp) { } void EnMag_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; Gfx* gfx; Gfx* gfxRef; diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index 9c007332086..65c11272595 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -257,7 +257,7 @@ void EnMb_SetupAction(EnMb* this, EnMbActionFunc actionFunc) { void EnMb_Init(Actor* thisx, PlayState* play) { EnMb* this = (EnMb*)thisx; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); s16 relYawFromPlayer; @@ -674,7 +674,7 @@ void EnMb_SpearPatrolTurnTowardsWaypoint(EnMb* this, PlayState* play) { * Slow down and resume walking. */ void EnMb_SpearEndChargeQuick(EnMb* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.5f, 1.0f, 0.0f); if (this->actor.speedXZ > 1.0f) { @@ -816,7 +816,7 @@ void EnMb_SpearGuardPrepareAndCharge(EnMb* this, PlayState* play) { void EnMb_ClubAttack(EnMb* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; Vec3f effSpawnPos; Vec3f effWhiteShockwaveDynamics = { 0.0f, 0.0f, 0.0f }; f32 flamesParams[] = { 18.0f, 18.0f, 0.0f }; @@ -1052,7 +1052,7 @@ void EnMb_ClubDamaged(EnMb* this, PlayState* play) { } void EnMb_ClubDamagedWhileKneeling(EnMb* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; if (SkelAnime_Update(&this->skelAnime)) { if (this->timer3 != 0) { @@ -1115,8 +1115,8 @@ void EnMb_ClubDead(EnMb* this, PlayState* play) { void EnMb_SpearGuardWalk(EnMb* this, PlayState* play) { s32 prevFrame; s32 beforeCurFrame; - s32 pad1; - s32 pad2; + UNUSED s32 pad1; + UNUSED s32 pad2; Player* player = GET_PLAYER(play); s16 relYawTowardsPlayer = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; s16 yawTowardsHome; @@ -1231,7 +1231,7 @@ void EnMb_SpearPatrolWalkTowardsWaypoint(EnMb* this, PlayState* play) { void EnMb_ClubWaitPlayerNear(EnMb* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; s16 relYawFromPlayer = this->actor.world.rot.y - this->actor.yawTowardsPlayer; SkelAnime_Update(&this->skelAnime); @@ -1416,7 +1416,7 @@ void EnMb_CheckColliding(EnMb* this, PlayState* play) { void EnMb_Update(Actor* thisx, PlayState* play) { EnMb* this = (EnMb*)thisx; - s32 pad; + UNUSED s32 pad; EnMb_CheckColliding(this, play); if (thisx->colChkInfo.damageEffect != ENMB_DMGEFF_FREEZE) { diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index 7b0a85c3ddb..d010af09f05 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -651,7 +651,7 @@ void func_80AAB5A4(EnMd* this, PlayState* play) { void EnMd_Init(Actor* thisx, PlayState* play) { EnMd* this = (EnMd*)thisx; - s32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gMidoSkel, NULL, this->jointTable, this->morphTable, 17); @@ -820,7 +820,7 @@ void func_80AABD0C(EnMd* this, PlayState* play) { void EnMd_Update(Actor* thisx, PlayState* play) { EnMd* this = (EnMd*)thisx; - s32 pad; + UNUSED s32 pad; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); 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 257c567cb54..33cd603b6b9 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -281,7 +281,7 @@ void EnMk_Wait(EnMk* this, PlayState* play) { void EnMk_Update(Actor* thisx, PlayState* play) { EnMk* this = (EnMk*)thisx; - s32 pad; + UNUSED s32 pad; Vec3s vec; Player* player; s16 swimFlag; 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 1fae3e0d8c6..d06a7946124 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -156,7 +156,7 @@ void EnMm_ChangeAnim(EnMm* this, s32 index, s32* currentIndex) { } void EnMm_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnMm* this = (EnMm*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -193,7 +193,7 @@ void EnMm_Init(Actor* thisx, PlayState* play) { } void EnMm_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnMm* this = (EnMm*)thisx; Collider_DestroyCylinder(play, &this->collider); @@ -210,7 +210,7 @@ s32 func_80AADA70(void) { } s32 func_80AADAA0(EnMm* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); s32 sp1C = 1; @@ -500,7 +500,7 @@ void func_80AAE598(EnMm* this, PlayState* play) { } void EnMm_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnMm* this = (EnMm*)thisx; this->actionFunc(this, play); @@ -511,7 +511,7 @@ void EnMm_Update(Actor* thisx, PlayState* play) { void EnMm_Draw(Actor* thisx, PlayState* play) { static void* mouthTextures[] = { gRunningManMouthOpenTex, gRunningManMouthClosedTex }; - s32 pad; + UNUSED s32 pad; EnMm* this = (EnMm*)thisx; if (0) {} 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 274af17c9ef..0f62efd8fde 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -289,7 +289,7 @@ void func_80AAF668(EnMm2* this, PlayState* play) { void EnMm2_Update(Actor* thisx, PlayState* play) { EnMm2* this = (EnMm2*)thisx; - s32 pad; + UNUSED s32 pad; if (this->unk_1F4 & 1) { Actor_TrackPlayer(play, &this->actor, &this->unk_1E8, &this->unk_1EE, this->actor.focus.pos); 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 97f584e59b8..d4930364622 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -70,7 +70,7 @@ void EnMs_SetOfferText(EnMs* this, PlayState* play) { void EnMs_Init(Actor* thisx, PlayState* play) { EnMs* this = (EnMs*)thisx; - s32 pad; + UNUSED s32 pad; if (LINK_AGE_IN_YEARS != YEARS_CHILD) { Actor_Kill(&this->actor); @@ -159,7 +159,7 @@ void EnMs_TalkAfterPurchase(EnMs* this, PlayState* play) { void EnMs_Update(Actor* thisx, PlayState* play) { EnMs* this = (EnMs*)thisx; - s32 pad; + UNUSED s32 pad; this->activeTimer += 1; Actor_SetFocus(&this->actor, 20.0f); diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/src/overlays/actors/ovl_En_Mu/z_en_mu.c index cd474241b08..3d89c3d6648 100644 --- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c +++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c @@ -132,7 +132,7 @@ s16 EnMu_CheckDialogState(PlayState* play, Actor* thisx) { void EnMu_Init(Actor* thisx, PlayState* play) { EnMu* this = (EnMu*)thisx; - s32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 160.0f); SkelAnime_InitFlex(play, &this->skelAnime, &object_mu_Skel_004F70, &object_mu_Anim_0003F4, NULL, NULL, 0); @@ -157,7 +157,7 @@ void EnMu_Pose(EnMu* this, PlayState* play) { void EnMu_Update(Actor* thisx, PlayState* play) { EnMu* this = (EnMu*)thisx; - s32 pad; + UNUSED s32 pad; f32 talkDist; Vec3s pos; 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 5935f5cfdb1..4497ca35957 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -103,7 +103,7 @@ s32 EnNb_GetType(EnNb* this) { void EnNb_UpdatePath(EnNb* this, PlayState* play) { Vec3s* pointPos; Path* pathList; - s32 pad; + UNUSED s32 pad; s32 path; pathList = play->setupPathList; @@ -136,7 +136,7 @@ void EnNb_SetupCollider(Actor* thisx, PlayState* play) { } void EnNb_UpdateCollider(EnNb* this, PlayState* play) { - s32 pad[4]; + UNUSED s32 pad[4]; ColliderCylinder* collider = &this->collider; Collider_UpdateCylinder(&this->actor, collider); @@ -166,7 +166,7 @@ void func_80AB1040(EnNb* this, PlayState* play) { } void func_80AB10C4(EnNb* this) { - s32 pad2[2]; + UNUSED s32 pad2[2]; Vec3s* tempPtr; Vec3s* tempPtr2; @@ -179,7 +179,7 @@ void func_80AB10C4(EnNb* this) { } void EnNb_UpdateEyes(EnNb* this) { - s32 pad[3]; + UNUSED s32 pad[3]; s16* blinkTimer = &this->blinkTimer; s16* eyeIdx = &this->eyeIdx; @@ -330,7 +330,7 @@ void EnNb_ComeUpImpl(EnNb* this, PlayState* play) { } void EnNb_SetupChamberCsImpl(EnNb* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; Player* player; if ((gSaveContext.chamberCutsceneNum == 3) && (gSaveContext.sceneSetupIndex < 4)) { @@ -540,7 +540,7 @@ void EnNb_CreateLightOrb(EnNb* this, PlayState* play) { } void EnNb_DrawTransparency(EnNb* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s16 eyeSegIdx = this->eyeIdx; void* eyeTex = sEyeTextures[eyeSegIdx]; SkelAnime* skelAnime = &this->skelAnime; @@ -581,7 +581,7 @@ void EnNb_SetPosInPortal(EnNb* this, PlayState* play) { CsCmdActorAction* csCmdNPCAction = EnNb_GetNpcCsAction(play, 1); Vec3f* pos = &this->actor.world.pos; f32 f0; - s32 pad; + UNUSED s32 pad; Vec3f startPos; Vec3f endPos; @@ -696,7 +696,7 @@ void EnNb_SetupConfrontation(EnNb* this, PlayState* play) { } void EnNb_PlayKnuckleDefeatSFX(EnNb* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; if (play->csCtx.frames == 548) { func_80078914(&this->actor.projectedPos, NA_SE_VO_NB_CRY_0); @@ -705,7 +705,7 @@ void EnNb_PlayKnuckleDefeatSFX(EnNb* this, PlayState* play) { } void EnNb_PlayKneelingOnGroundSFX(EnNb* this) { - s32 pad[2]; + UNUSED s32 pad[2]; if ((this->skelAnime.mode == 2) && (Animation_OnFrame(&this->skelAnime, 18.0f) || Animation_OnFrame(&this->skelAnime, 25.0f))) { @@ -714,7 +714,7 @@ void EnNb_PlayKneelingOnGroundSFX(EnNb* this) { } void EnNb_PlayLookRightSFX(EnNb* this) { - s32 pad[2]; + UNUSED s32 pad[2]; if ((this->skelAnime.mode == 2) && Animation_OnFrame(&this->skelAnime, 9.0f)) { func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_CONCRETE); @@ -722,7 +722,7 @@ void EnNb_PlayLookRightSFX(EnNb* this) { } void EnNb_PlayLookLeftSFX(EnNb* this) { - s32 pad[2]; + UNUSED s32 pad[2]; if (Animation_OnFrame(&this->skelAnime, 9.0f) || Animation_OnFrame(&this->skelAnime, 13.0f)) { func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_CONCRETE); @@ -746,7 +746,7 @@ void func_80AB26C8(EnNb* this) { } void func_80AB26DC(EnNb* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; AnimationHeader* animation = &gNabooruCollapseFromStandingToKneelingTransitionAnim; f32 lastFrame = Animation_GetLastFrame(animation); @@ -950,7 +950,7 @@ void EnNb_ConfrontationDestroy(EnNb* this, PlayState* play) { } void func_80AB2E70(EnNb* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; SkelAnime* skelAnime = &this->skelAnime; OPEN_DISPS(play->state.gfxCtx, "../z_en_nb_inConfrontion.c", 572); @@ -977,11 +977,11 @@ s32 func_80AB2FC0(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s } void func_80AB2FE4(EnNb* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 eyeIdx = this->eyeIdx; SkelAnime* skelAnime = &this->skelAnime; void* eyeTexture = sEyeTextures[eyeIdx]; - s32 pad1; + UNUSED s32 pad1; OPEN_DISPS(play->state.gfxCtx, "../z_en_nb_inConfrontion.c", 623); @@ -1217,9 +1217,9 @@ void EnNb_SetupPathMovement(EnNb* this, PlayState* play) { } void EnNb_SetTextIdAsChild(EnNb* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; u8 choiceIndex; - s32 pad1; + UNUSED s32 pad1; u16 textId; textId = this->actor.textId; @@ -1421,7 +1421,7 @@ void EnNb_Update(Actor* thisx, PlayState* play) { } void EnNb_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnNb* this = (EnNb*)thisx; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); @@ -1491,11 +1491,11 @@ void EnNb_DrawNothing(EnNb* this, PlayState* play) { } void EnNb_DrawDefault(EnNb* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 eyeIdx = this->eyeIdx; SkelAnime* skelAnime = &this->skelAnime; void* eyeTexture = sEyeTextures[eyeIdx]; - s32 pad1; + UNUSED s32 pad1; OPEN_DISPS(play->state.gfxCtx, "../z_en_nb.c", 992); 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 031a57ae086..055a7002599 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -121,7 +121,7 @@ static InitChainEntry sInitChain[] = { void EnNiw_Init(Actor* thisx, PlayState* play) { EnNiw* this = (EnNiw*)thisx; - s32 pad; + UNUSED s32 pad; s32 i; if (this->actor.params < 0) { @@ -471,7 +471,7 @@ void func_80AB6450(EnNiw* this, PlayState* play) { } void func_80AB6570(EnNiw* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; f32 posY = Rand_CenteredFloat(100.0f); f32 posZ = Rand_CenteredFloat(100.0f); s16 tmp; @@ -873,7 +873,7 @@ void func_80AB747C(EnNiw* this, PlayState* play) { } void EnNiw_Update(Actor* thisx, PlayState* play) { - s32 pad1; + UNUSED s32 pad1; EnNiw* this = (EnNiw*)thisx; Player* player = GET_PLAYER(play); s16 i; @@ -883,12 +883,12 @@ void EnNiw_Update(Actor* thisx, PlayState* play) { Vec3f pos; Vec3f vel; Vec3f accel; - s32 pad2; + UNUSED s32 pad2; f32 scale; Vec3f cam; f32 dist; f32 camResult; - s32 pad3[10]; + UNUSED s32 pad3[10]; if (1) {} // Required to match if (1) {} @@ -1204,7 +1204,7 @@ void EnNiw_UpdateEffects(EnNiw* this, PlayState* play) { void EnNiw_DrawEffects(EnNiw* this, PlayState* play) { u8 materialFlag = 0; s16 i; - s32 pad; + UNUSED s32 pad; GraphicsContext* gfxCtx = play->state.gfxCtx; EnNiwEffect* effect = &this->effects[0]; diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index 69cedb5e557..7331c7b5675 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -53,10 +53,10 @@ static ColliderCylinderInit sCylinderInit = { void EnNiwGirl_Init(Actor* thisx, PlayState* play) { EnNiwGirl* this = (EnNiwGirl*)thisx; - s32 pad; + UNUSED s32 pad; Vec3f vec1; Vec3f vec2; - s32 pad2; + UNUSED s32 pad2; SkelAnime_InitFlex(play, &this->skelAnime, &gNiwGirlSkel, &gNiwGirlRunAnim, this->jointTable, this->morphTable, 17); Collider_InitCylinder(play, &this->collider); @@ -246,7 +246,7 @@ static Vec3f sConstVec3f = { 0.2f, 0.2f, 0.2f }; void EnNiwGirl_Draw(Actor* thisx, PlayState* play) { static void* eyeTextures[] = { gNiwGirlEyeOpenTex, gNiwGirlEyeHalfTex, gNiwGirlEyeClosedTex }; EnNiwGirl* this = (EnNiwGirl*)thisx; - s32 pad; + UNUSED s32 pad; Vec3f sp4C = sConstVec3f; OPEN_DISPS(play->state.gfxCtx, "../z_en_niw_girl.c", 573); diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index e19d1bc2ffb..b50023d5bf2 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -67,7 +67,7 @@ static ColliderCylinderInit sCylinderInit = { }; void EnNiwLady_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnNiwLady* this = (EnNiwLady*)thisx; this->objectAneIndex = Object_GetIndex(&play->objectCtx, OBJECT_ANE); @@ -151,7 +151,7 @@ void EnNiwLady_ChoseAnimation(EnNiwLady* this, PlayState* play, s32 arg2) { void func_80AB9F24(EnNiwLady* this, PlayState* play) { f32 frames; - s32 pad; + UNUSED s32 pad; if (Object_IsLoaded(&play->objectCtx, this->objectAneIndex) && Object_IsLoaded(&play->objectCtx, this->objectOsAnimeIndex)) { @@ -491,7 +491,7 @@ void func_80ABAD7C(EnNiwLady* this, PlayState* play) { } void EnNiwLady_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnNiwLady* this = (EnNiwLady*)thisx; Player* player = GET_PLAYER(play); @@ -553,7 +553,7 @@ Gfx* EnNiwLady_EmptyDList(GraphicsContext* gfxCtx) { s32 EnNiwLady_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { EnNiwLady* this = (EnNiwLady*)thisx; - s32 pad; + UNUSED s32 pad; if (limbIndex == 15) { rot->x += this->unk_254.y; @@ -574,7 +574,7 @@ s32 EnNiwLady_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3 void EnNiwLady_Draw(Actor* thisx, PlayState* play) { static void* sEyeTextures[] = { gCuccoLadyEyeOpenTex, gCuccoLadyEyeHalfTex, gCuccoLadyEyeClosedTex }; EnNiwLady* this = (EnNiwLady*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_niw_lady.c", 1347); if (this->unk_27E != 0) { 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 d1cb883abf9..96144785a6e 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -64,7 +64,7 @@ static Gfx* sDLists[] = { void EnNutsball_Init(Actor* thisx, PlayState* play) { EnNutsball* this = (EnNutsball*)thisx; - s32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 400.0f, ActorShadow_DrawCircle, 13.0f); Collider_InitCylinder(play, &this->collider); @@ -145,7 +145,7 @@ void func_80ABBBA8(EnNutsball* this, PlayState* play) { void EnNutsball_Update(Actor* thisx, PlayState* play) { EnNutsball* this = (EnNutsball*)thisx; Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; if (!(player->stateFlags1 & (PLAYER_STATE1_6 | PLAYER_STATE1_7 | PLAYER_STATE1_28 | PLAYER_STATE1_29)) || (this->actionFunc == func_80ABBB34)) { @@ -165,7 +165,7 @@ void EnNutsball_Update(Actor* thisx, PlayState* play) { } void EnNutsball_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_nutsball.c", 327); 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 f04a4d3a2da..88427b10e00 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -202,7 +202,7 @@ void EnNwc_DrawChicks(EnNwc* this, PlayState* play) { } void EnNwc_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnNwc* this = (EnNwc*)thisx; ColliderJntSphElementInit elementInits[16]; ColliderJntSphElementInit* element; @@ -229,7 +229,7 @@ void EnNwc_Init(Actor* thisx, PlayState* play) { } void EnNwc_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnNwc* this = (EnNwc*)thisx; Collider_FreeJntSph(play, &this->collider); @@ -240,7 +240,7 @@ void EnNwc_Idle(EnNwc* this, PlayState* play) { } void EnNwc_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnNwc* this = (EnNwc*)thisx; this->updateFunc(this, play); @@ -248,7 +248,7 @@ void EnNwc_Update(Actor* thisx, PlayState* play) { } void EnNwc_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnNwc* this = (EnNwc*)thisx; EnNwc_DrawChicks(this, play); diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c index 9dcdf2e08c2..a03b0844365 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -523,7 +523,7 @@ static Vec3f sFireOffsets[] = { }; void EnNy_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnNy* this = (EnNy*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_ny.c", 837); 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 81f4c66ae63..7550ed1609d 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -115,7 +115,7 @@ static InitChainEntry sInitChain[] = { void EnOkuta_Init(Actor* thisx, PlayState* play) { EnOkuta* this = (EnOkuta*)thisx; - s32 pad; + UNUSED s32 pad; WaterBox* outWaterBox; f32 ySurface; s32 floorBgId; @@ -289,7 +289,7 @@ void EnOkuta_WaitToAppear(EnOkuta* this, PlayState* play) { } void EnOkuta_Appear(EnOkuta* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; if (SkelAnime_Update(&this->skelAnime)) { if (this->actor.xzDistToPlayer < 160.0f) { @@ -314,7 +314,7 @@ void EnOkuta_Appear(EnOkuta* this, PlayState* play) { } void EnOkuta_Hide(EnOkuta* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Math_ApproachF(&this->actor.world.pos.y, this->actor.home.pos.y, 0.5f, 30.0f); if (SkelAnime_Update(&this->skelAnime)) { @@ -702,7 +702,7 @@ s32 EnOkuta_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* void EnOkuta_Draw(Actor* thisx, PlayState* play) { EnOkuta* this = (EnOkuta*)thisx; - s32 pad; + UNUSED s32 pad; Gfx_SetupDL_25Opa(play->state.gfxCtx); 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 d7fc9bb700e..91a3c6968b1 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -569,7 +569,7 @@ s32 EnOssan_TryGetObjBankIndices(EnOssan* this, PlayState* play, s16* objectIds) void EnOssan_Init(Actor* thisx, PlayState* play) { EnOssan* this = (EnOssan*)thisx; - s32 pad; + UNUSED s32 pad; s16* objectIds; if (this->actor.params == OSSAN_TYPE_TALON && (LINK_AGE_IN_YEARS != YEARS_CHILD)) { @@ -1229,7 +1229,7 @@ void EnOssan_State_BrowseLeftShelf(EnOssan* this, PlayState* play, Player* playe } void EnOssan_State_BrowseRightShelf(EnOssan* this, PlayState* play, Player* player) { - s32 pad[2]; + UNUSED s32 pad[2]; u8 prevIndex; u8 nextIndex; @@ -2332,7 +2332,7 @@ void EnOssan_DrawStickDirectionPrompts(PlayState* play, EnOssan* this) { void EnOssan_DrawBazaarShopkeeper(Actor* thisx, PlayState* play) { static void* sBazaarShopkeeperEyeTextures[] = { gOssanEyeOpenTex, gOssanEyeHalfTex, gOssanEyeClosedTex }; EnOssan* this = (EnOssan*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_oB1.c", 4320); @@ -2354,7 +2354,7 @@ s32 EnOssan_OverrideLimbDrawKokiriShopkeeper(PlayState* play, s32 limbIndex, Gfx gKokiriShopkeeperEyeOpenTex, }; EnOssan* this = (EnOssan*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_oB1.c", 4354); @@ -2387,7 +2387,7 @@ Gfx* EnOssan_SetEnvColor(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b, u8 a) { void EnOssan_DrawKokiriShopkeeper(Actor* thisx, PlayState* play) { EnOssan* this = (EnOssan*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_oB1.c", 4409); @@ -2408,7 +2408,7 @@ void EnOssan_DrawKokiriShopkeeper(Actor* thisx, PlayState* play) { void EnOssan_DrawGoronShopkeeper(Actor* thisx, PlayState* play) { static void* sGoronShopkeeperEyeTextures[] = { gGoronCsEyeOpenTex, gGoronCsEyeHalfTex, gGoronCsEyeClosedTex }; EnOssan* this = (EnOssan*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_oB1.c", 4455); @@ -2436,7 +2436,7 @@ s32 EnOssan_OverrideLimbDrawZoraShopkeeper(PlayState* play, s32 limbIndex, Gfx** void EnOssan_DrawZoraShopkeeper(Actor* thisx, PlayState* play) { static void* sZoraShopkeeperEyeTextures[] = { gZoraEyeOpenTex, gZoraEyeHalfTex, gZoraEyeClosedTex }; EnOssan* this = (EnOssan*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_oB1.c", 4506); @@ -2457,7 +2457,7 @@ void EnOssan_DrawPotionShopkeeper(Actor* thisx, PlayState* play) { static void* sPotionShopkeeperEyeTextures[] = { gPotionShopkeeperEyeOpenTex, gPotionShopkeeperEyeHalfTex, gPotionShopkeeperEyeClosedTex }; EnOssan* this = (EnOssan*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_oB1.c", 4544); @@ -2474,7 +2474,7 @@ void EnOssan_DrawPotionShopkeeper(Actor* thisx, PlayState* play) { void EnOssan_DrawHappyMaskShopkeeper(Actor* thisx, PlayState* play) { static void* sHappyMaskShopkeeperEyeTextures[] = { gOsEyeClosedTex, gOsEyeOpenTex }; EnOssan* this = (EnOssan*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_oB1.c", 4578); @@ -2494,7 +2494,7 @@ void EnOssan_DrawBombchuShopkeeper(Actor* thisx, PlayState* play) { static void* sBombchuShopkeeperEyeTextures[] = { gBombchuShopkeeperEyeOpenTex, gBombchuShopkeeperEyeHalfTex, gBombchuShopkeeperEyeClosedTex }; EnOssan* this = (EnOssan*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_oB1.c", 4611); 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 3a32f4ca3c7..871855f7eba 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -1073,7 +1073,7 @@ s32 func_80ACC624(EnOwl* this, PlayState* play) { } void EnOwl_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnOwl* this = (EnOwl*)thisx; s16 phi_a1; @@ -1311,7 +1311,7 @@ void EnOwl_PostLimbUpdate(PlayState* play, s32 limbIndex, Gfx** gfx, Vec3s* rot, void EnOwl_Draw(Actor* thisx, PlayState* play) { static void* eyeTextures[] = { gObjOwlEyeOpenTex, gObjOwlEyeHalfTex, gObjOwlEyeClosedTex }; EnOwl* this = (EnOwl*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_owl.c", 2247); 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 a26f2db372b..c41d20cdbae 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -855,7 +855,7 @@ void EnPeehat_SetStateExplode(EnPeehat* this) { void EnPeehat_StateExplode(EnPeehat* this, PlayState* play) { EnBom* bomb; - s32 pad[2]; + UNUSED s32 pad[2]; if (this->animTimer == 5) { bomb = (EnBom*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOM, this->actor.world.pos.x, diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c index 86b74b3ed50..e3961d96705 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c @@ -58,7 +58,7 @@ static InitChainEntry sInitChain[] = { }; void EnPoDesert_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnPoDesert* this = (EnPoDesert*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -186,7 +186,7 @@ void EnPoDesert_Disappear(EnPoDesert* this, PlayState* play) { void EnPoDesert_Update(Actor* thisx, PlayState* play) { EnPoDesert* this = (EnPoDesert*)thisx; - s32 pad; + UNUSED s32 pad; SkelAnime_Update(&this->skelAnime); this->actionFunc(this, play); diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index 8c2f7ae37ac..bdd4a9c1cdb 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -147,7 +147,7 @@ static MtxF sLimb7Mtx; void EnPoField_Init(Actor* thisx, PlayState* play) { EnPoField* this = (EnPoField*)thisx; - s32 pad; + UNUSED s32 pad; if (sNumSpawned != 10) { sSpawnPositions[sNumSpawned].x = this->actor.world.pos.x; @@ -541,8 +541,8 @@ void EnPoField_Damage(EnPoField* this, PlayState* play) { void EnPoField_Death(EnPoField* this, PlayState* play) { Vec3f sp6C; f32 sp68; - s32 pad; - s32 pad1; + UNUSED s32 pad; + UNUSED s32 pad1; f32 temp_f0; this->actionTimer++; @@ -772,7 +772,7 @@ void EnPoField_UpdateFlame(EnPoField* this, PlayState* play) { void EnPoField_DrawFlame(EnPoField* this, PlayState* play) { f32 sp4C; - s32 pad; + UNUSED s32 pad; if (this->flameTimer != 0) { OPEN_DISPS(play->state.gfxCtx, "../z_en_po_field.c", 1669); @@ -846,7 +846,7 @@ void func_80AD6330(EnPoField* this) { } void EnPoField_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnPoField* this = (EnPoField*)thisx; EnPoField_TestForDamage(this, play); @@ -967,7 +967,7 @@ void EnPoField_UpdateDead(Actor* thisx, PlayState* play) { void EnPoField_DrawSoul(Actor* thisx, PlayState* play) { EnPoField* this = (EnPoField*)thisx; - s32 pad; + UNUSED s32 pad; EnPoFieldInfo* info = &sPoFieldInfo[this->actor.params]; OPEN_DISPS(play->state.gfxCtx, "../z_en_po_field.c", 2077); diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index 8d2dbdcf097..c953d38f3ba 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -289,9 +289,9 @@ void EnPoRelay_Talk2(EnPoRelay* this, PlayState* play) { void EnPoRelay_DisappearAndReward(EnPoRelay* this, PlayState* play) { Vec3f vec; f32 multiplier; - s32 pad; + UNUSED s32 pad; Vec3f sp60; - s32 pad1; + UNUSED s32 pad1; this->actionTimer++; if (this->actionTimer < 8) { @@ -347,7 +347,7 @@ void EnPoRelay_DisappearAndReward(EnPoRelay* this, PlayState* play) { void EnPoRelay_Update(Actor* thisx, PlayState* play) { EnPoRelay* this = (EnPoRelay*)thisx; - s32 pad; + UNUSED s32 pad; SkelAnime_Update(&this->skelAnime); this->actionFunc(this, play); 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 849fdd038c6..4aabbdea282 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 @@ -175,7 +175,7 @@ static Vec3f D_80ADD7F8 = { 1000.0f, -1700.0f, 0.0f }; void EnPoSisters_Init(Actor* thisx, PlayState* play) { EnPoSisters* this = (EnPoSisters*)thisx; - s32 pad; + UNUSED s32 pad; Actor_ProcessInitChain(&this->actor, sInitChain); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 50.0f); @@ -397,8 +397,8 @@ void func_80AD9AA8(EnPoSisters* this, PlayState* play) { this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0x800); Actor* actor3 = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_PO_SISTERS, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0xC00); - s32 pad; - s32 pad1; + UNUSED s32 pad; + UNUSED s32 pad1; if (actor1 == NULL || actor2 == NULL || actor3 == NULL) { if (actor1 != NULL) { @@ -662,7 +662,7 @@ void func_80ADA7F0(EnPoSisters* this, PlayState* play) { } void func_80ADA8C0(EnPoSisters* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; SkelAnime_Update(&this->skelAnime); if (Animation_OnFrame(&this->skelAnime, 0.0f) && this->unk_19A != 0) { @@ -1172,7 +1172,7 @@ void func_80ADC10C(EnPoSisters* this, PlayState* play) { } void EnPoSisters_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnPoSisters* this = (EnPoSisters*)thisx; s16 temp; @@ -1299,7 +1299,7 @@ s32 EnPoSisters_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Ve void EnPoSisters_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfxP) { EnPoSisters* this = (EnPoSisters*)thisx; s32 i; - s32 pad; + UNUSED s32 pad; if (this->actionFunc == func_80ADAFC0 && this->unk_19A >= 8 && limbIndex == 9) { gSPMatrix((*gfxP)++, Matrix_NewMtx(play->state.gfxCtx, "../z_en_po_sisters.c", 2876), @@ -1346,7 +1346,7 @@ void EnPoSisters_Draw(Actor* thisx, PlayState* play) { u8 spE7; Color_RGBA8* temp_s1 = &D_80ADD700[this->unk_194]; Color_RGBA8* temp_s7 = &D_80ADD6F0[this->unk_194]; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_po_sisters.c", 2989); func_80ADC55C(this); 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 29707a407f1..eeaa352d092 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -182,7 +182,7 @@ static Vec3f D_80AE1B60 = { 0.0f, 3.0f, 0.0f }; static Vec3f D_80AE1B6C = { 0.0f, 0.0f, 0.0f }; void EnPoh_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnItem00* collectible; EnPoh* this = (EnPoh*)thisx; @@ -604,8 +604,8 @@ void func_80ADF15C(EnPoh* this, PlayState* play) { Vec3f vec; f32 multiplier; f32 newScale; - s32 pad; - s32 pad1; + UNUSED s32 pad; + UNUSED s32 pad1; this->unk_198++; if (this->unk_198 < 8) { @@ -983,7 +983,7 @@ void func_80AE089C(EnPoh* this) { void EnPoh_UpdateLiving(Actor* thisx, PlayState* play) { EnPoh* this = (EnPoh*)thisx; - s32 pad; + UNUSED s32 pad; Vec3f vec; s32 sp38; @@ -1174,7 +1174,7 @@ void EnPoh_DrawSoul(Actor* thisx, PlayState* play) { gSPDisplayList(POLY_OPA_DISP++, this->info->lanternDisplayList); if (this->infoIdx == EN_POH_INFO_COMPOSER) { Color_RGBA8* envColor = (this->actor.params == EN_POH_SHARP) ? &D_80AE1B4C : &D_80AE1B50; - s32 pad; + UNUSED s32 pad; gSPDisplayList(POLY_OPA_DISP++, gPoeComposerLanternBottomDL); gDPPipeSync(POLY_OPA_DISP++); 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 cde8a3f6896..f4707f53d4b 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -340,7 +340,7 @@ void EnRd_WalkToPlayer(EnRd* this, PlayState* play) { Color_RGBA8 D_80AE4924 = { 200, 200, 255, 255 }; Color_RGBA8 D_80AE4928 = { 0, 0, 255, 0 }; Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; s16 yaw = this->actor.yawTowardsPlayer - this->actor.shape.rot.y - this->headYRotation - this->upperBodyYRotation; this->skelAnime.playSpeed = this->actor.speedXZ; @@ -409,7 +409,7 @@ void EnRd_SetupWalkToHome(EnRd* this, PlayState* play) { void EnRd_WalkToHome(EnRd* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; s16 targetY = Actor_WorldYawTowardPoint(&this->actor, &this->actor.home.pos); if (Actor_WorldDistXYZToPoint(&this->actor, &this->actor.home.pos) >= 5.0f) { @@ -467,7 +467,7 @@ void EnRd_SetupWalkToParent(EnRd* this) { */ void EnRd_WalkToParent(EnRd* this, PlayState* play) { if (this->actor.parent != NULL) { - s32 pad; + UNUSED s32 pad; s16 targetY; Vec3f parentPos = this->actor.parent->world.pos; @@ -513,7 +513,7 @@ void EnRd_SetupGrab(EnRd* this) { } void EnRd_Grab(EnRd* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); if (SkelAnime_Update(&this->skelAnime)) { @@ -785,7 +785,7 @@ void EnRd_TurnTowardsPlayer(EnRd* this, PlayState* play) { } void EnRd_UpdateDamage(EnRd* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); if ((gSaveContext.sunsSongState != SUNSSONG_INACTIVE) && (this->actor.shape.rot.x == 0) && @@ -838,10 +838,10 @@ void EnRd_UpdateDamage(EnRd* this, PlayState* play) { } void EnRd_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnRd* this = (EnRd*)thisx; Player* player = GET_PLAYER(play); - s32 pad2; + UNUSED s32 pad2; EnRd_UpdateDamage(this, play); @@ -956,7 +956,7 @@ void EnRd_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void EnRd_Draw(Actor* thisx, PlayState* play) { static Vec3f D_80AE494C = { 300.0f, 0.0f, 0.0f }; static Vec3f sShadowScale = { 0.25f, 0.25f, 0.25f }; - s32 pad; + UNUSED s32 pad; EnRd* this = (EnRd*)thisx; Vec3f thisPos = thisx->world.pos; diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index 2b21a2967e5..26a5f87d322 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -98,7 +98,7 @@ static ColliderCylinderInit sCylinderInit = { }; void EnReeba_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnReeba* this = (EnReeba*)thisx; s32 surfaceType; @@ -144,7 +144,7 @@ void EnReeba_Init(Actor* thisx, PlayState* play) { } void EnReeba_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnReeba* this = (EnReeba*)thisx; Collider_DestroyCylinder(play, &this->collider); @@ -654,7 +654,7 @@ void EnReeba_Update(Actor* thisx, PlayState* play2) { } void EnReeba_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnReeba* this = (EnReeba*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_reeba.c", 1062); diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/src/overlays/actors/ovl_En_Rl/z_en_rl.c index a5e4cca8528..41d7c1ce572 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -36,7 +36,7 @@ void EnRl_Destroy(Actor* thisx, PlayState* play) { } void func_80AE72D0(EnRl* this) { - s32 pad[3]; + UNUSED s32 pad[3]; s16* timer = &this->timer; s16* eyeTextureIndex = &this->eyeTextureIndex; @@ -113,7 +113,7 @@ void func_80AE7544(EnRl* this, PlayState* play) { } void func_80AE7590(EnRl* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player; Vec3f pos; s16 sceneNum = play->sceneNum; @@ -295,7 +295,7 @@ void func_80AE7D40(EnRl* this, PlayState* play) { } void func_80AE7D94(EnRl* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s16 temp = this->eyeTextureIndex; void* tex = D_80AE81A0[temp]; SkelAnime* skelAnime = &this->skelAnime; @@ -344,7 +344,7 @@ void func_80AE7FD0(EnRl* this, PlayState* play) { } void func_80AE7FDC(EnRl* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s16 temp = this->eyeTextureIndex; void* tex = D_80AE81A0[temp]; SkelAnime* skelAnime = &this->skelAnime; 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 5a5b187814e..91b2069b222 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -198,7 +198,7 @@ void EnRr_Init(Actor* thisx, PlayState* play2) { } void EnRr_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnRr* this = (EnRr*)thisx; Collider_DestroyCylinder(play, &this->collider1); @@ -654,7 +654,7 @@ void EnRr_Damage(EnRr* this, PlayState* play) { } void EnRr_Death(EnRr* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 i; if (this->frameCount < 40) { @@ -759,7 +759,7 @@ void EnRr_Stunned(EnRr* this, PlayState* play) { } void EnRr_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnRr* this = (EnRr*)thisx; s32 i; @@ -843,7 +843,7 @@ static Vec3f sEffectOffsets[] = { }; void EnRr_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f zeroVec; EnRr* this = (EnRr*)thisx; s32 i; diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index d5d10dbdb2d..961f2cfea91 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -145,14 +145,14 @@ const ActorInit En_Ru1_InitVars = { }; void func_80AEAC10(EnRu1* this, PlayState* play) { - s32 pad[5]; + UNUSED s32 pad[5]; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); } void func_80AEAC54(EnRu1* this, PlayState* play) { - s32 pad[5]; + UNUSED s32 pad[5]; Collider_UpdateCylinder(&this->actor, &this->collider2); if (this->unk_34C != 0) { @@ -163,7 +163,7 @@ void func_80AEAC54(EnRu1* this, PlayState* play) { } void func_80AEACDC(EnRu1* this, PlayState* play) { - s32 pad[5]; + UNUSED s32 pad[5]; Collider_UpdateCylinder(&this->actor, &this->collider2); CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider2.base); @@ -207,7 +207,7 @@ void EnRu1_Destroy(Actor* thisx, PlayState* play) { } void EnRu1_UpdateEyes(EnRu1* this) { - s32 pad[3]; + UNUSED s32 pad[3]; s16* blinkTimer = &this->blinkTimer; s16* eyeIndex = &this->eyeIndex; @@ -247,7 +247,7 @@ s32 EnRu1_IsCsStateIdle(PlayState* play) { } CsCmdActorAction* func_80AEAF58(PlayState* play, s32 npcActionIdx) { - s32 pad[2]; + UNUSED s32 pad[2]; CsCmdActorAction* ret = NULL; if (!EnRu1_IsCsStateIdle(play)) { @@ -359,7 +359,7 @@ void func_80AEB220(EnRu1* this, PlayState* play) { } void func_80AEB264(EnRu1* this, AnimationHeader* animation, u8 arg2, f32 morphFrames, s32 arg4) { - s32 pad[2]; + UNUSED s32 pad[2]; AnimationHeader* animHeader = SEGMENTED_TO_VIRTUAL(animation); f32 frameCount = Animation_GetLastFrame(animHeader); f32 playbackSpeed; @@ -527,7 +527,7 @@ void func_80AEB974(EnRu1* this, PlayState* play) { Vec3f* thisPos; f32 sp30; CsCmdActorAction* csCmdNPCAction = func_80AEB438(play); - s32 pad; + UNUSED s32 pad; if (csCmdNPCAction != NULL) { sp30 = func_80AEB7E0(csCmdNPCAction, play); @@ -543,12 +543,12 @@ void func_80AEBA0C(EnRu1* this, PlayState* play) { } void func_80AEBA2C(EnRu1* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f* unk_364 = &this->unk_364; Vec3f* thisPos; f32 temp_ret_2; CsCmdActorAction* csCmdNPCAction = func_80AEB438(play); - s32 pad2; + UNUSED s32 pad2; if (csCmdNPCAction != NULL) { temp_ret_2 = func_80AEB7E0(csCmdNPCAction, play); @@ -622,7 +622,7 @@ void func_80AEBD1C(EnRu1* this, PlayState* play) { } void func_80AEBD94(EnRu1* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; f32 frameCount; if (func_80AEB480(play, 3)) { @@ -636,7 +636,7 @@ void func_80AEBD94(EnRu1* this, PlayState* play) { } void func_80AEBE3C(EnRu1* this, PlayState* play, s32 arg2) { - s32 pad[2]; + UNUSED s32 pad[2]; f32 frameCount; if (arg2 != 0) { @@ -650,7 +650,7 @@ void func_80AEBE3C(EnRu1* this, PlayState* play, s32 arg2) { } void func_80AEBEC8(EnRu1* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; f32 frameCount; if (func_80AEB458(play, 6)) { @@ -829,7 +829,7 @@ s32 func_80AEC5FC(EnRu1* this, PlayState* play) { } void func_80AEC650(EnRu1* this) { - s32 pad[2]; + UNUSED s32 pad[2]; if (this->unk_280 == 0) { if (Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 7.0f)) { @@ -853,7 +853,7 @@ void func_80AEC6E4(EnRu1* this, PlayState* play) { } void func_80AEC780(EnRu1* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); if ((func_80AEC5FC(this, play)) && (!Play_InCsMode(play)) && @@ -986,13 +986,13 @@ void func_80AECC84(EnRu1* this, PlayState* play) { } void func_80AECCB0(EnRu1* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f* pos; s16 yawTowardsPlayer; f32 spawnX; f32 spawnY; f32 spawnZ; - s32 pad2[2]; + UNUSED s32 pad2[2]; yawTowardsPlayer = this->actor.yawTowardsPlayer; pos = &this->actor.world.pos; @@ -1016,11 +1016,11 @@ void func_80AECE04(EnRu1* this, PlayState* play) { } void func_80AECE20(EnRu1* this, PlayState* play) { - s32 pad2; + UNUSED s32 pad2; Player* player = GET_PLAYER(play); Vec3f* playerPos = &player->actor.world.pos; s16 shapeRotY = player->actor.shape.rot.y; - s32 pad; + UNUSED s32 pad; f32 unk_27C = this->unk_27C; Vec3f* pos = &this->actor.world.pos; @@ -1030,7 +1030,7 @@ void func_80AECE20(EnRu1* this, PlayState* play) { } void func_80AECEB4(EnRu1* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); Vec3f* player_unk_450 = &player->unk_450; Vec3f* pos = &this->actor.world.pos; @@ -1047,7 +1047,7 @@ s32 func_80AECF6C(EnRu1* this, PlayState* play) { s16 temp_f16; f32 temp1; f32 temp2; - s32 pad2[5]; + UNUSED s32 pad2[5]; this->unk_26C += 1.0f; if ((player->actor.speedXZ == 0.0f) && (this->unk_26C >= 3.0f)) { @@ -1270,7 +1270,7 @@ void func_80AED738(EnRu1* this, PlayState* play) { } void func_80AED83C(EnRu1* this) { - s32 pad[2]; + UNUSED s32 pad[2]; Vec3s* tempPtr; Vec3s* tempPtr2; @@ -1287,7 +1287,7 @@ void func_80AED8DC(EnRu1* this) { s16* unk_2AC = &this->unk_2AC; s16* someY = &this->unk_374.unk_08.y; s16* unk_29E = &this->unk_29E; - s32 pad[2]; + UNUSED s32 pad[2]; if (DECR(*unk_2AC) == 0) { *unk_2AC = Rand_S16Offset(0xA, 0x19); @@ -1442,7 +1442,7 @@ void func_80AEE02C(EnRu1* this) { } void func_80AEE050(EnRu1* this) { - s32 pad; + UNUSED s32 pad; f32 sp28; f32 sp24; f32 temp_f10; @@ -1530,7 +1530,7 @@ void func_80AEE2F8(EnRu1* this, PlayState* play) { } s32 func_80AEE394(EnRu1* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; CollisionContext* colCtx; DynaPolyActor* dynaPolyActor; s32 floorBgId; @@ -1585,7 +1585,7 @@ void func_80AEE568(EnRu1* this, PlayState* play) { } void func_80AEE628(EnRu1* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s8 curRoomNum = play->roomCtx.curRoom.num; if (EnRu1_IsCsStateIdle(play)) { @@ -1598,7 +1598,7 @@ void func_80AEE628(EnRu1* this, PlayState* play) { } s32 func_80AEE6D0(EnRu1* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s8 curRoomNum = play->roomCtx.curRoom.num; if (!GET_INFTABLE(INFTABLE_144) && (func_80AEB124(play) != 0)) { @@ -1620,7 +1620,7 @@ s32 func_80AEE6D0(EnRu1* this, PlayState* play) { void func_80AEE7C4(EnRu1* this, PlayState* play) { f32 frameCount; - s32 pad[13]; + UNUSED s32 pad[13]; Player* player; f32* unk_370 = &this->unk_370; @@ -2000,7 +2000,7 @@ void func_80AEF820(EnRu1* this, UNK_TYPE arg1) { } void func_80AEF890(EnRu1* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s8 curRoomNum; if ((gSaveContext.sceneSetupIndex < 4) && (EnRu1_IsCsStateIdle(play))) { @@ -2220,7 +2220,7 @@ void EnRu1_Update(Actor* thisx, PlayState* play) { } void EnRu1_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnRu1* this = (EnRu1*)thisx; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); @@ -2309,13 +2309,13 @@ void EnRu1_DrawNothing(EnRu1* this, PlayState* play) { } void EnRu1_DrawOpa(EnRu1* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s16 eyeIndex = this->eyeIndex; void* eyeTex = sEyeTextures[eyeIndex]; s16 mouthIndex = this->mouthIndex; SkelAnime* skelAnime = &this->skelAnime; void* mouthTex = sMouthTextures[mouthIndex]; - s32 pad1; + UNUSED s32 pad1; OPEN_DISPS(play->state.gfxCtx, "../z_en_ru1.c", 1282); @@ -2334,13 +2334,13 @@ void EnRu1_DrawOpa(EnRu1* this, PlayState* play) { } void EnRu1_DrawXlu(EnRu1* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s16 eyeIndex = this->eyeIndex; void* eyeTex = sEyeTextures[eyeIndex]; s16 mouthIndex = this->mouthIndex; SkelAnime* skelAnime = &this->skelAnime; void* mouthTex = sMouthTextures[mouthIndex]; - s32 pad1; + UNUSED s32 pad1; OPEN_DISPS(play->state.gfxCtx, "../z_en_ru1.c", 1324); diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index cce4a612fb3..13175a9c87d 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -98,7 +98,7 @@ void func_80AF2550(Actor* thisx, PlayState* play) { } void func_80AF259C(EnRu2* this, PlayState* play) { - s32 pad[5]; + UNUSED s32 pad[5]; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base); @@ -111,7 +111,7 @@ void EnRu2_Destroy(Actor* thisx, PlayState* play) { } void func_80AF2608(EnRu2* this) { - s32 pad[3]; + UNUSED s32 pad[3]; s16* unk_2A6 = &this->unk_2A6; s16* unk_2A4 = &this->unk_2A4; @@ -261,7 +261,7 @@ void func_80AF2A38(EnRu2* this, PlayState* play) { } void func_80AF2AB4(EnRu2* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; Player* player; s16 temp; @@ -466,7 +466,7 @@ void func_80AF31C8(EnRu2* this, PlayState* play) { } void func_80AF321C(EnRu2* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s16 temp = this->unk_2A4; void* tex = sEyeTextures[temp]; SkelAnime* skelAnime = &this->skelAnime; @@ -656,12 +656,12 @@ void func_80AF390C(EnRu2* this, PlayState* play) { } void func_80AF39DC(EnRu2* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; MessageContext* msgCtx; - s32 pad2; + UNUSED s32 pad2; u8 dialogState; Player* player; - s32 pad3; + UNUSED s32 pad3; msgCtx = &play->msgCtx; dialogState = Message_GetState(msgCtx); @@ -794,7 +794,7 @@ void func_80AF3F14(EnRu2* this, PlayState* play) { } void func_80AF3F20(EnRu2* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s16 temp = this->unk_2A4; void* tex = sEyeTextures[temp]; SkelAnime* skelAnime = &this->skelAnime; diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index 0fb7c78355e..6e58c2abfe4 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -479,7 +479,7 @@ void func_80AF6170(CsCmdActorAction* csAction, Vec3f* dst) { void EnSa_Init(Actor* thisx, PlayState* play) { EnSa* this = (EnSa*)thisx; - s32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 12.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gSariaSkel, NULL, this->jointTable, this->morphTable, 17); @@ -721,7 +721,7 @@ void func_80AF6B20(EnSa* this, PlayState* play) { void EnSa_Update(Actor* thisx, PlayState* play) { EnSa* this = (EnSa*)thisx; - s32 pad; + UNUSED s32 pad; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); @@ -760,7 +760,7 @@ void EnSa_Update(Actor* thisx, PlayState* play) { s32 EnSa_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) { EnSa* this = (EnSa*)thisx; - s32 pad; + UNUSED s32 pad; Vec3s sp18; if (limbIndex == 16) { 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 ba1d0e5b1c2..d58e5d2053c 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -283,7 +283,7 @@ void EnSb_Lunge(EnSb* this, PlayState* play) { } void EnSb_Bounce(EnSb* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 currentFrame; f32 frameCount; @@ -442,7 +442,7 @@ s32 EnSb_UpdateDamage(EnSb* this, PlayState* play) { void EnSb_Update(Actor* thisx, PlayState* play) { EnSb* this = (EnSb*)thisx; - s32 pad; + UNUSED s32 pad; if (this->isDead) { if (this->actor.yDistToWater > 0.0f) { diff --git a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c index 67ef0e2fc41..79c6fb323cc 100644 --- a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c +++ b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c @@ -50,9 +50,9 @@ void EnSceneChange_Update(Actor* thisx, PlayState* play) { } void EnSceneChange_Draw(Actor* thisx, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; Gfx* displayList; - s32 pad2[2]; + UNUSED s32 pad2[2]; Gfx* displayListHead; displayList = Graph_Alloc(play->state.gfxCtx, 0x3C0); 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 c41272b6ef5..504aa384786 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -95,7 +95,7 @@ void EnSda_Destroy(Actor* thisx, PlayState* play) { } void EnSda_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnSda* this = (EnSda*)thisx; Player* player; @@ -333,7 +333,7 @@ void func_80AF95C4(EnSda* this, u8* shadowTexture, Player* player, PlayState* pl } void func_80AF9C70(u8* shadowTexture, Player* player, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 tempx; f32 tempz; s16 phi_s1; diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c index 08f38d5d0d9..ec0e26d45d7 100644 --- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c +++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c @@ -38,7 +38,7 @@ void EnSiofuki_Init(Actor* thisx, PlayState* play) { EnSiofuki* this = (EnSiofuki*)thisx; s32 type; CollisionHeader* colHeader = NULL; - s32 pad; + UNUSED s32 pad; if ((thisx->room == 10) && Flags_GetSwitch(play, 0x1E)) { Actor_Kill(thisx); 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 f5a2eaa8796..d88b3c8ad7c 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -432,7 +432,7 @@ void func_80AFD880(EnSkb* this, PlayState* play) { } void func_80AFD968(EnSkb* this, PlayState* play) { - s16 pad; + UNUSED s16 pad; s32 i; Vec3f flamePos; s16 scale; @@ -496,7 +496,7 @@ void func_80AFD968(EnSkb* this, PlayState* play) { void EnSkb_Update(Actor* thisx, PlayState* play) { EnSkb* this = (EnSkb*)thisx; - s32 pad; + UNUSED s32 pad; func_80AFD968(this, play); Actor_MoveForward(&this->actor); @@ -522,7 +522,7 @@ void EnSkb_Update(Actor* thisx, PlayState* play) { s32 EnSkb_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { EnSkb* this = (EnSkb*)thisx; s16 color; - s16 pad[2]; + UNUSED s16 pad[2]; if (limbIndex == 11) { if ((this->unk_283 & 2) == 0) { diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index 1476a9e0329..a0869d931d6 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -363,7 +363,7 @@ void EnSkj_Init(Actor* thisx, PlayState* play2) { s16 type = (thisx->params >> 0xA) & 0x3F; EnSkj* this = (EnSkj*)thisx; PlayState* play = play2; - s32 pad; + UNUSED s32 pad; Player* player; Actor_ProcessInitChain(thisx, sInitChain); @@ -458,7 +458,7 @@ void EnSkj_Init(Actor* thisx, PlayState* play2) { } void EnSkj_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnSkj* this = (EnSkj*)thisx; Collider_DestroyCylinder(play, &this->collider); @@ -488,7 +488,7 @@ f32 EnSkj_GetItemYRange(EnSkj* this) { } s32 EnSkj_ShootNeedle(EnSkj* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f pos; Vec3f pos2; EnSkjneedle* needle; @@ -803,7 +803,7 @@ void EnSkj_SetupStand(EnSkj* this) { void EnSkj_Fight(EnSkj* this, PlayState* play) { Vec3f pos1; Vec3f pos2; - s32 pad[3]; + UNUSED s32 pad[3]; f32 prevPosX; f32 prevPosZ; f32 phi_f14; @@ -1026,7 +1026,7 @@ void EnSkj_SetupTalk(EnSkj* this) { } void EnSkj_SariaSongTalk(EnSkj* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) { if (GET_ITEMGETINF(ITEMGETINF_16)) { @@ -1280,7 +1280,7 @@ void EnSkj_LeaveOcarinaGame(EnSkj* this, PlayState* play) { void EnSkj_Update(Actor* thisx, PlayState* play) { Vec3f dropPos; - s32 pad; + UNUSED s32 pad; EnSkj* this = (EnSkj*)thisx; D_80B01EA0 = Actor_ProcessTalkRequest(&this->actor, play); @@ -1640,7 +1640,7 @@ Gfx* EnSkj_OpaqueDL(GraphicsContext* gfxCtx, u32 alpha) { } void EnSkj_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnSkj* this = (EnSkj*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_skj.c", 2475); diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c index e8c33719579..e79e2f4aee1 100644 --- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c +++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c @@ -99,7 +99,7 @@ void EnSkjneedle_Update(Actor* thisx, PlayState* play2) { } void EnSkjneedle_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_skj_needle.c", 200); 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 6faf9661fe0..a2253056de0 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -193,7 +193,7 @@ void EnSsh_InitColliders(EnSsh* this, PlayState* play) { &sCylinderInit1, &sCylinderInit1, &sCylinderInit1, &sCylinderInit2, &sCylinderInit2, &sCylinderInit2, }; s32 i; - s32 pad; + UNUSED s32 pad; for (i = 0; i < ARRAY_COUNT(cylinders); i++) { Collider_InitCylinder(play, &this->colCylinder[i]); @@ -225,7 +225,7 @@ f32 EnSsh_SetAnimation(EnSsh* this, s32 animIndex) { f32 playbackSpeed[] = { 1.0f, 4.0f, 1.0f, 1.0f, 8.0f, 6.0f, 2.0f }; u8 mode[] = { 3, 3, 1, 3, 1, 1, 1 }; f32 frameCount = Animation_GetLastFrame(animation[animIndex]); - s32 pad; + UNUSED s32 pad; Animation_Change(&this->skelAnime, animation[animIndex], playbackSpeed[animIndex], 0.0f, frameCount, mode[animIndex], -6.0f); @@ -605,7 +605,7 @@ void EnSsh_SetColliders(EnSsh* this, PlayState* play) { void EnSsh_Init(Actor* thisx, PlayState* play) { f32 frameCount; - s32 pad; + UNUSED s32 pad; EnSsh* this = (EnSsh*)thisx; frameCount = Animation_GetLastFrame(&object_ssh_Anim_000304); @@ -637,7 +637,7 @@ void EnSsh_Init(Actor* thisx, PlayState* play) { } void EnSsh_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnSsh* this = (EnSsh*)thisx; s32 i; @@ -805,7 +805,7 @@ void EnSsh_Start(EnSsh* this, PlayState* play) { } void EnSsh_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnSsh* this = (EnSsh*)thisx; EnSsh_UpdateColliderScale(this); @@ -876,7 +876,7 @@ void EnSsh_Draw(Actor* thisx, PlayState* play) { object_ssh_Tex_000C60, object_ssh_Tex_001060, }; - s32 pad; + UNUSED s32 pad; EnSsh* this = (EnSsh*)thisx; EnSsh_CheckBodyStickHit(this, play); 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 e0d654cc034..d21861a0432 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -278,7 +278,7 @@ void EnSt_InitColliders(EnSt* this, PlayState* play) { }; s32 i; - s32 pad; + UNUSED s32 pad; for (i = 0; i < ARRAY_COUNT(cylinders); i++) { Collider_InitCylinder(play, &this->colCylinder[i]); @@ -780,7 +780,7 @@ void EnSt_Sway(EnSt* this) { void EnSt_Init(Actor* thisx, PlayState* play) { EnSt* this = (EnSt*)thisx; - s32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 14.0f); SkelAnime_Init(play, &this->skelAnime, &object_st_Skel_005298, NULL, this->jointTable, this->morphTable, 30); @@ -1008,7 +1008,7 @@ void EnSt_StartOnCeilingOrGround(EnSt* this, PlayState* play) { void EnSt_Update(Actor* thisx, PlayState* play) { EnSt* this = (EnSt*)thisx; - s32 pad; + UNUSED s32 pad; Color_RGBA8 color = { 0, 0, 0, 0 }; if (this->actor.flags & ACTOR_FLAG_15) { 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 7274dbd6fe9..a9a6ebd46fd 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -135,7 +135,7 @@ void EnSth_Init(Actor* thisx, PlayState* play) { } void EnSth_SetupShapeColliderUpdate2AndDraw(EnSth* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); Collider_InitCylinder(play, &this->collider); @@ -146,7 +146,7 @@ void EnSth_SetupShapeColliderUpdate2AndDraw(EnSth* this, PlayState* play) { } void EnSth_SetupAfterObjectLoaded(EnSth* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16* params; EnSth_SetupShapeColliderUpdate2AndDraw(this, play); @@ -178,7 +178,7 @@ void EnSth_WaitForObjectLoaded(EnSth* this, PlayState* play) { } void EnSth_FacePlayer(EnSth* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 diffRot = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; if (ABS(diffRot) <= 0x4000) { @@ -313,7 +313,7 @@ void EnSth_Update(Actor* thisx, PlayState* play) { void EnSth_Update2(Actor* thisx, PlayState* play) { EnSth* this = (EnSth*)thisx; - s32 pad; + UNUSED s32 pad; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); 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 9934941fd57..382ae65b044 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -81,12 +81,12 @@ s32 func_80B0B81C(Vec3f* vortexPosRot, Vec3f* playerPosRot, Vec3f* posDifference void EnStream_SuckPlayer(EnStream* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 pad48; + UNUSED s32 pad48; Vec3f posDifference; f32 xzDist; f32 yDistWithOffset; - s32 pad30; - s32 pad2C; + UNUSED s32 pad30; + UNUSED s32 pad2C; if (func_80B0B81C(&this->actor.world.pos, &player->actor.world.pos, &posDifference, this->actor.scale.y) != 0) { xzDist = sqrtf(SQ(posDifference.x) + SQ(posDifference.z)); @@ -112,7 +112,7 @@ void EnStream_SuckPlayer(EnStream* this, PlayState* play) { void EnStream_WaitForPlayer(EnStream* this, PlayState* play) { Player* player = GET_PLAYER(play); - s16 pad; + UNUSED s16 pad; Vec3f temp; if (func_80B0B81C(&this->actor.world.pos, &player->actor.world.pos, &temp, this->actor.scale.y) != 0) { 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 a55498d3a11..4fb8283bf36 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -74,7 +74,7 @@ s32 func_80B0BE20(EnSw* this, CollisionPoly* poly) { Vec3f sp38; f32 sp34; f32 temp_f0; - s32 pad; + UNUSED s32 pad; this->actor.floorPoly = poly; polyNormal.x = COLPOLY_GET_NORMAL(poly->normal.x); @@ -116,7 +116,7 @@ s32 func_80B0BE20(EnSw* this, CollisionPoly* poly) { CollisionPoly* func_80B0C020(PlayState* play, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3, s32* arg4) { CollisionPoly* sp3C; - s32 pad; + UNUSED s32 pad; if (!BgCheck_EntityLineTest1(&play->colCtx, arg1, arg2, arg3, &sp3C, true, true, true, false, arg4)) { return NULL; @@ -140,7 +140,7 @@ s32 func_80B0C0CC(EnSw* this, PlayState* play, s32 arg2) { Vec3f sp90; Vec3f sp84; Vec3f sp78; - s32 pad; + UNUSED s32 pad; s32 sp70; s32 sp6C; s32 phi_s1; @@ -217,7 +217,7 @@ void EnSw_Init(Actor* thisx, PlayState* play) { EnSw* this = (EnSw*)thisx; s32 phi_v0; Vec3f sp4C = { 0.0f, 0.0f, 0.0f }; - s32 pad; + UNUSED s32 pad; if (thisx->params & 0x8000) { phi_v0 = (((thisx->params - 0x8000) & 0xE000) >> 0xD) + 1; @@ -711,7 +711,7 @@ s32 func_80B0DEA8(EnSw* this, PlayState* play, s32 arg2) { } s32 func_80B0DFFC(EnSw* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; CollisionPoly* sp60; s32 sp5C; Vec3f sp50; @@ -816,7 +816,7 @@ s32 func_80B0E430(EnSw* this, f32 arg1, s16 arg2, s32 arg3, PlayState* play) { } void func_80B0E5E0(EnSw* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; f32 rand; if (func_80B0E430(this, 6.0f, 0x3E8, 1, play)) { @@ -835,7 +835,7 @@ void func_80B0E5E0(EnSw* this, PlayState* play) { void func_80B0E728(EnSw* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; if (DECR(this->unk_442) != 0) { if (func_80B0DEA8(this, play, 1)) { @@ -868,7 +868,7 @@ void func_80B0E728(EnSw* this, PlayState* play) { } void func_80B0E90C(EnSw* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; func_80B0E314(this, this->unk_448, 0.0f); if (this->actor.speedXZ == 0.0f) { @@ -879,7 +879,7 @@ void func_80B0E90C(EnSw* this, PlayState* play) { } void func_80B0E9BC(EnSw* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; if (func_80B0E430(this, 6.0f, 0x3E8, 0, play)) { func_80B0E314(this, this->unk_448, 2.0f); @@ -987,7 +987,7 @@ void func_80B0EDB8(PlayState* play, Color_RGBA8* arg1, s16 arg2, s16 arg3) { } void func_80B0EEA4(PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_sw.c", 2205); diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c index 01f23135b0e..ee788a7cac4 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c @@ -331,7 +331,7 @@ void EnSyatekiItm_EndGame(EnSyatekiItm* this, PlayState* play) { } void EnSyatekiItm_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnSyatekiItm* this = (EnSyatekiItm*)thisx; this->actionFunc(this, play); 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 ccc3bc509e2..61c6e1b952d 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 @@ -150,7 +150,7 @@ static s16 sTextIds[] = { 0x2B, 0x2E, 0xC8, 0x2D }; static s16 sTextBoxCount[] = { TEXT_STATE_CHOICE, TEXT_STATE_EVENT, TEXT_STATE_EVENT, TEXT_STATE_EVENT }; void EnSyatekiMan_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnSyatekiMan* this = (EnSyatekiMan*)thisx; osSyncPrintf("\n\n"); @@ -460,7 +460,7 @@ void EnSyatekiMan_Blink(EnSyatekiMan* this) { } void EnSyatekiMan_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnSyatekiMan* this = (EnSyatekiMan*)thisx; if (this->timer != 0) { @@ -494,7 +494,7 @@ s32 EnSyatekiMan_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, V } void EnSyatekiMan_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnSyatekiMan* this = (EnSyatekiMan*)thisx; Gfx_SetupDL_25Opa(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 857c51810f9..420c2fb09f1 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -511,7 +511,7 @@ void func_80B128F8(EnSyatekiNiw* this, PlayState* play) { } void func_80B129EC(EnSyatekiNiw* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 phi_f2; s16 sp2E; s16 sp2C; @@ -571,7 +571,7 @@ void func_80B12BA4(EnSyatekiNiw* this, PlayState* play) { void EnSyatekiNiw_Update(Actor* thisx, PlayState* play) { EnSyatekiNiw* this = (EnSyatekiNiw*)thisx; - s32 pad; + UNUSED s32 pad; s16 i; Vec3f sp90 = { 0.0f, 0.0f, 0.0f }; Vec3f sp84 = { 0.0f, 0.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index 7228c96bbf2..ceedc1c9fc5 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -1132,7 +1132,7 @@ void func_80B16938(EnTa* this) { void EnTa_Update(Actor* thisx, PlayState* play) { EnTa* this = (EnTa*)thisx; - s32 pad; + UNUSED s32 pad; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); @@ -1207,7 +1207,7 @@ void EnTa_Draw(Actor* thisx, PlayState* play) { gTalonEyeClosedTex, }; EnTa* this = (EnTa*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_ta.c", 2381); 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 64cfc04b335..56240d3a97c 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -359,7 +359,7 @@ void EnTest_ChooseRandomAction(EnTest* this, PlayState* play) { } void EnTest_ChooseAction(EnTest* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); s16 yawDiff = player->actor.shape.rot.y - this->actor.shape.rot.y; @@ -566,9 +566,9 @@ void EnTest_SetupWalkAndBlock(EnTest* this) { } void EnTest_WalkAndBlock(EnTest* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 checkDist = 0.0f; - s32 pad1; + UNUSED s32 pad1; s32 prevFrame; s32 beforeCurFrame; f32 playSpeed; @@ -789,7 +789,7 @@ void func_80860EC0(EnTest* this) { // a variation of sidestep void func_80860F84(EnTest* this, PlayState* play) { s16 playerYaw180; - s32 pad; + UNUSED s32 pad; s32 prevFrame; s32 beforeCurFrame; s16 yawDiff; @@ -1361,12 +1361,12 @@ void func_808627C4(EnTest* this, PlayState* play) { // a variation of sidestep void func_808628C8(EnTest* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); - s32 pad1; + UNUSED s32 pad1; s32 prevFrame; s32 beforeCurFrame; - s32 pad2; + UNUSED s32 pad2; f32 checkDist = 0.0f; s16 newYaw; f32 absPlaySpeed; @@ -1703,7 +1703,7 @@ void EnTest_Update(Actor* thisx, PlayState* play) { EnTest* this = (EnTest*)thisx; f32 oldWeight; u32 floorProperty; - s32 pad; + UNUSED s32 pad; EnTest_UpdateDamage(this, play); @@ -1821,7 +1821,7 @@ void EnTest_Update(Actor* thisx, PlayState* play) { s32 EnTest_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { EnTest* this = (EnTest*)thisx; - s32 pad; + UNUSED s32 pad; if (limbIndex == STALFOS_LIMB_HEAD_ROOT) { rot->x += this->headRot.y; @@ -1862,7 +1862,7 @@ void EnTest_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot Vec3f sp70; Vec3f sp64; EnTest* this = (EnTest*)thisx; - s32 pad; + UNUSED s32 pad; Vec3f sp50; BodyBreak_SetInfo(&this->bodyBreak, limbIndex, 0, 60, 60, dList, BODYBREAK_OBJECT_DEFAULT); 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 eac43e717b8..5d5183afac2 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -139,7 +139,7 @@ void EnTg_SpinIfNotTalking(EnTg* this, PlayState* play) { void EnTg_Update(Actor* thisx, PlayState* play) { EnTg* this = (EnTg*)thisx; - s32 pad; + UNUSED s32 pad; f32 temp; Vec3s sp2C; 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 b047206d92c..73848942207 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -893,7 +893,7 @@ void EnTite_CheckDamage(Actor* thisx, PlayState* play) { void EnTite_Update(Actor* thisx, PlayState* play) { EnTite* this = (EnTite*)thisx; - char pad[0x4]; + UNUSED s32 pad; CollisionPoly* floorPoly; WaterBox* waterBox; f32 waterSurfaceY; 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 473f3d9e66d..487b4cc8ec4 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -478,7 +478,7 @@ void EnTk_DigEff(EnTk* this) { void EnTk_Init(Actor* thisx, PlayState* play) { EnTk* this = (EnTk*)thisx; - s32 pad; + UNUSED s32 pad; ActorShape_Init(&this->actor.shape, 0, ActorShadow_DrawCircle, 24.0f); @@ -654,7 +654,7 @@ void EnTk_Dig(EnTk* this, PlayState* play) { void EnTk_Update(Actor* thisx, PlayState* play) { EnTk* this = (EnTk*)thisx; - s32 pad; + UNUSED s32 pad; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); 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 893af07c3cf..4f88693d3a4 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -127,7 +127,7 @@ void EnTorch2_Init(Actor* thisx, PlayState* play2) { } void EnTorch2_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* this = (Player*)thisx; Effect_Delete(play, this->meleeWeaponEffectIndex); @@ -204,11 +204,11 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { s16 sp66; u8 staggerThreshold; s8 stickY; - s32 pad60; + UNUSED s32 pad60; Actor* attackItem; s16 sp5A; - s16 pad58; - u32 pad54; + UNUSED s16 pad58; + UNUSED s32 pad54; f32 sp50; s16 sp4E; @@ -744,7 +744,7 @@ void EnTorch2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* r void EnTorch2_Draw(Actor* thisx, PlayState* play2) { PlayState* play = play2; Player* this = (Player*)thisx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_torch2.c", 1050); func_80093C80(play); diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c index 86651bac21d..8c1e4201a7b 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c @@ -93,7 +93,7 @@ static Vec3f sMultVec = { 800.0f, 1000.0f, 0.0f }; void EnToryo_Init(Actor* thisx, PlayState* play) { EnToryo* this = (EnToryo*)thisx; - s32 pad; + UNUSED s32 pad; switch (play->sceneNum) { case SCENE_SPOT09: @@ -138,7 +138,7 @@ void EnToryo_Destroy(Actor* thisx, PlayState* play) { } s32 func_80B203D8(EnToryo* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); s32 ret = 1; @@ -211,7 +211,7 @@ s32 func_80B203D8(EnToryo* this, PlayState* play) { } s32 func_80B205CC(EnToryo* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); s32 ret = 5; diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c index 9d11b8c07d5..ca5fe0d502d 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -298,7 +298,7 @@ void EnTp_SetupDie(EnTp* this) { void EnTp_Die(EnTp* this, PlayState* play) { EnTp* now; s16 i; - s32 pad; + UNUSED s32 pad; Vec3f effectVelAccel = { 0.0f, 0.5f, 0.0f }; Vec3f effectPos = { 0.0f, 0.0f, 0.0f }; @@ -374,7 +374,7 @@ void EnTp_Head_SetupTakeOff(EnTp* this) { * Flies up and loops around until it makes for Player */ void EnTp_Head_TakeOff(EnTp* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); Math_SmoothStepToF(&this->actor.speedXZ, 2.5f, 0.1f, 0.2f, 0.0f); @@ -646,7 +646,7 @@ void EnTp_UpdateDamage(EnTp* this, PlayState* play) { } void EnTp_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnTp* this = (EnTp*)thisx; Vec3f kiraVelocity = { 0.0f, 0.0f, 0.0f }; Vec3f kiraAccel = { 0.0f, -0.6f, 0.0f }; @@ -729,7 +729,7 @@ void EnTp_Update(Actor* thisx, PlayState* play) { } void EnTp_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnTp* this = (EnTp*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_tp.c", 1451); diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c index 5d0b633454b..ea4154829ef 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -372,7 +372,7 @@ void EnTr_ChooseAction1(EnTr* this, PlayState* play) { } void EnTr_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnTr* this = (EnTr*)thisx; Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2); @@ -426,7 +426,7 @@ s32 EnTr_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* po } void EnTr_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnTr* this = (EnTr*)thisx; if (1) {} diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c index 2df3f1e891f..aa1f5dd2a7c 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c @@ -128,7 +128,7 @@ void EnTrap_Update(Actor* thisx, PlayState* play) { s16 angleToCollidedActor; s16 touchingActor; s16 blockedOnReturn; - s32 pad; + UNUSED s32 pad; s16 angleToWall; Vec3f icePos; Vec3f posAhead; 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 f47c91b2774..82e4431eb5d 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 @@ -271,7 +271,7 @@ void EnTuboTrap_Fly(EnTuboTrap* this, PlayState* play) { void EnTuboTrap_Update(Actor* thisx, PlayState* play) { EnTuboTrap* this = (EnTuboTrap*)thisx; - s32 pad; + UNUSED s32 pad; this->actionFunc(this, play); Actor_MoveForward(&this->actor); diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/src/overlays/actors/ovl_En_Vali/z_en_vali.c index 405fd4136fe..46ebd6bd86e 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -134,7 +134,7 @@ static InitChainEntry sInitChain[] = { }; void EnVali_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnVali* this = (EnVali*)thisx; s32 bgId; @@ -536,7 +536,7 @@ void EnVali_UpdateDamage(EnVali* this, PlayState* play) { } void EnVali_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnVali* this = (EnVali*)thisx; if ((this->bodyCollider.base.atFlags & AT_HIT) || (this->leftArmCollider.base.atFlags & AT_HIT) || @@ -784,7 +784,7 @@ static Gfx D_80B289A8[] = { }; void EnVali_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnVali* this = (EnVali*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_vali.c", 1505); diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index cbe807cc909..f42ac4fffa7 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -49,9 +49,9 @@ static ColliderCylinderInit sCylinderInit = { }; void EnVbBall_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnVbBall* this = (EnVbBall*)thisx; - s32 pad2; + UNUSED s32 pad2; f32 angle; if (this->actor.params >= 200) { // Volvagia's bones @@ -76,7 +76,7 @@ void EnVbBall_Init(Actor* thisx, PlayState* play) { } void EnVbBall_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnVbBall* this = (EnVbBall*)thisx; if (this->actor.params < 200) { @@ -297,7 +297,7 @@ void EnVbBall_Update(Actor* thisx, PlayState* play2) { } void EnVbBall_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnVbBall* this = (EnVbBall*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_vb_ball.c", 604); 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 629ec18f4d2..ea5961882df 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -605,7 +605,7 @@ s32 EnViewer_ZeldaOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, } void EnViewer_ZeldaPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { - s32 pad; + UNUSED s32 pad; if (play->sceneNum == SCENE_TOKINOMA) { if (limbIndex == 16) { @@ -691,7 +691,7 @@ static EnViewerDrawFunc sDrawFuncs[] = { void EnViewer_Draw(Actor* thisx, PlayState* play) { EnViewer* this = (EnViewer*)thisx; - s32 pad; + UNUSED s32 pad; s16 type; OPEN_DISPS(play->state.gfxCtx, "../z_en_viewer.c", 1760); 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 550860379be..3f58b5329c8 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -177,7 +177,7 @@ void EnVm_Wait(EnVm* this, PlayState* play) { Player* player = GET_PLAYER(play); f32 dist; s16 headRot; - s16 pad; + UNUSED s16 pad; s16 pitch; switch (this->unk_25E) { @@ -468,7 +468,7 @@ void EnVm_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, Vec3f sp80 = D_80B2EAF8; Vec3f sp74 = D_80B2EB04; Vec3f sp68 = D_80B2EB10; - s32 pad; + UNUSED s32 pad; Vec3f posResult; CollisionPoly* poly; s32 bgId; diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c index 58eef0e15dd..d126e304267 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c @@ -64,7 +64,7 @@ void EnWallTubo_FindGirl(EnWallTubo* this, PlayState* play) { void EnWallTubo_DetectChu(EnWallTubo* this, PlayState* play) { EnBomChu* chu; - s32 pad; + UNUSED s32 pad; Vec3f effAccel = { 0.0f, 0.1f, 0.0f }; Vec3f effVelocity = { 0.0f, 0.0f, 0.0f }; Vec3f chuPosDiff; 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 304e83a6775..0c533e7725e 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -533,7 +533,7 @@ void EnWallmas_ColUpdate(EnWallmas* this, PlayState* play) { void EnWallmas_Update(Actor* thisx, PlayState* play) { EnWallmas* this = (EnWallmas*)thisx; - char pad[4]; + UNUSED s32 pad; EnWallmas_ColUpdate(this, play); this->actionFunc(this, play); @@ -577,7 +577,7 @@ void EnWallmas_Update(Actor* thisx, PlayState* play) { } void EnWallmas_DrawXlu(EnWallmas* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 xzScale; MtxF mf; 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 9d03e485d2e..527d5839542 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 @@ -129,7 +129,7 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) { u8 WeatherTag_CheckEnableWeatherEffect(EnWeatherTag* this, PlayState* play, u8 skyboxConfig, u8 changeSkyboxNextConfig, u8 lightConfig, u8 changeLightNextConfig, u16 changeDuration, u8 weatherMode) { - s32 pad; + UNUSED s32 pad; u8 ret = false; Player* player = GET_PLAYER(play); @@ -170,7 +170,7 @@ u8 WeatherTag_CheckEnableWeatherEffect(EnWeatherTag* this, PlayState* play, u8 s u8 WeatherTag_CheckRestoreWeather(EnWeatherTag* this, PlayState* play, u8 skyboxConfig, u8 changeSkyboxNextConfig, u8 lightConfig, u8 changeLightNextConfig, u16 changeDuration) { - s32 pad; + UNUSED s32 pad; u8 ret = false; Player* player = GET_PLAYER(play); diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c index 24bd6293fe1..9c9cdb17a08 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -582,7 +582,7 @@ void func_80B3368C(EnWeiyer* this, PlayState* play) { void EnWeiyer_Update(Actor* thisx, PlayState* play) { EnWeiyer* this = (EnWeiyer*)thisx; - s32 pad; + UNUSED s32 pad; this->actor.home.pos.y = this->actor.yDistToWater + this->actor.world.pos.y - 5.0f; func_80B3368C(this, play); 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 2aef3c07dcb..764f65a3ad2 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -209,7 +209,7 @@ void EnWf_SetupAction(EnWf* this, EnWfActionFunc actionFunc) { } void EnWf_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnWf* this = (EnWf*)thisx; Actor_ProcessInitChain(thisx, sInitChain); @@ -282,7 +282,7 @@ void EnWf_Destroy(Actor* thisx, PlayState* play) { s32 EnWf_ChangeAction(PlayState* play, EnWf* this, s16 mustChoose) { Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; s16 wallYawDiff; s16 playerYawDiff; Actor* explosive; @@ -419,7 +419,7 @@ void EnWf_SetupWait(EnWf* this) { void EnWf_Wait(EnWf* this, PlayState* play) { Player* player; - s32 pad; + UNUSED s32 pad; s16 angle; player = GET_PLAYER(play); @@ -492,7 +492,7 @@ void EnWf_SetupRunAtPlayer(EnWf* this, PlayState* play) { void EnWf_RunAtPlayer(EnWf* this, PlayState* play) { s32 prevFrame; s32 beforeCurFrame; - s32 pad; + UNUSED s32 pad; f32 baseRange = 0.0f; s16 playerFacingAngleDiff; Player* player = GET_PLAYER(play); @@ -631,7 +631,7 @@ void EnWf_SetupRunAroundPlayer(EnWf* this) { void EnWf_RunAroundPlayer(EnWf* this, PlayState* play) { s16 angle1; s16 angle2; - s32 pad; + UNUSED s32 pad; f32 baseRange = 0.0f; s32 prevFrame; s32 beforeCurFrame; @@ -1010,7 +1010,7 @@ void EnWf_SetupBlocking(EnWf* this) { void EnWf_Blocking(EnWf* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; if (this->actionTimer != 0) { this->actionTimer--; @@ -1296,7 +1296,7 @@ void EnWf_UpdateDamage(EnWf* this, PlayState* play) { } void EnWf_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnWf* this = (EnWf*)thisx; EnWf_UpdateDamage(this, play); @@ -1471,7 +1471,7 @@ s32 EnWf_DodgeRanged(PlayState* play, EnWf* this) { if (actor != NULL) { s16 angleToFacing; - s16 pad; + UNUSED s16 pad; f32 dist; angleToFacing = Actor_WorldYawTowardActor(&this->actor, actor) - this->actor.shape.rot.y; diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c index 9c4191277bf..59c582ec002 100644 --- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c +++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c @@ -57,7 +57,7 @@ static Vec3f sTagPointsFree[9]; static Vec3f sTagPointsOrdered[9]; void EnWonderItem_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnWonderItem* this = (EnWonderItem*)thisx; if ((this->collider.dim.radius != 0) || (this->collider.dim.height != 0)) { @@ -111,7 +111,7 @@ void EnWonderItem_Init(Actor* thisx, PlayState* play) { DMG_BOOMERANG, DMG_HOOKSHOT, }; - s32 pad; + UNUSED s32 pad; s16 colTypeIndex; EnWonderItem* this = (EnWonderItem*)thisx; s16 rotZover10; @@ -337,7 +337,7 @@ void EnWonderItem_Update(Actor* thisx, PlayState* play) { 255, 255, 0, 255, 0, 255, 0, 255, 255, 255, 0, 0, 0, 255, 0, 0, 0, 255, 128, 128, 128, 128, 128, 0, 128, 0, 128, 0, 128, 0, 128, 0, 0, 0, 128, 0, 0, 0, 128, }; // These seem to be mistyped. Logically they should be s16[13][3] and be indexed as [colorIndex][i] - s32 pad; + UNUSED s32 pad; EnWonderItem* this = (EnWonderItem*)thisx; s32 colorIndex; diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c index f3f9ba57885..7a6aa9a37c5 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c @@ -37,7 +37,7 @@ void EnWonderTalk2_Destroy(Actor* thisx, PlayState* play) { } void EnWonderTalk2_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnWonderTalk2* this = (EnWonderTalk2*)thisx; osSyncPrintf("\n\n"); @@ -268,7 +268,7 @@ void EnWonderTalk2_DoNothing(EnWonderTalk2* this, PlayState* play) { } void EnWonderTalk2_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnWonderTalk2* this = (EnWonderTalk2*)thisx; this->actionFunc(this, play); 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 ef1161dda9f..2bd5ecc2b03 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -308,7 +308,7 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) { f32 wobbleAmplitude; u8 new_var; u8 phi_v0; - s32 pad; + UNUSED s32 pad; Vec3f dropsSpawnPt; s32 i; s32 leavesParams; diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index edf81820d5d..b0904f84f0e 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -63,7 +63,7 @@ void EnXc_InitCollider(Actor* thisx, PlayState* play) { void EnXc_UpdateCollider(Actor* thisx, PlayState* play) { EnXc* this = (EnXc*)thisx; Collider* colliderBase = &this->collider.base; - s32 pad[3]; + UNUSED s32 pad[3]; Collider_UpdateCylinder(thisx, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, colliderBase); @@ -84,7 +84,7 @@ void EnXc_CalculateHeadTurn(EnXc* this, PlayState* play) { } void EnXc_SetEyePattern(EnXc* this) { - s32 pad[3]; + UNUSED s32 pad[3]; s16* blinkTimer = &this->blinkTimer; s16* eyePattern = &this->eyeIdx; @@ -99,7 +99,7 @@ void EnXc_SetEyePattern(EnXc* this) { } void EnXc_SpawnNut(EnXc* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f* pos = &this->actor.world.pos; s16 angle = this->actor.shape.rot.y; f32 x = (Math_SinS(angle) * 30.0f) + pos->x; @@ -184,7 +184,7 @@ void func_80B3C620(EnXc* this, PlayState* play, s32 npcActionIdx) { } void EnXc_ChangeAnimation(EnXc* this, AnimationHeader* animation, u8 mode, f32 morphFrames, s32 reverseFlag) { - s32 pad[2]; + UNUSED s32 pad[2]; AnimationHeader* animationSeg = SEGMENTED_TO_VIRTUAL(animation); f32 frameCount = Animation_GetLastFrame(&animationSeg->common); f32 playbackSpeed; @@ -365,9 +365,9 @@ void EnXc_DoNothing(EnXc* this, PlayState* play) { } void EnXc_SetWalkingSFX(EnXc* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; u32 sfxId; - s32 pad2; + UNUSED s32 pad2; if (Animation_OnFrame(&this->skelAnime, 11.0f) || Animation_OnFrame(&this->skelAnime, 23.0f)) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { @@ -379,9 +379,9 @@ void EnXc_SetWalkingSFX(EnXc* this, PlayState* play) { } void EnXc_SetNutThrowSFX(EnXc* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; u32 sfxId; - s32 pad2; + UNUSED s32 pad2; if (Animation_OnFrame(&this->skelAnime, 7.0f)) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { @@ -426,7 +426,7 @@ void EnXc_SetColossusAppearSFX(EnXc* this, PlayState* play) { func_80078914(&sXyzDist, NA_SE_EV_JUMP_CONC); } else if (frameCount == 164) { Vec3f pos = { -1069.0f, 38.0f, 0.0f }; - s32 pad; + UNUSED s32 pad; SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &pos, &sXyzDist, wDest); func_80078914(&sXyzDist, NA_SE_PL_WALK_CONCRETE); @@ -451,7 +451,7 @@ void EnXc_SetColossusWindSFX(PlayState* play) { static Vec3f sPos = { 0.0f, 0.0f, 0.0f }; static f32 sMaxSpeed = 0.0f; static Vec3f D_80B42DB0; - s32 pad; + UNUSED s32 pad; s16 sceneNum = play->sceneNum; if (sceneNum == SCENE_SPOT11) { @@ -459,7 +459,7 @@ void EnXc_SetColossusWindSFX(PlayState* play) { u16 frameCount = csCtx->frames; if ((frameCount >= 120) && (frameCount < 164)) { - s32 pad; + UNUSED s32 pad; Vec3f* eye = &play->view.eye; if (D_80B41D90 != 0) { @@ -519,7 +519,7 @@ void EnXc_DestroyFlame(EnXc* this) { void EnXc_InitFlame(EnXc* this, PlayState* play) { static s32 D_80B41DA8 = 1; - s32 pad; + UNUSED s32 pad; s16 sceneNum = play->sceneNum; if (sceneNum == SCENE_SPOT17) { @@ -631,14 +631,14 @@ void func_80B3D750(EnXc* this, PlayState* play) { } void EnXc_SetupFallFromSkyAction(EnXc* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; CutsceneContext* csCtx = &play->csCtx; if (csCtx->state != 0) { CsCmdActorAction* npcAction = csCtx->npcActions[4]; if (npcAction && npcAction->action == 2) { - s32 pad; + UNUSED s32 pad; Vec3f* pos = &this->actor.world.pos; SkelAnime* skelAnime = &this->skelAnime; f32 frameCount = Animation_GetLastFrame(&gSheikFallingFromSkyAnim); @@ -738,7 +738,7 @@ void EnXc_SetupInitialHarpAction(EnXc* this, s32 animFinished) { } void EnXc_SetupPlayingHarpAction(EnXc* this, PlayState* play, s32 animFinished) { - s32 pad; + UNUSED s32 pad; SkelAnime* skelAnime; AnimationHeader* animation; f32 frameCount; @@ -1068,12 +1068,12 @@ s32 EnXc_HarpOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f void EnXc_DrawPullingOutHarp(Actor* thisx, PlayState* play) { EnXc* this = (EnXc*)thisx; - s32 pad; + UNUSED s32 pad; s16 eyePattern = this->eyeIdx; void* eyeTexture = sEyeTextures[eyePattern]; SkelAnime* skelAnime = &this->skelAnime; GraphicsContext* gfxCtx = play->state.gfxCtx; - s32 pad2; + UNUSED s32 pad2; OPEN_DISPS(gfxCtx, "../z_en_oA2_inSpot05.c", 1444); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); @@ -1090,12 +1090,12 @@ void EnXc_DrawPullingOutHarp(Actor* thisx, PlayState* play) { void EnXc_DrawHarp(Actor* thisx, PlayState* play) { EnXc* this = (EnXc*)thisx; - s32 pad; + UNUSED s32 pad; s16 eyePattern = this->eyeIdx; void* eyeTexture = sEyeTextures[eyePattern]; SkelAnime* skelAnime = &this->skelAnime; GraphicsContext* gfxCtx = play->state.gfxCtx; - s32 pad2; + UNUSED s32 pad2; OPEN_DISPS(gfxCtx, "../z_en_oA2_inSpot05.c", 1511); @@ -1529,7 +1529,7 @@ void EnXc_PlayTriforceSFX(Actor* thisx, PlayState* play) { EnXc* this = (EnXc*)thisx; if (this->unk_2A8) { - s32 pad; + UNUSED s32 pad; Vec3f src; Vec3f pos; Vec3f sp1C = { 0.0f, 0.0f, 0.0f }; @@ -1688,7 +1688,7 @@ s32 EnXc_TriforceOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, V } void EnXc_TriforcePostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { - s32 pad[2]; + UNUSED s32 pad[2]; EnXc* this = (EnXc*)thisx; if (limbIndex == 15) { @@ -1701,12 +1701,12 @@ void EnXc_TriforcePostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3 void EnXc_DrawTriforce(Actor* thisx, PlayState* play) { EnXc* this = (EnXc*)thisx; - s32 pad; + UNUSED s32 pad; s16 eyeIdx = this->eyeIdx; void* eyeTexture = sEyeTextures[eyeIdx]; SkelAnime* skelAnime = &this->skelAnime; GraphicsContext* gfxCtx = play->state.gfxCtx; - s32 pad2; + UNUSED s32 pad2; OPEN_DISPS(gfxCtx, "../z_en_oA2_inMetamol.c", 565); if (this->unk_2BC != 0) { @@ -1782,7 +1782,7 @@ void func_80B406F8(Actor* thisx) { } void EnXc_SetupIdleInNocturne(EnXc* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; ActorShape* actorShape = &this->actor.shape; SkelAnime* skelAnime = &this->skelAnime; f32 frameCount = Animation_GetLastFrame(&gSheikIdleAnim); @@ -1806,7 +1806,7 @@ void EnXc_SetupDefenseStance(Actor* thisx) { } void EnXc_SetupContortions(EnXc* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; SkelAnime* skelAnime = &this->skelAnime; f32 frameCount = Animation_GetLastFrame(&gSheikIdleAnim); @@ -1821,7 +1821,7 @@ void EnXc_SetupContortions(EnXc* this, PlayState* play) { } void EnXc_SetupFallInNocturne(EnXc* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; SkelAnime* skelAnime = &this->skelAnime; f32 frameCount = Animation_GetLastFrame(&gSheikIdleAnim); @@ -1836,7 +1836,7 @@ void EnXc_SetupFallInNocturne(EnXc* this, PlayState* play) { } void EnXc_SetupHittingGroundInNocturne(EnXc* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; f32 frameCount = Animation_GetLastFrame(&gSheikHittingGroundAnim); func_80B3C9DC(this); @@ -1848,7 +1848,7 @@ void EnXc_SetupHittingGroundInNocturne(EnXc* this, PlayState* play) { } void func_80B40A78(EnXc* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; f32 frameCount = Animation_GetLastFrame(&gSheikHittingGroundAnim); func_80B3C9DC(this); @@ -1860,7 +1860,7 @@ void func_80B40A78(EnXc* this, PlayState* play) { } void EnXc_SetupKneelInNocturne(EnXc* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; f32 frameCount = Animation_GetLastFrame(&gSheikKneelingAnim); func_80B3C9DC(this); @@ -1872,7 +1872,7 @@ void EnXc_SetupKneelInNocturne(EnXc* this, PlayState* play) { } void func_80B40BB4(EnXc* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; f32 frameCount = Animation_GetLastFrame(&gSheikIdleAnim); func_80B3C9DC(this); func_80B3C588(this, play, 4); @@ -2375,7 +2375,7 @@ void EnXc_DrawNothing(Actor* thisx, PlayState* play) { } void EnXc_DrawDefault(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnXc* this = (EnXc*)thisx; s16 eyeIdx = this->eyeIdx; void* eyeSegment = sEyeTextures[eyeIdx]; diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c index cbe955756c2..da0f1d546e0 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c @@ -119,7 +119,7 @@ void func_80B42F74(EnYabusameMark* this, PlayState* play) { Vec3f effectVelocity = { 0.0f, 0.0f, 0.0f }; Vec3f arrowHitPos; Vec3f distanceFromCenter; - s32 pad; + UNUSED s32 pad; s32 scoreIndex; f32 scoreDistance100; f32 scoreDistance60; diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index 19e1356de05..8ab6342d12e 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -114,7 +114,7 @@ void EnYukabyun_Break(EnYukabyun* this, PlayState* play) { void EnYukabyun_Update(Actor* thisx, PlayState* play) { EnYukabyun* this = (EnYukabyun*)thisx; - s32 pad; + UNUSED s32 pad; if (((this->collider.base.atFlags & AT_HIT) || (this->collider.base.acFlags & AC_HIT) || ((this->collider.base.ocFlags1 & OC1_HIT) && !(this->collider.base.oc->id == ACTOR_EN_YUKABYUN))) || diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index a94eb159033..4de5fd10ebf 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -275,7 +275,7 @@ s16 EnZf_SecondaryFloorCheck(EnZf* this, PlayState* play, f32 dist) { } void EnZf_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnZf* this = (EnZf*)thisx; Player* player = GET_PLAYER(play); EffectBlureInit1 blureInit; @@ -705,7 +705,7 @@ void func_80B45384(EnZf* this) { void func_80B4543C(EnZf* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; s16 angleToPlayer = (this->actor.yawTowardsPlayer - this->headRot) - this->actor.shape.rot.y; angleToPlayer = ABS(angleToPlayer); @@ -974,7 +974,7 @@ void func_80B4604C(EnZf* this) { } void func_80B46098(EnZf* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 phi_f2; Player* player = GET_PLAYER(play); s16 temp_v0; @@ -1051,7 +1051,7 @@ void func_80B462E4(EnZf* this, PlayState* play) { void func_80B463E4(EnZf* this, PlayState* play) { s16 angleBehindPlayer; s16 phi_v0_3; - s32 pad; + UNUSED s32 pad; s32 prevFrame; s32 beforeCurFrame; s32 absPlaySpeed; @@ -1474,10 +1474,10 @@ void EnZf_HopAway(EnZf* this, PlayState* play) { f32 sp74; f32 sp70 = 1.0f; f32 phi_f20 = 550.0f; - s32 pad; + UNUSED s32 pad; f32 phi_f20_2; f32 phi_f0; - s32 pad2; + UNUSED s32 pad2; s16 sp5A; s32 sp54; s32 temp_v1_2; @@ -1990,7 +1990,7 @@ void EnZf_UpdateHeadRotation(EnZf* this, PlayState* play) { } void EnZf_UpdateDamage(EnZf* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 dropParams; if ((this->bodyCollider.base.acFlags & AC_HIT) && (this->action <= ENZF_ACTION_STUNNED)) { @@ -2037,9 +2037,9 @@ void EnZf_UpdateDamage(EnZf* this, PlayState* play) { } void EnZf_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnZf* this = (EnZf*)thisx; - s32 pad2; + UNUSED s32 pad2; EnZf_UpdateDamage(this, play); if (this->actor.colChkInfo.damageEffect != ENZF_DMGEFF_IMMUNE) { @@ -2247,7 +2247,7 @@ static Gfx D_80B4A2F8[] = { }; void EnZf_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnZf* this = (EnZf*)thisx; ; // Extra ";" required for matching. Cannot be if (1) {} or the like. Typo? 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 37e4305a81c..9279b6c9c68 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -138,7 +138,7 @@ void func_80B4AE18(EnZl1* this) { void func_80B4AF18(EnZl1* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; Actor_TrackPlayer(play, &this->actor, &this->unk_200, &this->unk_206, this->actor.focus.pos); @@ -158,9 +158,9 @@ void func_80B4AF18(EnZl1* this, PlayState* play) { void func_80B4B010(EnZl1* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 pad2; - s32 pad3; - s32 pad; + UNUSED s32 pad2; + UNUSED s32 pad3; + UNUSED s32 pad; Vec3f subCamAt = { -460.0f, 118.0f, 0.0f }; Vec3f subCamEye = { -406.0f, 110.0f, 0.0f }; Vec3f playerPos = { -398.0f, 84.0f, 0.0f }; @@ -199,10 +199,10 @@ void func_80B4B010(EnZl1* this, PlayState* play) { void func_80B4B240(EnZl1* this, PlayState* play) { Vec3f subCamAt = { -427.0f, 108.0, 26.0 }; Vec3f subCamEye = { -340.0f, 108.0f, 98.0f }; - s32 pad; + UNUSED s32 pad; Vec3f sp58 = { -434.0f, 84.0f, 0.0f }; u8 sp54[] = { 0x00, 0x00, 0x02 }; - s32 pad2; + UNUSED s32 pad2; Player* player = GET_PLAYER(play); AnimationHeader* animHeaderSeg; MessageContext* msgCtx = &play->msgCtx; @@ -367,13 +367,13 @@ void func_80B4B8B4(EnZl1* this, PlayState* play) { }; Vec3f subCamAt = { -421.0f, 143.0f, -5.0f }; Vec3f subCamEye = { -512.0f, 105.0f, -4.0f }; - s32 pad2; + UNUSED s32 pad2; f32 actionLength; CsCmdActorAction* npcAction; Vec3f sp74; Vec3f sp68; Vec3f velocity = { 0.0f, 0.0f, 0.0f }; - s32 pad; + UNUSED s32 pad; f32 frameCount; Vec3f sp48; @@ -417,7 +417,7 @@ void func_80B4B8B4(EnZl1* this, PlayState* play) { } void func_80B4BBC4(EnZl1* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 frameCount = Animation_GetLastFrame(&gChildZelda1Anim_00438); Player* player = GET_PLAYER(play); @@ -446,13 +446,13 @@ void func_80B4BC78(EnZl1* this, PlayState* play) { u8 sp84[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, }; - s32 pad2; + UNUSED s32 pad2; f32 actionLength; Vec3f sp70; Vec3f sp64; Vec3f velocity = { 0.0f, 0.0f, 0.0f }; CsCmdActorAction* npcAction; - s32 pad; + UNUSED s32 pad; f32 frameCount; if (SkelAnime_Update(&this->skelAnime) && (this->skelAnime.animation == &gChildZelda1Anim_10B38)) { @@ -489,7 +489,7 @@ void func_80B4BC78(EnZl1* this, PlayState* play) { } void func_80B4BF2C(EnZl1* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; MessageContext* msgCtx = &play->msgCtx; Player* player = GET_PLAYER(play); @@ -566,7 +566,7 @@ void func_80B4BF2C(EnZl1* this, PlayState* play) { } void EnZl1_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnZl1* this = (EnZl1*)thisx; if ((this->actionFunc != func_80B4B8B4) && (this->actionFunc != func_80B4BC78)) { diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index a7492d3d737..5405079e073 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -104,7 +104,7 @@ void EnZl2_Destroy(Actor* thisx, PlayState* play) { } void EnZl2_UpdateEyes(EnZl2* this) { - s32 pad[4]; + UNUSED s32 pad[4]; s16* eyeTexIndex2 = &this->eyeTexIndex2; s16* blinkTimer = &this->blinkTimer; s16* eyeTexIndex = &this->eyeTexIndex; @@ -433,12 +433,12 @@ void func_80B4F230(EnZl2* this, s16 arg1, s32 arg2) { } s32 func_80B4F45C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) { - s32 pad; + UNUSED s32 pad; EnZl2* this = (EnZl2*)thisx; Mtx* sp74; MtxF sp34; Vec3s sp2C; - s16 pad2; + UNUSED s16 pad2; s16* unk_1DC = this->unk_1DC; if (limbIndex == 14) { @@ -533,7 +533,7 @@ s32 func_80B4F45C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s void EnZl2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) { EnZl2* this = (EnZl2*)thisx; - s32 pad[2]; + UNUSED s32 pad[2]; if (limbIndex == 10) { if ((this->unk_254 != 0) && (play->csCtx.frames >= 900)) { @@ -738,7 +738,7 @@ void func_80B50278(EnZl2* this, PlayState* play) { } void func_80B50304(EnZl2* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; ActorShape* shape = &this->actor.shape; CsCmdActorAction* npcAction = EnZl2_GetNpcAction(play, 0); f32 actionXDelta; @@ -1430,7 +1430,7 @@ void func_80B51D0C(EnZl2* this, PlayState* play) { } void func_80B51D24(EnZl2* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; u32 sfxId; SkelAnime* skelAnime = &this->skelAnime; @@ -1481,7 +1481,7 @@ void func_80B51EA8(EnZl2* this) { void func_80B51EBC(EnZl2* this, PlayState* play) { ActorShape* shape = &this->actor.shape; CsCmdActorAction* npcAction = EnZl2_GetNpcAction(play, 0); - s32 pad[2]; + UNUSED s32 pad[2]; this->actor.world.rot.y = shape->rot.y = npcAction->rot.y; func_80B4FD00(this, &gZelda2Anime1Anim_00B224, 0, 0.0f, 0); @@ -1565,10 +1565,10 @@ void func_80B52114(EnZl2* this, PlayState* play) { } void func_80B521A0(EnZl2* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; ObjectContext* objectCtx = &play->objectCtx; s32 bankIndex = Object_GetIndex(objectCtx, OBJECT_ZL2_ANIME1); - s32 pad2; + UNUSED s32 pad2; if (bankIndex < 0) { osSyncPrintf(VT_FGCOL(RED) "En_Zl2_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" VT_RST); @@ -1596,7 +1596,7 @@ void EnZl2_Update(Actor* thisx, PlayState* play) { void EnZl2_Init(Actor* thisx, PlayState* play) { EnZl2* this = (EnZl2*)thisx; ActorShape* shape = &thisx->shape; - s32 pad; + UNUSED s32 pad; ActorShape_Init(shape, 0.0f, ActorShadow_DrawCircle, 30.0f); shape->shadowAlpha = 0; @@ -1628,7 +1628,7 @@ void func_80B523BC(EnZl2* this, PlayState* play) { } void func_80B523C8(EnZl2* this, PlayState* play) { - s32 pad[3]; + UNUSED s32 pad[3]; s16 eyeTexIndex = this->eyeTexIndex; s16 eyeTexIndex2 = this->eyeTexIndex2; void* eyeTex = sEyeTextures[eyeTexIndex]; @@ -1636,7 +1636,7 @@ void func_80B523C8(EnZl2* this, PlayState* play) { SkelAnime* skelAnime = &this->skelAnime; s16 mouthTexIndex = this->mouthTexIndex; void* mouthTex = sMouthTextures[mouthTexIndex]; - s32 pad1; + UNUSED s32 pad1; OPEN_DISPS(play->state.gfxCtx, "../z_en_zl2.c", 1623); @@ -1655,13 +1655,13 @@ void func_80B523C8(EnZl2* this, PlayState* play) { } void func_80B525D4(EnZl2* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s16 eyeTexIndex = this->eyeTexIndex; void* eyeTex = sEyeTextures[eyeTexIndex]; s16 mouthTexIndex = this->mouthTexIndex; SkelAnime* skelAnime = &this->skelAnime; void* mouthTex = sMouthTextures[mouthTexIndex]; - s32 pad1; + UNUSED s32 pad1; OPEN_DISPS(play->state.gfxCtx, "../z_en_zl2.c", 1663); diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index cbed9c5109c..8dd56da2cf9 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -73,7 +73,7 @@ void func_80B533B0(Actor* thisx, PlayState* play) { void func_80B533FC(EnZl3* this, PlayState* play) { ColliderCylinder* collider = &this->collider; - s32 pad[4]; + UNUSED s32 pad[4]; Collider_UpdateCylinder(&this->actor, collider); CollisionCheck_SetOC(play, &play->colChkCtx, &collider->base); @@ -105,7 +105,7 @@ BossGanon2* func_80B53488(EnZl3* this, PlayState* play) { } void EnZl3_UpdateEyes(EnZl3* this) { - s32 pad[2]; + UNUSED s32 pad[2]; s16* eyeTexIndex = &this->eyeTexIndex; s16* blinkTimer = &this->blinkTimer; @@ -149,7 +149,7 @@ void func_80B536B4(EnZl3* this) { } void func_80B536C4(EnZl3* this) { - s32 pad[2]; + UNUSED s32 pad[2]; Vec3s* vec1 = &this->unk_3F8.unk_08; Vec3s* vec2 = &this->unk_3F8.unk_0E; @@ -172,7 +172,7 @@ s32 func_80B537E8(EnZl3* this) { s16* rotY = &this->actor.world.rot.y; s16* unk_3D0 = &this->unk_3D0; s16 retVal; - s16 pad[2]; + UNUSED s16 pad[2]; Math_SmoothStepToS(unk_3D0, ABS((s16)(yawTowardsPlayer - *rotY)), 5, 6200, 100); retVal = Math_SmoothStepToS(rotY, yawTowardsPlayer, 5, *unk_3D0, 100); @@ -596,7 +596,7 @@ void func_80B54360(EnZl3* this, s16 arg1, s32 arg2) { } s32 func_80B5458C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) { - s32 pad[3]; + UNUSED s32 pad[3]; EnZl3* this = (EnZl3*)thisx; s16* unk_28C = this->unk_28C; Mtx* sp78; @@ -700,9 +700,9 @@ s32 func_80B5458C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s void EnZl3_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) { EnZl3* this = (EnZl3*)thisx; - s32 pad; + UNUSED s32 pad; Vec3f sp34; - s32 pad2; + UNUSED s32 pad2; Vec3f sp24; Vec3f sp18; @@ -1029,7 +1029,7 @@ void func_80B5585C(EnZl3* this) { } void func_80B558A8(EnZl3* this) { - s32 pad[4]; + UNUSED s32 pad[4]; s16 thisRotY = this->actor.world.rot.y; Vec3f* unk_338 = &this->unk_338; @@ -1551,7 +1551,7 @@ void func_80B56DEC(EnZl3* this) { } void func_80B56E38(EnZl3* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s32 sfxId; SkelAnime* sp20 = &this->skelAnime; @@ -1634,9 +1634,9 @@ s16 func_80B57104(EnZl3* this, s32 arg1) { } s32 func_80B571A8(EnZl3* this) { - s32 pad; + UNUSED s32 pad; s32 unk_314 = this->unk_314; - s32 pad2; + UNUSED s32 pad2; if (func_80B56F8C(this, unk_314 + 1) == 0) { return this->actor.shape.rot.y; @@ -1646,7 +1646,7 @@ s32 func_80B571A8(EnZl3* this) { } s32 func_80B571FC(EnZl3* this) { - s32 pad; + UNUSED s32 pad; s32 unk_314 = this->unk_314; if (func_80B56F8C(this, unk_314) == 0) { @@ -1729,7 +1729,7 @@ s32 func_80B57458(EnZl3* this, PlayState* play) { f32 thisZ = thisPos->z; Player* player = GET_PLAYER(play); Vec3f* playerPos = &player->actor.world.pos; - s32 pad; + UNUSED s32 pad; f32 playerX = playerPos->x; f32 playerZ = playerPos->z; f32 temp_f12 = playerX - thisX; @@ -1820,7 +1820,7 @@ void func_80B57754(EnZl3* this, PlayState* play) { } void func_80B577BC(PlayState* play, Vec3f* vec) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); Vec3f* playerPos = &player->actor.world.pos; f32 posX = vec->x; @@ -1837,7 +1837,7 @@ void func_80B57858(PlayState* play) { } s32 func_80B57890(EnZl3* this, PlayState* play) { - s8 pad[2]; + UNUSED s8 pad[2]; u8 curSpawn = play->curSpawn; s16 sceneNum = play->sceneNum; s32 result = func_80B54DB4(this); @@ -1905,9 +1905,9 @@ void func_80B57AAC(EnZl3* this, s32 arg1, AnimationHeader* arg2) { } void func_80B57AE0(EnZl3* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 shapeRotY = this->actor.shape.rot.y; - s32 pad2; + UNUSED s32 pad2; Vec3f* unk_354 = &this->unk_354; Vec3f* unk_348 = &this->unk_348; Vec3s* temp_v0; @@ -1970,13 +1970,13 @@ void func_80B57D60(EnZl3* this, PlayState* play) { } s32 func_80B57D80(EnZl3* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16* sp32 = &this->actor.shape.rot.y; struct_80034A14_arg1* unk_3F8 = &this->unk_3F8; Player* player = GET_PLAYER(play); s32 unk_314 = this->unk_314; s16 temp_v0 = func_80B57104(this, unk_314); - s32 pad2; + UNUSED s32 pad2; s16 phi_v1; unk_3F8->unk_18.y = player->actor.world.pos.y; @@ -2030,7 +2030,7 @@ s32 func_80B57F84(EnZl3* this, PlayState* play) { } void func_80B58014(EnZl3* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); s8 invincibilityTimer = player->invincibilityTimer; @@ -2085,7 +2085,7 @@ void func_80B58268(EnZl3* this, PlayState* play) { void func_80B582C8(EnZl3* this, PlayState* play) { f32* unk_3CC = &this->unk_3CC; - s32 pad; + UNUSED s32 pad; if (*unk_3CC == kREG(14) + 10.0f) { *unk_3CC += 1.0f; @@ -2110,7 +2110,7 @@ void func_80B582C8(EnZl3* this, PlayState* play) { } void func_80B584B4(EnZl3* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); s8 invincibilityTimer = player->invincibilityTimer; Actor* nearbyEnTest = Actor_FindNearby(play, &this->actor, ACTOR_EN_TEST, ACTORCAT_ENEMY, 8000.0f); @@ -2138,7 +2138,7 @@ void func_80B584B4(EnZl3* this, PlayState* play) { } void func_80B58624(EnZl3* this, PlayState* play) { - s32 pad[4]; + UNUSED s32 pad[4]; f32* unk_3CC = &this->unk_3CC; if (*unk_3CC == (kREG(18) + 10.0f)) { @@ -2248,7 +2248,7 @@ void func_80B58AAC(EnZl3* this, PlayState* play) { } void func_80B58C08(EnZl3* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; Vec3f* unk_348 = &this->unk_348; Vec3f* unk_354 = &this->unk_354; Vec3f* thisPos = &this->actor.world.pos; @@ -2618,10 +2618,10 @@ void func_80B59B6C(EnZl3* this, PlayState* play) { } void func_80B59DB8(EnZl3* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; ObjectContext* objCtx = &play->objectCtx; s32 objIndex = Object_GetIndex(objCtx, OBJECT_ZL2_ANIME2); - s32 pad2; + UNUSED s32 pad2; if (objIndex < 0) { osSyncPrintf(VT_FGCOL(RED) "En_Zl3_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" VT_RST); @@ -2657,7 +2657,7 @@ void EnZl3_Update(Actor* thisx, PlayState* play) { void EnZl3_Init(Actor* thisx, PlayState* play) { EnZl3* this = (EnZl3*)thisx; ActorShape* shape = &this->actor.shape; - s32 pad; + UNUSED s32 pad; osSyncPrintf("ゼルダ姫のEn_Zl3_Actor_ct通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n"); ActorShape_Init(shape, 0.0f, ActorShadow_DrawCircle, 30.0f); @@ -2698,13 +2698,13 @@ void func_80B59FE8(EnZl3* this, PlayState* play) { } void func_80B59FF4(EnZl3* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s16 eyeTexIndex = this->eyeTexIndex; void* eyeTex = sEyeTextures[eyeTexIndex]; s16 mouthTexIndex = this->mouthTexIndex; SkelAnime* skelAnime = &this->skelAnime; void* mouthTex = sMouthTextures[mouthTexIndex]; - s32 pad2; + UNUSED s32 pad2; OPEN_DISPS(play->state.gfxCtx, "../z_en_zl3.c", 2165); @@ -2723,13 +2723,13 @@ void func_80B59FF4(EnZl3* this, PlayState* play) { } void func_80B5A1D0(EnZl3* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s16 eyeTexIndex = this->eyeTexIndex; void* eyeTex = sEyeTextures[eyeTexIndex]; s16 mouthTexIndex = this->mouthTexIndex; SkelAnime* skelAnime = &this->skelAnime; void* mouthTex = sMouthTextures[mouthTexIndex]; - s32 pad2; + UNUSED s32 pad2; OPEN_DISPS(play->state.gfxCtx, "../z_en_zl3.c", 2205); 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 d32098232ff..965a98116b9 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -357,7 +357,7 @@ s32 EnZl4_InMovingAnim(EnZl4* this) { } void EnZl4_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnZl4* this = (EnZl4*)thisx; SkelAnime_InitFlex(play, &this->skelAnime, &gChildZeldaSkel, NULL, this->jointTable, this->morphTable, 18); @@ -393,7 +393,7 @@ void EnZl4_Init(Actor* thisx, PlayState* play) { } void EnZl4_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnZl4* this = (EnZl4*)thisx; Collider_DestroyCylinder(play, &this->collider); @@ -1250,7 +1250,7 @@ void EnZl4_TheEnd(EnZl4* this, PlayState* play) { } void EnZl4_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnZl4* this = (EnZl4*)thisx; if (this->actionFunc != EnZl4_TheEnd) { 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 73160159d3b..4becb814761 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -716,7 +716,7 @@ void EnZo_Dive(EnZo* this, PlayState* play) { void EnZo_Update(Actor* thisx, PlayState* play) { EnZo* this = (EnZo*)thisx; - u32 pad; + UNUSED s32 pad; Vec3f pos; if ((s32)this->alpha != 0) { diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index 93970c064b7..9958f6e2840 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -90,7 +90,7 @@ void EnfHG_Init(Actor* thisx, PlayState* play2) { } void EnfHG_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnfHG* this = (EnfHG*)thisx; osSyncPrintf("F DT1\n"); @@ -108,11 +108,11 @@ void EnfHG_SetupIntro(EnfHG* this, PlayState* play) { void EnfHG_Intro(EnfHG* this, PlayState* play) { static Vec3f audioVec = { 0.0f, 0.0f, 50.0f }; - s32 pad64; + UNUSED s32 pad64; Player* player = GET_PLAYER(play); BossGanondrof* bossGnd = (BossGanondrof*)this->actor.parent; - s32 pad58; - s32 pad54; + UNUSED s32 pad58; + UNUSED s32 pad54; if (this->cutsceneState != INTRO_FINISH) { SkelAnime_Update(&this->skin.skelAnime); @@ -677,7 +677,7 @@ void EnfHG_Done(EnfHG* this, PlayState* play) { } void EnfHG_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; EnfHG* this = (EnfHG*)thisx; u8 i; @@ -713,7 +713,7 @@ void EnfHG_PostDraw(Actor* thisx, PlayState* play, Skin* skin) { void EnfHG_Draw(Actor* thisx, PlayState* play) { EnfHG* this = (EnfHG*)thisx; BossGanondrof* bossGnd = (BossGanondrof*)this->actor.parent; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_fhg.c", 2439); Gfx_SetupDL_25Opa(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.c b/src/overlays/actors/ovl_End_Title/z_end_title.c index 5ca553bf225..6648755b746 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.c +++ b/src/overlays/actors/ovl_End_Title/z_end_title.c @@ -113,7 +113,7 @@ void EndTitle_DrawFull(Actor* thisx, PlayState* play) { // Used in the Temple of Time void EndTitle_DrawNintendoLogo(Actor* thisx, PlayState* play) { EndTitle* this = (EndTitle*)thisx; - s32 pad; + UNUSED s32 pad; s32 frames = play->csCtx.frames; if ((frames >= 1101) && (this->endAlpha < 255)) { diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index fb466d48863..5776b3abb17 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -1170,7 +1170,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) { u8 materialFlag = 0; f32 rotY; s16 i; - s32 pad; + UNUSED s32 pad; FishingEffect* firstEffect = effect; OPEN_DISPS(play->state.gfxCtx, "../z_fishing.c", 2271); @@ -1374,7 +1374,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) { } void Fishing_DrawStreamSplash(PlayState* play) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_fishing.c", 2572); @@ -1416,7 +1416,7 @@ void Fishing_UpdateLine(PlayState* play, Vec3f* basePos, Vec3f* pos, Vec3f* rot, f32 dist; f32 spD8; s16 temp_s2; - s32 pad; + UNUSED s32 pad; f32 temp_f20; Vec3f posSrc = { 0.0f, 0.0f, 0.0f }; Vec3f posStep; @@ -1784,7 +1784,7 @@ void Fishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot) { Vec3f hookPos[2]; s16 i; s16 spB4 = D_80B7E144; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); OPEN_DISPS(play->state.gfxCtx, "../z_fishing.c", 3287); @@ -1952,7 +1952,7 @@ void Fishing_DrawRod(PlayState* play) { f32 spC0; Input* input = &play->state.input[0]; Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_fishing.c", 3600); @@ -2111,7 +2111,7 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) { f32 sp70; Vec3f sp64; Vec3f sp58; - s32 pad; + UNUSED s32 pad; D_80B7E0AE++; @@ -2899,7 +2899,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) { u8 phi_v0_2; f32 temp_f0; f32 temp; - s32 pad; + UNUSED s32 pad; f32 spA4; u16 spA2; u8 phi_a1; @@ -4384,7 +4384,7 @@ void Fishing_DrawPondProps(PlayState* play) { u8 materialFlag = 0; FishingProp* prop = &sPondProps[0]; s16 i; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_fishing.c", 7704); @@ -4679,7 +4679,7 @@ void Fishing_DrawGroupFishes(PlayState* play) { FishingGroupFish* fish = &sGroupFishes[0]; f32 scale; s16 i; - s32 pad; + UNUSED s32 pad; if (sLinkAge == LINK_AGE_CHILD) { scale = 0.003325f; @@ -5085,7 +5085,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) { f32 target; f32 subCamAtMaxVelFrac; f32 lureDistXZ; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); Input* input = &play->state.input[0]; @@ -5637,14 +5637,14 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) { play->envCtx.adjLight1Color[0] = play->envCtx.adjLight1Color[1] = play->envCtx.adjLight1Color[2] = D_80B7A658; if ((u8)D_80B7A650 > 0) { - s32 pad; + UNUSED s32 pad; Camera* mainCam = Play_GetCamera(play, CAM_ID_MAIN); s16 i; - s32 pad1; + UNUSED s32 pad1; Vec3f pos; Vec3f rot; Vec3f projectedPos; - s32 pad2; + UNUSED s32 pad2; rot.x = M_PI / 2.0f + 0.1f; rot.y = 1.0f; @@ -5713,7 +5713,7 @@ static void* sFishingOwnerEyeTexs[] = { }; void Fishing_DrawOwner(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; Fishing* this = (Fishing*)thisx; Input* input = &play->state.input[0]; 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 ba29d03285f..564f262f44a 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -58,7 +58,7 @@ void ItemEtcetera_SetupAction(ItemEtcetera* this, ItemEtceteraActionFunc actionF void ItemEtcetera_Init(Actor* thisx, PlayState* play) { ItemEtcetera* this = (ItemEtcetera*)thisx; - s32 pad; + UNUSED s32 pad; s32 type; s32 objBankIndex; diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c index b72b644f593..9da4ea9a95a 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -182,7 +182,7 @@ void func_80B86CA8(ItemShield* this, PlayState* play) { } void func_80B86F68(ItemShield* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); MtxF* shield = &player->shieldMf; diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index 22d591cd9ba..1965069ddec 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -72,7 +72,7 @@ void MagicDark_DiamondUpdate(Actor* thisx, PlayState* play) { MagicDark* this = (MagicDark*)thisx; u8 phi_a0; Player* player = GET_PLAYER(play); - s16 pad; + UNUSED s16 pad; s16 nayrusLoveTimer = gSaveContext.nayrusLoveTimer; s32 msgMode = play->msgCtx.msgMode; @@ -175,7 +175,7 @@ void MagicDark_DimLighting(PlayState* play, f32 intensity) { void MagicDark_OrbUpdate(Actor* thisx, PlayState* play) { MagicDark* this = (MagicDark*)thisx; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); func_8002F974(&this->actor, NA_SE_PL_MAGIC_SOUL_BALL - SFX_FLAG); @@ -203,7 +203,7 @@ void MagicDark_OrbUpdate(Actor* thisx, PlayState* play) { void MagicDark_DiamondDraw(Actor* thisx, PlayState* play) { MagicDark* this = (MagicDark*)thisx; - s32 pad; + UNUSED s32 pad; u16 gameplayFrames = play->gameplayFrames; OPEN_DISPS(play->state.gfxCtx, "../z_magic_dark.c", 525); @@ -242,7 +242,7 @@ void MagicDark_OrbDraw(Actor* thisx, PlayState* play) { MagicDark* this = (MagicDark*)thisx; Vec3f pos; Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; f32 sp6C = play->state.frames & 0x1F; if (this->timer < 32) { diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c index bfc38a295b6..fe3ea127dcb 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -119,7 +119,7 @@ void MagicFire_UpdateBeforeCast(Actor* thisx, PlayState* play) { void MagicFire_Update(Actor* thisx, PlayState* play) { MagicFire* this = (MagicFire*)thisx; Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; if (1) {} this->actor.world.pos = player->actor.world.pos; @@ -218,9 +218,9 @@ void MagicFire_Update(Actor* thisx, PlayState* play) { void MagicFire_Draw(Actor* thisx, PlayState* play) { MagicFire* this = (MagicFire*)thisx; - s32 pad1; + UNUSED s32 pad1; u32 gameplayFrames = play->gameplayFrames; - s32 pad2; + UNUSED s32 pad2; s32 i; u8 alpha; diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index aea488b2c66..fd04e712626 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -144,7 +144,7 @@ void MagicWind_Update(Actor* thisx, PlayState* play) { } s32 MagicWind_OverrideLimbDraw(PlayState* play, SkelCurve* skelCurve, s32 limbIndex, void* thisx) { - s32 pad; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_magic_wind.c", 615); 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 e163fb1101d..c1ba51e0061 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -159,7 +159,7 @@ void MirRay_MakeShieldLight(MirRay* this, PlayState* play) { } void MirRay_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; MirRay* this = (MirRay*)thisx; MirRayDataEntry* dataEntry = &sMirRayData[this->actor.params]; @@ -237,7 +237,7 @@ void MirRay_Destroy(Actor* thisx, PlayState* play) { } void MirRay_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; MirRay* this = (MirRay*)thisx; Player* player = GET_PLAYER(play); @@ -266,7 +266,7 @@ void MirRay_SetIntensity(MirRay* this, PlayState* play) { f32 temp_f0; f32 temp_f0_2; f32 temp_f2_2; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); MtxF* shieldMtx = &player->shieldMf; 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 72920d1020d..7f76c88ce93 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -134,9 +134,9 @@ void ObjBean_InitCollider(Actor* thisx, PlayState* play) { } void ObjBean_InitDynaPoly(ObjBean* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader; - s32 pad2; + UNUSED s32 pad2; colHeader = NULL; @@ -866,7 +866,7 @@ void func_80B90A34(ObjBean* this, PlayState* play) { } } void ObjBean_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; ObjBean* this = (ObjBean*)thisx; if (this->timer > 0) { 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 d2a1d00bc85..0886bac0622 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c @@ -43,7 +43,7 @@ void ObjBlockstop_Update(Actor* thisx, PlayState* play) { DynaPolyActor* dynaPolyActor; Vec3f sp4C; s32 bgId; - s32 pad; + UNUSED s32 pad; if (BgCheck_EntityLineTest2(&play->colCtx, &this->actor.home.pos, &this->actor.world.pos, &sp4C, &this->actor.floorPoly, false, false, true, true, &bgId, &this->actor)) { 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 e938f6c29c8..de6f0cdc02b 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -122,7 +122,7 @@ void ObjBombiwa_Break(ObjBombiwa* this, PlayState* play) { void ObjBombiwa_Update(Actor* thisx, PlayState* play) { ObjBombiwa* this = (ObjBombiwa*)thisx; - s32 pad; + UNUSED s32 pad; if ((func_80033684(play, &this->actor) != NULL) || ((this->collider.base.acFlags & AC_HIT) && (this->collider.info.acHitInfo->toucher.dmgFlags & DMG_HAMMER))) { diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c index 307ad2f323c..033f7472664 100644 --- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c +++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c @@ -42,7 +42,7 @@ static ColliderCylinderInitToActor sCylinderInit = { void ObjDekujr_Init(Actor* thisx, PlayState* play) { ObjDekujr* this = (ObjDekujr*)thisx; - s32 pad; + UNUSED s32 pad; if (gSaveContext.cutsceneIndex < 0xFFF0) { if (!LINK_IS_ADULT) { @@ -127,7 +127,7 @@ void ObjDekujr_ComeUp(ObjDekujr* this, PlayState* play) { void ObjDekujr_Update(Actor* thisx, PlayState* play) { ObjDekujr* this = (ObjDekujr*)thisx; - s32 pad; + UNUSED s32 pad; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index 6cd7e51e051..67b70fb2fcc 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -44,9 +44,9 @@ void ObjElevator_SetupAction(ObjElevator* this, ObjElevatorActionFunc actionFunc } void func_80B92B08(ObjElevator* this, PlayState* play, CollisionHeader* collision, s32 flag) { - s16 pad1; + UNUSED s16 pad1; CollisionHeader* colHeader = NULL; - s16 pad2; + UNUSED s16 pad2; Actor* thisx = &this->dyna.actor; DynaPolyActor_Init(&this->dyna, flag); 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 bc62183e470..4d862f15164 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -91,7 +91,7 @@ void ObjHamishi_Shake(ObjHamishi* this) { } void ObjHamishi_Break(ObjHamishi* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f velocity; Vec3f pos; s16 phi_s0 = 1000; 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 c7a68820924..032bb716d33 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -53,9 +53,9 @@ void ObjHsblock_SetupAction(ObjHsblock* this, ObjHsblockActionFunc actionFunc) { } void func_80B93B68(ObjHsblock* this, PlayState* play, CollisionHeader* collision, s32 moveFlags) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; - s32 pad2[2]; + UNUSED s32 pad2[2]; DynaPolyActor_Init(&this->dyna, moveFlags); CollisionHeader_GetVirtual(collision, &colHeader); 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 24989fa383b..b062e74224c 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 @@ -102,7 +102,7 @@ void ObjIcePoly_Init(Actor* thisx, PlayState* play) { } void ObjIcePoly_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; ObjIcePoly* this = (ObjIcePoly*)thisx; if ((this->actor.params >= 0) && (this->actor.params < 3)) { @@ -113,7 +113,7 @@ void ObjIcePoly_Destroy(Actor* thisx, PlayState* play) { void ObjIcePoly_Idle(ObjIcePoly* this, PlayState* play) { static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; - s32 pad; + UNUSED s32 pad; Vec3f pos; if (this->colliderIce.base.acFlags & AC_HIT) { @@ -182,14 +182,14 @@ void ObjIcePoly_Melt(ObjIcePoly* this, PlayState* play) { } void ObjIcePoly_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; ObjIcePoly* this = (ObjIcePoly*)thisx; this->actionFunc(this, play); } void ObjIcePoly_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; ObjIcePoly* this = (ObjIcePoly*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_obj_ice_poly.c", 421); 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 654b9fd3847..5240a63097e 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -88,7 +88,7 @@ void ObjKibako_InitCollider(Actor* thisx, PlayState* play) { } void ObjKibako_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; ObjKibako* this = (ObjKibako*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -183,7 +183,7 @@ void ObjKibako_SetupIdle(ObjKibako* this) { } void ObjKibako_Idle(ObjKibako* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; if (Actor_HasParent(&this->actor, play)) { ObjKibako_SetupHeld(this); @@ -246,8 +246,8 @@ void ObjKibako_SetupThrown(ObjKibako* this) { } void ObjKibako_Thrown(ObjKibako* this, PlayState* play) { - s32 pad; - s32 pad2; + UNUSED s32 pad; + UNUSED s32 pad2; if ((this->actor.bgCheckFlags & (BGCHECKFLAG_GROUND | BGCHECKFLAG_GROUND_TOUCH | BGCHECKFLAG_WALL)) || (this->collider.base.atFlags & AT_HIT)) { @@ -271,14 +271,14 @@ void ObjKibako_Thrown(ObjKibako* this, PlayState* play) { } void ObjKibako_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; ObjKibako* this = (ObjKibako*)thisx; this->actionFunc(this, play); } void ObjKibako_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; ObjKibako* this = (ObjKibako*)thisx; Gfx_DrawDListOpa(play, gSmallWoodenBoxDL); 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 336de8d2de0..c48cd9f4d68 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -65,7 +65,7 @@ void ObjKibako2_InitCollider(Actor* thisx, PlayState* play) { } void ObjKibako2_Break(ObjKibako2* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; Vec3f* thisPos; Vec3f pos; Vec3f velocity; @@ -116,7 +116,7 @@ void ObjKibako2_SpawnCollectible(ObjKibako2* this, PlayState* play) { void ObjKibako2_Init(Actor* thisx, PlayState* play) { ObjKibako2* this = (ObjKibako2*)thisx; - s16 pad; + UNUSED s16 pad; CollisionHeader* colHeader = NULL; u32 bgId; 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 957eb1f51e3..bf87288518b 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -61,9 +61,9 @@ void ObjLift_SetupAction(ObjLift* this, ObjLiftActionFunc actionFunc) { } void ObjLift_InitDynaPoly(ObjLift* this, PlayState* play, CollisionHeader* collision, s32 flags) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; DynaPolyActor_Init(&this->dyna, flags); CollisionHeader_GetVirtual(collision, &colHeader); @@ -79,7 +79,7 @@ void func_80B96160(ObjLift* this, PlayState* play) { Vec3f pos; Vec3f velocity; Vec3f* temp_s3; - s32 pad0; + UNUSED s32 pad0; s32 i; temp_s3 = &this->dyna.actor.world.pos; @@ -134,7 +134,7 @@ void func_80B9651C(ObjLift* this) { } void func_80B96560(ObjLift* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 quakeIndex; if (DynaPolyActor_IsPlayerOnTop(&this->dyna)) { @@ -187,7 +187,7 @@ void func_80B967C0(ObjLift* this) { } void func_80B96840(ObjLift* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 bgId; Vec3f sp2C; 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 10029079f80..0c09c55472a 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -89,7 +89,7 @@ static InitChainEntry sInitChain[] = { }; void ObjLightswitch_InitCollider(ObjLightswitch* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->actor, &sColliderJntSphInit, this->colliderItems); @@ -136,7 +136,7 @@ void ObjLightswitch_SpawnDisappearEffects(ObjLightswitch* this, PlayState* play) f32 x; f32 y; f32 z; - s32 pad; + UNUSED s32 pad; if (this->alpha >= (100 << 6)) { x = (CLAMP_MAX((1.0f - 1.0f / (255 << 6) * this->alpha) * 400.0f, 60.0f) - 30.0f + 30.0f) * Rand_ZeroOne(); @@ -444,7 +444,7 @@ void ObjLightswitch_DrawOpa(ObjLightswitch* this, PlayState* play) { } void ObjLightswitch_DrawXlu(ObjLightswitch* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Vec3f sp68; Vec3s sp60; 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 c1bd1853be4..2c77aa143b5 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -136,7 +136,7 @@ void ObjMure_SpawnActors0(ObjMure* this, PlayState* play) { ActorContext* ac; s32 i; Vec3f pos; - s32 pad; + UNUSED s32 pad; s32 maxChildren = ObjMure_GetMaxChildSpawns(this); for (i = 0; i < maxChildren; i++) { 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 233acdba1ff..ce31b53a4bb 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -141,7 +141,7 @@ void func_80B9ADCC(ObjMure3* this, PlayState* play) { } void ObjMure3_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; ObjMure3* this = (ObjMure3*)thisx; if (Flags_GetSwitch(play, this->actor.params & 0x3F)) { 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 b21dc1ed461..8bf6efaea4a 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -84,9 +84,9 @@ static Vec2f sFaceDirection[] = { }; void ObjOshihiki_InitDynapoly(ObjOshihiki* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; DynaPolyActor_Init(&this->dyna, moveFlag); CollisionHeader_GetVirtual(collision, &colHeader); @@ -307,7 +307,7 @@ void ObjOshihiki_Init(Actor* thisx, PlayState* play2) { } void ObjOshihiki_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; ObjOshihiki* this = (ObjOshihiki*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -419,7 +419,7 @@ s32 ObjOshihiki_CheckWall(PlayState* play, s16 angle, f32 direction, ObjOshihiki } s32 ObjOshihiki_MoveWithBlockUnder(ObjOshihiki* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; ObjOshihiki* blockUnder = ObjOshihiki_GetBlockUnder(this, play); if ((blockUnder != NULL) && (blockUnder->stateFlags & PUSHBLOCK_SETUP_PUSH) && @@ -450,7 +450,7 @@ void ObjOshihiki_SetupOnScene(ObjOshihiki* this, PlayState* play) { } void ObjOshihiki_OnScene(ObjOshihiki* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); this->stateFlags |= PUSHBLOCK_ON_SCENE; @@ -611,7 +611,7 @@ void ObjOshihiki_Fall(ObjOshihiki* this, PlayState* play) { } void ObjOshihiki_Update(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; ObjOshihiki* this = (ObjOshihiki*)thisx; this->stateFlags &= @@ -634,7 +634,7 @@ void ObjOshihiki_Update(Actor* thisx, PlayState* play) { } void ObjOshihiki_Draw(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; ObjOshihiki* this = (ObjOshihiki*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_obj_oshihiki.c", 1289); 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 cff2431b05d..0077d878202 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -183,9 +183,9 @@ void ObjSwitch_RotateY(Vec3f* dest, Vec3f* src, s16 angle) { } void ObjSwitch_InitDynaPoly(ObjSwitch* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; - s32 pad2; + UNUSED s32 pad2; DynaPolyActor_Init(&this->dyna, moveFlag); CollisionHeader_GetVirtual(collision, &colHeader); @@ -239,7 +239,7 @@ Actor* ObjSwitch_SpawnIce(ObjSwitch* this, PlayState* play) { } void ObjSwitch_SetOn(ObjSwitch* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 subType; if (Flags_GetSwitch(play, (this->dyna.actor.params >> 8 & 0x3F))) { @@ -731,7 +731,7 @@ void ObjSwitch_DrawEye(ObjSwitch* this, PlayState* play) { { gEyeSwitchSilverOpenTex, gEyeSwitchSilverHalfTex, gEyeSwitchSilverClosedTex, gEyeSwitchSilverClosedTex }, }; static Gfx* eyeDlists[] = { gEyeSwitch1DL, gEyeSwitch2DL }; - s32 pad; + UNUSED s32 pad; s32 subType = (this->dyna.actor.params >> 4 & 7); OPEN_DISPS(play->state.gfxCtx, "../z_obj_switch.c", 1459); @@ -750,8 +750,8 @@ void ObjSwitch_DrawCrystal(ObjSwitch* this, PlayState* play) { gCrystalSwitchCoreXluDL }; static Gfx* opaDLists[] = { gCrystalSwitchCoreOpaDL, gCrystalSwitchDiamondOpaDL, NULL, NULL, gCrystalSwitchCoreOpaDL }; - s32 pad1; - s32 pad2; + UNUSED s32 pad1; + UNUSED s32 pad2; s32 subType; subType = (this->dyna.actor.params >> 4 & 7); 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 92ee4585c58..71cac03b594 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -79,7 +79,7 @@ static s32 sLitTorchCount; void ObjSyokudai_Init(Actor* thisx, PlayState* play) { static u8 sColTypesStand[] = { 0x09, 0x0B, 0x0B }; - s32 pad; + UNUSED s32 pad; ObjSyokudai* this = (ObjSyokudai*)thisx; s32 torchType = this->actor.params & 0xF000; @@ -109,7 +109,7 @@ void ObjSyokudai_Init(Actor* thisx, PlayState* play) { } void ObjSyokudai_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; ObjSyokudai* this = (ObjSyokudai*)thisx; Collider_DestroyCylinder(play, &this->colliderStand); @@ -133,8 +133,8 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) { s32 interactionType; u32 dmgFlags; Vec3f tipToFlame; - s32 pad; - s32 pad2; + UNUSED s32 pad; + UNUSED s32 pad2; litTimeScale = torchCount; if (torchCount == 10) { @@ -259,7 +259,7 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) { void ObjSyokudai_Draw(Actor* thisx, PlayState* play) { static Gfx* displayLists[] = { gGoldenTorchDL, gTimedTorchDL, gWoodenTorchDL }; - s32 pad; + UNUSED s32 pad; ObjSyokudai* this = (ObjSyokudai*)thisx; s32 timerMax; diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c index 96d4bc2c3a6..badb032187d 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c @@ -98,7 +98,7 @@ void ObjTimeblock_ToggleSwitchFlag(PlayState* play, s32 flag) { void ObjTimeblock_Init(Actor* thisx, PlayState* play) { ObjTimeblock* this = (ObjTimeblock*)thisx; - s32 pad; + UNUSED s32 pad; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); @@ -140,7 +140,7 @@ void ObjTimeblock_Init(Actor* thisx, PlayState* play) { } void ObjTimeblock_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; ObjTimeblock* this = (ObjTimeblock*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); 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 6217588e092..87e572cf510 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -153,7 +153,7 @@ void ObjTsubo_Destroy(Actor* thisx, PlayState* play2) { } void ObjTsubo_AirBreak(ObjTsubo* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; f32 rand; s16 angle; Vec3f pos; @@ -189,7 +189,7 @@ void ObjTsubo_AirBreak(ObjTsubo* this, PlayState* play) { } void ObjTsubo_WaterBreak(ObjTsubo* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; s16 angle; Vec3f pos = this->actor.world.pos; Vec3f velocity; @@ -234,7 +234,7 @@ void ObjTsubo_SetupIdle(ObjTsubo* this) { } void ObjTsubo_Idle(ObjTsubo* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s16 temp_v0; s32 phi_v1; @@ -302,7 +302,7 @@ void ObjTsubo_SetupThrown(ObjTsubo* this) { } void ObjTsubo_Thrown(ObjTsubo* this, PlayState* play) { - s32 pad[2]; + UNUSED s32 pad[2]; if ((this->actor.bgCheckFlags & (BGCHECKFLAG_GROUND | BGCHECKFLAG_GROUND_TOUCH | BGCHECKFLAG_WALL)) || (this->collider.base.atFlags & AT_HIT)) { diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index f98a3a3fc17..71593f9348e 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -74,7 +74,7 @@ void ObjWarp2block_Spawn(ObjWarp2block* this, PlayState* play) { } s32 func_80BA1ECC(ObjWarp2block* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; Actor* temp_a3; Player* player; Vec3f sp20; 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 532a39fa5a4..43515019a2f 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -64,7 +64,7 @@ void ObjectKankyo_SetupAction(ObjectKankyo* this, ObjectKankyoActionFunc action) void ObjectKankyo_Init(Actor* thisx, PlayState* play) { ObjectKankyo* this = (ObjectKankyo*)thisx; - s32 pad; + UNUSED s32 pad; s16 i; for (i = 0; i < ARRAY_COUNT(this->effects); i++) { @@ -593,8 +593,8 @@ void ObjectKankyo_DrawSnow(Actor* thisx, PlayState* play2) { Vec3f vec1 = { 0.0f, 0.0f, 0.0f }; Vec3f vec2 = { 0.0f, 0.0f, 0.0f }; s16 i; - s32 pad; - s32 pad2; + UNUSED s32 pad; + UNUSED s32 pad2; if (!(play->cameraPtrs[CAM_ID_MAIN]->unk_14C & 0x100)) { OPEN_DISPS(play->state.gfxCtx, "../z_object_kankyo.c", 958); @@ -750,7 +750,7 @@ void ObjectKankyo_Lightning(ObjectKankyo* this, PlayState* play) { } void ObjectKankyo_DrawLightning(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; ObjectKankyo* this = (ObjectKankyo*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_object_kankyo.c", 1182); 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 09ed4dbec66..034a0f91d52 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -40,7 +40,7 @@ void OceffSpot_SetupAction(OceffSpot* this, OceffSpotActionFunc actionFunc) { } void OceffSpot_Init(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; OceffSpot* this = (OceffSpot*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -63,7 +63,7 @@ void OceffSpot_Init(Actor* thisx, PlayState* play) { } void OceffSpot_Destroy(Actor* thisx, PlayState* play) { - s32 pad; + UNUSED s32 pad; OceffSpot* this = (OceffSpot*)thisx; Player* player = GET_PLAYER(play); @@ -118,7 +118,7 @@ void OceffSpot_GrowCylinder(OceffSpot* this, PlayState* play) { void OceffSpot_Update(Actor* thisx, PlayState* play) { OceffSpot* this = (OceffSpot*)thisx; - s32 pad; + UNUSED s32 pad; Player* player = GET_PLAYER(play); f32 temp; 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 dac291b0349..d26cea0fa91 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -67,7 +67,7 @@ void OceffWipe_Draw(Actor* thisx, PlayState* play) { u32 scroll = play->state.frames & 0xFF; OceffWipe* this = (OceffWipe*)thisx; f32 z; - s32 pad; + UNUSED s32 pad; u8 alphaTable[3]; s32 i; Vec3f eye; 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 8878cfeb1d9..57a8668eb54 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -63,7 +63,7 @@ void OceffWipe2_Draw(Actor* thisx, PlayState* play) { OceffWipe2* this = (OceffWipe2*)thisx; f32 z; u8 alpha; - s32 pad[2]; + UNUSED s32 pad[2]; Vec3f eye; Vtx* vtxPtr; Vec3f vec; 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 92dba716fda..2d54ffe69c6 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -64,7 +64,7 @@ void OceffWipe3_Draw(Actor* thisx, PlayState* play) { OceffWipe3* this = (OceffWipe3*)thisx; f32 z; u8 alpha; - s32 pad[2]; + UNUSED s32 pad[2]; Vec3f eye; Vtx* vtxPtr; Vec3f vec; 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 fc323b7153f..ad7a6c11887 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -62,7 +62,7 @@ void OceffWipe4_Draw(Actor* thisx, PlayState* play) { OceffWipe4* this = (OceffWipe4*)thisx; f32 z; u8 alpha; - s32 pad[2]; + UNUSED s32 pad[2]; Vec3f eye; Vtx* vtxPtr; Vec3f vec; 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 cb753ac12fd..147e6be17b1 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -121,7 +121,7 @@ void ShotSun_TriggerFairy(ShotSun* this, PlayState* play) { void func_80BADF0C(ShotSun* this, PlayState* play) { Player* player = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; s32 params = this->actor.params & 0xFF; if (Math3D_Vec3fDistSq(&this->actor.world.pos, &player->actor.world.pos) > SQ(150.0f)) { @@ -156,7 +156,7 @@ void ShotSun_UpdateHyliaSun(ShotSun* this, PlayState* play) { Vec3s cylinderPos; Player* player = GET_PLAYER(play); EnItem00* collectible; - s32 pad; + UNUSED s32 pad; Vec3f spawnPos; if (this->collider.base.acFlags & AC_HIT) { diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index d95f299b694..5aa76fbbd5f 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -1519,7 +1519,7 @@ void func_80832924(Player* this, struct_80832924* entry) { s32 data; s32 flags; u32 cont; - s32 pad; + UNUSED s32 pad; do { data = ABS(entry->field); @@ -3110,7 +3110,7 @@ void func_80836BEC(Player* this, PlayState* play) { s32 sp1C = 0; s32 zTrigPressed = CHECK_BTN_ALL(sControlInput->cur.button, BTN_Z); Actor* actorToTarget; - s32 pad; + UNUSED s32 pad; s32 holdTarget; s32 cond; @@ -3492,7 +3492,7 @@ static u32 D_80854488[][2] = { }; void func_80837948(PlayState* play, Player* this, s32 arg2) { - s32 pad; + UNUSED s32 pad; u32 dmgFlags; s32 temp; @@ -3766,7 +3766,7 @@ void func_808382BC(Player* this) { } s32 func_808382DC(Player* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; s32 sp68 = false; s32 sp64; @@ -4314,7 +4314,7 @@ s32 func_80839800(Player* this, PlayState* play) { f32 sp74; Actor* doorActor; f32 sp6C; - s32 pad3; + UNUSED s32 pad3; s32 frontRoom; Actor* attachedActor; LinkAnimationHeader* sp5C; @@ -4849,7 +4849,7 @@ s32 func_8083ADD4(PlayState* play, Player* this) { } void func_8083AE40(Player* this, s16 objectId) { - s32 pad; + UNUSED s32 pad; u32 size; if (objectId != OBJECT_INVALID) { @@ -6035,7 +6035,7 @@ static LinkAnimationHeader* D_80854590[] = { }; s32 func_8083E318(PlayState* play, Player* this, CollisionPoly* floorPoly) { - s32 pad; + UNUSED s32 pad; s16 playerVelYaw; Vec3f slopeNormal; s16 downwardSlopeYaw; @@ -6267,7 +6267,7 @@ s32 func_8083EC18(Player* this, PlayState* play, u32 arg2) { s32 i; f32 sp48; Vec3f* sp44 = &sp50[0]; - s32 pad; + UNUSED s32 pad; CollisionPoly_GetVerticesByBgId(wallPoly, this->actor.wallBgId, &play->colCtx, sp50); @@ -7710,7 +7710,7 @@ static LinkAnimationHeader* D_808545CC[] = { }; void func_80842D20(PlayState* play, Player* this) { - s32 pad; + UNUSED s32 pad; s32 sp28; if (func_80843188 != this->func_674) { @@ -8325,7 +8325,7 @@ void func_80844708(Player* this, PlayState* play) { s32 temp; s32 sp44; DynaPolyActor* wallPolyActor; - s32 pad; + UNUSED s32 pad; f32 sp38; s16 sp36; @@ -8828,7 +8828,7 @@ void func_80845CA4(Player* this, PlayState* play) { s32 temp; f32 sp34; s32 sp30; - s32 pad; + UNUSED s32 pad; if (!func_8083B040(this, play)) { if (this->unk_850 == 0) { @@ -9721,7 +9721,7 @@ void func_80847BA0(PlayState* play, Player* this) { CollisionPoly* spA0; s32 sp9C; s16 sp9A; - s32 pad; + UNUSED s32 pad; D_80854798.y = 18.0f; D_80854798.z = this->ageProperties->unk_38 + 10.0f; @@ -9838,9 +9838,9 @@ void func_80847BA0(PlayState* play, Player* this) { f32 invFloorPolyNormalY; f32 floorPolyNormalZ; f32 sp4C; - s32 pad2; + UNUSED s32 pad2; f32 sp44; - s32 pad3; + UNUSED s32 pad3; if (this->actor.floorBgId != BGCHECK_SCENE) { DynaPoly_SetPlayerOnTop(&play->colCtx, this->actor.floorBgId); @@ -9880,7 +9880,7 @@ void func_80847BA0(PlayState* play, Player* this) { void Player_UpdateCamAndSeqModes(PlayState* play, Player* this) { u8 seqMode; - s32 pad; + UNUSED s32 pad; Actor* unk_664; s32 camMode; @@ -10118,7 +10118,7 @@ static f32 sWaterConveyorSpeeds[] = { 2.0f, 4.0f, 7.0f }; static f32 sFloorConveyorSpeeds[] = { 0.5f, 1.0f, 3.0f }; void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { - s32 pad; + UNUSED s32 pad; sControlInput = input; @@ -10247,7 +10247,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { f32 sp70 = this->linearVelocity; s16 sp6E = this->currentYaw; s16 yawDiff = this->actor.world.rot.y - sp6E; - s32 pad; + UNUSED s32 pad; if ((ABS(yawDiff) > 0x6000) && (this->actor.speedXZ != 0.0f)) { sp70 = 0.0f; @@ -10523,7 +10523,7 @@ void Player_Update(Actor* thisx, PlayState* play) { static Vec3f sDogSpawnPos; Player* this = (Player*)thisx; s32 dogParams; - s32 pad; + UNUSED s32 pad; Input sp44; Actor* dog; @@ -10665,7 +10665,7 @@ void Player_Draw(Actor* thisx, PlayState* play2) { if (!(this->stateFlags2 & PLAYER_STATE2_29)) { OverrideLimbDrawOpa overrideLimbDraw = Player_OverrideLimbDrawGameplayDefault; s32 lod; - s32 pad; + UNUSED s32 pad; if ((this->csMode != 0) || (func_8008E9C4(this) && 0) || (this->actor.projectedPos.z < 160.0f)) { lod = 0; @@ -12659,7 +12659,7 @@ void func_8084F698(Player* this, PlayState* play) { } void func_8084F710(Player* this, PlayState* play) { - s32 pad; + UNUSED s32 pad; if ((this->unk_84F != 0) && (play->csCtx.frames < 0x131)) { this->actor.gravity = 0.0f; @@ -12878,7 +12878,7 @@ void func_8084FF7C(Player* this) { } void func_8085002C(Player* this) { - s32 pad; + UNUSED s32 pad; s16 sp2A; s16 sp28; s16 sp26; @@ -14251,7 +14251,7 @@ void func_80852C0C(PlayState* play, Player* this, s32 csMode) { void func_80852C50(PlayState* play, Player* this, CsCmdActorAction* arg2) { CsCmdActorAction* linkCsAction = play->csCtx.linkAction; - s32 pad; + UNUSED s32 pad; s32 sp24; if (play->csCtx.state == CS_STATE_UNSKIPPABLE_INIT) { @@ -14371,7 +14371,7 @@ s32 Player_InflictDamage(PlayState* play, s32 damage) { // Start talking with the given actor void func_80853148(PlayState* play, Actor* actor) { Player* this = GET_PLAYER(play); - s32 pad; + UNUSED s32 pad; if ((this->targetActor != NULL) || (actor == this->naviActor) || CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_0 | ACTOR_FLAG_18)) { diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c index 071f5046ae9..17148b71cda 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c @@ -58,7 +58,7 @@ u32 EffectSsBlast_Init(PlayState* play, u32 index, EffectSs* this, void* initPar void EffectSsBlast_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; MtxF mf; - s32 pad; + UNUSED s32 pad; f32 radius; OPEN_DISPS(gfxCtx, "../z_eff_ss_blast.c", 170); diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c index e64c991d21b..d7c228cf0e6 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c @@ -48,7 +48,7 @@ void EffectSsBomb_Draw(PlayState* play, u32 index, EffectSs* this) { MtxF mfResult; MtxF mfTrans11DA0; Mtx* mtx; - s32 pad; + UNUSED s32 pad; f32 scale; s16 color; diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c index 03f5a02f947..3205f4b91b8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c @@ -70,7 +70,7 @@ void EffectSsBomb2_DrawFade(PlayState* play, u32 index, EffectSs* this) { MtxF mfResult; MtxF mfTrans11DA0; Mtx* mtx; - s32 pad; + UNUSED s32 pad; f32 scale; OPEN_DISPS(gfxCtx, "../z_eff_ss_bomb2.c", 298); @@ -112,7 +112,7 @@ void EffectSsBomb2_DrawLayered(PlayState* play, u32 index, EffectSs* this) { MtxF mtx2F; Mtx* mtx2; Mtx* mtx; - s32 pad[3]; + UNUSED s32 pad[3]; f32 scale; f32 depth; f32 layer2Scale = 0.925f; diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c index 8d949c9e5b4..021ae02172c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c @@ -64,7 +64,7 @@ void EffectSsDFire_Draw(PlayState* play, u32 index, EffectSs* this) { MtxF mfScale; MtxF mfResult; MtxF mfTrans11DA0; - s32 pad; + UNUSED s32 pad; void* object; Mtx* mtx; f32 scale; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c index ed85786d918..99312034de7 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c @@ -95,7 +95,7 @@ void EffectSsDeadDb_Draw(PlayState* play, u32 index, EffectSs* this) { void EffectSsDeadDb_Update(PlayState* play, u32 index, EffectSs* this) { f32 w; - f32 pad; + UNUSED s32 pad; this->rTextIdx = (f32)((this->rReg11 - this->life) * 9) / this->rReg11; this->rScale += this->rScaleStep; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c index 0ac1b73e02b..ce3a1c037ca 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c @@ -46,10 +46,10 @@ u32 EffectSsDeadDs_Init(PlayState* play, u32 index, EffectSs* this, void* initPa } void EffectSsDeadDs_Draw(PlayState* play, u32 index, EffectSs* this) { - s32 pad; + UNUSED s32 pad; f32 scale; - s32 pad1; - s32 pad2; + UNUSED s32 pad1; + UNUSED s32 pad2; MtxF mf; f32 temp; Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c index 2c264d7eb68..fd9b0c5640e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c @@ -85,7 +85,7 @@ void EffectSsDust_Draw(PlayState* play, u32 index, EffectSs* this) { MtxF mfScale; MtxF mfResult; MtxF mfTrans11DA0; - s32 pad; + UNUSED s32 pad; Mtx* mtx; f32 scale; diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c index addd4e8bea1..c0f5672ace2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c @@ -67,7 +67,7 @@ void EffectSsEnFire_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; f32 scale; s16 camYaw; - s32 pad[3]; + UNUSED s32 pad[3]; s16 redGreen; OPEN_DISPS(gfxCtx, "../z_eff_en_fire.c", 169); diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c index 038cb3755c8..26be4c4bde8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c @@ -87,7 +87,7 @@ u32 EffectSsEnIce_Init(PlayState* play, u32 index, EffectSs* this, void* initPar void EffectSsEnIce_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - s32 pad; + UNUSED s32 pad; f32 scale; Vec3f hiliteLightDir; u32 gameplayFrames; diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c index 651b6c57047..e9d45addf16 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c @@ -25,7 +25,7 @@ EffectSsInit Effect_Ss_Extra_InitVars = { u32 EffectSsExtra_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx) { EffectSsExtraInitParams* initParams = (EffectSsExtraInitParams*)initParamsx; - s32 pad; + UNUSED s32 pad; s32 objBankIndex; u32 oldSeg6; @@ -59,7 +59,7 @@ static void* sTextures[] = { }; void EffectSsExtra_Draw(PlayState* play, u32 index, EffectSs* this) { - s32 pad; + UNUSED s32 pad; f32 scale = this->rScale / 100.0f; void* object = play->objectCtx.status[this->rObjBankIdx].segment; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c index ebe3213e6c8..93ddf34de2e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c @@ -44,7 +44,7 @@ u32 EffectSsFcircle_Init(PlayState* play, u32 index, EffectSs* this, void* initP void EffectSsFcircle_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - s32 pad; + UNUSED s32 pad; f32 yScale; f32 xzScale; f32 scale; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c index 44c7754948b..b8839182dcd 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c @@ -30,7 +30,7 @@ static Gfx D_809A5100[15]; u32 EffectSsFhgFlash_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx) { EffectSsFhgFlashInitParams* initParams = (EffectSsFhgFlashInitParams*)initParamsx; - s32 pad; + UNUSED s32 pad; s32 objBankIdx; Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; Vec3f sp34 = { 0.0f, -1000.0f, 0.0f }; @@ -86,7 +86,7 @@ static Color_RGB8 sColors[] = { void EffectSsFhgFlash_DrawLightBall(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - s32 pad; + UNUSED s32 pad; f32 scale; void* object; @@ -114,7 +114,7 @@ void EffectSsFhgFlash_DrawLightBall(PlayState* play, u32 index, EffectSs* this) void EffectSsFhgFlash_DrawShock(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - s32 pad; + UNUSED s32 pad; f32 scale; scale = this->rScale / 100.0f; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c index df915ca0256..77f47bd4651 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c @@ -67,7 +67,7 @@ u32 EffectSsFireTail_Init(PlayState* play, u32 index, EffectSs* this, void* init void EffectSsFireTail_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - s32 pad; + UNUSED s32 pad; s16 yaw; Vec3f scale; f32 temp1; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c index 1469e74ce3c..201fda0307a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c @@ -39,7 +39,7 @@ EffectSsInit Effect_Ss_G_Magma2_InitVars = { u32 EffectSsGMagma2_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx) { s32 objBankIndex = Object_GetIndex(&play->objectCtx, OBJECT_KINGDODONGO); - s32 pad; + UNUSED s32 pad; if ((objBankIndex >= 0) && Object_IsLoaded(&play->objectCtx, objBankIndex)) { Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; @@ -73,7 +73,7 @@ u32 EffectSsGMagma2_Init(PlayState* play, u32 index, EffectSs* this, void* initP void EffectSsGMagma2_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - s32 pad; + UNUSED s32 pad; f32 scale; void* object; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c index 4e7cf3138b6..4371ae470cb 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c @@ -30,7 +30,7 @@ EffectSsInit Effect_Ss_G_Ripple_InitVars = { }; u32 EffectSsGRipple_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx) { - s32 pad; + UNUSED s32 pad; Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; WaterBox* waterBox; EffectSsGRippleInitParams* initParams = (EffectSsGRippleInitParams*)initParamsx; @@ -62,7 +62,7 @@ u32 EffectSsGRipple_Init(PlayState* play, u32 index, EffectSs* this, void* initP void EffectSsGRipple_DrawRipple(PlayState* play, EffectSs* this, void* segment) { GraphicsContext* gfxCtx = play->state.gfxCtx; f32 radius; - s32 pad; + UNUSED s32 pad; MtxF mfTrans; MtxF mfScale; MtxF mfResult; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c index f2858afd78a..43824862006 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c @@ -79,7 +79,7 @@ void EffectSsGSpk_Draw(PlayState* play, u32 index, EffectSs* this) { MtxF mfTrans11DA0; Mtx* mtx; f32 scale; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(gfxCtx, "../z_eff_ss_g_spk.c", 208); diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c index a07d924829d..68a50434b82 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c +++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c @@ -68,7 +68,7 @@ u32 EffectSsHahen_Init(PlayState* play, u32 index, EffectSs* this, void* initPar void EffectSsHahen_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - s32 pad; + UNUSED s32 pad; f32 scale = this->rScale * 0.001f; OPEN_DISPS(gfxCtx, "../z_eff_hahen.c", 208); @@ -92,7 +92,7 @@ void EffectSsHahen_Draw(PlayState* play, u32 index, EffectSs* this) { // in the original game this function is hardcoded to be used only by the skull pots in Shadow Temple void EffectSsHahen_DrawGray(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - s32 pad; + UNUSED s32 pad; f32 scale = this->rScale * 0.001f; OPEN_DISPS(gfxCtx, "../z_eff_hahen.c", 253); diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c index 75b11bd2719..65c646be7f8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c +++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c @@ -77,7 +77,7 @@ void EffectSsHitMark_Draw(PlayState* play, u32 index, EffectSs* this) { MtxF mfTrans11DA0; Mtx* mtx; f32 scale; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(gfxCtx, "../z_eff_ss_hitmark.c", 297); diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c index cf5c0de7596..bd08a62068c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c @@ -44,7 +44,7 @@ u32 EffectSsIcePiece_Init(PlayState* play, u32 index, EffectSs* this, void* init void EffectSsIcePiece_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - s32 pad; + UNUSED s32 pad; f32 scale; u32 frames; f32 alpha; diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c index d79e5d9861a..83d66781d9c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c @@ -22,7 +22,7 @@ EffectSsInit Effect_Ss_Ice_Smoke_InitVars = { u32 EffectSsIceSmoke_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx) { EffectSsIceSmokeInitParams* initParams = (EffectSsIceSmokeInitParams*)initParamsx; - s32 pad; + UNUSED s32 pad; s32 objBankIdx; u32 oldSeg6; @@ -51,7 +51,7 @@ u32 EffectSsIceSmoke_Init(PlayState* play, u32 index, EffectSs* this, void* init } void EffectSsIceSmoke_Draw(PlayState* play, u32 index, EffectSs* this) { - s32 pad; + UNUSED s32 pad; void* object; Mtx* mtx; f32 scale; diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c index b5666bf0408..bb1d5f2a736 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c @@ -42,7 +42,7 @@ u32 EffectSsKFire_Init(PlayState* play, u32 index, EffectSs* this, void* initPar void EffectSsKFire_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - s32 pad; + UNUSED s32 pad; f32 xzScale; f32 yScale; diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c index d91e8d60810..6d0fee54bae 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c +++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c @@ -89,7 +89,7 @@ f32 func_809A9818(f32 arg0, f32 arg1) { void EffectSsKakera_Draw(PlayState* play, u32 index, EffectSs* this) { static Color_RGB8 colors[] = { { 255, 255, 255 }, { 235, 170, 130 } }; GraphicsContext* gfxCtx = play->state.gfxCtx; - s32 pad; + UNUSED s32 pad; f32 scale; s32 colorIdx; diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c index 632072003c0..b83d9b9d910 100644 --- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c +++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c @@ -77,7 +77,7 @@ u32 EffectSsKiraKira_Init(PlayState* play, u32 index, EffectSs* this, void* init void EffectSsKiraKira_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx; f32 scale; - s32 pad; + UNUSED s32 pad; MtxF mfTrans; MtxF mfRotY; MtxF mfScale; diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c index 17c6c1260b8..6abe13d5262 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c @@ -118,7 +118,7 @@ void EffectSsLightning_Draw(PlayState* play, u32 index, EffectSs* this) { } void EffectSsLightning_Update(PlayState* play, u32 index, EffectSs* this) { - s32 pad; + UNUSED s32 pad; Vec3f pos; s16 yaw; f32 scale; diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c index 9fdba62b392..03b78cb1fae 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c @@ -79,7 +79,7 @@ void EffectSsSibuki_Draw(PlayState* play, u32 index, EffectSs* this) { } void EffectSsSibuki_Update(PlayState* play, u32 index, EffectSs* this) { - s32 pad[3]; + UNUSED s32 pad[3]; f32 xzVelScale; s16 yaw; Player* player = GET_PLAYER(play); diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c index 1667ac89836..95f224263f2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c +++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c @@ -30,7 +30,7 @@ u32 EffectSsSolderSrchBall_Init(PlayState* play, u32 index, EffectSs* this, void } void EffectSsSolderSrchBall_Update(PlayState* play, u32 index, EffectSs* this) { - s32 pad; + UNUSED s32 pad; f32 playerPosDiffX; f32 playerPosDiffY; f32 playerPosDiffZ; diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c index b2d36a4b731..f5ee8754059 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c @@ -50,7 +50,7 @@ u32 EffectSsStick_Init(PlayState* play, u32 index, EffectSs* this, void* initPar void EffectSsStick_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - s32 pad; + UNUSED s32 pad; OPEN_DISPS(gfxCtx, "../z_eff_ss_stick.c", 153); diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index 08cee5f54ff..2c4317c78be 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -944,7 +944,7 @@ void FileSelect_DrawWindowContents(GameState* thisx) { s16 i; s16 quadVtxIndex; s16 isActive; - s16 pad; + UNUSED s16 pad; OPEN_DISPS(this->state.gfxCtx, "../z_file_choose.c", 1940); @@ -1438,7 +1438,7 @@ void FileSelect_FadeOut(GameState* thisx) { void FileSelect_LoadGame(GameState* thisx) { FileSelectState* this = (FileSelectState*)thisx; u16 swordEquipValue; - s32 pad; + UNUSED s32 pad; if (this->buttonIndex == FS_BTN_SELECT_FILE_1) { Audio_PlaySoundGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, @@ -1872,7 +1872,7 @@ void FileSelect_Destroy(GameState* thisx) { void FileSelect_Init(GameState* thisx) { FileSelectState* this = (FileSelectState*)thisx; u32 size = (u32)_title_staticSegmentRomEnd - (u32)_title_staticSegmentRomStart; - s32 pad; + UNUSED s32 pad; SREG(30) = 1; osSyncPrintf("SIZE=%x\n", size); diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index a2395db5c2e..6d50073cca2 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -301,7 +301,7 @@ static SceneSelectEntry sScenes[] = { void MapSelect_UpdateMenu(MapSelectState* this) { Input* input = &this->state.input[0]; - s32 pad; + UNUSED s32 pad; SceneSelectEntry* selectedScene; if (this->verticalInputAccumulator == 0) { @@ -724,7 +724,7 @@ void MapSelect_Destroy(GameState* thisx) { void MapSelect_Init(GameState* thisx) { MapSelectState* this = (MapSelectState*)thisx; u32 size; - s32 pad; + UNUSED s32 pad; this->state.main = MapSelect_Main; this->state.destroy = MapSelect_Destroy; diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index 4dde02f9628..302c039b2de 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -60,11 +60,11 @@ void ConsoleLogo_Draw(ConsoleLogoState* this) { u16 y; u16 idx; - s32 pad1; + UNUSED s32 pad1; Vec3f v3; Vec3f v1; Vec3f v2; - s32 pad2[2]; + UNUSED s32 pad2[2]; OPEN_DISPS(this->state.gfxCtx, "../z_title.c", 395); @@ -130,7 +130,7 @@ void ConsoleLogo_Main(GameState* thisx) { if (gIsCtrlr2Valid) { Gfx* gfx = POLY_OPA_DISP; - s32 pad; + UNUSED s32 pad; ConsoleLogo_PrintBuildInfo(&gfx); POLY_OPA_DISP = gfx; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c index 68927437544..1e50d58d128 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c @@ -67,9 +67,9 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { s16 sp21A; s16 sp218; s16 sp216; - s16 pad1; + UNUSED s16 pad1; s16 phi_v1; - s16 pad2; + UNUSED s16 pad2; s16 cursorItem; s16 sp208[3]; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c index ef47e9d34d4..64081188ad8 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c @@ -36,7 +36,7 @@ static s16 sSlotItems[] = { void KaleidoScope_DrawDebugEditorText(Gfx** gfxp) { GfxPrint printer; - s32 pad[2]; + UNUSED s32 pad[2]; GfxPrint_Init(&printer); GfxPrint_Open(&printer, *gfxp); diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index cd3d9855551..28c1b482339 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -24,7 +24,7 @@ void KaleidoScope_DrawEquipmentImage(PlayState* play, void* source, u32 width, u s32 textureHeight; s32 remainingSize; s32 textureSize; - s32 pad; + UNUSED s32 pad; s32 i; OPEN_DISPS(play->state.gfxCtx, "../z_kaleido_equipment.c", 68); @@ -126,7 +126,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) { u16 temp; u16 point; u16 rowStart; - u16 pad; + UNUSED u16 pad; s16 cursorMoveResult; u16 cursorItem; u16 cursorSlot; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index 35bc5547686..5d257c4df91 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -2435,7 +2435,7 @@ void KaleidoScope_UpdateCursorSize(PlayState* play) { void KaleidoScope_LoadDungeonMap(PlayState* play) { InterfaceContext* interfaceCtx = &play->interfaceCtx; - s32 pad; + UNUSED s32 pad; DmaMgr_SendRequest1(interfaceCtx->mapSegment, (u32)_map_48x85_staticSegmentRomStart + (R_MAP_TEX_INDEX * 2040), 2040, "../z_kaleido_scope_PAL.c", 3467); @@ -2485,7 +2485,7 @@ void KaleidoScope_Update(PlayState* play) { s16 stepG; s16 stepB; s16 stepA; - s32 pad; + UNUSED s32 pad; if ((R_PAUSE_MENU_MODE >= 3) && (((pauseCtx->state >= 4) && (pauseCtx->state <= 7)) || ((pauseCtx->state >= 0xA) && (pauseCtx->state <= 0x12)))) { From 17691530d291220ba47e7d611bd3880b521bba33 Mon Sep 17 00:00:00 2001 From: Thar0 <17233964+Thar0@users.noreply.github.com> Date: Tue, 5 Jul 2022 04:24:44 +0100 Subject: [PATCH 02/14] No more unused variable warnings --- Makefile | 2 +- .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c | 2 +- .../ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c | 2 +- .../ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c | 2 +- .../ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c | 5 ++--- .../ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c | 2 +- .../ovl_Bg_Haka_Megane/z_bg_haka_megane.c | 2 +- .../ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c | 2 +- .../ovl_Bg_Ice_Objects/z_bg_ice_objects.c | 2 +- .../ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c | 2 +- .../actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c | 2 +- src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c | 2 +- .../actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c | 2 +- .../ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c | 2 +- .../z_bg_spot01_idohashira.c | 2 +- .../z_bg_spot11_bakudankabe.c | 2 +- .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 4 ++-- src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 10 ++++------ src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c | 4 +--- .../actors/ovl_Boss_Ganon/z_boss_ganon.c | 2 +- .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 4 ++-- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 4 +--- src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 2 +- src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 11 +++++------ src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c | 2 +- .../actors/ovl_Demo_Effect/z_demo_effect.c | 4 ++-- .../actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 14 ++++++-------- .../actors/ovl_Door_Warp1/z_door_warp1.c | 1 - .../actors/ovl_En_Attack_Niw/z_en_attack_niw.c | 2 +- src/overlays/actors/ovl_En_Ba/z_en_ba.c | 2 +- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 12 ++++++------ src/overlays/actors/ovl_En_Bx/z_en_bx.c | 2 +- src/overlays/actors/ovl_En_Daiku/z_en_daiku.c | 2 -- src/overlays/actors/ovl_En_Dha/z_en_dha.c | 2 +- .../ovl_En_Diving_Game/z_en_diving_game.c | 2 +- src/overlays/actors/ovl_En_Dog/z_en_dog.c | 2 +- .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 4 ++-- src/overlays/actors/ovl_En_Fd/z_en_fd.c | 4 ++-- .../actors/ovl_En_Fd_Fire/z_en_fd_fire.c | 2 +- .../actors/ovl_En_Fire_Rock/z_en_fire_rock.c | 4 +--- src/overlays/actors/ovl_En_Fr/z_en_fr.c | 2 +- src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 1 - src/overlays/actors/ovl_En_Go/z_en_go.c | 4 ++-- src/overlays/actors/ovl_En_Go2/z_en_go2.c | 2 +- src/overlays/actors/ovl_En_Gs/z_en_gs.c | 2 +- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 18 ++++++++---------- src/overlays/actors/ovl_En_Hy/z_en_hy.c | 2 +- .../actors/ovl_En_Ice_Hono/z_en_ice_hono.c | 2 +- src/overlays/actors/ovl_En_In/z_en_in.c | 2 +- .../actors/ovl_En_Insect/z_en_insect.c | 10 +++++----- src/overlays/actors/ovl_En_Kz/z_en_kz.c | 4 ++-- src/overlays/actors/ovl_En_Mb/z_en_mb.c | 2 +- src/overlays/actors/ovl_En_Mk/z_en_mk.c | 4 ++-- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 3 +-- src/overlays/actors/ovl_En_Niw/z_en_niw.c | 8 ++++---- .../z_en_okarina_effect.c | 2 +- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 4 +--- .../actors/ovl_En_Po_Sisters/z_en_po_sisters.c | 3 --- src/overlays/actors/ovl_En_Rd/z_en_rd.c | 14 +++++++------- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 1 - src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 4 ++-- src/overlays/actors/ovl_En_Sth/z_en_sth.c | 2 +- src/overlays/actors/ovl_En_Sw/z_en_sw.c | 2 +- .../ovl_En_Syateki_Niw/z_en_syateki_niw.c | 6 +++--- src/overlays/actors/ovl_En_Tana/z_en_tana.c | 6 +++--- src/overlays/actors/ovl_En_Test/z_en_test.c | 14 +++++++------- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 4 ++-- src/overlays/actors/ovl_En_Toryo/z_en_toryo.c | 3 +-- src/overlays/actors/ovl_En_Trap/z_en_trap.c | 2 +- .../actors/ovl_En_Vb_Ball/z_en_vb_ball.c | 5 ++--- src/overlays/actors/ovl_En_Xc/z_en_xc.c | 2 +- src/overlays/actors/ovl_En_Zf/z_en_zf.c | 2 +- src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 4 +--- src/overlays/actors/ovl_En_Zo/z_en_zo.c | 4 ++-- .../actors/ovl_Item_Ocarina/z_item_ocarina.c | 2 +- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 1 - .../actors/ovl_Obj_Kibako/z_obj_kibako.c | 2 +- .../actors/ovl_Object_Kankyo/z_object_kankyo.c | 15 +++++++-------- .../actors/ovl_Oceff_Spot/z_oceff_spot.c | 2 +- .../actors/ovl_Oceff_Storm/z_oceff_storm.c | 2 +- .../actors/ovl_Oceff_Wipe/z_oceff_wipe.c | 2 +- .../actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c | 2 +- .../actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c | 2 +- .../actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c | 2 +- .../actors/ovl_player_actor/z_player.c | 2 -- .../ovl_file_choose/z_file_copy_erase.c | 2 +- .../ovl_file_choose/z_file_nameset_PAL.c | 3 +-- .../misc/ovl_kaleido_scope/z_kaleido_collect.c | 2 +- .../misc/ovl_kaleido_scope/z_kaleido_map_PAL.c | 2 +- .../ovl_kaleido_scope/z_kaleido_scope_PAL.c | 2 +- 90 files changed, 149 insertions(+), 183 deletions(-) diff --git a/Makefile b/Makefile index 64271e06170..03b54a08cb1 100644 --- a/Makefile +++ b/Makefile @@ -101,7 +101,7 @@ EMU_FLAGS = --noosd INC := -Iinclude -Isrc -Ibuild -I. # Check code syntax with host compiler -CHECK_WARNINGS := -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -Wno-unused-parameter -Wno-unused-variable -Wno-missing-braces +CHECK_WARNINGS := -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -Wno-unused-parameter -Wno-missing-braces CPP := cpp MKLDSCRIPT := tools/mkldscript 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 be5392a6178..05572b812b6 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -132,7 +132,7 @@ Actor* BgBreakwall_SpawnFragments(PlayState* play, BgBreakwall* this, Vec3f* pos s32 i; s16 angle1; s16 angle2 = 0; - Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; // unused + UNUSED Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; Vec3s actorRotList[] = { { 0, 0, 0 }, { 0, 0, 0x4000 }, { 0, 0, -0x4000 }, { 0, 0, 0 } }; Vec3f actorScaleList[] = { { 0.004f, 0.004f, 0.004f }, diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index c81e7155d41..5ce90bbda33 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -244,7 +244,7 @@ void BgGanonOtyuka_Update(Actor* thisx, PlayState* play) { } void BgGanonOtyuka_Draw(Actor* thisx, PlayState* play) { - BgGanonOtyuka* this = (BgGanonOtyuka*)thisx; + UNUSED BgGanonOtyuka* this = (BgGanonOtyuka*)thisx; s16 i; Gfx* phi_s2; Gfx* phi_s1; diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index 23cc15fbee8..ffdc38d791a 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -96,7 +96,7 @@ void BgGjyoBridge_Update(Actor* thisx, PlayState* play) { } void BgGjyoBridge_Draw(Actor* thisx, PlayState* play) { - BgGjyoBridge* this = (BgGjyoBridge*)thisx; + UNUSED BgGjyoBridge* this = (BgGjyoBridge*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_bg_gjyo_bridge.c", 260); diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c index ee3c834fbba..b82502212f8 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c @@ -170,11 +170,10 @@ void BgGndDarkmeiro_UpdateSwitchBlock(BgGndDarkmeiro* this, PlayState* play) { BgGndDarkmeiro_ToggleBlock(this, play); } -void BgGndDarkmeiro_Update(Actor* thisx, PlayState* play2) { +void BgGndDarkmeiro_Update(Actor* thisx, PlayState* play) { BgGndDarkmeiro* this = (BgGndDarkmeiro*)thisx; - PlayState* play = play2; - this->updateFunc(this, play2); + this->updateFunc(this, play); } void BgGndDarkmeiro_DrawInvisiblePath(Actor* thisx, PlayState* play) { diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c index b857fe7d1bc..81b405487d9 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c @@ -352,7 +352,7 @@ void BgGndIceblock_Update(Actor* thisx, PlayState* play) { void BgGndIceblock_Draw(Actor* thisx, PlayState* play) { UNUSED s32 pad; - BgGndIceblock* this = (BgGndIceblock*)thisx; + UNUSED BgGndIceblock* this = (BgGndIceblock*)thisx; Gfx_DrawDListOpa(play, gWaterTrialIceBlockDL); } diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c index d3154f74599..718bbf7dcbd 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c @@ -127,7 +127,7 @@ void BgHakaMegane_Update(Actor* thisx, PlayState* play) { } void BgHakaMegane_Draw(Actor* thisx, PlayState* play) { - BgHakaMegane* this = (BgHakaMegane*)thisx; + UNUSED BgHakaMegane* this = (BgHakaMegane*)thisx; if (CHECK_FLAG_ALL(thisx->flags, ACTOR_FLAG_7)) { Gfx_DrawDListXlu(play, sDLists[thisx->params]); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c index 8c22ce09d31..3a2988e1743 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c @@ -296,7 +296,7 @@ void BgHidanSekizou_Update(Actor* thisx, PlayState* play2) { Gfx* func_8088D9F4(PlayState* play, BgHidanSekizou* this, s16 arg2, MtxF* arg3, f32 arg4, f32 arg5, s16 arg6, Gfx* arg7) { - f32 temp_f0; + UNUSED s32 pad; f32 temp_f2; f32 phi_f12; diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c index b5c282ab796..5c18caee07a 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c @@ -231,7 +231,7 @@ void BgIceObjects_Update(Actor* thisx, PlayState* play) { void BgIceObjects_Draw(Actor* thisx, PlayState* play) { UNUSED s32 pad; - BgIceObjects* this = (BgIceObjects*)thisx; + UNUSED BgIceObjects* this = (BgIceObjects*)thisx; Gfx_DrawDListOpa(play, object_ice_objects_DL_000190); } diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c index 1721755e291..08d7a0b3c1f 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c @@ -46,7 +46,7 @@ void func_80891AC0(BgIceShutter* this) { void BgIceShutter_Init(Actor* thisx, PlayState* play) { BgIceShutter* this = (BgIceShutter*)thisx; - f32 sp24; + UNUSED s32 pad; CollisionHeader* colHeader; s32 sp28; f32 temp_f6; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index f8719e49d38..414df4830d0 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -325,7 +325,7 @@ void BgMizuWater_Update(Actor* thisx, PlayState* play) { } void BgMizuWater_Draw(Actor* thisx, PlayState* play) { - BgMizuWater* this = (BgMizuWater*)thisx; + UNUSED BgMizuWater* this = (BgMizuWater*)thisx; s32 gameplayFrames; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mizu_water.c", 738); diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c index 2c611f6a916..25e7906402c 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c @@ -100,7 +100,7 @@ void BgMjin_Update(Actor* thisx, PlayState* play) { } void BgMjin_Draw(Actor* thisx, PlayState* play) { - BgMjin* this = (BgMjin*)thisx; + UNUSED BgMjin* this = (BgMjin*)thisx; Gfx* dlist; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mjin.c", 250); diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index d1a1540102f..d24a398f65d 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -143,7 +143,7 @@ void BgMoriBigst_SetupStalfosFight(BgMoriBigst* this, PlayState* play) { } void BgMoriBigst_StalfosFight(BgMoriBigst* this, PlayState* play) { - Player* player = GET_PLAYER(play); + UNUSED s32 pad; if ((this->dyna.actor.home.rot.z == 0) && ((this->dyna.actor.home.pos.y - 5.0f) <= GET_PLAYER(play)->actor.world.pos.y)) { diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c index bb00444f88c..b1ae89a84b4 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c @@ -223,7 +223,7 @@ void BgMoriHineri_Update(Actor* thisx, PlayState* play) { void BgMoriHineri_DrawHallAndRoom(Actor* thisx, PlayState* play) { BgMoriHineri* this = (BgMoriHineri*)thisx; - s8 objIndex; + UNUSED s32 pad; MtxF mtx; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mori_hineri.c", 611); diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index 43dd95430d5..a8a779f6926 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -193,7 +193,7 @@ s32 func_808AB29C(BgSpot01Idohashira* this, PlayState* play) { Vec3f initPos; f32 endZ; f32 tempY; - f32 tempZ; + UNUSED s32 pad; npcAction = BgSpot01Idohashira_GetNpcAction(play, 2); if (npcAction != NULL) { diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index d151a187598..069aa9af83e 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -146,7 +146,7 @@ void BgSpot11Bakudankabe_Update(Actor* thisx, PlayState* play) { } void BgSpot11Bakudankabe_Draw(Actor* thisx, PlayState* play) { - BgSpot11Bakudankabe* this = (BgSpot11Bakudankabe*)thisx; + UNUSED BgSpot11Bakudankabe* this = (BgSpot11Bakudankabe*)thisx; Gfx_DrawDListOpa(play, gDesertColossusBombableWallDL); } diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index f3f20edff80..0ce821f9804 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -599,8 +599,8 @@ void BossDodongo_GetUp(BossDodongo* this, PlayState* play) { void BossDodongo_BlowFire(BossDodongo* this, PlayState* play) { UNUSED s32 pad; - Vec3f unusedZeroVec1 = { 0.0f, 0.0f, 0.0f }; - Vec3f unusedZeroVec2 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f zeroVec1 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f zeroVec2 = { 0.0f, 0.0f, 0.0f }; SkelAnime_Update(&this->skelAnime); diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index 229d5421cfc..1a5e80b22d6 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -268,7 +268,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) { Player* player = GET_PLAYER(play); f32 angleToTarget; f32 pitchToTarget; - Vec3f* holePosition1; + UNUSED s32 pad; f32 temp_y; f32 temp_x; f32 temp_z; @@ -763,7 +763,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) { Vec3f sp170; Vec3f sp164 = { 0.0f, 0.03f, 0.0f }; Vec3f sp158; - f32 pad154; + UNUSED s32 pad; s16 temp_rand2; s16 sp150; @@ -926,9 +926,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) { Vec3f spE0[3]; Vec3f spBC[3]; f32 phi_f20; - f32 padB4; - f32 padB0; - f32 padAC; + UNUSED s32 pad1[3]; Math_ApproachS(&this->actor.world.rot.y, angleToTarget, 0xA, this->fwork[BFD_TURN_RATE]); @@ -1887,7 +1885,7 @@ void BossFd_DrawBody(PlayState* play, BossFd* this) { Vec3f spF0 = { 0.0f, 0.0f, 0.0f }; Vec3f spE4; Vec3s spDC; - f32 padD8; + UNUSED s32 pad; if (this->bodyFallApart[i] < 2) { f32 spD4 = 0.1f; diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index 1689957f2e6..d8e4c6eb2c2 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -642,9 +642,7 @@ void BossFd2_Death(BossFd2* this, PlayState* play) { Vec3f sp64; BossFd* bossFd = (BossFd*)this->actor.parent; Camera* mainCam = Play_GetCamera(play, CAM_ID_MAIN); - f32 pad3; - f32 pad2; - f32 pad1; + UNUSED s32 pad[3]; f32 cameraShake; SkelAnime* skelAnime = &this->skelAnime; diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index 4c99686dd9a..845e0e5f664 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -3777,7 +3777,7 @@ void BossGanon_DrawShadowTexture(void* tex, BossGanon* this, PlayState* play) { } void BossGanon_Draw(Actor* thisx, PlayState* play) { - s32 i; + UNUSED s32 pad; BossGanon* this = (BossGanon*)thisx; void* shadowTex; diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index 6a99c041d7c..65e851d36f1 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -1038,7 +1038,7 @@ void func_808FFCFC(BossGanon2* this, PlayState* play) { } void func_808FFDB0(BossGanon2* this, PlayState* play) { - s32 sp28; + UNUSED s32 pad; s32 objectIdx = Object_GetIndex(&play->objectCtx, OBJECT_GANON2); if (Object_IsLoaded(&play->objectCtx, objectIdx)) { @@ -1467,7 +1467,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) { f32 temp_f12; Camera* mainCam; s16 temp_a0_2; - f32 phi_f0; + UNUSED s32 pad; s32 phi_a1; player = GET_PLAYER(play); diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index 0dbb002b478..46132f74ef4 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -1205,9 +1205,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) { Vec3f bubblePos; Vec3f bubblePos2; Camera* mainCam2; - f32 pad50; - f32 pad4C; - f32 pad48; + UNUSED s32 pad[3]; if (this->csState < MO_INTRO_REVEAL) { this->subCamFov = 80.0f; diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index 86556e18083..eabcf13eb20 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -1162,7 +1162,7 @@ void BossSst_HeadSetupFinish(BossSst* this) { void BossSst_HeadFinish(BossSst* this, PlayState* play) { static Color_RGBA8 colorIndigo = { 80, 80, 150, 255 }; static Color_RGBA8 colorDarkIndigo = { 40, 40, 80, 255 }; - static Color_RGBA8 colorUnused[2] = { + UNUSED static Color_RGBA8 colorUnused[2] = { { 0, 0, 0, 255 }, { 100, 100, 100, 0 }, }; diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index e17b3a37e1d..3d6bc23902f 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -2149,8 +2149,7 @@ void BossVa_SetupZapperDeath(BossVa* this, PlayState* play) { void BossVa_ZapperDeath(BossVa* this, PlayState* play) { f32 sp3C = 55.0f; - f32 tmpf1; - f32 tmpf2; + UNUSED s32 pad; BossVa_AttachToBody(this); if (((play->gameplayFrames % 32) == 0) && (sCsState <= DEATH_BODY_TUMORS)) { @@ -2727,7 +2726,7 @@ void BossVa_SetupBariPhase3Stunned(BossVa* this, PlayState* play) { } void BossVa_BariPhase3Stunned(BossVa* this, PlayState* play) { - s32 sp44_pad; + UNUSED s32 pad; Vec3f sp40 = GET_BODY(this)->unk_1D8; this->actor.world.rot.x = Math_Vec3f_Pitch(&GET_BODY(this)->actor.world.pos, &this->actor.world.pos); @@ -3144,7 +3143,7 @@ s32 BossVa_BariOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec } void BossVa_BariPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { - BossVa* this = (BossVa*)thisx; + UNUSED BossVa* this = (BossVa*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_boss_va.c", 4494); @@ -3174,7 +3173,7 @@ void BossVa_Draw(Actor* thisx, PlayState* play) { Vec3f sp8C = { -15.0f, 40.0f, 0.0f }; Vec3f sp80 = { 15.0f, 40.0f, 0.0f }; Vec3f sp74 = { -15.0f, 40.0f, 0.0f }; - Color_RGBA8 unused = { 250, 250, 230, 200 }; + UNUSED Color_RGBA8 unused = { 250, 250, 230, 200 }; OPEN_DISPS(play->state.gfxCtx, "../z_boss_va.c", 4542); @@ -3944,7 +3943,7 @@ void BossVa_SpawnGore(PlayState* play, BossVaEffect* effect, Vec3f* pos, s16 yaw void BossVa_SpawnZapperCharge(PlayState* play, BossVaEffect* effect, BossVa* this, Vec3f* pos, Vec3s* rot, s16 scale, u8 mode) { - Vec3f unused = { 0.0f, -1000.0f, 0.0f }; + UNUSED Vec3f unused = { 0.0f, -1000.0f, 0.0f }; s16 i; for (i = 0; i < BOSS_VA_EFFECT_COUNT; i++, effect++) { diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index 37868a86343..c1cfb638d41 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -1076,7 +1076,7 @@ void DemoEc_UpdateFishingOwner(DemoEc* this, PlayState* play) { } void DemoEc_FishingOwnerPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) { - DemoEc* this = (DemoEc*)thisx; + UNUSED DemoEc* this = (DemoEc*)thisx; if ((limbIndex == 8) && !(HIGH_SCORE(HS_FISHING) & 0x1000)) { gSPDisplayList((*gfx)++, SEGMENTED_TO_VIRTUAL(gFishingOwnerHatDL)); 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 a05ec7204a0..e95dca4b014 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -1033,7 +1033,7 @@ void DemoEffect_UpdateBlueOrbGrow(DemoEffect* this, PlayState* play) { * This function updates the position and scale of the actor based on the current cutscene command. */ void DemoEffect_UpdateLightEffect(DemoEffect* this, PlayState* play) { - u16 action; + UNUSED s32 pad; s32 isLargeSize; isLargeSize = ((this->actor.params & 0x0F00) >> 8); @@ -1773,7 +1773,7 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, PlayState* play) { * Draw function for the Fire Ball Actor. */ void DemoEffect_DrawFireBall(Actor* thisx, PlayState* play) { - DemoEffect* this = (DemoEffect*)thisx; + UNUSED DemoEffect* this = (DemoEffect*)thisx; u32 frames = play->gameplayFrames; OPEN_DISPS(play->state.gfxCtx, "../z_demo_effect.c", 2701); 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 97135cdb29d..5c95bda2d5c 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -707,7 +707,7 @@ void DemoKankyo_DrawDoorOfTime(Actor* thisx, PlayState* play) { } void DemoKankyo_DrawLightPlane(Actor* thisx, PlayState* play) { - DemoKankyo* this = (DemoKankyo*)thisx; + UNUSED DemoKankyo* this = (DemoKankyo*)thisx; UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_demo_kankyo.c", 1514); @@ -755,9 +755,8 @@ void DemoKankyo_Vec3fAddPosRot(PosRot* posRot, Vec3f* vec, Vec3f* dst) { void DemoKankyo_DrawWarpSparkles(Actor* thisx, PlayState* play) { static f32 sWarpRoll; static f32 sWarpFoV; - // the following 2 vars are unused - static u32 D_8098CF90; - static u32 D_8098CF94; + UNUSED static s32 D_8098CF90; + UNUSED static s32 D_8098CF94; static Vec3f D_8098CF98; s16 i; @@ -895,10 +894,9 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, PlayState* play) { void DemoKankyo_DrawSparkles(Actor* thisx, PlayState* play) { static f32 sSparklesRoll; static f32 sSparklesFoV; - // the following 3 vars are unused - static u32 D_8098CFAC; - static u32 D_8098CFB0; - static u32 D_8098CFB4; + UNUSED static s32 D_8098CFAC; + UNUSED static s32 D_8098CFB0; + UNUSED static s32 D_8098CFB4; static Vec3f D_8098CFB8; DemoKankyo* this = (DemoKankyo*)thisx; 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 46648fceaaa..bd1efe1a015 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -289,7 +289,6 @@ void DoorWarp1_BlueCrystal(DoorWarp1* this, PlayState* play) { } void func_80999214(DoorWarp1* this, PlayState* play) { - s32 temp_f4; f32 darkness; s16 i; 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 e33df076586..2f747ed17bc 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 @@ -375,7 +375,7 @@ void EnAttackNiw_Update(Actor* thisx, PlayState* play) { s32 func_809B5F98(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { EnAttackNiw* this = (EnAttackNiw*)thisx; - Vec3f sp0 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f sp0 = { 0.0f, 0.0f, 0.0f }; if (limbIndex == 13) { rot->y += (s16)this->unk_2BC; diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/src/overlays/actors/ovl_En_Ba/z_en_ba.c index 35abebbcc0e..52b0f97f365 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -476,7 +476,7 @@ void EnBa_Draw(Actor* thisx, PlayState* play) { UNUSED s32 pad; s16 i; Mtx* mtx = Graph_Alloc(play->state.gfxCtx, sizeof(Mtx) * 14); - Vec3f unused = { 0.0f, 0.0f, 448.0f }; + UNUSED Vec3f unused = { 0.0f, 0.0f, 448.0f }; OPEN_DISPS(play->state.gfxCtx, "../z_en_ba.c", 933); Gfx_SetupDL_25Opa(play->state.gfxCtx); 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 dfad886e55d..e8fda69801b 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -466,8 +466,8 @@ void EnBb_SetupDeath(EnBb* this, PlayState* play) { void EnBb_Death(EnBb* this, PlayState* play) { s16 enpartType = 3; - Vec3f sp40 = { 0.0f, 0.5f, 0.0f }; - Vec3f sp34 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f sp40 = { 0.0f, 0.5f, 0.0f }; + UNUSED Vec3f sp34 = { 0.0f, 0.0f, 0.0f }; if (this->actor.params <= ENBB_BLUE) { Math_SmoothStepToF(&this->flameScaleY, 0.0f, 1.0f, 30.0f, 0.0f); @@ -1224,10 +1224,10 @@ void EnBb_CollisionCheck(EnBb* this, PlayState* play) { void EnBb_Update(Actor* thisx, PlayState* play2) { PlayState* play = play2; EnBb* this = (EnBb*)thisx; - Vec3f sp4C = { 0.0f, 0.0f, 0.0f }; - Vec3f sp40 = { 0.0f, -0.6f, 0.0f }; - Color_RGBA8 sp3C = { 0, 0, 255, 255 }; - Color_RGBA8 sp38 = { 0, 0, 0, 0 }; + UNUSED Vec3f sp4C = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f sp40 = { 0.0f, -0.6f, 0.0f }; + UNUSED Color_RGBA8 sp3C = { 0, 0, 255, 255 }; + UNUSED Color_RGBA8 sp38 = { 0, 0, 0, 0 }; f32 sp34 = -15.0f; if (this->actor.params <= ENBB_BLUE) { diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index d85252212ec..aa5b6200eb4 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -69,7 +69,7 @@ static ColliderQuadInit sQuadInit = { void EnBx_Init(Actor* thisx, PlayState* play) { EnBx* this = (EnBx*)thisx; Vec3f sp48 = { 0.015f, 0.015f, 0.015f }; - Vec3f sp3C = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f sp3C = { 0.0f, 0.0f, 0.0f }; static InitChainEntry sInitChain[] = { ICHAIN_F32(targetArrowOffset, 5300, ICHAIN_STOP), }; 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 590977abb50..22e07546477 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -351,8 +351,6 @@ void EnDaiku_TentIdle(EnDaiku* this, PlayState* play) { */ void EnDaiku_Jailed(EnDaiku* this, PlayState* play) { EnGeldB* gerudo; - s32 temp_t9; - s32 temp_v1; if (!(this->stateFlags & ENDAIKU_STATEFLAG_GERUDOFIGHTING)) { EnDaiku_UpdateText(this, play); diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index 56901bc8775..da51576fe02 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -189,7 +189,7 @@ void EnDha_SetupWait(EnDha* this) { } void EnDha_Wait(EnDha* this, PlayState* play) { - Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; // unused + UNUSED Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; Vec3f armPosMultiplier1 = { 0.0f, 0.0f, 55.0f }; Vec3f armPosMultiplier2 = { 0.0f, 0.0f, -54.0f }; Player* player = GET_PLAYER(play); diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index 0ab1eec6498..4872a4dd2bd 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -567,7 +567,7 @@ s32 EnDivingGame_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, V void EnDivingGame_Draw(Actor* thisx, PlayState* play) { EnDivingGame* this = (EnDivingGame*)thisx; - GraphicsContext* gfxCtx = play->state.gfxCtx; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_diving_game.c", 1212); Gfx_SetupDL_25Opa(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index 8ec4146190a..4e5b7d1b744 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -303,7 +303,7 @@ void EnDog_Destroy(Actor* thisx, PlayState* play) { void EnDog_FollowPath(EnDog* this, PlayState* play) { s32 behaviors[] = { DOG_SIT, DOG_BOW, DOG_BARK }; - s32 unused[] = { 40, 80, 20 }; + UNUSED s32 unused[] = { 40, 80, 20 }; f32 speed; s32 frame; diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index 99870683261..fd1c585798d 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -267,8 +267,8 @@ void EnExRuppy_Sink(EnExRuppy* this, PlayState* play) { void EnExRuppy_WaitInGame(EnExRuppy* this, PlayState* play) { EnDivingGame* divingGame; - Vec3f D_80A0B388 = { 0.0f, 0.1f, 0.0f }; - Vec3f D_80A0B394 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f D_80A0B388 = { 0.0f, 0.1f, 0.0f }; + UNUSED Vec3f D_80A0B394 = { 0.0f, 0.0f, 0.0f }; f32 localConst = 30.0f; if (this->timer == 0) { diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c index 240dd93c2a1..17f5f9c562c 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -710,8 +710,8 @@ s32 EnFd_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* po void EnFd_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfxP) { EnFd* this = (EnFd*)thisx; - Vec3f unused0 = { 6800.0f, 0.0f, 0.0f }; - Vec3f unused1 = { 6800.0f, 0.0f, 0.0f }; + UNUSED Vec3f unused0 = { 6800.0f, 0.0f, 0.0f }; + UNUSED Vec3f unused1 = { 6800.0f, 0.0f, 0.0f }; Vec3f initialPos = { 0.0f, 0.0f, 0.0f }; Vec3f pos = { 0.0f, 0.0f, 0.0f }; Vec3f accel = { 0.0f, 0.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c index efe9a47fd17..6fdbbb747de 100644 --- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c +++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c @@ -240,7 +240,7 @@ void EnFdFire_Draw(Actor* thisx, PlayState* play) { UNUSED s32 pad; EnFdFire* this = (EnFdFire*)thisx; Vec3f scale = { 0.0f, 0.0f, 0.0f }; - Vec3f sp90 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f sp90 = { 0.0f, 0.0f, 0.0f }; s16 sp8E; f32 sp88; f32 sp84; 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 31dba2a4d86..0099ff1b580 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 @@ -68,10 +68,9 @@ static ColliderCylinderInit D_80A12CCC = { }; void EnFireRock_Init(Actor* thisx, PlayState* play) { - PlayState* play2 = play; + UNUSED s32 pad; Player* player = GET_PLAYER(play); EnFireRock* this = (EnFireRock*)thisx; - s16 temp; this->type = this->actor.params; if (this->type != FIRE_ROCK_CEILING_SPOT_SPAWNER) { @@ -229,7 +228,6 @@ void EnFireRock_SpawnMoreBrokenPieces(EnFireRock* this, PlayState* play) { EnFireRock* spawnedFireRock; s32 nextRockType; s32 i; - s32 temp; nextRockType = FIRE_ROCK_SPAWNED_FALLING1; switch (this->type) { 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 1b808453e4e..0615d6bcb76 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -1053,7 +1053,7 @@ s32 EnFr_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* po } void EnFr_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { - EnFr* this = (EnFr*)thisx; + UNUSED EnFr* this = (EnFr*)thisx; if ((limbIndex == 7) || (limbIndex == 8)) { OPEN_DISPS(play->state.gfxCtx, "../z_en_fr.c", 1735); 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 fc08569055d..2a23d340753 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -894,7 +894,6 @@ void EnGirlA_Noop(EnGirlA* this, PlayState* play) { void EnGirlA_SetItemDescription(PlayState* play, EnGirlA* this) { ShopItemEntry* tmp = &shopItemEntries[this->actor.params]; - s32 params = this->actor.params; s32 maskId; s32 isMaskFreeToBorrow; 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 5a9ef419233..a713507ab80 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -621,8 +621,8 @@ void func_80A3F908(EnGo* this, PlayState* play) { void EnGo_Init(Actor* thisx, PlayState* play) { EnGo* this = (EnGo*)thisx; UNUSED s32 pad; - Vec3f D_80A41B9C = { 0.0f, 0.0f, 0.0f }; // unused - Vec3f D_80A41BA8 = { 0.0f, 0.0f, 0.0f }; // unused + UNUSED Vec3f D_80A41B9C = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f D_80A41BA8 = { 0.0f, 0.0f, 0.0f }; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gGoronSkel, NULL, 0, 0, 0); diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index af6898d4ff7..254571f48d5 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -581,7 +581,7 @@ u16 EnGo2_GetTextIdGoronDmtBiggoron(PlayState* play, EnGo2* this) { } s16 EnGo2_GetStateGoronDmtBiggoron(PlayState* play, EnGo2* this) { - s32 unusedPad; + UNUSED s32 pad; u8 dialogState = this->dialogState; switch (EnGo2_GetDialogState(this, play)) { 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 78d62f28f6d..5211d1908e6 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -559,7 +559,7 @@ void EnGs_Update(Actor* thisx, PlayState* play2) { void EnGs_Draw(Actor* thisx, PlayState* play) { EnGs* this = (EnGs*)thisx; - s32 tmp; + UNUSED s32 pad; u32 frames; if (!(this->unk_19E & 8)) { 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 8b943b8207a..faf274c8c90 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -1614,7 +1614,7 @@ void EnHorse_Stub1(EnHorse* this) { } void EnHorse_LowJump(EnHorse* this, PlayState* play) { - Vec3f pad; + UNUSED s32 pad[3]; Vec3s* jointTable; f32 curFrame; f32 y; @@ -1689,7 +1689,7 @@ void EnHorse_Stub2(EnHorse* this) { } void EnHorse_HighJump(EnHorse* this, PlayState* play) { - Vec3f pad; + UNUSED s32 pad[3]; Vec3s* jointTable; f32 curFrame; f32 y; @@ -3109,12 +3109,11 @@ void EnHorse_BgCheckSlowMoving(EnHorse* this, PlayState* play) { } void EnHorse_UpdateBgCheckInfo(EnHorse* this, PlayState* play) { - UNUSED s32 pad; - UNUSED s32 pad2; + UNUSED s32 pad[2]; Vec3f startPos; Vec3f endPos; Vec3f obstaclePos; - f32 pad3; + UNUSED s32 pad1; f32 intersectDist; CollisionPoly* wall = NULL; CollisionPoly* obstacleFloor = NULL; @@ -3123,7 +3122,7 @@ void EnHorse_UpdateBgCheckInfo(EnHorse* this, PlayState* play) { f32 behindObstacleHeight; f32 ny; s32 movingFast; - UNUSED s32 pad5; + UNUSED s32 pad2; DynaPolyActor* dynaPoly; Vec3f intersect; Vec3f obstacleTop; @@ -3399,7 +3398,7 @@ void EnHorse_RegenBoost(EnHorse* this, PlayState* play) { } void EnHorse_UpdatePlayerDir(EnHorse* this, PlayState* play) { - EnHorse* pad; + UNUSED s32 pad; s16 angle; f32 s; f32 c; @@ -3676,9 +3675,8 @@ void EnHorse_PostDraw(Actor* thisx, PlayState* play, Skin* skin) { Vec3f hoofOffset = { 5.0f, -4.0f, 5.0f }; Vec3f riderOffset = { 600.0f, -1670.0f, 0.0f }; Vec3f sp70; - Vec3f sp64 = { 0.0f, 0.0f, 0.0f }; - Vec3f sp58 = { 0.0f, -1.0f, 0.0f }; - + UNUSED Vec3f sp64 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f sp58 = { 0.0f, -1.0f, 0.0f }; f32 frame = this->skin.skelAnime.curFrame; Vec3f center; Vec3f newCenter; diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c index b7b758f4ca3..52e6a671036 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -550,7 +550,7 @@ u16 func_80A6F810(PlayState* play, Actor* thisx) { s16 func_80A70058(PlayState* play, Actor* thisx) { EnHy* this = (EnHy*)thisx; - s16 beggarItems[] = { ITEM_BLUE_FIRE, ITEM_FISH, ITEM_BUG, ITEM_FAIRY }; + UNUSED s16 beggarItems[] = { ITEM_BLUE_FIRE, ITEM_FISH, ITEM_BUG, ITEM_FAIRY }; s16 beggarRewards[] = { 150, 100, 50, 25 }; switch (Message_GetState(&play->msgCtx)) { diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index 5ae085b1ec2..3a674584f0f 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -151,7 +151,7 @@ void EnIceHono_InitSmallFlame(Actor* thisx, PlayState* play) { void EnIceHono_Init(Actor* thisx, PlayState* play) { EnIceHono* this = (EnIceHono*)thisx; - s16 params = this->actor.params; + UNUSED s32 params = this->actor.params; switch (this->actor.params) { case -1: 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 c804c3bd3cb..f6df40f3b83 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -758,7 +758,7 @@ void func_80A7A940(EnIn* this, PlayState* play) { } void func_80A7AA40(EnIn* this, PlayState* play) { - Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; Vec3f subCamAt; Vec3f subCamEye; 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 1818e4ed804..3efc2f9c0ef 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -422,7 +422,7 @@ void EnInsect_SetupDig(EnInsect* this) { void EnInsect_Dig(EnInsect* this, PlayState* play) { static Vec3f accel = { 0.0f, 0.0f, 0.0f }; - static Vec3f unused = { 0.0f, 0.0f, 0.0f }; + UNUSED static Vec3f unused = { 0.0f, 0.0f, 0.0f }; UNUSED s32 pad[2]; Vec3f velocity; @@ -463,9 +463,9 @@ void EnInsect_SetupWalkOnWater(EnInsect* this) { } void EnInsect_WalkOnWater(EnInsect* this, PlayState* play) { - f32 temp_f0; + UNUSED s32 pad; s16 temp_v1; - UNUSED s16 pad; + UNUSED s16 pad1; s16 type; Vec3f ripplePoint; @@ -559,11 +559,11 @@ void EnInsect_SetupDropped(EnInsect* this) { } void EnInsect_Dropped(EnInsect* this, PlayState* play) { - s32 temp_a0; + UNUSED s32 pad; s32 sp50; f32 phi_f0; EnInsect* thisTemp = this; - s32 temp_a1; + UNUSED s32 pad1; f32 distanceSq; f32 phi_f2; s16 type; diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index b3f198c08cf..f23b07df30e 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -362,7 +362,7 @@ void EnKz_PreMweepWait(EnKz* this, PlayState* play) { } void EnKz_SetupMweep(EnKz* this, PlayState* play) { - Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; // unused + UNUSED Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; Vec3f subCamAt; Vec3f subCamEye; @@ -382,7 +382,7 @@ void EnKz_SetupMweep(EnKz* this, PlayState* play) { } void EnKz_Mweep(EnKz* this, PlayState* play) { - Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; // unused + UNUSED Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; Vec3f subCamAt; Vec3f subCamEye; diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index 65c11272595..21bf605f3c4 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -1446,7 +1446,7 @@ void EnMb_Update(Actor* thisx, PlayState* play) { } void EnMb_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { - static Vec3f unused = { 1100.0f, -700.0f, 0.0f }; + UNUSED static Vec3f unused = { 1100.0f, -700.0f, 0.0f }; static Vec3f feetPos = { 0.0f, 0.0f, 0.0f }; static Vec3f effSpawnModelPos = { 0.0f, -8000.0f, 0.0f }; static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; 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 33cd603b6b9..931ed64d212 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -50,7 +50,7 @@ static ColliderCylinderInit sCylinderInit = { void EnMk_Init(Actor* thisx, PlayState* play) { EnMk* this = (EnMk*)thisx; - s32 swimFlag; + UNUSED s32 pad; this->actor.minVelocityY = -4.0f; this->actor.gravity = -1.0f; @@ -211,7 +211,7 @@ void func_80AAD014(EnMk* this, PlayState* play) { void EnMk_Wait(EnMk* this, PlayState* play) { s16 angle; - s32 swimFlag; + UNUSED s32 pad; Player* player = GET_PLAYER(play); s32 playerExchangeItem; 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 4497ca35957..bfa2dcf3b71 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -238,7 +238,6 @@ CsCmdActorAction* EnNb_GetNpcCsAction(PlayState* play, s32 npcActionIdx) { void EnNb_SetupCsPosRot(EnNb* this, PlayState* play, s32 npcActionIdx) { CsCmdActorAction* csCmdNPCAction = EnNb_GetNpcCsAction(play, npcActionIdx); - s16 newRotY; Actor* thisx = &this->actor; if (csCmdNPCAction != NULL) { @@ -967,7 +966,7 @@ void func_80AB2E70(EnNb* this, PlayState* play) { } s32 func_80AB2FC0(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { - EnNb* this = (EnNb*)thisx; + UNUSED EnNb* this = (EnNb*)thisx; if (limbIndex == NB_LIMB_HEAD) { *dList = gNabooruHeadMouthOpenDL; 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 055a7002599..9201fc5f6c6 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -878,8 +878,8 @@ void EnNiw_Update(Actor* thisx, PlayState* play) { Player* player = GET_PLAYER(play); s16 i; s16 featherCount; - Vec3f zeroVec1 = { 0.0f, 0.0f, 0.0f }; - Vec3f zeroVec2 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f zeroVec1 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f zeroVec2 = { 0.0f, 0.0f, 0.0f }; Vec3f pos; Vec3f vel; Vec3f accel; @@ -1113,7 +1113,7 @@ void EnNiw_Update(Actor* thisx, PlayState* play) { s32 EnNiw_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { EnNiw* this = (EnNiw*)thisx; - Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; if (limbIndex == 13) { rot->y += (s16)this->unk_2DC; @@ -1138,7 +1138,7 @@ s32 EnNiw_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p void EnNiw_Draw(Actor* thisx, PlayState* play) { EnNiw* this = (EnNiw*)thisx; Vec3f scale = { 0.15f, 0.15f, 0.15f }; - GraphicsContext* gfxCtx = play->state.gfxCtx; + UNUSED s32 pad; Gfx_SetupDL_25Opa(play->state.gfxCtx); SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, 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 e1713e27638..2bff10a4eb7 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 @@ -33,7 +33,7 @@ void EnOkarinaEffect_SetupAction(EnOkarinaEffect* this, EnOkarinaEffectActionFun } void EnOkarinaEffect_Destroy(Actor* thisx, PlayState* play) { - EnOkarinaEffect* this = (EnOkarinaEffect*)thisx; + UNUSED EnOkarinaEffect* this = (EnOkarinaEffect*)thisx; play->envCtx.precipitation[PRECIP_SOS_MAX] = 0; if ((gWeatherMode != WEATHER_MODE_RAIN) && (gWeatherMode != WEATHER_MODE_HEAVY_RAIN) && 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 871855f7eba..8f689f11734 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -106,7 +106,7 @@ static InitChainEntry sInitChain[] = { void EnOwl_Init(Actor* thisx, PlayState* play) { EnOwl* this = (EnOwl*)thisx; - ColliderCylinder* collider; + UNUSED s32 pad; s32 owlType; s32 switchFlag; @@ -918,8 +918,6 @@ void func_80ACBF50(EnOwl* this, PlayState* play) { void func_80ACC00C(EnOwl* this, PlayState* play) { s32 owlType; - s32 temp_v0; - s32 temp_v0_2; Math_SmoothStepToS(&this->actor.world.rot.y, this->unk_400, 2, 0x384, 0x258); this->actor.shape.rot.y = this->actor.world.rot.y; 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 4aabbdea282..848919a3377 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 @@ -934,9 +934,6 @@ void func_80ADB51C(EnPoSisters* this, PlayState* play) { } void func_80ADB770(EnPoSisters* this, PlayState* play) { - s32 temp_v0; - s32 phi_a0; - if (this->unk_19A != 0) { this->unk_19A--; } 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 f4707f53d4b..7ad04b02234 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -336,9 +336,9 @@ void EnRd_SetupWalkToPlayer(EnRd* this, PlayState* play) { } void EnRd_WalkToPlayer(EnRd* this, PlayState* play) { - Vec3f D_80AE4918 = { 0.0f, 0.0f, 0.0f }; - Color_RGBA8 D_80AE4924 = { 200, 200, 255, 255 }; - Color_RGBA8 D_80AE4928 = { 0, 0, 255, 0 }; + UNUSED Vec3f D_80AE4918 = { 0.0f, 0.0f, 0.0f }; + UNUSED Color_RGBA8 D_80AE4924 = { 200, 200, 255, 255 }; + UNUSED Color_RGBA8 D_80AE4928 = { 0, 0, 255, 0 }; Player* player = GET_PLAYER(play); UNUSED s32 pad; s16 yaw = this->actor.yawTowardsPlayer - this->actor.shape.rot.y - this->headYRotation - this->upperBodyYRotation; @@ -594,9 +594,9 @@ void EnRd_SetupAttemptPlayerFreeze(EnRd* this) { } void EnRd_AttemptPlayerFreeze(EnRd* this, PlayState* play) { - Vec3f D_80AE492C = { 0.0f, 0.0f, 0.0f }; - Color_RGBA8 D_80AE4938 = { 200, 200, 255, 255 }; - Color_RGBA8 D_80AE493C = { 0, 0, 255, 0 }; + UNUSED Vec3f D_80AE492C = { 0.0f, 0.0f, 0.0f }; + UNUSED Color_RGBA8 D_80AE4938 = { 200, 200, 255, 255 }; + UNUSED Color_RGBA8 D_80AE493C = { 0, 0, 255, 0 }; Player* player = GET_PLAYER(play); s16 yaw = this->actor.yawTowardsPlayer - this->actor.shape.rot.y - this->headYRotation - this->upperBodyYRotation; @@ -954,7 +954,7 @@ void EnRd_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, } void EnRd_Draw(Actor* thisx, PlayState* play) { - static Vec3f D_80AE494C = { 300.0f, 0.0f, 0.0f }; + UNUSED static Vec3f D_80AE494C = { 300.0f, 0.0f, 0.0f }; static Vec3f sShadowScale = { 0.25f, 0.25f, 0.25f }; UNUSED s32 pad; EnRd* this = (EnRd*)thisx; diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 961f2cfea91..a0b134c7958 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -424,7 +424,6 @@ s32 func_80AEB480(PlayState* play, u16 action) { void EnRu1_SpawnRipple(EnRu1* this, PlayState* play, s16 radiusMax, s16 life) { Vec3f pos; - Actor* thisx = &this->actor; pos.x = this->actor.world.pos.x; pos.y = this->actor.world.pos.y + this->actor.yDistToWater; 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 a2253056de0..6440e218fb3 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -386,7 +386,7 @@ s32 EnSsh_IsCloseToLink(EnSsh* this, PlayState* play) { s32 EnSsh_IsCloseToHome(EnSsh* this) { f32 vel = this->actor.velocity.y; - f32 nextY = this->actor.world.pos.y + 2.0f * this->actor.velocity.y; + f32 nextY = this->actor.world.pos.y + 2.0f * vel; if (nextY >= this->actor.home.pos.y) { return 1; @@ -396,7 +396,7 @@ s32 EnSsh_IsCloseToHome(EnSsh* this) { s32 EnSsh_IsCloseToGround(EnSsh* this) { f32 vel = this->actor.velocity.y; - f32 nextY = this->actor.world.pos.y + 2.0f * this->actor.velocity.y; + f32 nextY = this->actor.world.pos.y + 2.0f * vel; if ((nextY - this->actor.floorHeight) <= this->floorHeightOffset) { return 1; 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 a9a6ebd46fd..ae501bd3d1b 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -385,7 +385,7 @@ Gfx* EnSth_AllocColorDList(GraphicsContext* play, u8 envR, u8 envG, u8 envB, u8 void EnSth_Draw(Actor* thisx, PlayState* play) { EnSth* this = (EnSth*)thisx; - Color_RGB8* envColor1; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_en_sth.c", 2133); 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 4fb8283bf36..63e4804071d 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -216,7 +216,7 @@ s32 func_80B0C0CC(EnSw* this, PlayState* play, s32 arg2) { void EnSw_Init(Actor* thisx, PlayState* play) { EnSw* this = (EnSw*)thisx; s32 phi_v0; - Vec3f sp4C = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f sp4C = { 0.0f, 0.0f, 0.0f }; UNUSED s32 pad; if (thisx->params & 0x8000) { diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 420c2fb09f1..36226e20bb9 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -573,8 +573,8 @@ void EnSyatekiNiw_Update(Actor* thisx, PlayState* play) { EnSyatekiNiw* this = (EnSyatekiNiw*)thisx; UNUSED s32 pad; s16 i; - Vec3f sp90 = { 0.0f, 0.0f, 0.0f }; - Vec3f sp84 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f sp90 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f sp84 = { 0.0f, 0.0f, 0.0f }; Vec3f sp78; Vec3f sp6C; Vec3f sp60; @@ -671,7 +671,7 @@ void EnSyatekiNiw_Update(Actor* thisx, PlayState* play) { s32 SyatekiNiw_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { EnSyatekiNiw* this = (EnSyatekiNiw*)thisx; - Vec3f sp0 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f sp0 = { 0.0f, 0.0f, 0.0f }; if (limbIndex == 13) { rot->y += (s16)this->unk_2BC.x; diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.c b/src/overlays/actors/ovl_En_Tana/z_en_tana.c index 197154e0077..417ddfe45ab 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.c +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.c @@ -57,7 +57,7 @@ static void* sStoneTextures[] = { }; void EnTana_Init(Actor* thisx, PlayState* play) { - EnTana* this = (EnTana*)thisx; + UNUSED EnTana* this = (EnTana*)thisx; osSyncPrintf("☆☆☆ %s ☆☆☆\n", sShelfTypes[thisx->params]); Actor_SetScale(thisx, 1.0f); @@ -72,7 +72,7 @@ void EnTana_Update(Actor* thisx, PlayState* play) { } void EnTana_DrawWoodenShelves(Actor* thisx, PlayState* play) { - EnTana* this = (EnTana*)thisx; + UNUSED EnTana* this = (EnTana*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_tana.c", 148); @@ -85,7 +85,7 @@ void EnTana_DrawWoodenShelves(Actor* thisx, PlayState* play) { } void EnTana_DrawStoneShelves(Actor* thisx, PlayState* play) { - EnTana* this = (EnTana*)thisx; + UNUSED EnTana* this = (EnTana*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_tana.c", 163); 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 56240d3a97c..19a455f2314 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -1844,7 +1844,7 @@ s32 EnTest_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* } void EnTest_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { - static Vec3f unused1 = { 1100.0f, -700.0f, 0.0f }; + UNUSED static Vec3f unused1 = { 1100.0f, -700.0f, 0.0f }; static Vec3f D_80864658 = { 300.0f, 0.0f, 0.0f }; static Vec3f D_80864664 = { 3400.0f, 0.0f, 0.0f }; static Vec3f D_80864670 = { 0.0f, 0.0f, 0.0f }; @@ -1852,12 +1852,12 @@ void EnTest_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot static Vec3f D_80864688 = { 3000.0f, -2000.0f, -1000.0f }; static Vec3f D_80864694 = { 3000.0f, -2000.0f, 1000.0f }; static Vec3f D_808646A0 = { -1300.0f, 1100.0f, 0.0f }; - static Vec3f unused2 = { -3000.0f, 1900.0f, 800.0f }; - static Vec3f unused3 = { -3000.0f, -1100.0f, 800.0f }; - static Vec3f unused4 = { 1900.0f, 1900.0f, 800.0f }; - static Vec3f unused5 = { -3000.0f, -1100.0f, 800.0f }; - static Vec3f unused6 = { 1900.0f, -1100.0f, 800.0f }; - static Vec3f unused7 = { 1900.0f, 1900.0f, 800.0f }; + UNUSED static Vec3f unused2 = { -3000.0f, 1900.0f, 800.0f }; + UNUSED static Vec3f unused3 = { -3000.0f, -1100.0f, 800.0f }; + UNUSED static Vec3f unused4 = { 1900.0f, 1900.0f, 800.0f }; + UNUSED static Vec3f unused5 = { -3000.0f, -1100.0f, 800.0f }; + UNUSED static Vec3f unused6 = { 1900.0f, -1100.0f, 800.0f }; + UNUSED static Vec3f unused7 = { 1900.0f, 1900.0f, 800.0f }; s32 bodyPart = -1; Vec3f sp70; Vec3f sp64; 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 487b4cc8ec4..c80ede383cb 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -465,8 +465,8 @@ s32 EnTk_ChooseReward(EnTk* this) { void EnTk_DigEff(EnTk* this) { Vec3f pos = { 0.0f, 0.0f, 0.0f }; - Vec3f speed = { 0.0f, 0.0f, 0.0f }; - Vec3f accel = { 0.0f, 0.3f, 0.0f }; + UNUSED Vec3f speed = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f accel = { 0.0f, 0.3f, 0.0f }; if (this->skelAnime.curFrame >= 32.0f && this->skelAnime.curFrame < 40.0f) { pos.x = (Rand_ZeroOne() - 0.5f) * 12.0f + this->v3f_304.x; diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c index 8c1e4201a7b..ff5b7bfcf19 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c @@ -211,8 +211,7 @@ s32 func_80B203D8(EnToryo* this, PlayState* play) { } s32 func_80B205CC(EnToryo* this, PlayState* play) { - UNUSED s32 pad; - Player* player = GET_PLAYER(play); + UNUSED s32 pad[2]; s32 ret = 5; switch (Message_GetState(&play->msgCtx)) { diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c index aa1f5dd2a7c..68047ba6101 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c @@ -65,7 +65,7 @@ void EnTrap_Init(Actor* thisx, PlayState* play) { s16 zSpeed; s16 xSpeed; EnTrap* this = (EnTrap*)thisx; - ColliderCylinder* unused = &this->collider; // required to match + UNUSED ColliderCylinder* unused = &this->collider; // required to match this->upperParams = (thisx->params >> 8) & 0xFF; thisx->params &= 0xFF; diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index f42ac4fffa7..b44d8f53071 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -121,8 +121,7 @@ void EnVbBall_SpawnDust(PlayState* play, BossFdEffect* effect, Vec3f* position, void EnVbBall_UpdateBones(EnVbBall* this, PlayState* play) { BossFd* bossFd = (BossFd*)this->actor.parent; - f32 pad2; - f32 pad1; + UNUSED s32 pad[2]; f32 angle; s16 i; @@ -166,7 +165,7 @@ void EnVbBall_Update(Actor* thisx, PlayState* play2) { EnVbBall* this = (EnVbBall*)thisx; BossFd* bossFd = (BossFd*)this->actor.parent; f32 radius; - f32 pad2; + UNUSED s32 pad; s16 spawnNum; s16 i; diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index b0904f84f0e..d2e81dd7b50 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -1057,7 +1057,7 @@ s32 EnXc_PullingOutHarpOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dL } s32 EnXc_HarpOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { - EnXc* this = (EnXc*)thisx; + UNUSED EnXc* this = (EnXc*)thisx; if (limbIndex == 12) { *dList = gSheikHarpDL; diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index 4de5fd10ebf..5c6691c82ee 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -2158,7 +2158,7 @@ s32 EnZf_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* po } void EnZf_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) { - static Vec3f sUnused = { 1100.0f, -700.0f, 0.0f }; + UNUSED static Vec3f sUnused = { 1100.0f, -700.0f, 0.0f }; static Vec3f footOffset = { 300.0f, 0.0f, 0.0f }; static Vec3f D_80B4A2A4 = { 300.0f, -1700.0f, 0.0f }; // Sword tip? static Vec3f D_80B4A2B0 = { -600.0f, 300.0f, 0.0f }; // Sword hilt? diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 8dd56da2cf9..71a90c5a832 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -281,7 +281,6 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) { s32 action = this->action; s32 phi_a1; s32 idx25C; - s16 temp_t1; s32 temp_a0; s32 phi_v0; s32 phi_v1; @@ -2575,8 +2574,7 @@ void func_80B59A80(EnZl3* this, PlayState* play) { } void func_80B59AD0(EnZl3* this, PlayState* play) { - // todo look into - Actor* thisx = &this->actor; // unused, necessary to use 'this' first to fix regalloc + if (this) {} Flags_SetSwitch(play, 0x36); func_80088AA0(180); 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 4becb814761..f715bd4c997 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -30,7 +30,7 @@ void EnZo_Dive(EnZo* this, PlayState* play); void EnZo_SpawnRipple(EnZo* this, Vec3f* pos, f32 scale, f32 targetScale, u8 alpha) { EnZoEffect* effect; - Vec3f vec = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f vec = { 0.0f, 0.0f, 0.0f }; s16 i; effect = this->effects; @@ -49,7 +49,7 @@ void EnZo_SpawnRipple(EnZo* this, Vec3f* pos, f32 scale, f32 targetScale, u8 alp void EnZo_SpawnBubble(EnZo* this, Vec3f* pos) { EnZoEffect* effect; - Vec3f vec = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f vec = { 0.0f, 0.0f, 0.0f }; Vec3f vel = { 0.0f, 1.0f, 0.0f }; s16 i; f32 waterSurface; diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c index 532f7626fc8..a4bbb9da672 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -195,7 +195,7 @@ void ItemOcarina_Update(Actor* thisx, PlayState* play) { } void ItemOcarina_Draw(Actor* thisx, PlayState* play) { - ItemOcarina* this = (ItemOcarina*)thisx; + UNUSED ItemOcarina* this = (ItemOcarina*)thisx; func_8002EBCC(thisx, play, 0); func_8002ED80(thisx, play, 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 7f76c88ce93..ffc447af15a 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -609,7 +609,6 @@ void func_80B90010(ObjBean* this) { // Control is returned to the player and the leaves start to flatten out void func_80B90050(ObjBean* this, PlayState* play) { s16 temp_a0; - f32 temp_f2; this->unk_1B6.x += 0x3E80; this->unk_1B6.y += -0xC8; 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 5240a63097e..3d7d9e29f7f 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -279,7 +279,7 @@ void ObjKibako_Update(Actor* thisx, PlayState* play) { void ObjKibako_Draw(Actor* thisx, PlayState* play) { UNUSED s32 pad; - ObjKibako* this = (ObjKibako*)thisx; + UNUSED ObjKibako* this = (ObjKibako*)thisx; Gfx_DrawDListOpa(play, gSmallWoodenBoxDL); } 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 43515019a2f..3e997e04ebe 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -183,8 +183,8 @@ void ObjectKankyo_Fairies(ObjectKankyo* this, PlayState* play) { f32 baseX; f32 baseY; f32 baseZ; - Vec3f vec1 = { 0.0f, 0.0f, 0.0f }; - Vec3f vec2 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f vec1 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f vec2 = { 0.0f, 0.0f, 0.0f }; f32 random; s16 i; Vec3f viewForwards; @@ -497,8 +497,8 @@ void ObjectKankyo_DrawFairies(Actor* thisx, PlayState* play2) { PlayState* play = play2; ObjectKankyo* this = (ObjectKankyo*)thisx; f32 alphaScale; - Vec3f vec1 = { 0.0f, 0.0f, 0.0f }; - Vec3f vec2 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f vec1 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f vec2 = { 0.0f, 0.0f, 0.0f }; s16 i; if (!(play->cameraPtrs[CAM_ID_MAIN]->unk_14C & 0x100)) { @@ -590,11 +590,10 @@ void ObjectKankyo_DrawSnow(Actor* thisx, PlayState* play2) { f32 baseX; f32 baseY; f32 baseZ; - Vec3f vec1 = { 0.0f, 0.0f, 0.0f }; - Vec3f vec2 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f vec1 = { 0.0f, 0.0f, 0.0f }; + UNUSED Vec3f vec2 = { 0.0f, 0.0f, 0.0f }; s16 i; - UNUSED s32 pad; - UNUSED s32 pad2; + UNUSED s32 pad[2]; if (!(play->cameraPtrs[CAM_ID_MAIN]->unk_14C & 0x100)) { OPEN_DISPS(play->state.gfxCtx, "../z_object_kankyo.c", 958); 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 034a0f91d52..013964cce8f 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -146,7 +146,7 @@ void OceffSpot_Update(Actor* thisx, PlayState* play) { } void OceffSpot_Draw(Actor* thisx, PlayState* play) { - OceffSpot* this = (OceffSpot*)thisx; + UNUSED OceffSpot* this = (OceffSpot*)thisx; u32 scroll = play->state.frames & 0xFFFF; OPEN_DISPS(play->state.gfxCtx, "../z_oceff_spot.c", 466); 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 8b6447e69ed..875929447aa 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -56,7 +56,7 @@ void OceffStorm_Init(Actor* thisx, PlayState* play) { } void OceffStorm_Destroy(Actor* thisx, PlayState* play) { - OceffStorm* this = (OceffStorm*)thisx; + UNUSED OceffStorm* this = (OceffStorm*)thisx; Player* player = GET_PLAYER(play); Magic_Reset(play); 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 d26cea0fa91..329062302aa 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -36,7 +36,7 @@ void OceffWipe_Init(Actor* thisx, PlayState* play) { } void OceffWipe_Destroy(Actor* thisx, PlayState* play) { - OceffWipe* this = (OceffWipe*)thisx; + UNUSED OceffWipe* this = (OceffWipe*)thisx; Player* player = GET_PLAYER(play); Magic_Reset(play); 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 57a8668eb54..ca6bf34804a 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -36,7 +36,7 @@ void OceffWipe2_Init(Actor* thisx, PlayState* play) { } void OceffWipe2_Destroy(Actor* thisx, PlayState* play) { - OceffWipe2* this = (OceffWipe2*)thisx; + UNUSED OceffWipe2* this = (OceffWipe2*)thisx; Player* player = GET_PLAYER(play); Magic_Reset(play); 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 2d54ffe69c6..7444f97f536 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -39,7 +39,7 @@ void OceffWipe3_Init(Actor* thisx, PlayState* play) { } void OceffWipe3_Destroy(Actor* thisx, PlayState* play) { - OceffWipe3* this = (OceffWipe3*)thisx; + UNUSED OceffWipe3* this = (OceffWipe3*)thisx; Player* player = GET_PLAYER(play); Magic_Reset(play); 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 ad7a6c11887..3c33bfb000e 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -36,7 +36,7 @@ void OceffWipe4_Init(Actor* thisx, PlayState* play) { } void OceffWipe4_Destroy(Actor* thisx, PlayState* play) { - OceffWipe4* this = (OceffWipe4*)thisx; + UNUSED OceffWipe4* this = (OceffWipe4*)thisx; Magic_Reset(play); diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 5aa76fbbd5f..5e94bf4ba2f 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -3300,8 +3300,6 @@ static s32 (*D_80854448[])(Player* this, PlayState* play) = { }; s32 func_80837348(PlayState* play, Player* this, s8* arg2, s32 arg3) { - s32 i; - if (!(this->stateFlags1 & (PLAYER_STATE1_0 | PLAYER_STATE1_7 | PLAYER_STATE1_29))) { if (arg3 != 0) { D_808535E0 = func_80836670(this, play); diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c b/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c index cc9a1dd26e3..54f03e17f8a 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c @@ -270,7 +270,7 @@ void FileSelect_ExitToCopySource1(GameState* thisx) { */ void FileSelect_ExitToCopySource2(GameState* thisx) { FileSelectState* this = (FileSelectState*)thisx; - SramContext* sramCtx = &this->sramCtx; + UNUSED SramContext* sramCtx = &this->sramCtx; s16 i; s16 yStep; diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c index a99f48a39ae..4b39358b4f8 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c @@ -30,7 +30,6 @@ void FileSelect_DrawCharacter(GraphicsContext* gfxCtx, void* texture, s16 vtx) { void FileSelect_SetKeyboardVtx(GameState* thisx) { FileSelectState* this = (FileSelectState*)thisx; - s16 val; s16 phi_t2; s16 phi_t0; s16 phi_t3; @@ -812,7 +811,7 @@ void FileSelect_DrawOptionsImpl(GameState* thisx) { s16 cursorGreen; s16 cursorBlue; s16 i; - s16 j; + UNUSED s16 pad; s16 vtx; OPEN_DISPS(this->state.gfxCtx, "../z_file_nameset_PAL.c", 848); diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c index 1e50d58d128..c6b0e546ec8 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c @@ -32,7 +32,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { static void* D_8082A130[] = { gOcarinaATex, gOcarinaCDownTex, gOcarinaCRightTex, gOcarinaCLeftTex, gOcarinaCUpTex, }; - static u16 D_8082A144[] = { + UNUSED static u16 D_8082A144[] = { 0xFFCC, 0xFFCC, 0xFFCC, 0xFFCC, 0xFFCC, }; static s16 D_8082A150[] = { diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c index 65a7df5e575..031b0644be1 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c @@ -372,7 +372,7 @@ void KaleidoScope_DrawWorldMap(PlayState* play, GraphicsContext* gfxCtx) { }; static s16 pointPulseStage = 1; static s16 pointPulseTimer = 20; - static s16 D_8082A5B8[] = { 64, 64, 64, 28 }; + UNUSED static s16 D_8082A5B8[] = { 64, 64, 64, 28 }; static s16 areaBoxPosX[] = { -41, 19, 44, 40, 49, 51, -49, 83, 80, -67, 50, -109, -76, -86, -10, -6, 19, 24, 11, -17, 37, -6, }; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index 5d257c4df91..c2cde0e8d68 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -927,7 +927,7 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) { }; static s16 D_8082AE00 = 20; static s16 D_8082AE04 = 0; - static s16 D_8082AE08[] = { + UNUSED static s16 D_8082AE08[] = { 10, 16, 16, 17, 12, 13, 18, 17, 17, 19, 13, 21, 20, 21, 14, 15, 15, 15, 11, 14, }; static s16 D_8082AE30[] = { From c6f2ee978ccca323daf7839fa6566a844bb6a0d7 Mon Sep 17 00:00:00 2001 From: Thar0 <17233964+Thar0@users.noreply.github.com> Date: Fri, 8 Jul 2022 00:44:29 +0100 Subject: [PATCH 03/14] Make pad variable names consistent --- src/code/audio_load.c | 6 +- src/code/audio_synthesis.c | 4 +- src/code/code_800E4FE0.c | 4 +- src/code/code_800EC960.c | 14 ++-- src/code/db_camera.c | 4 +- src/code/speed_meter.c | 6 +- src/code/ucode_disas.c | 2 +- src/code/z_bgcheck.c | 15 ++-- src/code/z_camera.c | 64 +++++++++-------- src/code/z_collision_check.c | 3 +- src/code/z_demo.c | 2 +- src/code/z_eff_blure.c | 3 +- src/code/z_effect_soft_sprite_old_init.c | 2 +- src/code/z_en_item00.c | 4 +- src/code/z_fbdemo.c | 3 +- src/code/z_fcurve_data_skelanime.c | 4 +- src/code/z_lifemeter.c | 2 +- src/code/z_lights.c | 4 +- src/code/z_message_PAL.c | 8 +-- src/code/z_quake.c | 2 +- src/code/z_room.c | 2 +- src/code/z_vr_box.c | 40 +++++------ .../actors/ovl_Arms_Hook/z_arms_hook.c | 4 +- .../actors/ovl_Bg_Bombwall/z_bg_bombwall.c | 3 +- .../actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c | 3 +- .../ovl_Bg_Haka_Water/z_bg_haka_water.c | 2 +- .../ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c | 6 +- .../z_bg_hidan_kowarerukabe.c | 2 +- .../ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c | 3 +- .../actors/ovl_Bg_Ingate/z_bg_ingate.c | 1 - .../ovl_Bg_Jya_1flift/z_bg_jya_1flift.c | 2 +- .../actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c | 2 +- .../ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c | 2 +- .../z_bg_jya_zurerukabe.c | 2 +- .../ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c | 2 +- .../actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c | 2 +- .../ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c | 2 +- .../ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c | 2 +- .../ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c | 2 +- .../actors/ovl_Bg_Po_Event/z_bg_po_event.c | 2 +- .../actors/ovl_Bg_Pushbox/z_bg_pushbox.c | 2 +- .../z_bg_spot01_idohashira.c | 4 +- .../z_bg_spot01_idosoko.c | 2 +- .../z_bg_spot06_objects.c | 2 +- .../z_bg_spot08_iceblock.c | 2 +- .../ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c | 2 +- .../ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c | 2 +- .../ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c | 2 +- .../ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c | 2 +- .../ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c | 2 +- .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 2 +- src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 6 +- .../actors/ovl_Boss_Ganon/z_boss_ganon.c | 9 ++- .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 4 +- .../ovl_Boss_Ganondrof/z_boss_ganondrof.c | 4 +- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 27 +++----- src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 4 +- src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 22 +++--- src/overlays/actors/ovl_Demo_6K/z_demo_6k.c | 4 +- src/overlays/actors/ovl_Demo_Du/z_demo_du.c | 2 +- src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c | 2 +- .../actors/ovl_Demo_Effect/z_demo_effect.c | 5 +- src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 6 +- src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c | 68 +++++++++---------- src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c | 4 +- .../actors/ovl_Door_Warp1/z_door_warp1.c | 3 +- src/overlays/actors/ovl_En_Am/z_en_am.c | 4 +- src/overlays/actors/ovl_En_Bombf/z_en_bombf.c | 3 +- src/overlays/actors/ovl_En_Cs/z_en_cs.c | 3 +- .../z_en_daiku_kakariko.c | 2 +- .../actors/ovl_En_Dekunuts/z_en_dekunuts.c | 1 - src/overlays/actors/ovl_En_Dh/z_en_dh.c | 4 +- src/overlays/actors/ovl_En_Dha/z_en_dha.c | 3 +- .../actors/ovl_En_Dodongo/z_en_dodongo.c | 4 +- src/overlays/actors/ovl_En_Door/z_en_door.c | 2 +- src/overlays/actors/ovl_En_Elf/z_en_elf.c | 4 +- src/overlays/actors/ovl_En_Fish/z_en_fish.c | 11 ++- src/overlays/actors/ovl_En_Fr/z_en_fr.c | 2 +- src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 3 +- src/overlays/actors/ovl_En_Ge3/z_en_ge3.c | 3 +- .../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 2 +- .../actors/ovl_En_Heishi1/z_en_heishi1.c | 2 +- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 6 +- .../ovl_En_Horse_Normal/z_en_horse_normal.c | 2 +- .../ovl_En_Horse_Zelda/z_en_horse_zelda.c | 2 +- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 2 +- .../actors/ovl_En_Insect/z_en_insect.c | 16 ++--- src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 2 +- src/overlays/actors/ovl_En_Js/z_en_js.c | 3 +- src/overlays/actors/ovl_En_Mb/z_en_mb.c | 3 +- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 12 ++-- .../actors/ovl_En_Niw_Girl/z_en_niw_girl.c | 2 +- .../actors/ovl_En_Po_Field/z_en_po_field.c | 3 +- .../actors/ovl_En_Po_Relay/z_en_po_relay.c | 4 +- .../ovl_En_Po_Sisters/z_en_po_sisters.c | 3 +- src/overlays/actors/ovl_En_Poh/z_en_poh.c | 3 +- src/overlays/actors/ovl_En_Rd/z_en_rd.c | 2 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 14 ++-- src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 2 +- .../ovl_En_Scene_Change/z_en_scene_change.c | 2 +- .../actors/ovl_En_Stream/z_en_stream.c | 5 +- src/overlays/actors/ovl_En_Test/z_en_test.c | 10 +-- .../actors/ovl_En_Torch2/z_en_torch2.c | 12 ++-- src/overlays/actors/ovl_En_Trap/z_en_trap.c | 2 +- .../actors/ovl_En_Vb_Ball/z_en_vb_ball.c | 2 +- src/overlays/actors/ovl_En_Xc/z_en_xc.c | 10 +-- src/overlays/actors/ovl_En_Zf/z_en_zf.c | 4 +- src/overlays/actors/ovl_En_Zl1/z_en_zl1.c | 14 ++-- src/overlays/actors/ovl_En_Zl2/z_en_zl2.c | 12 ++-- src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 16 ++--- src/overlays/actors/ovl_En_fHG/z_en_fhg.c | 5 +- src/overlays/actors/ovl_Fishing/z_fishing.c | 8 +-- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 2 +- .../actors/ovl_Obj_Hsblock/z_obj_hsblock.c | 2 +- .../actors/ovl_Obj_Kibako/z_obj_kibako.c | 3 +- src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c | 4 +- .../actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c | 2 +- .../actors/ovl_Obj_Switch/z_obj_switch.c | 5 +- .../actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 3 +- .../actors/ovl_player_actor/z_player.c | 12 ++-- .../ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c | 5 +- src/overlays/gamestates/ovl_title/z_title.c | 1 - .../ovl_kaleido_scope/z_kaleido_equipment.c | 2 +- 123 files changed, 332 insertions(+), 381 deletions(-) diff --git a/src/code/audio_load.c b/src/code/audio_load.c index 6913fb00407..697284efd18 100644 --- a/src/code/audio_load.c +++ b/src/code/audio_load.c @@ -356,12 +356,12 @@ void AudioLoad_InitTable(AudioTable* table, u32 romAddr, u16 unkMediumParam) { } SoundFontData* AudioLoad_SyncLoadSeqFonts(s32 seqId, u32* outDefaultFontId) { - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; s32 index; SoundFontData* fontData; s32 numFonts; s32 fontId; - UNUSED s32 pad1; + UNUSED s32 pad2; if (seqId >= gAudioContext.numSequences) { return NULL; @@ -2064,7 +2064,7 @@ void AudioLoad_PreloadSamplesForFont(s32 fontId, s32 async, SampleBankRelocInfo* } void AudioLoad_LoadPermanentSamples(void) { - UNUSED s32 pad; + UNUSED s32 pad1; u32 fontId; AudioTable* sampleBankTable; UNUSED s32 pad2; diff --git a/src/code/audio_synthesis.c b/src/code/audio_synthesis.c index bcad3fd0fc1..609454e9820 100644 --- a/src/code/audio_synthesis.c +++ b/src/code/audio_synthesis.c @@ -705,7 +705,7 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS s32 gain; s32 frameIndex; s32 skipBytes; - UNUSED s32 pad; + UNUSED s32 pad2; void* buf; s32 nSamplesToDecode; u32 sampleAddr; @@ -716,7 +716,7 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS s32 nSamplesToProcess; s32 phi_s4; s32 nFirstFrameSamplesToIgnore; - UNUSED s32 pad2[7]; + UNUSED s32 pad3[7]; s32 frameSize; s32 nFramesToDecode; s32 skipInitialSamples; diff --git a/src/code/code_800E4FE0.c b/src/code/code_800E4FE0.c index f76a178c7bd..68a891d03c7 100644 --- a/src/code/code_800E4FE0.c +++ b/src/code/code_800E4FE0.c @@ -215,9 +215,7 @@ AudioTask* func_800E5000(void) { void func_800E5584(AudioCmd* cmd) { s32 i; - UNUSED s32 pad; - UNUSED s32 pad2; - UNUSED s32 pad3; + UNUSED s32 pad[3]; u32 temp_t7; switch (cmd->op) { diff --git a/src/code/code_800EC960.c b/src/code/code_800EC960.c index c94d3a893c4..94e3b4e4ae4 100644 --- a/src/code/code_800EC960.c +++ b/src/code/code_800EC960.c @@ -1477,9 +1477,9 @@ void AudioOcarina_CheckIfStartedSong(void) { */ void AudioOcarina_CheckSongsWithMusicStaff(void) { u16 curOcarinaSongFlag; - UNUSED u16 pad; + UNUSED s16 pad1; u8 noNewValidInput = false; - UNUSED u16 pad2; + UNUSED s16 pad2; s8 staffOcarinaPlayingPosOffset = 0; u8 songIndex; OcarinaNote* curNote; @@ -1924,12 +1924,12 @@ void AudioOcarina_PlaybackSong(void) { void AudioOcarina_SetRecordingSong(u8 isRecordingComplete) { u16 i; - UNUSED u16 pad[2]; + UNUSED s16 pad1[2]; u8 pitch; - UNUSED s32 pad1; + UNUSED s32 pad2; u8 j; u8 k; - UNUSED s32 pad2; + UNUSED s32 pad3; OcarinaNote* recordedSong; if (sRecordingState == OCARINA_RECORD_SCARECROW_LONG) { @@ -4767,7 +4767,7 @@ void Audio_PlayFanfare(u16 seqId) { void func_800F5CF8(void) { u16 sp26; - UNUSED u16 pad; + UNUSED s16 pad; u16 sp22; if (D_8016B9F4 != 0) { @@ -4902,7 +4902,7 @@ void Audio_SetBgmEnemyVolume(f32 dist) { } void func_800F6268(f32 dist, u16 arg1) { - UNUSED s8 pad; + UNUSED u8 pad; s8 phi_v1; s16 temp_a0; diff --git a/src/code/db_camera.c b/src/code/db_camera.c index e312f656417..d7f1c90d45b 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -436,7 +436,7 @@ void DbCamera_PrintF32Bytes(f32 value) { } void DbCamera_PrintU16Bytes(u16 value) { - UNUSED u16 pad; + UNUSED s16 pad; u16 b = value; char* a = (char*)&b; @@ -444,7 +444,7 @@ void DbCamera_PrintU16Bytes(u16 value) { } void DbCamera_PrintS16Bytes(s16 value) { - UNUSED u16 pad; + UNUSED s16 pad; s16 b = value; char* a = (char*)&b; diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index 649bd80a4c5..065416ac272 100644 --- a/src/code/speed_meter.c +++ b/src/code/speed_meter.c @@ -42,7 +42,7 @@ void SpeedMeter_Destroy(UNUSED SpeedMeter* this) { } void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx) { - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; u32 baseX = 32; s32 temp; s32 i; @@ -151,11 +151,11 @@ void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxC } void SpeedMeter_DrawAllocEntries(UNUSED SpeedMeter* meter, GraphicsContext* gfxCtx, GameState* state) { - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; u32 ulx = 30; u32 lrx = 290; SpeedMeterAllocEntry entry; - UNUSED s32 pad1; + UNUSED s32 pad2; s32 y; TwoHeadGfxArena* thga; u32 zeldaFreeMax; diff --git a/src/code/ucode_disas.c b/src/code/ucode_disas.c index 63d592983c4..0bb9ff7cb44 100644 --- a/src/code/ucode_disas.c +++ b/src/code/ucode_disas.c @@ -1312,7 +1312,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, GfxMod* ptr) { } break; case G_MOVEWORD: { - UNUSED u32 pad[2]; + UNUSED s32 pad[2]; Gmovewd movewd = ptr->movewd; switch (movewd.index) { diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index e0f331ef268..7d09d7cbbbe 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -641,7 +641,7 @@ s32 BgCheck_ComputeWallDisplacement(CollisionContext* colCtx, CollisionPoly* pol s32 BgCheck_SphVsStaticWall(StaticLookup* lookup, CollisionContext* colCtx, u16 xpFlags, f32* outX, f32* outZ, Vec3f* pos, f32 radius, CollisionPoly** outPoly) { Vec3f resultPos; - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; f32 planeDist; f32 intersect; s32 result; @@ -658,8 +658,7 @@ s32 BgCheck_SphVsStaticWall(StaticLookup* lookup, CollisionContext* colCtx, u16 f32 nz; f32 temp_f16; Vec3s* vtxList; - UNUSED u16 pad1; - + UNUSED s16 pad2; f32 zMin; f32 zMax; f32 xMin; @@ -2737,13 +2736,13 @@ void DynaPoly_AddBgActorToLookup(UNUSED PlayState* play, DynaCollisionContext* d s32* polyStartIndex) { MtxF mtx; Actor* actor; - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; f32 numVtxInverse; s32 i; Vec3f pos; Sphere16* sphere; Vec3s* dVtxList; - UNUSED s32 pad1; + UNUSED s32 pad2; Vec3f newCenterPoint; f32 newRadiusSq; CollisionHeader* pbgdata; @@ -3182,7 +3181,7 @@ f32 BgCheck_RaycastFloorDyna(DynaRaycast* dynaRaycast) { s32 BgCheck_SphVsDynaWallInBgActor(CollisionContext* colCtx, u16 xpFlags, DynaCollisionContext* dyna, SSList* ssList, f32* outX, f32* outZ, CollisionPoly** outPoly, s32* outBgId, Vec3f* pos, f32 radius, s32 bgId) { - UNUSED s32 pad; + UNUSED s32 pad1; f32 intersect; s32 result = false; CollisionPoly* poly; @@ -3198,7 +3197,7 @@ s32 BgCheck_SphVsDynaWallInBgActor(CollisionContext* colCtx, u16 xpFlags, DynaCo f32 invNormalXZ; f32 planeDist; f32 temp_f18; - UNUSED s32 pad1; + UNUSED s32 pad2; f32 xIntersectDist; f32 zMin; f32 zMax; @@ -3438,7 +3437,7 @@ s32 BgCheck_CheckDynaCeilingList(UNUSED CollisionContext* colCtx, u16 xpFlags, D f32 nz; s32 result = false; f32 intersectDist; - UNUSED u16 padding; + UNUSED s16 pad; if (ssList->head == SS_NULL) { return false; diff --git a/src/code/z_camera.c b/src/code/z_camera.c index fafd08a2e4a..2a564c9e03b 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -353,7 +353,7 @@ void func_80044340(Camera* camera, Vec3f* arg1, Vec3f* arg2) { * Checks if `from` to `to` is looking from the outside of a poly towards the front */ s32 Camera_CheckOOB(Camera* camera, Vec3f* from, Vec3f* to) { - UNUSED s32 pad; + UNUSED s32 pad1; Vec3f intersect; UNUSED s32 pad2; s32 bgId; @@ -1188,8 +1188,7 @@ s32 Camera_CalcAtForHorse(Camera* camera, VecSph* eyeAtDir, f32 yOffset, f32* yP Vec3f* at = &camera->at; Vec3f posOffsetTarget; Vec3f atTarget; - UNUSED s32 pad; - UNUSED s32 pad2; + UNUSED s32 pad[2]; f32 playerHeight; Player* player; PosRot horsePosRot; @@ -1270,7 +1269,7 @@ f32 Camera_ClampDist(Camera* camera, f32 dist, f32 minDist, f32 maxDist, s16 tim } s16 Camera_CalcDefaultPitch(Camera* camera, s16 arg1, s16 arg2, s16 arg3) { - f32 pad; + f32 value; f32 stepScale; f32 t; s16 phi_v0; @@ -1285,8 +1284,8 @@ s16 Camera_CalcDefaultPitch(Camera* camera, s16 arg1, s16 arg2, s16 arg3) { stepScale = (1.0f / camera->pitchUpdateRateInv) * 3.0f; } else { t = absCur * (1.0f / R_CAM_MAX_PHI); - pad = Camera_InterpolateCurve(0.8f, 1.0f - t); - stepScale = (1.0f / camera->pitchUpdateRateInv) * pad; + value = Camera_InterpolateCurve(0.8f, 1.0f - t); + stepScale = (1.0f / camera->pitchUpdateRateInv) * value; } return Camera_LERPCeilS(target, arg1, stepScale, 0xA); } @@ -2191,7 +2190,7 @@ s32 Camera_Jump1(Camera* camera) { Vec3f* eye = &camera->eye; Vec3f* at = &camera->at; Vec3f* eyeNext = &camera->eyeNext; - UNUSED s32 pad2; + UNUSED s32 pad1; f32 spA4; Vec3f newEye; VecSph eyeAtOffset; @@ -2200,10 +2199,10 @@ s32 Camera_Jump1(Camera* camera) { VecSph eyeDiffTarget; PosRot* playerPosRot = &camera->playerPosRot; PosRot playerhead; - UNUSED s16 pad1; + UNUSED s16 pad2; Jump1ReadOnlyData* roData = &camera->paramData.jump1.roData; Jump1ReadWriteData* rwData = &camera->paramData.jump1.rwData; - UNUSED s32 pad; + UNUSED s32 pad3; f32 playerHeight; playerHeight = Player_GetHeight(camera->player); @@ -2535,8 +2534,7 @@ s32 Camera_Jump3(Camera* camera) { Jump3ReadOnlyData* roData = &camera->paramData.jump3.roData; VecSph eyeAtOffset; VecSph eyeNextAtOffset; - UNUSED s32 pad; - UNUSED s32 pad2; + UNUSED s32 pad1[2]; CameraModeValue* values; f32 t2; f32 phi_f0; @@ -2544,9 +2542,9 @@ s32 Camera_Jump3(Camera* camera) { f32 playerHeight; PosRot playerhead; f32 yNormal; - UNUSED s32 pad3; + UNUSED s32 pad2; s32 modeSwitch; - UNUSED s32 pad1; + UNUSED s32 pad3; Jump3ReadWriteData* rwData = &camera->paramData.jump3.rwData; playerHeight = Player_GetHeight(camera->player); @@ -2751,7 +2749,7 @@ s32 Camera_Battle1(Camera* camera) { f32 fov; Battle1ReadOnlyData* roData = &camera->paramData.batt1.roData; Battle1ReadWriteData* rwData = &camera->paramData.batt1.rwData; - UNUSED s32 pad; + UNUSED s32 pad2; f32 playerHeight; skipEyeAtCalc = false; @@ -3329,7 +3327,7 @@ s32 Camera_KeepOn3(Camera* camera) { PosRot* camPlayerPosRot = &camera->playerPosRot; KeepOn3ReadOnlyData* roData = &camera->paramData.keep3.roData; KeepOn3ReadWriteData* rwData = &camera->paramData.keep3.rwData; - s32 pad; + s32 value; f32 playerHeight; playerHeight = Player_GetHeight(camera->player); @@ -3445,10 +3443,10 @@ s32 Camera_KeepOn3(Camera* camera) { } osSyncPrintf("camera: talk: BG&collision check %d time(s)\n", i); camera->unk_14C &= ~0xC; - pad = ((rwData->animTimer + 1) * rwData->animTimer) >> 1; - rwData->eyeToAtTarget.y = (f32)BINANG_SUB(atToEyeAdj.yaw, atToEyeNextDir.yaw) / pad; - rwData->eyeToAtTarget.z = (f32)BINANG_SUB(atToEyeAdj.pitch, atToEyeNextDir.pitch) / pad; - rwData->eyeToAtTarget.x = (atToEyeAdj.r - atToEyeNextDir.r) / pad; + value = ((rwData->animTimer + 1) * rwData->animTimer) >> 1; + rwData->eyeToAtTarget.y = (f32)BINANG_SUB(atToEyeAdj.yaw, atToEyeNextDir.yaw) / value; + rwData->eyeToAtTarget.z = (f32)BINANG_SUB(atToEyeAdj.pitch, atToEyeNextDir.pitch) / value; + rwData->eyeToAtTarget.x = (atToEyeAdj.r - atToEyeNextDir.r) / value; return 1; } @@ -3867,7 +3865,7 @@ s32 Camera_KeepOn0(Camera* camera) { s32 Camera_Fixed1(Camera* camera) { Fixed1ReadOnlyData* roData = &camera->paramData.fixd1.roData; Fixed1ReadWriteData* rwData = &camera->paramData.fixd1.rwData; - UNUSED s32 pad; + UNUSED s32 pad1; VecSph eyeOffset; VecSph eyeAtOffset; UNUSED s32 pad2; @@ -4327,13 +4325,13 @@ s32 Camera_Subj4(Camera* camera) { Vec3f sp98; Vec3f sp8C; f32 sp88; - UNUSED s16 pad2; + UNUSED s16 pad1; f32 temp_f16; PosRot sp6C; VecSph sp64; VecSph sp5C; s16 temp_a0; - UNUSED s32 pad; + UNUSED s32 pad2; Player* player; PosRot* playerPosRot = &camera->playerPosRot; Subj4ReadOnlyData* roData = &camera->paramData.subj4.roData; @@ -4467,7 +4465,7 @@ s32 Camera_Data3(Camera* camera) { } s32 Camera_Data4(Camera* camera) { - UNUSED s32 pad2[2]; + UNUSED s32 pad1[2]; Data4ReadOnlyData* roData = &camera->paramData.data4.roData; VecSph eyeAtOffset; VecSph atOffset; @@ -4482,7 +4480,7 @@ s32 Camera_Data4(Camera* camera) { Vec3f* eye = &camera->eye; f32 playerHeight; Vec3f* at = &camera->at; - UNUSED s32 pad; + UNUSED s32 pad2; playerHeight = Player_GetHeight(camera->player); @@ -4557,7 +4555,7 @@ s32 Camera_Unique1(Camera* camera) { PosRot playerhead; Unique1ReadOnlyData* roData = &camera->paramData.uniq1.roData; Unique1ReadWriteData* rwData = &camera->paramData.uniq1.rwData; - UNUSED s32 pad; + UNUSED s32 pad1; f32 playerHeight; UNUSED s32 pad2; @@ -4645,7 +4643,7 @@ s32 Camera_Unique2(Camera* camera) { Vec3f playerPos; VecSph eyeOffset; VecSph eyeAtOffset; - UNUSED s32 pad; + UNUSED s32 pad1; f32 lerpRateFactor; Unique2ReadOnlyData* roData = &camera->paramData.uniq2.roData; Unique2ReadWriteData* rwData = &camera->paramData.uniq2.rwData; @@ -5092,7 +5090,7 @@ s32 Camera_Unique9(Camera* camera) { s16 action; s16 atInitFlags; s16 eyeInitFlags; - UNUSED s16 pad2; + UNUSED s16 pad; PosRot targethead; PosRot playerhead; PosRot playerPosRot; @@ -5688,7 +5686,7 @@ s32 Camera_Demo3(Camera* camera) { Vec3f sp68; Vec3f sp5C; f32 temp_f0; - UNUSED s32 pad; + UNUSED s32 pad1; u8 skipUpdateEye = false; f32 yOffset = Player_GetHeight(camera->player); s16 angle; @@ -6227,7 +6225,7 @@ s32 Camera_Demo8(Camera* camera) { * to be relative to the main camera's player, the current camera's player, or the main camera's target */ s32 Camera_Demo9(Camera* camera) { - UNUSED s32 pad; + UNUSED s32 pad1; s32 finishAction; s16 onePointTimer; OnePointCamData* onePointCamData = &camera->paramData.demo9.onePointCamData; @@ -6241,7 +6239,7 @@ s32 Camera_Demo9(Camera* camera) { Vec3f* eye = &camera->eye; PosRot* mainCamPlayerPosRot; PosRot focusPosRot; - UNUSED s32 pad3; + UNUSED s32 pad2; Vec3f* eyeNext = &camera->eyeNext; Demo9ReadOnlyData* roData = &camera->paramData.demo9.roData; Vec3f* at = &camera->at; @@ -6717,7 +6715,7 @@ s32 Camera_Special8(Camera* camera) { } s32 Camera_Special9(Camera* camera) { - UNUSED s32 pad; + UNUSED s32 pad1; Vec3f* eye = &camera->eye; Vec3f* at = &camera->at; Vec3f* eyeNext = &camera->eyeNext; @@ -6725,14 +6723,14 @@ s32 Camera_Special9(Camera* camera) { VecSph eyeAdjustment; VecSph atEyeOffsetGeo; f32 playerYOffset; - UNUSED s32 pad3; + UNUSED s32 pad2; PosRot* playerPosRot = &camera->playerPosRot; PosRot adjustedPlayerPosRot; f32 yNormal; DoorParams* doorParams = &camera->paramData.doorParams; Special9ReadOnlyData* roData = &camera->paramData.spec9.roData; Special9ReadWriteData* rwData = &camera->paramData.spec9.rwData; - UNUSED s32 pad4; + UNUSED s32 pad3; BgCamFuncData* bgCamFuncData; playerYOffset = Player_GetHeight(camera->player); diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index b75f4efb3f8..5f6b647ac60 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -3470,8 +3470,7 @@ s32 CollisionCheck_CylSideVsLineSeg(f32 radius, f32 height, f32 offset, Vec3f* a f32 actorDotItemXZ; f32 zero = 0.0f; f32 closeDist; - UNUSED s32 pad1; - UNUSED s32 pad2; + UNUSED s32 pad[2]; actorToItem.x = itemPos->x - actorPos->x; actorToItem.y = itemPos->y - actorPos->y - offset; diff --git a/src/code/z_demo.c b/src/code/z_demo.c index bcf81797271..b9a00d99f0e 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -1454,7 +1454,7 @@ s32 Cutscene_Command_08(PlayState* play, CutsceneContext* csCtx, u8* cmd, UNUSED Vec3f sp3C; Vec3f sp30; Camera* subCam; - UNUSED f32 sp28; + UNUSED s32 pad; cmd += 8; size = 8; diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index 4b1d22f5b68..ffe4b3a370f 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -608,8 +608,7 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem f32 temp_f22 = temp_f2 - 2.0f * temp_f0 + temp_f28; // t^3 - 2t^2 + t f32 temp_f24 = 2.0f * temp_f2 - temp_f0 * 3.0f + 1.0f; // 2t^3 - 3t^2 + 1 f32 temp_f26 = temp_f0 * 3.0f - 2.0f * temp_f2; // 3t^2 - 2t^3 - UNUSED s32 pad1; - UNUSED s32 pad2; + UNUSED s32 pad[2]; // p = (2t^3 - 3t^2 + 1)p0 + (3t^2 - 2t^3)p1 + (t^3 - 2t^2 + t)m0 + (t^3 - t^2)m1 spE0.x = (temp_f24 * sp1CC.x) + (temp_f26 * sp18C.x) + (temp_f22 * sp1B4.x) + (temp_f20 * sp174.x); diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index 55ff0e25bad..7bc8a09a7ea 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -47,7 +47,7 @@ void EffectSs_DrawGEffect(PlayState* play, EffectSs* this, void* texture) { MtxF mfScale; MtxF mfResult; MtxF mfTrans11DA0; - UNUSED s32 pad1; + UNUSED s32 pad; Mtx* mtx; void* object = play->objectCtx.status[this->rgObjBankIdx].segment; diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 017ae63162a..d64bf294e55 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -138,12 +138,12 @@ void EnItem00_SetupAction(EnItem00* this, EnItem00ActionFunc actionFunc) { void EnItem00_Init(Actor* thisx, PlayState* play) { EnItem00* this = (EnItem00*)thisx; - UNUSED s32 pad; + UNUSED s32 pad1; f32 yOffset = 980.0f; f32 shadowScale = 6.0f; s32 getItemId = GI_NONE; s16 spawnParam8000 = this->actor.params & 0x8000; - UNUSED s32 pad1; + UNUSED s32 pad2; this->collectibleFlag = (this->actor.params & 0x3F00) >> 8; diff --git a/src/code/z_fbdemo.c b/src/code/z_fbdemo.c index 26cf9042a0d..07f581778ab 100644 --- a/src/code/z_fbdemo.c +++ b/src/code/z_fbdemo.c @@ -27,8 +27,7 @@ Gfx D_8012B000[] = { void TransitionUnk_InitGraphics(TransitionUnk* this) { s32 row2; - UNUSED s32 pad2; - UNUSED s32 pad3; + UNUSED s32 pad[2]; Vtx_t* vtx2; s32 frame; s32 rowTex; diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c index a8b4e2ef819..4bde5db19a3 100644 --- a/src/code/z_fcurve_data_skelanime.c +++ b/src/code/z_fcurve_data_skelanime.c @@ -188,7 +188,7 @@ void SkelCurve_DrawLimb(PlayState* play, s32 limbIndex, SkelCurve* skelCurve, Ov Matrix_Scale(scale.x, scale.y, scale.z, MTXMODE_APPLY); if (lod == 0) { - UNUSED s32 pad1; + UNUSED s32 pad; dList = limb->dList[0]; if (dList != NULL) { @@ -197,7 +197,7 @@ void SkelCurve_DrawLimb(PlayState* play, s32 limbIndex, SkelCurve* skelCurve, Ov gSPDisplayList(POLY_OPA_DISP++, dList); } } else if (lod == 1) { - UNUSED s32 pad2; + UNUSED s32 pad; dList = limb->dList[0]; if (dList != NULL) { diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index 7a2b1437525..73b508c7f57 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -296,7 +296,7 @@ static void* sHeartDDTextures[] = { }; void Health_DrawMeter(PlayState* play) { - UNUSED s32 pad[5]; + UNUSED s32 pad1[5]; void* heartBgImg; u32 curColorSet; f32 offsetX; diff --git a/src/code/z_lights.c b/src/code/z_lights.c index be44a0abeea..52c412d4961 100644 --- a/src/code/z_lights.c +++ b/src/code/z_lights.c @@ -357,7 +357,7 @@ void Lights_GlowCheck(PlayState* play) { } void Lights_DrawGlow(PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; LightNode* node; node = play->lightCtx.listHead; @@ -373,7 +373,7 @@ void Lights_DrawGlow(PlayState* play) { LightInfo* info; LightPoint* params; f32 scale; - UNUSED s32 pad[4]; + UNUSED s32 pad2[4]; info = node->info; params = &info->params.point; diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c index f919d4a928e..812cc8560c3 100644 --- a/src/code/z_message_PAL.c +++ b/src/code/z_message_PAL.c @@ -2005,14 +2005,14 @@ void Message_DrawMain(PlayState* play, Gfx** p) { MessageContext* msgCtx = &play->msgCtx; u16 buttonIndexPos; Player* player = GET_PLAYER(play); - UNUSED s32 pad; + UNUSED s32 pad1; Gfx* gfx = *p; s16 r; s16 g; s16 b; u16 i; u16 notePosX; - UNUSED u16 pad1; + UNUSED u16 pad2; u16 j; gSPSegment(gfx++, 0x02, play->interfaceCtx.parameterSegment); @@ -2983,9 +2983,9 @@ void Message_DrawDebugVariableChanged(s16* var, GraphicsContext* gfxCtx) { } void Message_DrawDebugText(PlayState* play, Gfx** p) { - UNUSED s32 pad; - GfxPrint printer; UNUSED s32 pad1; + GfxPrint printer; + UNUSED s32 pad2; GfxPrint_Init(&printer); GfxPrint_Open(&printer, *p); diff --git a/src/code/z_quake.c b/src/code/z_quake.c index 768553fc8d1..ec304e5760c 100644 --- a/src/code/z_quake.c +++ b/src/code/z_quake.c @@ -312,7 +312,7 @@ s16 Quake_Calc(Camera* camera, QuakeCamCalc* camData) { ShakeInfo shake; f32 absSpeedDiv; s16* temp; - UNUSED s32 pad2; + UNUSED s32 pad; s32 idx; s32 ret; u32 eq; diff --git a/src/code/z_room.c b/src/code/z_room.c index 3f3e127027c..980a86de7c1 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -85,7 +85,7 @@ void Room_Draw2(PlayState* play, Room* room, u32 flags) { struct_80095D04* spB4 = NULL; struct_80095D04* spB0 = NULL; struct_80095D04* iter; - UNUSED s32 pad; + UNUSED s32 pad1; struct_80095D04* spA4; s32 j; s32 i; diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index 3d5a521180a..302e9369e61 100644 --- a/src/code/z_vr_box.c +++ b/src/code/z_vr_box.c @@ -81,8 +81,8 @@ Struct_8012AF0C D_8012AF0C[6] = { s32 func_800ADBB0(SkyboxContext* skyboxCtx, Vtx* roomVtx, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { - UNUSED s32 pad42C; - UNUSED s32 pad428; + s32 sp42C; + s32 sp428; s32 sp424; s32 i; s32 j; @@ -103,55 +103,55 @@ s32 func_800ADBB0(SkyboxContext* skyboxCtx, Vtx* roomVtx, s32 arg2, s32 arg3, s3 switch (arg8) { case 0: case 2: - pad428 = arg4; + sp428 = arg4; for (i = 0, k = 0; k < 45; i++) { - pad42C = arg3; + sp42C = arg3; for (j = 0; j < 5; j++, k++) { sp1F0[k] = arg5; - sp358[k] = pad42C; - sp2A4[k] = pad428; + sp358[k] = sp42C; + sp2A4[k] = sp428; sp13C[k] = D_8012AD20[j]; sp88[k] = D_8012AD2C[i]; - pad42C += arg6; + sp42C += arg6; } - pad428 += arg7; + sp428 += arg7; } break; case 1: case 3: - pad428 = arg4; + sp428 = arg4; for (i = 0, k = 0; k < 45; i++) { - pad42C = arg5; + sp42C = arg5; for (j = 0; j < 5; j++, k++) { sp358[k] = arg3; - sp2A4[k] = pad428; - sp1F0[k] = pad42C; + sp2A4[k] = sp428; + sp1F0[k] = sp42C; sp13C[k] = D_8012AD20[j]; sp88[k] = D_8012AD2C[i]; - pad42C += arg6; + sp42C += arg6; } - pad428 += arg7; + sp428 += arg7; } break; case 4: case 5: - pad428 = arg5; + sp428 = arg5; for (i = 0, k = 0; k < 45; i++) { - pad42C = arg3; + sp42C = arg3; for (j = 0; j < 5; j++, k++) { sp2A4[k] = arg4; - sp358[k] = pad42C; - sp1F0[k] = pad428; + sp358[k] = sp42C; + sp1F0[k] = sp428; sp13C[k] = D_8012AD20[j]; sp88[k] = D_8012AD2C[i]; - pad42C += arg6; + sp42C += arg6; } - pad428 += arg7; + sp428 += arg7; } break; } 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 cb3c1593498..118c4f9a151 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -148,7 +148,7 @@ void ArmsHook_Shoot(ArmsHook* this, PlayState* play) { DynaPolyActor* dynaPolyActor; f32 curGrabbedDist; f32 grabbedDist; - UNUSED s32 pad; + UNUSED s32 pad1; CollisionPoly* poly; s32 bgId; Vec3f intersectPos; @@ -157,7 +157,7 @@ void ArmsHook_Shoot(ArmsHook* this, PlayState* play) { f32 polyNormalX; f32 polyNormalZ; f32 velocity; - UNUSED s32 pad1; + UNUSED s32 pad2; if ((this->actor.parent == NULL) || (!Player_HoldsHookshot(player))) { ArmsHook_DetachHookFromActor(this); diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c index 03654fde10f..eae3e1a6e17 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c @@ -82,8 +82,7 @@ const ActorInit Bg_Bombwall_InitVars = { }; void BgBombwall_InitDynapoly(BgBombwall* this, PlayState* play) { - UNUSED s32 pad; - UNUSED s32 pad2; + UNUSED s32 pad[2]; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index 7686d052865..03188adff52 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -46,8 +46,7 @@ static s16 sTargetRot[] = { 0x0000, 0x0000, 0x3FFF, -0x3FFF }; void BgBowlWall_Init(Actor* thisx, PlayState* play) { BgBowlWall* this = (BgBowlWall*)thisx; - UNUSED s32 pad1; - UNUSED s32 pad2; + UNUSED s32 pad[2]; CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DPM_UNK); diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c index a976cce25ed..af8bfbbacfb 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c +++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c @@ -107,7 +107,7 @@ void BgHakaWater_Update(Actor* thisx, PlayState* play) { void BgHakaWater_Draw(Actor* thisx, PlayState* play) { BgHakaWater* this = (BgHakaWater*)thisx; - UNUSED s32 pad; + UNUSED s32 pad1; f32 temp; UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c index ffccedaa00e..738e316ff72 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c @@ -289,8 +289,7 @@ void func_808887C4(BgHidanHamstep* this, PlayState* play) { } void func_80888860(BgHidanHamstep* this, PlayState* play) { - UNUSED s32 pad; - UNUSED s32 pad2; + UNUSED s32 pad[2]; s32 quakeIndex; Actor_MoveForward(&this->dyna.actor); @@ -339,8 +338,7 @@ void func_808889B8(BgHidanHamstep* this, PlayState* play) { } void func_80888A58(BgHidanHamstep* this, PlayState* play) { - UNUSED s32 pad; - UNUSED s32 pad2; + UNUSED s32 pad[2]; s32 quakeIndex; Actor_MoveForward(&this->dyna.actor); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index e491c305a2a..4861540a853 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -73,7 +73,7 @@ void BgHidanKowarerukabe_InitDynaPoly(BgHidanKowarerukabe* this, PlayState* play &gFireTempleBombableWallCol, &gFireTempleLargeBombableWallCol, }; - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader = NULL; UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index 6b46b63d4c1..2ba10983c86 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -99,7 +99,7 @@ void func_80890740(BgIceShelter* this, PlayState* play) { } void func_80890874(BgIceShelter* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader = NULL; UNUSED s32 pad2; @@ -332,7 +332,6 @@ static void (*sEffSpawnFuncs[])(BgIceShelter* this, PlayState* play, f32 chance, }; void func_808911D4(BgIceShelter* this, PlayState* play) { - UNUSED s32 pad; s32 type = (this->dyna.actor.params >> 8) & 7; f32 phi_f0; 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 8e07ecd9343..0fa8b167a29 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -35,7 +35,6 @@ void BgInGate_SetupAction(BgInGate* this, BgInGateActionFunc actionFunc) { void BgInGate_Init(Actor* thisx, PlayState* play) { BgInGate* this = (BgInGate*)thisx; - UNUSED s32 pad; CollisionHeader* colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index 71a54914fb8..6cdcc2d473e 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -67,7 +67,7 @@ static InitChainEntry sInitChain[] = { }; void BgJya1flift_InitDynapoly(BgJya1flift* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader = NULL; UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index 7833776bfc4..ca1ee6c27a5 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -116,7 +116,7 @@ void func_808958F0(Vec3f* dest, Vec3f* src, f32 arg2, f32 arg3) { } void BgJyaCobra_InitDynapoly(BgJyaCobra* this, PlayState* play, CollisionHeader* collision, s32 flags) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader = NULL; UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index 134f405023f..6a7895abb7e 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -40,7 +40,7 @@ static InitChainEntry sInitChain[] = { }; void BgJyaKanaami_InitDynaPoly(BgJyaKanaami* this, PlayState* play, CollisionHeader* collision, s32 flag) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader = NULL; UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index bc067b50abd..ff777c17f55 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -60,7 +60,7 @@ static InitChainEntry sInitChain[] = { }; void BgJyaZurerukabe_InitDynaPoly(BgJyaZurerukabe* this, PlayState* play, CollisionHeader* collision, s32 flag) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader = NULL; UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c index 918ccb47de9..c7497cde960 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c @@ -45,7 +45,7 @@ static InitChainEntry sInitChain[] = { }; void BgMizuShutter_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; BgMizuShutter* this = (BgMizuShutter*)thisx; UNUSED s32 pad2; CollisionHeader* colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c index f2536583383..54f141a0c6a 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c @@ -35,7 +35,7 @@ static InitChainEntry sInitChain[] = { }; void BgMizuUzu_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; BgMizuUzu* this = (BgMizuUzu*)thisx; CollisionHeader* colHeader = NULL; UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index d24a398f65d..71c229c38c9 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -50,7 +50,7 @@ void BgMoriBigst_SetupAction(BgMoriBigst* this, BgMoriBigstActionFunc actionFunc } void BgMoriBigst_InitDynapoly(BgMoriBigst* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader = NULL; UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index 9f89af9767f..c9d7df4630a 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -77,7 +77,7 @@ static InitChainEntry sInitChainLadder[] = { }; void BgMoriHashigo_InitDynapoly(BgMoriHashigo* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader; UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c index a1b315d9c06..33f9d0d1863 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c @@ -49,7 +49,7 @@ void BgMoriHashira4_SetupAction(BgMoriHashira4* this, BgMoriHashira4ActionFunc a } void BgMoriHashira4_InitDynaPoly(BgMoriHashira4* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader; UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index 783419f47f0..1b7b39c9538 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -592,7 +592,7 @@ void BgPoEvent_Draw(Actor* thisx, PlayState* play) { gPoSistersAmyBlockDL, gPoSistersAmyBethBlockDL, gPoSistersJoellePaintingDL, gPoSistersBethPaintingDL, gPoSistersAmyPaintingDL, }; - UNUSED s32 pad; + UNUSED s32 pad1; BgPoEvent* this = (BgPoEvent*)thisx; u8 alpha; Vec3f sp58; diff --git a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c index 3caa3d2c0ae..137df5e55fd 100644 --- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c +++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c @@ -38,7 +38,7 @@ void BgPushbox_SetupAction(BgPushbox* this, BgPushboxActionFunc actionFunc) { } void BgPushbox_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; BgPushbox* this = (BgPushbox*)thisx; CollisionHeader* colHeader = NULL; UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index a8a779f6926..27d11c6a569 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -189,11 +189,11 @@ s32 func_808AB29C(BgSpot01Idohashira* this, PlayState* play) { Vec3f* thisPos; f32 endX; f32 temp_f0; - UNUSED s32 pad2; + UNUSED s32 pad1; Vec3f initPos; f32 endZ; f32 tempY; - UNUSED s32 pad; + UNUSED s32 pad2; npcAction = BgSpot01Idohashira_GetNpcAction(play, 2); if (npcAction != NULL) { diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c index 29360e74acf..016f2064e80 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c @@ -37,7 +37,7 @@ void BgSpot01Idosoko_SetupAction(BgSpot01Idosoko* this, BgSpot01IdosokoActionFun } void BgSpot01Idosoko_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; BgSpot01Idosoko* this = (BgSpot01Idosoko*)thisx; CollisionHeader* colHeader = NULL; UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index f48d6ab5d7f..8676c178d2a 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -281,7 +281,7 @@ void BgSpot06Objects_LockSpawnBubbles(BgSpot06Objects* this, PlayState* play, s3 * This is where the fish shaped lock waits to be pulled out by the hookshot. Once it does it will spawn bubbles. */ void BgSpot06Objects_LockWait(BgSpot06Objects* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; s32 i; UNUSED s32 pad2; Vec3f effectPos; diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c index 91ce8b55565..d1387e6d4fd 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c @@ -39,7 +39,7 @@ void BgSpot08Iceblock_SetupAction(BgSpot08Iceblock* this, BgSpot08IceblockAction } void BgSpot08Iceblock_InitDynaPoly(BgSpot08Iceblock* this, PlayState* play, CollisionHeader* collision, s32 flags) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader = NULL; UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index 77b709b5e22..9bb671b18d3 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -93,7 +93,7 @@ s32 func_808B1BA0(BgSpot09Obj* this, PlayState* play) { } s32 func_808B1BEC(BgSpot09Obj* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader = NULL; UNUSED s32 pad2[2]; diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index ec2df3a0c21..bdeb01376f1 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -43,7 +43,7 @@ static InitChainEntry sInitChain[] = { }; void BgSpot12Gate_InitDynaPoly(BgSpot12Gate* this, PlayState* play, CollisionHeader* collision, s32 flags) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader = NULL; UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index ee3eb2ee883..d02b6ed0c30 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -41,7 +41,7 @@ static InitChainEntry sInitChain[] = { }; void func_808B3420(BgSpot12Saku* this, PlayState* play, CollisionHeader* collision, s32 flags) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader = NULL; UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index 07cad39d6b1..0df6a845e7a 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -55,7 +55,7 @@ static Vec3f D_808B45DC[] = { }; void func_808B3960(BgSpot15Rrbox* this, PlayState* play, CollisionHeader* collision, s32 flags) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader = NULL; UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c index 09ea4d0c132..7fc62ed2838 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c @@ -31,7 +31,7 @@ const ActorInit Bg_Spot15_Saku_InitVars = { }; void BgSpot15Saku_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; BgSpot15Saku* this = (BgSpot15Saku*)thisx; UNUSED s32 pad2; CollisionHeader* colHeader = NULL; diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 0ce821f9804..1b5a43bc19e 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -1553,7 +1553,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) { { -890.0f, 0.0f, -3804.0f }, { -1390.0f, 0.0f, -3304.0f } }; Vec3f* sp78; - UNUSED s32 pad74; + UNUSED s32 pad; if (this->unk_1A2 == 0) { sp78 = &spAC[this->unk_1A0]; diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index 1a5e80b22d6..1e4e8802dba 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -268,7 +268,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) { Player* player = GET_PLAYER(play); f32 angleToTarget; f32 pitchToTarget; - UNUSED s32 pad; + UNUSED s32 pad1; f32 temp_y; f32 temp_x; f32 temp_z; @@ -763,7 +763,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) { Vec3f sp170; Vec3f sp164 = { 0.0f, 0.03f, 0.0f }; Vec3f sp158; - UNUSED s32 pad; + UNUSED s32 pad2; s16 temp_rand2; s16 sp150; @@ -926,7 +926,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) { Vec3f spE0[3]; Vec3f spBC[3]; f32 phi_f20; - UNUSED s32 pad1[3]; + UNUSED s32 pad3[3]; Math_ApproachS(&this->actor.world.rot.y, angleToTarget, 0xA, this->fwork[BFD_TURN_RATE]); diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index 845e0e5f664..8b88920c9e8 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -3868,9 +3868,9 @@ void BossGanon_LightBall_Update(Actor* thisx, PlayState* play2) { f32 yDistFromGanondorf; f32 zDistFromGanondorf; Player* player = GET_PLAYER(play); - UNUSED s32 pad; - BossGanon* ganondorf = (BossGanon*)this->actor.parent; UNUSED s32 pad1; + BossGanon* ganondorf = (BossGanon*)this->actor.parent; + UNUSED s32 pad2; this->unk_1A2++; ganondorf->envLightMode = 1; @@ -4591,7 +4591,7 @@ void BossGanon_UpdateEffects(PlayState* play) { Player* player = GET_PLAYER(play); GanondorfEffect* eff = play->specialEffects; s16 i; - UNUSED s32 pad; + UNUSED s32 pad1; f32 xDiff; f32 yDiff; f32 zDiff; @@ -4600,8 +4600,7 @@ void BossGanon_UpdateEffects(PlayState* play) { Vec3f spA0; s16 bodyPart; f32 distToPlayer; - UNUSED s32 pad2; - UNUSED s32 pad3; + UNUSED s32 pad2[2]; spA0.x = 0.0f; spA0.y = 0.0f; diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index 65e851d36f1..15e72bec097 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -179,7 +179,7 @@ void func_808FD5C4(BossGanon2* this, PlayState* play) { } void func_808FD5F4(BossGanon2* this, PlayState* play) { - UNUSED s16 pad; + UNUSED s16 pad1; u8 sp8D; Player* player; s32 objectIdx; @@ -2539,7 +2539,7 @@ s32 BossGanon2_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec } void BossGanon2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { - UNUSED s8 pad; + UNUSED u8 pad; s8 temp_v0; BossGanon2* this = (BossGanon2*)thisx; Vec3f sp4C; diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index de3ce16372b..4e3e1ff8ac6 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -1289,9 +1289,9 @@ void BossGanondrof_Update(Actor* thisx, PlayState* play) { f32 legRotTargetY; f32 legRotTargetZ; f32 legSplitTarget; - UNUSED s32 pad2; + UNUSED s32 pad1; s16 i; - UNUSED s32 pad; + UNUSED s32 pad2; BossGanondrof* this = (BossGanondrof*)thisx; EnfHG* horse; diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index 46132f74ef4..6b1c63d4d16 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -440,15 +440,10 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { Vec3f sp138; Vec3f sp12C; Vec3f sp120; - UNUSED s32 pad11C; - UNUSED s32 pad118; - UNUSED s32 pad114; - UNUSED s32 pad110; - UNUSED s32 pad10C; - UNUSED s32 pad108; + UNUSED s32 pad[6]; Vec3f spFC; Vec3f spF0; - f32 padEC; + f32 spEC; Vec3f spE0; Vec3f spD4; Vec3f spC8; @@ -1071,8 +1066,8 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { } else { this->fwork[MO_TENT_MAX_STRETCH] = 0.2f; this->fwork[MO_TENT_MAX_STRETCH] += Math_SinS(this->work[MO_TENT_MOVE_TIMER] * 0x2000) * 0.05f; - padEC = Math_CosS(this->work[MO_TENT_MOVE_TIMER] * 0x2000) * 0.0005f; - Math_ApproachF(&this->actor.scale.x, 0.002f + padEC, 0.5f, 0.0005f); + spEC = Math_CosS(this->work[MO_TENT_MOVE_TIMER] * 0x2000) * 0.0005f; + Math_ApproachF(&this->actor.scale.x, 0.002f + spEC, 0.5f, 0.0005f); this->actor.world.pos.y += this->actor.velocity.y; this->actor.velocity.y -= 1.0f; if (this->actor.world.pos.y < -250.0f) { @@ -1196,7 +1191,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) { f32 dz; f32 tempX; f32 tempY; - UNUSED s32 pad84; + UNUSED s32 pad1; f32 sp80; f32 sp7C; f32 sp78; @@ -1205,7 +1200,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) { Vec3f bubblePos; Vec3f bubblePos2; Camera* mainCam2; - UNUSED s32 pad[3]; + UNUSED s32 pad2[3]; if (this->csState < MO_INTRO_REVEAL) { this->subCamFov = 80.0f; @@ -1845,19 +1840,18 @@ void BossMo_Core(BossMo* this, PlayState* play) { f32 spD4; f32 spD0; f32 spCC; - UNUSED s32 padC8; + UNUSED s32 pad1; s32 temp; // not on stack f32 xScaleTarget; // not on stack f32 yScaleTarget; Vec3f effectPos; Vec3f effectVelocity; Vec3f effectAccel; - UNUSED s32 pad94; - UNUSED s32 pad90; + UNUSED s32 pad2[2]; s16 j; s16 index; // not on stack f32 sp88; - UNUSED s32 pad84; + UNUSED s32 pad3; f32 sp80; f32 sp7C; Vec3f sp70; @@ -2458,8 +2452,7 @@ void BossMo_DrawTentacle(BossMo* this, PlayState* play) { BossMo_InitRand(1, 29100, 9786); for (i = 0; i < 41; i++, matrix++) { - UNUSED s32 pad; - UNUSED s32 pad2; + UNUSED s32 pad[2]; if (i < 2) { Matrix_Push(); diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index a3a052ceae5..a5b3191acd6 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -2388,9 +2388,7 @@ void BossTw_TwinrovaSetupDeathCS(BossTw* this, PlayState* play) { } void BossTw_DeathCSMsgSfx(BossTw* this, PlayState* play) { - UNUSED s32 pad; - UNUSED s32 pad2; - UNUSED s32 pad3; + UNUSED s32 pad[3]; s16 msgId2; s16 msgId1; u8 kotakeAnim; diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index 3d6bc23902f..e07a05ab4c8 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -1917,7 +1917,7 @@ void BossVa_ZapperAttack(BossVa* this, PlayState* play) { s16 sp8E; u32 sp88; Vec3f sp7C; - UNUSED s32 pad3; + UNUSED s32 pad; f32 sp74; s32 i; s16 sp6E; @@ -3291,18 +3291,18 @@ void BossVa_UpdateEffects(PlayState* play) { s16 spB6; s16 i; f32 floorY; - UNUSED s32 padAC; + UNUSED s32 pad; s16 pitch; s16 yaw; BossVa* refActor2; BossVa* refActor; Vec3f sp94; CollisionPoly* sp90; - f32 pad8C; + f32 sp8C; Vec3f sp80; CollisionPoly* sp7C; - f32 pad78; - f32 pad74; + f32 sp78; + f32 sp74; for (i = 0; i < BOSS_VA_EFFECT_COUNT; i++, effect++) { if (effect->type != VA_NONE) { @@ -3324,12 +3324,12 @@ void BossVa_UpdateEffects(PlayState* play) { if ((effect->mode == SPARK_TETHER) || (effect->mode == SPARK_UNUSED)) { pitch = effect->rot.x - Math_Vec3f_Pitch(&refActor->actor.world.pos, &GET_BODY(refActor)->unk_1D8); - pad8C = Math_SinS(refActor->actor.world.rot.y); - effect->pos.x = refActor->actor.world.pos.x - (effect->offset.x * pad8C); - pad74 = Math_CosS(refActor->actor.world.rot.y); - effect->pos.z = refActor->actor.world.pos.z - (effect->offset.x * pad74); - pad78 = Math_CosS(-pitch); - effect->pos.y = (effect->offset.y * pad78) + refActor->actor.world.pos.y; + sp8C = Math_SinS(refActor->actor.world.rot.y); + effect->pos.x = refActor->actor.world.pos.x - (effect->offset.x * sp8C); + sp74 = Math_CosS(refActor->actor.world.rot.y); + effect->pos.z = refActor->actor.world.pos.z - (effect->offset.x * sp74); + sp78 = Math_CosS(-pitch); + effect->pos.y = (effect->offset.y * sp78) + refActor->actor.world.pos.y; } else if ((effect->mode == SPARK_BARI) || (effect->mode == SPARK_BODY)) { effect->pos.x = effect->offset.x + refActor->actor.world.pos.x; effect->pos.y = effect->offset.y + refActor->actor.world.pos.y; diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index c7fba96c919..5d64f165c5a 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -558,7 +558,7 @@ void Demo6K_Update(Actor* thisx, PlayState* play) { void func_80967FFC(Actor* thisx, PlayState* play) { Demo6K* this = (Demo6K*)thisx; - UNUSED s32 pad; + UNUSED s32 pad1; u16 timer1 = this->timer1; OPEN_DISPS(play->state.gfxCtx, "../z_demo_6k.c", 1070); @@ -571,7 +571,7 @@ void func_80967FFC(Actor* thisx, PlayState* play) { { s32 i; - UNUSED s32 pad; + UNUSED s32 pad2; Color_RGB8 colors[6][2] = { { { 255, 170, 255 }, { 255, 0, 100 } }, { { 255, 255, 170 }, { 0, 255, 0 } }, { { 255, 255, 170 }, { 255, 255, 0 } }, { { 255, 170, 255 }, { 50, 0, 255 } }, diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index 89317757542..40e99060e28 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -392,7 +392,7 @@ void DemoDu_CsGoronsRuby_SpawnDustWhenHittingLink(DemoDu* this, PlayState* play) }; if (Animation_OnFrame(&this->skelAnime, 31.0f) || Animation_OnFrame(&this->skelAnime, 41.0f)) { - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; s32 i; Player* player = GET_PLAYER(play); Vec3f* pos = &player->bodyPartsPos[PLAYER_BODYPART_L_FOREARM]; diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index c1cfb638d41..c8ad43aa864 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -1251,7 +1251,7 @@ void DemoEc_InitNpc(DemoEc* this, PlayState* play) { } void DemoEc_InitCommon(DemoEc* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; s16 primary; s32 type; UNUSED s16 pad2; 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 e95dca4b014..6d35002c805 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -1399,8 +1399,7 @@ void DemoEffect_MoveJewelSplit(PosRot* world, DemoEffect* this) { */ void DemoEffect_MoveJewelSpherical(f32 degrees, f32 frameDivisor, Vec3f startPos, Vec3f endPos, f32 radius, Vec3s rotation, DemoEffect* this) { - UNUSED s32 pad; - UNUSED s32 pad2; + UNUSED s32 pad[2]; f32 distance; f32 xPos; f32 ySpherical; @@ -1896,7 +1895,7 @@ void DemoEffect_DrawLightEffect(Actor* thisx, PlayState* play) { */ void DemoEffect_DrawBlueOrb(Actor* thisx, PlayState* play) { DemoEffect* this = (DemoEffect*)thisx; - UNUSED s32 pad2; + UNUSED s32 pad; OPEN_DISPS(play->state.gfxCtx, "../z_demo_effect.c", 2892); gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 188, 255, 255, this->blueOrb.alpha); diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index 2f99d8d18b3..f0945c36046 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -281,7 +281,7 @@ void DemoGj_DrawCommon(DemoGj* this, PlayState* play, Gfx* displayList) { } void DemoGj_DrawRotated(DemoGj* this, PlayState* play, Gfx* displayList) { - UNUSED s32 pad; + UNUSED s32 pad1; GraphicsContext* gfxCtx; s16 x = this->rotationVec.x; s16 y = this->rotationVec.y; @@ -1005,7 +1005,7 @@ void func_8097AEE8(DemoGj* this, PlayState* play) { } void DemoGj_SetCylindersAsAC(DemoGj* this, PlayState* play) { - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; Collider* cylinder0 = &this->cylinders[0].base; Collider* cylinder1 = &this->cylinders[1].base; Collider* cylinder2 = &this->cylinders[2].base; @@ -1135,7 +1135,7 @@ void func_8097B450(DemoGj* this, PlayState* play) { } void DemoGj_SetCylindersAsAC2(DemoGj* this, PlayState* play) { - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; Collider* cylinder0 = &this->cylinders[0].base; Collider* cylinder1 = &this->cylinders[1].base; Collider* cylinder2 = &this->cylinders[2].base; diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index 78aea8c33eb..a53bc749926 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -44,13 +44,13 @@ void DemoGt_SpawnDust(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel } void func_8097D7D8(PlayState* play, Vec3f* pos, Vec3f* velOffset, f32 scale, s32 arg4, s32 arg5, s16 life) { - UNUSED s32 pad; + UNUSED s32 pad1; if (!FrameAdvance_IsEnabled(play)) { s32 frames = play->gameplayFrames; if (ABS(frames % arg4) == arg5) { - UNUSED s32 pad[2]; + UNUSED s32 pad2[2]; Vec3f velocity = { 0.0f, 6.0f, 0.0f }; Vec3f accel = { 0.0f, 0.0f, 0.0f }; @@ -258,7 +258,7 @@ void func_8097E1D4(PlayState* play, Vec3f* arg1, s16 arg2) { void func_8097E454(PlayState* play, Vec3f* spawnerPos, Vec3f* velocity, Vec3f* accel, f32 arg4, f32 scale, s32 arg6, s32 arg7, s16 life) { - UNUSED s32 pad2[3]; + UNUSED s32 pad[3]; s16 increment; s32 frames; s32 i; @@ -501,7 +501,7 @@ void func_8097EF40(DemoGt* this, PlayState* play) { Vec3f velocity = { 0.0f, -16.0f, 0.0f }; Vec3f accel = { 0.0f, 1.2f, 0.0f }; Vec3f* pos = &this->dyna.actor.world.pos; - UNUSED s32 pad; + UNUSED s32 pad2; if ((kREG(1) == 20) || (frames == 220)) { dustPos.x = pos->x + 256.0f; @@ -519,12 +519,12 @@ void func_8097EF40(DemoGt* this, PlayState* play) { } void func_8097F0AC(DemoGt* this, PlayState* play) { - UNUSED s32 pad[3]; + UNUSED s32 pad1[3]; Vec3f sp38; - UNUSED s16 pad1[3]; + UNUSED s16 pad2[3]; Vec3f sp24; u16 frames = play->csCtx.frames; - UNUSED s32 pad2; + UNUSED s32 pad3; if ((frames == 140) || (kREG(1) == 19)) { sp38.x = this->dyna.actor.world.pos.x + 260.0f; @@ -623,7 +623,7 @@ void DemoGt_Update8(DemoGt* this, PlayState* play) { } void DemoGt_Draw1(DemoGt* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; GraphicsContext* gfxCtx = play->state.gfxCtx; u32 gameplayFrames = play->gameplayFrames; UNUSED s16 pad2[2]; @@ -723,12 +723,12 @@ void func_8097F96C(DemoGt* this, PlayState* play) { } void func_8097FA1C(DemoGt* this, PlayState* play) { - UNUSED s32 pad[3]; + UNUSED s32 pad1[3]; Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { -12.0f, -17.0, 5.0 }; - UNUSED s32 pad1[3]; + UNUSED s32 pad2[3]; if (((frames > 502) && !(frames >= 581)) || (kREG(1) == 5)) { dustPos.x = pos->x + 300.0f; @@ -766,12 +766,12 @@ void func_8097FAFC(DemoGt* this, PlayState* play) { } void func_8097FC1C(DemoGt* this, PlayState* play) { - UNUSED s32 pad[3]; + UNUSED s32 pad1[3]; Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -16.0f, -16.0f }; - UNUSED s32 pad1[3]; + UNUSED s32 pad2[3]; if (frames > 682 || kREG(1) == 7) { dustPos.x = pos->x + 260.0f; @@ -925,12 +925,12 @@ void func_80980218(DemoGt* this, PlayState* play) { } void func_809802AC(DemoGt* this, PlayState* play) { - UNUSED s32 pad[3]; + UNUSED s32 pad1[3]; Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 0.0f, 0.0f, -10.0f }; - UNUSED s32 pad1[3]; + UNUSED s32 pad2[3]; if (frames > 109 && frames < 140) { dustPos.x = pos->x - 100.0f; @@ -941,12 +941,12 @@ void func_809802AC(DemoGt* this, PlayState* play) { } void func_8098036C(DemoGt* this, PlayState* play) { - UNUSED s32 pad[3]; + UNUSED s32 pad1[3]; Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* world = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -3.0f, 0.0f }; - UNUSED s32 pad1[3]; + UNUSED s32 pad2[3]; if ((frames > 284) && (frames < 421)) { dustPos.x = world->x + 760.0f; @@ -957,12 +957,12 @@ void func_8098036C(DemoGt* this, PlayState* play) { } void func_80980430(DemoGt* this, PlayState* play) { - UNUSED s32 pad[3]; + UNUSED s32 pad1[3]; Vec3f dustPos; s32 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -3.0f, 0.0f }; - UNUSED s32 pad1[3]; + UNUSED s32 pad2[3]; if (frames > 709 || kREG(1) == 8) { dustPos.x = pos->x + 760.0f; @@ -973,12 +973,12 @@ void func_80980430(DemoGt* this, PlayState* play) { } void func_80980504(DemoGt* this, PlayState* play) { - UNUSED s32 pad[3]; + UNUSED s32 pad1[3]; Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -16.0f, -16.0f }; - UNUSED s32 pad1[3]; + UNUSED s32 pad2[3]; if ((frames > 704) || kREG(1) == 9) { dustPos.x = pos->x + 830.0f; @@ -989,12 +989,12 @@ void func_80980504(DemoGt* this, PlayState* play) { } void func_809805D8(DemoGt* this, PlayState* play) { - UNUSED s32 pad[3]; + UNUSED s32 pad1[3]; Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* homePos = &this->dyna.actor.home.pos; Vec3f velOffset = { 15.0f, -26.0, 0.0f }; - UNUSED s32 pad1[3]; + UNUSED s32 pad2[3]; if (((frames > 739) && (frames < 781)) || kREG(1) == 11) { dustPos.x = homePos->x + 550.0f; @@ -1005,12 +1005,12 @@ void func_809805D8(DemoGt* this, PlayState* play) { } void func_809806B8(DemoGt* this, PlayState* play) { - UNUSED s32 pad[3]; + UNUSED s32 pad1[3]; Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -16.0f, -16.0f }; - UNUSED s32 pad1[3]; + UNUSED s32 pad2[3]; if ((frames > 964) || (kREG(1) == 12)) { dustPos.x = pos->x + 460.0f; @@ -1021,12 +1021,12 @@ void func_809806B8(DemoGt* this, PlayState* play) { } void func_8098078C(DemoGt* this, PlayState* play) { - UNUSED s32 pad[3]; + UNUSED s32 pad1[3]; Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -16.0f, -16.0f }; - UNUSED s32 pad1[3]; + UNUSED s32 pad2[3]; if ((frames > 939) || (kREG(1) == 14)) { dustPos.x = pos->x + 360.0f; @@ -1066,7 +1066,7 @@ void func_809809C0(DemoGt* this, PlayState* play2) { s32 gameplayFrames = play->gameplayFrames; u16 frames = play->csCtx.frames; Vec3f sp54; - UNUSED s16 pad[3]; + UNUSED s16 pad1[3]; if (((frames > 469) && (frames < 481)) || (kREG(1) == 3)) { Vec3f sp40 = { 20.0f, 6.0f, 0.0f }; @@ -1194,14 +1194,14 @@ void func_80980F58(DemoGt* this, PlayState* play) { } void func_80980F8C(DemoGt* this, PlayState* play) { - UNUSED s32 pad[3]; + UNUSED s32 pad1[3]; Vec3f sp58; Vec3f dustPos; u16 frames = play->csCtx.frames; if ((frames > 259) && (frames < 289)) { Vec3f velOfset = { 0.0f, -17.0f, 0.0f }; - UNUSED s32 pad[3]; + UNUSED s32 pad2[3]; sp58.x = 640.0f; sp58.y = 2100.0f; @@ -1246,7 +1246,7 @@ void DemoGt_Draw4(DemoGt* this, PlayState* play2) { GraphicsContext* gfxCtx; PlayState* play = play2; u16 frames = play->csCtx.frames; - UNUSED s32 pad; + UNUSED s32 pad1; s16 sp76; f32 sp70; f32 sp6C; @@ -1317,14 +1317,14 @@ void func_80981424(DemoGt* this, PlayState* play) { } void func_80981458(DemoGt* this, PlayState* play) { - UNUSED s32 pad[3]; + UNUSED s32 pad1[3]; Vec3f sp58; Vec3f dustPos; u16 frames = play->csCtx.frames; if (((frames > 855) && (frames < 891)) || (kREG(1) == 13)) { Vec3f velOffset = { 0.0f, -30.0f, 0.0f }; - UNUSED s32 pad1[3]; + UNUSED s32 pad2[3]; sp58.x = 0.0f; sp58.y = 1170.0f; @@ -1367,13 +1367,13 @@ void DemoGt_Update17(DemoGt* this, PlayState* play) { void DemoGt_Draw5(DemoGt* this, PlayState* play) { GraphicsContext* gfxCtx; - UNUSED s32 pad; + UNUSED s32 pad1; s16 sp76; f32 sp70; f32 sp6C; s16 sp6A; s16 sp68; - UNUSED s16 pad1; + UNUSED s16 pad2; Mtx* sp60; Vec3f sp54; Vec3f sp48; diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 7d3c5aa71a4..a336c0532fa 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -454,7 +454,7 @@ void func_8098F16C(DemoSa* this, PlayState* play) { } void DemoSa_DrawXlu(DemoSa* this, PlayState* play) { - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; s16 eyeIndex = this->eyeIndex; void* sp78 = sEyeTextures[eyeIndex]; s16 mouthIndex = this->mouthIndex; @@ -792,7 +792,7 @@ void DemoSa_DrawNothing(DemoSa* this, PlayState* play) { } void DemoSa_DrawOpa(DemoSa* this, PlayState* play) { - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; s16 eyeIndex = this->eyeIndex; void* eyeTex = sEyeTextures[eyeIndex]; UNUSED s32 pad2; 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 bd1efe1a015..a665db8abd1 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -916,8 +916,7 @@ void DoorWarp1_DrawPurpleCrystal(DoorWarp1* this, PlayState* play) { } void DoorWarp1_DrawWarp(DoorWarp1* this, PlayState* play) { - UNUSED s32 pad; - UNUSED s32 pad1; + UNUSED s32 pad[2]; u32 spEC = play->state.frames * 10; f32 spE8 = (this->unk_194 >= 1.0f) ? 0.0f : 1.0f - this->unk_194; f32 spE4 = (this->unk_198 >= 1.0f) ? 0.0f : 1.0f - this->unk_198; 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 3d33c28fbce..d69fa4ed5df 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -831,13 +831,13 @@ void EnAm_Update(Actor* thisx, PlayState* play) { static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; static Color_RGBA8 dustPrimColor = { 150, 150, 150, 255 }; static Color_RGBA8 dustEnvColor = { 100, 100, 100, 150 }; - UNUSED s32 pad; + UNUSED s32 pad1; EnAm* this = (EnAm*)thisx; EnBom* bomb; Vec3f dustPos; s32 i; f32 dustPosScale; - UNUSED s32 pad1; + UNUSED s32 pad2; if (this->dyna.actor.params != ARMOS_STATUE) { EnAm_UpdateDamage(this, play); 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 5592d71e157..af3a7b065ea 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -143,8 +143,7 @@ void EnBombf_SetupGrowBomb(EnBombf* this, s16 params) { void EnBombf_GrowBomb(EnBombf* this, PlayState* play) { EnBombf* bombFlower; - UNUSED s32 pad; - UNUSED s32 pad1; + UNUSED s32 pad1[2]; Player* player = GET_PLAYER(play); UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c index 4b519a4c860..2e07a4aff1c 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c @@ -163,8 +163,7 @@ void EnCs_Destroy(Actor* thisx, PlayState* play) { } s32 EnCs_GetTalkState(EnCs* this, PlayState* play) { - UNUSED s32 pad; - UNUSED s32 pad2; + UNUSED s32 pad[2]; s32 talkState = 1; switch (Message_GetState(&play->msgCtx)) { diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index 85f168bb797..46d2bd740c7 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -452,7 +452,7 @@ void EnDaikuKakariko_Run(EnDaikuKakariko* this, PlayState* play) { void EnDaikuKakariko_Update(Actor* thisx, PlayState* play) { EnDaikuKakariko* this = (EnDaikuKakariko*)thisx; - UNUSED s32 pad; + UNUSED s32 pad1; Player* player = GET_PLAYER(play); UNUSED s32 pad2; 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 1e777c52a9c..1648dfb3aa8 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -421,7 +421,6 @@ void EnDekunuts_BeStunned(EnDekunuts* this, PlayState* play) { void EnDekunuts_Die(EnDekunuts* this, PlayState* play) { static Vec3f effectVelAndAccel = { 0.0f, 0.0f, 0.0f }; - UNUSED s32 pad; Vec3f effectPos; diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index 407ee67fe6b..07e2b132c64 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -501,10 +501,10 @@ void EnDh_CollisionCheck(EnDh* this, PlayState* play) { } void EnDh_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; EnDh* this = (EnDh*)thisx; Player* player = GET_PLAYER(play); - UNUSED s32 pad40; + UNUSED s32 pad2; EnDh_CollisionCheck(this, play); this->actionFunc(this, play); diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index da51576fe02..421c791992c 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -193,8 +193,7 @@ void EnDha_Wait(EnDha* this, PlayState* play) { Vec3f armPosMultiplier1 = { 0.0f, 0.0f, 55.0f }; Vec3f armPosMultiplier2 = { 0.0f, 0.0f, -54.0f }; Player* player = GET_PLAYER(play); - UNUSED s32 pad; - UNUSED s32 pad2; + UNUSED s32 pad[2]; Vec3f playerPos = player->actor.world.pos; Vec3s angle; s16 yaw; 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 98a27789115..b4c71d735e0 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -422,7 +422,7 @@ void EnDodongo_EndBreatheFire(EnDodongo* this, PlayState* play) { } void EnDodongo_BreatheFire(EnDodongo* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; Vec3f velocity = { 0.0f, 0.0f, 0.0f }; Vec3f accel = { 0.0f, 0.0f, 0.0f }; Vec3f pos; @@ -742,7 +742,7 @@ void EnDodongo_UpdateQuad(EnDodongo* this, PlayState* play) { Vec3f sp88 = { -1000.0f, -200.0f, 1500.0f }; Vec3f sp7C = { -1000.0f, -200.0f, -1500.0f }; Vec3f sp70 = { 0.0f, 0.0f, 0.0f }; - UNUSED s32 pad4C[9]; // Possibly 3 more Vec3fs? + UNUSED s32 pad[9]; // Possibly 3 more Vec3fs? s32 a = 0; s32 b = 1; // These indices are needed to match. s32 c = 2; // Might be a way to quickly test vertex arrangements 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 f409c2eaa5b..1ff8f737d71 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -296,7 +296,7 @@ void EnDoor_Update(Actor* thisx, PlayState* play) { } s32 EnDoor_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { - UNUSED s32 pad; + UNUSED s32 pad1; TransitionActorEntry* transitionEntry; Gfx** doorDLists; UNUSED s32 pad2; 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 805b7cd47ab..bcee76a869c 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -1502,11 +1502,11 @@ s32 EnElf_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p } void EnElf_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; f32 alphaScale; s32 envAlpha; EnElf* this = (EnElf*)thisx; - UNUSED s32 pad1; + UNUSED s32 pad2; Gfx* dListHead; Player* player = GET_PLAYER(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 6fdf04987b5..ec7824d6185 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -262,7 +262,7 @@ void EnFish_Respawning_SetupFleePlayer(EnFish* this) { } void EnFish_Respawning_FleePlayer(EnFish* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; UNUSED s16 pad2; s16 frames; s16 yaw; @@ -317,7 +317,7 @@ void EnFish_Respawning_SetupApproachPlayer(EnFish* this) { } void EnFish_Respawning_ApproachPlayer(EnFish* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; Player* player = GET_PLAYER(play); UNUSED s32 pad2; Vec3f sp38; @@ -536,9 +536,9 @@ void EnFish_Unique_SwimIdle(EnFish* this, PlayState* play) { f32 playSpeed; u32 frames = play->gameplayFrames; f32* speed; - UNUSED s32 pad2; + UNUSED s32 pad1; f32 extraPlaySpeed; - UNUSED s32 pad3; + UNUSED s32 pad2; if (this->actor.xzDistToPlayer < 60.0f) { if (this->timer < 12) { @@ -616,8 +616,7 @@ void EnFish_Cutscene_WiggleFlyingThroughAir(EnFish* this, PlayState* play) { } void EnFish_UpdateCutscene(EnFish* this, PlayState* play) { - UNUSED s32 pad; - UNUSED s32 pad2; + UNUSED s32 pad[2]; CsCmdActorAction* csAction = play->csCtx.npcActions[1]; Vec3f startPos; Vec3f endPos; 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 0615d6bcb76..d7504de4a4f 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -273,7 +273,7 @@ void EnFr_DrawActive(EnFr* this) { void EnFr_Update(Actor* thisx, PlayState* play) { EnFr* this = (EnFr*)thisx; - UNUSED s32 pad; + UNUSED s32 pad1; s32 frogIndex; UNUSED s32 pad2; 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 62710dfc9fd..537028bc282 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -486,8 +486,7 @@ void EnGe2_SetupCapturePlayer(EnGe2* this, PlayState* play) { } void EnGe2_MaintainColliderAndSetAnimState(EnGe2* this, PlayState* play) { - UNUSED s32 pad; - UNUSED s32 pad2; + UNUSED s32 pad[2]; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); 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 f463ff0e7f9..593835cdd17 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -170,8 +170,7 @@ void EnGe3_ForceTalk(EnGe3* this, PlayState* play) { } void EnGe3_UpdateCollision(EnGe3* this, PlayState* play) { - UNUSED s32 pad; - UNUSED s32 pad2; + UNUSED s32 pad[2]; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); 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 316dffca259..15bc4409e16 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -352,7 +352,7 @@ s32 EnGoroiwa_MoveUpToNextWaypoint(EnGoroiwa* this, PlayState* play) { } s32 EnGoroiwa_MoveDownToNextWaypoint(EnGoroiwa* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; Path* path = &play->setupPathList[this->actor.params & 0xFF]; Vec3s* nextPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint; f32 nextPointY; diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index 89226b76a4a..4eb424c85e1 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -381,7 +381,7 @@ void EnHeishi1_Update(Actor* thisx, PlayState* play) { EnHeishi1* this = (EnHeishi1*)thisx; s16 path; u8 i; - UNUSED s32 pad; + UNUSED s32 pad1; Player* player = GET_PLAYER(play); UNUSED s32 pad2; Camera* activeCam; 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 faf274c8c90..f49a92327e6 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -3109,11 +3109,11 @@ void EnHorse_BgCheckSlowMoving(EnHorse* this, PlayState* play) { } void EnHorse_UpdateBgCheckInfo(EnHorse* this, PlayState* play) { - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; Vec3f startPos; Vec3f endPos; Vec3f obstaclePos; - UNUSED s32 pad1; + UNUSED s32 pad2; f32 intersectDist; CollisionPoly* wall = NULL; CollisionPoly* obstacleFloor = NULL; @@ -3122,7 +3122,7 @@ void EnHorse_UpdateBgCheckInfo(EnHorse* this, PlayState* play) { f32 behindObstacleHeight; f32 ny; s32 movingFast; - UNUSED s32 pad2; + UNUSED s32 pad3; DynaPolyActor* dynaPoly; Vec3f intersect; Vec3f obstacleTop; diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index 9fa40242220..46e5adacaf0 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -556,7 +556,7 @@ void EnHorseNormal_WaitClone(EnHorseNormal* this, PlayState* play) { } void func_80A6C8E0(EnHorseNormal* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionPoly* sp38; UNUSED s32 pad2; Vec3f sp28; diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c index d0ece4d21e6..6df947d2c7f 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c @@ -214,7 +214,7 @@ void func_80A6DDFC(EnHorseZelda* this, PlayState* play) { } void func_80A6DE38(EnHorseZelda* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionPoly* poly; UNUSED s32 pad2; Vec3f pos; 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 398e8e06802..415db86ae6e 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -660,7 +660,7 @@ void func_80A75A38(EnIk* this, PlayState* play) { void func_80A75C38(EnIk* this, PlayState* play) { f32 temp_f0; - UNUSED u8 pad; + UNUSED u8 pad1; UNUSED u8 pad2; u8 prevHealth; s32 temp_v0_3; 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 3efc2f9c0ef..860e478e7ee 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -294,8 +294,7 @@ void EnInsect_SetupCrawl(EnInsect* this) { } void EnInsect_Crawl(EnInsect* this, PlayState* play) { - UNUSED s32 pad1; - UNUSED s32 pad2; + UNUSED s32 pad[2]; s16 yaw; s16 type = this->actor.params & 3; @@ -339,9 +338,8 @@ void EnInsect_SetupRunFromPlayer(EnInsect* this) { } void EnInsect_RunFromPlayer(EnInsect* this, PlayState* play) { - UNUSED s32 pad1; - UNUSED s32 pad2; - UNUSED s16 pad3; + UNUSED s32 pad1[2]; + UNUSED s16 pad2; s16 frames; s16 yaw; s16 playerIsClose = this->actor.xzDistToPlayer < 40.0f; @@ -463,9 +461,9 @@ void EnInsect_SetupWalkOnWater(EnInsect* this) { } void EnInsect_WalkOnWater(EnInsect* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; s16 temp_v1; - UNUSED s16 pad1; + UNUSED s16 pad2; s16 type; Vec3f ripplePoint; @@ -559,11 +557,11 @@ void EnInsect_SetupDropped(EnInsect* this) { } void EnInsect_Dropped(EnInsect* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; s32 sp50; f32 phi_f0; EnInsect* thisTemp = this; - UNUSED s32 pad1; + UNUSED s32 pad2; f32 distanceSq; f32 phi_f2; s16 type; 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 a1d4b9e2983..a608b6b7613 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -418,7 +418,7 @@ void EnIshi_SetupFly(EnIshi* this) { } void EnIshi_Fly(EnIshi* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; s16 type = this->actor.params & 1; UNUSED s32 pad2; s32 quakeIdx; 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 063855b2d8c..c85cfef2109 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -165,8 +165,7 @@ void func_80A89304(EnJs* this, PlayState* play) { void EnJs_Update(Actor* thisx, PlayState* play) { EnJs* this = (EnJs*)thisx; - UNUSED s32 pad; - UNUSED s32 pad2; + UNUSED s32 pad[2]; Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index 21bf605f3c4..62efd763d2f 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -1115,8 +1115,7 @@ void EnMb_ClubDead(EnMb* this, PlayState* play) { void EnMb_SpearGuardWalk(EnMb* this, PlayState* play) { s32 prevFrame; s32 beforeCurFrame; - UNUSED s32 pad1; - UNUSED s32 pad2; + UNUSED s32 pad[2]; Player* player = GET_PLAYER(play); s16 relYawTowardsPlayer = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; s16 yawTowardsHome; 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 bfa2dcf3b71..132ec679aec 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -976,11 +976,11 @@ s32 func_80AB2FC0(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s } void func_80AB2FE4(EnNb* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; s16 eyeIdx = this->eyeIdx; SkelAnime* skelAnime = &this->skelAnime; void* eyeTexture = sEyeTextures[eyeIdx]; - UNUSED s32 pad1; + UNUSED s32 pad2; OPEN_DISPS(play->state.gfxCtx, "../z_en_nb_inConfrontion.c", 623); @@ -1216,9 +1216,9 @@ void EnNb_SetupPathMovement(EnNb* this, PlayState* play) { } void EnNb_SetTextIdAsChild(EnNb* this, PlayState* play) { - UNUSED s32 pad; - u8 choiceIndex; UNUSED s32 pad1; + u8 choiceIndex; + UNUSED s32 pad2; u16 textId; textId = this->actor.textId; @@ -1490,11 +1490,11 @@ void EnNb_DrawNothing(EnNb* this, PlayState* play) { } void EnNb_DrawDefault(EnNb* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; s16 eyeIdx = this->eyeIdx; SkelAnime* skelAnime = &this->skelAnime; void* eyeTexture = sEyeTextures[eyeIdx]; - UNUSED s32 pad1; + UNUSED s32 pad2; OPEN_DISPS(play->state.gfxCtx, "../z_en_nb.c", 992); diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index 7331c7b5675..7a485c22087 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -53,7 +53,7 @@ static ColliderCylinderInit sCylinderInit = { void EnNiwGirl_Init(Actor* thisx, PlayState* play) { EnNiwGirl* this = (EnNiwGirl*)thisx; - UNUSED s32 pad; + UNUSED s32 pad1; Vec3f vec1; Vec3f vec2; UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index bdd4a9c1cdb..619c37622f0 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -541,8 +541,7 @@ void EnPoField_Damage(EnPoField* this, PlayState* play) { void EnPoField_Death(EnPoField* this, PlayState* play) { Vec3f sp6C; f32 sp68; - UNUSED s32 pad; - UNUSED s32 pad1; + UNUSED s32 pad[2]; f32 temp_f0; this->actionTimer++; diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index c953d38f3ba..935f116f8e9 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -289,9 +289,9 @@ void EnPoRelay_Talk2(EnPoRelay* this, PlayState* play) { void EnPoRelay_DisappearAndReward(EnPoRelay* this, PlayState* play) { Vec3f vec; f32 multiplier; - UNUSED s32 pad; - Vec3f sp60; UNUSED s32 pad1; + Vec3f sp60; + UNUSED s32 pad2; this->actionTimer++; if (this->actionTimer < 8) { 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 848919a3377..61e50592035 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 @@ -397,8 +397,7 @@ void func_80AD9AA8(EnPoSisters* this, PlayState* play) { this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0x800); Actor* actor3 = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_PO_SISTERS, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0xC00); - UNUSED s32 pad; - UNUSED s32 pad1; + UNUSED s32 pad[2]; if (actor1 == NULL || actor2 == NULL || actor3 == NULL) { if (actor1 != NULL) { 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 eeaa352d092..4dac86845b6 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -604,8 +604,7 @@ void func_80ADF15C(EnPoh* this, PlayState* play) { Vec3f vec; f32 multiplier; f32 newScale; - UNUSED s32 pad; - UNUSED s32 pad1; + UNUSED s32 pad[2]; this->unk_198++; if (this->unk_198 < 8) { 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 7ad04b02234..b92bb91ae0d 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -838,7 +838,7 @@ void EnRd_UpdateDamage(EnRd* this, PlayState* play) { } void EnRd_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; EnRd* this = (EnRd*)thisx; Player* player = GET_PLAYER(play); UNUSED s32 pad2; diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index a0b134c7958..fd3ab4a61f9 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -542,7 +542,7 @@ void func_80AEBA0C(EnRu1* this, PlayState* play) { } void func_80AEBA2C(EnRu1* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; Vec3f* unk_364 = &this->unk_364; Vec3f* thisPos; f32 temp_ret_2; @@ -985,7 +985,7 @@ void func_80AECC84(EnRu1* this, PlayState* play) { } void func_80AECCB0(EnRu1* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; Vec3f* pos; s16 yawTowardsPlayer; f32 spawnX; @@ -1015,11 +1015,11 @@ void func_80AECE04(EnRu1* this, PlayState* play) { } void func_80AECE20(EnRu1* this, PlayState* play) { - UNUSED s32 pad2; + UNUSED s32 pad1; Player* player = GET_PLAYER(play); Vec3f* playerPos = &player->actor.world.pos; s16 shapeRotY = player->actor.shape.rot.y; - UNUSED s32 pad; + UNUSED s32 pad2; f32 unk_27C = this->unk_27C; Vec3f* pos = &this->actor.world.pos; @@ -1046,7 +1046,7 @@ s32 func_80AECF6C(EnRu1* this, PlayState* play) { s16 temp_f16; f32 temp1; f32 temp2; - UNUSED s32 pad2[5]; + UNUSED s32 pad[5]; this->unk_26C += 1.0f; if ((player->actor.speedXZ == 0.0f) && (this->unk_26C >= 3.0f)) { @@ -2333,13 +2333,13 @@ void EnRu1_DrawOpa(EnRu1* this, PlayState* play) { } void EnRu1_DrawXlu(EnRu1* this, PlayState* play) { - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; s16 eyeIndex = this->eyeIndex; void* eyeTex = sEyeTextures[eyeIndex]; s16 mouthIndex = this->mouthIndex; SkelAnime* skelAnime = &this->skelAnime; void* mouthTex = sMouthTextures[mouthIndex]; - UNUSED s32 pad1; + UNUSED s32 pad2; OPEN_DISPS(play->state.gfxCtx, "../z_en_ru1.c", 1324); diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 13175a9c87d..03eb5c98ab2 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -656,7 +656,7 @@ void func_80AF390C(EnRu2* this, PlayState* play) { } void func_80AF39DC(EnRu2* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; MessageContext* msgCtx; UNUSED s32 pad2; u8 dialogState; diff --git a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c index 79c6fb323cc..97bf089d3e7 100644 --- a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c +++ b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c @@ -50,7 +50,7 @@ void EnSceneChange_Update(Actor* thisx, PlayState* play) { } void EnSceneChange_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; Gfx* displayList; UNUSED s32 pad2[2]; Gfx* displayListHead; 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 382ae65b044..fea42de05de 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -81,12 +81,11 @@ s32 func_80B0B81C(Vec3f* vortexPosRot, Vec3f* playerPosRot, Vec3f* posDifference void EnStream_SuckPlayer(EnStream* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad48; + UNUSED s32 pad1; Vec3f posDifference; f32 xzDist; f32 yDistWithOffset; - UNUSED s32 pad30; - UNUSED s32 pad2C; + UNUSED s32 pad2[2]; if (func_80B0B81C(&this->actor.world.pos, &player->actor.world.pos, &posDifference, this->actor.scale.y) != 0) { xzDist = sqrtf(SQ(posDifference.x) + SQ(posDifference.z)); 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 19a455f2314..59c8fa66be2 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -566,9 +566,9 @@ void EnTest_SetupWalkAndBlock(EnTest* this) { } void EnTest_WalkAndBlock(EnTest* this, PlayState* play) { - UNUSED s32 pad; - f32 checkDist = 0.0f; UNUSED s32 pad1; + f32 checkDist = 0.0f; + UNUSED s32 pad2; s32 prevFrame; s32 beforeCurFrame; f32 playSpeed; @@ -1361,12 +1361,12 @@ void func_808627C4(EnTest* this, PlayState* play) { // a variation of sidestep void func_808628C8(EnTest* this, PlayState* play) { - UNUSED s32 pad; - Player* player = GET_PLAYER(play); UNUSED s32 pad1; + Player* player = GET_PLAYER(play); + UNUSED s32 pad2; s32 prevFrame; s32 beforeCurFrame; - UNUSED s32 pad2; + UNUSED s32 pad3; f32 checkDist = 0.0f; s16 newYaw; f32 absPlaySpeed; 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 4f88693d3a4..a0f70c0f89c 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -204,11 +204,11 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { s16 sp66; u8 staggerThreshold; s8 stickY; - UNUSED s32 pad60; + UNUSED s32 pad1; Actor* attackItem; s16 sp5A; - UNUSED s16 pad58; - UNUSED s32 pad54; + UNUSED s16 pad2; + s32 sp54; f32 sp50; s16 sp4E; @@ -547,12 +547,12 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { // Updates Dark Link's "controller". The conditional seems to cause him to // stop targeting and hold shield if he's been holding it long enough. - pad54 = input->prev.button ^ input->cur.button; - input->press.button = input->cur.button & pad54; + sp54 = input->prev.button ^ input->cur.button; + input->press.button = input->cur.button & sp54; if (CHECK_BTN_ANY(input->cur.button, BTN_R)) { input->cur.button = ((sCounterState == 0) && (this->meleeWeaponState == 0)) ? BTN_R : input->cur.button ^ BTN_R; } - input->rel.button = input->prev.button & pad54; + input->rel.button = input->prev.button & sp54; input->prev.button = input->cur.button & (u16) ~(BTN_A | BTN_B); PadUtils_UpdateRelXY(input); diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c index 68047ba6101..da7e3ab5e97 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c @@ -65,7 +65,7 @@ void EnTrap_Init(Actor* thisx, PlayState* play) { s16 zSpeed; s16 xSpeed; EnTrap* this = (EnTrap*)thisx; - UNUSED ColliderCylinder* unused = &this->collider; // required to match + UNUSED ColliderCylinder* collider = &this->collider; // required to match this->upperParams = (thisx->params >> 8) & 0xFF; thisx->params &= 0xFF; diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index b44d8f53071..ddcd1792080 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -49,7 +49,7 @@ static ColliderCylinderInit sCylinderInit = { }; void EnVbBall_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; EnVbBall* this = (EnVbBall*)thisx; UNUSED s32 pad2; f32 angle; diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index d2e81dd7b50..6e3e02237ef 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -365,7 +365,7 @@ void EnXc_DoNothing(EnXc* this, PlayState* play) { } void EnXc_SetWalkingSFX(EnXc* this, PlayState* play) { - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; u32 sfxId; UNUSED s32 pad2; @@ -379,7 +379,7 @@ void EnXc_SetWalkingSFX(EnXc* this, PlayState* play) { } void EnXc_SetNutThrowSFX(EnXc* this, PlayState* play) { - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; u32 sfxId; UNUSED s32 pad2; @@ -1068,7 +1068,7 @@ s32 EnXc_HarpOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f void EnXc_DrawPullingOutHarp(Actor* thisx, PlayState* play) { EnXc* this = (EnXc*)thisx; - UNUSED s32 pad; + UNUSED s32 pad1; s16 eyePattern = this->eyeIdx; void* eyeTexture = sEyeTextures[eyePattern]; SkelAnime* skelAnime = &this->skelAnime; @@ -1090,7 +1090,7 @@ void EnXc_DrawPullingOutHarp(Actor* thisx, PlayState* play) { void EnXc_DrawHarp(Actor* thisx, PlayState* play) { EnXc* this = (EnXc*)thisx; - UNUSED s32 pad; + UNUSED s32 pad1; s16 eyePattern = this->eyeIdx; void* eyeTexture = sEyeTextures[eyePattern]; SkelAnime* skelAnime = &this->skelAnime; @@ -1701,7 +1701,7 @@ void EnXc_TriforcePostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3 void EnXc_DrawTriforce(Actor* thisx, PlayState* play) { EnXc* this = (EnXc*)thisx; - UNUSED s32 pad; + UNUSED s32 pad1; s16 eyeIdx = this->eyeIdx; void* eyeTexture = sEyeTextures[eyeIdx]; SkelAnime* skelAnime = &this->skelAnime; diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index 5c6691c82ee..b4cfc293fd1 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -1474,7 +1474,7 @@ void EnZf_HopAway(EnZf* this, PlayState* play) { f32 sp74; f32 sp70 = 1.0f; f32 phi_f20 = 550.0f; - UNUSED s32 pad; + UNUSED s32 pad1; f32 phi_f20_2; f32 phi_f0; UNUSED s32 pad2; @@ -2037,7 +2037,7 @@ void EnZf_UpdateDamage(EnZf* this, PlayState* play) { } void EnZf_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; EnZf* this = (EnZf*)thisx; UNUSED s32 pad2; 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 9279b6c9c68..41cc65988b0 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -158,9 +158,7 @@ void func_80B4AF18(EnZl1* this, PlayState* play) { void func_80B4B010(EnZl1* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad2; - UNUSED s32 pad3; - UNUSED s32 pad; + UNUSED s32 pad[3]; Vec3f subCamAt = { -460.0f, 118.0f, 0.0f }; Vec3f subCamEye = { -406.0f, 110.0f, 0.0f }; Vec3f playerPos = { -398.0f, 84.0f, 0.0f }; @@ -199,7 +197,7 @@ void func_80B4B010(EnZl1* this, PlayState* play) { void func_80B4B240(EnZl1* this, PlayState* play) { Vec3f subCamAt = { -427.0f, 108.0, 26.0 }; Vec3f subCamEye = { -340.0f, 108.0f, 98.0f }; - UNUSED s32 pad; + UNUSED s32 pad1; Vec3f sp58 = { -434.0f, 84.0f, 0.0f }; u8 sp54[] = { 0x00, 0x00, 0x02 }; UNUSED s32 pad2; @@ -367,13 +365,13 @@ void func_80B4B8B4(EnZl1* this, PlayState* play) { }; Vec3f subCamAt = { -421.0f, 143.0f, -5.0f }; Vec3f subCamEye = { -512.0f, 105.0f, -4.0f }; - UNUSED s32 pad2; + UNUSED s32 pad1; f32 actionLength; CsCmdActorAction* npcAction; Vec3f sp74; Vec3f sp68; Vec3f velocity = { 0.0f, 0.0f, 0.0f }; - UNUSED s32 pad; + UNUSED s32 pad2; f32 frameCount; Vec3f sp48; @@ -446,13 +444,13 @@ void func_80B4BC78(EnZl1* this, PlayState* play) { u8 sp84[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, }; - UNUSED s32 pad2; + UNUSED s32 pad1; f32 actionLength; Vec3f sp70; Vec3f sp64; Vec3f velocity = { 0.0f, 0.0f, 0.0f }; CsCmdActorAction* npcAction; - UNUSED s32 pad; + UNUSED s32 pad2; f32 frameCount; if (SkelAnime_Update(&this->skelAnime) && (this->skelAnime.animation == &gChildZelda1Anim_10B38)) { diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index 5405079e073..cc2c0b9bcee 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -433,7 +433,7 @@ void func_80B4F230(EnZl2* this, s16 arg1, s32 arg2) { } s32 func_80B4F45C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) { - UNUSED s32 pad; + UNUSED s32 pad1; EnZl2* this = (EnZl2*)thisx; Mtx* sp74; MtxF sp34; @@ -1565,7 +1565,7 @@ void func_80B52114(EnZl2* this, PlayState* play) { } void func_80B521A0(EnZl2* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; ObjectContext* objectCtx = &play->objectCtx; s32 bankIndex = Object_GetIndex(objectCtx, OBJECT_ZL2_ANIME1); UNUSED s32 pad2; @@ -1628,7 +1628,7 @@ void func_80B523BC(EnZl2* this, PlayState* play) { } void func_80B523C8(EnZl2* this, PlayState* play) { - UNUSED s32 pad[3]; + UNUSED s32 pad1[3]; s16 eyeTexIndex = this->eyeTexIndex; s16 eyeTexIndex2 = this->eyeTexIndex2; void* eyeTex = sEyeTextures[eyeTexIndex]; @@ -1636,7 +1636,7 @@ void func_80B523C8(EnZl2* this, PlayState* play) { SkelAnime* skelAnime = &this->skelAnime; s16 mouthTexIndex = this->mouthTexIndex; void* mouthTex = sMouthTextures[mouthTexIndex]; - UNUSED s32 pad1; + UNUSED s32 pad2; OPEN_DISPS(play->state.gfxCtx, "../z_en_zl2.c", 1623); @@ -1655,13 +1655,13 @@ void func_80B523C8(EnZl2* this, PlayState* play) { } void func_80B525D4(EnZl2* this, PlayState* play) { - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; s16 eyeTexIndex = this->eyeTexIndex; void* eyeTex = sEyeTextures[eyeTexIndex]; s16 mouthTexIndex = this->mouthTexIndex; SkelAnime* skelAnime = &this->skelAnime; void* mouthTex = sMouthTextures[mouthTexIndex]; - UNUSED s32 pad1; + UNUSED s32 pad2; OPEN_DISPS(play->state.gfxCtx, "../z_en_zl2.c", 1663); diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 71a90c5a832..34912ef9ec1 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -699,7 +699,7 @@ s32 func_80B5458C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s void EnZl3_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) { EnZl3* this = (EnZl3*)thisx; - UNUSED s32 pad; + UNUSED s32 pad1; Vec3f sp34; UNUSED s32 pad2; Vec3f sp24; @@ -1633,7 +1633,7 @@ s16 func_80B57104(EnZl3* this, s32 arg1) { } s32 func_80B571A8(EnZl3* this) { - UNUSED s32 pad; + UNUSED s32 pad1; s32 unk_314 = this->unk_314; UNUSED s32 pad2; @@ -1836,7 +1836,7 @@ void func_80B57858(PlayState* play) { } s32 func_80B57890(EnZl3* this, PlayState* play) { - UNUSED s8 pad[2]; + UNUSED u8 pad[2]; u8 curSpawn = play->curSpawn; s16 sceneNum = play->sceneNum; s32 result = func_80B54DB4(this); @@ -1904,7 +1904,7 @@ void func_80B57AAC(EnZl3* this, s32 arg1, AnimationHeader* arg2) { } void func_80B57AE0(EnZl3* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; s16 shapeRotY = this->actor.shape.rot.y; UNUSED s32 pad2; Vec3f* unk_354 = &this->unk_354; @@ -1969,7 +1969,7 @@ void func_80B57D60(EnZl3* this, PlayState* play) { } s32 func_80B57D80(EnZl3* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; s16* sp32 = &this->actor.shape.rot.y; struct_80034A14_arg1* unk_3F8 = &this->unk_3F8; Player* player = GET_PLAYER(play); @@ -2616,7 +2616,7 @@ void func_80B59B6C(EnZl3* this, PlayState* play) { } void func_80B59DB8(EnZl3* this, PlayState* play) { - UNUSED s32 pad; + UNUSED s32 pad1; ObjectContext* objCtx = &play->objectCtx; s32 objIndex = Object_GetIndex(objCtx, OBJECT_ZL2_ANIME2); UNUSED s32 pad2; @@ -2696,7 +2696,7 @@ void func_80B59FE8(EnZl3* this, PlayState* play) { } void func_80B59FF4(EnZl3* this, PlayState* play) { - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; s16 eyeTexIndex = this->eyeTexIndex; void* eyeTex = sEyeTextures[eyeTexIndex]; s16 mouthTexIndex = this->mouthTexIndex; @@ -2721,7 +2721,7 @@ void func_80B59FF4(EnZl3* this, PlayState* play) { } void func_80B5A1D0(EnZl3* this, PlayState* play) { - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; s16 eyeTexIndex = this->eyeTexIndex; void* eyeTex = sEyeTextures[eyeTexIndex]; s16 mouthTexIndex = this->mouthTexIndex; diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index 9958f6e2840..cc084c34e67 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -108,11 +108,10 @@ void EnfHG_SetupIntro(EnfHG* this, PlayState* play) { void EnfHG_Intro(EnfHG* this, PlayState* play) { static Vec3f audioVec = { 0.0f, 0.0f, 50.0f }; - UNUSED s32 pad64; + UNUSED s32 pad1; Player* player = GET_PLAYER(play); BossGanondrof* bossGnd = (BossGanondrof*)this->actor.parent; - UNUSED s32 pad58; - UNUSED s32 pad54; + UNUSED s32 pad2[2]; if (this->cutsceneState != INTRO_FINISH) { SkelAnime_Update(&this->skin.skelAnime); diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 5776b3abb17..85e61d030e8 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -5085,7 +5085,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) { f32 target; f32 subCamAtMaxVelFrac; f32 lureDistXZ; - UNUSED s32 pad; + UNUSED s32 pad1; Player* player = GET_PLAYER(play); Input* input = &play->state.input[0]; @@ -5637,14 +5637,14 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) { play->envCtx.adjLight1Color[0] = play->envCtx.adjLight1Color[1] = play->envCtx.adjLight1Color[2] = D_80B7A658; if ((u8)D_80B7A650 > 0) { - UNUSED s32 pad; + UNUSED s32 pad2; Camera* mainCam = Play_GetCamera(play, CAM_ID_MAIN); s16 i; - UNUSED s32 pad1; + UNUSED s32 pad3; Vec3f pos; Vec3f rot; Vec3f projectedPos; - UNUSED s32 pad2; + UNUSED s32 pad4; rot.x = M_PI / 2.0f + 0.1f; rot.y = 1.0f; 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 ffc447af15a..d3f226e412f 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -134,7 +134,7 @@ void ObjBean_InitCollider(Actor* thisx, PlayState* play) { } void ObjBean_InitDynaPoly(ObjBean* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader; UNUSED s32 pad2; 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 032bb716d33..cda5a1180aa 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -53,7 +53,7 @@ void ObjHsblock_SetupAction(ObjHsblock* this, ObjHsblockActionFunc actionFunc) { } void func_80B93B68(ObjHsblock* this, PlayState* play, CollisionHeader* collision, s32 moveFlags) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader = NULL; UNUSED s32 pad2[2]; 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 3d7d9e29f7f..e04efe1dbb6 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -246,8 +246,7 @@ void ObjKibako_SetupThrown(ObjKibako* this) { } void ObjKibako_Thrown(ObjKibako* this, PlayState* play) { - UNUSED s32 pad; - UNUSED s32 pad2; + UNUSED s32 pad[2]; if ((this->actor.bgCheckFlags & (BGCHECKFLAG_GROUND | BGCHECKFLAG_GROUND_TOUCH | BGCHECKFLAG_WALL)) || (this->collider.base.atFlags & AT_HIT)) { 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 bf87288518b..3c5cd2a18ce 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -61,7 +61,7 @@ void ObjLift_SetupAction(ObjLift* this, ObjLiftActionFunc actionFunc) { } void ObjLift_InitDynaPoly(ObjLift* this, PlayState* play, CollisionHeader* collision, s32 flags) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader = NULL; UNUSED s32 pad2; @@ -79,7 +79,7 @@ void func_80B96160(ObjLift* this, PlayState* play) { Vec3f pos; Vec3f velocity; Vec3f* temp_s3; - UNUSED s32 pad0; + UNUSED s32 pad; s32 i; temp_s3 = &this->dyna.actor.world.pos; 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 8bf6efaea4a..cac7920259b 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -84,7 +84,7 @@ static Vec2f sFaceDirection[] = { }; void ObjOshihiki_InitDynapoly(ObjOshihiki* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader = NULL; UNUSED s32 pad2; 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 0077d878202..ad30811bb1e 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -183,7 +183,7 @@ void ObjSwitch_RotateY(Vec3f* dest, Vec3f* src, s16 angle) { } void ObjSwitch_InitDynaPoly(ObjSwitch* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - UNUSED s32 pad; + UNUSED s32 pad1; CollisionHeader* colHeader = NULL; UNUSED s32 pad2; @@ -750,8 +750,7 @@ void ObjSwitch_DrawCrystal(ObjSwitch* this, PlayState* play) { gCrystalSwitchCoreXluDL }; static Gfx* opaDLists[] = { gCrystalSwitchCoreOpaDL, gCrystalSwitchDiamondOpaDL, NULL, NULL, gCrystalSwitchCoreOpaDL }; - UNUSED s32 pad1; - UNUSED s32 pad2; + UNUSED s32 pad[2]; s32 subType; subType = (this->dyna.actor.params >> 4 & 7); 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 71cac03b594..32930c7c8b4 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -133,8 +133,7 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) { s32 interactionType; u32 dmgFlags; Vec3f tipToFlame; - UNUSED s32 pad; - UNUSED s32 pad2; + UNUSED s32 pad[2]; litTimeScale = torchCount; if (torchCount == 10) { diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 5e94bf4ba2f..60b591205df 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -4312,7 +4312,7 @@ s32 func_80839800(Player* this, PlayState* play) { f32 sp74; Actor* doorActor; f32 sp6C; - UNUSED s32 pad3; + UNUSED s32 pad; s32 frontRoom; Actor* attachedActor; LinkAnimationHeader* sp5C; @@ -9719,7 +9719,7 @@ void func_80847BA0(PlayState* play, Player* this) { CollisionPoly* spA0; s32 sp9C; s16 sp9A; - UNUSED s32 pad; + UNUSED s32 pad1; D_80854798.y = 18.0f; D_80854798.z = this->ageProperties->unk_38 + 10.0f; @@ -9836,9 +9836,9 @@ void func_80847BA0(PlayState* play, Player* this) { f32 invFloorPolyNormalY; f32 floorPolyNormalZ; f32 sp4C; - UNUSED s32 pad2; + UNUSED s32 pad1; f32 sp44; - UNUSED s32 pad3; + UNUSED s32 pad2; if (this->actor.floorBgId != BGCHECK_SCENE) { DynaPoly_SetPlayerOnTop(&play->colCtx, this->actor.floorBgId); @@ -10116,7 +10116,7 @@ static f32 sWaterConveyorSpeeds[] = { 2.0f, 4.0f, 7.0f }; static f32 sFloorConveyorSpeeds[] = { 0.5f, 1.0f, 3.0f }; void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { - UNUSED s32 pad; + UNUSED s32 pad1; sControlInput = input; @@ -10245,7 +10245,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { f32 sp70 = this->linearVelocity; s16 sp6E = this->currentYaw; s16 yawDiff = this->actor.world.rot.y - sp6E; - UNUSED s32 pad; + UNUSED s32 pad2; if ((ABS(yawDiff) > 0x6000) && (this->actor.speedXZ != 0.0f)) { sp70 = 0.0f; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c index ce3a1c037ca..7d9e8d7eda1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c @@ -46,10 +46,9 @@ u32 EffectSsDeadDs_Init(PlayState* play, u32 index, EffectSs* this, void* initPa } void EffectSsDeadDs_Draw(PlayState* play, u32 index, EffectSs* this) { - UNUSED s32 pad; - f32 scale; UNUSED s32 pad1; - UNUSED s32 pad2; + f32 scale; + UNUSED s32 pad2[2]; MtxF mf; f32 temp; Vec3f pos; diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index 302c039b2de..0f40c4f48a1 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -57,7 +57,6 @@ void ConsoleLogo_SetupView(ConsoleLogoState* this, f32 x, f32 y, f32 z) { void ConsoleLogo_Draw(ConsoleLogoState* this) { static s16 sTitleRotY = 0; static Lights1 sTitleLights = gdSPDefLights1(100, 100, 100, 255, 255, 255, 69, 69, 69); - u16 y; u16 idx; UNUSED s32 pad1; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index 28c1b482339..48097ecabbe 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -126,7 +126,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) { u16 temp; u16 point; u16 rowStart; - UNUSED u16 pad; + UNUSED s16 pad; s16 cursorMoveResult; u16 cursorItem; u16 cursorSlot; From 80102d15e674d16f903a489448361fe7a6ccb81b Mon Sep 17 00:00:00 2001 From: Thar0 <17233964+Thar0@users.noreply.github.com> Date: Sun, 30 Oct 2022 01:48:18 +0000 Subject: [PATCH 04/14] Small cleanup --- src/code/audio_playback.c | 2 +- src/code/graph.c | 2 +- src/code/z_camera.c | 4 ++-- src/code/z_message_PAL.c | 2 +- src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 2 +- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 2 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/code/audio_playback.c b/src/code/audio_playback.c index 7653bece7eb..8621a92285c 100644 --- a/src/code/audio_playback.c +++ b/src/code/audio_playback.c @@ -4,7 +4,7 @@ void Audio_InitNoteSub(Note* note, NoteSubEu* sub, NoteSubAttributes* attrs) { f32 volLeft; f32 volRight; s32 halfPanIndex; - UNUSED u64 pad; + UNUSED s32 pad[3]; u8 strongLeft; u8 strongRight; f32 vel; diff --git a/src/code/graph.c b/src/code/graph.c index 10bd065a1c5..ecf392c0106 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -228,7 +228,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) { task->data_size = (uintptr_t)WORK_DISP - (uintptr_t)gfxCtx->workBuffer; CLOSE_DISPS(gfxCtx, "../graph.c", 830); - { UNUSED s32 pad2; } // Necessary to match stack usage + { UNUSED s32 pad; } // Necessary to match stack usage task->yield_data_ptr = gGfxSPTaskYieldBuffer; task->yield_data_size = sizeof(gGfxSPTaskYieldBuffer); diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 5e6eca895d3..456f2d06e4b 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -916,7 +916,7 @@ s32 Camera_CalcAtDefault(Camera* camera, VecGeo* eyeAtDir, f32 extraYOffset, s16 Vec3f* at = &camera->at; Vec3f posOffsetTarget; Vec3f atTarget; - UNUSED s32 pad2; + UNUSED s32 pad; PosRot* playerPosRot = &camera->playerPosRot; f32 yOffset; @@ -2010,7 +2010,7 @@ s32 Camera_Parallel1(Camera* camera) { s16 phi_a0; Parallel1ReadOnlyData* roData = &camera->paramData.para1.roData; Parallel1ReadWriteData* rwData = &camera->paramData.para1.rwData; - UNUSED s32 pad1; + UNUSED s32 pad; f32 playerHeight; f32 value; diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c index 59a28c0be67..66a1e4aa924 100644 --- a/src/code/z_message_PAL.c +++ b/src/code/z_message_PAL.c @@ -2012,7 +2012,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { s16 b; u16 i; u16 notePosX; - UNUSED u16 pad2; + UNUSED s16 pad2; u16 j; gSPSegment(gfx++, 0x02, play->interfaceCtx.parameterSegment); 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 483817df455..8783cae2c09 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -595,7 +595,7 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) { Matrix_Scale(sRainScale * 0.001f, sRainScale * 0.001f, sRainScale * 0.001f, MTXMODE_APPLY); for (j = 0; j < 5; j++) { - UNUSED s32 pad1; + UNUSED s32 pad; if (play->sceneId != SCENE_TOKINOMA) { if (this->unk_150[i].unk_0.x >= 0.0f) { 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 43057551a23..e779064c43a 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -166,7 +166,7 @@ void func_80AB1040(EnNb* this, PlayState* play) { } void func_80AB10C4(EnNb* this) { - UNUSED s32 pad2[2]; + UNUSED s32 pad[2]; Vec3s* tempPtr; Vec3s* tempPtr2; diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index ffc553dbcdb..49acd2f8184 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -2308,13 +2308,13 @@ void EnRu1_DrawNothing(EnRu1* this, PlayState* play) { } void EnRu1_DrawOpa(EnRu1* this, PlayState* play) { - UNUSED s32 pad[2]; + UNUSED s32 pad1[2]; s16 eyeIndex = this->eyeIndex; void* eyeTex = sEyeTextures[eyeIndex]; s16 mouthIndex = this->mouthIndex; SkelAnime* skelAnime = &this->skelAnime; void* mouthTex = sMouthTextures[mouthIndex]; - UNUSED s32 pad1; + UNUSED s32 pad2; OPEN_DISPS(play->state.gfxCtx, "../z_en_ru1.c", 1282); From d291784d4e80b6ea7cced400ff70865ac1f2d2b0 Mon Sep 17 00:00:00 2001 From: Thar0 <17233964+Thar0@users.noreply.github.com> Date: Sun, 30 Oct 2022 02:13:56 +0000 Subject: [PATCH 05/14] Macro-ify stack padding --- include/macros.h | 13 +++ include/message_data_fmt.h | 2 + src/boot/yaz0.c | 2 +- src/boot/z_std_dma.c | 4 +- src/code/PreRender.c | 6 +- src/code/__osMalloc.c | 2 +- src/code/audio_heap.c | 6 +- src/code/audio_load.c | 26 ++--- src/code/audio_playback.c | 6 +- src/code/audio_seqplayer.c | 4 +- src/code/audio_synthesis.c | 10 +- src/code/code_80097A00.c | 2 +- src/code/code_800E4FE0.c | 8 +- src/code/code_800EC960.c | 14 +-- src/code/code_800F7260.c | 4 +- src/code/code_800F9280.c | 6 +- src/code/db_camera.c | 10 +- src/code/fault.c | 8 +- src/code/flg_set.c | 2 +- src/code/game.c | 4 +- src/code/graph.c | 4 +- src/code/jpegdecoder.c | 2 +- src/code/load.c | 2 +- src/code/mempak.c | 10 +- src/code/relocation.c | 2 +- src/code/speed_meter.c | 8 +- src/code/sys_math3d.c | 6 +- src/code/ucode_disas.c | 6 +- src/code/z_actor.c | 18 +-- src/code/z_bgcheck.c | 30 ++--- src/code/z_camera.c | 106 +++++++++--------- src/code/z_collision_check.c | 4 +- src/code/z_construct.c | 2 +- src/code/z_debug.c | 4 +- src/code/z_demo.c | 4 +- src/code/z_draw.c | 52 ++++----- src/code/z_eff_blure.c | 2 +- src/code/z_eff_ss_dead.c | 4 +- src/code/z_effect_soft_sprite_old_init.c | 2 +- src/code/z_en_a_keep.c | 2 +- src/code/z_en_item00.c | 20 ++-- src/code/z_fbdemo.c | 2 +- src/code/z_fbdemo_circle.c | 2 +- src/code/z_fbdemo_triforce.c | 4 +- src/code/z_fbdemo_wipe1.c | 2 +- src/code/z_fcurve_data_skelanime.c | 6 +- src/code/z_horse.c | 2 +- src/code/z_jpeg.c | 2 +- src/code/z_kankyo.c | 12 +- src/code/z_lifemeter.c | 4 +- src/code/z_lights.c | 4 +- src/code/z_map_exp.c | 4 +- src/code/z_message_PAL.c | 12 +- src/code/z_moji.c | 2 +- src/code/z_parameter.c | 2 +- src/code/z_play.c | 10 +- src/code/z_player_lib.c | 8 +- src/code/z_quake.c | 4 +- src/code/z_room.c | 4 +- src/code/z_scene.c | 2 +- src/code/z_scene_table.c | 2 +- src/code/z_skelanime.c | 14 +-- src/code/z_skin.c | 6 +- src/code/z_skin_awb.c | 4 +- src/code/z_skin_matrix.c | 4 +- src/code/z_view.c | 4 +- src/code/z_vr_box.c | 4 +- src/libultra/rmon/xldtob.c | 2 +- .../actors/ovl_Arms_Hook/z_arms_hook.c | 6 +- .../actors/ovl_Arrow_Fire/z_arrow_fire.c | 2 +- .../actors/ovl_Arrow_Ice/z_arrow_ice.c | 4 +- .../actors/ovl_Arrow_Light/z_arrow_light.c | 4 +- .../ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c | 2 +- .../ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c | 10 +- .../actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c | 2 +- .../actors/ovl_Bg_Bombwall/z_bg_bombwall.c | 4 +- .../actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c | 6 +- .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c | 6 +- .../actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c | 2 +- .../actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c | 2 +- .../actors/ovl_Bg_Dodoago/z_bg_dodoago.c | 2 +- .../ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c | 2 +- .../ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c | 2 +- .../ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c | 4 +- .../ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c | 8 +- .../ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c | 4 +- src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c | 4 +- .../actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c | 6 +- .../actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c | 2 +- .../ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c | 2 +- .../actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c | 4 +- .../actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c | 4 +- .../actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c | 4 +- .../ovl_Bg_Haka_Water/z_bg_haka_water.c | 4 +- .../actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c | 4 +- .../ovl_Bg_Heavy_Block/z_bg_heavy_block.c | 10 +- .../ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c | 4 +- .../ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c | 2 +- .../z_bg_hidan_firewall.c | 2 +- .../ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c | 4 +- .../ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c | 6 +- .../ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c | 8 +- .../ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c | 4 +- .../z_bg_hidan_kowarerukabe.c | 10 +- .../ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c | 6 +- .../z_bg_hidan_rsekizou.c | 6 +- .../ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c | 6 +- .../ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c | 6 +- .../ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c | 2 +- .../ovl_Bg_Ice_Objects/z_bg_ice_objects.c | 8 +- .../ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c | 14 +-- .../ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c | 2 +- .../ovl_Bg_Ice_Turara/z_bg_ice_turara.c | 2 +- .../actors/ovl_Bg_Ingate/z_bg_ingate.c | 2 +- .../ovl_Bg_Jya_1flift/z_bg_jya_1flift.c | 4 +- .../z_bg_jya_amishutter.c | 4 +- .../actors/ovl_Bg_Jya_Block/z_bg_jya_block.c | 2 +- .../z_bg_jya_bombchuiwa.c | 2 +- .../ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c | 6 +- .../actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c | 12 +- .../ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c | 4 +- .../ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c | 10 +- .../ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c | 6 +- .../ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c | 6 +- .../actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c | 2 +- .../ovl_Bg_Jya_Megami/z_bg_jya_megami.c | 8 +- .../z_bg_jya_zurerukabe.c | 4 +- .../ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c | 2 +- .../z_bg_menkuri_kaiten.c | 2 +- .../ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c | 8 +- .../ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c | 12 +- .../actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c | 4 +- .../ovl_Bg_Mizu_Water/z_bg_mizu_water.c | 6 +- .../ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c | 16 +-- .../ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c | 6 +- .../ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c | 14 +-- .../ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c | 12 +- .../ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c | 2 +- .../ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c | 8 +- .../z_bg_mori_kaitenkabe.c | 8 +- .../z_bg_mori_rakkatenjo.c | 10 +- .../actors/ovl_Bg_Po_Event/z_bg_po_event.c | 10 +- .../ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c | 4 +- .../actors/ovl_Bg_Pushbox/z_bg_pushbox.c | 6 +- .../ovl_Bg_Relay_Objects/z_bg_relay_objects.c | 2 +- .../ovl_Bg_Spot00_Break/z_bg_spot00_break.c | 2 +- .../z_bg_spot00_hanebasi.c | 4 +- .../z_bg_spot01_idohashira.c | 12 +- .../z_bg_spot01_idosoko.c | 4 +- .../z_bg_spot01_objects2.c | 2 +- .../z_bg_spot02_objects.c | 6 +- .../ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c | 4 +- .../ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c | 4 +- .../z_bg_spot06_objects.c | 12 +- .../ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c | 2 +- .../z_bg_spot08_bakudankabe.c | 6 +- .../z_bg_spot08_iceblock.c | 8 +- .../ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c | 4 +- .../z_bg_spot11_bakudankabe.c | 4 +- .../ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c | 2 +- .../ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c | 6 +- .../ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c | 4 +- .../ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c | 4 +- .../ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c | 4 +- .../z_bg_spot16_bombstone.c | 8 +- .../z_bg_spot16_doughnut.c | 2 +- .../z_bg_spot17_bakudankabe.c | 6 +- .../ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c | 2 +- .../ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c | 6 +- .../ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c | 2 +- .../ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c | 4 +- .../z_bg_spot18_shutter.c | 2 +- .../actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c | 6 +- .../ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c | 4 +- .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c | 4 +- .../actors/ovl_Bg_Treemouth/z_bg_treemouth.c | 4 +- .../actors/ovl_Bg_Umajump/z_bg_umajump.c | 2 +- .../actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c | 6 +- .../actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c | 2 +- .../ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c | 2 +- src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c | 2 +- .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 18 +-- src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 18 +-- src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c | 10 +- .../actors/ovl_Boss_Ganon/z_boss_ganon.c | 42 +++---- .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 40 +++---- .../ovl_Boss_Ganondrof/z_boss_ganondrof.c | 14 +-- .../actors/ovl_Boss_Goma/z_boss_goma.c | 8 +- src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 30 ++--- src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 14 +-- src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 24 ++-- src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 20 ++-- src/overlays/actors/ovl_Demo_6K/z_demo_6k.c | 14 +-- src/overlays/actors/ovl_Demo_Du/z_demo_du.c | 22 ++-- src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c | 14 +-- .../actors/ovl_Demo_Effect/z_demo_effect.c | 16 +-- .../actors/ovl_Demo_Geff/z_demo_geff.c | 4 +- src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 20 ++-- src/overlays/actors/ovl_Demo_Go/z_demo_go.c | 10 +- src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c | 104 ++++++++--------- src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c | 14 +-- src/overlays/actors/ovl_Demo_Im/z_demo_im.c | 16 +-- .../actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 12 +- .../actors/ovl_Demo_Kekkai/z_demo_kekkai.c | 10 +- src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c | 16 +-- src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c | 2 +- .../actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c | 4 +- .../actors/ovl_Door_Gerudo/z_door_gerudo.c | 2 +- .../actors/ovl_Door_Shutter/z_door_shutter.c | 6 +- .../actors/ovl_Door_Toki/z_door_toki.c | 2 +- .../actors/ovl_Door_Warp1/z_door_warp1.c | 6 +- .../actors/ovl_Efc_Erupc/z_efc_erupc.c | 2 +- src/overlays/actors/ovl_En_Am/z_en_am.c | 16 +-- src/overlays/actors/ovl_En_Ani/z_en_ani.c | 8 +- .../actors/ovl_En_Anubice/z_en_anubice.c | 2 +- .../ovl_En_Anubice_Fire/z_en_anubice_fire.c | 8 +- src/overlays/actors/ovl_En_Arrow/z_en_arrow.c | 4 +- .../ovl_En_Attack_Niw/z_en_attack_niw.c | 4 +- src/overlays/actors/ovl_En_Ba/z_en_ba.c | 6 +- src/overlays/actors/ovl_En_Bb/z_en_bb.c | 6 +- .../actors/ovl_En_Bdfire/z_en_bdfire.c | 4 +- .../actors/ovl_En_Bigokuta/z_en_bigokuta.c | 2 +- .../actors/ovl_En_Blkobj/z_en_blkobj.c | 8 +- src/overlays/actors/ovl_En_Bom/z_en_bom.c | 4 +- .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 2 +- .../actors/ovl_En_Bom_Chu/z_en_bom_chu.c | 2 +- src/overlays/actors/ovl_En_Bombf/z_en_bombf.c | 10 +- src/overlays/actors/ovl_En_Boom/z_en_boom.c | 4 +- src/overlays/actors/ovl_En_Box/z_en_box.c | 4 +- src/overlays/actors/ovl_En_Brob/z_en_brob.c | 2 +- .../actors/ovl_En_Bubble/z_en_bubble.c | 4 +- src/overlays/actors/ovl_En_Bw/z_en_bw.c | 4 +- src/overlays/actors/ovl_En_Bx/z_en_bx.c | 4 +- .../actors/ovl_En_Clear_Tag/z_en_clear_tag.c | 4 +- src/overlays/actors/ovl_En_Cow/z_en_cow.c | 4 +- src/overlays/actors/ovl_En_Crow/z_en_crow.c | 2 +- src/overlays/actors/ovl_En_Cs/z_en_cs.c | 10 +- src/overlays/actors/ovl_En_Daiku/z_en_daiku.c | 10 +- .../z_en_daiku_kakariko.c | 8 +- .../actors/ovl_En_Dekubaba/z_en_dekubaba.c | 2 +- .../actors/ovl_En_Dekunuts/z_en_dekunuts.c | 6 +- src/overlays/actors/ovl_En_Dh/z_en_dh.c | 12 +- src/overlays/actors/ovl_En_Dha/z_en_dha.c | 8 +- .../ovl_En_Diving_Game/z_en_diving_game.c | 4 +- src/overlays/actors/ovl_En_Dns/z_en_dns.c | 2 +- .../actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c | 4 +- .../actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c | 4 +- .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c | 8 +- .../actors/ovl_En_Dodojr/z_en_dodojr.c | 2 +- .../actors/ovl_En_Dodongo/z_en_dodongo.c | 16 +-- src/overlays/actors/ovl_En_Dog/z_en_dog.c | 4 +- src/overlays/actors/ovl_En_Door/z_en_door.c | 4 +- src/overlays/actors/ovl_En_Du/z_en_du.c | 4 +- .../actors/ovl_En_Dy_Extra/z_en_dy_extra.c | 2 +- src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c | 6 +- src/overlays/actors/ovl_En_Elf/z_en_elf.c | 22 ++-- .../actors/ovl_En_Encount1/z_en_encount1.c | 4 +- .../actors/ovl_En_Encount2/z_en_encount2.c | 2 +- .../actors/ovl_En_Ex_Item/z_en_ex_item.c | 8 +- .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 4 +- src/overlays/actors/ovl_En_Fd/z_en_fd.c | 6 +- .../actors/ovl_En_Fd_Fire/z_en_fd_fire.c | 6 +- .../actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c | 8 +- .../actors/ovl_En_Fire_Rock/z_en_fire_rock.c | 4 +- src/overlays/actors/ovl_En_Fish/z_en_fish.c | 26 ++--- .../actors/ovl_En_Floormas/z_en_floormas.c | 8 +- src/overlays/actors/ovl_En_Fr/z_en_fr.c | 4 +- src/overlays/actors/ovl_En_Fu/z_en_fu.c | 8 +- src/overlays/actors/ovl_En_Fz/z_en_fz.c | 4 +- .../actors/ovl_En_G_Switch/z_en_g_switch.c | 14 +-- .../ovl_En_Ganon_Mant/z_en_ganon_mant.c | 6 +- src/overlays/actors/ovl_En_Gb/z_en_gb.c | 6 +- src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 10 +- src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 8 +- src/overlays/actors/ovl_En_Ge3/z_en_ge3.c | 4 +- src/overlays/actors/ovl_En_GeldB/z_en_geldb.c | 18 +-- src/overlays/actors/ovl_En_Gm/z_en_gm.c | 4 +- src/overlays/actors/ovl_En_Go/z_en_go.c | 4 +- src/overlays/actors/ovl_En_Go2/z_en_go2.c | 6 +- src/overlays/actors/ovl_En_Goma/z_en_goma.c | 4 +- .../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 20 ++-- src/overlays/actors/ovl_En_Gs/z_en_gs.c | 2 +- src/overlays/actors/ovl_En_Guest/z_en_guest.c | 6 +- src/overlays/actors/ovl_En_Hata/z_en_hata.c | 2 +- .../actors/ovl_En_Heishi1/z_en_heishi1.c | 8 +- .../actors/ovl_En_Heishi2/z_en_heishi2.c | 10 +- .../actors/ovl_En_Heishi3/z_en_heishi3.c | 2 +- .../actors/ovl_En_Heishi4/z_en_heishi4.c | 2 +- .../actors/ovl_En_Hintnuts/z_en_hintnuts.c | 4 +- .../actors/ovl_En_Honotrap/z_en_honotrap.c | 20 ++-- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 20 ++-- .../z_en_horse_game_check.c | 6 +- .../ovl_En_Horse_Ganon/z_en_horse_ganon.c | 6 +- .../z_en_horse_link_child.c | 4 +- .../ovl_En_Horse_Normal/z_en_horse_normal.c | 12 +- .../ovl_En_Horse_Zelda/z_en_horse_zelda.c | 8 +- src/overlays/actors/ovl_En_Hs/z_en_hs.c | 4 +- src/overlays/actors/ovl_En_Hs2/z_en_hs2.c | 4 +- src/overlays/actors/ovl_En_Hy/z_en_hy.c | 4 +- .../actors/ovl_En_Ice_Hono/z_en_ice_hono.c | 6 +- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 20 ++-- .../actors/ovl_En_Insect/z_en_insect.c | 20 ++-- src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 8 +- src/overlays/actors/ovl_En_It/z_en_it.c | 2 +- src/overlays/actors/ovl_En_Js/z_en_js.c | 4 +- .../actors/ovl_En_Jsjutan/z_en_jsjutan.c | 4 +- .../actors/ovl_En_Kakasi/z_en_kakasi.c | 2 +- .../actors/ovl_En_Kakasi2/z_en_kakasi2.c | 2 +- .../actors/ovl_En_Kakasi3/z_en_kakasi3.c | 2 +- .../actors/ovl_En_Kanban/z_en_kanban.c | 2 +- .../actors/ovl_En_Karebaba/z_en_karebaba.c | 2 +- src/overlays/actors/ovl_En_Ko/z_en_ko.c | 4 +- src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 8 +- src/overlays/actors/ovl_En_Kz/z_en_kz.c | 4 +- src/overlays/actors/ovl_En_Light/z_en_light.c | 2 +- .../actors/ovl_En_Lightbox/z_en_lightbox.c | 2 +- .../actors/ovl_En_M_Fire1/z_en_m_fire1.c | 4 +- src/overlays/actors/ovl_En_Ma1/z_en_ma1.c | 6 +- src/overlays/actors/ovl_En_Ma2/z_en_ma2.c | 6 +- src/overlays/actors/ovl_En_Ma3/z_en_ma3.c | 6 +- src/overlays/actors/ovl_En_Mag/z_en_mag.c | 8 +- src/overlays/actors/ovl_En_Mb/z_en_mb.c | 14 +-- src/overlays/actors/ovl_En_Md/z_en_md.c | 4 +- src/overlays/actors/ovl_En_Mk/z_en_mk.c | 6 +- src/overlays/actors/ovl_En_Mm/z_en_mm.c | 10 +- src/overlays/actors/ovl_En_Mm2/z_en_mm2.c | 2 +- src/overlays/actors/ovl_En_Ms/z_en_ms.c | 4 +- src/overlays/actors/ovl_En_Mu/z_en_mu.c | 4 +- src/overlays/actors/ovl_En_Nb/z_en_nb.c | 40 +++---- src/overlays/actors/ovl_En_Niw/z_en_niw.c | 14 +-- .../actors/ovl_En_Niw_Girl/z_en_niw_girl.c | 6 +- .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c | 10 +- .../actors/ovl_En_Nutsball/z_en_nutsball.c | 6 +- src/overlays/actors/ovl_En_Nwc/z_en_nwc.c | 8 +- src/overlays/actors/ovl_En_Ny/z_en_ny.c | 2 +- src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 8 +- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 20 ++-- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 6 +- .../actors/ovl_En_Peehat/z_en_peehat.c | 2 +- .../actors/ovl_En_Po_Desert/z_en_po_desert.c | 4 +- .../actors/ovl_En_Po_Field/z_en_po_field.c | 10 +- .../actors/ovl_En_Po_Relay/z_en_po_relay.c | 6 +- .../ovl_En_Po_Sisters/z_en_po_sisters.c | 12 +- src/overlays/actors/ovl_En_Poh/z_en_poh.c | 8 +- src/overlays/actors/ovl_En_Rd/z_en_rd.c | 16 +-- src/overlays/actors/ovl_En_Reeba/z_en_reeba.c | 6 +- src/overlays/actors/ovl_En_Rl/z_en_rl.c | 8 +- src/overlays/actors/ovl_En_Rr/z_en_rr.c | 8 +- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 66 +++++------ src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 16 +-- src/overlays/actors/ovl_En_Sa/z_en_sa.c | 6 +- src/overlays/actors/ovl_En_Sb/z_en_sb.c | 4 +- .../ovl_En_Scene_Change/z_en_scene_change.c | 4 +- src/overlays/actors/ovl_En_Sda/z_en_sda.c | 4 +- .../actors/ovl_En_Siofuki/z_en_siofuki.c | 2 +- src/overlays/actors/ovl_En_Skb/z_en_skb.c | 6 +- src/overlays/actors/ovl_En_Skj/z_en_skj.c | 14 +-- .../actors/ovl_En_Skjneedle/z_en_skjneedle.c | 2 +- src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 12 +- src/overlays/actors/ovl_En_St/z_en_st.c | 6 +- src/overlays/actors/ovl_En_Sth/z_en_sth.c | 10 +- .../actors/ovl_En_Stream/z_en_stream.c | 6 +- src/overlays/actors/ovl_En_Sw/z_en_sw.c | 20 ++-- .../ovl_En_Syateki_Itm/z_en_syateki_itm.c | 2 +- .../ovl_En_Syateki_Man/z_en_syateki_man.c | 6 +- .../ovl_En_Syateki_Niw/z_en_syateki_niw.c | 4 +- src/overlays/actors/ovl_En_Ta/z_en_ta.c | 4 +- src/overlays/actors/ovl_En_Test/z_en_test.c | 20 ++-- src/overlays/actors/ovl_En_Tg/z_en_tg.c | 2 +- src/overlays/actors/ovl_En_Tite/z_en_tite.c | 2 +- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 4 +- .../actors/ovl_En_Torch2/z_en_torch2.c | 8 +- src/overlays/actors/ovl_En_Toryo/z_en_toryo.c | 6 +- src/overlays/actors/ovl_En_Tp/z_en_tp.c | 8 +- src/overlays/actors/ovl_En_Tr/z_en_tr.c | 4 +- src/overlays/actors/ovl_En_Trap/z_en_trap.c | 2 +- .../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 2 +- src/overlays/actors/ovl_En_Vali/z_en_vali.c | 6 +- .../actors/ovl_En_Vb_Ball/z_en_vb_ball.c | 12 +- .../actors/ovl_En_Viewer/z_en_viewer.c | 4 +- src/overlays/actors/ovl_En_Vm/z_en_vm.c | 4 +- .../actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c | 2 +- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 4 +- .../ovl_En_Weather_Tag/z_en_weather_tag.c | 4 +- .../actors/ovl_En_Weiyer/z_en_weiyer.c | 2 +- src/overlays/actors/ovl_En_Wf/z_en_wf.c | 16 +-- .../ovl_En_Wonder_Item/z_en_wonder_item.c | 6 +- .../ovl_En_Wonder_Talk2/z_en_wonder_talk2.c | 4 +- .../actors/ovl_En_Wood02/z_en_wood02.c | 2 +- src/overlays/actors/ovl_En_Xc/z_en_xc.c | 62 +++++----- .../ovl_En_Yabusame_Mark/z_en_yabusame_mark.c | 2 +- .../actors/ovl_En_Yukabyun/z_en_yukabyun.c | 2 +- src/overlays/actors/ovl_En_Zf/z_en_zf.c | 20 ++-- src/overlays/actors/ovl_En_Zl1/z_en_zl1.c | 22 ++-- src/overlays/actors/ovl_En_Zl2/z_en_zl2.c | 28 ++--- src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 62 +++++----- src/overlays/actors/ovl_En_Zl4/z_en_zl4.c | 6 +- src/overlays/actors/ovl_En_Zo/z_en_zo.c | 2 +- src/overlays/actors/ovl_En_fHG/z_en_fhg.c | 10 +- .../actors/ovl_End_Title/z_end_title.c | 2 +- src/overlays/actors/ovl_Fishing/z_fishing.c | 28 ++--- .../ovl_Item_Etcetera/z_item_etcetera.c | 2 +- .../actors/ovl_Item_Shield/z_item_shield.c | 2 +- .../actors/ovl_Magic_Dark/z_magic_dark.c | 8 +- .../actors/ovl_Magic_Fire/z_magic_fire.c | 6 +- .../actors/ovl_Magic_Wind/z_magic_wind.c | 2 +- src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c | 6 +- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 6 +- .../ovl_Obj_Blockstop/z_obj_blockstop.c | 2 +- .../actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c | 2 +- .../actors/ovl_Obj_Dekujr/z_obj_dekujr.c | 4 +- .../actors/ovl_Obj_Elevator/z_obj_elevator.c | 4 +- .../actors/ovl_Obj_Hamishi/z_obj_hamishi.c | 2 +- .../actors/ovl_Obj_Hsblock/z_obj_hsblock.c | 4 +- .../actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c | 8 +- .../actors/ovl_Obj_Kibako/z_obj_kibako.c | 10 +- .../actors/ovl_Obj_Kibako2/z_obj_kibako2.c | 4 +- src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c | 10 +- .../ovl_Obj_Lightswitch/z_obj_lightswitch.c | 6 +- src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c | 2 +- .../actors/ovl_Obj_Mure3/z_obj_mure3.c | 2 +- .../actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c | 14 +-- .../actors/ovl_Obj_Switch/z_obj_switch.c | 10 +- .../actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 8 +- .../ovl_Obj_Timeblock/z_obj_timeblock.c | 4 +- .../actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 8 +- .../ovl_Obj_Warp2block/z_obj_warp2block.c | 2 +- .../ovl_Object_Kankyo/z_object_kankyo.c | 6 +- .../actors/ovl_Oceff_Spot/z_oceff_spot.c | 6 +- .../actors/ovl_Oceff_Wipe/z_oceff_wipe.c | 2 +- .../actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c | 2 +- .../actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c | 2 +- .../actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c | 2 +- src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 4 +- .../actors/ovl_player_actor/z_player.c | 46 ++++---- .../ovl_Effect_Ss_Blast/z_eff_ss_blast.c | 2 +- .../ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c | 2 +- .../ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c | 4 +- .../ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c | 2 +- .../ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c | 2 +- .../ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c | 4 +- .../ovl_Effect_Ss_Dust/z_eff_ss_dust.c | 2 +- .../ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c | 2 +- .../ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c | 2 +- .../ovl_Effect_Ss_Extra/z_eff_ss_extra.c | 4 +- .../ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c | 2 +- .../z_eff_ss_fhg_flash.c | 6 +- .../z_eff_ss_fire_tail.c | 2 +- .../z_eff_ss_g_magma2.c | 4 +- .../z_eff_ss_g_ripple.c | 4 +- .../ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c | 2 +- .../ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c | 4 +- .../ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c | 2 +- .../z_eff_ss_ice_piece.c | 2 +- .../z_eff_ss_ice_smoke.c | 4 +- .../ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c | 2 +- .../ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c | 2 +- .../z_eff_ss_kirakira.c | 2 +- .../z_eff_ss_lightning.c | 2 +- .../ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c | 2 +- .../z_eff_ss_solder_srch_ball.c | 2 +- .../ovl_Effect_Ss_Stick/z_eff_ss_stick.c | 2 +- .../ovl_file_choose/z_file_choose.c | 6 +- .../ovl_file_choose/z_file_nameset_PAL.c | 2 +- src/overlays/gamestates/ovl_select/z_select.c | 4 +- src/overlays/gamestates/ovl_title/z_title.c | 6 +- .../ovl_kaleido_scope/z_kaleido_collect.c | 4 +- .../misc/ovl_kaleido_scope/z_kaleido_debug.c | 2 +- .../ovl_kaleido_scope/z_kaleido_equipment.c | 4 +- .../ovl_kaleido_scope/z_kaleido_scope_PAL.c | 4 +- 470 files changed, 1748 insertions(+), 1733 deletions(-) diff --git a/include/macros.h b/include/macros.h index 36cb917ab5d..49f9a32d6d9 100644 --- a/include/macros.h +++ b/include/macros.h @@ -1,6 +1,11 @@ #ifndef MACROS_H #define MACROS_H +#ifndef GLUE +#define GLUE(a,b) a##b +#endif +#define GLUE2(a,b) GLUE(a,b) + #ifndef __GNUC__ #define __attribute__(x) #endif @@ -14,6 +19,14 @@ #define UNUSED __attribute__((unused)) #define FALLTHROUGH __attribute__((fallthrough)) +#ifndef NON_MATCHING +#define STACK_PAD(type) UNUSED type GLUE2(__stack_pad_, __LINE__) +#define STACK_PADS(type, n) STACK_PAD(type) [(n)] +#else +#define STACK_PAD(type) +#define STACK_PADS(type, n) +#endif + #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0])) #define ARRAY_COUNTU(arr) (u32)(sizeof(arr) / sizeof(arr[0])) diff --git a/include/message_data_fmt.h b/include/message_data_fmt.h index 7ec967b503a..447117d81fb 100644 --- a/include/message_data_fmt.h +++ b/include/message_data_fmt.h @@ -7,7 +7,9 @@ * The strings are used in the message_data_static files themselves, as you can only concat strings with other strings */ +#ifndef GLUE #define GLUE(a, b) a##b +#endif #define STRINGIFY(s) #s #define EXPAND_AND_STRINGIFY(s) STRINGIFY(s) diff --git a/src/boot/yaz0.c b/src/boot/yaz0.c index 35dfd10f6ab..f1e40959bf0 100644 --- a/src/boot/yaz0.c +++ b/src/boot/yaz0.c @@ -7,7 +7,7 @@ u32 sYaz0CurSize; u8* sYaz0MaxPtr; void* Yaz0_FirstDMA(void) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); u32 dmaSize; u32 bufferSize; diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index a6f3c3959d3..d47cf4193bb 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -49,7 +49,7 @@ s32 DmaMgr_DmaRomToRam(uintptr_t rom, void* ram, u32 size) { OSMesg msg; s32 ret; u32 buffSize = gDmaMgrDmaBuffSize; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if (buffSize == 0) { buffSize = 0x2000; @@ -440,7 +440,7 @@ s32 DmaMgr_SendRequest1(void* ram, uintptr_t vrom, u32 size, const char* file, s s32 ret; OSMesgQueue queue; OSMesg msg; - UNUSED s32 pad; + STACK_PAD(s32); req.filename = file; req.line = line; diff --git a/src/code/PreRender.c b/src/code/PreRender.c index 4f73eb5d89c..f1ba6e460fc 100644 --- a/src/code/PreRender.c +++ b/src/code/PreRender.c @@ -540,7 +540,7 @@ void PreRender_AntiAliasFilter(PreRender* this, s32 x, s32 y) { s32 buffB[5 * 3]; s32 xi; s32 yi; - UNUSED s32 pad; + STACK_PAD(s32); s32 pmaxR; s32 pmaxG; s32 pmaxB; @@ -684,11 +684,11 @@ void PreRender_AntiAliasFilter(PreRender* this, s32 x, s32 y) { void PreRender_DivotFilter(PreRender* this) { s32 x; s32 y; - UNUSED s32 pad1; + STACK_PAD(s32); u8* buffR = alloca(this->width); u8* buffG = alloca(this->width); u8* buffB = alloca(this->width); - UNUSED s32 pad2[3]; + STACK_PADS(s32, 3); s32 pxR; s32 pxG; s32 pxB; diff --git a/src/code/__osMalloc.c b/src/code/__osMalloc.c index 5d665c6fe89..2988b275363 100644 --- a/src/code/__osMalloc.c +++ b/src/code/__osMalloc.c @@ -560,7 +560,7 @@ void* __osRealloc(Arena* arena, void* ptr, u32 newSize) { ArenaNode* overNext2; ArenaNode localCopy; u32 blockSize; - UNUSED s32 pad; + STACK_PAD(s32); newSize = ALIGN16(newSize); osSyncPrintf("__osRealloc(%08x, %d)\n", ptr, newSize); diff --git a/src/code/audio_heap.c b/src/code/audio_heap.c index cacc73c8145..0e56396b84d 100644 --- a/src/code/audio_heap.c +++ b/src/code/audio_heap.c @@ -843,7 +843,7 @@ s32 AudioHeap_ResetStep(void) { } void AudioHeap_Init(void) { - UNUSED s32 pad1[4]; + STACK_PADS(s32, 4); s16* ramAddr; s32 persistentSize; s32 temporarySize; @@ -852,7 +852,7 @@ void AudioHeap_Init(void) { OSIntMask intMask; s32 i; s32 j; - UNUSED s32 pad2; + STACK_PAD(s32); AudioSpec* spec = &gAudioSpecs[gAudioCtx.audioResetSpecIdToLoad]; // Audio Specifications gAudioCtx.sampleDmaCount = 0; @@ -1388,7 +1388,7 @@ void AudioHeap_ApplySampleBankCacheInternal(s32 apply, s32 sampleBankId) { Instrument* inst; SoundEffect* soundEffect; u32* fakematch; - UNUSED s32 pad[4]; + STACK_PADS(s32, 4); sampleBankTable = gAudioCtx.sampleBankTable; numFonts = gAudioCtx.soundFontTable->numEntries; diff --git a/src/code/audio_load.c b/src/code/audio_load.c index 7a1034e62ea..bced30fef66 100644 --- a/src/code/audio_load.c +++ b/src/code/audio_load.c @@ -105,11 +105,11 @@ void AudioLoad_DecreaseSampleDmaTtls(void) { } void* AudioLoad_DmaSampleData(u32 devAddr, u32 size, s32 arg2, u8* dmaIndexRef, s32 medium) { - UNUSED s32 pad1; + STACK_PAD(s32); SampleDma* dma; s32 hasDma = false; u32 dmaDevAddr; - UNUSED s32 pad2; + STACK_PAD(s32); u32 dmaIndex; u32 transfer; s32 bufferPos; @@ -349,12 +349,12 @@ void AudioLoad_InitTable(AudioTable* table, u32 romAddr, u16 unkMediumParam) { } SoundFontData* AudioLoad_SyncLoadSeqFonts(s32 seqId, u32* outDefaultFontId) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); s32 index; SoundFontData* fontData; s32 numFonts; s32 fontId; - UNUSED s32 pad2; + STACK_PAD(s32); if (seqId >= gAudioCtx.numSequences) { return NULL; @@ -375,7 +375,7 @@ SoundFontData* AudioLoad_SyncLoadSeqFonts(s32 seqId, u32* outDefaultFontId) { } void AudioLoad_SyncLoadSeqParts(s32 seqId, s32 arg1) { - UNUSED s32 pad; + STACK_PAD(s32); u32 defaultFontId; if (seqId < gAudioCtx.numSequences) { @@ -566,7 +566,7 @@ s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, UNUSED s32 arg } u8* AudioLoad_SyncLoadSeq(s32 seqId) { - UNUSED s32 pad; + STACK_PAD(s32); s32 didAllocate; if (gAudioCtx.seqLoadStatus[AudioLoad_GetRealTableIndex(SEQUENCE_TABLE, seqId)] == LOAD_STATUS_IN_PROGRESS) { @@ -654,7 +654,7 @@ SoundFontData* AudioLoad_SyncLoadFont(u32 fontId) { void* AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate) { u32 size; AudioTable* table; - UNUSED s32 pad; + STACK_PAD(s32); u32 medium; s32 loadStatus; u32 romAddr; @@ -993,7 +993,7 @@ void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData, s8 cachePolicy; u32 devAddr; s32 loadStatus; - UNUSED s32 pad; + STACK_PAD(s32); u32 realId = AudioLoad_GetRealTableIndex(tableType, id); switch (tableType) { @@ -1117,7 +1117,7 @@ void AudioLoad_InitSoundFont(s32 fontId) { } void AudioLoad_Init(void* heap, u32 heapSize) { - UNUSED s32 pad[18]; + STACK_PADS(s32, 18); s32 numFonts; void* ramAddr; s32 i; @@ -1536,7 +1536,7 @@ void AudioLoad_ProcessAsyncLoadUnkMedium(UNUSED AudioAsyncLoad* asyncLoad, UNUSE void AudioLoad_FinishAsyncLoad(AudioAsyncLoad* asyncLoad) { u32 retMsg = asyncLoad->retMsg; u32 fontId; - UNUSED s32 pad; + STACK_PAD(s32); OSMesg doneMsg; u32 sampleBankId1; u32 sampleBankId2; @@ -1807,7 +1807,7 @@ s32 AudioLoad_ProcessSamplePreloads(s32 resetStatus) { u32 preloadIndex; u32 key; u32 nChunks; - UNUSED s32 pad; + STACK_PAD(s32); if (gAudioCtx.preloadSampleStackTop > 0) { if (resetStatus != 0) { @@ -2057,10 +2057,10 @@ void AudioLoad_PreloadSamplesForFont(s32 fontId, s32 async, SampleBankRelocInfo* } void AudioLoad_LoadPermanentSamples(void) { - UNUSED s32 pad1; + STACK_PAD(s32); u32 fontId; AudioTable* sampleBankTable; - UNUSED s32 pad2; + STACK_PAD(s32); s32 i; sampleBankTable = AudioLoad_GetLoadTable(SAMPLE_TABLE); diff --git a/src/code/audio_playback.c b/src/code/audio_playback.c index 8621a92285c..a483d2f100b 100644 --- a/src/code/audio_playback.c +++ b/src/code/audio_playback.c @@ -4,7 +4,7 @@ void Audio_InitNoteSub(Note* note, NoteSubEu* sub, NoteSubAttributes* attrs) { f32 volLeft; f32 volRight; s32 halfPanIndex; - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); u8 strongLeft; u8 strongRight; f32 vel; @@ -152,7 +152,7 @@ void Audio_NoteDisable(Note* note) { } void Audio_ProcessNotes(void) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); NoteAttributes* attrs; NoteSubEu* noteSubEu2; NoteSubEu* noteSubEu; @@ -758,7 +758,7 @@ Note* Audio_FindNodeWithPrioLessThan(AudioListItem* list, s32 limit) { } void Audio_NoteInitForLayer(Note* note, SequenceLayer* layer) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); s16 instId; NotePlaybackState* playbackState = ¬e->playbackState; NoteSubEu* sub = ¬e->noteSubEu; diff --git a/src/code/audio_seqplayer.c b/src/code/audio_seqplayer.c index 83a65f72af7..b427064d5d8 100644 --- a/src/code/audio_seqplayer.c +++ b/src/code/audio_seqplayer.c @@ -306,7 +306,7 @@ void AudioSeq_InitSequenceChannel(SequenceChannel* channel) { s32 AudioSeq_SeqChannelSetLayer(SequenceChannel* channel, s32 layerIndex) { SequenceLayer* layer; - UNUSED s32 pad; + STACK_PAD(s32); if (channel->layers[layerIndex] == NULL) { layer = AudioSeq_AudioListPopBack(&gAudioCtx.layerFreeList); @@ -1722,7 +1722,7 @@ void AudioSeq_SequencePlayerProcessSequence(SequencePlayer* seqPlayer) { u8* data; u8* data2; u8* data3; - UNUSED s32 pad; + STACK_PAD(s32); s32 dummy; s32 delay; diff --git a/src/code/audio_synthesis.c b/src/code/audio_synthesis.c index f8dab1f273b..0f2cc98025d 100644 --- a/src/code/audio_synthesis.c +++ b/src/code/audio_synthesis.c @@ -60,7 +60,7 @@ u8 sNumSamplesPerWavePeriod[] = { void AudioSynth_InitNextRingBuf(s32 chunkLen, s32 updateIndex, s32 reverbIndex) { ReverbRingBufferItem* bufItem; - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); SynthesisReverb* reverb = &gAudioCtx.synthesisReverbs[reverbIndex]; s32 temp_a0_2; s32 temp_a0_4; @@ -702,7 +702,7 @@ Acmd* AudioSynth_DoOneAudioUpdate(s16* aiBuf, s32 aiBufLen, Acmd* cmd, s32 updat Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, UNUSED s16* aiBuf, s32 aiBufLen, Acmd* cmd, s32 updateIndex) { - UNUSED s32 pad1[3]; + STACK_PADS(s32, 3); Sample* sample; AdpcmLoop* loopInfo; s32 nSamplesUntilLoopEnd; @@ -716,7 +716,7 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS s32 gain; s32 frameIndex; s32 skipBytes; - UNUSED s32 pad2; + STACK_PAD(s32); void* buf; s32 nSamplesToDecode; u32 sampleAddr; @@ -727,7 +727,7 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS s32 nSamplesToProcess; s32 phi_s4; s32 nFirstFrameSamplesToIgnore; - UNUSED s32 pad3[7]; + STACK_PADS(s32, 7); s32 frameSize; s32 nFramesToDecode; s32 skipInitialSamples; @@ -1152,7 +1152,7 @@ Acmd* AudioSynth_ProcessEnvelope(Acmd* cmd, NoteSubEu* noteSubEu, NoteSynthesisS s16 rampReverb; s16 sourceReverbVol; u16 targetVolRight; - UNUSED s32 pad; + STACK_PAD(s32); curVolLeft = synthState->curVolLeft; targetVolLeft = noteSubEu->targetVolLeft; diff --git a/src/code/code_80097A00.c b/src/code/code_80097A00.c index 845c38c8d8d..4f7b87b57da 100644 --- a/src/code/code_80097A00.c +++ b/src/code/code_80097A00.c @@ -277,7 +277,7 @@ void Inventory_ChangeEquipment(s16 equipment, u16 value) { u8 Inventory_DeleteEquipment(PlayState* play, s16 equipment) { Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); u16 equipValue = gSaveContext.equips.equipment & gEquipMasks[equipment]; // "Erasing equipment item = %d zzz=%d" diff --git a/src/code/code_800E4FE0.c b/src/code/code_800E4FE0.c index 0b12abbb345..fc64d9fb4fd 100644 --- a/src/code/code_800E4FE0.c +++ b/src/code/code_800E4FE0.c @@ -43,7 +43,7 @@ AudioTask* func_800E5000(void) { static AudioTask* sWaitingAudioTask = NULL; u32 samplesRemainingInAi; s32 abiCmdCnt; - UNUSED s32 pad; + STACK_PAD(s32); s32 j; s32 sp5C; s16* currAiBuffer; @@ -213,7 +213,7 @@ AudioTask* func_800E5000(void) { void func_800E5584(AudioCmd* cmd) { s32 i; - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); u32 temp_t7; switch (cmd->op) { @@ -519,7 +519,7 @@ void Audio_GetSampleBankIdsOfFont(s32 fontId, u32* sampleBankId1, u32* sampleBan } s32 func_800E5EDC(void) { - UNUSED s32 pad; + STACK_PAD(s32); s32 sp18; if (osRecvMesg(gAudioCtx.audioResetQueueP, (OSMesg*)&sp18, OS_MESG_NOBLOCK) == -1) { @@ -541,7 +541,7 @@ void func_800E5F34(void) { s32 func_800E5F88(s32 resetPreloadID) { s32 resetStatus; OSMesg msg; - UNUSED s32 pad; + STACK_PAD(s32); func_800E5F34(); resetStatus = gAudioCtx.resetStatus; diff --git a/src/code/code_800EC960.c b/src/code/code_800EC960.c index a7c259951bd..55ca53d065f 100644 --- a/src/code/code_800EC960.c +++ b/src/code/code_800EC960.c @@ -1480,9 +1480,9 @@ void AudioOcarina_CheckIfStartedSong(void) { */ void AudioOcarina_CheckSongsWithMusicStaff(void) { u16 curOcarinaSongFlag; - UNUSED s16 pad1; + STACK_PAD(s16); u8 noNewValidInput = false; - UNUSED s16 pad2; + STACK_PAD(s16); s8 staffOcarinaPlayingPosOffset = 0; u8 songIndex; OcarinaNote* curNote; @@ -1927,12 +1927,12 @@ void AudioOcarina_PlaybackSong(void) { void AudioOcarina_SetRecordingSong(u8 isRecordingComplete) { u16 i; - UNUSED s16 pad1[2]; + STACK_PADS(s16, 2); u8 pitch; - UNUSED s32 pad2; + STACK_PAD(s32); u8 j; u8 k; - UNUSED s32 pad3; + STACK_PAD(s32); OcarinaNote* recordedSong; if (sRecordingState == OCARINA_RECORD_SCARECROW_LONG) { @@ -2400,7 +2400,7 @@ char* AudioDebug_ToStringBinary(u32 num, u8 bits) { } void AudioDebug_Draw(GfxPrint* printer) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); u8 i; u8 j; u8 ctr; @@ -4923,7 +4923,7 @@ void Audio_SetBgmEnemyVolume(f32 dist) { } void Audio_UpdateMalonSinging(f32 dist, u16 seqId) { - UNUSED u8 pad; + STACK_PAD(u8); s8 melodyVolume; s16 curSeqId; diff --git a/src/code/code_800F7260.c b/src/code/code_800F7260.c index a8fe5baa6b9..1fc79760be1 100644 --- a/src/code/code_800F7260.c +++ b/src/code/code_800F7260.c @@ -289,7 +289,7 @@ void Audio_ChooseActiveSfx(u8 bankId) { SfxBankEntry* entry; ActiveSfx chosenSfx[MAX_CHANNELS_PER_BANK]; ActiveSfx* activeSfx; - UNUSED s32 pad; + STACK_PAD(s32); numChosenSfx = 0; for (i = 0; i < MAX_CHANNELS_PER_BANK; i++) { @@ -493,7 +493,7 @@ void Audio_PlayActiveSfx(u8 bankId) { void Audio_StopSfxByBank(u8 bankId) { SfxBankEntry* entry; - UNUSED s32 pad; + STACK_PAD(s32); SfxBankEntry cmp; u8 entryIndex = gSfxBanks[bankId][0].next; diff --git a/src/code/code_800F9280.c b/src/code/code_800F9280.c index 82f8b1f43a8..c20e0bac7b0 100644 --- a/src/code/code_800F9280.c +++ b/src/code/code_800F9280.c @@ -39,7 +39,7 @@ ActiveSequence gActiveSeqs[4]; void Audio_StartSequence(u8 seqPlayerIndex, u8 seqId, u8 seqArgs, u16 fadeInDuration) { u8 channelIndex; u16 duration; - UNUSED s32 pad; + STACK_PAD(s32); if (!gStartSeqDisabled || (seqPlayerIndex == SEQ_PLAYER_SFX)) { seqArgs &= 0x7F; @@ -101,7 +101,7 @@ void Audio_ProcessSeqCmd(u32 cmd) { u8 channelIndex; u8 i; f32 freqScaleTarget; - UNUSED s32 pad; + STACK_PAD(s32); if (gAudioDebugPrintSeqCmd && (cmd & SEQCMD_OP_MASK) != (SEQCMD_OP_SET_PLAYER_IO << 28)) { AudioDebug_ScrPrt("SEQ H", (cmd >> 16) & 0xFFFF); @@ -479,7 +479,7 @@ void Audio_UpdateActiveSequences(void) { u8 setupVal2; u8 setupVal1; u16 seqId; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); u16 channelMask; u32 retMsg; f32 volume; diff --git a/src/code/db_camera.c b/src/code/db_camera.c index 86665bc1e80..cf802bded58 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -436,7 +436,7 @@ void DbCamera_PrintF32Bytes(f32 value) { } void DbCamera_PrintU16Bytes(u16 value) { - UNUSED s16 pad; + STACK_PAD(s16); u16 b = value; char* a = (char*)&b; @@ -444,7 +444,7 @@ void DbCamera_PrintU16Bytes(u16 value) { } void DbCamera_PrintS16Bytes(s16 value) { - UNUSED s16 pad; + STACK_PAD(s16); s16 b = value; char* a = (char*)&b; @@ -578,7 +578,7 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) { UNUSED Vec3f* at; Vec3f* phi_s0; Vec3f spD8; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f* sp90; Vec3f* sp80; Vec3f* sp7C; @@ -1642,7 +1642,7 @@ s32 DbCamera_LoadCallback(char* c) { } s32 DbCamera_SaveCallback(char* c) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s32 ret; u32 freeSize; s32 off; @@ -1742,7 +1742,7 @@ char D_8012D128[] = GFXP_KATAKANA "ﾄ-ﾀﾙ "; char D_8012D13C[] = GFXP_KATAKANA "ｷ- / "; s32 func_800B91B0(Camera* cam, DbCamera* dbCamera) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); while (sDbCameraCuts[D_8016110C].letter == '?') { D_8016110C++; diff --git a/src/code/fault.c b/src/code/fault.c index 4ec4b03abf0..b64bfffa663 100644 --- a/src/code/fault.c +++ b/src/code/fault.c @@ -642,7 +642,7 @@ OSThread* Fault_FindFaultedThread(void) { } void Fault_Wait5Seconds(void) { - UNUSED s32 pad; + STACK_PAD(s32); OSTime start = osGetTime(); do { @@ -1082,7 +1082,7 @@ void Fault_LogStackTrace(OSThread* thread, s32 height) { uintptr_t ra = thread->context.ra; uintptr_t pc = thread->context.pc; uintptr_t addr; - UNUSED s32 pad; + STACK_PAD(s32); osSyncPrintf("STACK TRACE\nSP PC (VPC)\n"); for (line = 1; line < height && (ra != 0 || sp != 0) && pc != (uintptr_t)__osCleanupThread; line++) { @@ -1161,7 +1161,7 @@ void Fault_UpdatePad(void) { void Fault_ThreadEntry(UNUSED void* arg) { OSMesg msg; OSThread* faultedThread; - UNUSED s32 pad; + STACK_PAD(s32); // Direct OS event messages to the fault event queue osSetEventMesg(OS_EVENT_CPU_BREAK, &sFaultInstance->queue, FAULT_MSG_CPU_BREAK); @@ -1297,7 +1297,7 @@ void Fault_HungupFaultClient(const char* exp1, const char* exp2) { */ void Fault_AddHungupAndCrashImpl(const char* exp1, const char* exp2) { FaultClient client; - UNUSED s32 pad; + STACK_PAD(s32); Fault_AddClient(&client, Fault_HungupFaultClient, (void*)exp1, (void*)exp2); *(u32*)0x11111111 = 0; // trigger an exception via unaligned memory access diff --git a/src/code/flg_set.c b/src/code/flg_set.c index 72fc0c3e2d2..ddf4938d4ef 100644 --- a/src/code/flg_set.c +++ b/src/code/flg_set.c @@ -44,7 +44,7 @@ void FlagSet_Update(PlayState* play) { { GfxPrint printer; - UNUSED s32 pad; + STACK_PAD(s32); polyOpa = POLY_OPA_DISP; gfx = Graph_GfxPlusOne(polyOpa); diff --git a/src/code/game.c b/src/code/game.c index 3c80302992f..0e8d3b4e05a 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -157,7 +157,7 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) { } if (R_ENABLE_AUDIO_DBG & 1) { - UNUSED s32 pad; + STACK_PAD(s32); GfxPrint printer; GfxPrint_Init(&printer); @@ -168,7 +168,7 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) { } if (R_ENABLE_ARENA_DBG < 0) { - UNUSED s32 pad; + STACK_PAD(s32); DebugArena_Display(); SystemArena_Display(); diff --git a/src/code/graph.c b/src/code/graph.c index ecf392c0106..958f75c45a1 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -228,7 +228,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) { task->data_size = (uintptr_t)WORK_DISP - (uintptr_t)gfxCtx->workBuffer; CLOSE_DISPS(gfxCtx, "../graph.c", 830); - { UNUSED s32 pad; } // Necessary to match stack usage + { STACK_PAD(s32); } // Necessary to match stack usage task->yield_data_ptr = gGfxSPTaskYieldBuffer; task->yield_data_size = sizeof(gGfxSPTaskYieldBuffer); @@ -380,7 +380,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { { OSTime timeNow = osGetTime(); - UNUSED s32 pad[4]; + STACK_PADS(s32, 4); gRSPGfxTimeTotal = gRSPGfxTimeAcc; gRSPAudioTimeTotal = gRSPAudioTimeAcc; diff --git a/src/code/jpegdecoder.c b/src/code/jpegdecoder.c index dffb0705037..404effce55d 100644 --- a/src/code/jpegdecoder.c +++ b/src/code/jpegdecoder.c @@ -7,7 +7,7 @@ u8 sJpegBitStreamDontSkip; u32 sJpegBitStreamCurWord; s32 JpegDecoder_Decode(JpegDecoder* decoder, u16* mcuBuff, s32 count, u8 isFollowing, JpegDecoderState* state) { - UNUSED s16 pad; + STACK_PAD(s16); s16 unk0; s16 unk1; s16 unk2; diff --git a/src/code/load.c b/src/code/load.c index 7d0c109e6c2..e14a7a55032 100644 --- a/src/code/load.c +++ b/src/code/load.c @@ -1,7 +1,7 @@ #include "global.h" s32 Overlay_Load(uintptr_t vRomStart, uintptr_t vRomEnd, void* vRamStart, void* vRamEnd, void* allocatedVRamAddr) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); uintptr_t end; OverlayRelocationSection* ovl; u32 ovlOffset; diff --git a/src/code/mempak.c b/src/code/mempak.c index 45b07f6d137..4f95496e694 100644 --- a/src/code/mempak.c +++ b/src/code/mempak.c @@ -14,7 +14,7 @@ u8 sMempakExtName[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; s32 Mempak_Init(s32 controllerNb) { OSMesgQueue* mq; - UNUSED s32 pad; + STACK_PAD(s32); s32 ret = false; mq = PadMgr_AcquireSerialEventQueue(&gPadMgr); @@ -67,7 +67,7 @@ s32 Mempak_Write(UNUSED s32 controllerNb, char idx, void* buffer, s32 offset, s3 OSMesgQueue* mq; s32 error; s32 ret = false; - UNUSED s32 pad; + STACK_PAD(s32); mq = PadMgr_AcquireSerialEventQueue(&gPadMgr); @@ -87,7 +87,7 @@ s32 Mempak_Read(UNUSED s32 controllerNb, char idx, void* buffer, s32 offset, s32 OSMesgQueue* mq; s32 error; s32 ret = false; - UNUSED s32 pad; + STACK_PAD(s32); mq = PadMgr_AcquireSerialEventQueue(&gPadMgr); @@ -107,7 +107,7 @@ s32 Mempak_Alloc(UNUSED s32 controllerNb, char* idx, s32 size) { s32 error; s32 ret = 0; s32 i; - UNUSED s32 pad; + STACK_PAD(s32); mq = PadMgr_AcquireSerialEventQueue(&gPadMgr); @@ -176,7 +176,7 @@ s32 Mempak_GetFileSize(UNUSED s32 controllerNb, char idx) { OSMesgQueue* mq = PadMgr_AcquireSerialEventQueue(&gPadMgr); OSPfsState state; s32 error = osPfsFileState(&sMempakPfsHandle, sMempakFiles[idx - 'A'], &state); - UNUSED s32 pad; + STACK_PAD(s32); PadMgr_ReleaseSerialEventQueue(&gPadMgr, mq); diff --git a/src/code/relocation.c b/src/code/relocation.c index 659c148600b..a736d7827c7 100644 --- a/src/code/relocation.c +++ b/src/code/relocation.c @@ -17,7 +17,7 @@ void Overlay_Relocate(void* allocatedVRamAddress, OverlayRelocationSection* over uintptr_t allocu32 = (uintptr_t)allocatedVRamAddress; u32* regValP; u32 isLoNeg; - UNUSED s32 pad; + STACK_PAD(s32); relocOffset = 0; relocatedValue = 0; diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index 35755fee403..2af798b09b0 100644 --- a/src/code/speed_meter.c +++ b/src/code/speed_meter.c @@ -87,14 +87,14 @@ void SpeedMeter_Destroy(UNUSED SpeedMeter* this) { } void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); u32 baseX = 32; s32 width; s32 i; s32 uly; s32 lry; View view; - UNUSED s32 pad2[3]; + STACK_PADS(s32, 3); Gfx* gfx; uly = this->y; @@ -196,11 +196,11 @@ void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxC } void SpeedMeter_DrawAllocEntries(UNUSED SpeedMeter* meter, GraphicsContext* gfxCtx, GameState* state) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); u32 ulx = 30; u32 lrx = 290; SpeedMeterAllocEntry entry; - UNUSED s32 pad2; + STACK_PAD(s32); s32 y; TwoHeadGfxArena* thga; u32 zeldaFreeMax; diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index fc046589b27..ff7b46fbd6e 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -151,7 +151,7 @@ void Math3D_FindPointOnPlaneIntersect(f32 planeAAxis1Norm, f32 planeAAxis2Norm, */ s32 Math3D_PlaneVsPlaneNewLine(f32 planeAA, f32 planeAB, f32 planeAC, f32 planeADist, f32 planeBA, f32 planeBB, f32 planeBC, f32 planeBDist, InfiniteLine* intersect) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f planeANormal; Vec3f planeBNormal; f32 dirX; @@ -1631,7 +1631,7 @@ s32 Math3D_CylVsLineSeg(Cylinder16* cyl, Vec3f* linePointA, Vec3f* linePointB, V f32 fracB; f32 fracBase; f32 zero = 0.0f; - UNUSED s32 pad; + STACK_PAD(s32); f32 cylRadiusSq; f32 radSqDiff; f32 distCent2; @@ -1824,7 +1824,7 @@ s32 Math3D_CylTriVsIntersect(Cylinder16* cyl, TriNorm* tri, Vec3f* intersect) { Vec3f midpointv0v1; Vec3f diffMidpointIntersect; f32 distFromCylYIntersectTov0v1; - UNUSED s32 pad; + STACK_PAD(s32); cylBottom = (f32)cyl->pos.y + cyl->yShift; cylTop = cyl->height + cylBottom; diff --git a/src/code/ucode_disas.c b/src/code/ucode_disas.c index 977401ccca7..dade1da5880 100644 --- a/src/code/ucode_disas.c +++ b/src/code/ucode_disas.c @@ -285,7 +285,7 @@ void UCodeDisas_PrintVertices(UCodeDisas* this, Vtx* vtx, s32 count, s32 start) } void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) { - UNUSED s32 pad; + STACK_PAD(s32); uintptr_t addr; u32 rdpHalf; u16 linkDlLow; @@ -973,7 +973,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) { } case G_MOVEWORD: { - UNUSED s32 pad; + STACK_PAD(s32); Gdma dma = ptr->dma; Gmovewd movewd = ptr->movewd; @@ -1159,7 +1159,7 @@ void UCodeDisas_Disassemble(UCodeDisas* this, Gfx* ptr) { } break; case G_MOVEWORD: { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Gmovewd movewd = ptr->movewd; switch (movewd.index) { diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 9bb9cfbd4a3..d2d2b644329 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -78,9 +78,9 @@ void ActorShadow_DrawHorse(Actor* actor, Lights* lights, PlayState* play) { } void ActorShadow_DrawFoot(PlayState* play, Light* light, MtxF* arg2, s32 arg3, f32 arg4, f32 arg5, f32 arg6) { - UNUSED s32 pad1; + STACK_PAD(s32); f32 sp58; - UNUSED s32 pad2[2]; + STACK_PADS(s32, 2); OPEN_DISPS(play->state.gfxCtx, "../z_actor.c", 1661); @@ -304,7 +304,7 @@ void func_8002C124(TargetContext* targetCtx, PlayState* play) { TargetContextEntry* entry; Player* player; s16 spCE; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f projTargetCenter; s32 spB8; f32 projTargetCappedInvW; @@ -413,7 +413,7 @@ void func_8002C124(TargetContext* targetCtx, PlayState* play) { } void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Actor* unkActor; s32 actorCategory; Vec3f projectedFocusPos; @@ -706,7 +706,7 @@ void TitleCard_Update(UNUSED PlayState* play, TitleCardContext* titleCtx) { void TitleCard_Draw(PlayState* play, TitleCardContext* titleCtx) { s32 width; s32 height; - UNUSED s32 pad; + STACK_PAD(s32); s32 titleX; s32 doubleWidth; s32 titleY; @@ -1231,7 +1231,7 @@ s32 func_8002E2AC(PlayState* play, Actor* actor, Vec3f* pos, s32 arg3) { void Actor_UpdateBgCheckInfo(PlayState* play, Actor* actor, f32 wallCheckHeight, f32 wallCheckRadius, f32 ceilingCheckHeight, s32 flags) { f32 sp74; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sp64; s32 bgId; CollisionPoly* wallPoly; @@ -2660,7 +2660,7 @@ void Actor_FreeOverlay(ActorOverlay* actorOverlay) { Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 posX, f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, s16 params) { - UNUSED s32 pad; + STACK_PAD(s32); Actor* actor; ActorInit* actorInit; s32 objBankIndex; @@ -3757,7 +3757,7 @@ s16 func_800347E8(s16 arg0) { } s16 func_80034810(Actor* actor, struct_80034A14_arg1* arg1, f32 arg2, s16 arg3, s16 arg4) { - UNUSED s32 pad; + STACK_PAD(s32); s16 var; s16 abs_var; @@ -4175,7 +4175,7 @@ void func_800359B8(Actor* actor, s16 arg1, Vec3s* arg2) { f32 sp28; f32 sp24; CollisionPoly* floorPoly; - UNUSED s32 pad; + STACK_PAD(s32); if (actor->floorPoly != NULL) { floorPoly = actor->floorPoly; diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index ed7b6e38c0e..90d32eac8cd 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -242,7 +242,7 @@ void func_80038A28(CollisionPoly* poly, f32 tx, f32 ty, f32 tz, MtxF* dest) { f32 nx; f32 ny; f32 nz; - UNUSED s32 pad; + STACK_PAD(s32); f32 xx; f32 zz; f32 yz; @@ -687,7 +687,7 @@ s32 BgCheck_ComputeWallDisplacement(CollisionContext* colCtx, CollisionPoly* pol s32 BgCheck_SphVsStaticWall(StaticLookup* lookup, CollisionContext* colCtx, u16 xpFlags, f32* outX, f32* outZ, Vec3f* pos, f32 radius, CollisionPoly** outPoly) { Vec3f resultPos; - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); f32 planeDist; f32 intersect; s32 result; @@ -704,7 +704,7 @@ s32 BgCheck_SphVsStaticWall(StaticLookup* lookup, CollisionContext* colCtx, u16 f32 nz; f32 temp_f16; Vec3s* vtxList; - UNUSED s16 pad2; + STACK_PAD(s16); f32 zMin; f32 zMax; f32 xMin; @@ -895,7 +895,7 @@ s32 BgCheck_SphVsStaticWall(StaticLookup* lookup, CollisionContext* colCtx, u16 s32 BgCheck_CheckStaticCeiling(StaticLookup* lookup, u16 xpFlags, CollisionContext* colCtx, f32* outY, Vec3f* pos, f32 checkHeight, CollisionPoly** outPoly) { s32 result = false; - UNUSED s32 pad; + STACK_PAD(s32); CollisionPoly* curPoly; CollisionPoly* polyList; f32 ceilingY; @@ -1056,7 +1056,7 @@ s32 BgCheck_SphVsFirstStaticPolyList(SSNode* node, u16 xpFlags, CollisionContext CollisionPoly* polyList = colCtx->colHeader->polyList; Vec3s* vtxList = colCtx->colHeader->vtxList; CollisionPoly* curPoly; - UNUSED s16 pad; + STACK_PAD(s16); s16 curPolyId; while (true) { @@ -1543,7 +1543,7 @@ void BgCheck_Allocate(CollisionContext* colCtx, PlayState* play, CollisionHeader u32 tblMax; u32 memSize; u32 lookupTblMemSize; - UNUSED s32 pad; + STACK_PAD(s32); s32 useCustomSubdivisions; u32 customMemSize; s32 customNodeListMax; @@ -1700,7 +1700,7 @@ s32 BgCheck_PosInStaticBoundingBox(CollisionContext* colCtx, Vec3f* pos) { f32 BgCheck_RaycastDownImpl(PlayState* play, CollisionContext* colCtx, u16 xpFlags, CollisionPoly** outPoly, s32* outBgId, Vec3f* pos, Actor* actor, u32 downChkFlags, f32 chkDist) { f32 yIntersectDyna; - UNUSED s32 pad; + STACK_PAD(s32); StaticLookup* lookupTbl; Vec3f checkPos; StaticLookup* lookup; @@ -2821,13 +2821,13 @@ void DynaPoly_AddBgActorToLookup(UNUSED PlayState* play, DynaCollisionContext* d s32* polyStartIndex) { MtxF mtx; Actor* actor; - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); f32 numVtxInverse; s32 i; Vec3f pos; Sphere16* sphere; Vec3s* dVtxList; - UNUSED s32 pad2; + STACK_PAD(s32); Vec3f newCenterPoint; f32 newRadiusSq; CollisionHeader* pbgdata; @@ -3147,7 +3147,7 @@ f32 BgCheck_RaycastDownDyna(DynaRaycastDown* dynaRaycastDown) { s32 i2; s32 pauseState; DynaPolyActor* dynaActor; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f polyVtx[3]; Vec3f polyNorm; u32 polyIndex; @@ -3269,7 +3269,7 @@ f32 BgCheck_RaycastDownDyna(DynaRaycastDown* dynaRaycastDown) { s32 BgCheck_SphVsDynaWallInBgActor(CollisionContext* colCtx, u16 xpFlags, DynaCollisionContext* dyna, SSList* ssList, f32* outX, f32* outZ, CollisionPoly** outPoly, s32* outBgId, Vec3f* pos, f32 radius, s32 bgId) { - UNUSED s32 pad1; + STACK_PAD(s32); f32 intersect; s32 result = false; CollisionPoly* poly; @@ -3285,7 +3285,7 @@ s32 BgCheck_SphVsDynaWallInBgActor(CollisionContext* colCtx, u16 xpFlags, DynaCo f32 invNormalXZ; f32 planeDist; f32 temp_f18; - UNUSED s32 pad2; + STACK_PAD(s32); f32 xIntersectDist; f32 zMin; f32 zMax; @@ -3525,7 +3525,7 @@ s32 BgCheck_CheckDynaCeilingList(UNUSED CollisionContext* colCtx, u16 xpFlags, D f32 nz; s32 result = false; f32 intersectDist; - UNUSED s16 pad; + STACK_PAD(s16); if (ssList->head == SS_NULL) { return false; @@ -3585,7 +3585,7 @@ s32 BgCheck_CheckDynaCeiling(CollisionContext* colCtx, u16 xpFlags, f32* outY, V s32 result = false; f32 resultY; f32 tempY = chkDist + pos->y; - UNUSED s32 pad; + STACK_PAD(s32); CollisionPoly* poly; resultY = tempY; @@ -3718,7 +3718,7 @@ s32 BgCheck_CheckLineAgainstBgActor(CollisionContext* colCtx, u16 xpFlags, Vec3f s32 BgCheck_CheckLineAgainstDyna(CollisionContext* colCtx, u16 xpFlags, Vec3f* posA, Vec3f* posB, Vec3f* posResult, CollisionPoly** outPoly, f32* distSq, s32* outBgId, Actor* actor, f32 chkDist, s32 bccFlags) { - UNUSED s32 pad; + STACK_PAD(s32); s32 i; s32 result = false; Linef line; diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 456f2d06e4b..d3d29960010 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -345,7 +345,7 @@ s32 func_80043F94(Camera* camera, Vec3f* from, CamColChk* to) { void func_80044340(Camera* camera, Vec3f* arg1, Vec3f* arg2) { CamColChk sp20; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); sp20.pos = *arg2; func_80043F94(camera, arg1, &sp20); @@ -356,9 +356,9 @@ void func_80044340(Camera* camera, Vec3f* arg1, Vec3f* arg2) { * Checks if `from` to `to` is looking from the outside of a poly towards the front */ s32 Camera_CheckOOB(Camera* camera, Vec3f* from, Vec3f* to) { - UNUSED s32 pad1; + STACK_PAD(s32); Vec3f intersect; - UNUSED s32 pad2; + STACK_PAD(s32); s32 bgId; CollisionPoly* poly; CollisionContext* colCtx = &camera->play->colCtx; @@ -378,7 +378,7 @@ s32 Camera_CheckOOB(Camera* camera, Vec3f* from, Vec3f* to) { * and bgId to `bgId`. If no floor is found, then the normal is a flat surface pointing upwards. */ f32 Camera_GetFloorYNorm(Camera* camera, Vec3f* floorNorm, Vec3f* chkPos, s32* bgId) { - UNUSED s32 pad; + STACK_PAD(s32); CollisionPoly* floorPoly; f32 floorY = BgCheck_EntityRaycastDown3(&camera->play->colCtx, &floorPoly, bgId, chkPos); @@ -488,7 +488,7 @@ s32 Camera_GetBgCamIndex(Camera* camera, s32* bgId, CollisionPoly* poly) { */ Vec3s* Camera_GetBgCamFuncDataUnderPlayer(Camera* camera, u16* bgCamCount) { CollisionPoly* floorPoly; - UNUSED s32 pad; + STACK_PAD(s32); s32 bgId; PosRot playerPosShape; @@ -672,7 +672,7 @@ Vec3f* Camera_CalcUpFromPitchYawRoll(Vec3f* viewUp, s16 pitch, s16 yaw, s16 roll Vec3f rollMtxRow1; Vec3f rollMtxRow2; Vec3f rollMtxRow3; - UNUSED s32 pad; + STACK_PAD(s32); // Axis to roll around u.x = cosP * sinY; @@ -916,7 +916,7 @@ s32 Camera_CalcAtDefault(Camera* camera, VecGeo* eyeAtDir, f32 extraYOffset, s16 Vec3f* at = &camera->at; Vec3f posOffsetTarget; Vec3f atTarget; - UNUSED s32 pad; + STACK_PAD(s32); PosRot* playerPosRot = &camera->playerPosRot; f32 yOffset; @@ -951,7 +951,7 @@ s32 func_800458D4(Camera* camera, VecGeo* eyeAtDir, f32 arg2, f32* arg3, s16 arg f32 eyeAtAngle; PosRot* playerPosRot = &camera->playerPosRot; f32 deltaY; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); posOffsetTarget.y = Player_GetHeight(camera->player) + arg2; posOffsetTarget.x = 0.0f; @@ -991,7 +991,7 @@ s32 func_80045B08(Camera* camera, VecGeo* eyeAtDir, f32 yExtra, s16 arg3) { f32 phi_f2; Vec3f posOffsetTarget; Vec3f atTarget; - UNUSED s32 pad; + STACK_PAD(s32); f32 temp_ret; PosRot* playerPosRot = &camera->playerPosRot; @@ -1199,7 +1199,7 @@ s32 Camera_CalcAtForHorse(Camera* camera, VecGeo* eyeAtDir, f32 yOffset, f32* yP Vec3f* at = &camera->at; Vec3f posOffsetTarget; Vec3f atTarget; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); f32 playerHeight; Player* player; PosRot horsePosRot; @@ -1683,7 +1683,7 @@ s32 Camera_Normal2(Camera* camera) { PosRot* playerPosRot = &camera->playerPosRot; Normal2ReadOnlyData* roData = &camera->paramData.norm2.roData; Normal2ReadWriteData* rwData = &camera->paramData.norm2.rwData; - UNUSED s32 pad; + STACK_PAD(s32); BgCamFuncData* bgCamFuncData; f32 playerHeight; f32 yNormal; @@ -1850,7 +1850,7 @@ s32 Camera_Normal3(Camera* camera) { VecGeo sp74; PosRot* playerPosRot = &camera->playerPosRot; f32 temp_f0; - UNUSED s32 pad; + STACK_PAD(s32); s16 phi_a0; s16 t2; Normal3ReadOnlyData* roData = &camera->paramData.norm3.roData; @@ -2010,7 +2010,7 @@ s32 Camera_Parallel1(Camera* camera) { s16 phi_a0; Parallel1ReadOnlyData* roData = &camera->paramData.para1.roData; Parallel1ReadWriteData* rwData = &camera->paramData.para1.rwData; - UNUSED s32 pad; + STACK_PAD(s32); f32 playerHeight; f32 value; @@ -2213,7 +2213,7 @@ s32 Camera_Jump1(Camera* camera) { Vec3f* eye = &camera->eye; Vec3f* at = &camera->at; Vec3f* eyeNext = &camera->eyeNext; - UNUSED s32 pad1; + STACK_PAD(s32); f32 spA4; Vec3f newEye; VecGeo eyeAtOffset; @@ -2222,10 +2222,10 @@ s32 Camera_Jump1(Camera* camera) { VecGeo eyeDiffTarget; PosRot* playerPosRot = &camera->playerPosRot; PosRot playerhead; - UNUSED s16 pad2; + STACK_PAD(s16); Jump1ReadOnlyData* roData = &camera->paramData.jump1.roData; Jump1ReadWriteData* rwData = &camera->paramData.jump1.rwData; - UNUSED s32 pad3; + STACK_PAD(s32); f32 playerHeight; playerHeight = Player_GetHeight(camera->player); @@ -2565,7 +2565,7 @@ s32 Camera_Jump3(Camera* camera) { Jump3ReadOnlyData* roData = &camera->paramData.jump3.roData; VecGeo eyeAtOffset; VecGeo eyeNextAtOffset; - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); CameraModeValue* values; f32 t2; f32 phi_f0; @@ -2573,9 +2573,9 @@ s32 Camera_Jump3(Camera* camera) { f32 playerHeight; PosRot playerhead; f32 yNormal; - UNUSED s32 pad2; + STACK_PAD(s32); s32 modeSwitch; - UNUSED s32 pad3; + STACK_PAD(s32); Jump3ReadWriteData* rwData = &camera->paramData.jump3.rwData; playerHeight = Player_GetHeight(camera->player); @@ -2755,7 +2755,7 @@ s32 Camera_Battle1(Camera* camera) { Vec3f targetPos; f32 var3; f32 var2; - UNUSED s32 pad1; + STACK_PAD(s32); f32 temp_f12_2; f32 spFC; f32 spF8; @@ -2782,7 +2782,7 @@ s32 Camera_Battle1(Camera* camera) { f32 fov; Battle1ReadOnlyData* roData = &camera->paramData.batt1.roData; Battle1ReadWriteData* rwData = &camera->paramData.batt1.rwData; - UNUSED s32 pad2; + STACK_PAD(s32); f32 playerHeight; skipEyeAtCalc = false; @@ -3031,7 +3031,7 @@ s32 Camera_Battle4(Camera* camera) { VecGeo eyeNextAtOffset; Battle4ReadOnlyData* roData = &camera->paramData.batt4.roData; Battle4ReadWriteData* rwData = &camera->paramData.batt4.rwData; - UNUSED s32 pad; + STACK_PAD(s32); f32 playerHeight; playerHeight = Player_GetHeight(camera->player); @@ -3134,7 +3134,7 @@ s32 Camera_KeepOn1(Camera* camera) { s16 sp80; KeepOn1ReadOnlyData* roData = &camera->paramData.keep1.roData; KeepOn1ReadWriteData* rwData = &camera->paramData.keep1.rwData; - UNUSED s32 pad; + STACK_PAD(s32); f32 playerHeight; sp88 = 0; @@ -3559,7 +3559,7 @@ s32 Camera_KeepOn4(Camera* camera) { PosRot* playerPosRot = &camera->playerPosRot; KeepOn4ReadOnlyData* roData = &camera->paramData.keep4.roData; KeepOn4ReadWriteData* rwData = &camera->paramData.keep4.rwData; - UNUSED s32 pad; + STACK_PAD(s32); f32 playerHeight; Player* player = GET_PLAYER(camera->play); s16 angleCnt; @@ -3842,7 +3842,7 @@ s32 Camera_KeepOn0(Camera* camera) { VecGeo eyeAtOffset; KeepOn0ReadOnlyData* roData = &camera->paramData.keep0.roData; KeepOn0ReadWriteData* rwData = &camera->paramData.keep0.rwData; - UNUSED s32 pad; + STACK_PAD(s32); BgCamFuncData* bgCamFuncData; UNUSED Vec3s bgCamRot; s16 fov; @@ -3912,10 +3912,10 @@ s32 Camera_KeepOn0(Camera* camera) { s32 Camera_Fixed1(Camera* camera) { Fixed1ReadOnlyData* roData = &camera->paramData.fixd1.roData; Fixed1ReadWriteData* rwData = &camera->paramData.fixd1.rwData; - UNUSED s32 pad1; + STACK_PAD(s32); VecGeo eyeOffset; VecGeo eyeAtOffset; - UNUSED s32 pad2; + STACK_PAD(s32); Vec3f adjustedPos; BgCamFuncData* bgCamFuncData; Vec3f* eye = &camera->eye; @@ -3993,7 +3993,7 @@ s32 Camera_Fixed2(Camera* camera) { BgCamFuncData* bgCamFuncData; Fixed2ReadOnlyData* roData = &camera->paramData.fixd2.roData; Fixed2ReadWriteData* rwData = &camera->paramData.fixd2.rwData; - UNUSED s32 pad; + STACK_PAD(s32); f32 playerHeight; playerHeight = Player_GetHeight(camera->player); @@ -4074,7 +4074,7 @@ s32 Camera_Fixed3(Camera* camera) { VecGeo eyeAtOffset; Fixed3ReadOnlyData* roData = &camera->paramData.fixd3.roData; Fixed3ReadWriteData* rwData = &camera->paramData.fixd3.rwData; - UNUSED s32 pad; + STACK_PAD(s32); bgCamFuncData = (BgCamFuncData*)Camera_GetBgCamFuncData(camera); @@ -4379,7 +4379,7 @@ s32 Camera_Subj4(Camera* camera) { VecGeo targetOffset; VecGeo atEyeOffset; s16 eyeToAtYaw; - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); Subj4ReadOnlyData* roData = &camera->paramData.subj4.roData; Subj4ReadWriteData* rwData = &camera->paramData.subj4.rwData; @@ -4543,7 +4543,7 @@ s32 Camera_Data3(Camera* camera) { } s32 Camera_Data4(Camera* camera) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); Data4ReadOnlyData* roData = &camera->paramData.data4.roData; VecGeo eyeAtOffset; VecGeo atOffset; @@ -4558,7 +4558,7 @@ s32 Camera_Data4(Camera* camera) { Vec3f* eye = &camera->eye; f32 playerHeight; Vec3f* at = &camera->at; - UNUSED s32 pad2; + STACK_PAD(s32); playerHeight = Player_GetHeight(camera->player); @@ -4633,9 +4633,9 @@ s32 Camera_Unique1(Camera* camera) { PosRot playerhead; Unique1ReadOnlyData* roData = &camera->paramData.uniq1.roData; Unique1ReadWriteData* rwData = &camera->paramData.uniq1.rwData; - UNUSED s32 pad1; + STACK_PAD(s32); f32 playerHeight; - UNUSED s32 pad2; + STACK_PAD(s32); playerHeight = Player_GetHeight(camera->player); if (RELOAD_PARAMS(camera) || R_RELOAD_CAM_PARAMS) { @@ -4725,11 +4725,11 @@ s32 Camera_Unique2(Camera* camera) { Vec3f playerPos; VecGeo eyeOffset; VecGeo eyeAtOffset; - UNUSED s32 pad1; + STACK_PAD(s32); f32 lerpRateFactor; Unique2ReadOnlyData* roData = &camera->paramData.uniq2.roData; Unique2ReadWriteData* rwData = &camera->paramData.uniq2.rwData; - UNUSED s32 pad2; + STACK_PAD(s32); f32 playerHeight; playerHeight = Player_GetHeight(camera->player); @@ -5096,7 +5096,7 @@ s32 Camera_Unique6(Camera* camera) { * camera rotates to follow player */ s32 Camera_Unique7(Camera* camera) { - UNUSED s32 pad; + STACK_PAD(s32); Unique7ReadOnlyData* roData = &camera->paramData.uniq7.roData; CameraModeValue* values; VecGeo playerPosEyeOffset; @@ -5172,7 +5172,7 @@ s32 Camera_Unique9(Camera* camera) { s16 action; s16 atInitFlags; s16 eyeInitFlags; - UNUSED s16 pad; + STACK_PAD(s16); PosRot targethead; PosRot playerhead; PosRot playerPosRot; @@ -5680,7 +5680,7 @@ void Camera_RotateAroundPoint(PosRot* at, Vec3f* pos, Vec3f* dst) { * until all keyFrames have been exhausted. */ s32 Camera_Demo1(Camera* camera) { - UNUSED s32 pad; + STACK_PAD(s32); Demo1ReadOnlyData* roData = &camera->paramData.demo1.roData; CameraModeValue* values; Vec3f* at = &camera->at; @@ -5768,13 +5768,13 @@ s32 Camera_Demo3(Camera* camera) { Vec3f sp68; Vec3f sp5C; f32 temp_f0; - UNUSED s32 pad1; + STACK_PAD(s32); u8 skipUpdateEye = false; f32 yOffset = Player_GetHeight(camera->player); s16 angle; Demo3ReadOnlyData* roData = &camera->paramData.demo3.roData; Demo3ReadWriteData* rwData = &camera->paramData.demo3.rwData; - UNUSED s32 pad2; + STACK_PAD(s32); camera->unk_14C &= ~0x10; @@ -5985,7 +5985,7 @@ s32 Camera_Demo5(Camera* camera) { VecGeo eyePlayerGeo; s16 targetScreenPosX; s16 targetScreenPosY; - UNUSED s32 pad1; + STACK_PAD(s32); PosRot playerhead; PosRot targethead; Player* player; @@ -5993,7 +5993,7 @@ s32 Camera_Demo5(Camera* camera) { s32 framesDiff; s32 temp_v0; s16 t; - UNUSED s32 pad2; + STACK_PAD(s32); Actor_GetFocus(&playerhead, &camera->player->actor); player = camera->player; @@ -6307,7 +6307,7 @@ s32 Camera_Demo8(Camera* camera) { * to be relative to the main camera's player, the current camera's player, or the main camera's target */ s32 Camera_Demo9(Camera* camera) { - UNUSED s32 pad1; + STACK_PAD(s32); s32 finishAction; s16 onePointTimer; OnePointCamData* onePointCamData = &camera->paramData.demo9.onePointCamData; @@ -6321,7 +6321,7 @@ s32 Camera_Demo9(Camera* camera) { Vec3f* eye = &camera->eye; PosRot* mainCamPlayerPosRot; PosRot focusPosRot; - UNUSED s32 pad2; + STACK_PAD(s32); Vec3f* eyeNext = &camera->eyeNext; Demo9ReadOnlyData* roData = &camera->paramData.demo9.roData; Vec3f* at = &camera->at; @@ -6549,7 +6549,7 @@ s32 Camera_Special5(Camera* camera) { Vec3f* at = &camera->at; Vec3f* eyeNext = &camera->eyeNext; PosRot spA8; - UNUSED s16 pad; + STACK_PAD(s16); s16 spA4; CamColChk sp7C; VecGeo sp74; @@ -6708,7 +6708,7 @@ s32 Camera_Special6(Camera* camera) { f32 timerDivisor; Special6ReadOnlyData* roData = &camera->paramData.spec6.roData; Special6ReadWriteData* rwData = &camera->paramData.spec6.rwData; - UNUSED s32 pad; + STACK_PAD(s32); if (RELOAD_PARAMS(camera) || R_RELOAD_CAM_PARAMS) { CameraModeValue* values = sCameraSettings[camera->setting].cameraModes[camera->mode].values; @@ -6797,7 +6797,7 @@ s32 Camera_Special8(Camera* camera) { } s32 Camera_Special9(Camera* camera) { - UNUSED s32 pad1; + STACK_PAD(s32); Vec3f* eye = &camera->eye; Vec3f* at = &camera->at; Vec3f* eyeNext = &camera->eyeNext; @@ -6805,14 +6805,14 @@ s32 Camera_Special9(Camera* camera) { VecGeo eyeAdjustment; VecGeo atEyeOffsetGeo; f32 playerYOffset; - UNUSED s32 pad2; + STACK_PAD(s32); PosRot* playerPosRot = &camera->playerPosRot; PosRot adjustedPlayerPosRot; f32 yNormal; DoorParams* doorParams = &camera->paramData.doorParams; Special9ReadOnlyData* roData = &camera->paramData.spec9.roData; Special9ReadWriteData* rwData = &camera->paramData.spec9.rwData; - UNUSED s32 pad3; + STACK_PAD(s32); BgCamFuncData* bgCamFuncData; playerYOffset = Player_GetHeight(camera->player); @@ -7414,7 +7414,7 @@ void Camera_UpdateDistortion(Camera* camera) { f32 speedFactor; f32 depthPhaseStep; f32 screenPlanePhaseStep; - UNUSED s32 pad[5]; + STACK_PADS(s32, 5); f32 xScale; f32 yScale; f32 zScale; @@ -8095,7 +8095,7 @@ s32 Camera_RequestQuake(Camera* camera, UNUSED s32 unused, s16 y, s32 duration) } s32 Camera_SetParam(Camera* camera, s32 param, void* value) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); if (value != NULL) { switch (param) { @@ -8227,7 +8227,7 @@ s32 Camera_ChangeDoorCam(Camera* camera, Actor* doorActor, s16 bgCamIndex, UNUSE } s32 Camera_Copy(Camera* dstCamera, Camera* srcCamera) { - UNUSED s32 pad; + STACK_PAD(s32); dstCamera->posOffset.x = 0.0f; dstCamera->posOffset.y = 0.0f; diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index c6038a626c5..3d9ea6165e7 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -2636,7 +2636,7 @@ s32 CollisionCheck_GetMassType(u8 mass) { */ void CollisionCheck_SetOCvsOC(Collider* left, ColliderInfo* leftInfo, Vec3f* leftPos, Collider* right, ColliderInfo* rightInfo, Vec3f* rightPos, f32 overlap) { - UNUSED s32 pad; + STACK_PAD(s32); f32 leftDispRatio; f32 rightDispRatio; f32 xzDist; @@ -3470,7 +3470,7 @@ s32 CollisionCheck_CylSideVsLineSeg(f32 radius, f32 height, f32 offset, Vec3f* a f32 actorDotItemXZ; f32 zero = 0.0f; f32 closeDist; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); actorToItem.x = itemPos->x - actorPos->x; actorToItem.y = itemPos->y - actorPos->y - offset; diff --git a/src/code/z_construct.c b/src/code/z_construct.c index a5f8237dcba..1abd2158a43 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -166,7 +166,7 @@ void Interface_Init(PlayState* play) { void Message_Init(PlayState* play) { MessageContext* msgCtx = &play->msgCtx; - UNUSED s32 pad; + STACK_PAD(s32); Message_SetTables(); diff --git a/src/code/z_debug.c b/src/code/z_debug.c index f85dc07a737..63489598e94 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -244,7 +244,7 @@ void Regs_DrawEditor(GfxPrint* printer) { s32 i; s32 pageStart = (gRegEditor->regPage - 1) * REGS_PER_PAGE; s32 pageDataStart = ((gRegEditor->regGroup * REG_PAGES) + gRegEditor->regPage - 1) * REGS_PER_PAGE; - UNUSED s32 pad; + STACK_PAD(s32); char regGroupName[3]; regGroupName[0] = 'R'; @@ -271,7 +271,7 @@ void func_80063D7C(GraphicsContext* gfxCtx) { Gfx* gfx; Gfx* opaStart; GfxPrint printer; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(gfxCtx, "../z_debug.c", 628); diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 93c7f6dbf2e..f125f112551 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -108,7 +108,7 @@ void func_80068ECC(PlayState* play, CutsceneContext* csCtx); void Cutscene_DrawDebugInfo(UNUSED PlayState* play, Gfx** dlist, CutsceneContext* csCtx) { GfxPrint printer; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); GfxPrint_Init(&printer); GfxPrint_Open(&printer, *dlist); @@ -1454,7 +1454,7 @@ s32 Cutscene_Command_08(PlayState* play, CutsceneContext* csCtx, u8* cmd, UNUSED Vec3f sp3C; Vec3f sp30; Camera* subCam; - UNUSED s32 pad; + STACK_PAD(s32); cmd += 8; size = 8; diff --git a/src/code/z_draw.c b/src/code/z_draw.c index cd8d236039c..265bc105a18 100644 --- a/src/code/z_draw.c +++ b/src/code/z_draw.c @@ -380,7 +380,7 @@ void GetItem_Draw(PlayState* play, s16 drawId) { // All remaining functions in this file are draw functions referenced in the table and called by the function above void GetItem_DrawMaskOrBombchu(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 556); @@ -392,7 +392,7 @@ void GetItem_DrawMaskOrBombchu(PlayState* play, s16 drawId) { } void GetItem_DrawSoldOut(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 572); @@ -404,7 +404,7 @@ void GetItem_DrawSoldOut(PlayState* play, s16 drawId) { } void GetItem_DrawBlueFire(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 588); @@ -428,7 +428,7 @@ void GetItem_DrawBlueFire(PlayState* play, s16 drawId) { } void GetItem_DrawPoes(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 628); @@ -454,7 +454,7 @@ void GetItem_DrawPoes(PlayState* play, s16 drawId) { } void GetItem_DrawFairy(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 670); @@ -479,7 +479,7 @@ void GetItem_DrawFairy(PlayState* play, s16 drawId) { } void GetItem_DrawMirrorShield(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 712); @@ -499,7 +499,7 @@ void GetItem_DrawMirrorShield(PlayState* play, s16 drawId) { } void GetItem_DrawSkullToken(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 742); @@ -519,7 +519,7 @@ void GetItem_DrawSkullToken(PlayState* play, s16 drawId) { } void GetItem_DrawEggOrMedallion(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 772); @@ -532,7 +532,7 @@ void GetItem_DrawEggOrMedallion(PlayState* play, s16 drawId) { } void GetItem_DrawCompass(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 811); @@ -548,7 +548,7 @@ void GetItem_DrawCompass(PlayState* play, s16 drawId) { } void GetItem_DrawPotion(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 834); @@ -572,7 +572,7 @@ void GetItem_DrawPotion(PlayState* play, s16 drawId) { } void GetItem_DrawGoronSword(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 868); @@ -588,7 +588,7 @@ void GetItem_DrawGoronSword(PlayState* play, s16 drawId) { } void GetItem_DrawDekuNuts(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 890); @@ -604,7 +604,7 @@ void GetItem_DrawDekuNuts(PlayState* play, s16 drawId) { } void GetItem_DrawRecoveryHeart(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 913); @@ -620,7 +620,7 @@ void GetItem_DrawRecoveryHeart(PlayState* play, s16 drawId) { } void GetItem_DrawFish(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 936); @@ -636,7 +636,7 @@ void GetItem_DrawFish(PlayState* play, s16 drawId) { } void GetItem_DrawOpa0(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 959); @@ -648,7 +648,7 @@ void GetItem_DrawOpa0(PlayState* play, s16 drawId) { } void GetItem_DrawOpa0Xlu1(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 975); @@ -664,7 +664,7 @@ void GetItem_DrawOpa0Xlu1(PlayState* play, s16 drawId) { } void GetItem_DrawXlu01(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 998); @@ -677,7 +677,7 @@ void GetItem_DrawXlu01(PlayState* play, s16 drawId) { } void GetItem_DrawOpa10Xlu2(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1015); @@ -694,7 +694,7 @@ void GetItem_DrawOpa10Xlu2(PlayState* play, s16 drawId) { } void GetItem_DrawMagicArrow(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1039); @@ -711,7 +711,7 @@ void GetItem_DrawMagicArrow(PlayState* play, s16 drawId) { } void GetItem_DrawMagicSpell(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1063); @@ -729,7 +729,7 @@ void GetItem_DrawMagicSpell(PlayState* play, s16 drawId) { } void GetItem_DrawOpa1023(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1088); @@ -744,7 +744,7 @@ void GetItem_DrawOpa1023(PlayState* play, s16 drawId) { } void GetItem_DrawOpa10Xlu32(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1108); @@ -762,7 +762,7 @@ void GetItem_DrawOpa10Xlu32(PlayState* play, s16 drawId) { } void GetItem_DrawSmallRupee(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1133); @@ -782,7 +782,7 @@ void GetItem_DrawSmallRupee(PlayState* play, s16 drawId) { } void GetItem_DrawScale(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1162); @@ -801,7 +801,7 @@ void GetItem_DrawScale(PlayState* play, s16 drawId) { } void GetItem_DrawBulletBag(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1188); @@ -820,7 +820,7 @@ void GetItem_DrawBulletBag(PlayState* play, s16 drawId) { } void GetItem_DrawWallet(PlayState* play, s16 drawId) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_draw.c", 1214); diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index 3f9209fe23b..077c5a6a544 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -596,7 +596,7 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem f32 temp_f22 = temp_f2 - 2.0f * temp_f0 + temp_f28; // t^3 - 2t^2 + t f32 temp_f24 = 2.0f * temp_f2 - temp_f0 * 3.0f + 1.0f; // 2t^3 - 3t^2 + 1 f32 temp_f26 = temp_f0 * 3.0f - 2.0f * temp_f2; // 3t^2 - 2t^3 - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); // p = (2t^3 - 3t^2 + 1)p0 + (3t^2 - 2t^3)p1 + (t^3 - 2t^2 + t)m0 + (t^3 - t^2)m1 spE0.x = (temp_f24 * sp1CC.x) + (temp_f26 * sp18C.x) + (temp_f22 * sp1B4.x) + (temp_f20 * sp174.x); diff --git a/src/code/z_eff_ss_dead.c b/src/code/z_eff_ss_dead.c index 2327535d87e..caa2d57105b 100644 --- a/src/code/z_eff_ss_dead.c +++ b/src/code/z_eff_ss_dead.c @@ -51,7 +51,7 @@ void func_80026400(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3) { } void func_80026608(PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_eff_ss_dead.c", 159); @@ -108,7 +108,7 @@ void func_80026860(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3) { } void func_80026A6C(PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_eff_ss_dead.c", 217); diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index fd6d2ab4247..f4cdd116eb9 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -47,7 +47,7 @@ void EffectSs_DrawGEffect(PlayState* play, EffectSs* this, void* texture) { MtxF mfScale; MtxF mfResult; MtxF mfTrans11DA0; - UNUSED s32 pad; + STACK_PAD(s32); Mtx* mtx; void* object = play->objectCtx.status[this->rgObjBankIdx].segment; diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 6d617958c57..be962b5d1cc 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -77,7 +77,7 @@ void EnAObj_SetupAction(EnAObj* this, EnAObjActionFunc actionFunc) { void EnAObj_Init(Actor* thisx, PlayState* play) { CollisionHeader* colHeader = NULL; - UNUSED s32 pad; + STACK_PAD(s32); EnAObj* this = (EnAObj*)thisx; f32 shadowScale = 6.0f; diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 82d0aca9a03..c614fa505d9 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -138,12 +138,12 @@ void EnItem00_SetupAction(EnItem00* this, EnItem00ActionFunc actionFunc) { void EnItem00_Init(Actor* thisx, PlayState* play) { EnItem00* this = (EnItem00*)thisx; - UNUSED s32 pad1; + STACK_PAD(s32); f32 yOffset = 980.0f; f32 shadowScale = 6.0f; s32 getItemId = GI_NONE; s16 spawnParam8000 = this->actor.params & 0x8000; - UNUSED s32 pad2; + STACK_PAD(s32); this->collectibleFlag = (this->actor.params & 0x3F00) >> 8; @@ -440,7 +440,7 @@ void func_8001E1C8(EnItem00* this, PlayState* play) { } void func_8001E304(EnItem00* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f pos; s32 rotOffset; @@ -537,7 +537,7 @@ void EnItem00_Update(Actor* thisx, PlayState* play) { s16 i; u32* temp; EnItem00* this = (EnItem00*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (this->despawnTimer > 0) { this->despawnTimer--; @@ -817,7 +817,7 @@ void EnItem00_Draw(Actor* thisx, PlayState* play) { * Draw Function used for Rupee types of En_Item00. */ void EnItem00_DrawRupee(EnItem00* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 texIndex; OPEN_DISPS(play->state.gfxCtx, "../z_en_item00.c", 1546); @@ -872,7 +872,7 @@ void EnItem00_DrawCollectible(EnItem00* this, PlayState* play) { * Draw Function used for the Heart Container type of En_Item00. */ void EnItem00_DrawHeartContainer(EnItem00* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_item00.c", 1623); @@ -895,7 +895,7 @@ void EnItem00_DrawHeartContainer(EnItem00* this, PlayState* play) { * Draw Function used for the Piece of Heart type of En_Item00. */ void EnItem00_DrawHeartPiece(EnItem00* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_item00.c", 1658); @@ -945,7 +945,7 @@ s16 func_8001F404(s16 dropId) { // External functions used by other actors to drop collectibles, which usually results in spawning an En_Item00 actor. EnItem00* Item_DropCollectible(PlayState* play, Vec3f* spawnPos, s16 params) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); EnItem00* spawnedActor = NULL; s16 param4000 = params & 0x4000; s16 param8000 = params & 0x8000; @@ -989,7 +989,7 @@ EnItem00* Item_DropCollectible(PlayState* play, Vec3f* spawnPos, s16 params) { EnItem00* Item_DropCollectible2(PlayState* play, Vec3f* spawnPos, s16 params) { EnItem00* spawnedActor = NULL; - UNUSED s32 pad; + STACK_PAD(s32); s16 param4000 = params & 0x4000; s16 param8000 = params & 0x8000; s16 param3F00 = params & 0x3F00; @@ -1021,7 +1021,7 @@ EnItem00* Item_DropCollectible2(PlayState* play, Vec3f* spawnPos, s16 params) { } void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnPos, s16 params) { - UNUSED s32 pad; + STACK_PAD(s32); EnItem00* spawnedActor; s16 dropQuantity; s16 param8000; diff --git a/src/code/z_fbdemo.c b/src/code/z_fbdemo.c index 07f581778ab..7ec1a4d6253 100644 --- a/src/code/z_fbdemo.c +++ b/src/code/z_fbdemo.c @@ -27,7 +27,7 @@ Gfx D_8012B000[] = { void TransitionUnk_InitGraphics(TransitionUnk* this) { s32 row2; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Vtx_t* vtx2; s32 frame; s32 rowTex; diff --git a/src/code/z_fbdemo_circle.c b/src/code/z_fbdemo_circle.c index a8c739a2775..4c210fa6959 100644 --- a/src/code/z_fbdemo_circle.c +++ b/src/code/z_fbdemo_circle.c @@ -101,7 +101,7 @@ void TransitionCircle_Destroy(UNUSED void* thisx) { void TransitionCircle_Update(void* thisx, s32 updateRate) { TransitionCircle* this = (TransitionCircle*)thisx; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if (this->direction != 0) { if (this->texY == 0) { diff --git a/src/code/z_fbdemo_triforce.c b/src/code/z_fbdemo_triforce.c index 2fcd73be7c8..fae304c1c0b 100644 --- a/src/code/z_fbdemo_triforce.c +++ b/src/code/z_fbdemo_triforce.c @@ -31,7 +31,7 @@ void TransitionTriforce_Destroy(UNUSED void* thisx) { void TransitionTriforce_Update(void* thisx, s32 updateRate) { TransitionTriforce* this = (TransitionTriforce*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s32 i; for (i = updateRate; i > 0; i--) { @@ -71,7 +71,7 @@ void TransitionTriforce_Draw(void* thisx, Gfx** gfxP) { Mtx* modelView; f32 scale; TransitionTriforce* this = (TransitionTriforce*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); f32 rotation = this->transPos * 360.0f; modelView = this->modelView[this->frame]; diff --git a/src/code/z_fbdemo_wipe1.c b/src/code/z_fbdemo_wipe1.c index e153cede971..e56719a7bc7 100644 --- a/src/code/z_fbdemo_wipe1.c +++ b/src/code/z_fbdemo_wipe1.c @@ -83,7 +83,7 @@ void TransitionWipe_Draw(void* thisx, Gfx** gfxP) { Gfx* gfx = *gfxP; Mtx* modelView; TransitionWipe* this = (TransitionWipe*)thisx; - UNUSED s32 pad[4]; + STACK_PADS(s32, 4); Gfx* tex; modelView = this->modelView[this->frame]; diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c index 4bde5db19a3..da4ed6f3a0b 100644 --- a/src/code/z_fcurve_data_skelanime.c +++ b/src/code/z_fcurve_data_skelanime.c @@ -46,7 +46,7 @@ void SkelCurve_Clear(SkelCurve* skelCurve) { */ s32 SkelCurve_Init(UNUSED PlayState* play, SkelCurve* skelCurve, CurveSkeletonHeader* skeletonHeaderSeg, UNUSED CurveAnimationHeader* animation) { - UNUSED s32 pad; + STACK_PAD(s32); CurveSkeletonHeader* skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); skelCurve->limbCount = skeletonHeader->limbCount; @@ -188,7 +188,7 @@ void SkelCurve_DrawLimb(PlayState* play, s32 limbIndex, SkelCurve* skelCurve, Ov Matrix_Scale(scale.x, scale.y, scale.z, MTXMODE_APPLY); if (lod == 0) { - UNUSED s32 pad; + STACK_PAD(s32); dList = limb->dList[0]; if (dList != NULL) { @@ -197,7 +197,7 @@ void SkelCurve_DrawLimb(PlayState* play, s32 limbIndex, SkelCurve* skelCurve, Ov gSPDisplayList(POLY_OPA_DISP++, dList); } } else if (lod == 1) { - UNUSED s32 pad; + STACK_PAD(s32); dList = limb->dList[0]; if (dList != NULL) { diff --git a/src/code/z_horse.c b/src/code/z_horse.c index d58526d273b..978b5afb07c 100644 --- a/src/code/z_horse.c +++ b/src/code/z_horse.c @@ -126,7 +126,7 @@ typedef struct { } struct_8011F9B8; void func_8006D684(PlayState* play, Player* player) { - UNUSED s32 pad; + STACK_PAD(s32); s32 i; Vec3s spawnPos; diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c index 155b0faa76f..ff9caf749b8 100644 --- a/src/code/z_jpeg.c +++ b/src/code/z_jpeg.c @@ -38,7 +38,7 @@ void Jpeg_ScheduleDecoderTask(JpegContext* ctx) { }; JpegWork* workBuf = ctx->workBuf; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); workBuf->taskData.address = VIRTUAL_TO_PHYSICAL(&workBuf->data); workBuf->taskData.mode = ctx->mode; diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 2dad91f6461..a46ae358eec 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -815,7 +815,7 @@ void Environment_DisableUnderwaterLights(PlayState* play) { void Environment_PrintDebugInfo(UNUSED PlayState* play, Gfx** gfx) { GfxPrint printer; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); GfxPrint_Init(&printer); GfxPrint_Open(&printer, *gfx); @@ -1486,7 +1486,7 @@ void Environment_DrawLensFlare(PlayState* play, EnvironmentContext* envCtx, View f32 halfPosY; f32 halfPosZ; f32 cosAngle; - UNUSED s32 pad; + STACK_PAD(s32); f32 lensFlareAlphaScaleTarget; u32 isOffScreen = false; f32 alpha; @@ -1676,7 +1676,7 @@ f32 Environment_RandCentered(void) { void Environment_DrawRain(PlayState* play, View* view, GraphicsContext* gfxCtx) { s16 i; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f vec; f32 temp1; f32 temp2; @@ -1960,7 +1960,7 @@ void Environment_DrawLightning(PlayState* play, UNUSED s32 arg1) { f32 dz; f32 x; f32 z; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); UNUSED Vec3f zeroVec1 = { 0.0f, 0.0f, 0.0f }; UNUSED Vec3f zeroVec2 = { 0.0f, 0.0f, 0.0f }; @@ -2193,7 +2193,7 @@ void Environment_DrawCustomLensFlare(PlayState* play) { } void Environment_InitGameOverLights(PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); sGameOverLightsIntensity = 0; @@ -2353,7 +2353,7 @@ void Environment_DrawSandstorm(PlayState* play, u8 sandstormState) { s32 envA = play->envCtx.sandstormEnvA; Color_RGBA8 primColor; Color_RGBA8 envColor; - UNUSED s32 pad; + STACK_PAD(s32); f32 sp98; u16 sp96; u16 sp94; diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index 73b508c7f57..f5a41fe577e 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -296,7 +296,7 @@ static void* sHeartDDTextures[] = { }; void Health_DrawMeter(PlayState* play) { - UNUSED s32 pad1[5]; + STACK_PADS(s32, 5); void* heartBgImg; u32 curColorSet; f32 offsetX; @@ -312,7 +312,7 @@ void Health_DrawMeter(PlayState* play) { s32 curHeartFraction = gSaveContext.health % 0x10; s16 totalHeartCount = gSaveContext.healthCapacity / 0x10; s16 fullHeartCount = gSaveContext.health / 0x10; - UNUSED s32 pad2; + STACK_PAD(s32); f32 beatingHeartPulsingSize = interfaceCtx->beatingHeartOscillator * 0.1f; s32 curCombineModeSet = 0; u8* curBgImgLoaded = NULL; diff --git a/src/code/z_lights.c b/src/code/z_lights.c index d83ccb4b489..77162c90de8 100644 --- a/src/code/z_lights.c +++ b/src/code/z_lights.c @@ -354,7 +354,7 @@ void Lights_GlowCheck(PlayState* play) { } void Lights_DrawGlow(PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); LightNode* node; node = play->lightCtx.listHead; @@ -370,7 +370,7 @@ void Lights_DrawGlow(PlayState* play) { LightInfo* info; LightPoint* params; f32 scale; - UNUSED s32 pad2[4]; + STACK_PADS(s32, 4); info = node->info; params = &info->params.point; diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index 4fb9b2eece5..48e9000941c 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -310,7 +310,7 @@ void Map_Init(PlayState* play) { } void Minimap_DrawCompassIcons(PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); s16 tempX, tempZ; @@ -359,7 +359,7 @@ void Minimap_DrawCompassIcons(PlayState* play) { } void Minimap_Draw(PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); InterfaceContext* interfaceCtx = &play->interfaceCtx; s32 mapIndex = gSaveContext.mapIndex; diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c index 66a1e4aa924..aae9c0934dc 100644 --- a/src/code/z_message_PAL.c +++ b/src/code/z_message_PAL.c @@ -738,7 +738,7 @@ f32 sFontWidths[144] = { }; u16 Message_DrawItemIcon(PlayState* play, u16 itemId, Gfx** p, u16 i) { - UNUSED s32 pad; + STACK_PAD(s32); Gfx* gfx = *p; MessageContext* msgCtx = &play->msgCtx; @@ -2005,14 +2005,14 @@ void Message_DrawMain(PlayState* play, Gfx** p) { MessageContext* msgCtx = &play->msgCtx; u16 buttonIndexPos; Player* player = GET_PLAYER(play); - UNUSED s32 pad1; + STACK_PAD(s32); Gfx* gfx = *p; s16 r; s16 g; s16 b; u16 i; u16 notePosX; - UNUSED s16 pad2; + STACK_PAD(s16); u16 j; gSPSegment(gfx++, 0x02, play->interfaceCtx.parameterSegment); @@ -2955,7 +2955,7 @@ void Message_DrawMain(PlayState* play, Gfx** p) { void Message_DrawDebugVariableChanged(s16* var, GraphicsContext* gfxCtx) { static s16 sVarLastValue = 0; static s16 sFillTimer = 0; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(gfxCtx, "../z_message_PAL.c", 3485); @@ -2982,9 +2982,9 @@ void Message_DrawDebugVariableChanged(s16* var, GraphicsContext* gfxCtx) { } void Message_DrawDebugText(PlayState* play, Gfx** p) { - UNUSED s32 pad1; + STACK_PAD(s32); GfxPrint printer; - UNUSED s32 pad2; + STACK_PAD(s32); GfxPrint_Init(&printer); GfxPrint_Open(&printer, *p); diff --git a/src/code/z_moji.c b/src/code/z_moji.c index 7c83ef4cd55..e25f65a55ac 100644 --- a/src/code/z_moji.c +++ b/src/code/z_moji.c @@ -60,7 +60,7 @@ void Moji_SetPosition(s32 gridX, s32 gridY) { } void Moji_DrawChar(GraphicsContext* gfxCtx, char c) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); OPEN_DISPS(gfxCtx, "../z_moji.c", 86); diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 1b7b89e4e5b..b5311f7f544 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -3083,7 +3083,7 @@ void Interface_Draw(PlayState* play) { s16 svar1; s16 svar2; s16 svar3; - UNUSED s16 pad; + STACK_PAD(s16); s16 svar5; s16 svar6; diff --git a/src/code/z_play.c b/src/code/z_play.c index d9c9d574b7b..01962c5d31d 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -224,7 +224,7 @@ void Play_Init(GameState* thisx) { s32 playerStartBgCamIndex; s32 i; u8 baseSceneLayer; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if (gSaveContext.entranceIndex == ENTR_LOAD_OPENING) { gSaveContext.entranceIndex = 0; @@ -443,11 +443,11 @@ void Play_Init(GameState* thisx) { } void Play_Update(PlayState* this) { - UNUSED s32 pad1; + STACK_PAD(s32); s32 sp80; Input* input; u32 i; - UNUSED s32 pad2; + STACK_PAD(s32); input = this->state.input; @@ -978,7 +978,7 @@ void Play_Update(PlayState* this) { PLAY_LOG(3801); if ((sp80 == 0) || gDbgCamEnabled) { - UNUSED s32 pad3[5]; + STACK_PADS(s32, 5); s32 i; this->nextCamId = this->activeCamId; @@ -1325,7 +1325,7 @@ f32 func_800BFCB8(PlayState* this, MtxF* mf, Vec3f* pos) { f32 nx; f32 ny; f32 nz; - UNUSED s32 pad[5]; + STACK_PADS(s32, 5); floorY = BgCheck_AnyRaycastDown1(&this->colCtx, &poly, pos); diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 981e0a0d57d..99eadb813f9 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -642,7 +642,7 @@ s32 func_8008EF44(PlayState* play, s32 ammo) { s32 Player_IsBurningStickInRange(PlayState* play, Vec3f* pos, f32 xzRange, f32 yRange) { Player* this = GET_PLAYER(play); Vec3f diff; - UNUSED s32 pad; + STACK_PAD(s32); if ((this->heldItemAction == PLAYER_IA_STICK) && (this->unk_860 != 0)) { Math_Vec3f_Diff(&this->meleeWeaponInfo[0].tip, pos, &diff); @@ -976,7 +976,7 @@ void func_8008F87C(PlayState* play, Player* this, SkelAnime* skelAnime, Vec3f* p if ((this->actor.scale.y >= 0.0f) && !(this->stateFlags1 & PLAYER_STATE1_7) && (Player_ActionToMagicSpell(this, this->itemAction) < 0)) { - UNUSED s32 pad; + STACK_PAD(s32); sp7C = D_80126058[(void)0, gSaveContext.linkAge]; sp78 = D_80126060[(void)0, gSaveContext.linkAge]; @@ -1581,7 +1581,7 @@ void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, UN if (heldActor != NULL) { MtxF sp44; - UNUSED s32 pad; + STACK_PAD(s32); Matrix_MultVec3f(&D_80126190, &heldActor->world.pos); Matrix_RotateZYX(0, -0x4000, -0x4000, MTXMODE_APPLY); @@ -1727,7 +1727,7 @@ void Player_DrawPauseImpl(PlayState* play, void* gameplayKeep, void* linkObject, OPEN_DISPS(play->state.gfxCtx, "../z_player_lib.c", 3129); - { UNUSED s32 pad[2]; } + { STACK_PADS(s32, 2); } opaRef = POLY_OPA_DISP; POLY_OPA_DISP++; diff --git a/src/code/z_quake.c b/src/code/z_quake.c index ce831f7683a..b534dfb3096 100644 --- a/src/code/z_quake.c +++ b/src/code/z_quake.c @@ -81,7 +81,7 @@ void Quake_UpdateShakeInfo(QuakeRequest* req, ShakeInfo* shake, f32 y, f32 x) { } s16 Quake_CallbackType1(QuakeRequest* req, ShakeInfo* shake) { - UNUSED s32 pad; + STACK_PAD(s32); if (req->timer > 0) { f32 xyOffset = Math_SinS(req->speed * req->timer); @@ -103,7 +103,7 @@ s16 Quake_CallbackType5(QuakeRequest* req, ShakeInfo* shake) { } s16 Quake_CallbackType6(QuakeRequest* req, ShakeInfo* shake) { - UNUSED s32 pad; + STACK_PAD(s32); f32 xyOffset; req->timer--; diff --git a/src/code/z_room.c b/src/code/z_room.c index 23b7d97c4ae..8a79b03144c 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -98,14 +98,14 @@ void Room_DrawCullable(PlayState* play, Room* room, u32 flags) { RoomShapeCullableEntryLinked* head = NULL; RoomShapeCullableEntryLinked* tail = NULL; RoomShapeCullableEntryLinked* iter; - UNUSED s32 pad1; + STACK_PAD(s32); RoomShapeCullableEntryLinked* insert; s32 j; s32 i; Vec3f pos; Vec3f projectedPos; f32 projectedW; - UNUSED s32 pad2; + STACK_PAD(s32); RoomShapeCullableEntry* roomShapeCullableEntries; RoomShapeCullableEntry* roomShapeCullableEntryIter; f32 entryBoundsNearZ; diff --git a/src/code/z_scene.c b/src/code/z_scene.c index b41aec4b436..2090b252565 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -405,7 +405,7 @@ void Scene_CommandEchoSettings(PlayState* play, SceneCmd* cmd) { } void Scene_CommandAlternateHeaderList(PlayState* play, SceneCmd* cmd) { - UNUSED s32 pad; + STACK_PAD(s32); SceneCmd* altHeader; osSyncPrintf("\n[ZU]sceneset age =[%X]", ((void)0, gSaveContext.linkAge)); diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index 0d6751edbe9..07843938f0b 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -156,7 +156,7 @@ void* sDCLavaFloorTextures[] = { void Scene_DrawConfigDdan(PlayState* play) { u32 gameplayFrames; - UNUSED s32 pad; + STACK_PAD(s32); Gfx* displayListHead = Graph_Alloc(play->state.gfxCtx, 2 * sizeof(Gfx[3])); OPEN_DISPS(play->state.gfxCtx, "../z_scene_table.c", 4905); diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 6d0ef0ae4f7..58cee934133 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -70,7 +70,7 @@ void SkelAnime_DrawLimbLod(PlayState* play, s32 limbIndex, void** skeleton, Vec3 void SkelAnime_DrawLod(PlayState* play, void** skeleton, Vec3s* jointTable, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, void* arg, s32 lod) { LodLimb* rootLimb; - UNUSED s32 pad; + STACK_PAD(s32); Gfx* dList; Vec3f pos; Vec3s rot; @@ -180,7 +180,7 @@ void SkelAnime_DrawFlexLimbLod(PlayState* play, s32 limbIndex, void** skeleton, void SkelAnime_DrawFlexLod(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListCount, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, void* arg, s32 lod) { LodLimb* rootLimb; - UNUSED s32 pad; + STACK_PAD(s32); Gfx* newDList; Gfx* limbDList; Vec3f pos; @@ -287,7 +287,7 @@ void SkelAnime_DrawLimbOpa(PlayState* play, s32 limbIndex, void** skeleton, Vec3 void SkelAnime_DrawOpa(PlayState* play, void** skeleton, Vec3s* jointTable, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, void* arg) { StandardLimb* rootLimb; - UNUSED s32 pad; + STACK_PAD(s32); Gfx* dList; Vec3f pos; Vec3s rot; @@ -397,7 +397,7 @@ void SkelAnime_DrawFlexLimbOpa(PlayState* play, s32 limbIndex, void** skeleton, void SkelAnime_DrawFlexOpa(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListCount, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, void* arg) { StandardLimb* rootLimb; - UNUSED s32 pad; + STACK_PAD(s32); Gfx* newDList; Gfx* limbDList; Vec3f pos; @@ -550,7 +550,7 @@ Gfx* SkelAnime_DrawLimb(PlayState* play, s32 limbIndex, void** skeleton, Vec3s* Gfx* SkelAnime_Draw(PlayState* play, void** skeleton, Vec3s* jointTable, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, void* arg, Gfx* gfx) { StandardLimb* rootLimb; - UNUSED s32 pad; + STACK_PAD(s32); Gfx* dList; Vec3f pos; Vec3s rot; @@ -657,7 +657,7 @@ Gfx* SkelAnime_DrawFlexLimb(PlayState* play, s32 limbIndex, void** skeleton, Vec Gfx* SkelAnime_DrawFlex(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListCount, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, void* arg, Gfx* gfx) { StandardLimb* rootLimb; - UNUSED s32 pad; + STACK_PAD(s32); Gfx* newDList; Gfx* limbDList; Vec3f pos; @@ -838,7 +838,7 @@ void AnimationContext_SetLoadFrame(PlayState* play, LinkAnimationHeader* animati if (entry != NULL) { LinkAnimationHeader* linkAnimHeader = SEGMENTED_TO_VIRTUAL(animation); - UNUSED s32 pad; + STACK_PAD(s32); osCreateMesgQueue(&entry->data.load.msgQueue, &entry->data.load.msg, 1); DmaMgr_SendRequest2(&entry->data.load.req, frameTable, diff --git a/src/code/z_skin.c b/src/code/z_skin.c index e1bf0ed9e00..da82c7f06da 100644 --- a/src/code/z_skin.c +++ b/src/code/z_skin.c @@ -45,7 +45,7 @@ void Skin_UpdateVertices(MtxF* mtx, SkinVertex* skinVertices, SkinLimbModif* mod void Skin_ApplyLimbModifications(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, s32 arg3) { s32 modifCount; SkinLimb** skeleton; - UNUSED s32 pad; + STACK_PAD(s32); SkinAnimatedLimbData* data; SkinLimbModif* modif; SkinLimbVtx* vtxEntry; @@ -161,7 +161,7 @@ void Skin_DrawAnimatedLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, s void Skin_DrawLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, Gfx* dlistOverride, UNUSED s32 drawFlags) { Gfx* gfx = dlistOverride; SkinLimb** skeleton; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(gfxCtx, "../z_skin.c", 395); @@ -191,7 +191,7 @@ void Skin_DrawImpl(Actor* actor, PlayState* play, Skin* skin, SkinPostDraw postD s32 segmentType; SkinLimb** skeleton; GraphicsContext* gfxCtx = play->state.gfxCtx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(gfxCtx, "../z_skin.c", 471); diff --git a/src/code/z_skin_awb.c b/src/code/z_skin_awb.c index 4c87ae7e576..174de0ec709 100644 --- a/src/code/z_skin_awb.c +++ b/src/code/z_skin_awb.c @@ -108,7 +108,7 @@ void Skin_Free(PlayState* play, Skin* skin) { } s32 func_800A698C(Skin* skin, SkinLimb** skeleton, MtxF* limbMatrices, u8 parentIndex, u8 limbIndex) { - UNUSED s32 pad; + STACK_PAD(s32); SkinLimb* limb = SEGMENTED_TO_VIRTUAL(skeleton[limbIndex]); MtxF* mtx; s32 ret; @@ -145,7 +145,7 @@ s32 func_800A698C(Skin* skin, SkinLimb** skeleton, MtxF* limbMatrices, u8 parent */ s32 Skin_ApplyAnimTransformations(Skin* skin, MtxF* limbMatrices, Actor* actor, s32 setTranslation) { s32 i; - UNUSED s32 pad; + STACK_PAD(s32); f32 yRot; f32 xRot; f32 zRot; diff --git a/src/code/z_skin_matrix.c b/src/code/z_skin_matrix.c index 2fe3ae2a42b..0e1cf8eb9d6 100644 --- a/src/code/z_skin_matrix.c +++ b/src/code/z_skin_matrix.c @@ -237,7 +237,7 @@ void SkinMatrix_MtxFCopy(MtxF* src, MtxF* dest) { s32 SkinMatrix_Invert(MtxF* src, MtxF* dest) { MtxF mfCopy; s32 i; - UNUSED s32 pad; + STACK_PAD(s32); f32 temp2; f32 temp1; s32 thisCol; @@ -616,7 +616,7 @@ void SkinMatrix_SetRotateAxis(MtxF* mf, s16 angle, f32 axisX, f32 axisY, f32 axi f32 xy; f32 yz; f32 xz; - UNUSED s32 pad; + STACK_PAD(s32); sinA = Math_SinS(angle); cosA = Math_CosS(angle); diff --git a/src/code/z_view.c b/src/code/z_view.c index 0e9a677ddd5..b8d51ea650a 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -138,7 +138,7 @@ void View_GetViewport(View* view, Viewport* viewport) { void View_ApplyLetterbox(View* view) { s32 varY; s32 varX; - UNUSED s32 pad; + STACK_PAD(s32); s32 ulx; s32 uly; s32 lrx; @@ -463,7 +463,7 @@ s32 View_ApplyOrthoToOverlay(View* view) { * Apply scissor, viewport, view and projection (perspective) to OVERLAY_DISP. */ s32 View_ApplyPerspectiveToOverlay(View* view) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); f32 aspect; s32 width; s32 height; diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index 984b783eee5..dbc72364173 100644 --- a/src/code/z_vr_box.c +++ b/src/code/z_vr_box.c @@ -98,7 +98,7 @@ s32 func_800ADBB0(SkyboxContext* skyboxCtx, Vtx* roomVtx, s32 arg2, s32 arg3, s3 s32 sp1F0[9 * 5]; s32 sp13C[9 * 5]; s32 sp88[9 * 5]; - UNUSED s32 pad; + STACK_PAD(s32); switch (arg8) { case 0: @@ -209,7 +209,7 @@ s32 func_800AE2C0(SkyboxContext* skyboxCtx, Vtx* roomVtx, s32 arg2, s32 arg3, s3 s32 sp1EC[5 * 5]; s32 sp188[5 * 5]; s32 sp124[5 * 5]; - UNUSED s32 pad; + STACK_PAD(s32); switch (arg8) { case 0: diff --git a/src/libultra/rmon/xldtob.c b/src/libultra/rmon/xldtob.c index d5e503b2934..4bb4562f4c9 100644 --- a/src/libultra/rmon/xldtob.c +++ b/src/libultra/rmon/xldtob.c @@ -43,7 +43,7 @@ const f64 D_800122E0[] = { 10e0L, 10e1L, 10e3L, 10e7L, 10e15L, 10e31L, 10e63L, 1 void _Ldtob(_Pft* args, u8 type) { u8 buff[BUFF_LEN]; u8* ptr = buff; - UNUSED s32 pad; + STACK_PAD(s32); f64 val = args->v.ld; /* maybe struct? */ s16 err; 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 8c86b224c99..88f1affa0a2 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -148,7 +148,7 @@ void ArmsHook_Shoot(ArmsHook* this, PlayState* play) { DynaPolyActor* dynaPolyActor; f32 curGrabbedDist; f32 grabbedDist; - UNUSED s32 pad1; + STACK_PAD(s32); CollisionPoly* poly; s32 bgId; Vec3f intersectPos; @@ -157,7 +157,7 @@ void ArmsHook_Shoot(ArmsHook* this, PlayState* play) { f32 polyNormalX; f32 polyNormalZ; f32 velocity; - UNUSED s32 pad2; + STACK_PAD(s32); if ((this->actor.parent == NULL) || (!Player_HoldsHookshot(player))) { ArmsHook_DetachHookFromActor(this); @@ -296,7 +296,7 @@ void ArmsHook_Update(Actor* thisx, PlayState* play) { } void ArmsHook_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ArmsHook* this = (ArmsHook*)thisx; Player* player = GET_PLAYER(play); Vec3f sp78; 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 235b3b0e563..d6c1f55ce65 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -146,7 +146,7 @@ void ArrowFire_Hit(ArrowFire* this, PlayState* play) { void ArrowFire_Fly(ArrowFire* this, PlayState* play) { EnArrow* arrow; f32 distanceScaled; - UNUSED s32 pad; + STACK_PAD(s32); arrow = (EnArrow*)this->actor.parent; if ((arrow == NULL) || (arrow->actor.update == NULL)) { 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 2c8fec802cb..7e608803e1f 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -147,7 +147,7 @@ void ArrowIce_Hit(ArrowIce* this, PlayState* play) { void ArrowIce_Fly(ArrowIce* this, PlayState* play) { EnArrow* arrow; f32 distanceScaled; - UNUSED s32 pad; + STACK_PAD(s32); arrow = (EnArrow*)this->actor.parent; if ((arrow == NULL) || (arrow->actor.update == NULL)) { @@ -194,7 +194,7 @@ void ArrowIce_Update(Actor* thisx, PlayState* play) { void ArrowIce_Draw(Actor* thisx, PlayState* play) { ArrowIce* this = (ArrowIce*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Actor* transform; u32 stateFrames = play->state.frames; EnArrow* arrow = (EnArrow*)this->actor.parent; 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 3d36d697b5d..8d38fd80aee 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -146,7 +146,7 @@ void ArrowLight_Hit(ArrowLight* this, PlayState* play) { void ArrowLight_Fly(ArrowLight* this, PlayState* play) { EnArrow* arrow = (EnArrow*)this->actor.parent; f32 distanceScaled; - UNUSED s32 pad; + STACK_PAD(s32); if ((arrow == NULL) || (arrow->actor.update == NULL)) { Actor_Kill(&this->actor); @@ -192,7 +192,7 @@ void ArrowLight_Update(Actor* thisx, PlayState* play) { void ArrowLight_Draw(Actor* thisx, PlayState* play) { ArrowLight* this = (ArrowLight*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); u32 stateFrames = play->state.frames; EnArrow* arrow = (EnArrow*)this->actor.parent; Actor* transform; diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index c68a63987ce..4858d8a10ab 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -106,7 +106,7 @@ void BgBdanObjects_SetContactRu1(BgBdanObjects* this, s32 arg1) { } void BgBdanObjects_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgBdanObjects* this = (BgBdanObjects*)thisx; CollisionHeader* colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index dfa2b84743f..e22f30111c7 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -90,9 +90,9 @@ static InitChainEntry sInitChain[] = { static Vec3f D_8086E0E0 = { 0.0f, 140.0f, 0.0f }; void BgBdanSwitch_InitDynaPoly(BgBdanSwitch* this, PlayState* play, CollisionHeader* collision, s32 flag) { - UNUSED s16 pad1; + STACK_PAD(s16); CollisionHeader* colHeader = NULL; - UNUSED s16 pad2; + STACK_PAD(s16); DynaPolyActor_Init(&this->dyna, flag); CollisionHeader_GetVirtual(collision, &colHeader); @@ -135,7 +135,7 @@ void func_8086D0EC(BgBdanSwitch* this) { void BgBdanSwitch_Init(Actor* thisx, PlayState* play) { BgBdanSwitch* this = (BgBdanSwitch*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s16 type; s32 flag; @@ -217,7 +217,7 @@ void BgBdanSwitch_Destroy(Actor* thisx, PlayState* play) { } void func_8086D4B4(BgBdanSwitch* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 type; if (!Flags_GetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F)) { @@ -481,7 +481,7 @@ void func_8086DDC0(BgBdanSwitch* this, PlayState* play) { } void BgBdanSwitch_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgBdanSwitch* this = (BgBdanSwitch*)thisx; s32 type; diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c index 6cbad290959..e86c26a2c2f 100644 --- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c +++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c @@ -35,7 +35,7 @@ void BgBomGuard_SetupAction(BgBomGuard* this, BgBomGuardActionFunc actionFunc) { void BgBomGuard_Init(Actor* thisx, PlayState* play) { BgBomGuard* this = (BgBomGuard*)thisx; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, 0); diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c index 6fe8fbe8185..6f75fd9d043 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c @@ -82,7 +82,7 @@ ActorInit Bg_Bombwall_InitVars = { }; void BgBombwall_InitDynapoly(BgBombwall* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, 0); @@ -113,7 +113,7 @@ void BgBombwall_Init(Actor* thisx, PlayState* play) { s32 j; Vec3f vecs[3]; Vec3f sp80; - UNUSED s32 pad; + STACK_PAD(s32); BgBombwall* this = (BgBombwall*)thisx; f32 sin = Math_SinS(this->dyna.actor.shape.rot.y); f32 cos = Math_CosS(this->dyna.actor.shape.rot.y); diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index dab13d4b7f7..b3a2649336a 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -47,7 +47,7 @@ static s16 sTargetRot[] = { 0x0000, 0x0000, 0x3FFF, -0x3FFF }; void BgBowlWall_Init(Actor* thisx, PlayState* play) { BgBowlWall* this = (BgBowlWall*)thisx; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, 0); @@ -73,7 +73,7 @@ void BgBowlWall_Destroy(Actor* thisx, PlayState* play) { } void BgBowlWall_SpawnBullseyes(BgBowlWall* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnWallTubo* bullseye; Actor* lookForGirl; s16 type; @@ -118,7 +118,7 @@ void BgBowlWall_WaitForHit(BgBowlWall* this, PlayState* play) { } void BgBowlWall_FallDoEffects(BgBowlWall* this, PlayState* play) { - UNUSED s16 pad; + STACK_PAD(s16); Vec3f effectAccel = { 0.0f, 0.1f, 0.0f }; Vec3f effectVelocity = { 0.0f, 0.0f, 0.0f }; Vec3f effectPos; 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 e859f09d694..ce469830342 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -78,7 +78,7 @@ void BgBreakwall_SetupAction(BgBreakwall* this, BgBreakwallActionFunc actionFunc void BgBreakwall_Init(Actor* thisx, PlayState* play) { BgBreakwall* this = (BgBreakwall*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s32 wallType = ((this->dyna.actor.params >> 13) & 3) & 0xFF; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); @@ -146,7 +146,7 @@ Actor* BgBreakwall_SpawnFragments(PlayState* play, BgBreakwall* this, Vec3f* pos { { -40.0f, 14.0f, 0.0f }, { -50.0f, 57.0f, 0.0f }, { -30.0f, 57.0f, 0.0f }, { -40.0f, 70.0f, 0.0f } }, { { -55.0f, -15.0f, 0.0f }, { -55.0f, -32.0f, 0.0f }, { -30.0f, -32.0f, 0.0f }, { -20.0f, -10.0f, 0.0f } }, }; - UNUSED s32 pad; + STACK_PAD(s32); for (k = 3; k >= 0; k--) { if ((k == 0) || (k == 3)) { @@ -290,7 +290,7 @@ static Vec3f sColQuadList[][4] = { }; void BgBreakwall_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgBreakwall* this = (BgBreakwall*)thisx; if (this->bombableWallDList != NULL) { diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c index 3945e11e22c..5664773769f 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c @@ -51,7 +51,7 @@ typedef enum { #define SHORTCUT_Y_SPEED 5 void BgDdanJd_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgDdanJd* this = (BgDdanJd*)thisx; CollisionHeader* colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index 8984767d926..03f349a9825 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c @@ -63,7 +63,7 @@ void BgDdanKd_SetupAction(BgDdanKd* this, BgDdanKdActionFunc actionFunc) { void BgDdanKd_Init(Actor* thisx, PlayState* play) { BgDdanKd* this = (BgDdanKd*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; this->prevExplosive = NULL; diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index 27b52e8506a..d0ffc9260c5 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -109,7 +109,7 @@ static InitChainEntry sInitChain[] = { void BgDodoago_Init(Actor* thisx, PlayState* play) { BgDodoago* this = (BgDodoago*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index d5c9581de5f..042ee7af27e 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -34,7 +34,7 @@ ActorInit Bg_Gate_Shutter_InitVars = { void BgGateShutter_Init(Actor* thisx, PlayState* play) { BgGateShutter* this = (BgGateShutter*)thisx; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, 0); diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index 63fadd16075..cde45ac1e3a 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -38,7 +38,7 @@ static InitChainEntry sInitChain[] = { void BgGjyoBridge_Init(Actor* thisx, PlayState* play) { BgGjyoBridge* this = (BgGjyoBridge*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader; colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c index 68c6a9dcac3..a1075f98187 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c @@ -31,7 +31,7 @@ ActorInit Bg_Gnd_Firemeiro_InitVars = { }; void BgGndFiremeiro_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgGndFiremeiro* this = (BgGndFiremeiro*)thisx; CollisionHeader* colHeader = NULL; @@ -82,7 +82,7 @@ void BgGndFiremeiro_Sink(BgGndFiremeiro* this, PlayState* play) { } void BgGndFiremeiro_Shake(BgGndFiremeiro* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 randSign; if (DynaPolyActor_IsPlayerOnTop(&this->dyna)) { diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c index c7d6d6d991a..f4bc8da17e6 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c @@ -45,7 +45,7 @@ static InitChainEntry sInitChain[] = { static u8 sBlockPositions[2]; void BgGndIceblock_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgGndIceblock* this = (BgGndIceblock*)thisx; CollisionHeader* colHeader = NULL; @@ -68,7 +68,7 @@ void BgGndIceblock_Init(Actor* thisx, PlayState* play) { } void BgGndIceblock_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgGndIceblock* this = (BgGndIceblock*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -344,14 +344,14 @@ void BgGndIceblock_Slide(BgGndIceblock* this, PlayState* play) { } void BgGndIceblock_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgGndIceblock* this = (BgGndIceblock*)thisx; this->actionFunc(this, play); } void BgGndIceblock_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); UNUSED BgGndIceblock* this = (BgGndIceblock*)thisx; Gfx_DrawDListOpa(play, gWaterTrialIceBlockDL); diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c index 92bdfcc19eb..57dbc5a9714 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c @@ -59,7 +59,7 @@ static InitChainEntry sInitChain[] = { }; void BgGndSoulmeiro_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgGndSoulmeiro* this = (BgGndSoulmeiro*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -157,7 +157,7 @@ void func_8087AF38(BgGndSoulmeiro* this, PlayState* play) { } void func_8087B284(BgGndSoulmeiro* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); if (!Flags_GetSwitch(play, (this->actor.params >> 8) & 0x3F)) { this->actor.draw = BgGndSoulmeiro_Draw; diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c index 90897056aec..8ec4d06ac31 100644 --- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c +++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c @@ -39,7 +39,7 @@ static InitChainEntry sInitChain[] = { void BgHaka_Init(Actor* thisx, PlayState* play) { BgHaka* this = (BgHaka*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); @@ -124,7 +124,7 @@ void func_8087BAAC(BgHaka* this, PlayState* play) { void func_8087BAE4(BgHaka* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); if (this->dyna.actor.params != 0) { this->dyna.actor.params -= 1; diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index 9e8f6b563d7..dfda1267afb 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -69,7 +69,7 @@ static InitChainEntry sInitChain[] = { }; void BgHakaGate_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgHakaGate* this = (BgHakaGate*)thisx; CollisionHeader* colHeader = NULL; @@ -134,7 +134,7 @@ void BgHakaGate_Init(Actor* thisx, PlayState* play) { } void BgHakaGate_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgHakaGate* this = (BgHakaGate*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -299,7 +299,7 @@ void BgHakaGate_FalseSkull(BgHakaGate* this, PlayState* play) { } void BgHakaGate_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgHakaGate* this = (BgHakaGate*)thisx; this->actionFunc(this, play); diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c index f87cd3fe9fb..58711347d6d 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c +++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c @@ -42,7 +42,7 @@ static InitChainEntry sInitChain[] = { void BgHakaHuta_Init(Actor* thisx, PlayState* play) { BgHakaHuta* this = (BgHakaHuta*)thisx; - UNUSED s16 pad; + STACK_PAD(s16); CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(thisx, sInitChain); diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c index f286c63707a..298f584ddd5 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c @@ -54,7 +54,7 @@ static Gfx* D_8087E410[] = { }; void BgHakaMeganeBG_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgHakaMeganeBG* this = (BgHakaMeganeBG*)thisx; CollisionHeader* colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c index 70732d92a85..f26a0a5a049 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c +++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c @@ -39,7 +39,7 @@ static InitChainEntry sInitChain[] = { void BgHakaShip_Init(Actor* thisx, PlayState* play) { BgHakaShip* this = (BgHakaShip*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); @@ -222,7 +222,7 @@ void BgHakaShip_Draw(Actor* thisx, PlayState* play) { } CLOSE_DISPS(play->state.gfxCtx, "../z_bg_haka_ship.c", 568); if (this->actionFunc == BgHakaShip_CutsceneStationary || this->actionFunc == BgHakaShip_Move) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sp2C; sp2C.x = this->dyna.actor.world.pos.x + -367.0f; diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index bfa81102a10..d424e743dad 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -108,7 +108,7 @@ static InitChainEntry sInitChain[] = { void BgHakaTrap_Init(Actor* thisx, PlayState* play) { static UNK_TYPE D_80881014 = 0; BgHakaTrap* this = (BgHakaTrap*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(thisx, sInitChain); @@ -521,7 +521,7 @@ void BgHakaTrap_Draw(Actor* thisx, PlayState* play) { }; static Color_RGBA8 D_8088103C = { 0, 0, 0, 0 }; BgHakaTrap* this = (BgHakaTrap*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sp2C; if (this->actionFunc == func_808802D8) { diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index 79cce6c9c72..5f962566100 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -78,7 +78,7 @@ static InitChainEntry sInitChain[] = { void BgHakaTubo_Init(Actor* thisx, PlayState* play) { BgHakaTubo* this = (BgHakaTubo*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); @@ -219,7 +219,7 @@ void BgHakaTubo_Update(Actor* thisx, PlayState* play) { } void BgHakaTubo_DrawFlameCircle(BgHakaTubo* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_bg_haka_tubo.c", 476); diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c index 1eb1de95ec3..0062c1e3350 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c +++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c @@ -107,9 +107,9 @@ void BgHakaWater_Update(Actor* thisx, PlayState* play) { void BgHakaWater_Draw(Actor* thisx, PlayState* play) { BgHakaWater* this = (BgHakaWater*)thisx; - UNUSED s32 pad1; + STACK_PAD(s32); f32 temp; - UNUSED s32 pad2; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_bg_haka_water.c", 287); Gfx_SetupDL_25Xlu(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c index 2c2b395a5e8..4941b4e6c4b 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c @@ -72,7 +72,7 @@ static InitChainEntry sInitChain[] = { }; void BgHakaZou_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgHakaZou* this = (BgHakaZou*)thisx; Actor_ProcessInitChain(thisx, sInitChain); @@ -226,7 +226,7 @@ void func_80882CC4(BgHakaZou* this, PlayState* play) { Vec3f actorSpawnPos; f32 sin; f32 cos; - UNUSED s32 pad; + STACK_PAD(s32); sin = Math_SinS(this->dyna.actor.shape.rot.y - 0x4000) * 40.0f; cos = Math_CosS(this->dyna.actor.shape.rot.y - 0x4000) * 40.0f; diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index 11341ee8372..5b677e306cb 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -74,7 +74,7 @@ void BgHeavyBlock_InitPiece(BgHeavyBlock* this, f32 scale) { } void BgHeavyBlock_SetupDynapoly(BgHeavyBlock* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); CollisionHeader* colHeader = NULL; this->dyna.actor.flags |= ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_17; DynaPolyActor_Init(&this->dyna, 0); @@ -285,7 +285,7 @@ void BgHeavyBlock_SpawnPieces(BgHeavyBlock* this, PlayState* play) { { 0.0f, 300.0f, -20.0f }, { 50.0f, 200.0f, -20.0f }, { -50.0f, 200.0f, -20.0f }, { 0.0f, 100.0f, 30.0f }, { 0.0f, 100.0f, -70.0f }, { 0.0f, 0.0f, -20.0f }, }; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f pos; f32 sinPitch; f32 cosPitch; @@ -342,7 +342,7 @@ void BgHeavyBlock_Wait(BgHeavyBlock* this, PlayState* play) { void BgHeavyBlock_LiftedUp(BgHeavyBlock* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); f32 cosYaw; f32 zOffset; f32 sinYaw; @@ -448,7 +448,7 @@ void BgHeavyBlock_DoNothing(BgHeavyBlock* this, PlayState* play) { } void BgHeavyBlock_Land(BgHeavyBlock* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); if (Math_SmoothStepToS(&this->dyna.actor.shape.rot.x, 0x8AD0, 6, 2000, 100) != 0) { Math_StepToF(&this->dyna.actor.speedXZ, 0.0f, 20.0f); @@ -485,7 +485,7 @@ void BgHeavyBlock_Draw(Actor* thisx, PlayState* play) { static Vec3f D_80884EC8 = { 0.0f, 0.0f, 0.0f }; static Vec3f D_80884ED4 = { 0.0f, 400.0f, 0.0f }; BgHeavyBlock* this = (BgHeavyBlock*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); OPEN_DISPS(play->state.gfxCtx, "../z_bg_heavy_block.c", 904); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index 39cb4e10369..73469c5a091 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -66,7 +66,7 @@ ActorInit Bg_Hidan_Curtain_InitVars = { }; void BgHidanCurtain_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgHidanCurtain* this = (BgHidanCurtain*)thisx; BgHidanCurtainParams* hcParams; @@ -117,7 +117,7 @@ void BgHidanCurtain_Init(Actor* thisx, PlayState* play) { } void BgHidanCurtain_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgHidanCurtain* this = (BgHidanCurtain*)thisx; Collider_DestroyCylinder(play, &this->collider); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c index 94ddc78b473..6032491d3ff 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c @@ -96,7 +96,7 @@ static InitChainEntry sInitChain[] = { void BgHidanDalm_Init(Actor* thisx, PlayState* play) { BgHidanDalm* this = (BgHidanDalm*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(thisx, sInitChain); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c index 28003df1f6b..36b888429c4 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c @@ -175,7 +175,7 @@ void BgHidanFirewall_ColliderFollowPlayer(BgHidanFirewall* this, PlayState* play void BgHidanFirewall_Update(Actor* thisx, PlayState* play) { BgHidanFirewall* this = (BgHidanFirewall*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); this->unk_150 = (this->unk_150 + 1) % 8; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c index 90aa71a5c04..2500f70cda8 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c @@ -38,10 +38,10 @@ static InitChainEntry sInitChain[] = { }; void BgHidanFslift_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); BgHidanFslift* this = (BgHidanFslift*)thisx; CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c index 939e73e2930..544a6e25f85 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c @@ -105,7 +105,7 @@ void BgHidanFwbig_Init(Actor* thisx, PlayState* play2) { } void BgHidanFwbig_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgHidanFwbig* this = (BgHidanFwbig*)thisx; Collider_DestroyCylinder(play, &this->collider); @@ -217,7 +217,7 @@ void BgHidanFwbig_MoveCollider(BgHidanFwbig* this, PlayState* play) { } void BgHidanFwbig_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgHidanFwbig* this = (BgHidanFwbig*)thisx; if (this->collider.base.atFlags & AT_HIT) { @@ -247,7 +247,7 @@ void BgHidanFwbig_Update(Actor* thisx, PlayState* play) { } void BgHidanFwbig_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 height; OPEN_DISPS(play->state.gfxCtx, "../z_bg_hidan_fwbig.c", 630); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c index 870c0f362c2..6beab2f4794 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c @@ -128,7 +128,7 @@ s32 BgHidanHamstep_SpawnChildren(BgHidanHamstep* this, PlayState* play2) { void BgHidanHamstep_Init(Actor* thisx, PlayState* play) { BgHidanHamstep* this = (BgHidanHamstep*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; Vec3f sp48[3]; s32 i; @@ -290,7 +290,7 @@ void func_808887C4(BgHidanHamstep* this, PlayState* play) { } void func_80888860(BgHidanHamstep* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s32 quakeIndex; Actor_MoveForward(&this->dyna.actor); @@ -322,7 +322,7 @@ void func_80888860(BgHidanHamstep* this, PlayState* play) { } void func_808889B8(BgHidanHamstep* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgHidanHamstep* parent = (BgHidanHamstep*)this->dyna.actor.parent; func_80888734(this); @@ -339,7 +339,7 @@ void func_808889B8(BgHidanHamstep* this, PlayState* play) { } void func_80888A58(BgHidanHamstep* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s32 quakeIndex; Actor_MoveForward(&this->dyna.actor); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c index b20c5973483..45dd2f75ed5 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c @@ -64,7 +64,7 @@ void BgHidanKousi_SetupAction(BgHidanKousi* this, BgHidanKousiActionFunc actionF void BgHidanKousi_Init(Actor* thisx, PlayState* play) { BgHidanKousi* this = (BgHidanKousi*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, 0); @@ -94,7 +94,7 @@ void BgHidanKousi_Destroy(Actor* thisx, PlayState* play) { } void func_80889ACC(BgHidanKousi* this) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Vec3s* rot = &this->dyna.actor.world.rot; f32 temp1 = D_80889E40[this->dyna.actor.params & 0xFF] * Math_SinS(rot->y); f32 temp2 = D_80889E40[this->dyna.actor.params & 0xFF] * Math_CosS(rot->y); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index 28df18fa532..4e79c096662 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -73,9 +73,9 @@ void BgHidanKowarerukabe_InitDynaPoly(BgHidanKowarerukabe* this, PlayState* play &gFireTempleBombableWallCol, &gFireTempleLargeBombableWallCol, }; - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); if (collisionHeaders[this->dyna.actor.params & 0xFF] != NULL) { DynaPolyActor_Init(&this->dyna, 0); @@ -89,7 +89,7 @@ void BgHidanKowarerukabe_InitDynaPoly(BgHidanKowarerukabe* this, PlayState* play void BgHidanKowarerukabe_InitColliderSphere(BgHidanKowarerukabe* this, PlayState* play) { static s16 sphereRadii[] = { 80, 45, 80 }; static s16 sphereYPositions[] = { 0, 500, 500 }; - UNUSED s32 pad; + STACK_PAD(s32); Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->dyna.actor, &sJntSphInit, this->colliderItems); @@ -145,7 +145,7 @@ void BgHidanKowarerukabe_Destroy(Actor* thisx, PlayState* play) { } void BgHidanKowarerukabe_SpawnDust(BgHidanKowarerukabe* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f pos; pos = this->dyna.actor.world.pos; @@ -300,7 +300,7 @@ void BgHidanKowarerukabe_Break(BgHidanKowarerukabe* this, PlayState* play) { void BgHidanKowarerukabe_Update(Actor* thisx, PlayState* play) { BgHidanKowarerukabe* this = (BgHidanKowarerukabe*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (Actor_GetCollidedExplosive(play, &this->collider.base) != NULL) { BgHidanKowarerukabe_Break(this, play); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c index de034bea406..c002b5546dc 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c @@ -68,7 +68,7 @@ static InitChainEntry sInitChain[] = { void BgHidanRock_Init(Actor* thisx, PlayState* play) { BgHidanRock* this = (BgHidanRock*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(thisx, sInitChain); @@ -349,7 +349,7 @@ static void* sVerticalFlamesTexs[] = { }; void func_8088BC40(PlayState* play, BgHidanRock* this) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_bg_hidan_rock.c", 808); @@ -378,7 +378,7 @@ void func_8088BC40(PlayState* play, BgHidanRock* this) { void BgHidanRock_Draw(Actor* thisx, PlayState* play) { BgHidanRock* this = (BgHidanRock*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (this->type == 0) { Gfx_DrawDListOpa(play, gFireTempleStoneBlock1DL); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c index ff9814e7e60..4644a51cf9d 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c @@ -122,7 +122,7 @@ static void* sFireballsTexs[] = { void BgHidanRsekizou_Init(Actor* thisx, PlayState* play) { BgHidanRsekizou* this = (BgHidanRsekizou*)thisx; s32 i; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader; colHeader = NULL; @@ -150,7 +150,7 @@ void BgHidanRsekizou_Update(Actor* thisx, PlayState* play) { BgHidanRsekizou* this = (BgHidanRsekizou*)thisx; s32 i; ColliderJntSphElement* sphere; - UNUSED s32 pad; + STACK_PAD(s32); f32 yawSine; f32 yawCosine; @@ -225,7 +225,7 @@ Gfx* BgHidanRsekizou_DrawFireball(PlayState* play, BgHidanRsekizou* this, s16 fr void BgHidanRsekizou_Draw(Actor* thisx, PlayState* play) { BgHidanRsekizou* this = (BgHidanRsekizou*)thisx; s32 i; - UNUSED s32 pad; + STACK_PAD(s32); MtxF mf; OPEN_DISPS(play->state.gfxCtx, "../z_bg_hidan_rsekizou.c", 564); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c index b4cdea2b46c..8b41dfa13b0 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c @@ -145,7 +145,7 @@ void func_8088CEC0(BgHidanSekizou* this, s32 arg1, s16 arg2) { } void BgHidanSekizou_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgHidanSekizou* this = (BgHidanSekizou*)thisx; s32 i; CollisionHeader* colHeader = NULL; @@ -296,7 +296,7 @@ void BgHidanSekizou_Update(Actor* thisx, PlayState* play2) { Gfx* func_8088D9F4(PlayState* play, BgHidanSekizou* this, s16 arg2, MtxF* arg3, f32 arg4, f32 arg5, s16 arg6, Gfx* arg7) { - UNUSED s32 pad; + STACK_PAD(s32); f32 temp_f2; f32 phi_f12; @@ -328,7 +328,7 @@ Gfx* func_8088D9F4(PlayState* play, BgHidanSekizou* this, s16 arg2, MtxF* arg3, } Gfx* func_8088DC50(PlayState* play, BgHidanSekizou* this, s16 arg2, s16 arg3, Gfx* arg4) { - UNUSED s32 pad; + STACK_PAD(s32); s16 temp_v1; s32 phi_s1; s32 phi_s2; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c index d53045749f2..e53efda34a3 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c @@ -82,7 +82,7 @@ static void* sFireballsTexs[] = { void BgHidanSima_Init(Actor* thisx, PlayState* play) { BgHidanSima* this = (BgHidanSima*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; s32 i; @@ -207,7 +207,7 @@ void func_8088E90C(BgHidanSima* this) { void BgHidanSima_Update(Actor* thisx, PlayState* play) { BgHidanSima* this = (BgHidanSima*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); this->actionFunc(this, play); if (this->dyna.actor.params != 0) { @@ -231,7 +231,7 @@ Gfx* func_8088EB54(PlayState* play, BgHidanSima* this, Gfx* gfx) { s32 v0; f32 cos; f32 sin; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Matrix_MtxFCopy(&mtxF, &gMtxFClear); cos = Math_CosS(this->dyna.actor.world.rot.y + 0x8000); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c index c286decb2ed..73063ea97c6 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c @@ -35,7 +35,7 @@ static InitChainEntry sInitChain[] = { }; void BgHidanSyoku_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgHidanSyoku* this = (BgHidanSyoku*)thisx; CollisionHeader* colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c index e953f297cb2..65108b56598 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c @@ -40,7 +40,7 @@ static InitChainEntry sInitChain[] = { }; void BgIceObjects_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgIceObjects* this = (BgIceObjects*)thisx; CollisionHeader* colHeader = NULL; @@ -54,7 +54,7 @@ void BgIceObjects_Init(Actor* thisx, PlayState* play) { } void BgIceObjects_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgIceObjects* this = (BgIceObjects*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -223,14 +223,14 @@ void BgIceObjects_Stuck(BgIceObjects* this, PlayState* play) { } void BgIceObjects_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgIceObjects* this = (BgIceObjects*)thisx; this->actionFunc(this, play); } void BgIceObjects_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); UNUSED BgIceObjects* this = (BgIceObjects*)thisx; Gfx_DrawDListOpa(play, object_ice_objects_DL_000190); diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index 1ac396723ac..f3cc8fe1f9c 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -86,7 +86,7 @@ static ColliderCylinderInit sCylinderInit2 = { void BgIceShelter_InitColliders(BgIceShelter* this, PlayState* play) { static s16 cylinderRadii[] = { 47, 33, 44, 41, 100 }; static s16 cylinderHeights[] = { 80, 54, 90, 60, 200 }; - UNUSED s32 pad; + STACK_PAD(s32); s32 type = BGICESHELTER_GET_TYPE(&this->dyna.actor); // All types use at least one collider in order to detect blue fire @@ -113,9 +113,9 @@ void BgIceShelter_InitColliders(BgIceShelter* this, PlayState* play) { } void BgIceShelter_InitDynaPoly(BgIceShelter* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); DynaPolyActor_Init(&this->dyna, moveFlag); CollisionHeader_GetVirtual(collision, &colHeader); @@ -233,7 +233,7 @@ void BgIceShelter_SpawnSteamAround(BgIceShelter* this, PlayState* play, f32 part s16 angle; s16 frameCounter; s32 i; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Vec3f steamPos; Vec3f steamVel; Vec3f steamAccel; @@ -281,7 +281,7 @@ void BgIceShelter_SpawnSteamAlong(BgIceShelter* this, PlayState* play, f32 parti static f32 signs[] = { -1.0f, 1.0f }; Vec3f* icePos; s16 frameCounter; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Vec3f steamPos; Vec3f steamVel; Vec3f steamAccel; @@ -327,7 +327,7 @@ void BgIceShelter_SetupIdle(BgIceShelter* this) { * Checks for collision with blue fire. Also used to freeze King Zora's actor. */ void BgIceShelter_Idle(BgIceShelter* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16 type = BGICESHELTER_GET_TYPE(&this->dyna.actor); // Freeze King Zora @@ -393,7 +393,7 @@ static void (*sSteamSpawnFuncs[])(BgIceShelter* this, PlayState* play, f32 parti * Progressively reduces the height and opacity of the red ice, while spawning steam effects at its base. */ void BgIceShelter_Melt(BgIceShelter* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 type = BGICESHELTER_GET_TYPE(&this->dyna.actor); f32 particleSpawningChance; diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c index 3895dbea10d..87098b6b59c 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c @@ -46,7 +46,7 @@ void func_80891AC0(BgIceShutter* this) { void BgIceShutter_Init(Actor* thisx, PlayState* play) { BgIceShutter* this = (BgIceShutter*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader; s32 sp28; f32 temp_f6; diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c index bfa4513b045..dd413961aa1 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c @@ -61,7 +61,7 @@ static InitChainEntry sInitChain[] = { void BgIceTurara_Init(Actor* thisx, PlayState* play) { BgIceTurara* this = (BgIceTurara*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); 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 d82b6a9b22e..d4a9e33ba87 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -35,7 +35,7 @@ void BgInGate_SetupAction(BgInGate* this, BgInGateActionFunc actionFunc) { void BgInGate_Init(Actor* thisx, PlayState* play) { BgInGate* this = (BgInGate*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, 0); diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index 07b16011f89..7319ff9916e 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -67,9 +67,9 @@ static InitChainEntry sInitChain[] = { }; void BgJya1flift_InitDynapoly(BgJya1flift* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); DynaPolyActor_Init(&this->dyna, moveFlag); CollisionHeader_GetVirtual(collision, &colHeader); diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c index 11f70cbf39e..5e0e20042d1 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c @@ -43,9 +43,9 @@ static InitChainEntry sInitChain[] = { }; void BgJyaAmishutter_InitDynaPoly(BgJyaAmishutter* this, PlayState* play, CollisionHeader* collision, s32 flag) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); DynaPolyActor_Init(&this->dyna, flag); CollisionHeader_GetVirtual(collision, &colHeader); diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c index eff30bf7e0c..2eef8467517 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c @@ -34,7 +34,7 @@ static InitChainEntry sInitChain[] = { }; void BgJyaBlock_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgJyaBlock* this = (BgJyaBlock*)thisx; CollisionHeader* colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index 034c563d78e..3e5431bd416 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -62,7 +62,7 @@ static InitChainEntry sInitChain[] = { }; void BgJyaBombchuiwa_SetupCollider(BgJyaBombchuiwa* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->actor, &sJntSphInit, &this->colliderItems); diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index e5ef9199101..4e0c68d7bcb 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -63,9 +63,9 @@ static InitChainEntry sInitChain[] = { }; void BgJyaBombiwa_SetupDynaPoly(BgJyaBombiwa* this, PlayState* play, CollisionHeader* collision, s32 flag) { - UNUSED s16 pad1; + STACK_PAD(s16); CollisionHeader* colHeader = NULL; - UNUSED s16 pad2; + STACK_PAD(s16); DynaPolyActor_Init(&this->dyna, flag); CollisionHeader_GetVirtual(collision, &colHeader); @@ -79,7 +79,7 @@ void BgJyaBombiwa_SetupDynaPoly(BgJyaBombiwa* this, PlayState* play, CollisionHe } void BgJyaBombiwa_InitCollider(BgJyaBombiwa* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->dyna.actor, &sJntSphInit, this->colliderItems); diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index fcb425f7d61..71107fb04d0 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -116,9 +116,9 @@ void func_808958F0(Vec3f* dest, Vec3f* src, f32 arg2, f32 arg3) { } void BgJyaCobra_InitDynapoly(BgJyaCobra* this, PlayState* play, CollisionHeader* collision, s32 flags) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); DynaPolyActor_Init(&this->dyna, flags); CollisionHeader_GetVirtual(collision, &colHeader); @@ -142,7 +142,7 @@ void BgJyaCobra_SpawnRay(BgJyaCobra* this, PlayState* play) { } void func_80895A70(BgJyaCobra* this) { - UNUSED s32 pad; + STACK_PAD(s32); BgJyaBigmirror* mirror = (BgJyaBigmirror*)this->dyna.actor.parent; MirRay* mirRay; @@ -190,7 +190,7 @@ void func_80895A70(BgJyaCobra* this) { void func_80895BEC(BgJyaCobra* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sp2C; func_808958F0(&sp2C, &this->unk_174, Math_SinS(this->unk_170), Math_CosS(this->unk_170)); @@ -536,7 +536,7 @@ void func_80896CB4(PlayState* play) { } void func_80896D78(BgJyaCobra* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3s sp44; OPEN_DISPS(play->state.gfxCtx, "../z_bg_jya_cobra.c", 924); @@ -557,7 +557,7 @@ void func_80896D78(BgJyaCobra* this, PlayState* play) { } void BgJyaCobra_DrawShadow(BgJyaCobra* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16 params = this->dyna.actor.params & 3; Vec3f sp64; Vec3s* phi_a3; diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c index 6152b1583dc..00a1515a69e 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c @@ -80,7 +80,7 @@ void BgJyaGoroiwa_UpdateCollider(BgJyaGoroiwa* this) { } void BgJyaGoroiwa_InitCollider(BgJyaGoroiwa* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->actor, &sJntSphInit, &this->colliderItem); @@ -194,7 +194,7 @@ void BgJyaGoroiwa_Wait(BgJyaGoroiwa* this, PlayState* play) { } void BgJyaGoroiwa_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgJyaGoroiwa* this = (BgJyaGoroiwa*)thisx; Player* player = GET_PLAYER(play); s32 bgId; diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c index 17bfddabb96..d5d6102a62c 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c @@ -76,7 +76,7 @@ static Vec3f D_808987A0[] = { 0.0f, 14.0f, 0.0f }; static Vec3f D_808987AC[] = { 0.0f, 8.0f, 0.0f }; void BgJyaHaheniron_ColliderInit(BgJyaHaheniron* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->actor, &sJntSphInit, this->colliderItems); @@ -116,7 +116,7 @@ void BgJyaHaheniron_SpawnFragments(PlayState* play, Vec3f* vec1, Vec3f* vec2) { } void BgJyaHaheniron_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgJyaHaheniron* this = (BgJyaHaheniron*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -133,7 +133,7 @@ void BgJyaHaheniron_Init(Actor* thisx, PlayState* play) { } void BgJyaHaheniron_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgJyaHaheniron* this = (BgJyaHaheniron*)thisx; if (this->actor.params == 0) { @@ -196,7 +196,7 @@ void BgJyaHaheniron_RubbleCollide(BgJyaHaheniron* this, PlayState* play) { } void BgJyaHaheniron_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgJyaHaheniron* this = (BgJyaHaheniron*)thisx; this->timer++; @@ -209,7 +209,7 @@ void BgJyaHaheniron_Draw(Actor* thisx, PlayState* play) { gObjectJyaIronDL_000AE0, gObjectJyaIronDL_000600, }; - UNUSED s32 pad; + STACK_PAD(s32); BgJyaHaheniron* this = (BgJyaHaheniron*)thisx; if (this->actor.params == 0) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c index fc9299bbc77..e4f596d8a2a 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c @@ -104,7 +104,7 @@ void BgJyaIronobj_SpawnPillarParticles(BgJyaIronobj* this, PlayState* play, EnIk f32 coss; s16 rotY; f32 sins; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if (enIk->unk_2FF <= 0 || enIk->unk_2FF >= 4) { osSyncPrintf("Error 攻撃方法が分からない(%s %d)\n", "../z_bg_jya_ironobj.c", 233, enIk->unk_2FF); @@ -167,7 +167,7 @@ void BgJyaIronobj_SpawnThroneParticles(BgJyaIronobj* this, PlayState* play, EnIk f32 coss; s16 rotY; f32 sins; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if (enIk->unk_2FF <= 0 || enIk->unk_2FF >= 4) { osSyncPrintf("Error 攻撃方法が分からない(%s %d)\n", "../z_bg_jya_ironobj.c", 362, enIk->unk_2FF); @@ -215,7 +215,7 @@ void BgJyaIronobj_SpawnThroneParticles(BgJyaIronobj* this, PlayState* play, EnIk void BgJyaIronobj_Init(Actor* thisx, PlayState* play) { BgJyaIronobj* this = (BgJyaIronobj*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, 0); diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index 3b884e3bbe3..c54e3ae131c 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -41,9 +41,9 @@ static InitChainEntry sInitChain[] = { }; void BgJyaKanaami_InitDynaPoly(BgJyaKanaami* this, PlayState* play, CollisionHeader* collision, s32 flag) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); DynaPolyActor_Init(&this->dyna, flag); CollisionHeader_GetVirtual(collision, &colHeader); @@ -96,7 +96,7 @@ void func_8089993C(BgJyaKanaami* this) { } void func_80899950(BgJyaKanaami* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s32 quakeIndex; this->unk_168 += 0x20; diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index 9d84b8467b2..9202ba617c7 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -42,7 +42,7 @@ static InitChainEntry sInitChain[] = { }; void BgJyaLift_InitDynapoly(BgJyaLift* this, PlayState* play, CollisionHeader* collisionHeader, s32 moveFlag) { - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, moveFlag); diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index a6688ecb25b..75f08007df5 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -111,7 +111,7 @@ static InitChainEntry sInitChain[] = { }; void BgJyaMegami_InitDynaPoly(BgJyaMegami* this, PlayState* play, CollisionHeader* collision, s32 flag) { - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, flag); @@ -120,7 +120,7 @@ void BgJyaMegami_InitDynaPoly(BgJyaMegami* this, PlayState* play, CollisionHeade } void BgJyaMegami_InitCollider(BgJyaMegami* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->dyna.actor, &sJntSphInit, &this->colliderItem); @@ -232,7 +232,7 @@ void BgJyaMegami_Explode(BgJyaMegami* this, PlayState* play) { u32 i; Vec3f sp8C; BgJyaMegamiPieceInit* temp2; - UNUSED s32 pad; + STACK_PAD(s32); this->explosionTimer++; if (this->explosionTimer == 30) { @@ -321,7 +321,7 @@ static Gfx* sDLists[] = { }; void BgJyaMegami_DrawExplode(BgJyaMegami* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgJyaMegamiPiece* piece; u32 i; diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index c10a2f3c80e..d2a10eb2093 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -60,9 +60,9 @@ static InitChainEntry sInitChain[] = { }; void BgJyaZurerukabe_InitDynaPoly(BgJyaZurerukabe* this, PlayState* play, CollisionHeader* collision, s32 flag) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); DynaPolyActor_Init(&this->dyna, flag); CollisionHeader_GetVirtual(collision, &colHeader); diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c index df449909841..187c1403191 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c @@ -119,7 +119,7 @@ void BgMenkuriEye_Update(Actor* thisx, PlayState* play) { void BgMenkuriEye_Draw(Actor* thisx, PlayState* play) { BgMenkuriEye* this = (BgMenkuriEye*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_bg_menkuri_eye.c", 292); Gfx_SetupDL_25Xlu(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c index 18ada4ccbf0..b9b154b312f 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c @@ -32,7 +32,7 @@ static InitChainEntry sInitChain[] = { void BgMenkuriKaiten_Init(Actor* thisx, PlayState* play) { BgMenkuriKaiten* this = (BgMenkuriKaiten*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index 55f121b702c..ff6b81c7415 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -170,7 +170,7 @@ void BgMizuBwall_RotateVec3f(Vec3f* out, Vec3f* in, f32 sin, f32 cos) { } void BgMizuBwall_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMizuBwall* this = (BgMizuBwall*)thisx; CollisionHeader* colHeader = NULL; @@ -369,7 +369,7 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play) { } void BgMizuBwall_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMizuBwall* this = (BgMizuBwall*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -413,7 +413,7 @@ void BgMizuBwall_SetAlpha(BgMizuBwall* this, PlayState* play) { void BgMizuBwall_SpawnDebris(BgMizuBwall* this, PlayState* play) { s32 i; - UNUSED s32 pad; + STACK_PAD(s32); s16 rand1; s16 rand2; Vec3f* thisPos = &this->dyna.actor.world.pos; @@ -491,7 +491,7 @@ void BgMizuBwall_DoNothing(BgMizuBwall* this, PlayState* play) { } void BgMizuBwall_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMizuBwall* this = (BgMizuBwall*)thisx; this->actionFunc(this, play); diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c index d7309f167ca..c35facfd88e 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c @@ -45,11 +45,11 @@ static InitChainEntry sInitChain[] = { }; void BgMizuShutter_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); BgMizuShutter* this = (BgMizuShutter*)thisx; - UNUSED s32 pad2; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad3; + STACK_PAD(s32); Actor_ProcessInitChain(&this->dyna.actor, sInitChain); this->displayList = sDisplayLists[BGMIZUSHUTTER_SIZE_PARAM(&this->dyna.actor)]; @@ -85,7 +85,7 @@ void BgMizuShutter_Init(Actor* thisx, PlayState* play) { } void BgMizuShutter_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMizuShutter* this = (BgMizuShutter*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -148,14 +148,14 @@ void BgMizuShutter_WaitForTimer(BgMizuShutter* this, PlayState* play) { } void BgMizuShutter_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMizuShutter* this = (BgMizuShutter*)thisx; this->actionFunc(this, play); } void BgMizuShutter_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMizuShutter* this = (BgMizuShutter*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mizu_shutter.c", 410); diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c index b52d830d787..265ba9107cb 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c @@ -35,10 +35,10 @@ static InitChainEntry sInitChain[] = { }; void BgMizuUzu_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); BgMizuUzu* this = (BgMizuUzu*)thisx; CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, 0); diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index 77540a7ac6b..d00668d6eec 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -164,7 +164,7 @@ void BgMizuWater_Destroy(Actor* thisx, PlayState* play) { } void BgMizuWater_WaitForAction(BgMizuWater* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 waterLevelActionIndex; s16 prevSwitchFlag; @@ -213,7 +213,7 @@ void BgMizuWater_WaitForAction(BgMizuWater* this, PlayState* play) { } void BgMizuWater_ChangeWaterLevel(BgMizuWater* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16 prevSwitchFlag; s32 waterLevelActionIndex; WaterBox* waterBoxes; @@ -295,7 +295,7 @@ void BgMizuWater_Update(Actor* thisx, PlayState* play) { s32 posY; s32 unk0; s32 unk1; - UNUSED s32 pad; + STACK_PAD(s32); if (bREG(15) == 0) { osSyncPrintf("%x %x %x\n", Flags_GetSwitch(play, WATER_TEMPLE_WATER_F1_FLAG), diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index f8d09a9e0c3..4da93eb99a4 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -51,9 +51,9 @@ void BgMoriBigst_SetupAction(BgMoriBigst* this, BgMoriBigstActionFunc actionFunc } void BgMoriBigst_InitDynapoly(BgMoriBigst* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); DynaPolyActor_Init(&this->dyna, moveFlag); CollisionHeader_GetVirtual(collision, &colHeader); @@ -67,7 +67,7 @@ void BgMoriBigst_InitDynapoly(BgMoriBigst* this, PlayState* play, CollisionHeade } void BgMoriBigst_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriBigst* this = (BgMoriBigst*)thisx; // "mori (bigST.keyceiling)" @@ -95,7 +95,7 @@ void BgMoriBigst_Init(Actor* thisx, PlayState* play) { } void BgMoriBigst_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriBigst* this = (BgMoriBigst*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -144,7 +144,7 @@ void BgMoriBigst_SetupStalfosFight(BgMoriBigst* this, PlayState* play) { } void BgMoriBigst_StalfosFight(BgMoriBigst* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); if ((this->dyna.actor.home.rot.z == 0) && ((this->dyna.actor.home.pos.y - 5.0f) <= GET_PLAYER(play)->actor.world.pos.y)) { @@ -169,7 +169,7 @@ void BgMoriBigst_Fall(BgMoriBigst* this, PlayState* play) { } void BgMoriBigst_SetupLanding(BgMoriBigst* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 quakeIndex; BgMoriBigst_SetupAction(this, BgMoriBigst_Landing); @@ -226,7 +226,7 @@ void BgMoriBigst_SetupDone(BgMoriBigst* this, PlayState* play) { } void BgMoriBigst_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriBigst* this = (BgMoriBigst*)thisx; Actor_SetFocus(&this->dyna.actor, 50.0f); @@ -242,7 +242,7 @@ void BgMoriBigst_Update(Actor* thisx, PlayState* play) { } void BgMoriBigst_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriBigst* this = (BgMoriBigst*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mori_bigst.c", 541); diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c index a5e7a25f98e..fb06a3d44b1 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c @@ -83,7 +83,7 @@ void func_808A18FC(BgMoriElevator* this, f32 distTo) { void BgMoriElevator_Init(Actor* thisx, PlayState* play) { BgMoriElevator* this = (BgMoriElevator*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; this->unk_172 = sIsSpawned; @@ -191,7 +191,7 @@ void BgMoriElevator_SetupSetPosition(BgMoriElevator* this) { } void BgMoriElevator_SetPosition(BgMoriElevator* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); if (BgMoriElevator_IsPlayerRiding(this, play)) { if (play->roomCtx.curRoom.num == 2) { @@ -249,7 +249,7 @@ void BgMoriElevator_Update(Actor* thisx, PlayState* play) { } void BgMoriElevator_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriElevator* this = (BgMoriElevator*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mori_elevator.c", 575); diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index 1e691072324..0b36fac0975 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -77,9 +77,9 @@ static InitChainEntry sInitChainLadder[] = { }; void BgMoriHashigo_InitDynapoly(BgMoriHashigo* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader; - UNUSED s32 pad2; + STACK_PAD(s32); colHeader = NULL; DynaPolyActor_Init(&this->dyna, moveFlag); @@ -94,7 +94,7 @@ void BgMoriHashigo_InitDynapoly(BgMoriHashigo* this, PlayState* play, CollisionH } void BgMoriHashigo_InitCollider(BgMoriHashigo* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->dyna.actor, &sJntSphInit, this->colliderItems); @@ -150,7 +150,7 @@ s32 BgMoriHashigo_InitLadder(BgMoriHashigo* this, PlayState* play) { } void BgMoriHashigo_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriHashigo* this = (BgMoriHashigo*)thisx; if (this->dyna.actor.params == HASHIGO_CLASP) { @@ -178,7 +178,7 @@ void BgMoriHashigo_Init(Actor* thisx, PlayState* play) { } void BgMoriHashigo_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriHashigo* this = (BgMoriHashigo*)thisx; if (this->dyna.actor.params == HASHIGO_LADDER) { @@ -267,7 +267,7 @@ void BgMoriHashigo_SetupLadderRest(BgMoriHashigo* this) { } void BgMoriHashigo_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriHashigo* this = (BgMoriHashigo*)thisx; if (this->hitTimer > 0) { @@ -279,7 +279,7 @@ void BgMoriHashigo_Update(Actor* thisx, PlayState* play) { } void BgMoriHashigo_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriHashigo* this = (BgMoriHashigo*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mori_hashigo.c", 516); diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c index 7957260b07c..b246ae66a87 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c @@ -49,9 +49,9 @@ void BgMoriHashira4_SetupAction(BgMoriHashira4* this, BgMoriHashira4ActionFunc a } void BgMoriHashira4_InitDynaPoly(BgMoriHashira4* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader; - UNUSED s32 pad2; + STACK_PAD(s32); colHeader = NULL; DynaPolyActor_Init(&this->dyna, moveFlag); @@ -66,7 +66,7 @@ void BgMoriHashira4_InitDynaPoly(BgMoriHashira4* this, PlayState* play, Collisio } void BgMoriHashira4_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriHashira4* this = (BgMoriHashira4*)thisx; this->switchFlag = (this->dyna.actor.params >> 8) & 0x3F; @@ -98,7 +98,7 @@ void BgMoriHashira4_Init(Actor* thisx, PlayState* play) { } void BgMoriHashira4_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriHashira4* this = (BgMoriHashira4*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -148,7 +148,7 @@ void BgMoriHashira4_GateOpen(BgMoriHashira4* this, PlayState* play) { } void BgMoriHashira4_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriHashira4* this = (BgMoriHashira4*)thisx; if (this->actionFunc != NULL) { @@ -157,7 +157,7 @@ void BgMoriHashira4_Update(Actor* thisx, PlayState* play) { } void BgMoriHashira4_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriHashira4* this = (BgMoriHashira4*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mori_hashira4.c", 339); diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c index f7f20f725cb..9a4ef190573 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c +++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c @@ -223,7 +223,7 @@ void BgMoriHineri_Update(Actor* thisx, PlayState* play) { void BgMoriHineri_DrawHallAndRoom(Actor* thisx, PlayState* play) { BgMoriHineri* this = (BgMoriHineri*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); MtxF mtx; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mori_hineri.c", 611); diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c index ae6ee864c5f..137f74cf9d4 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c @@ -46,7 +46,7 @@ void BgMoriIdomizu_SetWaterLevel(PlayState* play, s16 waterLevel) { } void BgMoriIdomizu_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriIdomizu* this = (BgMoriIdomizu*)thisx; if (sIsSpawned) { @@ -83,7 +83,7 @@ void BgMoriIdomizu_Init(Actor* thisx, PlayState* play) { } void BgMoriIdomizu_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriIdomizu* this = (BgMoriIdomizu*)thisx; if (this->isLoaded) { @@ -149,7 +149,7 @@ void BgMoriIdomizu_Main(BgMoriIdomizu* this, PlayState* play) { } void BgMoriIdomizu_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriIdomizu* this = (BgMoriIdomizu*)thisx; if (this->actionFunc != NULL) { @@ -158,7 +158,7 @@ void BgMoriIdomizu_Update(Actor* thisx, PlayState* play) { } void BgMoriIdomizu_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriIdomizu* this = (BgMoriIdomizu*)thisx; u32 gameplayFrames = play->gameplayFrames; diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c index 22e2832eb0e..917cf62e3cd 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c @@ -46,7 +46,7 @@ void BgMoriKaitenkabe_CrossProduct(Vec3f* dest, Vec3f* v1, Vec3f* v2) { } void BgMoriKaitenkabe_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriKaitenkabe* this = (BgMoriKaitenkabe*)thisx; CollisionHeader* colHeader = NULL; @@ -67,7 +67,7 @@ void BgMoriKaitenkabe_Init(Actor* thisx, PlayState* play) { } void BgMoriKaitenkabe_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriKaitenkabe* this = (BgMoriKaitenkabe*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -150,14 +150,14 @@ void BgMoriKaitenkabe_Rotate(BgMoriKaitenkabe* this, PlayState* play) { } void BgMoriKaitenkabe_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriKaitenkabe* this = (BgMoriKaitenkabe*)thisx; this->actionFunc(this, play); } void BgMoriKaitenkabe_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriKaitenkabe* this = (BgMoriKaitenkabe*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mori_kaitenkabe.c", 347); diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index 85fb3ef87d0..6ad47c05051 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -47,7 +47,7 @@ static InitChainEntry sInitChain[] = { }; void BgMoriRakkatenjo_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriRakkatenjo* this = (BgMoriRakkatenjo*)thisx; CollisionHeader* colHeader = NULL; @@ -79,7 +79,7 @@ void BgMoriRakkatenjo_Init(Actor* thisx, PlayState* play) { } void BgMoriRakkatenjo_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriRakkatenjo* this = (BgMoriRakkatenjo*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -145,7 +145,7 @@ void BgMoriRakkatenjo_SetupFall(BgMoriRakkatenjo* this) { void BgMoriRakkatenjo_Fall(BgMoriRakkatenjo* this, PlayState* play) { static f32 bounceVel[] = { 4.0f, 1.5f, 0.4f, 0.1f }; - UNUSED s32 pad; + STACK_PAD(s32); Actor* thisx = &this->dyna.actor; s32 quakeIndex; @@ -198,7 +198,7 @@ void BgMoriRakkatenjo_Rise(BgMoriRakkatenjo* this, PlayState* play) { } void BgMoriRakkatenjo_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriRakkatenjo* this = (BgMoriRakkatenjo*)thisx; if (this->timer > 0) { @@ -220,7 +220,7 @@ void BgMoriRakkatenjo_Update(Actor* thisx, PlayState* play) { } void BgMoriRakkatenjo_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgMoriRakkatenjo* this = (BgMoriRakkatenjo*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_bg_mori_rakkatenjo.c", 497); diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index c988dff4174..1ce9f643955 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -192,7 +192,7 @@ static InitChainEntry sInitChain[] = { }; void BgPoEvent_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgPoEvent* this = (BgPoEvent*)thisx; Actor_ProcessInitChain(thisx, sInitChain); @@ -219,7 +219,7 @@ void BgPoEvent_Init(Actor* thisx, PlayState* play) { } void BgPoEvent_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgPoEvent* this = (BgPoEvent*)thisx; if (this->type >= 2) { @@ -578,7 +578,7 @@ void BgPoEvent_PaintingBurn(BgPoEvent* this, PlayState* play) { } void BgPoEvent_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgPoEvent* this = (BgPoEvent*)thisx; this->actionFunc(this, play); @@ -592,13 +592,13 @@ void BgPoEvent_Draw(Actor* thisx, PlayState* play) { gPoSistersAmyBlockDL, gPoSistersAmyBethBlockDL, gPoSistersJoellePaintingDL, gPoSistersBethPaintingDL, gPoSistersAmyPaintingDL, }; - UNUSED s32 pad1; + STACK_PAD(s32); BgPoEvent* this = (BgPoEvent*)thisx; u8 alpha; Vec3f sp58; Vec3f sp4C; f32 sp48; - UNUSED s32 pad2; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_bg_po_event.c", 1481); Gfx_SetupDL_25Opa(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c index 469969f7fdb..d20c320a938 100644 --- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c +++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c @@ -76,7 +76,7 @@ static InitChainEntry sInitChain[] = { void BgPoSyokudai_Init(Actor* thisx, PlayState* play) { BgPoSyokudai* this = (BgPoSyokudai*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Actor_ProcessInitChain(thisx, sInitChain); @@ -130,7 +130,7 @@ void BgPoSyokudai_Destroy(Actor* thisx, PlayState* play) { void BgPoSyokudai_Update(Actor* thisx, PlayState* play) { BgPoSyokudai* this = (BgPoSyokudai*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); diff --git a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c index 604a6159e99..2a5ad8a79fd 100644 --- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c +++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c @@ -38,10 +38,10 @@ void BgPushbox_SetupAction(BgPushbox* this, BgPushboxActionFunc actionFunc) { } void BgPushbox_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); BgPushbox* this = (BgPushbox*)thisx; CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); Actor_ProcessInitChain(&this->dyna.actor, sInitChain); DynaPolyActor_Init(&this->dyna, 0); @@ -78,7 +78,7 @@ void BgPushbox_Update(Actor* thisx, PlayState* play) { } void BgPushbox_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_bg_pushbox.c", 263); diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c index a03dd19b3b6..a3631d736b1 100644 --- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c +++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c @@ -46,7 +46,7 @@ static InitChainEntry sInitChain[] = { void BgRelayObjects_Init(Actor* thisx, PlayState* play) { static u32 D_808A9508 = 0; BgRelayObjects* this = (BgRelayObjects*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(thisx, sInitChain); diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c index be1217dffdd..c59904f7519 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c @@ -35,7 +35,7 @@ static InitChainEntry sInitChain[] = { void BgSpot00Break_Init(Actor* thisx, PlayState* play) { BgSpot00Break* this = (BgSpot00Break*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c index a8dc5a5a7c0..05b7091bb9e 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c @@ -48,7 +48,7 @@ static InitChainEntry sInitChain[] = { void BgSpot00Hanebasi_Init(Actor* thisx, PlayState* play) { BgSpot00Hanebasi* this = (BgSpot00Hanebasi*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f chainPos; CollisionHeader* colHeader = NULL; @@ -202,7 +202,7 @@ void BgSpot00Hanebasi_SetTorchLightInfo(BgSpot00Hanebasi* this, PlayState* play) void BgSpot00Hanebasi_Update(Actor* thisx, PlayState* play) { BgSpot00Hanebasi* this = (BgSpot00Hanebasi*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); this->actionFunc(this, play); diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index df144ec77a8..49007d4bb87 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -106,7 +106,7 @@ void func_808AAD3C(PlayState* play, Vec3f* vec, u32 arg2) { } void func_808AAE6C(BgSpot01Idohashira* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sp30 = this->dyna.actor.world.pos; sp30.y += kREG(15); @@ -116,7 +116,7 @@ void func_808AAE6C(BgSpot01Idohashira* this, PlayState* play) { } void func_808AAF34(BgSpot01Idohashira* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Vec3f dest; Vec3f src; @@ -152,7 +152,7 @@ s32 BgSpot01Idohashira_NotInCsMode(PlayState* play) { } CsCmdActorAction* BgSpot01Idohashira_GetNpcAction(PlayState* play, s32 actionIdx) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); CsCmdActorAction* npcAction = NULL; if (!BgSpot01Idohashira_NotInCsMode(play)) { @@ -189,11 +189,11 @@ s32 func_808AB29C(BgSpot01Idohashira* this, PlayState* play) { Vec3f* thisPos; f32 endX; f32 temp_f0; - UNUSED s32 pad1; + STACK_PAD(s32); Vec3f initPos; f32 endZ; f32 tempY; - UNUSED s32 pad2; + STACK_PAD(s32); npcAction = BgSpot01Idohashira_GetNpcAction(play, 2); if (npcAction != NULL) { @@ -290,7 +290,7 @@ void BgSpot01Idohashira_Update(Actor* thisx, PlayState* play) { } void BgSpot01Idohashira_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); BgSpot01Idohashira* this = (BgSpot01Idohashira*)thisx; CollisionHeader* colHeader; diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c index e1ad50fcb69..12347f570bc 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c @@ -37,10 +37,10 @@ void BgSpot01Idosoko_SetupAction(BgSpot01Idosoko* this, BgSpot01IdosokoActionFun } void BgSpot01Idosoko_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); BgSpot01Idosoko* this = (BgSpot01Idosoko*)thisx; CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS); Actor_ProcessInitChain(&this->dyna.actor, sInitChain); diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c index 1acdb793156..f2709f73a89 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c @@ -88,7 +88,7 @@ s32 func_808AC22C(Path* pathList, Vec3f* pos, s32 path, s32 waypoint) { void func_808AC2BC(BgSpot01Objects2* this, PlayState* play) { CollisionHeader* colHeader = NULL; Actor* thisx = &this->dyna.actor; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f position; if (Object_IsLoaded(&play->objectCtx, this->objBankIndex)) { diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index 9d65b57a515..0f66ad29b78 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c @@ -48,7 +48,7 @@ static InitChainEntry sInitChain[] = { }; void BgSpot02Objects_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgSpot02Objects* this = (BgSpot02Objects*)thisx; CollisionHeader* colHeader = NULL; @@ -215,7 +215,7 @@ void func_808ACC34(BgSpot02Objects* this, PlayState* play) { void func_808ACCB8(Actor* thisx, PlayState* play) { BgSpot02Objects* this = (BgSpot02Objects*)thisx; f32 rate; - UNUSED s32 pad; + STACK_PAD(s32); u8 redPrim; u8 greenPrim; u8 bluePrim; @@ -280,7 +280,7 @@ void func_808AD3D4(BgSpot02Objects* this, PlayState* play) { void func_808AD450(Actor* thisx, PlayState* play) { BgSpot02Objects* this = (BgSpot02Objects*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); f32 lerp; OPEN_DISPS(play->state.gfxCtx, "../z_bg_spot02_objects.c", 736); diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c index f3b22e5cb16..687c5d6da99 100644 --- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c @@ -44,7 +44,7 @@ void BgSpot03Taki_ApplyOpeningAlpha(BgSpot03Taki* this, s32 bufferIndex) { void BgSpot03Taki_Init(Actor* thisx, PlayState* play) { BgSpot03Taki* this = (BgSpot03Taki*)thisx; - UNUSED s16 pad; + STACK_PAD(s16); CollisionHeader* colHeader = NULL; this->switchFlag = (this->dyna.actor.params & 0x3F); @@ -115,7 +115,7 @@ void BgSpot03Taki_Update(Actor* thisx, PlayState* play) { void BgSpot03Taki_Draw(Actor* thisx, PlayState* play) { BgSpot03Taki* this = (BgSpot03Taki*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); u32 gameplayFrames; OPEN_DISPS(play->state.gfxCtx, "../z_bg_spot03_taki.c", 321); diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c index 213646a8f7a..e5b9fb7c761 100644 --- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c +++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c @@ -39,10 +39,10 @@ static Gfx* sDLists[] = { }; void BgSpot05Soko_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); BgSpot05Soko* this = (BgSpot05Soko*)thisx; CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); Actor_ProcessInitChain(thisx, sInitChain); this->switchFlag = (thisx->params >> 8) & 0xFF; diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index 14aabceb8f8..34835258b01 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -93,7 +93,7 @@ static InitChainEntry sInitChainWaterPlane[] = { void BgSpot06Objects_Init(Actor* thisx, PlayState* play) { BgSpot06Objects* this = (BgSpot06Objects*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; this->switchFlag = thisx->params & 0xFF; @@ -281,9 +281,9 @@ void BgSpot06Objects_LockSpawnBubbles(BgSpot06Objects* this, PlayState* play, s3 * This is where the fish shaped lock waits to be pulled out by the hookshot. Once it does it will spawn bubbles. */ void BgSpot06Objects_LockWait(BgSpot06Objects* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); s32 i; - UNUSED s32 pad2; + STACK_PAD(s32); Vec3f effectPos; f32 sin; f32 cos; @@ -346,7 +346,7 @@ void BgSpot06Objects_LockPullOutward(BgSpot06Objects* this, PlayState* play) { */ void BgSpot06Objects_LockSwimToSurface(BgSpot06Objects* this, PlayState* play) { f32 cos; - UNUSED s32 pad; + STACK_PAD(s32); this->dyna.actor.world.pos.y += this->dyna.actor.velocity.y; @@ -424,7 +424,7 @@ void BgSpot06Objects_Update(Actor* thisx, PlayState* play) { * Draw the Lake Hylia water plane, and scroll its texture */ void BgSpot06Objects_DrawLakeHyliaWater(BgSpot06Objects* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 gameplayFrames; OPEN_DISPS(play->state.gfxCtx, "../z_bg_spot06_objects.c", 844); @@ -491,7 +491,7 @@ void BgSpot06Objects_WaterPlaneCutsceneWait(BgSpot06Objects* this, PlayState* pl * This is where the Lake Hylia water plane rises in the cutscene after the Water Temple is cleared. */ void BgSpot06Objects_WaterPlaneCutsceneRise(BgSpot06Objects* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); this->dyna.actor.world.pos.y = this->lakeHyliaWaterLevel + WATER_LEVEL_RAISED; diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c index 7294cb1ff2a..103c902c570 100644 --- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c @@ -34,7 +34,7 @@ static InitChainEntry sInitChain[] = { void BgSpot07Taki_Init(Actor* thisx, PlayState* play) { BgSpot07Taki* this = (BgSpot07Taki*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, DYNA_TRANSFORM_POS); diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index e66336f63f0..64436850c9a 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -94,14 +94,14 @@ static InitChainEntry sInitChain[] = { }; void func_808B02D0(BgSpot08Bakudankabe* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->dyna.actor, &sJntSphInit, this->colliderItems); } void func_808B0324(BgSpot08Bakudankabe* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s32 i; Vec3f burstDepthY; Vec3f burstDepthX; @@ -158,7 +158,7 @@ void func_808B0324(BgSpot08Bakudankabe* this, PlayState* play) { void BgSpot08Bakudankabe_Init(Actor* thisx, PlayState* play) { BgSpot08Bakudankabe* this = (BgSpot08Bakudankabe*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, 0); diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c index 6e71482a5c6..7e7e152dd39 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c @@ -39,9 +39,9 @@ void BgSpot08Iceblock_SetupAction(BgSpot08Iceblock* this, BgSpot08IceblockAction } void BgSpot08Iceblock_InitDynaPoly(BgSpot08Iceblock* this, PlayState* play, CollisionHeader* collision, s32 flags) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); DynaPolyActor_Init(&this->dyna, flags); CollisionHeader_GetVirtual(collision, &colHeader); @@ -170,7 +170,7 @@ void BgSpot08Iceblock_Roll(BgSpot08Iceblock* this, PlayState* play) { f32 playerCentroidDist; s32 rollDataIndex; MtxF mtx; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); switch (this->dyna.actor.params & 0xFF) { @@ -251,7 +251,7 @@ void BgSpot08Iceblock_Roll(BgSpot08Iceblock* this, PlayState* play) { } void BgSpot08Iceblock_SpawnTwinFloe(BgSpot08Iceblock* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); f32 sin; f32 cos; diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index 3ea6d471488..42721d31af5 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -93,9 +93,9 @@ s32 func_808B1BA0(BgSpot09Obj* this, PlayState* play) { } s32 func_808B1BEC(BgSpot09Obj* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad2[2]; + STACK_PADS(s32, 2); if (D_808B1F90[this->dyna.actor.params] != NULL) { DynaPolyActor_Init(&this->dyna, 0); diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index 52254aa27dc..5dce04d7043 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -52,7 +52,7 @@ static Vec3f D_808B272C = { 2259.0f, 108.0f, -1550.0f }; static Vec3f D_808B2738 = { 2259.0f, 108.0f, -1550.0f }; void func_808B2180(BgSpot11Bakudankabe* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Collider_InitCylinder(play, &this->collider); Collider_SetCylinder(play, &this->collider, &this->dyna.actor, &sCylinderInit); @@ -109,7 +109,7 @@ void func_808B2218(BgSpot11Bakudankabe* this, PlayState* play) { void BgSpot11Bakudankabe_Init(Actor* thisx, PlayState* play) { BgSpot11Bakudankabe* this = (BgSpot11Bakudankabe*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, 0); diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c index ee23d04a07f..f928bce6187 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c @@ -123,7 +123,7 @@ void func_808B2AB8(BgSpot11Oasis* this, PlayState* play) { void BgSpot11Oasis_Update(Actor* thisx, PlayState* play) { BgSpot11Oasis* this = (BgSpot11Oasis*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); u32 gameplayFrames; Vec3f sp30; diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index 34ebac032b0..365beba737e 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -44,9 +44,9 @@ static InitChainEntry sInitChain[] = { }; void BgSpot12Gate_InitDynaPoly(BgSpot12Gate* this, PlayState* play, CollisionHeader* collision, s32 flags) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); DynaPolyActor_Init(&this->dyna, flags); CollisionHeader_GetVirtual(collision, &colHeader); @@ -104,7 +104,7 @@ void func_808B317C(BgSpot12Gate* this) { } void func_808B318C(BgSpot12Gate* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 quakeIndex; Math_StepToF(&this->dyna.actor.velocity.y, 1.6f, 0.03f); diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index 0bd5a7e9b04..c73bb14e692 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -41,9 +41,9 @@ static InitChainEntry sInitChain[] = { }; void func_808B3420(BgSpot12Saku* this, PlayState* play, CollisionHeader* collision, s32 flags) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); DynaPolyActor_Init(&this->dyna, flags); CollisionHeader_GetVirtual(collision, &colHeader); diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index 3f7aefa95fc..1a387210adc 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -56,9 +56,9 @@ static Vec3f sBoxGroundCheckPoints[] = { }; void func_808B3960(BgSpot15Rrbox* this, PlayState* play, CollisionHeader* collision, s32 flags) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); DynaPolyActor_Init(&this->dyna, flags); CollisionHeader_GetVirtual(collision, &colHeader); diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c index 3f170643f54..a5241b86d35 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c @@ -31,9 +31,9 @@ ActorInit Bg_Spot15_Saku_InitVars = { }; void BgSpot15Saku_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); BgSpot15Saku* this = (BgSpot15Saku*)thisx; - UNUSED s32 pad2; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, 0); diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index 79d7943d79f..9bff5539d7c 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -149,7 +149,7 @@ void func_808B4C30(BgSpot16Bombstone* this) { } void func_808B4C4C(BgSpot16Bombstone* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Collider_InitJntSph(play, &this->colliderJntSph); Collider_SetJntSph(play, &this->colliderJntSph, &this->actor, &sJntSphInit, this->colliderElements); @@ -160,7 +160,7 @@ void func_808B4C4C(BgSpot16Bombstone* this, PlayState* play) { } void func_808B4D04(BgSpot16Bombstone* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Collider_InitCylinder(play, &this->colliderCylinder); Collider_SetCylinder(play, &this->colliderCylinder, &this->actor, &sCylinderInit); @@ -428,7 +428,7 @@ void func_808B5934(BgSpot16Bombstone* this) { } void func_808B5950(BgSpot16Bombstone* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); func_808B56BC(this, play); func_808B57E0(this, play); @@ -532,7 +532,7 @@ void BgSpot16Bombstone_Update(Actor* thisx, PlayState* play) { void BgSpot16Bombstone_Draw(Actor* thisx, PlayState* play) { BgSpot16Bombstone* this = (BgSpot16Bombstone*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_bg_spot16_bombstone.c", 1253); diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c index 2ca90f478ee..f0da11ffd87 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c @@ -119,7 +119,7 @@ void BgSpot16Doughnut_UpdateExpanding(Actor* thisx, PlayState* play) { void BgSpot16Doughnut_Draw(Actor* thisx, PlayState* play) { BgSpot16Doughnut* this = (BgSpot16Doughnut*)thisx; u32 scroll = play->gameplayFrames & 0xFFFF; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_bg_spot16_doughnut.c", 210); diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c index c1ff2fb31a5..af553c021b0 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c @@ -36,7 +36,7 @@ static InitChainEntry sInitChain[] = { }; void func_808B6BC0(BgSpot17Bakudankabe* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s32 i; Vec3f burstDepthY; Vec3f burstDepthX; @@ -92,7 +92,7 @@ void func_808B6BC0(BgSpot17Bakudankabe* this, PlayState* play) { void BgSpot17Bakudankabe_Init(Actor* thisx, PlayState* play) { BgSpot17Bakudankabe* this = (BgSpot17Bakudankabe*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, 0); @@ -123,7 +123,7 @@ void BgSpot17Bakudankabe_Update(Actor* thisx, PlayState* play) { } void BgSpot17Bakudankabe_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s8 r = coss(play->gameplayFrames * 1500) >> 8; s8 g = coss(play->gameplayFrames * 1500) >> 8; diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c index b3b2dcda908..12051bcd28a 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c +++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c @@ -52,7 +52,7 @@ void func_808B746C(Actor* thisx, PlayState* play) { } void func_808B7478(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_bg_spot17_funen.c", 153); diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index a7296ccfc02..a3020c864da 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -129,7 +129,7 @@ static InitChainEntry sInitChain[] = { }; void BgSpot18Basket_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgSpot18Basket* this = (BgSpot18Basket*)thisx; CollisionHeader* colHeader = NULL; @@ -306,7 +306,7 @@ void func_808B7F74(BgSpot18Basket* this) { } void func_808B7FC0(BgSpot18Basket* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 tempUnk214; f32 tempUnk210; s16 arrayValue; @@ -425,7 +425,7 @@ void func_808B81A0(BgSpot18Basket* this, PlayState* play) { } void BgSpot18Basket_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgSpot18Basket* this = (BgSpot18Basket*)thisx; s32 bgId; diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c index 3e86647ac9f..0f841d50ee7 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c @@ -35,7 +35,7 @@ static InitChainEntry sInitChain[] = { void BgSpot18Futa_Init(Actor* thisx, PlayState* play) { BgSpot18Futa* this = (BgSpot18Futa*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, 0); diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index 547e4f02437..561799891f2 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -125,7 +125,7 @@ s32 func_808B8A5C(BgSpot18Obj* this, PlayState* play) { } s32 func_808B8A98(BgSpot18Obj* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, 0); @@ -243,7 +243,7 @@ void func_808B8EE0(BgSpot18Obj* this) { } void func_808B8F08(BgSpot18Obj* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); Math_StepToF(&this->dyna.actor.speedXZ, 1.2f, 0.1f); diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c index aec20fae1ed..a462e9e4749 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c @@ -37,7 +37,7 @@ static InitChainEntry sInitChain[] = { }; void BgSpot18Shutter_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgSpot18Shutter* this = (BgSpot18Shutter*)thisx; s32 param = (this->dyna.actor.params >> 8) & 1; CollisionHeader* colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c index e05f9888f0d..91eec265570 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c @@ -33,7 +33,7 @@ static InitChainEntry sInitChain[] = { }; void BgSstFloor_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgSstFloor* this = (BgSstFloor*)thisx; CollisionHeader* colHeader = NULL; @@ -44,14 +44,14 @@ void BgSstFloor_Init(Actor* thisx, PlayState* play) { } void BgSstFloor_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgSstFloor* this = (BgSstFloor*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); } void BgSstFloor_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgSstFloor* this = (BgSstFloor*)thisx; Player* player = GET_PLAYER(play); CollisionHeader* colHeader = SEGMENTED_TO_VIRTUAL(&gBongoDrumCol); diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c index 7cad766bb35..18cb29b7db4 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c +++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c @@ -82,7 +82,7 @@ void BgTokiHikari_Draw(Actor* thisx, PlayState* play) { } void func_808BA018(BgTokiHikari* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_bg_toki_hikari.c", 246); Gfx_SetupDL_25Opa(play->state.gfxCtx); @@ -131,7 +131,7 @@ void func_808BA274(BgTokiHikari* this, PlayState* play) { } void func_808BA2CC(BgTokiHikari* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); OPEN_DISPS(play->state.gfxCtx, "../z_bg_toki_hikari.c", 350); Matrix_Translate(0.0f, 276.0f, 1122.0f, MTXMODE_NEW); diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index 119bfb80611..0bc5ef9b83a 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -65,7 +65,7 @@ void BgTokiSwd_SetupAction(BgTokiSwd* this, BgTokiSwdActionFunc actionFunc) { } void BgTokiSwd_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgTokiSwd* this = (BgTokiSwd*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -161,7 +161,7 @@ void BgTokiSwd_Update(Actor* thisx, PlayState* play) { void BgTokiSwd_Draw(Actor* thisx, PlayState* play2) { PlayState* play = play2; BgTokiSwd* this = (BgTokiSwd*)thisx; - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); OPEN_DISPS(play->state.gfxCtx, "../z_bg_toki_swd.c", 727); diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index 87a7e0dc493..a42e1c1a185 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -59,7 +59,7 @@ void BgTreemouth_SetupAction(BgTreemouth* this, BgTreemouthActionFunc actionFunc } void BgTreemouth_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgTreemouth* this = (BgTreemouth*)thisx; CollisionHeader* colHeader = NULL; @@ -225,7 +225,7 @@ void BgTreemouth_Update(Actor* thisx, PlayState* play) { } void BgTreemouth_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); u16 alpha = 500; OPEN_DISPS(play->state.gfxCtx, "../z_bg_treemouth.c", 893); 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 cd6ca90e6ac..fa94d1b5d43 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -31,7 +31,7 @@ static InitChainEntry sInitChain[] = { }; void BgUmaJump_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgUmaJump* this = (BgUmaJump*)thisx; CollisionHeader* colHeader = NULL; diff --git a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c index 54b36212609..529ea4e9955 100644 --- a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c +++ b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c @@ -32,7 +32,7 @@ static InitChainEntry sInitChain[] = { }; void BgVbSima_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgVbSima* this = (BgVbSima*)thisx; CollisionHeader* colHeader = NULL; @@ -43,7 +43,7 @@ void BgVbSima_Init(Actor* thisx, PlayState* play) { } void BgVbSima_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgVbSima* this = (BgVbSima*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -69,7 +69,7 @@ void BgVbSima_SpawnEmber(BossFdEffect* effect, Vec3f* position, Vec3f* velocity, void BgVbSima_Update(Actor* thisx, PlayState* play) { static Color_RGBA8 colorYellow = { 255, 255, 0, 255 }; static Color_RGBA8 colorRed = { 255, 10, 0, 255 }; - UNUSED s32 pad; + STACK_PAD(s32); BgVbSima* this = (BgVbSima*)thisx; BossFd* bossFd = (BossFd*)this->dyna.actor.parent; f32 minus1 = -1.0f; diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c index 7003b392a39..e3cb4ed20b2 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c @@ -38,7 +38,7 @@ static InitChainEntry sInitChain[] = { }; void BgYdanHasi_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgYdanHasi* this = (BgYdanHasi*)thisx; CollisionHeader* colHeader = NULL; WaterBox* waterBox; diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c index 3a462eb3e09..b7482235e88 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c @@ -75,7 +75,7 @@ static InitChainEntry sInitChain[] = { }; void BgYdanMaruta_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BgYdanMaruta* this = (BgYdanMaruta*)thisx; Vec3f sp4C[3]; s32 i; diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c index da53e52dd52..7306145b543 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -97,7 +97,7 @@ void BgZg_Update(Actor* thisx, PlayState* play) { } void BgZg_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); BgZg* this = (BgZg*)thisx; CollisionHeader* colHeader; diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 3a009159128..22dc3577fcc 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -521,7 +521,7 @@ void BossDodongo_Damaged(BossDodongo* this, PlayState* play) { void BossDodongo_Explode(BossDodongo* this, PlayState* play) { static Color_RGBA8 dustPrimColor = { 255, 255, 0, 255 }; static Color_RGBA8 dustEnvColor = { 255, 10, 0, 255 }; - UNUSED s16 pad; + STACK_PAD(s16); Vec3f dustVel; Vec3f dustAcell; Vec3f dustPos; @@ -598,7 +598,7 @@ void BossDodongo_GetUp(BossDodongo* this, PlayState* play) { } void BossDodongo_BlowFire(BossDodongo* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); UNUSED Vec3f zeroVec1 = { 0.0f, 0.0f, 0.0f }; UNUSED Vec3f zeroVec2 = { 0.0f, 0.0f, 0.0f }; @@ -819,7 +819,7 @@ void BossDodongo_Update(Actor* thisx, PlayState* play2) { s16 i; Player* player = GET_PLAYER(play); Player* player2 = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); this->unk_1E2 = 0; this->unk_19E++; @@ -1120,7 +1120,7 @@ void BossDodongo_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s void BossDodongo_Draw(Actor* thisx, PlayState* play) { BossDodongo* this = (BossDodongo*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_boss_dodongo.c", 3922); Gfx_SetupDL_25Opa(play->state.gfxCtx); @@ -1149,7 +1149,7 @@ f32 func_808C4F6C(BossDodongo* this, PlayState* play) { f32 xDiff; f32 zDiff; f32 sp2C; - UNUSED s32 pad; + STACK_PAD(s32); f32 temp_f2; f32 rotation; Player* player = GET_PLAYER(play); @@ -1172,7 +1172,7 @@ f32 func_808C50A8(BossDodongo* this, PlayState* play) { f32 xDiff; f32 zDiff; f32 sp2C; - UNUSED s32 pad; + STACK_PAD(s32); f32 temp_f2; f32 rotation; Player* player = GET_PLAYER(play); @@ -1225,7 +1225,7 @@ void BossDodongo_SpawnFire(BossDodongo* this, PlayState* play, s16 params) { } void BossDodongo_UpdateDamage(BossDodongo* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ColliderInfo* item1; u8 swordDamage; s32 damage; @@ -1557,7 +1557,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, PlayState* play) { { -890.0f, 0.0f, -3804.0f }, { -1390.0f, 0.0f, -3304.0f } }; Vec3f* sp78; - UNUSED s32 pad; + STACK_PAD(s32); if (this->unk_1A2 == 0) { sp78 = &spAC[this->unk_1A0]; @@ -1671,7 +1671,7 @@ void BossDodongo_UpdateEffects(PlayState* play) { } void BossDodongo_DrawEffects(PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16 i; u8 materialFlag = 0; BossDodongoEffect* eff; diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index e764e0b491e..6d050be0ae8 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -171,7 +171,7 @@ void BossFd_UpdateCamera(BossFd* this, PlayState* play) { } void BossFd_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossFd* this = (BossFd*)thisx; s16 i; @@ -224,7 +224,7 @@ void BossFd_Init(Actor* thisx, PlayState* play) { } void BossFd_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossFd* this = (BossFd*)thisx; SkelAnime_Free(&this->skelAnimeHead, play); @@ -268,7 +268,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) { Player* player = GET_PLAYER(play); f32 angleToTarget; f32 pitchToTarget; - UNUSED s32 pad1; + STACK_PAD(s32); f32 temp_y; f32 temp_x; f32 temp_z; @@ -760,7 +760,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) { Vec3f sp170; Vec3f sp164 = { 0.0f, 0.03f, 0.0f }; Vec3f sp158; - UNUSED s32 pad2; + STACK_PAD(s32); s16 temp_rand2; s16 sp150; @@ -922,7 +922,7 @@ void BossFd_Fly(BossFd* this, PlayState* play) { Vec3f spE0[3]; Vec3f spBC[3]; f32 phi_f20; - UNUSED s32 pad3[3]; + STACK_PADS(s32, 3); Math_ApproachS(&this->actor.world.rot.y, angleToTarget, 0xA, this->fwork[BFD_TURN_RATE]); @@ -1148,7 +1148,7 @@ void BossFd_Effects(BossFd* this, PlayState* play) { Vec3f spawnVel1; Vec3f spawnAccel1; Vec3f spawnPos1; - UNUSED s32 pad; + STACK_PAD(s32); Audio_PlaySfxGeneral(NA_SE_EN_VALVAISA_APPEAR - SFX_FLAG, &this->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); @@ -1297,7 +1297,7 @@ void BossFd_CollisionCheck(BossFd* this, PlayState* play) { } void BossFd_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossFd* this = (BossFd*)thisx; f32 headGlow; f32 rManeGlow; @@ -1629,7 +1629,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, PlayState* play) { } void BossFd_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossFd* this = (BossFd*)thisx; osSyncPrintf("FD DRAW START\n"); @@ -1881,7 +1881,7 @@ void BossFd_DrawBody(PlayState* play, BossFd* this) { Vec3f spF0 = { 0.0f, 0.0f, 0.0f }; Vec3f spE4; Vec3s spDC; - UNUSED s32 pad; + STACK_PAD(s32); if (this->bodyFallApart[i] < 2) { f32 spD4 = 0.1f; diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index 3bf1ede8b7b..912094f7766 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -169,7 +169,7 @@ void BossFd2_SpawnDust(BossFdEffect* effect, Vec3f* position, Vec3f* velocity, V } void BossFd2_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossFd2* this = (BossFd2*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -187,7 +187,7 @@ void BossFd2_Init(Actor* thisx, PlayState* play) { } void BossFd2_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossFd2* this = (BossFd2*)thisx; SkelAnime_Free(&this->skelAnime, play); @@ -642,7 +642,7 @@ void BossFd2_Death(BossFd2* this, PlayState* play) { Vec3f sp64; BossFd* bossFd = (BossFd*)this->actor.parent; Camera* mainCam = Play_GetCamera(play, CAM_ID_MAIN); - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); f32 cameraShake; SkelAnime* skelAnime = &this->skelAnime; @@ -1152,7 +1152,7 @@ void BossFd2_UpdateMane(BossFd2* this, PlayState* play, Vec3f* head, Vec3f* pos, } void BossFd2_DrawMane(BossFd2* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossFd* bossFd = (BossFd*)this->actor.parent; s16 i; @@ -1185,7 +1185,7 @@ void BossFd2_DrawMane(BossFd2* this, PlayState* play) { void BossFd2_Draw(Actor* thisx, PlayState* play) { static void* eyeTextures[] = { gHoleVolvagiaEyeOpenTex, gHoleVolvagiaEyeHalfTex, gHoleVolvagiaEyeClosedTex }; - UNUSED s32 pad; + STACK_PAD(s32); BossFd2* this = (BossFd2*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_boss_fd2.c", 2617); diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index ad825181aea..57afff20ed7 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -472,7 +472,7 @@ void BossGanon_Destroy(Actor* thisx, PlayState* play) { } void BossGanon_SetupIntroCutscene(BossGanon* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 animBankIndex = Object_GetIndex(&play->objectCtx, OBJECT_GANON_ANIME2); if (animBankIndex < 0) { @@ -527,7 +527,7 @@ void BossGanon_SetIntroCsCamera(BossGanon* this, u8 camPosIndex) { void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) { u8 moveCam = false; Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); f32 sin; f32 cos; Camera* mainCam; @@ -1161,7 +1161,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) { } void BossGanon_SetupDeathCutscene(BossGanon* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 animBankIndex = Object_GetIndex(&play->objectCtx, OBJECT_GANON_ANIME2); if (Object_IsLoaded(&play->objectCtx, animBankIndex)) { @@ -1177,7 +1177,7 @@ void BossGanon_SetupDeathCutscene(BossGanon* this, PlayState* play) { } void BossGanon_SetupTowerCutscene(BossGanon* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 animBankIndex = Object_GetIndex(&play->objectCtx, OBJECT_GANON_ANIME2); if (Object_IsLoaded(&play->objectCtx, animBankIndex)) { @@ -1217,7 +1217,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) { s16 i; u8 moveCam = false; Player* player = GET_PLAYER(play); - UNUSED s16 pad; + STACK_PAD(s16); Vec3f sp98; Vec3f sp8C; Vec3f sp80; @@ -1976,7 +1976,7 @@ void BossGanon_SetupChargeBigMagic(BossGanon* this, PlayState* play) { } void BossGanon_ChargeBigMagic(BossGanon* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 targetPosX; f32 targetPosZ; Vec3f sp80; @@ -2190,7 +2190,7 @@ void BossGanon_SetupWait(BossGanon* this, PlayState* play) { void BossGanon_Wait(BossGanon* this, PlayState* play) { f32 sin; - UNUSED s32 pad; + STACK_PAD(s32); f32 cos; Player* player = GET_PLAYER(play); @@ -3337,7 +3337,7 @@ f32 BossGanon_RandZeroOne(void) { } void BossGanon_DrawShock(BossGanon* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); GraphicsContext* gfxCtx = play->state.gfxCtx; s16 i; @@ -3393,7 +3393,7 @@ void BossGanon_DrawShock(BossGanon* this, PlayState* play) { } void BossGanon_DrawHandLightBall(BossGanon* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); GraphicsContext* gfxCtx = play->state.gfxCtx; s32 alpha; @@ -3433,7 +3433,7 @@ void BossGanon_DrawHandLightBall(BossGanon* this, PlayState* play) { } void BossGanon_DrawBigMagicCharge(BossGanon* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 yRot; GraphicsContext* gfxCtx = play->state.gfxCtx; s16 i; @@ -3518,7 +3518,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, PlayState* play) { } void BossGanon_DrawTriforce(BossGanon* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); if (this->fwork[GDF_TRIFORCE_PRIM_A] > 0.0f) { OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon.c", 7732); @@ -3570,7 +3570,7 @@ void BossGanon_DrawTriforce(BossGanon* this, PlayState* play) { } void BossGanon_DrawDarkVortex(BossGanon* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); if (this->fwork[GDF_VORTEX_ALPHA] > 0.0f) { OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon.c", 7792); @@ -3750,7 +3750,7 @@ void BossGanon_GenShadowTexture(u8* tex, BossGanon* this, PlayState* play) { } void BossGanon_DrawShadowTexture(void* tex, BossGanon* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 zOffset; GraphicsContext* gfxCtx = play->state.gfxCtx; @@ -3779,7 +3779,7 @@ void BossGanon_DrawShadowTexture(void* tex, BossGanon* this, PlayState* play) { } void BossGanon_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossGanon* this = (BossGanon*)thisx; void* shadowTex; @@ -3870,9 +3870,9 @@ void BossGanon_LightBall_Update(Actor* thisx, PlayState* play2) { f32 yDistFromGanondorf; f32 zDistFromGanondorf; Player* player = GET_PLAYER(play); - UNUSED s32 pad1; + STACK_PAD(s32); BossGanon* ganondorf = (BossGanon*)this->actor.parent; - UNUSED s32 pad2; + STACK_PAD(s32); this->unk_1A2++; ganondorf->envLightMode = 1; @@ -4124,7 +4124,7 @@ void BossGanon_LightBall_Draw(Actor* thisx, PlayState* play) { BossGanon* this = (BossGanon*)thisx; s16 i; f32 alpha; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon.c", 9849); @@ -4307,7 +4307,7 @@ void func_808E2544(Actor* thisx, PlayState* play) { s16 sp80; BossGanon* this = (BossGanon*)thisx; BossGanon* dorf = (BossGanon*)this->actor.parent; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); ColliderInfo* acHitInfo; Vec3f sp60; @@ -4592,7 +4592,7 @@ void BossGanon_UpdateEffects(PlayState* play) { Player* player = GET_PLAYER(play); GanondorfEffect* eff = play->specialEffects; s16 i; - UNUSED s32 pad1; + STACK_PAD(s32); f32 xDiff; f32 yDiff; f32 zDiff; @@ -4601,7 +4601,7 @@ void BossGanon_UpdateEffects(PlayState* play) { Vec3f spA0; s16 bodyPart; f32 distToPlayer; - UNUSED s32 pad2[2]; + STACK_PADS(s32, 2); spA0.x = 0.0f; spA0.y = 0.0f; @@ -4806,7 +4806,7 @@ static u8 sLightningEnvColors[] = { void BossGanon_DrawEffects(PlayState* play) { u8 materialFlag = 0; s16 i; - UNUSED s32 pad; + STACK_PAD(s32); GraphicsContext* gfxCtx = play->state.gfxCtx; GanondorfEffect* eff = play->specialEffects; GanondorfEffect* effFirst = eff; diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index 93308b38ef4..6eda6753b72 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -77,7 +77,7 @@ void func_808FD080(s32 idx, ColliderJntSph* collider, Vec3f* arg2) { } void BossGanon2_SetObjectSegment(BossGanon2* this, PlayState* play, s32 objectId, u8 setRSPSegment) { - UNUSED s32 pad; + STACK_PAD(s32); s32 objectIdx = Object_GetIndex(&play->objectCtx, objectId); gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.status[objectIdx].segment); @@ -130,7 +130,7 @@ void func_808FD27C(PlayState* play, Vec3f* position, Vec3f* velocity, f32 scale) void BossGanon2_Init(Actor* thisx, PlayState* play) { BossGanon2* this = (BossGanon2*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s16 i; play->specialEffects = sEffects; @@ -180,12 +180,12 @@ void func_808FD5C4(BossGanon2* this, PlayState* play) { } void func_808FD5F4(BossGanon2* this, PlayState* play) { - UNUSED s16 pad1; + STACK_PAD(s16); u8 sp8D; Player* player; s32 objectIdx; s32 zero = 0; - UNUSED s32 pad2; + STACK_PAD(s32); sp8D = false; player = GET_PLAYER(play); @@ -915,7 +915,7 @@ void func_808FF898(BossGanon2* this, PlayState* play) { if (SQ(this->unk_218.x - gj->dyna.actor.world.pos.x) + SQ(this->unk_218.z - gj->dyna.actor.world.pos.z) < SQ(100.0f)) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sp28; Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y) + 0.5f, MTXMODE_NEW); @@ -1039,7 +1039,7 @@ void func_808FFCFC(BossGanon2* this, PlayState* play) { } void func_808FFDB0(BossGanon2* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 objectIdx = Object_GetIndex(&play->objectCtx, OBJECT_GANON2); if (Object_IsLoaded(&play->objectCtx, objectIdx)) { @@ -1283,7 +1283,7 @@ void func_80900890(BossGanon2* this, PlayState* play) { Player* player; Camera* mainCam2; Camera* mainCam3; - UNUSED s32 pad; + STACK_PAD(s32); f32 temp_f12; f32 temp_f2; @@ -1468,7 +1468,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) { f32 temp_f12; Camera* mainCam; s16 temp_a0_2; - UNUSED s32 pad; + STACK_PAD(s32); s32 phi_a1; player = GET_PLAYER(play); @@ -1960,7 +1960,7 @@ void func_80902524(BossGanon2* this, PlayState* play) { void BossGanon2_Update(Actor* thisx, PlayState* play) { BossGanon2* this = (BossGanon2*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s16 i; f32 phi_f2; u16 i2; @@ -2213,7 +2213,7 @@ void func_809034E4(Vec3f* arg0, Vec3f* arg1) { f32 phi_f30; f32 temp_f28; f32 temp_f26; - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); Vec3f sp18C[20]; Vec3f sp9C[20]; @@ -2413,7 +2413,7 @@ void func_80903F38(BossGanon2* this, PlayState* play) { } void func_80904108(BossGanon2* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); if (this->unk_324 > 0.0f) { OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon2.c", 5131); @@ -2488,7 +2488,7 @@ void func_80904340(BossGanon2* this, PlayState* play) { } void func_8090464C(BossGanon2* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); if (this->unk_1B4 > 0.0f) { OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon2.c", 5264); @@ -2511,7 +2511,7 @@ void func_8090464C(BossGanon2* this, PlayState* play) { } s32 BossGanon2_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { - UNUSED s32 pad; + STACK_PAD(s32); BossGanon2* this = (BossGanon2*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon2.c", 5355); @@ -2542,7 +2542,7 @@ s32 BossGanon2_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec } void BossGanon2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { - UNUSED u8 pad; + STACK_PAD(u8); s8 temp_v0; BossGanon2* this = (BossGanon2*)thisx; Vec3f sp4C; @@ -2610,7 +2610,7 @@ void BossGanon2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* } void func_80904D88(BossGanon2* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16 i; OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon2.c", 5575); @@ -2641,7 +2641,7 @@ void func_80904D88(BossGanon2* this, PlayState* play) { } void func_80904FC8(BossGanon2* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon2.c", 5632); @@ -2725,7 +2725,7 @@ void BossGanon2_PostLimbDraw2(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s } void func_80905674(BossGanon2* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); if (this->unk_380 > 0.0f) { OPEN_DISPS(play->state.gfxCtx, "../z_boss_ganon2.c", 5772); @@ -2805,7 +2805,7 @@ void BossGanon2_Draw(Actor* thisx, PlayState* play) { if ((this->unk_312 != 0) || (D_80907080 != 0)) { func_80903F38(this, play); if (this->unk_312 == 0) { - UNUSED s32 pad; + STACK_PAD(s32); D_80907080 -= 40; if (D_80907080 <= 0) { @@ -2829,7 +2829,7 @@ void BossGanon2_Draw(Actor* thisx, PlayState* play) { } void BossGanon2_UpdateEffects(BossGanon2* this, PlayState* play) { - UNUSED s32 pad[5]; + STACK_PADS(s32, 5); Player* player = GET_PLAYER(play); BossGanon2Effect* effect = play->specialEffects; Vec3f sp78; @@ -3057,7 +3057,7 @@ void BossGanon2_GenShadowTexture(void* shadowTexture, BossGanon2* this, PlayStat } void BossGanon2_DrawShadowTexture(void* shadowTexture, BossGanon2* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); GraphicsContext* gfxCtx = play->state.gfxCtx; s16 alpha; diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index a88193087fa..80d5223208e 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -274,7 +274,7 @@ void BossGanondrof_SetColliderPos(Vec3f* pos, ColliderCylinder* collider) { } void BossGanondrof_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossGanondrof* this = (BossGanondrof*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -310,7 +310,7 @@ void BossGanondrof_Init(Actor* thisx, PlayState* play) { } void BossGanondrof_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossGanondrof* this = (BossGanondrof*)thisx; osSyncPrintf("DT1\n"); @@ -332,7 +332,7 @@ void BossGanondrof_SetupIntro(BossGanondrof* this, PlayState* play) { void BossGanondrof_Intro(BossGanondrof* this, PlayState* play) { s16 i; - UNUSED s32 pad; + STACK_PAD(s32); EnfHG* horse = (EnfHG*)this->actor.child; SkelAnime_Update(&this->skelAnime); @@ -941,7 +941,7 @@ void BossGanondrof_Death(BossGanondrof* this, PlayState* play) { u8 bodyDecayLevel = 0; f32 camX; f32 camZ; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); Camera* mainCam = Play_GetCamera(play, CAM_ID_MAIN); @@ -1289,9 +1289,9 @@ void BossGanondrof_Update(Actor* thisx, PlayState* play) { f32 legRotTargetY; f32 legRotTargetZ; f32 legSplitTarget; - UNUSED s32 pad1; + STACK_PAD(s32); s16 i; - UNUSED s32 pad2; + STACK_PAD(s32); BossGanondrof* this = (BossGanondrof*)thisx; EnfHG* horse; @@ -1483,7 +1483,7 @@ Gfx* BossGanondrof_EmptyDList(GraphicsContext* gfxCtx) { } void BossGanondrof_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossGanondrof* this = (BossGanondrof*)thisx; EnfHG* horse; diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index c0c7e44c727..910193c5f68 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -339,7 +339,7 @@ static InitChainEntry sInitChain[] = { }; void BossGoma_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossGoma* this = (BossGoma*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -672,7 +672,7 @@ void BossGoma_SetupEncounterState4(BossGoma* this, PlayState* play) { void BossGoma_Encounter(BossGoma* this, PlayState* play) { Camera* mainCam; Player* player = GET_PLAYER(play); - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Math_ApproachZeroF(&this->actor.speedXZ, 0.5f, 2.0f); @@ -1897,7 +1897,7 @@ void BossGoma_UpdateEyeEnvColor(BossGoma* this) { void BossGoma_Update(Actor* thisx, PlayState* play) { BossGoma* this = (BossGoma*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); this->visualState = VISUALSTATE_DEFAULT; this->frameCount++; @@ -2049,7 +2049,7 @@ void BossGoma_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* r Vec3s childRot; EnGoma* babyGohma; BossGoma* this = (BossGoma*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); MtxF mtx; if (limbIndex == BOSSGOMA_LIMB_TAIL4) { // tail end/last part diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index b3664ab248f..acfc11c5415 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -390,7 +390,7 @@ void BossMo_Init(Actor* thisx, PlayState* play2) { } void BossMo_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossMo* this = (BossMo*)thisx; if (this->actor.params >= BOSSMO_TENTACLE) { @@ -440,7 +440,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) { Vec3f sp138; Vec3f sp12C; Vec3f sp120; - UNUSED s32 pad[6]; + STACK_PADS(s32, 6); Vec3f spFC; Vec3f spF0; f32 spEC; @@ -1189,7 +1189,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) { f32 dz; f32 tempX; f32 tempY; - UNUSED s32 pad1; + STACK_PAD(s32); f32 sp80; f32 sp7C; f32 sp78; @@ -1198,7 +1198,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) { Vec3f bubblePos; Vec3f bubblePos2; Camera* mainCam2; - UNUSED s32 pad2[3]; + STACK_PADS(s32, 3); if (this->csState < MO_INTRO_REVEAL) { this->subCamFov = 80.0f; @@ -1838,18 +1838,18 @@ void BossMo_Core(BossMo* this, PlayState* play) { f32 spD4; f32 spD0; f32 spCC; - UNUSED s32 pad1; + STACK_PAD(s32); s32 temp; // not on stack f32 xScaleTarget; // not on stack f32 yScaleTarget; Vec3f effectPos; Vec3f effectVelocity; Vec3f effectAccel; - UNUSED s32 pad2[2]; + STACK_PADS(s32, 2); s16 j; s16 index; // not on stack f32 sp88; - UNUSED s32 pad3; + STACK_PAD(s32); f32 sp80; f32 sp7C; Vec3f sp70; @@ -2199,7 +2199,7 @@ void BossMo_Core(BossMo* this, PlayState* play) { } void BossMo_UpdateCore(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossMo* this = (BossMo*)thisx; s16 i; Player* player = GET_PLAYER(play); @@ -2246,7 +2246,7 @@ void BossMo_UpdateCore(Actor* thisx, PlayState* play) { void BossMo_UpdateTent(Actor* thisx, PlayState* play) { s16 i; s16 index; - UNUSED s32 pad; + STACK_PAD(s32); BossMo* this = (BossMo*)thisx; Player* player = GET_PLAYER(play); f32 phi_f0; @@ -2339,7 +2339,7 @@ void BossMo_UpdateTent(Actor* thisx, PlayState* play) { Vec3f sp7C; Vec3f bubblePos; Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; - UNUSED s32 pad; + STACK_PAD(s32); this->baseBubblesTimer--; sp88.x = 0.0; @@ -2450,7 +2450,7 @@ void BossMo_DrawTentacle(BossMo* this, PlayState* play) { BossMo_InitRand(1, 29100, 9786); for (i = 0; i < 41; i++, matrix++) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if (i < 2) { Matrix_Push(); @@ -2553,7 +2553,7 @@ void BossMo_DrawTentacle(BossMo* this, PlayState* play) { } void BossMo_DrawWater(BossMo* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_boss_mo.c", 6582); if (1) {} @@ -2583,7 +2583,7 @@ void BossMo_DrawWater(BossMo* this, PlayState* play) { } void BossMo_DrawCore(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossMo* this = (BossMo*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_boss_mo.c", 6688); @@ -2711,7 +2711,7 @@ void BossMo_DrawCore(Actor* thisx, PlayState* play) { } void BossMo_DrawTent(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossMo* this = (BossMo*)thisx; u16 texCoordScale; @@ -2893,7 +2893,7 @@ void BossMo_UpdateEffects(BossMo* this, PlayState* play) { void BossMo_DrawEffects(BossMoEffect* effect, PlayState* play) { u8 materialFlag = 0; s16 i; - UNUSED s32 pad; + STACK_PAD(s32); GraphicsContext* gfxCtx = play->state.gfxCtx; BossMoEffect* effectHead = effect; diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index 82fe3ee10b1..0cdebb1b6f6 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -333,7 +333,7 @@ void BossSst_Init(Actor* thisx, PlayState* play2) { } void BossSst_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossSst* this = (BossSst*)thisx; Collider_DestroyJntSph(play, &this->colliderJntSph); @@ -2573,7 +2573,7 @@ void BossSst_HeadCollisionCheck(BossSst* this, PlayState* play) { } void BossSst_UpdateHand(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossSst* this = (BossSst*)thisx; BossSstHandTrail* trail; @@ -2628,7 +2628,7 @@ void BossSst_UpdateHand(Actor* thisx, PlayState* play) { } void BossSst_UpdateHead(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossSst* this = (BossSst*)thisx; func_8002DBD0(&this->actor, &sHandOffsets[RIGHT], &sHands[RIGHT]->actor.world.pos); @@ -2730,7 +2730,7 @@ void BossSst_DrawHand(Actor* thisx, PlayState* play) { s32 i; s32 idx; s32 end; - UNUSED s32 pad; + STACK_PAD(s32); Gfx_SetupDL_25Xlu(play->state.gfxCtx); @@ -2858,7 +2858,7 @@ void BossSst_PostHeadDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* ro } void BossSst_DrawHead(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossSst* this = (BossSst*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_boss_sst.c", 6810); @@ -2938,7 +2938,7 @@ void BossSst_SpawnHeadShadow(BossSst* this) { { -160.0f, 0.0f, 250.0f }, { 160.0f, 0.0f, 250.0f }, }; - UNUSED s32 pad; + STACK_PAD(s32); s32 i; f32 sn; f32 cs; @@ -3150,7 +3150,7 @@ void BossSst_UpdateEffects(Actor* thisx, PlayState* play) { } void BossSst_DrawEffects(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); BossSst* this = (BossSst*)thisx; s32 i; BossSstEffect* effect; diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 2b8c44605f2..043208413bd 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -2308,7 +2308,7 @@ void BossTw_DeathBall(BossTw* this, PlayState* play) { f32 xDiff; f32 yDiff; f32 zDiff; - UNUSED s32 pad; + STACK_PAD(s32); s16 i; s16 yaw; @@ -2382,7 +2382,7 @@ void BossTw_TwinrovaSetupDeathCS(BossTw* this, PlayState* play) { } void BossTw_DeathCSMsgSfx(BossTw* this, PlayState* play) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); s16 msgId2; s16 msgId1; u8 kotakeAnim; @@ -2843,7 +2843,7 @@ void BossTw_Update(Actor* thisx, PlayState* play) { BossTw* this = (BossTw*)thisx; Player* player = GET_PLAYER(play); s16 i; - UNUSED s32 pad; + STACK_PAD(s32); this->collider.base.colType = COLTYPE_HIT3; Math_ApproachF(&this->fogR, play->lightCtx.fogColor[0], 1.0f, 10.0f); @@ -3256,7 +3256,7 @@ void BossTw_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot } void func_80941BC0(BossTw* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_boss_tw.c", 6341); @@ -3300,7 +3300,7 @@ void func_80941BC0(BossTw* this, PlayState* play) { } void func_80942180(BossTw* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_boss_tw.c", 6468); @@ -3348,7 +3348,7 @@ void func_80942180(BossTw* this, PlayState* play) { } void func_809426F0(BossTw* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16 i; OPEN_DISPS(play->state.gfxCtx, "../z_boss_tw.c", 6587); @@ -3671,7 +3671,7 @@ void BossTw_TwinrovaPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Ve } void BossTw_ShieldChargeDraw(BossTw* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); s16 temp_t0; s16 temp_a0; @@ -3774,7 +3774,7 @@ void BossTw_ShieldChargeDraw(BossTw* this, PlayState* play) { } void BossTw_SpawnPortalDraw(BossTw* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_boss_tw.c", 7546); @@ -3819,7 +3819,7 @@ void BossTw_SpawnPortalDraw(BossTw* this, PlayState* play) { } void func_80944C50(BossTw* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 scale; OPEN_DISPS(play->state.gfxCtx, "../z_boss_tw.c", 7645); @@ -4237,7 +4237,7 @@ void BossTw_BlastIce(BossTw* this, PlayState* play) { Audio_PlayActorSfx2(&this->actor, NA_SE_EV_ICE_FREEZE - SFX_FLAG); if (this->timers[0] > (sTwinrovaPtr->actionFunc == BossTw_Wait ? 70 : 20)) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f pos; Vec3f velocity; Vec3f accel; @@ -4891,7 +4891,7 @@ void BossTw_DrawEffects(PlayState* play) { u8 materialFlag = 0; s16 i; s16 j; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); s16 phi_s4; BossTwEffect* currentEffect = play->specialEffects; @@ -5385,7 +5385,7 @@ void BossTw_TwinrovaFly(BossTw* this, PlayState* play) { f32 xDiff; f32 yDiff; f32 zDiff; - UNUSED s32 pad; + STACK_PAD(s32); f32 yaw; f32 xzDist; diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index 54876a28079..76ac8842416 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -1224,7 +1224,7 @@ void BossVa_SetupBodyPhase3(BossVa* this) { } void BossVa_BodyPhase3(BossVa* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); s32 i; s16 sp62; @@ -1917,7 +1917,7 @@ void BossVa_ZapperAttack(BossVa* this, PlayState* play) { s16 sp8E; u32 sp88; Vec3f sp7C; - UNUSED s32 pad; + STACK_PAD(s32); f32 sp74; s32 i; s16 sp6E; @@ -2149,7 +2149,7 @@ void BossVa_SetupZapperDeath(BossVa* this, PlayState* play) { void BossVa_ZapperDeath(BossVa* this, PlayState* play) { f32 sp3C = 55.0f; - UNUSED s32 pad; + STACK_PAD(s32); BossVa_AttachToBody(this); if (((play->gameplayFrames % 32) == 0) && (sCsState <= DEATH_BODY_TUMORS)) { @@ -2236,7 +2236,7 @@ void BossVa_SetupZapperEnraged(BossVa* this, PlayState* play) { void BossVa_ZapperEnraged(BossVa* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); s16 tmp16; s16 sp6C; s16 sp6A; @@ -2528,7 +2528,7 @@ void BossVa_BariPhase3Attack(BossVa* this, PlayState* play) { EnBoom* boomerang; Vec3f sp54 = GET_BODY(this)->unk_1D8; s16 sp52; - UNUSED s32 pad; + STACK_PAD(s32); this->unk_1A4 += Rand_ZeroOne() * 0.5f; sp52 = this->timer2 & 0x1FF; @@ -2617,7 +2617,7 @@ void BossVa_BariPhase2Attack(BossVa* this, PlayState* play) { s16 sp52; s16 sp50; f32 sp4C; - UNUSED s32 pad; + STACK_PAD(s32); this->unk_1A4 += Rand_ZeroOne() * 0.5f; sp52 = this->timer2 & 0x1FF; @@ -2726,7 +2726,7 @@ void BossVa_SetupBariPhase3Stunned(BossVa* this, PlayState* play) { } void BossVa_BariPhase3Stunned(BossVa* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sp40 = GET_BODY(this)->unk_1D8; this->actor.world.rot.x = Math_Vec3f_Pitch(&GET_BODY(this)->actor.world.pos, &this->actor.world.pos); @@ -2863,7 +2863,7 @@ void BossVa_Update(Actor* thisx, PlayState* play2) { s32 BossVa_BodyOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { BossVa* this = (BossVa*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_boss_va.c", 4156); @@ -2892,7 +2892,7 @@ s32 BossVa_BodyOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec void BossVa_BodyPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { BossVa* this = (BossVa*)thisx; Vec3f sp78 = { 0.0f, 0.0f, 0.0f }; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_boss_va.c", 4192); @@ -2972,7 +2972,7 @@ s32 BossVa_SupportOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, void BossVa_SupportPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { BossVa* this = (BossVa*)thisx; Vec3f sp20 = { 0.0f, 0.0f, 0.0f }; - UNUSED s32 pad; + STACK_PAD(s32); if (this->onCeiling) { switch (limbIndex) { diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index 83a45889ef1..fc5d4e42c1b 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -67,7 +67,7 @@ void Demo6K_SetupAction(Demo6K* this, Demo6KActionFunc actionFunc) { void Demo6K_Init(Actor* thisx, PlayState* play) { Demo6K* this = (Demo6K*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s32 params = this->actor.params; s32 objBankIndex; s32 i; @@ -558,7 +558,7 @@ void Demo6K_Update(Actor* thisx, PlayState* play) { void func_80967FFC(Actor* thisx, PlayState* play) { Demo6K* this = (Demo6K*)thisx; - UNUSED s32 pad1; + STACK_PAD(s32); u16 timer1 = this->timer1; OPEN_DISPS(play->state.gfxCtx, "../z_demo_6k.c", 1070); @@ -571,7 +571,7 @@ void func_80967FFC(Actor* thisx, PlayState* play) { { s32 i; - UNUSED s32 pad2; + STACK_PAD(s32); Color_RGB8 colors[6][2] = { { { 255, 170, 255 }, { 255, 0, 100 } }, { { 255, 255, 170 }, { 0, 255, 0 } }, { { 255, 255, 170 }, { 255, 255, 0 } }, { { 255, 170, 255 }, { 50, 0, 255 } }, @@ -600,7 +600,7 @@ void func_80967FFC(Actor* thisx, PlayState* play) { void func_80968298(Actor* thisx, PlayState* play) { static u8 skipIndices[] = { 6, 7, 11, 16, 20, 24, 28, 33, 35, 41, 45, 50, 57, 58, 62, 255 }; Demo6K* this = (Demo6K*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); u32 timer1 = this->timer1; f32 scale = this->unk_164 * this->unk_168; Vtx* vertices = SEGMENTED_TO_VIRTUAL(object_demo_6kVtx_0035E0); @@ -650,7 +650,7 @@ void func_80968298(Actor* thisx, PlayState* play) { void func_8096865C(Actor* thisx, PlayState* play) { Demo6K* this = (Demo6K*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Gfx* displayList; OPEN_DISPS(play->state.gfxCtx, "../z_demo_6k.c", 1208); @@ -719,7 +719,7 @@ void func_809688C4(Actor* thisx, PlayState* play2) { } void func_80968B70(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Demo6K* this = (Demo6K*)thisx; u32 timer2 = this->timer2; u8 primColor[4]; @@ -773,7 +773,7 @@ void func_80968FB0(Actor* thisx, PlayState* play) { Gfx* displayList = Graph_Alloc(play->state.gfxCtx, 4 * sizeof(Gfx)); u16 frames = play->gameplayFrames; f32 scaleFactor; - UNUSED s32 pad; + STACK_PAD(s32); if (1) {} diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index 5bfa49a701d..a7f51829a92 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -48,7 +48,7 @@ void DemoDu_Destroy(Actor* thisx, PlayState* play) { void DemoDu_UpdateEyes(DemoDu* this) { s16* blinkTimer = &this->blinkTimer; s16* eyeTexIndex = &this->eyeTexIndex; - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); if (DECR(*blinkTimer) == 0) { *blinkTimer = Rand_S16Offset(60, 60); @@ -129,7 +129,7 @@ s32 DemoDu_IsNpcNotDoingThisAction(DemoDu* this, PlayState* play, u16 action, s3 void DemoDu_MoveToNpcPos(DemoDu* this, PlayState* play, s32 idx) { CsCmdActorAction* npcAction = DemoDu_GetNpcAction(play, idx); - UNUSED s32 pad; + STACK_PAD(s32); if (npcAction != NULL) { this->actor.world.pos.x = npcAction->startPos.x; @@ -192,7 +192,7 @@ void func_80969FB4(DemoDu* this, PlayState* play) { // Gives the Fire Medallion to Link too. void DemoDu_CsFireMedallion_AdvanceTo01(DemoDu* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if ((gSaveContext.chamberCutsceneNum == 1) && !IS_CUTSCENE_LAYER) { Player* player = GET_PLAYER(play); @@ -317,7 +317,7 @@ void DemoDu_CsPlaySfx_DaruniaFalling(PlayState* play) { // Cutscene: Darunia gives Link the Goron's Ruby. void DemoDu_CsPlaySfx_DaruniaHitsLink(PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); func_80078914(&player->actor.projectedPos, NA_SE_EN_DARUNIA_HIT_LINK); Audio_PlaySfxGeneral(NA_SE_VO_LI_DAMAGE_S_KID, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, @@ -376,7 +376,7 @@ void DemoDu_CsGoronsRuby_UpdateFaceTextures(DemoDu* this, PlayState* play) { } void func_8096A630(DemoDu* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f pos = this->actor.world.pos; pos.y += kREG(5); @@ -392,13 +392,13 @@ void DemoDu_CsGoronsRuby_SpawnDustWhenHittingLink(DemoDu* this, PlayState* play) }; if (Animation_OnFrame(&this->skelAnime, 31.0f) || Animation_OnFrame(&this->skelAnime, 41.0f)) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); s32 i; Player* player = GET_PLAYER(play); Vec3f* pos = &player->bodyPartsPos[PLAYER_BODYPART_L_FOREARM]; Vec3f velocity = { 0.0f, 0.0f, 0.0f }; Vec3f accel = { 0.0f, 0.3f, 0.0f }; - UNUSED s32 pad2; + STACK_PAD(s32); for (i = 4; i >= 0; --i) { Color_RGBA8 primColor = { 190, 150, 110, 255 }; @@ -434,7 +434,7 @@ void DemoDu_CsGoronsRuby_SpawnDustWhenHittingLink(DemoDu* this, PlayState* play) } void DemoDu_CsGoronsRuby_DaruniaFalling(DemoDu* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); CutsceneContext* csCtx = &play->csCtx; if (csCtx->state != CS_STATE_IDLE) { @@ -699,7 +699,7 @@ void DemoDu_UpdateCs_GR_13(DemoDu* this, PlayState* play) { } void DemoDu_InitCs_AfterGanon(DemoDu* this, PlayState* play) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); f32 lastFrame = Animation_GetLastFrame(&gDaruniaSageFormationAnim); SkelAnime_InitFlex(play, &this->skelAnime, &gDaruniaSkel, NULL, NULL, NULL, 0); @@ -799,7 +799,7 @@ void DemoDu_Draw_02(Actor* thisx, PlayState* play2) { DemoDu* this = (DemoDu*)thisx; s16 eyeTexIndex = this->eyeTexIndex; void* eyeTexture = sEyeTextures[eyeTexIndex]; - UNUSED s32 pad; + STACK_PAD(s32); s16 mouthTexIndex = this->mouthTexIndex; void* mouthTexture = sMouthTextures[mouthTexIndex]; SkelAnime* skelAnime = &this->skelAnime; @@ -994,7 +994,7 @@ void DemoDu_Draw_01(Actor* thisx, PlayState* play2) { DemoDu* this = (DemoDu*)thisx; s16 eyeTexIndex = this->eyeTexIndex; void* eyeTexture = sEyeTextures[eyeTexIndex]; - UNUSED s32 pad; + STACK_PAD(s32); s16 mouthTexIndex = this->mouthTexIndex; void* mouthTexture = sMouthTextures[mouthTexIndex]; SkelAnime* skelAnime = &this->skelAnime; diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index 7e21a0d0953..9d92cb472bf 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -193,7 +193,7 @@ void func_8096D64C(DemoEc* this, PlayState* play) { } void DemoEc_UpdateEyes(DemoEc* this) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); s16* blinkTimer = &this->blinkTimer; s16* eyeTexIndex = &this->eyeTexIndex; @@ -253,7 +253,7 @@ void DemoEc_DrawSkeleton(DemoEc* this, PlayState* play, void* eyeTexture, void* PostLimbDraw postLimbDraw) { GraphicsContext* gfxCtx = play->state.gfxCtx; SkelAnime* skelAnime = &this->skelAnime; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(gfxCtx, "../z_demo_ec.c", 565); @@ -277,7 +277,7 @@ void DemoEc_DrawSkeleton(DemoEc* this, PlayState* play, void* eyeTexture, void* void DemoEc_DrawSkeletonCustomColor(DemoEc* this, PlayState* play, Gfx* arg2, Gfx* arg3, u8* color1, u8* color2, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw) { - UNUSED s32 pad; + STACK_PAD(s32); GraphicsContext* gfxCtx = play->state.gfxCtx; SkelAnime* skelAnime = &this->skelAnime; @@ -313,7 +313,7 @@ void DemoEc_DrawSkeletonCustomColor(DemoEc* this, PlayState* play, Gfx* arg2, Gf } void DemoEc_UseDrawObject(DemoEc* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s32 drawObjBankIndex = this->drawObjBankIndex; GraphicsContext* gfxCtx = play->state.gfxCtx; @@ -1123,7 +1123,7 @@ void DemoEc_DrawBombchuShopOwner(DemoEc* this, PlayState* play) { } void DemoEc_InitGorons(DemoEc* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); AnimationHeader* animation; f32 goronScale; Vec3f* scale = &this->actor.scale; @@ -1251,10 +1251,10 @@ void DemoEc_InitNpc(DemoEc* this, PlayState* play) { } void DemoEc_InitCommon(DemoEc* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); s16 primary; s32 type; - UNUSED s16 pad2; + STACK_PAD(s16); s16 sp28; s32 primaryBankIndex; s32 secondaryBankIndex; 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 ae9a897778f..300981b769c 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -1033,7 +1033,7 @@ void DemoEffect_UpdateBlueOrbGrow(DemoEffect* this, PlayState* play) { * This function updates the position and scale of the actor based on the current cutscene command. */ void DemoEffect_UpdateLightEffect(DemoEffect* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 isLargeSize; isLargeSize = ((this->actor.params & 0x0F00) >> 8); @@ -1399,7 +1399,7 @@ void DemoEffect_MoveJewelSplit(PosRot* world, DemoEffect* this) { */ void DemoEffect_MoveJewelSpherical(f32 degrees, f32 frameDivisor, Vec3f startPos, Vec3f endPos, f32 radius, Vec3s rotation, DemoEffect* this) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); f32 distance; f32 xPos; f32 ySpherical; @@ -1795,7 +1795,7 @@ void DemoEffect_DrawFireBall(Actor* thisx, PlayState* play) { */ void DemoEffect_DrawGodLgt(Actor* thisx, PlayState* play) { DemoEffect* this = (DemoEffect*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); u32 frames = play->gameplayFrames; OPEN_DISPS(play->state.gfxCtx, "../z_demo_effect.c", 2737); @@ -1896,7 +1896,7 @@ void DemoEffect_DrawLightEffect(Actor* thisx, PlayState* play) { */ void DemoEffect_DrawBlueOrb(Actor* thisx, PlayState* play) { DemoEffect* this = (DemoEffect*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_demo_effect.c", 2892); gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 188, 255, 255, this->blueOrb.alpha); @@ -1916,7 +1916,7 @@ void DemoEffect_DrawBlueOrb(Actor* thisx, PlayState* play) { */ void DemoEffect_DrawLgtShower(Actor* thisx, PlayState* play) { DemoEffect* this = (DemoEffect*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); u32 frames = play->gameplayFrames; OPEN_DISPS(play->state.gfxCtx, "../z_demo_effect.c", 2921); @@ -1960,7 +1960,7 @@ void DemoEffect_DrawLightRing(Actor* thisx, PlayState* play2) { */ void DemoEffect_DrawTriforceSpot(Actor* thisx, PlayState* play) { DemoEffect* this = (DemoEffect*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Vtx* vertices = SEGMENTED_TO_VIRTUAL(gTriforceVtx); u32 frames = play->gameplayFrames; @@ -2041,7 +2041,7 @@ void DemoEffect_DrawGetItem(Actor* thisx, PlayState* play) { * Callback for the SkelCurve system to draw the animated limbs. */ s32 DemoEffect_OverrideLimbDrawTimeWarp(PlayState* play, SkelCurve* skelCurve, s32 limbIndex, void* thisx) { - UNUSED s32 pad; + STACK_PAD(s32); DemoEffect* this = (DemoEffect*)thisx; u32 frames = play->gameplayFrames; @@ -2090,7 +2090,7 @@ void DemoEffect_DrawTimeWarp(Actor* thisx, PlayState* play) { * Faces/rotates the Actor towards the current cutscene action end point. */ void DemoEffect_FaceToCsEndpoint(DemoEffect* this, Vec3f startPos, Vec3f endPos) { - UNUSED s32 pad; + STACK_PAD(s32); f32 x = endPos.x - startPos.x; f32 z = endPos.z - startPos.z; f32 xzDistance = sqrtf(SQ(x) + SQ(z)); diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index 6d5eca44bd4..e989ba76f5a 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -85,7 +85,7 @@ void func_80977EA8(PlayState* play, Gfx* dlist) { } void func_80977F80(DemoGeff* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s32 objBankIndex = this->objBankIndex; GraphicsContext* gfxCtx = play->state.gfxCtx; @@ -190,7 +190,7 @@ void func_809783D4(DemoGeff* this, PlayState* play) { s32 params = thisx->params; s16 objectId = sObjectIDs[params]; s32 objBankIndex = Object_GetIndex(objCtx, objectId); - UNUSED s32 pad; + STACK_PAD(s32); if (objBankIndex < 0) { osSyncPrintf(VT_FGCOL(RED) "Demo_Geff_main_bank:バンクを読めない arg_data = %d!\n" VT_RST, params); diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index d80a48344a7..43524cdac15 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -238,7 +238,7 @@ static InitChainEntry sInitChain[] = { }; void DemoGj_InitCommon(DemoGj* this, PlayState* play, CollisionHeader* header) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); CollisionHeader* newHeader; if (header != NULL) { @@ -281,12 +281,12 @@ void DemoGj_DrawCommon(DemoGj* this, PlayState* play, Gfx* displayList) { } void DemoGj_DrawRotated(DemoGj* this, PlayState* play, Gfx* displayList) { - UNUSED s32 pad1; + STACK_PAD(s32); GraphicsContext* gfxCtx; s16 x = this->rotationVec.x; s16 y = this->rotationVec.y; s16 z = this->rotationVec.z; - UNUSED s32 pad2; + STACK_PAD(s32); Mtx* matrix; gfxCtx = play->state.gfxCtx; @@ -986,7 +986,7 @@ void func_8097AEE8(DemoGj* this, PlayState* play) { ColliderCylinder* cylinder1 = &this->cylinders[1]; ColliderCylinder* cylinder2 = &this->cylinders[2]; Vec3f* actorPos = &this->dyna.actor.world.pos; - UNUSED s32 pad; + STACK_PAD(s32); s16 theta = this->dyna.actor.world.rot.y; f32 cos_theta = Math_CosS(theta); f32 sin_theta = Math_SinS(theta); @@ -1005,11 +1005,11 @@ void func_8097AEE8(DemoGj* this, PlayState* play) { } void DemoGj_SetCylindersAsAC(DemoGj* this, PlayState* play) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); Collider* cylinder0 = &this->cylinders[0].base; Collider* cylinder1 = &this->cylinders[1].base; Collider* cylinder2 = &this->cylinders[2].base; - UNUSED s32 pad2[3]; + STACK_PADS(s32, 3); CollisionCheck_SetAC(play, &play->colChkCtx, cylinder0); CollisionCheck_SetAC(play, &play->colChkCtx, cylinder1); @@ -1116,7 +1116,7 @@ void func_8097B450(DemoGj* this, PlayState* play) { ColliderCylinder* cylinder1 = &this->cylinders[1]; ColliderCylinder* cylinder2 = &this->cylinders[2]; Vec3f* actorPos = &this->dyna.actor.world.pos; - UNUSED s32 pad; + STACK_PAD(s32); s16 theta = this->dyna.actor.world.rot.y; f32 cos_theta = Math_CosS(theta); f32 sin_theta = Math_SinS(theta); @@ -1135,11 +1135,11 @@ void func_8097B450(DemoGj* this, PlayState* play) { } void DemoGj_SetCylindersAsAC2(DemoGj* this, PlayState* play) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); Collider* cylinder0 = &this->cylinders[0].base; Collider* cylinder1 = &this->cylinders[1].base; Collider* cylinder2 = &this->cylinders[2].base; - UNUSED s32 pad2[3]; + STACK_PADS(s32, 3); CollisionCheck_SetAC(play, &play->colChkCtx, cylinder0); CollisionCheck_SetAC(play, &play->colChkCtx, cylinder1); @@ -1274,7 +1274,7 @@ void func_8097B9BC(DemoGj* this, PlayState* play) { void func_8097BA48(DemoGj* this, PlayState* play) { Actor* thisx = &this->dyna.actor; ColliderCylinder* cylinder = &this->cylinders[0]; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if (func_809797E4(this, 4)) { Actor_Kill(thisx); diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index 3a780ea1fd8..0787ca98d0c 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -88,7 +88,7 @@ void DemoGo_Destroy(Actor* thisx, PlayState* play) { void func_8097C930(DemoGo* this) { s16* something = &this->unk_192; s16* other = &this->unk_190; - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); if (DECR(*something) == 0) { *something = Rand_S16Offset(60, 60); @@ -104,7 +104,7 @@ void func_8097C9B8(DemoGo* this) { } void func_8097C9DC(DemoGo* this) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if (Animation_OnFrame(&this->skelAnime, 12.0f) || Animation_OnFrame(&this->skelAnime, 25.0f)) { func_80078914(&this->actor.projectedPos, NA_SE_EN_MORIBLIN_WALK); @@ -116,7 +116,7 @@ void func_8097CA30(DemoGo* this, PlayState* play) { } void func_8097CA78(DemoGo* this, PlayState* play) { - UNUSED s16 pad; + STACK_PAD(s16); Vec3f vec = this->actor.world.pos; func_80033480(play, &vec, kREG(11) + 100.0f, kREG(12) + 0xA, kREG(13) + 0x12C, kREG(14), 0); func_8097C9B8(this); @@ -128,7 +128,7 @@ void func_8097CB0C(DemoGo* this, PlayState* play) { CutsceneContext* csCtx = &play->csCtx; CsCmdActorAction* npcAction; f32 temp_ret; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f startPos; Vec3f endPos; @@ -324,7 +324,7 @@ void func_8097D290(DemoGo* this, PlayState* play) { } void func_8097D29C(DemoGo* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16 eyeTexIdx = this->unk_190; SkelAnime* skelAnime = &this->skelAnime; void* eyeTexture = sEyeTextures[eyeTexIdx]; diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index d09c33e21a1..3c5504dde12 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -44,13 +44,13 @@ void DemoGt_SpawnDust(PlayState* play, Vec3f* pos, Vec3f* velocity, Vec3f* accel } void func_8097D7D8(PlayState* play, Vec3f* pos, Vec3f* velOffset, f32 scale, s32 arg4, s32 arg5, s16 life) { - UNUSED s32 pad1; + STACK_PAD(s32); if (!FrameAdvance_IsEnabled(play)) { s32 frames = play->gameplayFrames; if (ABS(frames % arg4) == arg5) { - UNUSED s32 pad2[2]; + STACK_PADS(s32, 2); Vec3f velocity = { 0.0f, 6.0f, 0.0f }; Vec3f accel = { 0.0f, 0.0f, 0.0f }; @@ -78,7 +78,7 @@ Actor* DemoGt_SpawnCloudRing(PlayState* play, Vec3f* pos, s16 params) { } void DemoGt_SpawnExplosionWithSound(PlayState* play, Vec3f* pos, f32 scale) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f velocity = { 0.0f, 0.0f, 0.0f }; Vec3f accel = { 0.0f, 0.0f, 0.0f }; @@ -258,7 +258,7 @@ void func_8097E1D4(PlayState* play, Vec3f* arg1, s16 arg2) { void func_8097E454(PlayState* play, Vec3f* spawnerPos, Vec3f* velocity, Vec3f* accel, f32 arg4, f32 scale, s32 arg6, s32 arg7, s16 life) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); s16 increment; s32 frames; s32 i; @@ -298,7 +298,7 @@ u8 func_8097E69C(PlayState* play) { } CsCmdActorAction* DemoGt_GetNpcAction(PlayState* play, u32 actionIdx) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); CsCmdActorAction* ret = NULL; if (!func_8097E69C(play)) { @@ -351,7 +351,7 @@ void func_8097E824(DemoGt* this, s32 arg1) { s16 phi_a3; Vec3f* pos = &this->dyna.actor.world.pos; Vec3s* unk16C = &this->unk_16C; - UNUSED s32 pad; + STACK_PAD(s32); f32 tempf3; f32 tempf2; f32 tempf1; @@ -450,7 +450,7 @@ static InitChainEntry sInitChain[] = { }; void func_8097EDD8(DemoGt* this, PlayState* play, CollisionHeader* collision) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); CollisionHeader* colHeader; if (collision != NULL) { @@ -495,12 +495,12 @@ void func_8097EF34(DemoGt* this, PlayState* play) { void func_8097EF40(DemoGt* this, PlayState* play) { u16 frames = play->csCtx.frames; - UNUSED s32 pad1[3]; + STACK_PADS(s32, 3); Vec3f dustPos; Vec3f velocity = { 0.0f, -16.0f, 0.0f }; Vec3f accel = { 0.0f, 1.2f, 0.0f }; Vec3f* pos = &this->dyna.actor.world.pos; - UNUSED s32 pad2; + STACK_PAD(s32); if ((kREG(1) == 20) || (frames == 220)) { dustPos.x = pos->x + 256.0f; @@ -518,12 +518,12 @@ void func_8097EF40(DemoGt* this, PlayState* play) { } void func_8097F0AC(DemoGt* this, PlayState* play) { - UNUSED s32 pad1[3]; + STACK_PADS(s32, 3); Vec3f sp38; - UNUSED s16 pad2[3]; + STACK_PADS(s16, 3); Vec3f sp24; u16 frames = play->csCtx.frames; - UNUSED s32 pad3; + STACK_PAD(s32); if ((frames == 140) || (kREG(1) == 19)) { sp38.x = this->dyna.actor.world.pos.x + 260.0f; @@ -622,10 +622,10 @@ void DemoGt_Update8(DemoGt* this, PlayState* play) { } void DemoGt_Draw1(DemoGt* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); GraphicsContext* gfxCtx = play->state.gfxCtx; u32 gameplayFrames = play->gameplayFrames; - UNUSED s16 pad2[2]; + STACK_PADS(s16, 2); s16 spC6; f32 spC0; f32 spBC; @@ -700,7 +700,7 @@ void func_8097F960(DemoGt* this, PlayState* play) { void func_8097F96C(DemoGt* this, PlayState* play) { static Actor* cloudRing = NULL; - UNUSED s32 pad[4]; + STACK_PADS(s32, 4); Vec3f pos; Actor* actor; u16 frames = play->csCtx.frames; @@ -722,12 +722,12 @@ void func_8097F96C(DemoGt* this, PlayState* play) { } void func_8097FA1C(DemoGt* this, PlayState* play) { - UNUSED s32 pad1[3]; + STACK_PADS(s32, 3); Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { -12.0f, -17.0, 5.0 }; - UNUSED s32 pad2[3]; + STACK_PADS(s32, 3); if (((frames > 502) && !(frames >= 581)) || (kREG(1) == 5)) { dustPos.x = pos->x + 300.0f; @@ -745,7 +745,7 @@ void func_8097FAFC(DemoGt* this, PlayState* play) { static s32 arg6 = 11; static s32 arg7 = 1; static s16 life = 3; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); u16 frames = play->csCtx.frames; Vec3f pos; f32 new_var = -200.0; @@ -765,12 +765,12 @@ void func_8097FAFC(DemoGt* this, PlayState* play) { } void func_8097FC1C(DemoGt* this, PlayState* play) { - UNUSED s32 pad1[3]; + STACK_PADS(s32, 3); Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -16.0f, -16.0f }; - UNUSED s32 pad2[3]; + STACK_PADS(s32, 3); if (frames > 682 || kREG(1) == 7) { dustPos.x = pos->x + 260.0f; @@ -781,7 +781,7 @@ void func_8097FC1C(DemoGt* this, PlayState* play) { } void func_8097FCE4(DemoGt* this, PlayState* play) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); Vec3f vec; u16 frames = play->csCtx.frames; @@ -848,7 +848,7 @@ void DemoGt_Draw2(DemoGt* this, PlayState* play) { GraphicsContext* gfxCtx = play->state.gfxCtx; s32* unk198; s32* unk178; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(gfxCtx, "../z_demo_gt_part2.c", 470); @@ -881,7 +881,7 @@ void func_80980178(DemoGt* this, PlayState* play) { void func_80980184(DemoGt* this, PlayState* play) { static Actor* cloudRing = NULL; - UNUSED s32 pad[4]; + STACK_PADS(s32, 4); Vec3f pos; Actor* actor; @@ -903,7 +903,7 @@ void func_80980184(DemoGt* this, PlayState* play) { void func_80980218(DemoGt* this, PlayState* play) { static Actor* cloudRing = NULL; - UNUSED s32 pad[4]; + STACK_PADS(s32, 4); Vec3f pos; Actor* actor; @@ -924,12 +924,12 @@ void func_80980218(DemoGt* this, PlayState* play) { } void func_809802AC(DemoGt* this, PlayState* play) { - UNUSED s32 pad1[3]; + STACK_PADS(s32, 3); Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 0.0f, 0.0f, -10.0f }; - UNUSED s32 pad2[3]; + STACK_PADS(s32, 3); if (frames > 109 && frames < 140) { dustPos.x = pos->x - 100.0f; @@ -940,12 +940,12 @@ void func_809802AC(DemoGt* this, PlayState* play) { } void func_8098036C(DemoGt* this, PlayState* play) { - UNUSED s32 pad1[3]; + STACK_PADS(s32, 3); Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* world = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -3.0f, 0.0f }; - UNUSED s32 pad2[3]; + STACK_PADS(s32, 3); if ((frames > 284) && (frames < 421)) { dustPos.x = world->x + 760.0f; @@ -956,12 +956,12 @@ void func_8098036C(DemoGt* this, PlayState* play) { } void func_80980430(DemoGt* this, PlayState* play) { - UNUSED s32 pad1[3]; + STACK_PADS(s32, 3); Vec3f dustPos; s32 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -3.0f, 0.0f }; - UNUSED s32 pad2[3]; + STACK_PADS(s32, 3); if (frames > 709 || kREG(1) == 8) { dustPos.x = pos->x + 760.0f; @@ -972,12 +972,12 @@ void func_80980430(DemoGt* this, PlayState* play) { } void func_80980504(DemoGt* this, PlayState* play) { - UNUSED s32 pad1[3]; + STACK_PADS(s32, 3); Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -16.0f, -16.0f }; - UNUSED s32 pad2[3]; + STACK_PADS(s32, 3); if ((frames > 704) || kREG(1) == 9) { dustPos.x = pos->x + 830.0f; @@ -988,12 +988,12 @@ void func_80980504(DemoGt* this, PlayState* play) { } void func_809805D8(DemoGt* this, PlayState* play) { - UNUSED s32 pad1[3]; + STACK_PADS(s32, 3); Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* homePos = &this->dyna.actor.home.pos; Vec3f velOffset = { 15.0f, -26.0, 0.0f }; - UNUSED s32 pad2[3]; + STACK_PADS(s32, 3); if (((frames > 739) && (frames < 781)) || kREG(1) == 11) { dustPos.x = homePos->x + 550.0f; @@ -1004,12 +1004,12 @@ void func_809805D8(DemoGt* this, PlayState* play) { } void func_809806B8(DemoGt* this, PlayState* play) { - UNUSED s32 pad1[3]; + STACK_PADS(s32, 3); Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -16.0f, -16.0f }; - UNUSED s32 pad2[3]; + STACK_PADS(s32, 3); if ((frames > 964) || (kREG(1) == 12)) { dustPos.x = pos->x + 460.0f; @@ -1020,12 +1020,12 @@ void func_809806B8(DemoGt* this, PlayState* play) { } void func_8098078C(DemoGt* this, PlayState* play) { - UNUSED s32 pad1[3]; + STACK_PADS(s32, 3); Vec3f dustPos; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; Vec3f velOffset = { 5.0f, -16.0f, -16.0f }; - UNUSED s32 pad2[3]; + STACK_PADS(s32, 3); if ((frames > 939) || (kREG(1) == 14)) { dustPos.x = pos->x + 360.0f; @@ -1036,7 +1036,7 @@ void func_8098078C(DemoGt* this, PlayState* play) { } void func_8098085C(DemoGt* this, PlayState* play) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); Vec3f sp28; u16 frames = play->csCtx.frames; Vec3f* pos = &this->dyna.actor.world.pos; @@ -1065,12 +1065,12 @@ void func_809809C0(DemoGt* this, PlayState* play2) { s32 gameplayFrames = play->gameplayFrames; u16 frames = play->csCtx.frames; Vec3f sp54; - UNUSED s16 pad1[3]; + STACK_PADS(s16, 3); if (((frames > 469) && (frames < 481)) || (kREG(1) == 3)) { Vec3f sp40 = { 20.0f, 6.0f, 0.0f }; Vec3f sp34 = { 0.0f, 0.0f, 0.0f }; - UNUSED s16 pad2[3]; + STACK_PADS(s16, 3); sp54.x = this2->dyna.actor.world.pos.x + 790.0f; sp54.y = this2->dyna.actor.world.pos.y + 60.0f; @@ -1083,7 +1083,7 @@ void func_809809C0(DemoGt* this, PlayState* play2) { } void func_80980AD4(DemoGt* this, PlayState* play) { - UNUSED s32 pad[4]; + STACK_PADS(s32, 4); Vec3f pos; u16 frames = play->csCtx.frames; @@ -1098,7 +1098,7 @@ void func_80980AD4(DemoGt* this, PlayState* play) { } void func_80980B68(DemoGt* this, PlayState* play) { - UNUSED s32 pad[4]; + STACK_PADS(s32, 4); Vec3f pos; u16 frames = play->csCtx.frames; @@ -1112,7 +1112,7 @@ void func_80980B68(DemoGt* this, PlayState* play) { } void func_80980BFC(DemoGt* this, PlayState* play) { - UNUSED s32 pad[4]; + STACK_PADS(s32, 4); Vec3f pos; u16 frames = play->csCtx.frames; @@ -1193,14 +1193,14 @@ void func_80980F58(DemoGt* this, PlayState* play) { } void func_80980F8C(DemoGt* this, PlayState* play) { - UNUSED s32 pad1[3]; + STACK_PADS(s32, 3); Vec3f sp58; Vec3f dustPos; u16 frames = play->csCtx.frames; if ((frames > 259) && (frames < 289)) { Vec3f velOfset = { 0.0f, -17.0f, 0.0f }; - UNUSED s32 pad2[3]; + STACK_PADS(s32, 3); sp58.x = 640.0f; sp58.y = 2100.0f; @@ -1245,13 +1245,13 @@ void DemoGt_Draw4(DemoGt* this, PlayState* play2) { GraphicsContext* gfxCtx; PlayState* play = play2; u16 frames = play->csCtx.frames; - UNUSED s32 pad1; + STACK_PAD(s32); s16 sp76; f32 sp70; f32 sp6C; s16 sp6A; s16 sp68; - UNUSED s16 pad2; + STACK_PAD(s16); Mtx* sp60; Vec3f sp54; Vec3f sp48; @@ -1316,14 +1316,14 @@ void func_80981424(DemoGt* this, PlayState* play) { } void func_80981458(DemoGt* this, PlayState* play) { - UNUSED s32 pad1[3]; + STACK_PADS(s32, 3); Vec3f sp58; Vec3f dustPos; u16 frames = play->csCtx.frames; if (((frames > 855) && (frames < 891)) || (kREG(1) == 13)) { Vec3f velOffset = { 0.0f, -30.0f, 0.0f }; - UNUSED s32 pad2[3]; + STACK_PADS(s32, 3); sp58.x = 0.0f; sp58.y = 1170.0f; @@ -1366,13 +1366,13 @@ void DemoGt_Update17(DemoGt* this, PlayState* play) { void DemoGt_Draw5(DemoGt* this, PlayState* play) { GraphicsContext* gfxCtx; - UNUSED s32 pad1; + STACK_PAD(s32); s16 sp76; f32 sp70; f32 sp6C; s16 sp6A; s16 sp68; - UNUSED s16 pad2; + STACK_PAD(s16); Mtx* sp60; Vec3f sp54; Vec3f sp48; diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c index a19663dad5d..0e32c0a2375 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -155,7 +155,7 @@ void DemoIk_MoveToStartPos(DemoIk* this, PlayState* play, s32 index) { } void DemoIk_Type1Init(DemoIk* this, PlayState* play) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); SkeletonHeader* skeleton; AnimationHeader* animation; f32 phi_f0; @@ -278,7 +278,7 @@ void DemoIk_Type1PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s } void DemoIk_Type1Draw(DemoIk* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); GraphicsContext* gfxCtx = play->state.gfxCtx; SkelAnime* skelAnime = &this->skelAnime; @@ -294,7 +294,7 @@ void DemoIk_Type1Draw(DemoIk* this, PlayState* play) { } void DemoIk_Type2Init(DemoIk* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); FlexSkeletonHeader* skeleton; AnimationHeader* animation; @@ -445,7 +445,7 @@ void DemoIk_Type2PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s } void DemoIk_Type2Draw(DemoIk* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); GraphicsContext* gfxCtx = play->state.gfxCtx; SkelAnime* skelAnime = &this->skelAnime; @@ -467,7 +467,7 @@ static DemoIkActionFunc sActionFuncs[] = { }; void DemoIk_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); DemoIk* this = (DemoIk*)thisx; if (this->actionMode < 0 || this->actionMode >= ARRAY_COUNT(sActionFuncs) || @@ -489,7 +489,7 @@ static DemoIkDrawFunc sDrawFuncs[] = { }; void DemoIk_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); DemoIk* this = (DemoIk*)thisx; if (this->drawMode < 0 || this->drawMode >= ARRAY_COUNT(sDrawFuncs) || sDrawFuncs[this->drawMode] == NULL) { @@ -513,7 +513,7 @@ ActorInit Demo_Ik_InitVars = { }; void DemoIk_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); DemoIk* this = (DemoIk*)thisx; if (this->actor.params == 0 || this->actor.params == 1 || this->actor.params == 2) { diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index 40f0d428d6a..807daf119d6 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -104,7 +104,7 @@ ActorInit Demo_Im_InitVars = { }; void func_80984BE0(DemoIm* this) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); s16* blinkTimer = &this->blinkTimer; s16* eyeIndex = &this->eyeIndex; @@ -158,14 +158,14 @@ void DemoIm_DestroyCollider(Actor* thisx, PlayState* play) { } void DemoIm_UpdateCollider(DemoIm* this, PlayState* play) { - UNUSED s32 pad[5]; + STACK_PADS(s32, 5); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); } void func_80984DB8(DemoIm* this) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Vec3s* vec1 = &this->unk_2D4.unk_08; Vec3s* vec2 = &this->unk_2D4.unk_0E; @@ -223,7 +223,7 @@ s32 DemoIm_IsCsStateIdle(PlayState* play) { } CsCmdActorAction* DemoIm_GetNpcAction(PlayState* play, s32 actionIdx) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); CsCmdActorAction* ret = NULL; if (!DemoIm_IsCsStateIdle(play)) { @@ -323,7 +323,7 @@ void func_80985430(DemoIm* this, PlayState* play) { } void func_8098544C(DemoIm* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if ((gSaveContext.chamberCutsceneNum == 4) && !IS_CUTSCENE_LAYER) { Player* player = GET_PLAYER(play); @@ -516,7 +516,7 @@ void func_80985C94(DemoIm* this, PlayState* play) { } void DemoIm_DrawTranslucent(DemoIm* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s16 eyeIndex = this->eyeIndex; void* eyeTex = sEyeTextures[eyeIndex]; SkelAnime* skelAnime = &this->skelAnime; @@ -726,7 +726,7 @@ void func_80986570(DemoIm* this, PlayState* play) { } void func_809865F8(DemoIm* this, PlayState* play, s32 arg2) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if (arg2 != 0) { f32* unk_278 = &this->unk_278; @@ -1180,7 +1180,7 @@ void DemoIm_DrawNothing(DemoIm* this, PlayState* play) { } void DemoIm_DrawSolid(DemoIm* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s16 eyeIndex = this->eyeIndex; void* eyeTexture = sEyeTextures[eyeIndex]; SkelAnime* skelAnime = &this->skelAnime; 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 8783cae2c09..1fc4a687cb6 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -524,7 +524,7 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) { OPEN_DISPS(play->state.gfxCtx, "../z_demo_kankyo.c", 1186); for (i = 0; i < 30; i++) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); dx = play->view.at.x - play->view.eye.x; dy = play->view.at.y - play->view.eye.y; @@ -595,7 +595,7 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) { Matrix_Scale(sRainScale * 0.001f, sRainScale * 0.001f, sRainScale * 0.001f, MTXMODE_APPLY); for (j = 0; j < 5; j++) { - UNUSED s32 pad; + STACK_PAD(s32); if (play->sceneId != SCENE_TOKINOMA) { if (this->unk_150[i].unk_0.x >= 0.0f) { @@ -631,7 +631,7 @@ void DemoKankyo_DrawRain(Actor* thisx, PlayState* play) { void DemoKankyo_DrawRock(Actor* thisx, PlayState* play) { DemoKankyo* this = (DemoKankyo*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_demo_kankyo.c", 1376); @@ -653,7 +653,7 @@ void DemoKankyo_DrawRock(Actor* thisx, PlayState* play) { void DemoKankyo_DrawClouds(Actor* thisx, PlayState* play) { DemoKankyo* this = (DemoKankyo*)thisx; s16 i; - UNUSED s32 pad; + STACK_PAD(s32); f32 dx; f32 dy; f32 dz; @@ -689,7 +689,7 @@ void DemoKankyo_DrawClouds(Actor* thisx, PlayState* play) { void DemoKankyo_DrawDoorOfTime(Actor* thisx, PlayState* play) { DemoKankyo* this = (DemoKankyo*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_demo_kankyo.c", 1487); @@ -708,7 +708,7 @@ void DemoKankyo_DrawDoorOfTime(Actor* thisx, PlayState* play) { void DemoKankyo_DrawLightPlane(Actor* thisx, PlayState* play) { UNUSED DemoKankyo* this = (DemoKankyo*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_demo_kankyo.c", 1514); diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index 1589cdce0bc..6741fc32ce7 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -74,7 +74,7 @@ s32 DemoKekkai_CheckEventFlag(s32 params) { } void DemoKekkai_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); DemoKekkai* this = (DemoKekkai*)thisx; this->sfxFlag = 0; @@ -125,7 +125,7 @@ void DemoKekkai_Init(Actor* thisx, PlayState* play) { } void DemoKekkai_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); DemoKekkai* this = (DemoKekkai*)thisx; Collider_DestroyCylinder(play, &this->collider1); @@ -204,7 +204,7 @@ void DemoKekkai_Update(Actor* thisx, PlayState* play2) { void DemoKekkai_TrialBarrierDispel(Actor* thisx, PlayState* play) { static u16 csFrames[] = { 0, 280, 280, 280, 280, 280, 280 }; - UNUSED s32 pad; + STACK_PAD(s32); DemoKekkai* this = (DemoKekkai*)thisx; if (play->csCtx.frames == csFrames[this->actor.params]) { @@ -242,7 +242,7 @@ static CutsceneData* sSageCutscenes[] = { }; void DemoKekkai_TrialBarrierIdle(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); DemoKekkai* this = (DemoKekkai*)thisx; if (this->collider1.base.atFlags & AT_HIT) { @@ -321,7 +321,7 @@ void DemoKekkai_DrawTrialBarrier(Actor* thisx, PlayState* play2) { } void DemoKekkai_DrawTowerBarrier(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); DemoKekkai* this = (DemoKekkai*)thisx; s32 scroll; diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index fd8d197af21..1b04170de2c 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -105,7 +105,7 @@ void DemoSa_Destroy(Actor* thisx, PlayState* play) { } void func_8098E480(DemoSa* this) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s16* eyeIndex = &this->eyeIndex; s16* blinkTimer = &this->blinkTimer; @@ -196,7 +196,7 @@ void func_8098E6EC(DemoSa* this, PlayState* play, s32 actionIdx) { } void func_8098E76C(DemoSa* this, AnimationHeader* animHeaderSeg, u8 arg2, f32 morphFrames, s32 arg4) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); f32 frameCount = Animation_GetLastFrame(animHeaderSeg); f32 playbackSpeed; f32 unk0; @@ -246,7 +246,7 @@ void func_8098E944(DemoSa* this, PlayState* play) { } void func_8098E960(DemoSa* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Player* player; if ((gSaveContext.chamberCutsceneNum == 0) && !IS_CUTSCENE_LAYER) { @@ -349,7 +349,7 @@ void func_8098ECCC(DemoSa* this, PlayState* play) { } void func_8098ECF4(DemoSa* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); SkelAnime* skelAnime = &this->skelAnime; f32 frameCount = Animation_GetLastFrame(&gSariaSealGanonAnim); @@ -454,11 +454,11 @@ void func_8098F16C(DemoSa* this, PlayState* play) { } void DemoSa_DrawXlu(DemoSa* this, PlayState* play) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); s16 eyeIndex = this->eyeIndex; void* sp78 = sEyeTextures[eyeIndex]; s16 mouthIndex = this->mouthIndex; - UNUSED s32 pad2; + STACK_PAD(s32); void* sp6C = sMouthTextures[mouthIndex]; SkelAnime* skelAnime = &this->skelAnime; @@ -792,10 +792,10 @@ void DemoSa_DrawNothing(DemoSa* this, PlayState* play) { } void DemoSa_DrawOpa(DemoSa* this, PlayState* play) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); s16 eyeIndex = this->eyeIndex; void* eyeTex = sEyeTextures[eyeIndex]; - UNUSED s32 pad2; + STACK_PAD(s32); s16 mouthIndex = this->mouthIndex; void* mouthTex = sMouthTextures[mouthIndex]; SkelAnime* skelAnime = &this->skelAnime; 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 cc169f5825b..13f466fdfb8 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -98,7 +98,7 @@ void DemoShd_Update(Actor* thisx, PlayState* play) { void DemoShd_Draw(Actor* thisx, PlayState* play) { DemoShd* this = (DemoShd*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); u32 unk_14E = this->unk_14E; if (1) {} // Necessary to match, can be anywhere in the function 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 434ad791fa8..aed4c1a5e34 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 @@ -81,7 +81,7 @@ void func_8099375C(DemoTreLgt* this, PlayState* play) { void func_809937B4(DemoTreLgt* this, PlayState* play, f32 currentFrame) { SkelCurve* skelCurve = &this->skelCurve; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); this->action = DEMO_TRE_LGT_ACTION_ANIMATE; @@ -132,7 +132,7 @@ void DemoTreLgt_Update(Actor* thisx, PlayState* play) { } s32 DemoTreLgt_OverrideLimbDraw(PlayState* play, SkelCurve* skelCurve, s32 limbIndex, void* thisx) { - UNUSED s32 pad; + STACK_PAD(s32); DemoTreLgt* this = (DemoTreLgt*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_demo_tre_lgt.c", 423); diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c index 76a1b2ee212..720daf9effe 100644 --- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c +++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c @@ -36,7 +36,7 @@ static InitChainEntry sInitChain[] = { }; void DoorGerudo_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); DoorGerudo* this = (DoorGerudo*)thisx; CollisionHeader* colHeader = NULL; 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 afe9d47c837..fd9093b603f 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -389,7 +389,7 @@ void DoorShutter_Init(Actor* thisx, PlayState* play2) { DoorShutter* this = (DoorShutter*)thisx; PlayState* play = play2; s32 styleType; - UNUSED s32 pad; + STACK_PAD(s32); s32 objectIndex; s32 i; @@ -488,7 +488,7 @@ void DoorShutter_WaitForObject(DoorShutter* this, PlayState* play) { * or returns the max float value if the player is too far left/right (`maxDistSides`) or above/below (`maxDistY`). */ f32 DoorShutter_GetPlayerDistance(PlayState* play, DoorShutter* this, f32 offsetY, f32 maxDistSides, f32 maxDistY) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f playerPos; Vec3f relPlayerPos; Player* player = GET_PLAYER(play); @@ -915,7 +915,7 @@ void DoorShutter_Draw(Actor* thisx, PlayState* play) { if (this->dyna.actor.objBankIndex == this->requiredObjBankIndex && (this->styleType == DOORSHUTTER_STYLE_PHANTOM_GANON || DoorShutter_ShouldDraw(this, play))) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); DoorShutterGfxInfo* gfxInfo = &sGfxInfo[this->gfxType]; OPEN_DISPS(play->state.gfxCtx, "../z_door_shutter.c", 2048); diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c index e3ca482729c..b0a86c72b8e 100644 --- a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c +++ b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c @@ -30,7 +30,7 @@ static InitChainEntry sInitChain[] = { }; void DoorToki_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); DoorToki* this = (DoorToki*)thisx; CollisionHeader* colHeader = NULL; 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 0a8965b1b9d..98f3ef87655 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -874,7 +874,7 @@ void DoorWarp1_Update(Actor* thisx, PlayState* play) { } void DoorWarp1_DrawBlueCrystal(DoorWarp1* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_door_warp1.c", 2078); @@ -892,7 +892,7 @@ void DoorWarp1_DrawBlueCrystal(DoorWarp1* this, PlayState* play) { } void DoorWarp1_DrawPurpleCrystal(DoorWarp1* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Vec3f eye; eye.x = -(Math_SinS(play->state.frames * 200) * 120.0f) * 80.0f; @@ -916,7 +916,7 @@ void DoorWarp1_DrawPurpleCrystal(DoorWarp1* this, PlayState* play) { } void DoorWarp1_DrawWarp(DoorWarp1* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); u32 spEC = play->state.frames * 10; f32 spE8 = (this->unk_194 >= 1.0f) ? 0.0f : 1.0f - this->unk_194; f32 spE4 = (this->unk_198 >= 1.0f) ? 0.0f : 1.0f - this->unk_198; diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c index ee8f9ed09e0..0045f22a9bb 100644 --- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c +++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c @@ -162,7 +162,7 @@ void EfcErupc_Draw(Actor* thisx, PlayState* play) { void EfcErupc_DrawEffects(EfcErupcEffect* effect, PlayState* play) { GraphicsContext* gfxCtx = play->state.gfxCtx; s16 i; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(gfxCtx, "../z_efc_erupc.c", 368); for (i = 0; i < EFC_ERUPC_EFFECT_COUNT; i++, effect++) { 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 605022c2b68..baa56f57cbb 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -205,7 +205,7 @@ s32 EnAm_CanMove(EnAm* this, PlayState* play, f32 distance, s16 yaw) { void EnAm_Init(Actor* thisx, PlayState* play) { CollisionHeader* colHeader = NULL; - UNUSED s32 pad; + STACK_PAD(s32); EnAm* this = (EnAm*)thisx; Actor_ProcessInitChain(&this->dyna.actor, sInitChain); @@ -240,7 +240,7 @@ void EnAm_Init(Actor* thisx, PlayState* play) { } void EnAm_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnAm* this = (EnAm*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -256,7 +256,7 @@ void EnAm_SpawnEffects(EnAm* this, PlayState* play) { Vec3f pos; Color_RGBA8 primColor = { 100, 100, 100, 0 }; Color_RGBA8 envColor = { 40, 40, 40, 0 }; - UNUSED s32 pad; + STACK_PAD(s32); for (i = 4; i > 0; i--) { pos.x = this->dyna.actor.world.pos.x + ((Rand_ZeroOne() - 0.5f) * 65.0f); @@ -366,7 +366,7 @@ void EnAm_SetupRicochet(EnAm* this, PlayState* play) { void EnAm_Sleep(EnAm* this, PlayState* play) { f32 cos; - UNUSED s32 pad; + STACK_PAD(s32); f32 rand; f32 sin; Player* player = GET_PLAYER(play); @@ -781,7 +781,7 @@ void EnAm_TransformSwordHitbox(Actor* thisx, PlayState* play) { } void EnAm_UpdateDamage(EnAm* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sparkPos; if (this->deathTimer == 0) { @@ -831,13 +831,13 @@ void EnAm_Update(Actor* thisx, PlayState* play) { static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; static Color_RGBA8 dustPrimColor = { 150, 150, 150, 255 }; static Color_RGBA8 dustEnvColor = { 100, 100, 100, 150 }; - UNUSED s32 pad1; + STACK_PAD(s32); EnAm* this = (EnAm*)thisx; EnBom* bomb; Vec3f dustPos; s32 i; f32 dustPosScale; - UNUSED s32 pad2; + STACK_PAD(s32); if (this->dyna.actor.params != ARMOS_STATUE) { EnAm_UpdateDamage(this, play); @@ -943,7 +943,7 @@ static Vec3f sIcePosOffsets[] = { }; void EnAm_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sp68; EnAm* this = (EnAm*)thisx; 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 377bdf77c4b..391809b986c 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -68,7 +68,7 @@ static InitChainEntry sInitChain[] = { }; void EnAni_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnAni* this = (EnAni*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -172,7 +172,7 @@ void func_809B064C(EnAni* this, PlayState* play) { } void func_809B07F8(EnAni* this, PlayState* play) { - UNUSED s16 pad; + STACK_PAD(s16); s16 yawDiff; u16 textId; @@ -234,7 +234,7 @@ void func_809B0A6C(EnAni* this, PlayState* play) { void EnAni_Update(Actor* thisx, PlayState* play) { EnAni* this = (EnAni*)thisx; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); @@ -316,7 +316,7 @@ void EnAni_Draw(Actor* thisx, PlayState* play) { gRoofManEyeClosedTex, }; EnAni* this = (EnAni*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_ani.c", 719); diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c index 81a100e7dd9..be4d038f8e8 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -318,7 +318,7 @@ void EnAnubice_Die(EnAnubice* this, PlayState* play) { f32 rotX; Vec3f baseFireEffectPos = { 0.0f, 0.0f, 0.0f }; Vec3f rotatedFireEffectPos = { 0.0f, 0.0f, 0.0f }; - UNUSED s32 pad; + STACK_PAD(s32); SkelAnime_Update(&this->skelAnime); Math_ApproachZeroF(&this->actor.shape.shadowScale, 0.4f, 0.25f); diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c index 98a564b897d..9c67bfd1453 100644 --- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c +++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c @@ -91,7 +91,7 @@ void func_809B26EC(EnAnubiceFire* this, PlayState* play) { } void func_809B27D8(EnAnubiceFire* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f velocity = { 0.0f, 0.0f, 0.0f }; Vec3f accel = { 0.0f, 0.0f, 0.0f }; Vec3f pos; @@ -147,7 +147,7 @@ void func_809B2B48(EnAnubiceFire* this, PlayState* play) { Vec3f pos; Color_RGBA8 primColor = { 255, 255, 0, 255 }; Color_RGBA8 envColor = { 255, 0, 0, 255 }; - UNUSED s32 pad; + STACK_PAD(s32); s32 i; if (this->unk_15C == 0) { @@ -171,7 +171,7 @@ void func_809B2B48(EnAnubiceFire* this, PlayState* play) { void EnAnubiceFire_Update(Actor* thisx, PlayState* play) { EnAnubiceFire* this = (EnAnubiceFire*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s32 i; Actor_SetScale(&this->actor, this->scale); @@ -218,7 +218,7 @@ void EnAnubiceFire_Draw(Actor* thisx, PlayState* play) { gDust4Tex, gDust5Tex, gDust6Tex, gDust7Tex, gDust8Tex, gDust7Tex, gDust6Tex, gDust5Tex, }; EnAnubiceFire* this = (EnAnubiceFire*)thisx; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s32 i; OPEN_DISPS(play->state.gfxCtx, "../z_en_anubice_fire.c", 503); 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 9211779012c..7c3066e72ae 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -385,7 +385,7 @@ void func_809B4640(EnArrow* this, PlayState* play) { } void EnArrow_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnArrow* this = (EnArrow*)thisx; Player* player = GET_PLAYER(play); @@ -449,7 +449,7 @@ void func_809B4800(EnArrow* this, PlayState* play) { } void EnArrow_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnArrow* this = (EnArrow*)thisx; u8 alpha; f32 scale; 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 225c52e26c8..b08a7a32060 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 @@ -39,7 +39,7 @@ static InitChainEntry sInitChain[] = { void EnAttackNiw_Init(Actor* thisx, PlayState* play) { EnAttackNiw* this = (EnAttackNiw*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Actor_ProcessInitChain(&this->actor, sInitChain); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 25.0f); @@ -297,7 +297,7 @@ void EnAttackNiw_Update(Actor* thisx, PlayState* play) { EnAttackNiw* this = (EnAttackNiw*)thisx; EnNiw* cucco; Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sp30; PlayState* play2 = play; diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/src/overlays/actors/ovl_En_Ba/z_en_ba.c index b252debcc43..a99a2dde117 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -91,7 +91,7 @@ static InitChainEntry sInitChain[] = { void EnBa_Init(Actor* thisx, PlayState* play) { EnBa* this = (EnBa*)thisx; Vec3f sp38 = D_809B80E4; - UNUSED s32 pad; + STACK_PAD(s32); s16 i; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -140,7 +140,7 @@ void EnBa_SetupIdle(EnBa* this) { void EnBa_Idle(EnBa* this, PlayState* play) { Player* player = GET_PLAYER(play); s32 i; - UNUSED s32 pad; + STACK_PAD(s32); Vec3s sp5C; if ((this->actor.colChkInfo.mass == MASS_IMMOVABLE) && (this->actor.xzDistToPlayer > 175.0f)) { @@ -473,7 +473,7 @@ static void* D_809B8118[] = { void EnBa_Draw(Actor* thisx, PlayState* play) { EnBa* this = (EnBa*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s16 i; Mtx* mtx = Graph_Alloc(play->state.gfxCtx, sizeof(Mtx) * 14); UNUSED Vec3f unused = { 0.0f, 0.0f, 448.0f }; 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 e70c484e693..6a438ba0daa 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -307,7 +307,7 @@ void EnBb_KillFlameTrail(EnBb* this) { void EnBb_Init(Actor* thisx, PlayState* play) { EffectBlureInit1 blureInit; - UNUSED s32 pad; + STACK_PAD(s32); EnBb* this = (EnBb*)thisx; Actor_ProcessInitChain(thisx, sInitChain); @@ -399,7 +399,7 @@ void EnBb_Init(Actor* thisx, PlayState* play) { } void EnBb_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnBb* this = (EnBb*)thisx; Collider_DestroyJntSph(play, &this->collider); @@ -1277,7 +1277,7 @@ static Vec3f sFireIceOffsets[] = { }; void EnBb_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnBb* this = (EnBb*)thisx; Vec3f blureBase1 = { 0.0f, 5000.0f, 0.0f }; Vec3f blureBase2 = { 0.0f, 2000.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c index 67e5bb086f4..10cd966d292 100644 --- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c +++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c @@ -40,7 +40,7 @@ void EnbdFire_SetupDraw(EnBdfire* this, EnBdfireDrawFunc drawFunc) { void EnBdfire_Init(Actor* thisx, PlayState* play) { EnBdfire* this = (EnBdfire*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Actor_SetScale(&this->actor, 0.6f); EnbdFire_SetupDraw(this, EnBdfire_DrawFire); @@ -191,7 +191,7 @@ void EnBdfire_DrawFire(EnBdfire* this, PlayState* play) { object_kingdodongo_Tex_02C4E0, object_kingdodongo_Tex_02D4E0, }; s16 texIndex; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_bdfire.c", 612); texIndex = this->unk_156 & 7; 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 fa20451dbe4..60e9b8228a9 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -477,7 +477,7 @@ void func_809BDB90(EnBigokuta* this, PlayState* play) { void func_809BDC08(EnBigokuta* this, PlayState* play) { Player* player = GET_PLAYER(play); s16 phi_v0; - UNUSED s16 pad; + STACK_PAD(s16); s16 phi_v1; Vec3f sp28; diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c index 40f370e9c33..a5a219825cb 100644 --- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c +++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c @@ -54,7 +54,7 @@ void EnBlkobj_SetupAction(EnBlkobj* this, EnBlkobjActionFunc actionFunc) { } void EnBlkobj_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnBlkobj* this = (EnBlkobj*)thisx; CollisionHeader* colHeader = NULL; @@ -71,7 +71,7 @@ void EnBlkobj_Init(Actor* thisx, PlayState* play) { } void EnBlkobj_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnBlkobj* this = (EnBlkobj*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -120,7 +120,7 @@ void EnBlkobj_DoNothing(EnBlkobj* this, PlayState* play) { } void EnBlkobj_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnBlkobj* this = (EnBlkobj*)thisx; this->actionFunc(this, play); @@ -145,7 +145,7 @@ void EnBlkobj_DrawAlpha(PlayState* play, Gfx* dList, s32 alpha) { } void EnBlkobj_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnBlkobj* this = (EnBlkobj*)thisx; s32 illusionAlpha; u32 gameplayFrames; 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 65d30cf54a5..3fd011378fe 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -224,7 +224,7 @@ void EnBom_Update(Actor* thisx, PlayState* play2) { Vec3f effPos; Vec3f dustAccel = { 0.0f, 0.6f, 0.0f }; Color_RGBA8 dustColor = { 255, 255, 255, 255 }; - UNUSED s32 pad; + STACK_PAD(s32); PlayState* play = play2; EnBom* this = (EnBom*)thisx; @@ -355,7 +355,7 @@ void EnBom_Update(Actor* thisx, PlayState* play2) { } void EnBom_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnBom* this = (EnBom*)thisx; if (1) {} 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 6ef9c65f23d..8648d058294 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 @@ -380,7 +380,7 @@ static s16 sPrizeRot[] = { 0x4268, 0x4268, -0x03E8, 0x0000, 0x4268, 0x0000 }; void EnBomBowMan_ChooseShowPrize(EnBomBowlMan* this, PlayState* play) { s16 prizeTemp; - UNUSED s32 pad; + STACK_PAD(s32); SkelAnime_Update(&this->skelAnime); 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 20cd95da9d5..4690b3709c9 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 @@ -477,7 +477,7 @@ void EnBomChu_Update(Actor* thisx, PlayState* play2) { } void EnBomChu_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnBomChu* this = (EnBomChu*)thisx; f32 colorIntensity; s32 blinkHalfPeriod; 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 fbb2739beda..7126932085c 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -86,7 +86,7 @@ void EnBombf_SetupAction(EnBombf* this, EnBombfActionFunc actionFunc) { void EnBombf_Init(Actor* thisx, PlayState* play) { f32 shapeUnk10 = 0.0f; - UNUSED s32 pad; + STACK_PAD(s32); EnBombf* this = (EnBombf*)thisx; Actor_SetScale(thisx, 0.01f); @@ -143,9 +143,9 @@ void EnBombf_SetupGrowBomb(EnBombf* this, s16 params) { void EnBombf_GrowBomb(EnBombf* this, PlayState* play) { EnBombf* bombFlower; - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); Player* player = GET_PLAYER(play); - UNUSED s32 pad2; + STACK_PAD(s32); if (this->flowerBombScale >= 1.0f) { if (Actor_HasParent(&this->actor, play)) { @@ -316,7 +316,7 @@ void EnBombf_Update(Actor* thisx, PlayState* play) { Vec3f effPos; Vec3f dustAccel = { 0.0f, 0.6f, 0.0f }; Color_RGBA8 dustColor = { 255, 255, 255, 255 }; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); EnBombf* this = (EnBombf*)thisx; if ((this->isFuseEnabled) && (this->timer != 0)) { @@ -478,7 +478,7 @@ Gfx* EnBombf_NewMtxDList(GraphicsContext* gfxCtx, PlayState* play) { } void EnBombf_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnBombf* this = (EnBombf*)thisx; if (1) {} 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 ffb6775cf94..973a4229b62 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -112,13 +112,13 @@ void EnBoom_Fly(EnBoom* this, PlayState* play) { s16 yawDiff; s16 pitchTarget; s16 pitchDiff; - UNUSED s32 pad1; + STACK_PAD(s32); f32 distXYZScale; f32 distFromLink; DynaPolyActor* hitActor; s32 hitDynaID; Vec3f hitPoint; - UNUSED s32 pad2; + STACK_PAD(s32); player = GET_PLAYER(play); target = this->moveTo; 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 f9c64a34e2f..82428a17e1a 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -390,7 +390,7 @@ void EnBox_WaitOpen(EnBox* this, PlayState* play) { f32 frameCount; AnimationHeader* anim; s32 linkAge; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sp4C; Player* player; @@ -545,7 +545,7 @@ void EnBox_Update(Actor* thisx, PlayState* play) { void EnBox_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) { EnBox* this = (EnBox*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (limbIndex == 1) { gSPMatrix((*gfx)++, Matrix_NewMtx(play->state.gfxCtx, "../z_en_box.c", 1492), diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.c b/src/overlays/actors/ovl_En_Brob/z_en_brob.c index 0fba44f51dd..510e1e17c0e 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.c +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.c @@ -57,7 +57,7 @@ static ColliderCylinderInit sCylinderInit = { static CollisionCheckInfoInit sColChkInfoInit = { 0, 60, 120, MASS_IMMOVABLE }; void EnBrob_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnBrob* this = (EnBrob*)thisx; CollisionHeader* colHeader = NULL; 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 256be21b533..6dbb644f9c2 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -331,7 +331,7 @@ void func_809CC774(EnBubble* this) { void EnBubble_Init(Actor* thisx, PlayState* play) { EnBubble* this = (EnBubble*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 16.0f, ActorShadow_DrawCircle, 0.2f); Collider_InitJntSph(play, &this->colliderSphere); @@ -407,7 +407,7 @@ void EnBubble_Update(Actor* thisx, PlayState* play) { void EnBubble_Draw(Actor* thisx, PlayState* play) { EnBubble* this = (EnBubble*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_bubble.c", 1175); diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index 14e7537d9c8..ca2c147ad6f 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -154,7 +154,7 @@ void EnBw_Init(Actor* thisx, PlayState* play) { } void EnBw_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnBw* this = (EnBw*)thisx; Collider_DestroyCylinder(play, &this->collider1); @@ -744,7 +744,7 @@ void EnBw_Update(Actor* thisx, PlayState* play2) { EnBw* this = (EnBw*)thisx; Vec3f velocity = { 0.0f, 0.0f, 0.0f }; Vec3f accel = { 0.0f, 0.0f, 0.0f }; - UNUSED s32 pad[3]; // probably an unused Vec3f + STACK_PADS(s32, 3); // probably an unused Vec3f Color_RGBA8 sp50 = { 255, 200, 0, 255 }; Color_RGBA8 sp4C = { 255, 80, 0, 255 }; Color_RGBA8 sp48 = { 0, 0, 0, 255 }; diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/src/overlays/actors/ovl_En_Bx/z_en_bx.c index a24c6c50c62..e3eaeac4ef6 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -74,7 +74,7 @@ void EnBx_Init(Actor* thisx, PlayState* play) { ICHAIN_F32(targetArrowOffset, 5300, ICHAIN_STOP), }; s32 i; - UNUSED s32 pad; + STACK_PAD(s32); Actor_ProcessInitChain(&this->actor, sInitChain); thisx->scale.x = thisx->scale.z = 0.01f; @@ -201,7 +201,7 @@ void EnBx_Draw(Actor* thisx, PlayState* play) { object_bxa_Tex_0029F0, }; EnBx* this = (EnBx*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Mtx* mtx = Graph_Alloc(play->state.gfxCtx, 4 * sizeof(Mtx)); s16 i; 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 f8e6ec7d8b1..75c960fa05f 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 @@ -341,7 +341,7 @@ void EnClearTag_Update(Actor* thisx, PlayState* play2) { s16 worldRotationTargetY; f32 loseTargetLockDistance; s16 worldRotationTargetZ; - UNUSED s32 pad; + STACK_PAD(s32); // Check if the Arwing should crash. if (this->collider.base.acFlags & AC_HIT) { @@ -679,7 +679,7 @@ void EnClearTag_Update(Actor* thisx, PlayState* play2) { * Arwing clear tage types will draw the Arwing, the backfire, and a shadow. */ void EnClearTag_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnClearTag* this = (EnClearTag*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_clear_tag.c", 983); 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 639e5c2342a..d49cfca5efd 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -103,7 +103,7 @@ void func_809DEF94(EnCow* this) { void EnCow_Init(Actor* thisx, PlayState* play) { EnCow* this = (EnCow*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 72.0f); switch (this->actor.params) { @@ -341,7 +341,7 @@ void EnCow_Update(Actor* thisx, PlayState* play2) { void func_809DFE98(Actor* thisx, PlayState* play) { EnCow* this = (EnCow*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (SkelAnime_Update(&this->skelAnime)) { if (this->skelAnime.animation == &gCowTailIdleAnim) { 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 ac3b74121b8..cdd3e57d596 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -427,7 +427,7 @@ void EnCrow_UpdateDamage(EnCrow* this, PlayState* play) { void EnCrow_Update(Actor* thisx, PlayState* play) { EnCrow* this = (EnCrow*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); f32 height; f32 scale; diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c index 8edad578bd3..0e412a1b77b 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c @@ -122,7 +122,7 @@ void EnCs_ChangeAnim(EnCs* this, s32 index, s32* currentIndex) { void EnCs_Init(Actor* thisx, PlayState* play) { EnCs* this = (EnCs*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (!IS_DAY) { Actor_Kill(&this->actor); @@ -163,7 +163,7 @@ void EnCs_Destroy(Actor* thisx, PlayState* play) { } s32 EnCs_GetTalkState(EnCs* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s32 talkState = 1; switch (Message_GetState(&play->msgCtx)) { @@ -225,7 +225,7 @@ s32 EnCs_GetTextID(EnCs* this, PlayState* play) { } void EnCs_HandleTalking(EnCs* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16 sp2A; s16 sp28; @@ -417,7 +417,7 @@ void EnCs_Talk(EnCs* this, PlayState* play) { void EnCs_Update(Actor* thisx, PlayState* play) { static s32 eyeBlinkFrames[] = { 70, 1, 1 }; EnCs* this = (EnCs*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (this->currentAnimIndex == 0) { if (((s32)this->skelAnime.curFrame == 9) || ((s32)this->skelAnime.curFrame == 23)) { @@ -458,7 +458,7 @@ void EnCs_Draw(Actor* thisx, PlayState* play) { gGraveyardKidEyesClosedTex, }; EnCs* this = (EnCs*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_cs.c", 968); 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 15ba1f497f9..1ed94b096c0 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -148,7 +148,7 @@ void EnDaiku_ChangeAnim(EnDaiku* this, s32 index, s32* currentIndex) { void EnDaiku_Init(Actor* thisx, PlayState* play) { EnDaiku* this = (EnDaiku*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s32 noKill = true; s32 isFree = false; @@ -437,7 +437,7 @@ void EnDaiku_EscapeRotate(EnDaiku* this, PlayState* play) { } void EnDaiku_InitSubCamera(EnDaiku* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f eyePosDeltaLocal; Vec3f eyePosDeltaWorld; @@ -471,7 +471,7 @@ void EnDaiku_InitSubCamera(EnDaiku* this, PlayState* play) { } void EnDaiku_UpdateSubCamera(EnDaiku* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); this->subCamAtNext.x = this->actor.world.pos.x; this->subCamAtNext.y = this->actor.world.pos.y + 60.0f; @@ -511,12 +511,12 @@ void EnDaiku_EscapeSuccess(EnDaiku* this, PlayState* play) { * The carpenter is running away */ void EnDaiku_EscapeRun(EnDaiku* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); Path* path; s16 ry; f32 dx; f32 dz; - UNUSED s32 pad2; + STACK_PAD(s32); f32 dxz; Vec3s* pointPos; diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index eac9679b0af..e7f0cbf014d 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -126,7 +126,7 @@ void EnDaikuKakariko_ChangeAnim(EnDaikuKakariko* this, s32 index, s32* currentIn void EnDaikuKakariko_Init(Actor* thisx, PlayState* play) { static u16 initFlags[] = { 0x0080, 0x00B0, 0x0070, 0x0470 }; // List of inital values for this->flags EnDaikuKakariko* this = (EnDaikuKakariko*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (LINK_AGE_IN_YEARS == YEARS_CHILD) { switch (play->sceneId) { @@ -348,7 +348,7 @@ void EnDaikuKakariko_StopRunning(EnDaikuKakariko* this, PlayState* play) { } void EnDaikuKakariko_Run(EnDaikuKakariko* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Path* path; Vec3s* pathPos; f32 xDist; @@ -452,9 +452,9 @@ void EnDaikuKakariko_Run(EnDaikuKakariko* this, PlayState* play) { void EnDaikuKakariko_Update(Actor* thisx, PlayState* play) { EnDaikuKakariko* this = (EnDaikuKakariko*)thisx; - UNUSED s32 pad1; + STACK_PAD(s32); Player* player = GET_PLAYER(play); - UNUSED s32 pad2; + STACK_PAD(s32); if (this->currentAnimIndex == 3) { if (((s32)this->skelAnime.curFrame == 6) || ((s32)this->skelAnime.curFrame == 15)) { 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 c0cb2db2067..e1e317cb6d7 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -1109,7 +1109,7 @@ void EnDekubaba_UpdateDamage(EnDekubaba* this, PlayState* play) { } void EnDekubaba_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnDekubaba* this = (EnDekubaba*)thisx; if (this->collider.base.atFlags & AT_HIT) { 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 5e24ac95873..5ea45a33670 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -107,7 +107,7 @@ static InitChainEntry sInitChain[] = { void EnDekunuts_Init(Actor* thisx, PlayState* play) { EnDekunuts* this = (EnDekunuts*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Actor_ProcessInitChain(&this->actor, sInitChain); if (thisx->params == DEKUNUTS_FLOWER) { @@ -421,7 +421,7 @@ void EnDekunuts_BeStunned(EnDekunuts* this, PlayState* play) { void EnDekunuts_Die(EnDekunuts* this, PlayState* play) { static Vec3f effectVelAndAccel = { 0.0f, 0.0f, 0.0f }; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f effectPos; if (SkelAnime_Update(&this->skelAnime)) { @@ -468,7 +468,7 @@ void EnDekunuts_ColliderCheck(EnDekunuts* this, PlayState* play) { void EnDekunuts_Update(Actor* thisx, PlayState* play) { EnDekunuts* this = (EnDekunuts*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (this->actor.params != DEKUNUTS_FLOWER) { EnDekunuts_ColliderCheck(this, play); diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index 8bf73cfd297..70ee597c60b 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -157,7 +157,7 @@ void EnDh_Init(Actor* thisx, PlayState* play) { } void EnDh_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnDh* this = (EnDh*)thisx; func_800F5B58(); @@ -296,7 +296,7 @@ void EnDh_SetupAttack(EnDh* this) { } void EnDh_Attack(EnDh* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); if (SkelAnime_Update(&this->skelAnime)) { this->actionState++; @@ -470,7 +470,7 @@ void EnDh_Death(EnDh* this, PlayState* play) { } void EnDh_CollisionCheck(EnDh* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); s32 lastHealth; @@ -501,10 +501,10 @@ void EnDh_CollisionCheck(EnDh* this, PlayState* play) { } void EnDh_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); EnDh* this = (EnDh*)thisx; Player* player = GET_PLAYER(play); - UNUSED s32 pad2; + STACK_PAD(s32); EnDh_CollisionCheck(this, play); this->actionFunc(this, play); @@ -547,7 +547,7 @@ void EnDh_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, } void EnDh_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnDh* this = (EnDh*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_dh.c", 1099); diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index 116033c441b..682bb1b6aea 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -172,7 +172,7 @@ void EnDha_Init(Actor* thisx, PlayState* play) { } void EnDha_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnDha* this = (EnDha*)thisx; Collider_DestroyJntSph(play, &this->collider); @@ -193,7 +193,7 @@ void EnDha_Wait(EnDha* this, PlayState* play) { Vec3f armPosMultiplier1 = { 0.0f, 0.0f, 55.0f }; Vec3f armPosMultiplier2 = { 0.0f, 0.0f, -54.0f }; Player* player = GET_PLAYER(play); - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Vec3f playerPos = player->actor.world.pos; Vec3s angle; s16 yaw; @@ -401,7 +401,7 @@ void EnDha_UpdateHealth(EnDha* this, PlayState* play) { } void EnDha_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnDha* this = (EnDha*)thisx; if (this->actor.parent == NULL) { @@ -455,7 +455,7 @@ void EnDha_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, } void EnDha_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnDha* this = (EnDha*)thisx; Gfx_SetupDL_25Opa(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index fa6067a707a..ca2a533d1b8 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -546,7 +546,7 @@ Gfx* EnDivingGame_EmptyDList(GraphicsContext* gfxCtx) { s32 EnDivingGame_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { EnDivingGame* this = (EnDivingGame*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (limbIndex == 6) { rot->x += this->vec_28A.y; @@ -567,7 +567,7 @@ s32 EnDivingGame_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, V void EnDivingGame_Draw(Actor* thisx, PlayState* play) { EnDivingGame* this = (EnDivingGame*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_diving_game.c", 1212); Gfx_SetupDL_25Opa(play->state.gfxCtx); 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 46bf64a8994..9218a20a070 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -473,7 +473,7 @@ void EnDns_Burrow(EnDns* this, PlayState* play) { void EnDns_Update(Actor* thisx, PlayState* play) { EnDns* this = (EnDns*)thisx; - UNUSED s16 pad; + STACK_PAD(s16); this->dustTimer++; this->actor.textId = D_809F040C[this->actor.params]; diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c index 7fac302fcb5..c4abce37ebd 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c @@ -72,7 +72,7 @@ void EnDntDemo_Init(Actor* thisx, PlayState* play2) { PlayState* play = play2; EnDntDemo* this = (EnDntDemo*)thisx; s32 i; - UNUSED s32 pad; + STACK_PAD(s32); osSyncPrintf("\n\n"); // "Deku Scrub mask show start" @@ -314,7 +314,7 @@ void EnDntDemo_Prize(EnDntDemo* this, PlayState* play) { } void EnDntDemo_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnDntDemo* this = (EnDntDemo*)thisx; if (this->unkTimer2 != 0) { diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index b2b799922ed..35c456191fa 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -90,7 +90,7 @@ void EnDntJiji_Init(Actor* thisx, PlayState* play) { } void EnDntJiji_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnDntJiji* this = (EnDntJiji*)thisx; Collider_DestroyCylinder(play, &this->collider); @@ -368,7 +368,7 @@ void EnDntJiji_Return(EnDntJiji* this, PlayState* play) { } void EnDntJiji_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnDntJiji* this = (EnDntJiji*)thisx; Actor_SetScale(&this->actor, 0.015f); diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index 85e9c114246..31c0da666b2 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -115,7 +115,7 @@ static Color_RGBA8 sLeafColors[] = { }; void EnDntNomal_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnDntNomal* this = (EnDntNomal*)thisx; this->type = this->actor.params; @@ -158,7 +158,7 @@ void EnDntNomal_Init(Actor* thisx, PlayState* play) { } void EnDntNomal_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnDntNomal* this = (EnDntNomal*)thisx; if (this->type == ENDNTNOMAL_TARGET) { @@ -735,7 +735,7 @@ void EnDntNomal_StageReturn(EnDntNomal* this, PlayState* play) { } void EnDntNomal_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnDntNomal* this = (EnDntNomal*)thisx; if (this->timer1 != 0) { @@ -850,7 +850,7 @@ void EnDntNomal_DrawStageScrub(Actor* thisx, PlayState* play) { static void* blinkTex[] = { gDntStageEyeOpenTex, gDntStageEyeHalfTex, gDntStageEyeShutTex }; EnDntNomal* this = (EnDntNomal*)thisx; Vec3f dustScale = { 0.25f, 0.25f, 0.25f }; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_dnt_nomal.c", 1790); Gfx_SetupDL_25Opa(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c index 499622aaf51..4329185a48b 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -276,7 +276,7 @@ s32 EnDodojr_TryEatBomb(EnDodojr* this) { void EnDodojr_UpdateCrawl(EnDodojr* this, PlayState* play) { f32 angles[] = { 0.0f, 210.0f, 60.0f, 270.0f, 120.0f, 330.0f, 180.0f, 30.0f, 240.0f, 90.0f, 300.0f, 150.0f }; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); Vec3f crawlTargetPos; s16 angleIndex; 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 40000bf9f02..5f7f12401c9 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -239,7 +239,7 @@ void EnDodongo_SetupAction(EnDodongo* this, EnDodongoActionFunc actionFunc) { } void EnDodongo_SpawnBombSmoke(EnDodongo* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f velocity = { 0.0f, 0.0f, 0.0f }; Vec3f accel = { 0.0f, 0.3f, 0.0f }; Vec3f pos = this->headPos; @@ -346,7 +346,7 @@ void EnDodongo_Init(Actor* thisx, PlayState* play) { } void EnDodongo_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnDodongo* this = (EnDodongo*)thisx; Effect_Delete(play, this->blureIdx); @@ -422,11 +422,11 @@ void EnDodongo_EndBreatheFire(EnDodongo* this, PlayState* play) { } void EnDodongo_BreatheFire(EnDodongo* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); Vec3f velocity = { 0.0f, 0.0f, 0.0f }; Vec3f accel = { 0.0f, 0.0f, 0.0f }; Vec3f pos; - UNUSED s16 pad2; + STACK_PAD(s16); s16 fireFrame; if ((s32)this->skelAnime.curFrame == 24) { @@ -456,7 +456,7 @@ void EnDodongo_SwallowBomb(EnDodongo* this, PlayState* play) { Vec3f deathFireAccel = { 0.0f, 1.0f, 0.0f }; s16 i; Vec3f pos; - UNUSED s32 pad; + STACK_PAD(s32); if (this->actor.child != NULL) { this->actor.child->world.pos = this->mouthPos; @@ -525,7 +525,7 @@ void EnDodongo_SwallowBomb(EnDodongo* this, PlayState* play) { } void EnDodongo_Walk(EnDodongo* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 playbackSpeed; Player* player = GET_PLAYER(play); s16 yawDiff = (s16)(this->actor.yawTowardsPlayer - this->actor.shape.rot.y); @@ -742,7 +742,7 @@ void EnDodongo_UpdateQuad(EnDodongo* this, PlayState* play) { Vec3f sp88 = { -1000.0f, -200.0f, 1500.0f }; Vec3f sp7C = { -1000.0f, -200.0f, -1500.0f }; Vec3f sp70 = { 0.0f, 0.0f, 0.0f }; - UNUSED s32 pad[9]; // Possibly 3 more Vec3fs? + STACK_PADS(s32, 9); // Possibly 3 more Vec3fs? s32 a = 0; s32 b = 1; // These indices are needed to match. s32 c = 2; // Might be a way to quickly test vertex arrangements @@ -763,7 +763,7 @@ void EnDodongo_UpdateQuad(EnDodongo* this, PlayState* play) { } void EnDodongo_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnDodongo* this = (EnDodongo*)thisx; EnDodongo_CollisionCheck(this, play); diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index 21caaeffae8..ce2a4ff876f 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -242,7 +242,7 @@ s32 EnDog_Orient(EnDog* this, PlayState* play) { void EnDog_Init(Actor* thisx, PlayState* play) { EnDog* this = (EnDog*)thisx; s16 followingDog; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gDogSkel, NULL, this->jointTable, this->morphTable, 13); @@ -449,7 +449,7 @@ void EnDog_Wait(EnDog* this, PlayState* play) { void EnDog_Update(Actor* thisx, PlayState* play) { EnDog* this = (EnDog*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); EnDog_PlayAnimAndSFX(this); SkelAnime_Update(&this->skelAnime); 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 42ed3284911..80f5704bcf0 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -327,10 +327,10 @@ void EnDoor_Update(Actor* thisx, PlayState* play) { } s32 EnDoor_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { - UNUSED s32 pad1; + STACK_PAD(s32); TransitionActorEntry* transitionEntry; Gfx** doorDLists; - UNUSED s32 pad2; + STACK_PAD(s32); s16 rotDiff; s32 doorDListIndex; EnDoor* this = (EnDoor*)thisx; diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c index 2368009fa97..1d348fc9c11 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.c +++ b/src/overlays/actors/ovl_En_Du/z_en_du.c @@ -278,7 +278,7 @@ void func_809FE104(EnDu* this) { void EnDu_Init(Actor* thisx, PlayState* play) { EnDu* this = (EnDu*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gDaruniaSkel, NULL, NULL, NULL, 0); @@ -535,7 +535,7 @@ void func_809FECE4(EnDu* this, PlayState* play) { void EnDu_Update(Actor* thisx, PlayState* play) { EnDu* this = (EnDu*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); 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 297480c55a5..eeffab8afa1 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 @@ -93,7 +93,7 @@ void EnDyExtra_Draw(Actor* thisx, PlayState* play) { static u8 D_809FFC50[] = { 0x02, 0x01, 0x01, 0x02, 0x00, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x02, 0x01, 0x00, 0x01, 0x02, 0x00 }; EnDyExtra* this = (EnDyExtra*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); GraphicsContext* gfxCtx = play->state.gfxCtx; Vtx* vertices = SEGMENTED_TO_VIRTUAL(gGreatFairySpiralBeamVtx); s32 i; diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index 83d398f8041..19ca7f03ad5 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -117,7 +117,7 @@ static InitChainEntry sInitChain[] = { */ void EnEiyer_Init(Actor* thisx, PlayState* play) { EnEiyer* this = (EnEiyer*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Actor_ProcessInitChain(&this->actor, sInitChain); ActorShape_Init(&this->actor.shape, 600.0f, ActorShadow_DrawCircle, 65.0f); @@ -409,7 +409,7 @@ void EnEiyer_Ambush(EnEiyer* this, PlayState* play) { void EnEiyer_Glide(EnEiyer* this, PlayState* play) { f32 curFrame; - UNUSED s32 pad; + STACK_PAD(s32); s16 yawChange; SkelAnime_Update(&this->skelanime); @@ -635,7 +635,7 @@ void EnEiyer_UpdateDamage(EnEiyer* this, PlayState* play) { void EnEiyer_Update(Actor* thisx, PlayState* play) { EnEiyer* this = (EnEiyer*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); EnEiyer_UpdateDamage(this, play); this->actionFunc(this, play); 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 a05be85cdae..fdc35ffeaac 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -313,7 +313,7 @@ f32 EnElf_GetColorValue(s32 colorFlag) { void EnElf_Init(Actor* thisx, PlayState* play) { EnElf* this = (EnElf*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); s32 colorConfig; s32 i; @@ -433,7 +433,7 @@ void func_80A029A8(EnElf* this, s16 increment) { } void EnElf_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnElf* this = (EnElf*)thisx; LightContext_RemoveLight(play, &play->lightCtx, this->lightNodeGlow); @@ -537,7 +537,7 @@ void func_80A02F2C(EnElf* this, Vec3f* targetPos) { } void func_80A03018(EnElf* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Player* player = GET_PLAYER(play); s16 targetYaw; Vec3f* unk_28C = &this->unk_28C; @@ -599,7 +599,7 @@ void func_80A03148(EnElf* this, Vec3f* arg1, f32 arg2, f32 arg3, f32 arg4) { void func_80A0329C(EnElf* this, PlayState* play) { Player* refActor = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); f32 heightDiff; @@ -1184,7 +1184,7 @@ void func_80A0461C(EnElf* this, PlayState* play) { void EnElf_SpawnSparkles(EnElf* this, PlayState* play, s32 sparkleLife) { static Vec3f sparkleVelocity = { 0.0f, -0.05f, 0.0f }; static Vec3f sparkleAccel = { 0.0f, -0.025f, 0.0f }; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sparklePos; Color_RGBA8 primColor; Color_RGBA8 envColor; @@ -1206,7 +1206,7 @@ void EnElf_SpawnSparkles(EnElf* this, PlayState* play, s32 sparkleLife) { } void func_80A04D90(EnElf* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 bgId; this->actor.floorHeight = BgCheck_EntityRaycastDown5(play, &play->colCtx, &this->actor.floorPoly, &bgId, @@ -1372,7 +1372,7 @@ void func_80A052F4(Actor* thisx, PlayState* play) { void func_80A053F0(Actor* thisx, PlayState* play) { u8 unk2C7; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); EnElf* this = (EnElf*)thisx; @@ -1457,7 +1457,7 @@ void func_80A053F0(Actor* thisx, PlayState* play) { } void EnElf_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnElf* this = (EnElf*)thisx; this->actionFunc(this, play); @@ -1472,7 +1472,7 @@ void EnElf_Update(Actor* thisx, PlayState* play) { s32 EnElf_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) { static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; - UNUSED s32 pad; + STACK_PAD(s32); f32 scale; Vec3f mtxMult; EnElf* this = (EnElf*)thisx; @@ -1501,11 +1501,11 @@ s32 EnElf_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p } void EnElf_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); f32 alphaScale; s32 envAlpha; EnElf* this = (EnElf*)thisx; - UNUSED s32 pad2; + STACK_PAD(s32); Gfx* dListHead; Player* player = GET_PLAYER(play); 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 b33c90f318f..942aefdaf8e 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -27,7 +27,7 @@ ActorInit En_Encount1_InitVars = { }; void EnEncount1_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnEncount1* this = (EnEncount1*)thisx; f32 spawnRange; @@ -313,7 +313,7 @@ void EnEncount1_SpawnStalchildOrWolfos(EnEncount1* this, PlayState* play) { } void EnEncount1_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnEncount1* this = (EnEncount1*)thisx; if (this->timer != 0) { 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 424d022b4d4..a4fa7b2d2a3 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -61,7 +61,7 @@ void EnEncount2_Init(Actor* thisx, PlayState* play) { } void EnEncount2_Wait(EnEncount2* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16 quakeIndex; s16 spawnerState; Player* player = GET_PLAYER(play); diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c index ec71cf1ca88..adfb9432509 100644 --- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c +++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c @@ -48,7 +48,7 @@ void EnExItem_Destroy(Actor* thisx, PlayState* play) { } void EnExItem_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnExItem* this = (EnExItem*)thisx; this->actor.flags &= ~ACTOR_FLAG_0; @@ -258,7 +258,7 @@ void EnExItem_WaitForObject(EnExItem* this, PlayState* play) { } void EnExItem_BowlPrize(EnExItem* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 tmpf1; f32 tmpf2; f32 tmpf3; @@ -420,7 +420,7 @@ void EnExItem_TargetPrizeFinish(EnExItem* this, PlayState* play) { } void EnExItem_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnExItem* this = (EnExItem*)thisx; if (this->timer != 0) { @@ -436,7 +436,7 @@ void EnExItem_Update(Actor* thisx, PlayState* play) { } void EnExItem_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnExItem* this = (EnExItem*)thisx; s32 magicType; diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index b9afd0f1b28..4bf863f5eba 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -247,7 +247,7 @@ void EnExRuppy_EnterWater(EnExRuppy* this, PlayState* play) { void EnExRuppy_Sink(EnExRuppy* this, PlayState* play) { EnDivingGame* divingGame; Vec3f pos; - UNUSED s32 pad; + STACK_PAD(s32); if ((this->actor.bgCheckFlags & BGCHECKFLAG_WATER) && (this->actor.yDistToWater > 15.0f)) { pos = this->actor.world.pos; @@ -378,7 +378,7 @@ void EnExRuppy_Draw(Actor* thisx, PlayState* play) { static void* rupeeTextures[] = { gRupeeGreenTex, gRupeeBlueTex, gRupeeRedTex, gRupeePinkTex, gRupeeOrangeTex, }; - UNUSED s32 pad; + STACK_PAD(s32); EnExRuppy* this = (EnExRuppy*)thisx; if (!this->invisible) { diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c index a9100ec017a..7baf76d2fea 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -321,7 +321,7 @@ s32 EnFd_CanSeeActor(EnFd* this, Actor* actor, PlayState* play) { s32 bgId; Vec3f colPoint; s16 angle; - UNUSED s32 pad; + STACK_PAD(s32); // Check to see if `actor` is within 400 units of `this` if (Math_Vec3f_DistXYZ(&this->actor.world.pos, &actor->world.pos) > 400.0f) { @@ -648,7 +648,7 @@ void EnFd_WaitForCore(EnFd* this, PlayState* play) { void EnFd_Update(Actor* thisx, PlayState* play) { EnFd* this = (EnFd*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (this->firstUpdateFlag) { func_800F5ACC(NA_BGM_MINI_BOSS); @@ -760,7 +760,7 @@ void EnFd_Draw(Actor* thisx, PlayState* play) { { 255, 0, 0, 255 }, }; u32 frames; - UNUSED s32 pad; + STACK_PAD(s32); frames = play->state.frames; diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c index 4ea8378b3f0..27beaf97c1e 100644 --- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c +++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c @@ -121,7 +121,7 @@ s32 EnFdFire_CheckCollider(EnFdFire* this, PlayState* play) { void EnFdFire_Init(Actor* thisx, PlayState* play) { EnFdFire* this = (EnFdFire*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 20.0f); @@ -209,7 +209,7 @@ void EnFdFire_Disappear(EnFdFire* this, PlayState* play) { void EnFdFire_Update(Actor* thisx, PlayState* play) { EnFdFire* this = (EnFdFire*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (this->actionFunc != EnFdFire_Disappear) { if ((this->actor.parent->update == NULL) || EnFdFire_CheckCollider(this, play)) { @@ -237,7 +237,7 @@ void EnFdFire_Draw(Actor* thisx, PlayState* play) { { 255, 10, 0, 255 }, { 0, 10, 255, 255 }, }; - UNUSED s32 pad; + STACK_PAD(s32); EnFdFire* this = (EnFdFire*)thisx; Vec3f scale = { 0.0f, 0.0f, 0.0f }; UNUSED Vec3f sp90 = { 0.0f, 0.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index b6acb3bbc6a..fd1c53eeb29 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -81,7 +81,7 @@ void EnFhgFire_SetUpdate(EnFhgFire* this, EnFhgFireUpdateFunc updateFunc) { } void EnFhgFire_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnFhgFire* this = (EnFhgFire*)thisx; Player* player = GET_PLAYER(play); @@ -163,7 +163,7 @@ void EnFhgFire_Init(Actor* thisx, PlayState* play) { } void EnFhgFire_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnFhgFire* this = (EnFhgFire*)thisx; if ((this->actor.params == FHGFIRE_LIGHTNING_SHOCK) || (this->actor.params == FHGFIRE_LIGHTNING_BURST) || @@ -681,7 +681,7 @@ void EnFhgFire_PhantomWarp(EnFhgFire* this, PlayState* play) { } void EnFhgFire_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnFhgFire* this = (EnFhgFire*)thisx; this->work[FHGFIRE_VARIANCE_TIMER]++; @@ -701,7 +701,7 @@ static void* sDustTextures[] = { }; void EnFhgFire_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnFhgFire* this = (EnFhgFire*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_fhg_fire.c", 1723); 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 2b1002a93ba..e364fb0eee3 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 @@ -68,7 +68,7 @@ static ColliderCylinderInit D_80A12CCC = { }; void EnFireRock_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); EnFireRock* this = (EnFireRock*)thisx; @@ -382,7 +382,7 @@ void EnFireRock_Update(Actor* thisx, PlayState* play) { void EnFireRock_Draw(Actor* thisx, PlayState* play) { EnFireRock* this = (EnFireRock*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_fire_rock.c", 747); Matrix_Translate(thisx->world.pos.x + this->relativePos.x, thisx->world.pos.y + this->relativePos.y, 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 d185ba0d861..c8a57377f91 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -163,7 +163,7 @@ void EnFish_SetYOffset(EnFish* this) { } s32 EnFish_InBottleRange(EnFish* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); Vec3f sp1C; @@ -226,7 +226,7 @@ void EnFish_Respawning_SetupFollowChild(EnFish* this) { } void EnFish_Respawning_FollowChild(EnFish* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnFish_SetYOffset(this); Math_SmoothStepToF(&this->actor.speedXZ, 1.8f, 0.08f, 0.4f, 0.0f); @@ -262,8 +262,8 @@ void EnFish_Respawning_SetupFleePlayer(EnFish* this) { } void EnFish_Respawning_FleePlayer(EnFish* this, PlayState* play) { - UNUSED s32 pad1; - UNUSED s16 pad2; + STACK_PAD(s32); + STACK_PAD(s16); s16 frames; s16 yaw; s16 playerClose; @@ -317,9 +317,9 @@ void EnFish_Respawning_SetupApproachPlayer(EnFish* this) { } void EnFish_Respawning_ApproachPlayer(EnFish* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); Player* player = GET_PLAYER(play); - UNUSED s32 pad2; + STACK_PAD(s32); Vec3f sp38; s16 yaw; s16 temp_a0_2; @@ -396,7 +396,7 @@ void EnFish_Dropped_Fall(EnFish* this, PlayState* play) { * height and whether the sound should play again. */ void EnFish_Dropped_SetupFlopOnGround(EnFish* this) { - UNUSED s32 pad; + STACK_PAD(s32); f32 randomFloat; s32 playSfx; @@ -431,7 +431,7 @@ void EnFish_Dropped_SetupFlopOnGround(EnFish* this) { } void EnFish_Dropped_FlopOnGround(EnFish* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16 frames = play->state.frames; s16 targetXRot; @@ -483,7 +483,7 @@ void EnFish_Dropped_SetupSwimAway(EnFish* this) { } void EnFish_Dropped_SwimAway(EnFish* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Math_SmoothStepToF(&this->actor.speedXZ, 2.8f, 0.1f, 0.4f, 0.0f); @@ -536,9 +536,9 @@ void EnFish_Unique_SwimIdle(EnFish* this, PlayState* play) { f32 playSpeed; u32 frames = play->gameplayFrames; f32* speed; - UNUSED s32 pad1; + STACK_PAD(s32); f32 extraPlaySpeed; - UNUSED s32 pad2; + STACK_PAD(s32); if (this->actor.xzDistToPlayer < 60.0f) { if (this->timer < 12) { @@ -604,7 +604,7 @@ void EnFish_Cutscene_FlopOnGround(EnFish* this, PlayState* play) { } void EnFish_Cutscene_WiggleFlyingThroughAir(EnFish* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 sp28 = Math_SinS(this->slowPhase); f32 sp24 = Math_SinS(this->fastPhase); @@ -616,7 +616,7 @@ void EnFish_Cutscene_WiggleFlyingThroughAir(EnFish* this, PlayState* play) { } void EnFish_UpdateCutscene(EnFish* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); CsCmdActorAction* csAction = play->csCtx.npcActions[1]; Vec3f startPos; Vec3f endPos; 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 9037048a0a1..d2cc7e52aeb 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -123,7 +123,7 @@ void EnFloormas_Init(Actor* thisx, PlayState* play2) { EnFloormas* this = (EnFloormas*)thisx; PlayState* play = play2; s32 invisble; - UNUSED s32 pad; + STACK_PAD(s32); Actor_ProcessInitChain(&this->actor, sInitChain); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 50.0f); @@ -522,7 +522,7 @@ void EnFloormas_Run(EnFloormas* this, PlayState* play) { } void EnFloormas_Turn(EnFloormas* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 sp30; f32 sp2C; @@ -974,7 +974,7 @@ void EnFloormas_Freeze(EnFloormas* this, PlayState* play) { } void EnFloormas_ColliderCheck(EnFloormas* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 isSmall; if (this->collider.base.acFlags & AC_HIT) { @@ -1020,7 +1020,7 @@ void EnFloormas_ColliderCheck(EnFloormas* this, PlayState* play) { void EnFloormas_Update(Actor* thisx, PlayState* play) { EnFloormas* this = (EnFloormas*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (this->actionFunc != EnFloormas_SmWait) { if (this->collider.base.atFlags & AT_HIT) { 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 5f7668df5b6..2c7a381a553 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -273,9 +273,9 @@ void EnFr_DrawActive(EnFr* this) { void EnFr_Update(Actor* thisx, PlayState* play) { EnFr* this = (EnFr*)thisx; - UNUSED s32 pad1; + STACK_PAD(s32); s32 frogIndex; - UNUSED s32 pad2; + STACK_PAD(s32); if (Object_IsLoaded(&play->objectCtx, this->objBankIndex)) { this->actor.flags &= ~ACTOR_FLAG_4; 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 291d6904a09..db0cd7b23c3 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -72,7 +72,7 @@ typedef enum { } EnFuFace; void EnFu_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnFu* this = (EnFu*)thisx; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); @@ -234,7 +234,7 @@ void EnFu_WaitAdult(EnFu* this, PlayState* play) { } void EnFu_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnFu* this = (EnFu*)thisx; Collider_UpdateCylinder(&this->actor, &this->collider); @@ -259,7 +259,7 @@ void EnFu_Update(Actor* thisx, PlayState* play) { s32 EnFu_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { EnFu* this = (EnFu*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (limbIndex == FU_LIMB_UNK) { return false; @@ -295,7 +295,7 @@ void EnFu_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void EnFu_Draw(Actor* thisx, PlayState* play) { static void* sEyesSegments[] = { gWindmillManEyeClosedTex, gWindmillManEyeAngryTex }; static void* sMouthSegments[] = { gWindmillManMouthOpenTex, gWindmillManMouthAngryTex }; - UNUSED s32 pad; + STACK_PAD(s32); EnFu* this = (EnFu*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_fu.c", 773); 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 9c15ff31a12..8613449a746 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -666,7 +666,7 @@ static EnFzSpawnIceSmokeFunc iceSmokeSpawnFuncs[] = { void EnFz_Update(Actor* thisx, PlayState* play) { EnFz* this = (EnFz*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); this->counter++; @@ -715,7 +715,7 @@ void EnFz_Draw(Actor* thisx, PlayState* play) { gFreezardHeadChippedDL, // Entire head chipped off (1 or 2 health) }; EnFz* this = (EnFz*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s32 index; index = (6 - this->actor.colChkInfo.health) >> 1; diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index 1c63ea47d2e..07003cd018b 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -77,7 +77,7 @@ ActorInit En_G_Switch_InitVars = { }; void EnGSwitch_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnGSwitch* this = (EnGSwitch*)thisx; this->type = (this->actor.params >> 0xC) & 0xF; @@ -165,7 +165,7 @@ void EnGSwitch_Init(Actor* thisx, PlayState* play) { } void EnGSwitch_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnGSwitch* this = (EnGSwitch*)thisx; Collider_DestroyCylinder(play, &this->collider); @@ -371,7 +371,7 @@ void EnGSwitch_ArcheryPot(EnGSwitch* this, PlayState* play) { f32 rand; s32 phi_s0; s32 scale; - UNUSED s32 pad; + STACK_PAD(s32); pos.x = sn * 8.0f; pos.y = 10.0f + Rand_CenteredFloat(5.0f); @@ -415,7 +415,7 @@ void EnGSwitch_Kill(EnGSwitch* this, PlayState* play) { } void EnGSwitch_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnGSwitch* this = (EnGSwitch*)thisx; this->actionFunc(this, play); @@ -451,7 +451,7 @@ void EnGSwitch_Update(Actor* thisx, PlayState* play) { } void EnGSwitch_DrawPot(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnGSwitch* this = (EnGSwitch*)thisx; if (!this->broken) { @@ -469,7 +469,7 @@ static void* sRupeeTextures[] = { }; void EnGSwitch_DrawRupee(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnGSwitch* this = (EnGSwitch*)thisx; if (1) {} @@ -549,7 +549,7 @@ void EnGSwitch_DrawEffects(EnGSwitch* this, PlayState* play) { EnGSwitchEffect* effect = this->effects; s16 i; f32 scale; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(gfxCtx, "../z_en_g_switch.c", 1073); Gfx_SetupDL_25Opa(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c index 60d0cad3848..07f6c80c288 100644 --- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c +++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c @@ -112,7 +112,7 @@ void EnGanonMant_Destroy(Actor* thisx, PlayState* play) { * Randomly zeros portions of the cloak texture */ void EnGanonMant_Tear(EnGanonMant* this) { - UNUSED s32 pad; + STACK_PAD(s32); s16 i; s16 areaX; s16 areaY; @@ -156,7 +156,7 @@ void EnGanonMant_UpdateStrand(PlayState* play, EnGanonMant* this, Vec3f* root, V f32 xDiff; f32 zDiff; f32 gravity; - UNUSED s32 pad[4]; + STACK_PADS(s32, 4); f32 yaw; s16 i; f32 x; @@ -355,7 +355,7 @@ void EnGanonMant_Update(Actor* thisx, PlayState* play) { } void EnGanonMant_DrawCloak(PlayState* play, EnGanonMant* this) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_ganon_mant.c", 564); diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/src/overlays/actors/ovl_En_Gb/z_en_gb.c index 93f19e3babb..2d9bb048389 100644 --- a/src/overlays/actors/ovl_En_Gb/z_en_gb.c +++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.c @@ -150,7 +150,7 @@ void func_80A2F180(EnGb* this) { void EnGb_Init(Actor* thisx, PlayState* play) { EnGb* this = (EnGb*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; s32 i; f32 rand; @@ -420,7 +420,7 @@ void EnGb_Update(Actor* thisx, PlayState* play2) { void EnGb_Draw(Actor* thisx, PlayState* play) { EnGb* this = (EnGb*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_gb.c", 763); @@ -513,7 +513,7 @@ void EnGb_UpdateCagedSouls(EnGb* this, PlayState* play) { } void EnGb_DrawCagedSouls(EnGb* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 i; OPEN_DISPS(play->state.gfxCtx, "../z_en_gb.c", 914); 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 415415cc391..88f8d5ea1d3 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -86,7 +86,7 @@ static void* sEyeTextures[] = { }; void EnGe1_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnGe1* this = (EnGe1*)thisx; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); @@ -687,7 +687,7 @@ void EnGe1_Wait_Archery(EnGe1* this, PlayState* play) { // General functions void EnGe1_TurnToFacePlayer(EnGe1* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16 angleDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; if (ABS(angleDiff) <= 0x4000) { @@ -718,7 +718,7 @@ void EnGe1_LookAtPlayer(EnGe1* this, PlayState* play) { } void EnGe1_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnGe1* this = (EnGe1*)thisx; Collider_UpdateCylinder(&this->actor, &this->collider); @@ -764,7 +764,7 @@ void EnGe1_StopFidget(EnGe1* this) { } s32 EnGe1_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { - UNUSED s32 pad; + STACK_PAD(s32); EnGe1* this = (EnGe1*)thisx; if (limbIndex == GE1_LIMB_HEAD) { @@ -800,7 +800,7 @@ void EnGe1_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, } void EnGe1_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnGe1* this = (EnGe1*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_ge1.c", 1442); 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 c3a18df2cae..d422366ff4c 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -112,7 +112,7 @@ void EnGe2_ChangeAction(EnGe2* this, s32 i) { } void EnGe2_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnGe2* this = (EnGe2*)thisx; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); @@ -391,7 +391,7 @@ void EnGe2_Stand(EnGe2* this, PlayState* play) { } void EnGe2_TurnToFacePlayer(EnGe2* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16 angleDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; if (ABS(angleDiff) <= 0x4000) { @@ -486,7 +486,7 @@ void EnGe2_SetupCapturePlayer(EnGe2* this, PlayState* play) { } void EnGe2_MaintainColliderAndSetAnimState(EnGe2* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); @@ -644,7 +644,7 @@ void EnGe2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void EnGe2_Draw(Actor* thisx, PlayState* play) { static void* eyeTextures[] = { gGerudoPurpleEyeOpenTex, gGerudoPurpleEyeHalfTex, gGerudoPurpleEyeClosedTex }; - UNUSED s32 pad; + STACK_PAD(s32); EnGe2* this = (EnGe2*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_ge2.c", 1274); 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 b6cacd750cd..d3eaa8ba168 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -92,7 +92,7 @@ void EnGe3_Destroy(Actor* thisx, PlayState* play) { } void EnGe3_TurnToFacePlayer(EnGe3* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16 angleDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; if (ABS(angleDiff) <= 0x4000) { @@ -170,7 +170,7 @@ void EnGe3_ForceTalk(EnGe3* this, PlayState* play) { } void EnGe3_UpdateCollision(EnGe3* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index d7d5cd8e60c..1fa412834b0 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -216,7 +216,7 @@ void EnGeldB_SetupAction(EnGeldB* this, EnGeldBActionFunc actionFunc) { } void EnGeldB_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EffectBlureInit1 blureInit; EnGeldB* this = (EnGeldB*)thisx; @@ -259,7 +259,7 @@ void EnGeldB_Init(Actor* thisx, PlayState* play) { } void EnGeldB_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnGeldB* this = (EnGeldB*)thisx; func_800F5B58(); @@ -418,7 +418,7 @@ void EnGeldB_SetupReady(EnGeldB* this) { void EnGeldB_Ready(EnGeldB* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); s16 angleToLink; SkelAnime_Update(&this->skelAnime); @@ -649,7 +649,7 @@ void EnGeldB_Circle(EnGeldB* this, PlayState* play) { s16 phi_v1; s32 afterPrevFrame; s32 prevFrame; - UNUSED s32 pad; + STACK_PAD(s32); s32 beforeCurFrame; Player* player = GET_PLAYER(play); @@ -763,7 +763,7 @@ void EnGeldB_SetupSpinDodge(EnGeldB* this, PlayState* play) { void EnGeldB_SpinDodge(EnGeldB* this, PlayState* play) { s16 phi_v1; s32 prevFrame; - UNUSED s32 pad; + STACK_PAD(s32); s32 beforeCurFrame; s32 afterPrevFrame; @@ -1131,7 +1131,7 @@ void EnGeldB_SetupBlock(EnGeldB* this) { void EnGeldB_Block(EnGeldB* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); s16 angleToLink; s16 angleFacingLink; @@ -1357,7 +1357,7 @@ void EnGeldB_TurnHead(EnGeldB* this, PlayState* play) { } void EnGeldB_CollisionCheck(EnGeldB* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnItem00* key; if (this->blockCollider.base.acFlags & AC_BOUNCED) { @@ -1401,7 +1401,7 @@ void EnGeldB_CollisionCheck(EnGeldB* this, PlayState* play) { } void EnGeldB_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnGeldB* this = (EnGeldB*)thisx; EnGeldB_CollisionCheck(this, play); @@ -1557,7 +1557,7 @@ void EnGeldB_Draw(Actor* thisx, PlayState* play) { }; static void* eyeTextures[] = { gGerudoRedEyeOpenTex, gGerudoRedEyeHalfTex, gGerudoRedEyeShutTex, gGerudoRedEyeHalfTex }; - UNUSED s32 pad; + STACK_PAD(s32); EnGeldB* this = (EnGeldB*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_geldB.c", 2672); 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 06755ab1937..82d08826c33 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -191,7 +191,7 @@ void func_80A3DBF4(EnGm* this, PlayState* play) { void func_80A3DC44(EnGm* this, PlayState* play) { f32 dx; f32 dz; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); EnGm_SetTextID(this); @@ -320,7 +320,7 @@ void func_80A3E090(EnGm* this) { void EnGm_Draw(Actor* thisx, PlayState* play) { static void* eyeTextures[] = { gGoronCsEyeOpenTex, gGoronCsEyeHalfTex, gGoronCsEyeClosedTex }; EnGm* this = (EnGm*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_gm.c", 613); 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 7a181f2fdef..c2fb6b74489 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -620,7 +620,7 @@ void func_80A3F908(EnGo* this, PlayState* play) { void EnGo_Init(Actor* thisx, PlayState* play) { EnGo* this = (EnGo*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); UNUSED Vec3f D_80A41B9C = { 0.0f, 0.0f, 0.0f }; UNUSED Vec3f D_80A41BA8 = { 0.0f, 0.0f, 0.0f }; @@ -1016,7 +1016,7 @@ void func_80A40DCC(EnGo* this, PlayState* play) { } void EnGo_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnGo* this = (EnGo*)thisx; Collider_UpdateCylinder(&this->actor, &this->collider); diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index a6f3e5cdced..1fad9c99083 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -578,7 +578,7 @@ u16 EnGo2_GetTextIdGoronDmtBiggoron(PlayState* play, EnGo2* this) { } s16 EnGo2_GetStateGoronDmtBiggoron(PlayState* play, EnGo2* this) { - UNUSED s32 pad; + STACK_PAD(s32); u8 dialogState = this->dialogState; switch (EnGo2_GetDialogState(this, play)) { @@ -1509,7 +1509,7 @@ void EnGo2_BiggoronAnimation(EnGo2* this) { void EnGo2_Init(Actor* thisx, PlayState* play) { EnGo2* this = (EnGo2*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 28.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gGoronSkel, NULL, this->jointTable, this->morphTable, 18); @@ -2002,7 +2002,7 @@ s32 EnGo2_DrawCurledUp(EnGo2* this, PlayState* play) { } s32 EnGo2_DrawRolling(EnGo2* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f D_80A48560 = { 0.0f, 0.0f, 0.0f }; f32 speedXZ; diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/src/overlays/actors/ovl_En_Goma/z_en_goma.c index 4476a066389..72743e06787 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -698,7 +698,7 @@ void EnGoma_SetFloorRot(EnGoma* this) { void EnGoma_Update(Actor* thisx, PlayState* play) { EnGoma* this = (EnGoma*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); if (this->actionTimer != 0) { @@ -781,7 +781,7 @@ Gfx* EnGoma_NoBackfaceCullingDlist(GraphicsContext* gfxCtx) { void EnGoma_Draw(Actor* thisx, PlayState* play) { EnGoma* this = (EnGoma*)thisx; s32 y; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_goma.c", 2040); Gfx_SetupDL_25Opa(play->state.gfxCtx); 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 60271593f2c..0b5be3ec26e 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -96,7 +96,7 @@ void EnGoroiwa_UpdateCollider(EnGoroiwa* this) { } void EnGoroiwa_InitCollider(EnGoroiwa* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->actor, &sJntSphInit, this->colliderItems); @@ -236,7 +236,7 @@ void EnGoroiwa_InitRotation(EnGoroiwa* this) { } s32 EnGoroiwa_GetAscendDirection(EnGoroiwa* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Path* path = &play->pathList[this->actor.params & 0xFF]; Vec3s* nextPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint; Vec3s* currentPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->currentWaypoint; @@ -296,7 +296,7 @@ void EnGoroiwa_SpawnWaterEffects(PlayState* play, Vec3f* contactPos) { s32 EnGoroiwa_MoveAndFall(EnGoroiwa* this, PlayState* play) { Path* path; s32 result; - UNUSED s32 pad; + STACK_PAD(s32); Vec3s* nextPointPos; Math_StepToF(&this->actor.speedXZ, R_EN_GOROIWA_SPEED * 0.01f, 0.3f); @@ -312,7 +312,7 @@ s32 EnGoroiwa_MoveAndFall(EnGoroiwa* this, PlayState* play) { s32 EnGoroiwa_Move(EnGoroiwa* this, PlayState* play) { Path* path = &play->pathList[this->actor.params & 0xFF]; - UNUSED s32 pad; + STACK_PAD(s32); Vec3s* nextPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint; Vec3s* currentPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->currentWaypoint; s32 nextPointReached; @@ -342,7 +342,7 @@ s32 EnGoroiwa_Move(EnGoroiwa* this, PlayState* play) { } s32 EnGoroiwa_MoveUpToNextWaypoint(EnGoroiwa* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Path* path = &play->pathList[this->actor.params & 0xFF]; Vec3s* nextPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint; @@ -353,7 +353,7 @@ s32 EnGoroiwa_MoveUpToNextWaypoint(EnGoroiwa* this, PlayState* play) { } s32 EnGoroiwa_MoveDownToNextWaypoint(EnGoroiwa* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); Path* path = &play->pathList[this->actor.params & 0xFF]; Vec3s* nextPointPos = (Vec3s*)SEGMENTED_TO_VIRTUAL(path->points) + this->nextWaypoint; f32 nextPointY; @@ -363,7 +363,7 @@ s32 EnGoroiwa_MoveDownToNextWaypoint(EnGoroiwa* this, PlayState* play) { CollisionPoly* floorPoly; Vec3f checkPos; f32 floorY; - UNUSED s32 pad2; + STACK_PAD(s32); s32 floorBgId; Vec3f dustPos; WaterBox* waterBox; @@ -429,7 +429,7 @@ s32 EnGoroiwa_MoveDownToNextWaypoint(EnGoroiwa* this, PlayState* play) { void EnGoroiwa_UpdateRotation(EnGoroiwa* this, PlayState* play) { static Vec3f unitY = { 0.0f, 1.0f, 0.0f }; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f* rollAxisPtr; f32 rollAngleDiff; Vec3f rollAxis; @@ -489,7 +489,7 @@ void EnGoroiwa_SpawnFragments(EnGoroiwa* this, PlayState* play) { static f32 yOffsets[] = { 0.0f, 59.5f }; s16 angle1; s16 angle2; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f* thisPos = &this->actor.world.pos; Vec3f effectPos; Vec3f fragmentVelocity; @@ -723,7 +723,7 @@ void EnGoroiwa_MoveDown(EnGoroiwa* this, PlayState* play) { void EnGoroiwa_Update(Actor* thisx, PlayState* play) { EnGoroiwa* this = (EnGoroiwa*)thisx; Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); s32 bgId; if (!(player->stateFlags1 & (PLAYER_STATE1_6 | PLAYER_STATE1_7 | PLAYER_STATE1_28 | PLAYER_STATE1_29))) { 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 788d8fc089a..5a62636fbfe 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -559,7 +559,7 @@ void EnGs_Update(Actor* thisx, PlayState* play2) { void EnGs_Draw(Actor* thisx, PlayState* play) { EnGs* this = (EnGs*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); u32 frames; if (!(this->unk_19E & 8)) { diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c index b9971f76815..ae0a5954252 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -74,7 +74,7 @@ void EnGuest_Destroy(Actor* thisx, PlayState* play) { void EnGuest_Update(Actor* thisx, PlayState* play) { EnGuest* this = (EnGuest*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (Object_IsLoaded(&play->objectCtx, this->osAnimeBankIndex)) { this->actor.flags &= ~ACTOR_FLAG_4; @@ -141,7 +141,7 @@ void func_80A5057C(EnGuest* this, PlayState* play) { void func_80A505CC(Actor* thisx, PlayState* play) { EnGuest* this = (EnGuest*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Player* player; player = GET_PLAYER(play); @@ -217,7 +217,7 @@ void EnGuest_Draw(Actor* thisx, PlayState* play) { object_boj_Tex_0007FC, }; EnGuest* this = (EnGuest*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_guest.c", 404); 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 04ea80d4de6..01d35d65ed5 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -51,7 +51,7 @@ static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE }; void EnHata_Init(Actor* thisx, PlayState* play) { EnHata* this = (EnHata*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; f32 frameCount = Animation_GetLastFrame(&gFlagpoleFlapAnim); diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index 69b1e452c71..dc7fa0a20e9 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -64,7 +64,7 @@ static s32 sBgCamIndices[] = { static s16 sWaypoints[] = { 0, 4, 1, 5, 2, 6, 3, 7 }; void EnHeishi1_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnHeishi1* this = (EnHeishi1*)thisx; Vec3f rupeePos; s32 i; @@ -381,9 +381,9 @@ void EnHeishi1_Update(Actor* thisx, PlayState* play) { EnHeishi1* this = (EnHeishi1*)thisx; s16 path; u8 i; - UNUSED s32 pad1; + STACK_PAD(s32); Player* player = GET_PLAYER(play); - UNUSED s32 pad2; + STACK_PAD(s32); Camera* activeCam; this->activeTimer++; @@ -481,7 +481,7 @@ s32 EnHeishi1_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3 } void EnHeishi1_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnHeishi1* this = (EnHeishi1*)thisx; Vec3f matrixScale = { 0.3f, 0.3f, 0.3f }; diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index e0c46cadf66..3b433f27204 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -277,7 +277,7 @@ void func_80A535BC(EnHeishi2* this, PlayState* play) { } void func_80A53638(EnHeishi2* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 frameCount = this->skelAnime.curFrame; BgSpot15Saku* actor = (BgSpot15Saku*)play->actorCtx.actorLists[ACTORCAT_ITEMACTION].head; @@ -438,7 +438,7 @@ void func_80A53C90(EnHeishi2* this, PlayState* play) { } void func_80A53D0C(EnHeishi2* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 frameCount; BgGateShutter* gate; @@ -599,7 +599,7 @@ void func_80A54320(EnHeishi2* this, PlayState* play) { } void func_80A543A0(EnHeishi2* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 frameCount = this->skelAnime.curFrame; BgGateShutter* gate = (BgGateShutter*)(play->actorCtx.actorLists[ACTORCAT_ITEMACTION].head); SkelAnime_Update(&this->skelAnime); @@ -644,7 +644,7 @@ void func_80A544AC(EnHeishi2* this, PlayState* play) { } void func_80A5455C(EnHeishi2* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f pos; f32 rotY; EnBom* bomb; @@ -761,7 +761,7 @@ void func_80A549E8(EnHeishi2* this, PlayState* play) { } void EnHeishi2_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnHeishi2* this = (EnHeishi2*)thisx; s32 i; diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index 00574512378..049fc70d29f 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -212,7 +212,7 @@ void func_80A55D00(EnHeishi3* this, PlayState* play) { void EnHeishi3_Update(Actor* thisx, PlayState* play) { EnHeishi3* this = (EnHeishi3*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Actor_SetFocus(&this->actor, 60.0f); this->unk_274 += 1; diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c index a257f11d1fb..739ba859ff3 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -339,7 +339,7 @@ void func_80A56B40(EnHeishi4* this, PlayState* play) { void EnHeishi4_Update(Actor* thisx, PlayState* play) { EnHeishi4* this = (EnHeishi4*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); thisx->world.pos.x = this->pos.x; diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index b8562d1f766..f8a5eed1b76 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -71,7 +71,7 @@ static InitChainEntry sInitChain[] = { void EnHintnuts_Init(Actor* thisx, PlayState* play) { EnHintnuts* this = (EnHintnuts*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Actor_ProcessInitChain(&this->actor, sInitChain); if (this->actor.params == 0xA) { @@ -476,7 +476,7 @@ void EnHintnuts_ColliderCheck(EnHintnuts* this, PlayState* play) { void EnHintnuts_Update(Actor* thisx, PlayState* play) { EnHintnuts* this = (EnHintnuts*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (this->actor.params != 0xA) { EnHintnuts_ColliderCheck(this, play); 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 b07dab063c4..a84e4c74242 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -126,7 +126,7 @@ static InitChainEntry sInitChain[] = { }; void EnHonotrap_FlameCollisionCheck(EnHonotrap* this, PlayState* play) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); Collider_UpdateCylinder(&this->actor, &this->collider.cyl); CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.cyl.base); @@ -153,7 +153,7 @@ void EnHonotrap_GetNormal(Vec3f* normal, Vec3f* vec) { } void EnHonotrap_InitEye(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnHonotrap* this = (EnHonotrap*)thisx; s32 i; s32 j; @@ -184,7 +184,7 @@ void EnHonotrap_InitEye(Actor* thisx, PlayState* play) { } void EnHonotrap_InitFlame(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnHonotrap* this = (EnHonotrap*)thisx; Actor_SetScale(&this->actor, 0.0001f); @@ -218,7 +218,7 @@ void EnHonotrap_Init(Actor* thisx, PlayState* play) { } void EnHonotrap_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnHonotrap* this = (EnHonotrap*)thisx; if (this->actor.params == HONOTRAP_EYE) { @@ -295,7 +295,7 @@ void EnHonotrap_SetupFlame(EnHonotrap* this) { } void EnHonotrap_Flame(EnHonotrap* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 ready = Math_StepToF(&this->actor.scale.x, (this->actor.params == HONOTRAP_FLAME_MOVE) ? 0.004f : 0.0048f, 0.0006f); @@ -355,7 +355,7 @@ void EnHonotrap_SetupFlameMove(EnHonotrap* this) { } void EnHonotrap_FlameMove(EnHonotrap* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f speed; s32 ready; @@ -410,7 +410,7 @@ void EnHonotrap_SetupFlameChase(EnHonotrap* this) { } void EnHonotrap_FlameChase(EnHonotrap* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Math_ScaledStepToS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 0x300); Math_StepToF(&this->actor.speedXZ, 3.0f, 0.1f); @@ -447,7 +447,7 @@ void EnHonotrap_SetupFlameVanish(EnHonotrap* this) { } void EnHonotrap_FlameVanish(EnHonotrap* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 ready = Math_StepToF(&this->actor.scale.x, 0.0001f, 0.00015f); this->actor.scale.z = this->actor.scale.y = this->actor.scale.x; @@ -463,7 +463,7 @@ void EnHonotrap_FlameVanish(EnHonotrap* this, PlayState* play) { void EnHonotrap_Update(Actor* thisx, PlayState* play) { static Vec3f velocity = { 0.0f, 0.0f, 0.0f }; static Vec3f accel = { 0.0f, 0.1f, 0.0f }; - UNUSED s32 pad; + STACK_PAD(s32); EnHonotrap* this = (EnHonotrap*)thisx; if (this->timer > 0) { @@ -513,7 +513,7 @@ void EnHonotrap_DrawEye(Actor* thisx, PlayState* play) { } void EnHonotrap_DrawFlame(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnHonotrap* this = (EnHonotrap*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_honotrap.c", 1000); 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 1de130e1921..a8de7defa2e 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -1615,7 +1615,7 @@ void EnHorse_Stub1(EnHorse* this) { } void EnHorse_LowJump(EnHorse* this, PlayState* play) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); Vec3s* jointTable; f32 curFrame; f32 y; @@ -1690,7 +1690,7 @@ void EnHorse_Stub2(EnHorse* this) { } void EnHorse_HighJump(EnHorse* this, PlayState* play) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); Vec3s* jointTable; f32 curFrame; f32 y; @@ -2915,7 +2915,7 @@ void EnHorse_CheckFloors(EnHorse* this, PlayState* play) { f32 dist; f32 waterHeight; WaterBox* waterBox; - UNUSED s32 pad; + STACK_PAD(s32); if (WaterBox_GetSurfaceImpl(play, &play->colCtx, this->actor.world.pos.x, this->actor.world.pos.z, &waterHeight, &waterBox) == 1 && @@ -3016,7 +3016,7 @@ void EnHorse_CheckFloors(EnHorse* this, PlayState* play) { s32 EnHorse_GetMountSide(EnHorse* this, PlayState* play); void EnHorse_MountDismount(EnHorse* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s32 mountSide; Player* player = GET_PLAYER(play); @@ -3110,11 +3110,11 @@ void EnHorse_BgCheckSlowMoving(EnHorse* this, PlayState* play) { } void EnHorse_UpdateBgCheckInfo(EnHorse* this, PlayState* play) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); Vec3f startPos; Vec3f endPos; Vec3f obstaclePos; - UNUSED s32 pad2; + STACK_PAD(s32); f32 intersectDist; CollisionPoly* wall = NULL; CollisionPoly* obstacleFloor = NULL; @@ -3123,7 +3123,7 @@ void EnHorse_UpdateBgCheckInfo(EnHorse* this, PlayState* play) { f32 behindObstacleHeight; f32 ny; s32 movingFast; - UNUSED s32 pad3; + STACK_PAD(s32); DynaPolyActor* dynaPoly; Vec3f intersect; Vec3f obstacleTop; @@ -3314,7 +3314,7 @@ void EnHorse_UpdateBgCheckInfo(EnHorse* this, PlayState* play) { void EnHorse_CheckBoost(EnHorse* thisx, PlayState* play2) { EnHorse* this = (EnHorse*)thisx; PlayState* play = play2; - UNUSED s32 pad; + STACK_PAD(s32); if (this->action == ENHORSE_ACT_MOUNTED_WALK || this->action == ENHORSE_ACT_MOUNTED_TROT || this->action == ENHORSE_ACT_MOUNTED_GALLOP) { @@ -3399,7 +3399,7 @@ void EnHorse_RegenBoost(EnHorse* this, PlayState* play) { } void EnHorse_UpdatePlayerDir(EnHorse* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16 angle; f32 s; f32 c; @@ -3671,7 +3671,7 @@ void EnHorse_RandomOffset(Vec3f* src, f32 dist, Vec3f* dst) { void EnHorse_PostDraw(Actor* thisx, PlayState* play, Skin* skin) { EnHorse* this = (EnHorse*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sp94 = { 0.0f, 0.0f, 0.0f }; Vec3f hoofOffset = { 5.0f, -4.0f, 5.0f }; Vec3f riderOffset = { 600.0f, -1670.0f, 0.0f }; 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 aba310915d0..20a0cca0344 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 @@ -441,7 +441,7 @@ static EnHorseGameCheckFunc sUpdateFuncs[] = { }; void EnHorseGameCheck_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnHorseGameCheckBase* this = (EnHorseGameCheckBase*)thisx; if ((play->sceneId == SCENE_SPOT20) && (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || DREG(1))) { @@ -453,7 +453,7 @@ void EnHorseGameCheck_Init(Actor* thisx, PlayState* play) { } void EnHorseGameCheck_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnHorseGameCheckBase* this = (EnHorseGameCheckBase*)thisx; if (sDestroyFuncs[this->actor.params] != NULL) { @@ -462,7 +462,7 @@ void EnHorseGameCheck_Destroy(Actor* thisx, PlayState* play) { } void EnHorseGameCheck_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnHorseGameCheckBase* this = (EnHorseGameCheckBase*)thisx; if (sUpdateFuncs[this->type] != NULL) { diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c index 9b36b9cccbd..00bb004f643 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c @@ -269,9 +269,9 @@ void func_80A68DB0(EnHorseGanon* this, PlayState* play) { } void func_80A68E14(EnHorseGanon* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionPoly* poly; - UNUSED s32 pad2; + STACK_PAD(s32); Vec3f checkPos; s32 bgId; @@ -284,7 +284,7 @@ void func_80A68E14(EnHorseGanon* this, PlayState* play) { void EnHorseGanon_Update(Actor* thisx, PlayState* play) { EnHorseGanon* this = (EnHorseGanon*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); sActionFuncs[this->action](this, play); Actor_MoveForward(&this->actor); 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 d9cf9bace7e..1e03abe5d1f 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 @@ -141,7 +141,7 @@ static InitChainEntry sInitChain[] = { void EnHorseLinkChild_Init(Actor* thisx, PlayState* play) { EnHorseLinkChild* this = (EnHorseLinkChild*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Actor_ProcessInitChain(&this->actor, sInitChain); Actor_SetScale(&this->actor, 0.005f); @@ -551,7 +551,7 @@ static u8 sEyeIndexOrder[] = { 0, 1, 2, 1 }; void EnHorseLinkChild_Update(Actor* thisx, PlayState* play) { EnHorseLinkChild* this = (EnHorseLinkChild*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); sActionFuncs[this->action](this, play); Actor_MoveForward(&this->actor); diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index 1a1cb34c786..bcd636d6100 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -183,7 +183,7 @@ static InitChainEntry sInitChain[] = { void EnHorseNormal_Init(Actor* thisx, PlayState* play) { EnHorseNormal* this = (EnHorseNormal*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Actor_ProcessInitChain(&this->actor, sInitChain); Actor_SetScale(&this->actor, 0.01f); @@ -290,7 +290,7 @@ void EnHorseNormal_FollowPath(EnHorseNormal* this, PlayState* play) { Vec3s* pointPos = SEGMENTED_TO_VIRTUAL(path->points); f32 dx; f32 dz; - UNUSED s32 pad; + STACK_PAD(s32); pointPos += this->waypoint; dx = pointPos->x - this->actor.world.pos.x; @@ -369,7 +369,7 @@ void EnHorseNormal_Wander(EnHorseNormal* this, PlayState* play) { static s32 D_80A6D4F4[] = { 0, 1, 4, 5, 6, 2, 3 }; static s32 D_80A6D510[] = { 0, 0, 2, 2, 1, 1, 1, 3, 3 }; s32 phi_t0 = this->animationIdx; - UNUSED s32 pad; + STACK_PAD(s32); switch (D_80A6D510[this->animationIdx]) { case 0: @@ -556,9 +556,9 @@ void EnHorseNormal_WaitClone(EnHorseNormal* this, PlayState* play) { } void func_80A6C8E0(EnHorseNormal* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionPoly* groundPoly; - UNUSED s32 pad2; + STACK_PAD(s32); Vec3f checkPos; s32 bgId; @@ -576,7 +576,7 @@ static EnHorseNormalActionFunc sActionFuncs[] = { void EnHorseNormal_Update(Actor* thisx, PlayState* play) { EnHorseNormal* this = (EnHorseNormal*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); sActionFuncs[this->action](this, play); Actor_MoveForward(&this->actor); diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c index 6d0890a6ec7..5a6a3ba9690 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c @@ -111,7 +111,7 @@ void func_80A6D8D0(unknownStruct* data, s32 index, Vec3f* vec) { } void func_80A6D918(EnHorseZelda* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sp28; s16 yawDiff; @@ -214,9 +214,9 @@ void func_80A6DDFC(EnHorseZelda* this, PlayState* play) { } void func_80A6DE38(EnHorseZelda* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionPoly* poly; - UNUSED s32 pad2; + STACK_PAD(s32); Vec3f checkPos; s32 bgId; @@ -229,7 +229,7 @@ void func_80A6DE38(EnHorseZelda* this, PlayState* play) { void EnHorseZelda_Update(Actor* thisx, PlayState* play) { EnHorseZelda* this = (EnHorseZelda*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); sActionFuncs[this->action](this, play); this->actor.speedXZ = 0.0f; 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 91162c5e5a7..5c12b5a45f6 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -56,7 +56,7 @@ void func_80A6E3A0(EnHs* this, EnHsActionFunc actionFunc) { void EnHs_Init(Actor* thisx, PlayState* play) { EnHs* this = (EnHs*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); SkelAnime_InitFlex(play, &this->skelAnime, &object_hs_Skel_006260, &object_hs_Anim_0005C0, this->jointTable, @@ -228,7 +228,7 @@ void func_80A6E9AC(EnHs* this, PlayState* play) { void EnHs_Update(Actor* thisx, PlayState* play) { EnHs* this = (EnHs*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Collider_UpdateCylinder(thisx, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); 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 0d2f0a4eba5..df1d3a52233 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -50,7 +50,7 @@ static ColliderCylinderInit sCylinderInit = { void EnHs2_Init(Actor* thisx, PlayState* play) { EnHs2* this = (EnHs2*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); SkelAnime_InitFlex(play, &this->skelAnime, &object_hs_Skel_006260, &object_hs_Anim_0005C0, this->jointTable, @@ -107,7 +107,7 @@ void func_80A6F1A4(EnHs2* this, PlayState* play) { void EnHs2_Update(Actor* thisx, PlayState* play) { EnHs2* this = (EnHs2*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c index 59776b86f36..8991e0ae2b8 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -1096,7 +1096,7 @@ void EnHy_Update(Actor* thisx, PlayState* play) { s32 EnHy_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { EnHy* this = (EnHy*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Vec3s sp48; u8 i; void* ptr; @@ -1145,7 +1145,7 @@ s32 EnHy_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* po void EnHy_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { EnHy* this = (EnHy*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sp3C = { 400.0f, 0.0f, 0.0f }; OPEN_DISPS(play->state.gfxCtx, "../z_en_hy.c", 2255); diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index a43cbf33edd..56a3e6299b7 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -338,9 +338,9 @@ void EnIceHono_SmallFlameMove(EnIceHono* this, PlayState* play) { void EnIceHono_Update(Actor* thisx, PlayState* play) { EnIceHono* this = (EnIceHono*)thisx; - UNUSED s32 pad1; + STACK_PAD(s32); f32 intensity; - UNUSED s32 pad2; + STACK_PAD(s32); f32 sin154; f32 sin156; @@ -371,7 +371,7 @@ void EnIceHono_Update(Actor* thisx, PlayState* play) { void EnIceHono_Draw(Actor* thisx, PlayState* play) { EnIceHono* this = (EnIceHono*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_ice_hono.c", 695); Gfx_SetupDL_25Xlu(play->state.gfxCtx); 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 981082e510c..95634fb3355 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -183,7 +183,7 @@ void EnIk_SetupAction(EnIk* this, EnIkActionFunc actionFunc) { void func_80A74398(Actor* thisx, PlayState* play) { EnIk* this = (EnIk*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); EffectBlureInit1 blureInit; thisx->update = func_80A75FA0; @@ -660,10 +660,10 @@ void func_80A75A38(EnIk* this, PlayState* play) { void func_80A75C38(EnIk* this, PlayState* play) { f32 temp_f0; - UNUSED u8 pad1; - UNUSED u8 pad2; + STACK_PAD(u8); + STACK_PAD(u8); u8 prevHealth; - UNUSED s32 pad3; + STACK_PAD(s32); Vec3f sp38; if ((this->unk_2F8 == 3) || (this->unk_2F8 == 2)) { @@ -740,7 +740,7 @@ void func_80A75C38(EnIk* this, PlayState* play) { void func_80A75FA0(Actor* thisx, PlayState* play) { EnIk* this = (EnIk*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); u8 prevInvincibilityTimer; @@ -999,7 +999,7 @@ void func_80A76E2C(EnIk* this, PlayState* play, Vec3f* pos) { }; if (this->unk_4D4 == 0) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f effectVelocity = { 0.0f, 0.0f, 0.0f }; Vec3f effectAccel = { 0.0f, 0.3f, 0.0f }; s32 i; @@ -1097,7 +1097,7 @@ void func_80A772A4(EnIk* this) { void func_80A772EC(EnIk* this, PlayState* play) { static Vec3f D_80A78FA0; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); f32 wDest; SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &this->actor.world.pos, &D_80A78FA0, &wDest); @@ -1106,7 +1106,7 @@ void func_80A772EC(EnIk* this, PlayState* play) { } void func_80A7735C(EnIk* this, PlayState* play) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); f32 frames = Animation_GetLastFrame(&object_ik_Anim_0203D8); SkelAnime_InitFlex(play, &this->skelAnime, &object_ik_Skel_0205C0, NULL, this->jointTable, this->morphTable, 30); @@ -1210,7 +1210,7 @@ void EnIk_PostLimbDraw2(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void func_80A77844(EnIk* this, PlayState* play) { GraphicsContext* gfxCtx = play->state.gfxCtx; SkelAnime* skelAnime = &this->skelAnime; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); OPEN_DISPS(gfxCtx, "../z_en_ik_inAwake.c", 322); @@ -1364,7 +1364,7 @@ void func_80A77ED0(EnIk* this, PlayState* play) { void func_80A77EDC(EnIk* this, PlayState* play) { GraphicsContext* gfxCtx = play->state.gfxCtx; SkelAnime* skelAnime = &this->skelAnime; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); OPEN_DISPS(gfxCtx, "../z_en_ik_inConfrontion.c", 630); 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 505574522d4..c3c7d9f4a90 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -107,7 +107,7 @@ f32 EnInsect_XZDistanceSquared(Vec3f* v1, Vec3f* v2) { } s32 EnInsect_InBottleRange(EnInsect* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); Vec3f pos; @@ -257,7 +257,7 @@ void EnInsect_SetupSlowDown(EnInsect* this) { } void EnInsect_SlowDown(EnInsect* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s16 type; f32 playSpeed; @@ -294,7 +294,7 @@ void EnInsect_SetupCrawl(EnInsect* this) { } void EnInsect_Crawl(EnInsect* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s16 yaw; s16 type = this->actor.params & 3; @@ -338,8 +338,8 @@ void EnInsect_SetupRunFromPlayer(EnInsect* this) { } void EnInsect_RunFromPlayer(EnInsect* this, PlayState* play) { - UNUSED s32 pad1[2]; - UNUSED s16 pad2; + STACK_PADS(s32, 2); + STACK_PAD(s16); s16 frames; s16 yaw; s16 playerIsClose = this->actor.xzDistToPlayer < 40.0f; @@ -421,7 +421,7 @@ void EnInsect_SetupDig(EnInsect* this) { void EnInsect_Dig(EnInsect* this, PlayState* play) { static Vec3f accel = { 0.0f, 0.0f, 0.0f }; UNUSED static Vec3f unused = { 0.0f, 0.0f, 0.0f }; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Vec3f velocity; Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.1f, 0.5f, 0.0f); @@ -461,9 +461,9 @@ void EnInsect_SetupWalkOnWater(EnInsect* this) { } void EnInsect_WalkOnWater(EnInsect* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); s16 temp_v1; - UNUSED s16 pad2; + STACK_PAD(s16); s16 type; Vec3f ripplePoint; @@ -557,11 +557,11 @@ void EnInsect_SetupDropped(EnInsect* this) { } void EnInsect_Dropped(EnInsect* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); s32 sp50; f32 phi_f0; EnInsect* thisTemp = this; - UNUSED s32 pad2; + STACK_PAD(s32); f32 distanceSq; f32 phi_f2; s16 type; 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 2b5e9c47901..c6146b3ed54 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -135,7 +135,7 @@ s32 EnIshi_SnapToFloor(EnIshi* this, PlayState* play, f32 arg2) { void EnIshi_SpawnFragmentsSmall(EnIshi* this, PlayState* play) { static s16 scales[] = { 16, 13, 11, 9, 7, 5 }; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f velocity; Vec3f pos; s16 phi_v0; @@ -346,7 +346,7 @@ void EnIshi_SetupWait(EnIshi* this) { void EnIshi_Wait(EnIshi* this, PlayState* play) { static u16 liftSfxIds[] = { NA_SE_PL_PULL_UP_ROCK, NA_SE_PL_PULL_UP_BIGROCK }; - UNUSED s32 pad; + STACK_PAD(s32); s16 type = this->actor.params & 1; if (Actor_HasParent(&this->actor, play)) { @@ -417,9 +417,9 @@ void EnIshi_SetupFly(EnIshi* this) { } void EnIshi_Fly(EnIshi* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); s16 type = this->actor.params & 1; - UNUSED s32 pad2; + STACK_PAD(s32); s32 quakeIndex; Vec3f contactPos; diff --git a/src/overlays/actors/ovl_En_It/z_en_it.c b/src/overlays/actors/ovl_En_It/z_en_it.c index 4317f7964bf..c8b7180dba6 100644 --- a/src/overlays/actors/ovl_En_It/z_en_it.c +++ b/src/overlays/actors/ovl_En_It/z_en_it.c @@ -63,7 +63,7 @@ void EnIt_Destroy(Actor* thisx, PlayState* play) { void EnIt_Update(Actor* thisx, PlayState* play) { EnIt* this = (EnIt*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); 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 1297a9637e4..a896cfb273c 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -54,7 +54,7 @@ void En_Js_SetupAction(EnJs* this, EnJsActionFunc actionFunc) { void EnJs_Init(Actor* thisx, PlayState* play) { EnJs* this = (EnJs*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 0.0f, NULL, 36.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gCarpetMerchantSkel, &gCarpetMerchantSlappingKneeAnim, this->jointTable, @@ -165,7 +165,7 @@ void func_80A89304(EnJs* this, PlayState* play) { void EnJs_Update(Actor* thisx, PlayState* play) { EnJs* this = (EnJs*)thisx; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c index f9dfdb6bf76..25a103613ae 100644 --- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c +++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c @@ -37,7 +37,7 @@ static s32 sUnused[2] = { 0, 0 }; void EnJsjutan_Init(Actor* thisx, PlayState* play) { EnJsjutan* this = (EnJsjutan*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* header = NULL; this->dyna.actor.flags &= ~ACTOR_FLAG_0; @@ -322,7 +322,7 @@ void func_80A89A6C(EnJsjutan* this, PlayState* play) { for (i = 0; i < ARRAY_COUNT(sCarpetOddVtx); i++, carpetVtx++) { f32 rotX; f32 rotZ; - UNUSED s32 pad; + STACK_PAD(s32); // Carpet size is 12x12. if ((i % 12) == 11) { // Last column. 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 47b1e89d765..8128aa1469c 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -314,7 +314,7 @@ void func_80A8FBB8(EnKakasi* this, PlayState* play) { void EnKakasi_Update(Actor* thisx, PlayState* play) { EnKakasi* this = (EnKakasi*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s32 i; this->unk_198++; diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index fd424712d9c..b1ecc51c9c7 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -55,7 +55,7 @@ ActorInit En_Kakasi2_InitVars = { void EnKakasi2_Init(Actor* thisx, PlayState* play) { EnKakasi2* this = (EnKakasi2*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); f32 spawnRangeY; f32 spawnRangeXZ; diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c index 50fb47e3e9f..cc43460ca5e 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -405,7 +405,7 @@ void func_80A91A90(EnKakasi3* this, PlayState* play) { void EnKakasi3_Update(Actor* thisx, PlayState* play) { EnKakasi3* this = (EnKakasi3*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s32 i; if (BREG(2) != 0) { 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 bd2058c384b..464a434287d 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -234,7 +234,7 @@ void EnKanban_Init(Actor* thisx, PlayState* play) { } void EnKanban_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnKanban* this = (EnKanban*)thisx; if (this->actionState == ENKANBAN_SIGN) { 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 8bd67302854..3348a5e3c73 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -407,7 +407,7 @@ void EnKarebaba_Regrow(EnKarebaba* this, PlayState* play) { } void EnKarebaba_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnKarebaba* this = (EnKarebaba*)thisx; f32 height; diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c index 7484994d310..7e3d6a15630 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -1240,7 +1240,7 @@ void func_80A995CC(EnKo* this, PlayState* play) { void EnKo_Update(Actor* thisx, PlayState* play) { ColliderCylinder* collider; EnKo* this = (EnKo*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (this->actionFunc != func_80A99048) { if ((s32)this->modelAlpha != 0) { @@ -1273,7 +1273,7 @@ s32 EnKo_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* po void* eyeTexture; Vec3s sp40; u8 headId; - UNUSED s32 pad; + STACK_PAD(s32); if (limbIndex == 15) { gSPSegment((*gfx)++, 0x06, play->objectCtx.status[this->headObjectBankIdx].segment); 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 eff74e56781..0c12612bdaf 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -98,7 +98,7 @@ void EnKusa_SetupAction(EnKusa* this, EnKusaActionFunc actionFunc) { } s32 EnKusa_SnapToFloor(EnKusa* this, PlayState* play, f32 yOffset) { - UNUSED s32 pad; + STACK_PAD(s32); CollisionPoly* groundPoly; Vec3f pos; s32 bgId; @@ -173,7 +173,7 @@ void EnKusa_SpawnFragments(EnKusa* this, PlayState* play) { s32 i; s32 scaleIndex; Vec3f* dir; - UNUSED s32 pad; + STACK_PAD(s32); for (i = 0; i < ARRAY_COUNT(sUnitDirections); i++) { dir = &sUnitDirections[i]; @@ -296,7 +296,7 @@ void EnKusa_SetupMain(EnKusa* this) { } void EnKusa_Main(EnKusa* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); if (Actor_HasParent(&this->actor, play)) { EnKusa_SetupLiftedUp(this); @@ -370,7 +370,7 @@ void EnKusa_SetupFall(EnKusa* this) { } void EnKusa_Fall(EnKusa* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f contactPos; if (this->actor.bgCheckFlags & (BGCHECKFLAG_GROUND | BGCHECKFLAG_GROUND_TOUCH | BGCHECKFLAG_WALL)) { diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index 371438fbcb0..ebd5ae3d730 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -318,7 +318,7 @@ s32 EnKz_SetMovedPos(EnKz* this, PlayState* play) { void EnKz_Init(Actor* thisx, PlayState* play) { EnKz* this = (EnKz*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); SkelAnime_InitFlex(play, &this->skelanime, &gKzSkel, NULL, this->jointTable, this->morphTable, 12); ActorShape_Init(&this->actor.shape, 0.0, NULL, 0.0); @@ -451,7 +451,7 @@ void EnKz_StartTimer(EnKz* this, PlayState* play) { void EnKz_Update(Actor* thisx, PlayState* play) { EnKz* this = (EnKz*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (LINK_IS_ADULT && !GET_INFTABLE(INFTABLE_138)) { SET_INFTABLE(INFTABLE_138); 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 fd1647eb17a..adbfce57e67 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -150,7 +150,7 @@ void EnLight_UpdateSwitch(Actor* thisx, PlayState* play) { void EnLight_Draw(Actor* thisx, PlayState* play) { EnLight* this = (EnLight*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); FlameParams* flameParams; Gfx* dList; diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c index 553d81be369..c6d2ad4f344 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c @@ -29,7 +29,7 @@ ActorInit En_Lightbox_InitVars = { void EnLightbox_Init(Actor* thisx, PlayState* play) { CollisionHeader* colHeader = NULL; EnLightbox* this = (EnLightbox*)thisx; - UNUSED s32 pad[4]; + STACK_PADS(s32, 4); switch (thisx->params) { case 0: 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 91c9427ecc6..39cfd7db51e 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 @@ -46,7 +46,7 @@ static ColliderCylinderInit sCylinderInit = { void EnMFire1_Init(Actor* thisx, PlayState* play) { EnMFire1* this = (EnMFire1*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (this->actor.params < 0) { Actor_ChangeCategory(play, &play->actorCtx, &this->actor, ACTORCAT_ITEMACTION); @@ -64,7 +64,7 @@ void EnMFire1_Destroy(Actor* thisx, PlayState* play) { void EnMFire1_Update(Actor* thisx, PlayState* play) { EnMFire1* this = (EnMFire1*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (Math_StepToF(&this->timer, 1.0f, 0.2f)) { Actor_Kill(&this->actor); diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index a6172ef5224..388bede9b02 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -264,7 +264,7 @@ void func_80AA0B74(EnMa1* this) { void EnMa1_Init(Actor* thisx, PlayState* play) { EnMa1* this = (EnMa1*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gMalonChildSkel, NULL, NULL, NULL, 0); @@ -400,7 +400,7 @@ void EnMa1_DoNothing(EnMa1* this, PlayState* play) { void EnMa1_Update(Actor* thisx, PlayState* play) { EnMa1* this = (EnMa1*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); @@ -450,7 +450,7 @@ void EnMa1_Draw(Actor* thisx, PlayState* play) { EnMa1* this = (EnMa1*)thisx; Camera* activeCam; f32 distFromCamEye; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_ma1.c", 1226); diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index a0a008e2547..fe2e15bbd72 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -213,7 +213,7 @@ void func_80AA1DB4(EnMa2* this, PlayState* play) { void EnMa2_Init(Actor* thisx, PlayState* play) { EnMa2* this = (EnMa2*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gMalonAdultSkel, NULL, NULL, NULL, 0); @@ -312,7 +312,7 @@ void func_80AA21C8(EnMa2* this, PlayState* play) { void EnMa2_Update(Actor* thisx, PlayState* play) { EnMa2* this = (EnMa2*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); @@ -377,7 +377,7 @@ void EnMa2_Draw(Actor* thisx, PlayState* play) { EnMa2* this = (EnMa2*)thisx; Camera* activeCam; f32 distFromCamEye; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_ma2.c", 955); diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index 632984d2f7f..e57a3f87ac7 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -244,7 +244,7 @@ void EnMa3_ChangeAnim(EnMa3* this, s32 index) { void EnMa3_Init(Actor* thisx, PlayState* play) { EnMa3* this = (EnMa3*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 18.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gMalonAdultSkel, NULL, NULL, NULL, 0); @@ -287,7 +287,7 @@ void func_80AA3200(EnMa3* this, PlayState* play) { void EnMa3_Update(Actor* thisx, PlayState* play) { EnMa3* this = (EnMa3*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); @@ -360,7 +360,7 @@ void EnMa3_Draw(Actor* thisx, PlayState* play) { EnMa3* this = (EnMa3*)thisx; Camera* activeCam; f32 distFromCamEye; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_ma3.c", 978); 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 bfd20b32c10..b2a9bdcabc0 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -102,7 +102,7 @@ void EnMag_Destroy(Actor* thisx, PlayState* play) { } void EnMag_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); EnMag* this = (EnMag*)thisx; if (gSaveContext.fileNum != 0xFEDC) { @@ -306,7 +306,7 @@ void EnMag_DrawImageRGBA32(Gfx** gfxp, s16 centerX, s16 centerY, u8* source, u32 u32 textureHeight; s32 remainingSize; s32 textureSize; - UNUSED s32 pad; + STACK_PAD(s32); s32 i; Gfx_SetupDL_56Ptr(&gfx); @@ -388,7 +388,7 @@ void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxp) { }; EnMag* this = (EnMag*)thisx; Font* font = &this->font; - UNUSED s32 pad; + STACK_PAD(s32); Gfx* gfx = *gfxp; u16 i, j, k; u16 rectLeft; @@ -563,7 +563,7 @@ void EnMag_DrawInner(Actor* thisx, PlayState* play, Gfx** gfxp) { } void EnMag_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Gfx* gfx; Gfx* gfxRef; diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index b40d4771f68..221378aa79e 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -257,7 +257,7 @@ void EnMb_SetupAction(EnMb* this, EnMbActionFunc actionFunc) { void EnMb_Init(Actor* thisx, PlayState* play) { EnMb* this = (EnMb*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); s16 relYawFromPlayer; @@ -674,7 +674,7 @@ void EnMb_SpearPatrolTurnTowardsWaypoint(EnMb* this, PlayState* play) { * Slow down and resume walking. */ void EnMb_SpearEndChargeQuick(EnMb* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Math_SmoothStepToF(&this->actor.speedXZ, 0.0f, 0.5f, 1.0f, 0.0f); if (this->actor.speedXZ > 1.0f) { @@ -816,7 +816,7 @@ void EnMb_SpearGuardPrepareAndCharge(EnMb* this, PlayState* play) { void EnMb_ClubAttack(EnMb* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); Vec3f effSpawnPos; Vec3f effWhiteShockwaveDynamics = { 0.0f, 0.0f, 0.0f }; f32 flamesParams[] = { 18.0f, 18.0f, 0.0f }; @@ -1052,7 +1052,7 @@ void EnMb_ClubDamaged(EnMb* this, PlayState* play) { } void EnMb_ClubDamagedWhileKneeling(EnMb* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); if (SkelAnime_Update(&this->skelAnime)) { if (this->timer3 != 0) { @@ -1115,7 +1115,7 @@ void EnMb_ClubDead(EnMb* this, PlayState* play) { void EnMb_SpearGuardWalk(EnMb* this, PlayState* play) { s32 prevFrame; s32 beforeCurFrame; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Player* player = GET_PLAYER(play); s16 relYawTowardsPlayer = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; s16 yawTowardsHome; @@ -1230,7 +1230,7 @@ void EnMb_SpearPatrolWalkTowardsWaypoint(EnMb* this, PlayState* play) { void EnMb_ClubWaitPlayerNear(EnMb* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); s16 relYawFromPlayer = this->actor.world.rot.y - this->actor.yawTowardsPlayer; SkelAnime_Update(&this->skelAnime); @@ -1415,7 +1415,7 @@ void EnMb_CheckColliding(EnMb* this, PlayState* play) { void EnMb_Update(Actor* thisx, PlayState* play) { EnMb* this = (EnMb*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); EnMb_CheckColliding(this, play); if (thisx->colChkInfo.damageEffect != ENMB_DMGEFF_FREEZE) { diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index ae00418c450..6a83d16a0d9 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -651,7 +651,7 @@ void func_80AAB5A4(EnMd* this, PlayState* play) { void EnMd_Init(Actor* thisx, PlayState* play) { EnMd* this = (EnMd*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 24.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gMidoSkel, NULL, this->jointTable, this->morphTable, ENMD_LIMB_MAX); @@ -819,7 +819,7 @@ void func_80AABD0C(EnMd* this, PlayState* play) { void EnMd_Update(Actor* thisx, PlayState* play) { EnMd* this = (EnMd*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); 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 f73c76531d1..9956bc54008 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -50,7 +50,7 @@ static ColliderCylinderInit sCylinderInit = { void EnMk_Init(Actor* thisx, PlayState* play) { EnMk* this = (EnMk*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); this->actor.minVelocityY = -4.0f; this->actor.gravity = -1.0f; @@ -211,7 +211,7 @@ void func_80AAD014(EnMk* this, PlayState* play) { void EnMk_Wait(EnMk* this, PlayState* play) { s16 angle; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); s32 playerExchangeItem; @@ -281,7 +281,7 @@ void EnMk_Wait(EnMk* this, PlayState* play) { void EnMk_Update(Actor* thisx, PlayState* play) { EnMk* this = (EnMk*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Vec3s vec; Player* player; s16 swimFlag; 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 5b8377b8cd2..7057e644670 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -156,7 +156,7 @@ void EnMm_ChangeAnim(EnMm* this, s32 index, s32* currentIndex) { } void EnMm_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnMm* this = (EnMm*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -193,7 +193,7 @@ void EnMm_Init(Actor* thisx, PlayState* play) { } void EnMm_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnMm* this = (EnMm*)thisx; Collider_DestroyCylinder(play, &this->collider); @@ -210,7 +210,7 @@ s32 func_80AADA70(void) { } s32 func_80AADAA0(EnMm* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); s32 sp1C = 1; @@ -500,7 +500,7 @@ void func_80AAE598(EnMm* this, PlayState* play) { } void EnMm_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnMm* this = (EnMm*)thisx; this->actionFunc(this, play); @@ -511,7 +511,7 @@ void EnMm_Update(Actor* thisx, PlayState* play) { void EnMm_Draw(Actor* thisx, PlayState* play) { static void* mouthTextures[] = { gRunningManMouthOpenTex, gRunningManMouthClosedTex }; - UNUSED s32 pad; + STACK_PAD(s32); EnMm* this = (EnMm*)thisx; if (0) {} 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 84c189ac63e..d6e5d932fc7 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -289,7 +289,7 @@ void func_80AAF668(EnMm2* this, PlayState* play) { void EnMm2_Update(Actor* thisx, PlayState* play) { EnMm2* this = (EnMm2*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (this->unk_1F4 & 1) { Actor_TrackPlayer(play, &this->actor, &this->unk_1E8, &this->unk_1EE, this->actor.focus.pos); 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 8cdf5b1388e..47b6856a6b7 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -70,7 +70,7 @@ void EnMs_SetOfferText(EnMs* this, PlayState* play) { void EnMs_Init(Actor* thisx, PlayState* play) { EnMs* this = (EnMs*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (LINK_AGE_IN_YEARS != YEARS_CHILD) { Actor_Kill(&this->actor); @@ -159,7 +159,7 @@ void EnMs_TalkAfterPurchase(EnMs* this, PlayState* play) { void EnMs_Update(Actor* thisx, PlayState* play) { EnMs* this = (EnMs*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); this->activeTimer += 1; Actor_SetFocus(&this->actor, 20.0f); diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/src/overlays/actors/ovl_En_Mu/z_en_mu.c index d831f11fd10..d6fe804132c 100644 --- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c +++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c @@ -132,7 +132,7 @@ s16 EnMu_CheckDialogState(PlayState* play, Actor* thisx) { void EnMu_Init(Actor* thisx, PlayState* play) { EnMu* this = (EnMu*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 160.0f); SkelAnime_InitFlex(play, &this->skelAnime, &object_mu_Skel_004F70, &object_mu_Anim_0003F4, NULL, NULL, 0); @@ -157,7 +157,7 @@ void EnMu_Pose(EnMu* this, PlayState* play) { void EnMu_Update(Actor* thisx, PlayState* play) { EnMu* this = (EnMu*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); f32 talkDist; Vec3s pos; 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 e779064c43a..62767c9be59 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -103,7 +103,7 @@ s32 EnNb_GetType(EnNb* this) { void EnNb_UpdatePath(EnNb* this, PlayState* play) { Vec3s* pointPos; Path* pathList; - UNUSED s32 pad; + STACK_PAD(s32); s32 path; pathList = play->pathList; @@ -136,7 +136,7 @@ void EnNb_SetupCollider(Actor* thisx, PlayState* play) { } void EnNb_UpdateCollider(EnNb* this, PlayState* play) { - UNUSED s32 pad[4]; + STACK_PADS(s32, 4); ColliderCylinder* collider = &this->collider; Collider_UpdateCylinder(&this->actor, collider); @@ -166,7 +166,7 @@ void func_80AB1040(EnNb* this, PlayState* play) { } void func_80AB10C4(EnNb* this) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Vec3s* tempPtr; Vec3s* tempPtr2; @@ -179,7 +179,7 @@ void func_80AB10C4(EnNb* this) { } void EnNb_UpdateEyes(EnNb* this) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); s16* blinkTimer = &this->blinkTimer; s16* eyeIdx = &this->eyeIdx; @@ -329,7 +329,7 @@ void EnNb_ComeUpImpl(EnNb* this, PlayState* play) { } void EnNb_SetupChamberCsImpl(EnNb* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Player* player; if ((gSaveContext.chamberCutsceneNum == 3) && !IS_CUTSCENE_LAYER) { @@ -539,7 +539,7 @@ void EnNb_CreateLightOrb(EnNb* this, PlayState* play) { } void EnNb_DrawTransparency(EnNb* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s16 eyeSegIdx = this->eyeIdx; void* eyeTex = sEyeTextures[eyeSegIdx]; SkelAnime* skelAnime = &this->skelAnime; @@ -580,7 +580,7 @@ void EnNb_SetPosInPortal(EnNb* this, PlayState* play) { CsCmdActorAction* csCmdNPCAction = EnNb_GetNpcCsAction(play, 1); Vec3f* pos = &this->actor.world.pos; f32 f0; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f startPos; Vec3f endPos; @@ -695,7 +695,7 @@ void EnNb_SetupConfrontation(EnNb* this, PlayState* play) { } void EnNb_PlayKnuckleDefeatSFX(EnNb* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if (play->csCtx.frames == 548) { func_80078914(&this->actor.projectedPos, NA_SE_VO_NB_CRY_0); @@ -704,7 +704,7 @@ void EnNb_PlayKnuckleDefeatSFX(EnNb* this, PlayState* play) { } void EnNb_PlayKneelingOnGroundSFX(EnNb* this) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if ((this->skelAnime.mode == 2) && (Animation_OnFrame(&this->skelAnime, 18.0f) || Animation_OnFrame(&this->skelAnime, 25.0f))) { @@ -713,7 +713,7 @@ void EnNb_PlayKneelingOnGroundSFX(EnNb* this) { } void EnNb_PlayLookRightSFX(EnNb* this) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if ((this->skelAnime.mode == 2) && Animation_OnFrame(&this->skelAnime, 9.0f)) { func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_CONCRETE); @@ -721,7 +721,7 @@ void EnNb_PlayLookRightSFX(EnNb* this) { } void EnNb_PlayLookLeftSFX(EnNb* this) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if (Animation_OnFrame(&this->skelAnime, 9.0f) || Animation_OnFrame(&this->skelAnime, 13.0f)) { func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_CONCRETE); @@ -745,7 +745,7 @@ void func_80AB26C8(EnNb* this) { } void func_80AB26DC(EnNb* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); AnimationHeader* animation = &gNabooruCollapseFromStandingToKneelingTransitionAnim; f32 lastFrame = Animation_GetLastFrame(animation); @@ -949,7 +949,7 @@ void EnNb_ConfrontationDestroy(EnNb* this, PlayState* play) { } void func_80AB2E70(EnNb* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); SkelAnime* skelAnime = &this->skelAnime; OPEN_DISPS(play->state.gfxCtx, "../z_en_nb_inConfrontion.c", 572); @@ -976,11 +976,11 @@ s32 func_80AB2FC0(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s } void func_80AB2FE4(EnNb* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); s16 eyeIdx = this->eyeIdx; SkelAnime* skelAnime = &this->skelAnime; void* eyeTexture = sEyeTextures[eyeIdx]; - UNUSED s32 pad2; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_nb_inConfrontion.c", 623); @@ -1216,9 +1216,9 @@ void EnNb_SetupPathMovement(EnNb* this, PlayState* play) { } void EnNb_SetTextIdAsChild(EnNb* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); u8 choiceIndex; - UNUSED s32 pad2; + STACK_PAD(s32); u16 textId; textId = this->actor.textId; @@ -1420,7 +1420,7 @@ void EnNb_Update(Actor* thisx, PlayState* play) { } void EnNb_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnNb* this = (EnNb*)thisx; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); @@ -1490,11 +1490,11 @@ void EnNb_DrawNothing(EnNb* this, PlayState* play) { } void EnNb_DrawDefault(EnNb* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); s16 eyeIdx = this->eyeIdx; SkelAnime* skelAnime = &this->skelAnime; void* eyeTexture = sEyeTextures[eyeIdx]; - UNUSED s32 pad2; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_nb.c", 992); 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 e4db290080c..fb29f80dbfa 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -121,7 +121,7 @@ static InitChainEntry sInitChain[] = { void EnNiw_Init(Actor* thisx, PlayState* play) { EnNiw* this = (EnNiw*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s32 i; if (this->actor.params < 0) { @@ -471,7 +471,7 @@ void func_80AB6450(EnNiw* this, PlayState* play) { } void func_80AB6570(EnNiw* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); f32 posY = Rand_CenteredFloat(100.0f); f32 posZ = Rand_CenteredFloat(100.0f); s16 tmp; @@ -873,7 +873,7 @@ void func_80AB747C(EnNiw* this, PlayState* play) { } void EnNiw_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); EnNiw* this = (EnNiw*)thisx; Player* player = GET_PLAYER(play); s16 i; @@ -883,12 +883,12 @@ void EnNiw_Update(Actor* thisx, PlayState* play) { Vec3f pos; Vec3f vel; Vec3f accel; - UNUSED s32 pad2; + STACK_PAD(s32); f32 scale; Vec3f cam; f32 dist; f32 camResult; - UNUSED s32 pad3[10]; + STACK_PADS(s32, 10); if (1) {} // Required to match if (1) {} @@ -1138,7 +1138,7 @@ s32 EnNiw_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p void EnNiw_Draw(Actor* thisx, PlayState* play) { EnNiw* this = (EnNiw*)thisx; Vec3f scale = { 0.15f, 0.15f, 0.15f }; - UNUSED s32 pad; + STACK_PAD(s32); Gfx_SetupDL_25Opa(play->state.gfxCtx); SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, @@ -1204,7 +1204,7 @@ void EnNiw_UpdateEffects(EnNiw* this, PlayState* play) { void EnNiw_DrawEffects(EnNiw* this, PlayState* play) { u8 materialFlag = 0; s16 i; - UNUSED s32 pad; + STACK_PAD(s32); GraphicsContext* gfxCtx = play->state.gfxCtx; EnNiwEffect* effect = &this->effects[0]; diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index 117523e65a1..b00c67e93ac 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -53,10 +53,10 @@ static ColliderCylinderInit sCylinderInit = { void EnNiwGirl_Init(Actor* thisx, PlayState* play) { EnNiwGirl* this = (EnNiwGirl*)thisx; - UNUSED s32 pad1; + STACK_PAD(s32); Vec3f vec1; Vec3f vec2; - UNUSED s32 pad2; + STACK_PAD(s32); SkelAnime_InitFlex(play, &this->skelAnime, &gNiwGirlSkel, &gNiwGirlRunAnim, this->jointTable, this->morphTable, 17); Collider_InitCylinder(play, &this->collider); @@ -246,7 +246,7 @@ static Vec3f sConstVec3f = { 0.2f, 0.2f, 0.2f }; void EnNiwGirl_Draw(Actor* thisx, PlayState* play) { static void* eyeTextures[] = { gNiwGirlEyeOpenTex, gNiwGirlEyeHalfTex, gNiwGirlEyeClosedTex }; EnNiwGirl* this = (EnNiwGirl*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sp4C = sConstVec3f; OPEN_DISPS(play->state.gfxCtx, "../z_en_niw_girl.c", 573); diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index 553ef0a0dac..4d3a1e3c428 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -67,7 +67,7 @@ static ColliderCylinderInit sCylinderInit = { }; void EnNiwLady_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnNiwLady* this = (EnNiwLady*)thisx; this->objectAneIndex = Object_GetIndex(&play->objectCtx, OBJECT_ANE); @@ -151,7 +151,7 @@ void EnNiwLady_ChoseAnimation(EnNiwLady* this, PlayState* play, s32 arg2) { void func_80AB9F24(EnNiwLady* this, PlayState* play) { f32 frames; - UNUSED s32 pad; + STACK_PAD(s32); if (Object_IsLoaded(&play->objectCtx, this->objectAneIndex) && Object_IsLoaded(&play->objectCtx, this->objectOsAnimeIndex)) { @@ -491,7 +491,7 @@ void func_80ABAD7C(EnNiwLady* this, PlayState* play) { } void EnNiwLady_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnNiwLady* this = (EnNiwLady*)thisx; Player* player = GET_PLAYER(play); @@ -553,7 +553,7 @@ Gfx* EnNiwLady_EmptyDList(GraphicsContext* gfxCtx) { s32 EnNiwLady_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { EnNiwLady* this = (EnNiwLady*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (limbIndex == 15) { rot->x += this->unk_254.y; @@ -574,7 +574,7 @@ s32 EnNiwLady_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3 void EnNiwLady_Draw(Actor* thisx, PlayState* play) { static void* sEyeTextures[] = { gCuccoLadyEyeOpenTex, gCuccoLadyEyeHalfTex, gCuccoLadyEyeClosedTex }; EnNiwLady* this = (EnNiwLady*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_niw_lady.c", 1347); if (this->unk_27E != 0) { 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 5e2cfefd7df..ef67dde2f8f 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -64,7 +64,7 @@ static Gfx* sDLists[] = { void EnNutsball_Init(Actor* thisx, PlayState* play) { EnNutsball* this = (EnNutsball*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 400.0f, ActorShadow_DrawCircle, 13.0f); Collider_InitCylinder(play, &this->collider); @@ -145,7 +145,7 @@ void func_80ABBBA8(EnNutsball* this, PlayState* play) { void EnNutsball_Update(Actor* thisx, PlayState* play) { EnNutsball* this = (EnNutsball*)thisx; Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); if (!(player->stateFlags1 & (PLAYER_STATE1_6 | PLAYER_STATE1_7 | PLAYER_STATE1_28 | PLAYER_STATE1_29)) || (this->actionFunc == func_80ABBB34)) { @@ -165,7 +165,7 @@ void EnNutsball_Update(Actor* thisx, PlayState* play) { } void EnNutsball_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_nutsball.c", 327); 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 307c6c4a124..50400575d3c 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -202,7 +202,7 @@ void EnNwc_DrawChicks(EnNwc* this, PlayState* play) { } void EnNwc_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnNwc* this = (EnNwc*)thisx; ColliderJntSphElementInit elementInits[16]; ColliderJntSphElementInit* element; @@ -229,7 +229,7 @@ void EnNwc_Init(Actor* thisx, PlayState* play) { } void EnNwc_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnNwc* this = (EnNwc*)thisx; Collider_FreeJntSph(play, &this->collider); @@ -240,7 +240,7 @@ void EnNwc_Idle(EnNwc* this, PlayState* play) { } void EnNwc_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnNwc* this = (EnNwc*)thisx; this->updateFunc(this, play); @@ -248,7 +248,7 @@ void EnNwc_Update(Actor* thisx, PlayState* play) { } void EnNwc_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnNwc* this = (EnNwc*)thisx; EnNwc_DrawChicks(this, play); diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c index 34ae9d8415d..b23b10897dc 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -523,7 +523,7 @@ static Vec3f sFireOffsets[] = { }; void EnNy_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnNy* this = (EnNy*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_ny.c", 837); 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 2ca35128ac3..ab2fa4b2674 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -115,7 +115,7 @@ static InitChainEntry sInitChain[] = { void EnOkuta_Init(Actor* thisx, PlayState* play) { EnOkuta* this = (EnOkuta*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); WaterBox* outWaterBox; f32 ySurface; s32 floorBgId; @@ -289,7 +289,7 @@ void EnOkuta_WaitToAppear(EnOkuta* this, PlayState* play) { } void EnOkuta_Appear(EnOkuta* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); if (SkelAnime_Update(&this->skelAnime)) { if (this->actor.xzDistToPlayer < 160.0f) { @@ -314,7 +314,7 @@ void EnOkuta_Appear(EnOkuta* this, PlayState* play) { } void EnOkuta_Hide(EnOkuta* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Math_ApproachF(&this->actor.world.pos.y, this->actor.home.pos.y, 0.5f, 30.0f); if (SkelAnime_Update(&this->skelAnime)) { @@ -702,7 +702,7 @@ s32 EnOkuta_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* void EnOkuta_Draw(Actor* thisx, PlayState* play) { EnOkuta* this = (EnOkuta*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Gfx_SetupDL_25Opa(play->state.gfxCtx); 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 54e9b5bf7ed..e24bf0c152f 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -569,7 +569,7 @@ s32 EnOssan_TryGetObjBankIndices(EnOssan* this, PlayState* play, s16* objectIds) void EnOssan_Init(Actor* thisx, PlayState* play) { EnOssan* this = (EnOssan*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s16* objectIds; if (this->actor.params == OSSAN_TYPE_TALON && (LINK_AGE_IN_YEARS != YEARS_CHILD)) { @@ -1229,7 +1229,7 @@ void EnOssan_State_BrowseLeftShelf(EnOssan* this, PlayState* play, Player* playe } void EnOssan_State_BrowseRightShelf(EnOssan* this, PlayState* play, Player* player) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); u8 prevIndex; u8 nextIndex; @@ -2332,7 +2332,7 @@ void EnOssan_DrawStickDirectionPrompts(PlayState* play, EnOssan* this) { void EnOssan_DrawBazaarShopkeeper(Actor* thisx, PlayState* play) { static void* sBazaarShopkeeperEyeTextures[] = { gOssanEyeOpenTex, gOssanEyeHalfTex, gOssanEyeClosedTex }; EnOssan* this = (EnOssan*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_oB1.c", 4320); @@ -2354,7 +2354,7 @@ s32 EnOssan_OverrideLimbDrawKokiriShopkeeper(PlayState* play, s32 limbIndex, Gfx gKokiriShopkeeperEyeOpenTex, }; EnOssan* this = (EnOssan*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_oB1.c", 4354); @@ -2387,7 +2387,7 @@ Gfx* EnOssan_SetEnvColor(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b, u8 a) { void EnOssan_DrawKokiriShopkeeper(Actor* thisx, PlayState* play) { EnOssan* this = (EnOssan*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_oB1.c", 4409); @@ -2408,7 +2408,7 @@ void EnOssan_DrawKokiriShopkeeper(Actor* thisx, PlayState* play) { void EnOssan_DrawGoronShopkeeper(Actor* thisx, PlayState* play) { static void* sGoronShopkeeperEyeTextures[] = { gGoronCsEyeOpenTex, gGoronCsEyeHalfTex, gGoronCsEyeClosedTex }; EnOssan* this = (EnOssan*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_oB1.c", 4455); @@ -2436,7 +2436,7 @@ s32 EnOssan_OverrideLimbDrawZoraShopkeeper(PlayState* play, s32 limbIndex, Gfx** void EnOssan_DrawZoraShopkeeper(Actor* thisx, PlayState* play) { static void* sZoraShopkeeperEyeTextures[] = { gZoraEyeOpenTex, gZoraEyeHalfTex, gZoraEyeClosedTex }; EnOssan* this = (EnOssan*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_oB1.c", 4506); @@ -2460,7 +2460,7 @@ void EnOssan_DrawPotionShopkeeper(Actor* thisx, PlayState* play) { gPotionShopkeeperEyeClosedTex, }; EnOssan* this = (EnOssan*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_oB1.c", 4544); @@ -2477,7 +2477,7 @@ void EnOssan_DrawPotionShopkeeper(Actor* thisx, PlayState* play) { void EnOssan_DrawHappyMaskShopkeeper(Actor* thisx, PlayState* play) { static void* sHappyMaskShopkeeperEyeTextures[] = { gHappyMaskSalesmanEyeClosedTex, gHappyMaskSalesmanEyeOpenTex }; EnOssan* this = (EnOssan*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_oB1.c", 4578); @@ -2500,7 +2500,7 @@ void EnOssan_DrawBombchuShopkeeper(Actor* thisx, PlayState* play) { gBombchuShopkeeperEyeClosedTex, }; EnOssan* this = (EnOssan*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_oB1.c", 4611); 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 8db670957bd..957fde51d71 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -106,7 +106,7 @@ static InitChainEntry sInitChain[] = { void EnOwl_Init(Actor* thisx, PlayState* play) { EnOwl* this = (EnOwl*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s32 owlType; s32 switchFlag; @@ -1071,7 +1071,7 @@ s32 func_80ACC624(EnOwl* this, PlayState* play) { } void EnOwl_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnOwl* this = (EnOwl*)thisx; s16 phi_a1; @@ -1309,7 +1309,7 @@ void EnOwl_PostLimbUpdate(PlayState* play, s32 limbIndex, Gfx** gfx, Vec3s* rot, void EnOwl_Draw(Actor* thisx, PlayState* play) { static void* eyeTextures[] = { gObjOwlEyeOpenTex, gObjOwlEyeHalfTex, gObjOwlEyeClosedTex }; EnOwl* this = (EnOwl*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_owl.c", 2247); 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 77f48584672..5fb100934ac 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -855,7 +855,7 @@ void EnPeehat_SetStateExplode(EnPeehat* this) { void EnPeehat_StateExplode(EnPeehat* this, PlayState* play) { EnBom* bomb; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if (this->animTimer == 5) { bomb = (EnBom*)Actor_Spawn(&play->actorCtx, play, ACTOR_EN_BOM, this->actor.world.pos.x, diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c index e5d7a2070f9..27e2e16f567 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c @@ -58,7 +58,7 @@ static InitChainEntry sInitChain[] = { }; void EnPoDesert_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnPoDesert* this = (EnPoDesert*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -186,7 +186,7 @@ void EnPoDesert_Disappear(EnPoDesert* this, PlayState* play) { void EnPoDesert_Update(Actor* thisx, PlayState* play) { EnPoDesert* this = (EnPoDesert*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); SkelAnime_Update(&this->skelAnime); this->actionFunc(this, play); diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index 5c5b3bb4928..17de8f945cb 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -147,7 +147,7 @@ static MtxF sLimb7Mtx; void EnPoField_Init(Actor* thisx, PlayState* play) { EnPoField* this = (EnPoField*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (sNumSpawned != 10) { sSpawnPositions[sNumSpawned].x = this->actor.world.pos.x; @@ -541,7 +541,7 @@ void EnPoField_Damage(EnPoField* this, PlayState* play) { void EnPoField_Death(EnPoField* this, PlayState* play) { Vec3f sp6C; f32 sp68; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); f32 temp_f0; this->actionTimer++; @@ -771,7 +771,7 @@ void EnPoField_UpdateFlame(EnPoField* this, PlayState* play) { void EnPoField_DrawFlame(EnPoField* this, PlayState* play) { f32 sp4C; - UNUSED s32 pad; + STACK_PAD(s32); if (this->flameTimer != 0) { OPEN_DISPS(play->state.gfxCtx, "../z_en_po_field.c", 1669); @@ -845,7 +845,7 @@ void func_80AD6330(EnPoField* this) { } void EnPoField_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnPoField* this = (EnPoField*)thisx; EnPoField_TestForDamage(this, play); @@ -966,7 +966,7 @@ void EnPoField_UpdateDead(Actor* thisx, PlayState* play) { void EnPoField_DrawSoul(Actor* thisx, PlayState* play) { EnPoField* this = (EnPoField*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); EnPoFieldInfo* info = &sPoFieldInfo[this->actor.params]; OPEN_DISPS(play->state.gfxCtx, "../z_en_po_field.c", 2077); diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index 4ef98322a29..3445d3237db 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -289,9 +289,9 @@ void EnPoRelay_Talk2(EnPoRelay* this, PlayState* play) { void EnPoRelay_DisappearAndReward(EnPoRelay* this, PlayState* play) { Vec3f vec; f32 multiplier; - UNUSED s32 pad1; + STACK_PAD(s32); Vec3f sp60; - UNUSED s32 pad2; + STACK_PAD(s32); this->actionTimer++; if (this->actionTimer < 8) { @@ -347,7 +347,7 @@ void EnPoRelay_DisappearAndReward(EnPoRelay* this, PlayState* play) { void EnPoRelay_Update(Actor* thisx, PlayState* play) { EnPoRelay* this = (EnPoRelay*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); SkelAnime_Update(&this->skelAnime); this->actionFunc(this, play); 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 613fed50a23..42d7a08587f 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 @@ -175,7 +175,7 @@ static Vec3f D_80ADD7F8 = { 1000.0f, -1700.0f, 0.0f }; void EnPoSisters_Init(Actor* thisx, PlayState* play) { EnPoSisters* this = (EnPoSisters*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Actor_ProcessInitChain(&this->actor, sInitChain); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 50.0f); @@ -397,7 +397,7 @@ void func_80AD9AA8(EnPoSisters* this, PlayState* play) { this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0x800); Actor* actor3 = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_PO_SISTERS, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 0xC00); - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if (actor1 == NULL || actor2 == NULL || actor3 == NULL) { if (actor1 != NULL) { @@ -661,7 +661,7 @@ void func_80ADA7F0(EnPoSisters* this, PlayState* play) { } void func_80ADA8C0(EnPoSisters* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); SkelAnime_Update(&this->skelAnime); if (Animation_OnFrame(&this->skelAnime, 0.0f) && this->unk_19A != 0) { @@ -1168,7 +1168,7 @@ void func_80ADC10C(EnPoSisters* this, PlayState* play) { } void EnPoSisters_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnPoSisters* this = (EnPoSisters*)thisx; s16 temp; @@ -1295,7 +1295,7 @@ s32 EnPoSisters_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Ve void EnPoSisters_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfxP) { EnPoSisters* this = (EnPoSisters*)thisx; s32 i; - UNUSED s32 pad; + STACK_PAD(s32); if (this->actionFunc == func_80ADAFC0 && this->unk_19A >= 8 && limbIndex == 9) { gSPMatrix((*gfxP)++, Matrix_NewMtx(play->state.gfxCtx, "../z_en_po_sisters.c", 2876), @@ -1342,7 +1342,7 @@ void EnPoSisters_Draw(Actor* thisx, PlayState* play) { u8 spE7; Color_RGBA8* temp_s1 = &D_80ADD700[this->unk_194]; Color_RGBA8* temp_s7 = &D_80ADD6F0[this->unk_194]; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_po_sisters.c", 2989); func_80ADC55C(this); 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 afdb291ebc5..dbf414f297b 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -182,7 +182,7 @@ static Vec3f D_80AE1B60 = { 0.0f, 3.0f, 0.0f }; static Vec3f D_80AE1B6C = { 0.0f, 0.0f, 0.0f }; void EnPoh_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnItem00* collectible; EnPoh* this = (EnPoh*)thisx; @@ -604,7 +604,7 @@ void func_80ADF15C(EnPoh* this, PlayState* play) { Vec3f vec; f32 multiplier; f32 newScale; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); this->unk_198++; if (this->unk_198 < 8) { @@ -982,7 +982,7 @@ void func_80AE089C(EnPoh* this) { void EnPoh_UpdateLiving(Actor* thisx, PlayState* play) { EnPoh* this = (EnPoh*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f checkPos; s32 bgId; @@ -1173,7 +1173,7 @@ void EnPoh_DrawSoul(Actor* thisx, PlayState* play) { gSPDisplayList(POLY_OPA_DISP++, this->info->lanternDisplayList); if (this->infoIdx == EN_POH_INFO_COMPOSER) { Color_RGBA8* envColor = (this->actor.params == EN_POH_SHARP) ? &D_80AE1B4C : &D_80AE1B50; - UNUSED s32 pad; + STACK_PAD(s32); gSPDisplayList(POLY_OPA_DISP++, gPoeComposerLanternBottomDL); gDPPipeSync(POLY_OPA_DISP++); 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 99a4c7b3758..23be1912c76 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -340,7 +340,7 @@ void EnRd_WalkToPlayer(EnRd* this, PlayState* play) { UNUSED Color_RGBA8 D_80AE4924 = { 200, 200, 255, 255 }; UNUSED Color_RGBA8 D_80AE4928 = { 0, 0, 255, 0 }; Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); s16 yaw = this->actor.yawTowardsPlayer - this->actor.shape.rot.y - this->headYRotation - this->upperBodyYRotation; this->skelAnime.playSpeed = this->actor.speedXZ; @@ -409,7 +409,7 @@ void EnRd_SetupWalkToHome(EnRd* this, PlayState* play) { void EnRd_WalkToHome(EnRd* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); s16 targetY = Actor_WorldYawTowardPoint(&this->actor, &this->actor.home.pos); if (Actor_WorldDistXYZToPoint(&this->actor, &this->actor.home.pos) >= 5.0f) { @@ -467,7 +467,7 @@ void EnRd_SetupWalkToParent(EnRd* this) { */ void EnRd_WalkToParent(EnRd* this, PlayState* play) { if (this->actor.parent != NULL) { - UNUSED s32 pad; + STACK_PAD(s32); s16 targetY; Vec3f parentPos = this->actor.parent->world.pos; @@ -513,7 +513,7 @@ void EnRd_SetupGrab(EnRd* this) { } void EnRd_Grab(EnRd* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); if (SkelAnime_Update(&this->skelAnime)) { @@ -785,7 +785,7 @@ void EnRd_TurnTowardsPlayer(EnRd* this, PlayState* play) { } void EnRd_UpdateDamage(EnRd* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); if ((gSaveContext.sunsSongState != SUNSSONG_INACTIVE) && (this->actor.shape.rot.x == 0) && @@ -838,10 +838,10 @@ void EnRd_UpdateDamage(EnRd* this, PlayState* play) { } void EnRd_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); EnRd* this = (EnRd*)thisx; Player* player = GET_PLAYER(play); - UNUSED s32 pad2; + STACK_PAD(s32); EnRd_UpdateDamage(this, play); @@ -956,7 +956,7 @@ void EnRd_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void EnRd_Draw(Actor* thisx, PlayState* play) { UNUSED static Vec3f D_80AE494C = { 300.0f, 0.0f, 0.0f }; static Vec3f sShadowScale = { 0.25f, 0.25f, 0.25f }; - UNUSED s32 pad; + STACK_PAD(s32); EnRd* this = (EnRd*)thisx; Vec3f thisPos = thisx->world.pos; diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index 4f0820c0480..1d0a34ee11d 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -98,7 +98,7 @@ static ColliderCylinderInit sCylinderInit = { }; void EnReeba_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnReeba* this = (EnReeba*)thisx; s32 surfaceType; @@ -144,7 +144,7 @@ void EnReeba_Init(Actor* thisx, PlayState* play) { } void EnReeba_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnReeba* this = (EnReeba*)thisx; Collider_DestroyCylinder(play, &this->collider); @@ -654,7 +654,7 @@ void EnReeba_Update(Actor* thisx, PlayState* play2) { } void EnReeba_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnReeba* this = (EnReeba*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_reeba.c", 1062); diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/src/overlays/actors/ovl_En_Rl/z_en_rl.c index 99b993d77d2..c525ddf0770 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -36,7 +36,7 @@ void EnRl_Destroy(Actor* thisx, PlayState* play) { } void func_80AE72D0(EnRl* this) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); s16* timer = &this->timer; s16* eyeTextureIndex = &this->eyeTextureIndex; @@ -113,7 +113,7 @@ void func_80AE7544(EnRl* this, PlayState* play) { } void func_80AE7590(EnRl* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player; Vec3f pos; s16 sceneId = play->sceneId; @@ -295,7 +295,7 @@ void func_80AE7D40(EnRl* this, PlayState* play) { } void func_80AE7D94(EnRl* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s16 temp = this->eyeTextureIndex; void* tex = D_80AE81A0[temp]; SkelAnime* skelAnime = &this->skelAnime; @@ -344,7 +344,7 @@ void func_80AE7FD0(EnRl* this, PlayState* play) { } void func_80AE7FDC(EnRl* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s16 temp = this->eyeTextureIndex; void* tex = D_80AE81A0[temp]; SkelAnime* skelAnime = &this->skelAnime; 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 ab313d652b7..cd7e317aa79 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -198,7 +198,7 @@ void EnRr_Init(Actor* thisx, PlayState* play2) { } void EnRr_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnRr* this = (EnRr*)thisx; Collider_DestroyCylinder(play, &this->collider1); @@ -654,7 +654,7 @@ void EnRr_Damage(EnRr* this, PlayState* play) { } void EnRr_Death(EnRr* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 i; if (this->frameCount < 40) { @@ -759,7 +759,7 @@ void EnRr_Stunned(EnRr* this, PlayState* play) { } void EnRr_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnRr* this = (EnRr*)thisx; s32 i; @@ -843,7 +843,7 @@ static Vec3f sEffectOffsets[] = { }; void EnRr_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f zeroVec; EnRr* this = (EnRr*)thisx; s32 i; diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 49acd2f8184..3ea82058471 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -145,14 +145,14 @@ ActorInit En_Ru1_InitVars = { }; void func_80AEAC10(EnRu1* this, PlayState* play) { - UNUSED s32 pad[5]; + STACK_PADS(s32, 5); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); } void func_80AEAC54(EnRu1* this, PlayState* play) { - UNUSED s32 pad[5]; + STACK_PADS(s32, 5); Collider_UpdateCylinder(&this->actor, &this->collider2); if (this->unk_34C != 0) { @@ -163,7 +163,7 @@ void func_80AEAC54(EnRu1* this, PlayState* play) { } void func_80AEACDC(EnRu1* this, PlayState* play) { - UNUSED s32 pad[5]; + STACK_PADS(s32, 5); Collider_UpdateCylinder(&this->actor, &this->collider2); CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider2.base); @@ -207,7 +207,7 @@ void EnRu1_Destroy(Actor* thisx, PlayState* play) { } void EnRu1_UpdateEyes(EnRu1* this) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); s16* blinkTimer = &this->blinkTimer; s16* eyeIndex = &this->eyeIndex; @@ -247,7 +247,7 @@ s32 EnRu1_IsCsStateIdle(PlayState* play) { } CsCmdActorAction* func_80AEAF58(PlayState* play, s32 npcActionIdx) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); CsCmdActorAction* ret = NULL; if (!EnRu1_IsCsStateIdle(play)) { @@ -359,7 +359,7 @@ void func_80AEB220(EnRu1* this, PlayState* play) { } void func_80AEB264(EnRu1* this, AnimationHeader* animation, u8 arg2, f32 morphFrames, s32 arg4) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); AnimationHeader* animHeader = SEGMENTED_TO_VIRTUAL(animation); f32 frameCount = Animation_GetLastFrame(animHeader); f32 playbackSpeed; @@ -526,7 +526,7 @@ void func_80AEB974(EnRu1* this, PlayState* play) { Vec3f* thisPos; f32 sp30; CsCmdActorAction* csCmdNPCAction = func_80AEB438(play); - UNUSED s32 pad; + STACK_PAD(s32); if (csCmdNPCAction != NULL) { sp30 = func_80AEB7E0(csCmdNPCAction, play); @@ -542,12 +542,12 @@ void func_80AEBA0C(EnRu1* this, PlayState* play) { } void func_80AEBA2C(EnRu1* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); Vec3f* unk_364 = &this->unk_364; Vec3f* thisPos; f32 temp_ret_2; CsCmdActorAction* csCmdNPCAction = func_80AEB438(play); - UNUSED s32 pad2; + STACK_PAD(s32); if (csCmdNPCAction != NULL) { temp_ret_2 = func_80AEB7E0(csCmdNPCAction, play); @@ -621,7 +621,7 @@ void func_80AEBD1C(EnRu1* this, PlayState* play) { } void func_80AEBD94(EnRu1* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); f32 frameCount; if (func_80AEB480(play, 3)) { @@ -635,7 +635,7 @@ void func_80AEBD94(EnRu1* this, PlayState* play) { } void func_80AEBE3C(EnRu1* this, PlayState* play, s32 arg2) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); f32 frameCount; if (arg2 != 0) { @@ -649,7 +649,7 @@ void func_80AEBE3C(EnRu1* this, PlayState* play, s32 arg2) { } void func_80AEBEC8(EnRu1* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); f32 frameCount; if (func_80AEB458(play, 6)) { @@ -828,7 +828,7 @@ s32 func_80AEC5FC(EnRu1* this, PlayState* play) { } void func_80AEC650(EnRu1* this) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if (this->unk_280 == 0) { if (Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 7.0f)) { @@ -852,7 +852,7 @@ void func_80AEC6E4(EnRu1* this, PlayState* play) { } void func_80AEC780(EnRu1* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); if ((func_80AEC5FC(this, play)) && (!Play_InCsMode(play)) && @@ -985,13 +985,13 @@ void func_80AECC84(EnRu1* this, PlayState* play) { } void func_80AECCB0(EnRu1* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); Vec3f* pos; s16 yawTowardsPlayer; f32 spawnX; f32 spawnY; f32 spawnZ; - UNUSED s32 pad2[2]; + STACK_PADS(s32, 2); yawTowardsPlayer = this->actor.yawTowardsPlayer; pos = &this->actor.world.pos; @@ -1015,11 +1015,11 @@ void func_80AECE04(EnRu1* this, PlayState* play) { } void func_80AECE20(EnRu1* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); Player* player = GET_PLAYER(play); Vec3f* playerPos = &player->actor.world.pos; s16 shapeRotY = player->actor.shape.rot.y; - UNUSED s32 pad2; + STACK_PAD(s32); f32 unk_27C = this->unk_27C; Vec3f* pos = &this->actor.world.pos; @@ -1029,7 +1029,7 @@ void func_80AECE20(EnRu1* this, PlayState* play) { } void func_80AECEB4(EnRu1* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); Vec3f* player_unk_450 = &player->unk_450; Vec3f* pos = &this->actor.world.pos; @@ -1046,7 +1046,7 @@ s32 func_80AECF6C(EnRu1* this, PlayState* play) { s16 temp_f16; f32 temp1; f32 temp2; - UNUSED s32 pad[5]; + STACK_PADS(s32, 5); this->unk_26C += 1.0f; if ((player->actor.speedXZ == 0.0f) && (this->unk_26C >= 3.0f)) { @@ -1269,7 +1269,7 @@ void func_80AED738(EnRu1* this, PlayState* play) { } void func_80AED83C(EnRu1* this) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Vec3s* tempPtr; Vec3s* tempPtr2; @@ -1286,7 +1286,7 @@ void func_80AED8DC(EnRu1* this) { s16* unk_2AC = &this->unk_2AC; s16* someY = &this->unk_374.unk_08.y; s16* unk_29E = &this->unk_29E; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if (DECR(*unk_2AC) == 0) { *unk_2AC = Rand_S16Offset(0xA, 0x19); @@ -1441,7 +1441,7 @@ void func_80AEE02C(EnRu1* this) { } void func_80AEE050(EnRu1* this) { - UNUSED s32 pad; + STACK_PAD(s32); f32 sp28; f32 sp24; f32 temp_f10; @@ -1529,7 +1529,7 @@ void func_80AEE2F8(EnRu1* this, PlayState* play) { } s32 func_80AEE394(EnRu1* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); CollisionContext* colCtx; DynaPolyActor* dynaPolyActor; s32 floorBgId; @@ -1584,7 +1584,7 @@ void func_80AEE568(EnRu1* this, PlayState* play) { } void func_80AEE628(EnRu1* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s8 curRoomNum = play->roomCtx.curRoom.num; if (EnRu1_IsCsStateIdle(play)) { @@ -1597,7 +1597,7 @@ void func_80AEE628(EnRu1* this, PlayState* play) { } s32 func_80AEE6D0(EnRu1* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s8 curRoomNum = play->roomCtx.curRoom.num; if (!GET_INFTABLE(INFTABLE_144) && (func_80AEB124(play) != NULL)) { @@ -1619,7 +1619,7 @@ s32 func_80AEE6D0(EnRu1* this, PlayState* play) { void func_80AEE7C4(EnRu1* this, PlayState* play) { f32 frameCount; - UNUSED s32 pad[13]; + STACK_PADS(s32, 13); Player* player; f32* unk_370 = &this->unk_370; @@ -1999,7 +1999,7 @@ void func_80AEF820(EnRu1* this, UNK_TYPE arg1) { } void func_80AEF890(EnRu1* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s8 curRoomNum; if (!IS_CUTSCENE_LAYER && (EnRu1_IsCsStateIdle(play))) { @@ -2219,7 +2219,7 @@ void EnRu1_Update(Actor* thisx, PlayState* play) { } void EnRu1_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnRu1* this = (EnRu1*)thisx; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f); @@ -2308,13 +2308,13 @@ void EnRu1_DrawNothing(EnRu1* this, PlayState* play) { } void EnRu1_DrawOpa(EnRu1* this, PlayState* play) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); s16 eyeIndex = this->eyeIndex; void* eyeTex = sEyeTextures[eyeIndex]; s16 mouthIndex = this->mouthIndex; SkelAnime* skelAnime = &this->skelAnime; void* mouthTex = sMouthTextures[mouthIndex]; - UNUSED s32 pad2; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_ru1.c", 1282); @@ -2333,13 +2333,13 @@ void EnRu1_DrawOpa(EnRu1* this, PlayState* play) { } void EnRu1_DrawXlu(EnRu1* this, PlayState* play) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); s16 eyeIndex = this->eyeIndex; void* eyeTex = sEyeTextures[eyeIndex]; s16 mouthIndex = this->mouthIndex; SkelAnime* skelAnime = &this->skelAnime; void* mouthTex = sMouthTextures[mouthIndex]; - UNUSED s32 pad2; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_ru1.c", 1324); diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index cb27ae63258..6fb3d1ff149 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -98,7 +98,7 @@ void func_80AF2550(Actor* thisx, PlayState* play) { } void func_80AF259C(EnRu2* this, PlayState* play) { - UNUSED s32 pad[5]; + STACK_PADS(s32, 5); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base); @@ -111,7 +111,7 @@ void EnRu2_Destroy(Actor* thisx, PlayState* play) { } void func_80AF2608(EnRu2* this) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); s16* unk_2A6 = &this->unk_2A6; s16* unk_2A4 = &this->unk_2A4; @@ -261,7 +261,7 @@ void func_80AF2A38(EnRu2* this, PlayState* play) { } void func_80AF2AB4(EnRu2* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Player* player; s16 temp; @@ -466,7 +466,7 @@ void func_80AF31C8(EnRu2* this, PlayState* play) { } void func_80AF321C(EnRu2* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s16 temp = this->unk_2A4; void* tex = sEyeTextures[temp]; SkelAnime* skelAnime = &this->skelAnime; @@ -656,12 +656,12 @@ void func_80AF390C(EnRu2* this, PlayState* play) { } void func_80AF39DC(EnRu2* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); MessageContext* msgCtx; - UNUSED s32 pad2; + STACK_PAD(s32); u8 dialogState; Player* player; - UNUSED s32 pad3; + STACK_PAD(s32); msgCtx = &play->msgCtx; dialogState = Message_GetState(msgCtx); @@ -794,7 +794,7 @@ void func_80AF3F14(EnRu2* this, PlayState* play) { } void func_80AF3F20(EnRu2* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s16 temp = this->unk_2A4; void* tex = sEyeTextures[temp]; SkelAnime* skelAnime = &this->skelAnime; diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index e3ff16ba2c5..9eaffc183da 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -479,7 +479,7 @@ void func_80AF6170(CsCmdActorAction* csAction, Vec3f* dst) { void EnSa_Init(Actor* thisx, PlayState* play) { EnSa* this = (EnSa*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 12.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gSariaSkel, NULL, this->jointTable, this->morphTable, 17); @@ -721,7 +721,7 @@ void func_80AF6B20(EnSa* this, PlayState* play) { void EnSa_Update(Actor* thisx, PlayState* play) { EnSa* this = (EnSa*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); @@ -760,7 +760,7 @@ void EnSa_Update(Actor* thisx, PlayState* play) { s32 EnSa_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) { EnSa* this = (EnSa*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Vec3s sp18; if (limbIndex == 16) { 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 0e42a69392e..814564c28b4 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -283,7 +283,7 @@ void EnSb_Lunge(EnSb* this, PlayState* play) { } void EnSb_Bounce(EnSb* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 currentFrame; f32 frameCount; @@ -442,7 +442,7 @@ s32 EnSb_UpdateDamage(EnSb* this, PlayState* play) { void EnSb_Update(Actor* thisx, PlayState* play) { EnSb* this = (EnSb*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (this->isDead) { if (this->actor.yDistToWater > 0.0f) { diff --git a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c index 9bc2280050e..1c8dff97ea2 100644 --- a/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c +++ b/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c @@ -50,9 +50,9 @@ void EnSceneChange_Update(Actor* thisx, PlayState* play) { } void EnSceneChange_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); Gfx* displayList; - UNUSED s32 pad2[2]; + STACK_PADS(s32, 2); Gfx* displayListHead; displayList = Graph_Alloc(play->state.gfxCtx, 0x3C0); 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 656e92b89c9..a7443e5a338 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -95,7 +95,7 @@ void EnSda_Destroy(Actor* thisx, PlayState* play) { } void EnSda_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnSda* this = (EnSda*)thisx; Player* player; @@ -333,7 +333,7 @@ void func_80AF95C4(EnSda* this, u8* shadowTexture, Player* player, PlayState* pl } void func_80AF9C70(u8* shadowTexture, Player* player, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 tempx; f32 tempz; s16 phi_s1; diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c index 6937bd56b0d..f570b7ddbe0 100644 --- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c +++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c @@ -38,7 +38,7 @@ void EnSiofuki_Init(Actor* thisx, PlayState* play) { EnSiofuki* this = (EnSiofuki*)thisx; s32 type; CollisionHeader* colHeader = NULL; - UNUSED s32 pad; + STACK_PAD(s32); if ((thisx->room == 10) && Flags_GetSwitch(play, 0x1E)) { Actor_Kill(thisx); 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 b36f1333b2a..e7789ef2624 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -441,7 +441,7 @@ void EnSkb_Death(EnSkb* this, PlayState* play) { } void EnSkb_CheckDamage(EnSkb* this, PlayState* play) { - UNUSED s16 pad; + STACK_PAD(s16); s32 i; Vec3f flamePos; s16 scale; @@ -506,7 +506,7 @@ void EnSkb_CheckDamage(EnSkb* this, PlayState* play) { void EnSkb_Update(Actor* thisx, PlayState* play) { EnSkb* this = (EnSkb*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); EnSkb_CheckDamage(this, play); Actor_MoveForward(&this->actor); @@ -532,7 +532,7 @@ void EnSkb_Update(Actor* thisx, PlayState* play) { s32 EnSkb_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { EnSkb* this = (EnSkb*)thisx; s16 color; - UNUSED s16 pad[2]; + STACK_PADS(s16, 2); if (limbIndex == 11) { if ((this->breakFlags & 2) == 0) { // head limb, head is still attached diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index ae13c1d4cfa..69915d9a22e 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -363,7 +363,7 @@ void EnSkj_Init(Actor* thisx, PlayState* play2) { s16 type = (thisx->params >> 0xA) & 0x3F; EnSkj* this = (EnSkj*)thisx; PlayState* play = play2; - UNUSED s32 pad; + STACK_PAD(s32); Player* player; Actor_ProcessInitChain(thisx, sInitChain); @@ -458,7 +458,7 @@ void EnSkj_Init(Actor* thisx, PlayState* play2) { } void EnSkj_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnSkj* this = (EnSkj*)thisx; Collider_DestroyCylinder(play, &this->collider); @@ -488,7 +488,7 @@ f32 EnSkj_GetItemYRange(EnSkj* this) { } s32 EnSkj_ShootNeedle(EnSkj* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f pos; Vec3f pos2; EnSkjneedle* needle; @@ -806,7 +806,7 @@ void EnSkj_SetupStand(EnSkj* this) { void EnSkj_Fight(EnSkj* this, PlayState* play) { Vec3f pos1; Vec3f pos2; - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); f32 prevPosX; f32 prevPosZ; f32 phi_f14; @@ -1029,7 +1029,7 @@ void EnSkj_SetupTalk(EnSkj* this) { } void EnSkj_SariaSongTalk(EnSkj* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); if ((Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(play)) { if (GET_ITEMGETINF(ITEMGETINF_16)) { @@ -1283,7 +1283,7 @@ void EnSkj_LeaveOcarinaGame(EnSkj* this, PlayState* play) { void EnSkj_Update(Actor* thisx, PlayState* play) { Vec3f dropPos; - UNUSED s32 pad; + STACK_PAD(s32); EnSkj* this = (EnSkj*)thisx; D_80B01EA0 = Actor_ProcessTalkRequest(&this->actor, play); @@ -1643,7 +1643,7 @@ Gfx* EnSkj_OpaqueDL(GraphicsContext* gfxCtx, u32 alpha) { } void EnSkj_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnSkj* this = (EnSkj*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_skj.c", 2475); diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c index 8c05de1ec24..06d5ecbbcd7 100644 --- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c +++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c @@ -99,7 +99,7 @@ void EnSkjneedle_Update(Actor* thisx, PlayState* play2) { } void EnSkjneedle_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_skj_needle.c", 200); 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 2e0ff030751..2e6cbe0f2a4 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -193,7 +193,7 @@ void EnSsh_InitColliders(EnSsh* this, PlayState* play) { &sCylinderInit1, &sCylinderInit1, &sCylinderInit1, &sCylinderInit2, &sCylinderInit2, &sCylinderInit2, }; s32 i; - UNUSED s32 pad; + STACK_PAD(s32); for (i = 0; i < ARRAY_COUNT(cylinders); i++) { Collider_InitCylinder(play, &this->colCylinder[i]); @@ -225,7 +225,7 @@ f32 EnSsh_SetAnimation(EnSsh* this, s32 animIndex) { f32 playbackSpeed[] = { 1.0f, 4.0f, 1.0f, 1.0f, 8.0f, 6.0f, 2.0f }; u8 mode[] = { 3, 3, 1, 3, 1, 1, 1 }; f32 frameCount = Animation_GetLastFrame(animation[animIndex]); - UNUSED s32 pad; + STACK_PAD(s32); Animation_Change(&this->skelAnime, animation[animIndex], playbackSpeed[animIndex], 0.0f, frameCount, mode[animIndex], -6.0f); @@ -605,7 +605,7 @@ void EnSsh_SetColliders(EnSsh* this, PlayState* play) { void EnSsh_Init(Actor* thisx, PlayState* play) { f32 frameCount; - UNUSED s32 pad; + STACK_PAD(s32); EnSsh* this = (EnSsh*)thisx; frameCount = Animation_GetLastFrame(&object_ssh_Anim_000304); @@ -637,7 +637,7 @@ void EnSsh_Init(Actor* thisx, PlayState* play) { } void EnSsh_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnSsh* this = (EnSsh*)thisx; s32 i; @@ -805,7 +805,7 @@ void EnSsh_Start(EnSsh* this, PlayState* play) { } void EnSsh_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnSsh* this = (EnSsh*)thisx; EnSsh_UpdateColliderScale(this); @@ -876,7 +876,7 @@ void EnSsh_Draw(Actor* thisx, PlayState* play) { object_ssh_Tex_000C60, object_ssh_Tex_001060, }; - UNUSED s32 pad; + STACK_PAD(s32); EnSsh* this = (EnSsh*)thisx; EnSsh_CheckBodyStickHit(this, play); 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 3985e78eb4e..3253d26579d 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -278,7 +278,7 @@ void EnSt_InitColliders(EnSt* this, PlayState* play) { }; s32 i; - UNUSED s32 pad; + STACK_PAD(s32); for (i = 0; i < ARRAY_COUNT(cylinders); i++) { Collider_InitCylinder(play, &this->colCylinder[i]); @@ -780,7 +780,7 @@ void EnSt_Sway(EnSt* this) { void EnSt_Init(Actor* thisx, PlayState* play) { EnSt* this = (EnSt*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 14.0f); SkelAnime_Init(play, &this->skelAnime, &object_st_Skel_005298, NULL, this->jointTable, this->morphTable, 30); @@ -1008,7 +1008,7 @@ void EnSt_StartOnCeilingOrGround(EnSt* this, PlayState* play) { void EnSt_Update(Actor* thisx, PlayState* play) { EnSt* this = (EnSt*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Color_RGBA8 color = { 0, 0, 0, 0 }; if (this->actor.flags & ACTOR_FLAG_15) { 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 b9bdd6ac18b..4163c4cf47b 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -135,7 +135,7 @@ void EnSth_Init(Actor* thisx, PlayState* play) { } void EnSth_SetupShapeColliderUpdate2AndDraw(EnSth* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); Collider_InitCylinder(play, &this->collider); @@ -146,7 +146,7 @@ void EnSth_SetupShapeColliderUpdate2AndDraw(EnSth* this, PlayState* play) { } void EnSth_SetupAfterObjectLoaded(EnSth* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16* params; EnSth_SetupShapeColliderUpdate2AndDraw(this, play); @@ -178,7 +178,7 @@ void EnSth_WaitForObjectLoaded(EnSth* this, PlayState* play) { } void EnSth_FacePlayer(EnSth* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16 diffRot = this->actor.yawTowardsPlayer - this->actor.shape.rot.y; if (ABS(diffRot) <= 0x4000) { @@ -313,7 +313,7 @@ void EnSth_Update(Actor* thisx, PlayState* play) { void EnSth_Update2(Actor* thisx, PlayState* play) { EnSth* this = (EnSth*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); @@ -385,7 +385,7 @@ Gfx* EnSth_AllocColorDList(GraphicsContext* play, u8 envR, u8 envG, u8 envB, u8 void EnSth_Draw(Actor* thisx, PlayState* play) { EnSth* this = (EnSth*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_sth.c", 2133); 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 eb60602259b..4fb18698658 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -81,11 +81,11 @@ s32 func_80B0B81C(Vec3f* vortexPosRot, Vec3f* playerPosRot, Vec3f* posDifference void EnStream_SuckPlayer(EnStream* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad1; + STACK_PAD(s32); Vec3f posDifference; f32 xzDist; f32 yDistWithOffset; - UNUSED s32 pad2[2]; + STACK_PADS(s32, 2); if (func_80B0B81C(&this->actor.world.pos, &player->actor.world.pos, &posDifference, this->actor.scale.y) != 0) { xzDist = sqrtf(SQ(posDifference.x) + SQ(posDifference.z)); @@ -111,7 +111,7 @@ void EnStream_SuckPlayer(EnStream* this, PlayState* play) { void EnStream_WaitForPlayer(EnStream* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s16 pad; + STACK_PAD(s16); Vec3f temp; if (func_80B0B81C(&this->actor.world.pos, &player->actor.world.pos, &temp, this->actor.scale.y) != 0) { 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 6f435eaf58e..05c456267b2 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -74,7 +74,7 @@ s32 func_80B0BE20(EnSw* this, CollisionPoly* poly) { Vec3f sp38; f32 sp34; f32 temp_f0; - UNUSED s32 pad; + STACK_PAD(s32); this->actor.floorPoly = poly; polyNormal.x = COLPOLY_GET_NORMAL(poly->normal.x); @@ -116,7 +116,7 @@ s32 func_80B0BE20(EnSw* this, CollisionPoly* poly) { CollisionPoly* func_80B0C020(PlayState* play, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3, s32* arg4) { CollisionPoly* sp3C; - UNUSED s32 pad; + STACK_PAD(s32); if (!BgCheck_EntityLineTest1(&play->colCtx, arg1, arg2, arg3, &sp3C, true, true, true, false, arg4)) { return NULL; @@ -140,7 +140,7 @@ s32 func_80B0C0CC(EnSw* this, PlayState* play, s32 arg2) { Vec3f sp90; Vec3f sp84; Vec3f sp78; - UNUSED s32 pad; + STACK_PAD(s32); s32 sp70; s32 sp6C; s32 phi_s1; @@ -217,7 +217,7 @@ void EnSw_Init(Actor* thisx, PlayState* play) { EnSw* this = (EnSw*)thisx; s32 phi_v0; UNUSED Vec3f sp4C = { 0.0f, 0.0f, 0.0f }; - UNUSED s32 pad; + STACK_PAD(s32); if (thisx->params & 0x8000) { phi_v0 = (((thisx->params - 0x8000) & 0xE000) >> 0xD) + 1; @@ -711,7 +711,7 @@ s32 func_80B0DEA8(EnSw* this, PlayState* play, s32 arg2) { } s32 func_80B0DFFC(EnSw* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); CollisionPoly* sp60; s32 sp5C; Vec3f sp50; @@ -816,7 +816,7 @@ s32 func_80B0E430(EnSw* this, f32 arg1, s16 arg2, s32 arg3, PlayState* play) { } void func_80B0E5E0(EnSw* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); f32 rand; if (func_80B0E430(this, 6.0f, 0x3E8, 1, play)) { @@ -835,7 +835,7 @@ void func_80B0E5E0(EnSw* this, PlayState* play) { void func_80B0E728(EnSw* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); if (DECR(this->unk_442) != 0) { if (func_80B0DEA8(this, play, 1)) { @@ -868,7 +868,7 @@ void func_80B0E728(EnSw* this, PlayState* play) { } void func_80B0E90C(EnSw* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); func_80B0E314(this, this->unk_448, 0.0f); if (this->actor.speedXZ == 0.0f) { @@ -879,7 +879,7 @@ void func_80B0E90C(EnSw* this, PlayState* play) { } void func_80B0E9BC(EnSw* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); if (func_80B0E430(this, 6.0f, 0x3E8, 0, play)) { func_80B0E314(this, this->unk_448, 2.0f); @@ -987,7 +987,7 @@ void func_80B0EDB8(PlayState* play, Color_RGBA8* arg1, s16 arg2, s16 arg3) { } void func_80B0EEA4(PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_sw.c", 2205); diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c index f51d9f462c5..cb5af7c9d11 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c @@ -331,7 +331,7 @@ void EnSyatekiItm_EndGame(EnSyatekiItm* this, PlayState* play) { } void EnSyatekiItm_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnSyatekiItm* this = (EnSyatekiItm*)thisx; this->actionFunc(this, play); 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 4deed4a3323..384b823740d 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 @@ -150,7 +150,7 @@ static s16 sTextIds[] = { 0x2B, 0x2E, 0xC8, 0x2D }; static s16 sTextBoxCount[] = { TEXT_STATE_CHOICE, TEXT_STATE_EVENT, TEXT_STATE_EVENT, TEXT_STATE_EVENT }; void EnSyatekiMan_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnSyatekiMan* this = (EnSyatekiMan*)thisx; osSyncPrintf("\n\n"); @@ -460,7 +460,7 @@ void EnSyatekiMan_Blink(EnSyatekiMan* this) { } void EnSyatekiMan_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnSyatekiMan* this = (EnSyatekiMan*)thisx; if (this->timer != 0) { @@ -494,7 +494,7 @@ s32 EnSyatekiMan_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, V } void EnSyatekiMan_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnSyatekiMan* this = (EnSyatekiMan*)thisx; Gfx_SetupDL_25Opa(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 2470b195697..6988fb47d01 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -511,7 +511,7 @@ void func_80B128F8(EnSyatekiNiw* this, PlayState* play) { } void func_80B129EC(EnSyatekiNiw* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 phi_f2; s16 sp2E; s16 sp2C; @@ -571,7 +571,7 @@ void func_80B12BA4(EnSyatekiNiw* this, PlayState* play) { void EnSyatekiNiw_Update(Actor* thisx, PlayState* play) { EnSyatekiNiw* this = (EnSyatekiNiw*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s16 i; UNUSED Vec3f sp90 = { 0.0f, 0.0f, 0.0f }; UNUSED Vec3f sp84 = { 0.0f, 0.0f, 0.0f }; diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index a95dccb5973..a8fb4b7f277 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -1228,7 +1228,7 @@ void EnTa_AnimRunToEnd(EnTa* this) { void EnTa_Update(Actor* thisx, PlayState* play) { EnTa* this = (EnTa*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); @@ -1309,7 +1309,7 @@ void EnTa_Draw(Actor* thisx, PlayState* play) { gTalonEyeClosedTex, }; EnTa* this = (EnTa*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_ta.c", 2381); 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 5f4f93a8341..3c3c55cd04b 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -359,7 +359,7 @@ void EnTest_ChooseRandomAction(EnTest* this, PlayState* play) { } void EnTest_ChooseAction(EnTest* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); s16 yawDiff = player->actor.shape.rot.y - this->actor.shape.rot.y; @@ -566,9 +566,9 @@ void EnTest_SetupWalkAndBlock(EnTest* this) { } void EnTest_WalkAndBlock(EnTest* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); f32 checkDist = 0.0f; - UNUSED s32 pad2; + STACK_PAD(s32); s32 prevFrame; s32 beforeCurFrame; f32 playSpeed; @@ -789,7 +789,7 @@ void func_80860EC0(EnTest* this) { // a variation of sidestep void func_80860F84(EnTest* this, PlayState* play) { s16 playerYaw180; - UNUSED s32 pad; + STACK_PAD(s32); s32 prevFrame; s32 beforeCurFrame; s16 yawDiff; @@ -1361,12 +1361,12 @@ void func_808627C4(EnTest* this, PlayState* play) { // a variation of sidestep void func_808628C8(EnTest* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); Player* player = GET_PLAYER(play); - UNUSED s32 pad2; + STACK_PAD(s32); s32 prevFrame; s32 beforeCurFrame; - UNUSED s32 pad3; + STACK_PAD(s32); f32 checkDist = 0.0f; s16 newYaw; f32 absPlaySpeed; @@ -1703,7 +1703,7 @@ void EnTest_Update(Actor* thisx, PlayState* play) { EnTest* this = (EnTest*)thisx; f32 oldWeight; u32 floorProperty; - UNUSED s32 pad; + STACK_PAD(s32); EnTest_UpdateDamage(this, play); @@ -1821,7 +1821,7 @@ void EnTest_Update(Actor* thisx, PlayState* play) { s32 EnTest_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { EnTest* this = (EnTest*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (limbIndex == STALFOS_LIMB_HEAD_ROOT) { rot->x += this->headRot.y; @@ -1862,7 +1862,7 @@ void EnTest_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot Vec3f sp70; Vec3f sp64; EnTest* this = (EnTest*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sp50; BodyBreak_SetInfo(&this->bodyBreak, limbIndex, 0, 60, 60, dList, BODYBREAK_OBJECT_DEFAULT); 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 03bf054a5bd..7e23c58b7ae 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -139,7 +139,7 @@ void EnTg_SpinIfNotTalking(EnTg* this, PlayState* play) { void EnTg_Update(Actor* thisx, PlayState* play) { EnTg* this = (EnTg*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); f32 temp; Vec3s sp2C; 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 9784b43d279..228ae04ece7 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -893,7 +893,7 @@ void EnTite_CheckDamage(Actor* thisx, PlayState* play) { void EnTite_Update(Actor* thisx, PlayState* play) { EnTite* this = (EnTite*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionPoly* floorPoly; WaterBox* waterBox; f32 waterSurfaceY; 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 48a2cf41c2d..83af2adbf29 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -478,7 +478,7 @@ void EnTk_DigEff(EnTk* this) { void EnTk_Init(Actor* thisx, PlayState* play) { EnTk* this = (EnTk*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(&this->actor.shape, 0, ActorShadow_DrawCircle, 24.0f); @@ -654,7 +654,7 @@ void EnTk_Dig(EnTk* this, PlayState* play) { void EnTk_Update(Actor* thisx, PlayState* play) { EnTk* this = (EnTk*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); 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 5b517d390d3..f21bc8c6ce0 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -127,7 +127,7 @@ void EnTorch2_Init(Actor* thisx, PlayState* play2) { } void EnTorch2_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* this = (Player*)thisx; Effect_Delete(play, this->meleeWeaponEffectIndex); @@ -204,10 +204,10 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { s16 sp66; u8 staggerThreshold; s8 stickY; - UNUSED s32 pad1; + STACK_PAD(s32); Actor* attackItem; s16 sp5A; - UNUSED s16 pad2; + STACK_PAD(s16); s32 sp54; f32 sp50; s16 sp4E; @@ -744,7 +744,7 @@ void EnTorch2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* r void EnTorch2_Draw(Actor* thisx, PlayState* play2) { PlayState* play = play2; Player* this = (Player*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_torch2.c", 1050); func_80093C80(play); diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c index 2e87776b07f..06253c2f571 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c @@ -93,7 +93,7 @@ static Vec3f sMultVec = { 800.0f, 1000.0f, 0.0f }; void EnToryo_Init(Actor* thisx, PlayState* play) { EnToryo* this = (EnToryo*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); switch (play->sceneId) { case SCENE_SPOT09: @@ -138,7 +138,7 @@ void EnToryo_Destroy(Actor* thisx, PlayState* play) { } s32 func_80B203D8(EnToryo* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); s32 ret = 1; @@ -211,7 +211,7 @@ s32 func_80B203D8(EnToryo* this, PlayState* play) { } s32 func_80B205CC(EnToryo* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s32 ret = 5; switch (Message_GetState(&play->msgCtx)) { diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c index 69bb730f776..5a02e10e2d6 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -298,7 +298,7 @@ void EnTp_SetupDie(EnTp* this) { void EnTp_Die(EnTp* this, PlayState* play) { EnTp* now; s16 i; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f effectVelAccel = { 0.0f, 0.5f, 0.0f }; Vec3f effectPos = { 0.0f, 0.0f, 0.0f }; @@ -374,7 +374,7 @@ void EnTp_Head_SetupTakeOff(EnTp* this) { * Flies up and loops around until it makes for Player */ void EnTp_Head_TakeOff(EnTp* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); Math_SmoothStepToF(&this->actor.speedXZ, 2.5f, 0.1f, 0.2f, 0.0f); @@ -646,7 +646,7 @@ void EnTp_UpdateDamage(EnTp* this, PlayState* play) { } void EnTp_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnTp* this = (EnTp*)thisx; Vec3f kiraVelocity = { 0.0f, 0.0f, 0.0f }; Vec3f kiraAccel = { 0.0f, -0.6f, 0.0f }; @@ -729,7 +729,7 @@ void EnTp_Update(Actor* thisx, PlayState* play) { } void EnTp_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnTp* this = (EnTp*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_tp.c", 1451); diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c index ac8706f5938..025a8521700 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -372,7 +372,7 @@ void EnTr_ChooseAction1(EnTr* this, PlayState* play) { } void EnTr_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnTr* this = (EnTr*)thisx; Actor_UpdateBgCheckInfo(play, &this->actor, 0.0f, 0.0f, 0.0f, UPDBGCHECKINFO_FLAG_0 | UPDBGCHECKINFO_FLAG_2); @@ -426,7 +426,7 @@ s32 EnTr_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* po } void EnTr_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnTr* this = (EnTr*)thisx; if (1) {} diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c index e880ab7137b..6ecd5aa24be 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c @@ -128,7 +128,7 @@ void EnTrap_Update(Actor* thisx, PlayState* play) { s16 angleToCollidedActor; s16 touchingActor; s16 blockedOnReturn; - UNUSED s32 pad; + STACK_PAD(s32); s16 angleToWall; Vec3f icePos; Vec3f posAhead; 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 722498f9ba2..2e923a72156 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 @@ -271,7 +271,7 @@ void EnTuboTrap_Fly(EnTuboTrap* this, PlayState* play) { void EnTuboTrap_Update(Actor* thisx, PlayState* play) { EnTuboTrap* this = (EnTuboTrap*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); this->actionFunc(this, play); Actor_MoveForward(&this->actor); diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/src/overlays/actors/ovl_En_Vali/z_en_vali.c index 046ae29ead8..8d7c6c5677b 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -134,7 +134,7 @@ static InitChainEntry sInitChain[] = { }; void EnVali_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnVali* this = (EnVali*)thisx; s32 bgId; @@ -536,7 +536,7 @@ void EnVali_UpdateDamage(EnVali* this, PlayState* play) { } void EnVali_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnVali* this = (EnVali*)thisx; if ((this->bodyCollider.base.atFlags & AT_HIT) || (this->leftArmCollider.base.atFlags & AT_HIT) || @@ -784,7 +784,7 @@ static Gfx D_80B289A8[] = { }; void EnVali_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnVali* this = (EnVali*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_vali.c", 1505); diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index ed34c8c03d2..5458feaec57 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -49,9 +49,9 @@ static ColliderCylinderInit sCylinderInit = { }; void EnVbBall_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); EnVbBall* this = (EnVbBall*)thisx; - UNUSED s32 pad2; + STACK_PAD(s32); f32 angle; if (this->actor.params >= 200) { // Volvagia's bones @@ -76,7 +76,7 @@ void EnVbBall_Init(Actor* thisx, PlayState* play) { } void EnVbBall_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnVbBall* this = (EnVbBall*)thisx; if (this->actor.params < 200) { @@ -121,7 +121,7 @@ void EnVbBall_SpawnDust(PlayState* play, BossFdEffect* effect, Vec3f* position, void EnVbBall_UpdateBones(EnVbBall* this, PlayState* play) { BossFd* bossFd = (BossFd*)this->actor.parent; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); f32 angle; s16 i; @@ -165,7 +165,7 @@ void EnVbBall_Update(Actor* thisx, PlayState* play2) { EnVbBall* this = (EnVbBall*)thisx; BossFd* bossFd = (BossFd*)this->actor.parent; f32 radius; - UNUSED s32 pad; + STACK_PAD(s32); s16 spawnNum; s16 i; @@ -296,7 +296,7 @@ void EnVbBall_Update(Actor* thisx, PlayState* play2) { } void EnVbBall_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnVbBall* this = (EnVbBall*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_vb_ball.c", 604); 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 d184468f1af..de2001fe8bb 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -611,7 +611,7 @@ s32 EnViewer_ZeldaOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, } void EnViewer_ZeldaPostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { - UNUSED s32 pad; + STACK_PAD(s32); if (play->sceneId == SCENE_TOKINOMA) { if (limbIndex == 16) { @@ -697,7 +697,7 @@ static EnViewerDrawFunc sDrawFuncs[] = { void EnViewer_Draw(Actor* thisx, PlayState* play) { EnViewer* this = (EnViewer*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s16 type; OPEN_DISPS(play->state.gfxCtx, "../z_en_viewer.c", 1760); 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 5862aeda041..4b5b9d7ed99 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -177,7 +177,7 @@ void EnVm_Wait(EnVm* this, PlayState* play) { Player* player = GET_PLAYER(play); f32 dist; s16 headRot; - UNUSED s16 pad; + STACK_PAD(s16); s16 pitch; switch (this->unk_25E) { @@ -468,7 +468,7 @@ void EnVm_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, Vec3f sp80 = D_80B2EAF8; Vec3f sp74 = D_80B2EB04; Vec3f sp68 = D_80B2EB10; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f posResult; CollisionPoly* poly; s32 bgId; diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c index ce72c31b726..0ec30e294bd 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c @@ -65,7 +65,7 @@ void EnWallTubo_FindGirl(EnWallTubo* this, PlayState* play) { void EnWallTubo_DetectChu(EnWallTubo* this, PlayState* play) { EnBomChu* chu; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f effAccel = { 0.0f, 0.1f, 0.0f }; Vec3f effVelocity = { 0.0f, 0.0f, 0.0f }; Vec3f chuPosDiff; 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 7d2dd9236fd..1723824917a 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -533,7 +533,7 @@ void EnWallmas_ColUpdate(EnWallmas* this, PlayState* play) { void EnWallmas_Update(Actor* thisx, PlayState* play) { EnWallmas* this = (EnWallmas*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); EnWallmas_ColUpdate(this, play); this->actionFunc(this, play); @@ -577,7 +577,7 @@ void EnWallmas_Update(Actor* thisx, PlayState* play) { } void EnWallmas_DrawXlu(EnWallmas* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 xzScale; MtxF mf; 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 117d61bf8b4..4b06e33dd94 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 @@ -129,7 +129,7 @@ void EnWeatherTag_Init(Actor* thisx, PlayState* play) { u8 WeatherTag_CheckEnableWeatherEffect(EnWeatherTag* this, PlayState* play, u8 skyboxConfig, u8 changeSkyboxNextConfig, u8 lightConfig, u8 changeLightNextConfig, u16 changeDuration, u8 weatherMode) { - UNUSED s32 pad; + STACK_PAD(s32); u8 ret = false; Player* player = GET_PLAYER(play); @@ -170,7 +170,7 @@ u8 WeatherTag_CheckEnableWeatherEffect(EnWeatherTag* this, PlayState* play, u8 s u8 WeatherTag_CheckRestoreWeather(EnWeatherTag* this, PlayState* play, u8 skyboxConfig, u8 changeSkyboxNextConfig, u8 lightConfig, u8 changeLightNextConfig, u16 changeDuration) { - UNUSED s32 pad; + STACK_PAD(s32); u8 ret = false; Player* player = GET_PLAYER(play); diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c index 3638917d6e2..324e617abb5 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -582,7 +582,7 @@ void func_80B3368C(EnWeiyer* this, PlayState* play) { void EnWeiyer_Update(Actor* thisx, PlayState* play) { EnWeiyer* this = (EnWeiyer*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); this->actor.home.pos.y = this->actor.yDistToWater + this->actor.world.pos.y - 5.0f; func_80B3368C(this, play); 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 efe26dbe2b3..6112202883e 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -209,7 +209,7 @@ void EnWf_SetupAction(EnWf* this, EnWfActionFunc actionFunc) { } void EnWf_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnWf* this = (EnWf*)thisx; Actor_ProcessInitChain(thisx, sInitChain); @@ -282,7 +282,7 @@ void EnWf_Destroy(Actor* thisx, PlayState* play) { s32 EnWf_ChangeAction(PlayState* play, EnWf* this, s16 mustChoose) { Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); s16 wallYawDiff; s16 playerYawDiff; Actor* explosive; @@ -419,7 +419,7 @@ void EnWf_SetupWait(EnWf* this) { void EnWf_Wait(EnWf* this, PlayState* play) { Player* player; - UNUSED s32 pad; + STACK_PAD(s32); s16 angle; player = GET_PLAYER(play); @@ -492,7 +492,7 @@ void EnWf_SetupRunAtPlayer(EnWf* this, PlayState* play) { void EnWf_RunAtPlayer(EnWf* this, PlayState* play) { s32 prevFrame; s32 beforeCurFrame; - UNUSED s32 pad; + STACK_PAD(s32); f32 baseRange = 0.0f; s16 playerFacingAngleDiff; Player* player = GET_PLAYER(play); @@ -631,7 +631,7 @@ void EnWf_SetupRunAroundPlayer(EnWf* this) { void EnWf_RunAroundPlayer(EnWf* this, PlayState* play) { s16 angle1; s16 angle2; - UNUSED s32 pad; + STACK_PAD(s32); f32 baseRange = 0.0f; s32 prevFrame; s32 beforeCurFrame; @@ -1010,7 +1010,7 @@ void EnWf_SetupBlocking(EnWf* this) { void EnWf_Blocking(EnWf* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); if (this->actionTimer != 0) { this->actionTimer--; @@ -1296,7 +1296,7 @@ void EnWf_UpdateDamage(EnWf* this, PlayState* play) { } void EnWf_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnWf* this = (EnWf*)thisx; EnWf_UpdateDamage(this, play); @@ -1471,7 +1471,7 @@ s32 EnWf_DodgeRanged(PlayState* play, EnWf* this) { if (actor != NULL) { s16 angleToFacing; - UNUSED s16 pad; + STACK_PAD(s16); f32 dist; angleToFacing = Actor_WorldYawTowardActor(&this->actor, actor) - this->actor.shape.rot.y; diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c index 01174a7f750..7ff40eb203f 100644 --- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c +++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c @@ -57,7 +57,7 @@ static Vec3f sTagPointsFree[9]; static Vec3f sTagPointsOrdered[9]; void EnWonderItem_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnWonderItem* this = (EnWonderItem*)thisx; if ((this->collider.dim.radius != 0) || (this->collider.dim.height != 0)) { @@ -111,7 +111,7 @@ void EnWonderItem_Init(Actor* thisx, PlayState* play) { DMG_BOOMERANG, DMG_HOOKSHOT, }; - UNUSED s32 pad; + STACK_PAD(s32); s16 colTypeIndex; EnWonderItem* this = (EnWonderItem*)thisx; s16 rotZover10; @@ -337,7 +337,7 @@ void EnWonderItem_Update(Actor* thisx, PlayState* play) { 255, 255, 0, 255, 0, 255, 0, 255, 255, 255, 0, 0, 0, 255, 0, 0, 0, 255, 128, 128, 128, 128, 128, 0, 128, 0, 128, 0, 128, 0, 128, 0, 0, 0, 128, 0, 0, 0, 128, }; // These seem to be mistyped. Logically they should be s16[13][3] and be indexed as [colorIndex][i] - UNUSED s32 pad; + STACK_PAD(s32); EnWonderItem* this = (EnWonderItem*)thisx; s32 colorIndex; diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c index f39bf5fdf3a..cafbd7c98e9 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c @@ -37,7 +37,7 @@ void EnWonderTalk2_Destroy(Actor* thisx, PlayState* play) { } void EnWonderTalk2_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnWonderTalk2* this = (EnWonderTalk2*)thisx; osSyncPrintf("\n\n"); @@ -268,7 +268,7 @@ void EnWonderTalk2_DoNothing(EnWonderTalk2* this, PlayState* play) { } void EnWonderTalk2_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnWonderTalk2* this = (EnWonderTalk2*)thisx; this->actionFunc(this, play); 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 d89c2668323..35969ee9445 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -308,7 +308,7 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) { f32 wobbleAmplitude; u8 new_var; u8 phi_v0; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f dropsSpawnPt; s32 i; s32 leavesParams; diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index 119b338510c..db9b63f1d34 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -63,7 +63,7 @@ void EnXc_InitCollider(Actor* thisx, PlayState* play) { void EnXc_UpdateCollider(Actor* thisx, PlayState* play) { EnXc* this = (EnXc*)thisx; Collider* colliderBase = &this->collider.base; - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); Collider_UpdateCylinder(thisx, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, colliderBase); @@ -84,7 +84,7 @@ void EnXc_CalculateHeadTurn(EnXc* this, PlayState* play) { } void EnXc_SetEyePattern(EnXc* this) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); s16* blinkTimer = &this->blinkTimer; s16* eyePattern = &this->eyeIdx; @@ -99,7 +99,7 @@ void EnXc_SetEyePattern(EnXc* this) { } void EnXc_SpawnNut(EnXc* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f* pos = &this->actor.world.pos; s16 angle = this->actor.shape.rot.y; f32 x = (Math_SinS(angle) * 30.0f) + pos->x; @@ -184,7 +184,7 @@ void func_80B3C620(EnXc* this, PlayState* play, s32 npcActionIdx) { } void EnXc_ChangeAnimation(EnXc* this, AnimationHeader* animation, u8 mode, f32 morphFrames, s32 reverseFlag) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); AnimationHeader* animationSeg = SEGMENTED_TO_VIRTUAL(animation); f32 frameCount = Animation_GetLastFrame(&animationSeg->common); f32 playbackSpeed; @@ -365,9 +365,9 @@ void EnXc_DoNothing(EnXc* this, PlayState* play) { } void EnXc_SetWalkingSFX(EnXc* this, PlayState* play) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); u32 sfxId; - UNUSED s32 pad2; + STACK_PAD(s32); if (Animation_OnFrame(&this->skelAnime, 11.0f) || Animation_OnFrame(&this->skelAnime, 23.0f)) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { @@ -379,9 +379,9 @@ void EnXc_SetWalkingSFX(EnXc* this, PlayState* play) { } void EnXc_SetNutThrowSFX(EnXc* this, PlayState* play) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); u32 sfxId; - UNUSED s32 pad2; + STACK_PAD(s32); if (Animation_OnFrame(&this->skelAnime, 7.0f)) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { @@ -426,7 +426,7 @@ void EnXc_SetColossusAppearSFX(EnXc* this, PlayState* play) { func_80078914(&sXyzDist, NA_SE_EV_JUMP_CONC); } else if (frameCount == 164) { Vec3f pos = { -1069.0f, 38.0f, 0.0f }; - UNUSED s32 pad; + STACK_PAD(s32); SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &pos, &sXyzDist, wDest); func_80078914(&sXyzDist, NA_SE_PL_WALK_CONCRETE); @@ -451,7 +451,7 @@ void EnXc_SetColossusWindSFX(PlayState* play) { static Vec3f sPos = { 0.0f, 0.0f, 0.0f }; static f32 sMaxSpeed = 0.0f; static Vec3f D_80B42DB0; - UNUSED s32 pad; + STACK_PAD(s32); s16 sceneId = play->sceneId; if (sceneId == SCENE_SPOT11) { @@ -459,7 +459,7 @@ void EnXc_SetColossusWindSFX(PlayState* play) { u16 frameCount = csCtx->frames; if ((frameCount >= 120) && (frameCount < 164)) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f* eye = &play->view.eye; if (D_80B41D90 != 0) { @@ -519,7 +519,7 @@ void EnXc_DestroyFlame(EnXc* this) { void EnXc_InitFlame(EnXc* this, PlayState* play) { static s32 D_80B41DA8 = 1; - UNUSED s32 pad; + STACK_PAD(s32); s16 sceneId = play->sceneId; if (sceneId == SCENE_SPOT17) { @@ -631,14 +631,14 @@ void func_80B3D750(EnXc* this, PlayState* play) { } void EnXc_SetupFallFromSkyAction(EnXc* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); CutsceneContext* csCtx = &play->csCtx; if (csCtx->state != 0) { CsCmdActorAction* npcAction = csCtx->npcActions[4]; if (npcAction && npcAction->action == 2) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f* pos = &this->actor.world.pos; SkelAnime* skelAnime = &this->skelAnime; f32 frameCount = Animation_GetLastFrame(&gSheikFallingFromSkyAnim); @@ -738,7 +738,7 @@ void EnXc_SetupInitialHarpAction(EnXc* this, s32 animFinished) { } void EnXc_SetupPlayingHarpAction(EnXc* this, PlayState* play, s32 animFinished) { - UNUSED s32 pad; + STACK_PAD(s32); SkelAnime* skelAnime; AnimationHeader* animation; f32 frameCount; @@ -1068,12 +1068,12 @@ s32 EnXc_HarpOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f void EnXc_DrawPullingOutHarp(Actor* thisx, PlayState* play) { EnXc* this = (EnXc*)thisx; - UNUSED s32 pad1; + STACK_PAD(s32); s16 eyePattern = this->eyeIdx; void* eyeTexture = sEyeTextures[eyePattern]; SkelAnime* skelAnime = &this->skelAnime; GraphicsContext* gfxCtx = play->state.gfxCtx; - UNUSED s32 pad2; + STACK_PAD(s32); OPEN_DISPS(gfxCtx, "../z_en_oA2_inSpot05.c", 1444); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); @@ -1090,12 +1090,12 @@ void EnXc_DrawPullingOutHarp(Actor* thisx, PlayState* play) { void EnXc_DrawHarp(Actor* thisx, PlayState* play) { EnXc* this = (EnXc*)thisx; - UNUSED s32 pad1; + STACK_PAD(s32); s16 eyePattern = this->eyeIdx; void* eyeTexture = sEyeTextures[eyePattern]; SkelAnime* skelAnime = &this->skelAnime; GraphicsContext* gfxCtx = play->state.gfxCtx; - UNUSED s32 pad2; + STACK_PAD(s32); OPEN_DISPS(gfxCtx, "../z_en_oA2_inSpot05.c", 1511); @@ -1529,7 +1529,7 @@ void EnXc_PlayTriforceSFX(Actor* thisx, PlayState* play) { EnXc* this = (EnXc*)thisx; if (this->unk_2A8) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f src; Vec3f pos; Vec3f sp1C = { 0.0f, 0.0f, 0.0f }; @@ -1688,7 +1688,7 @@ s32 EnXc_TriforceOverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, V } void EnXc_TriforcePostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); EnXc* this = (EnXc*)thisx; if (limbIndex == 15) { @@ -1701,12 +1701,12 @@ void EnXc_TriforcePostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3 void EnXc_DrawTriforce(Actor* thisx, PlayState* play) { EnXc* this = (EnXc*)thisx; - UNUSED s32 pad1; + STACK_PAD(s32); s16 eyeIdx = this->eyeIdx; void* eyeTexture = sEyeTextures[eyeIdx]; SkelAnime* skelAnime = &this->skelAnime; GraphicsContext* gfxCtx = play->state.gfxCtx; - UNUSED s32 pad2; + STACK_PAD(s32); OPEN_DISPS(gfxCtx, "../z_en_oA2_inMetamol.c", 565); if (this->unk_2BC != 0) { @@ -1782,7 +1782,7 @@ void func_80B406F8(Actor* thisx) { } void EnXc_SetupIdleInNocturne(EnXc* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ActorShape* actorShape = &this->actor.shape; SkelAnime* skelAnime = &this->skelAnime; f32 frameCount = Animation_GetLastFrame(&gSheikIdleAnim); @@ -1806,7 +1806,7 @@ void EnXc_SetupDefenseStance(Actor* thisx) { } void EnXc_SetupContortions(EnXc* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); SkelAnime* skelAnime = &this->skelAnime; f32 frameCount = Animation_GetLastFrame(&gSheikIdleAnim); @@ -1821,7 +1821,7 @@ void EnXc_SetupContortions(EnXc* this, PlayState* play) { } void EnXc_SetupFallInNocturne(EnXc* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); SkelAnime* skelAnime = &this->skelAnime; f32 frameCount = Animation_GetLastFrame(&gSheikIdleAnim); @@ -1836,7 +1836,7 @@ void EnXc_SetupFallInNocturne(EnXc* this, PlayState* play) { } void EnXc_SetupHittingGroundInNocturne(EnXc* this, PlayState* play) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); f32 frameCount = Animation_GetLastFrame(&gSheikHittingGroundAnim); func_80B3C9DC(this); @@ -1848,7 +1848,7 @@ void EnXc_SetupHittingGroundInNocturne(EnXc* this, PlayState* play) { } void func_80B40A78(EnXc* this, PlayState* play) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); f32 frameCount = Animation_GetLastFrame(&gSheikHittingGroundAnim); func_80B3C9DC(this); @@ -1860,7 +1860,7 @@ void func_80B40A78(EnXc* this, PlayState* play) { } void EnXc_SetupKneelInNocturne(EnXc* this, PlayState* play) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); f32 frameCount = Animation_GetLastFrame(&gSheikKneelingAnim); func_80B3C9DC(this); @@ -1872,7 +1872,7 @@ void EnXc_SetupKneelInNocturne(EnXc* this, PlayState* play) { } void func_80B40BB4(EnXc* this, PlayState* play) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); f32 frameCount = Animation_GetLastFrame(&gSheikIdleAnim); func_80B3C9DC(this); func_80B3C588(this, play, 4); @@ -2375,7 +2375,7 @@ void EnXc_DrawNothing(Actor* thisx, PlayState* play) { } void EnXc_DrawDefault(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnXc* this = (EnXc*)thisx; s16 eyeIdx = this->eyeIdx; void* eyeSegment = sEyeTextures[eyeIdx]; diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c index 34e5b007860..cbbaf23cc06 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c @@ -119,7 +119,7 @@ void func_80B42F74(EnYabusameMark* this, PlayState* play) { Vec3f effectVelocity = { 0.0f, 0.0f, 0.0f }; Vec3f arrowHitPos; Vec3f distanceFromCenter; - UNUSED s32 pad; + STACK_PAD(s32); s32 scoreIndex; f32 scoreDistance100; f32 scoreDistance60; diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index d0347d631a2..d0bddd3d2df 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -114,7 +114,7 @@ void EnYukabyun_Break(EnYukabyun* this, PlayState* play) { void EnYukabyun_Update(Actor* thisx, PlayState* play) { EnYukabyun* this = (EnYukabyun*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (((this->collider.base.atFlags & AT_HIT) || (this->collider.base.acFlags & AC_HIT) || ((this->collider.base.ocFlags1 & OC1_HIT) && !(this->collider.base.oc->id == ACTOR_EN_YUKABYUN))) || diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index 228ff73025a..3a938a7ae17 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -275,7 +275,7 @@ s16 EnZf_SecondaryFloorCheck(EnZf* this, PlayState* play, f32 dist) { } void EnZf_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnZf* this = (EnZf*)thisx; Player* player = GET_PLAYER(play); EffectBlureInit1 blureInit; @@ -705,7 +705,7 @@ void func_80B45384(EnZf* this) { void func_80B4543C(EnZf* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); s16 angleToPlayer = (this->actor.yawTowardsPlayer - this->headRot) - this->actor.shape.rot.y; angleToPlayer = ABS(angleToPlayer); @@ -974,7 +974,7 @@ void func_80B4604C(EnZf* this) { } void func_80B46098(EnZf* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 phi_f2; Player* player = GET_PLAYER(play); s16 temp_v0; @@ -1051,7 +1051,7 @@ void func_80B462E4(EnZf* this, PlayState* play) { void func_80B463E4(EnZf* this, PlayState* play) { s16 angleBehindPlayer; s16 phi_v0_3; - UNUSED s32 pad; + STACK_PAD(s32); s32 prevFrame; s32 beforeCurFrame; s32 absPlaySpeed; @@ -1474,10 +1474,10 @@ void EnZf_HopAway(EnZf* this, PlayState* play) { f32 sp74; f32 sp70 = 1.0f; f32 phi_f20 = 550.0f; - UNUSED s32 pad1; + STACK_PAD(s32); f32 phi_f20_2; f32 phi_f0; - UNUSED s32 pad2; + STACK_PAD(s32); s16 sp5A; s32 sp54; s32 temp_v1_2; @@ -1990,7 +1990,7 @@ void EnZf_UpdateHeadRotation(EnZf* this, PlayState* play) { } void EnZf_UpdateDamage(EnZf* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16 dropParams; if ((this->bodyCollider.base.acFlags & AC_HIT) && (this->action <= ENZF_ACTION_STUNNED)) { @@ -2037,9 +2037,9 @@ void EnZf_UpdateDamage(EnZf* this, PlayState* play) { } void EnZf_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); EnZf* this = (EnZf*)thisx; - UNUSED s32 pad2; + STACK_PAD(s32); EnZf_UpdateDamage(this, play); if (this->actor.colChkInfo.damageEffect != ENZF_DMGEFF_IMMUNE) { @@ -2247,7 +2247,7 @@ static Gfx D_80B4A2F8[] = { }; void EnZf_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnZf* this = (EnZf*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_en_zf.c", 3533); 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 8c68be9c232..d8fd17bada8 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -138,7 +138,7 @@ void func_80B4AE18(EnZl1* this) { void func_80B4AF18(EnZl1* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); Actor_TrackPlayer(play, &this->actor, &this->unk_200, &this->unk_206, this->actor.focus.pos); @@ -158,7 +158,7 @@ void func_80B4AF18(EnZl1* this, PlayState* play) { void func_80B4B010(EnZl1* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); Vec3f subCamAt = { -460.0f, 118.0f, 0.0f }; Vec3f subCamEye = { -406.0f, 110.0f, 0.0f }; Vec3f playerPos = { -398.0f, 84.0f, 0.0f }; @@ -197,10 +197,10 @@ void func_80B4B010(EnZl1* this, PlayState* play) { void func_80B4B240(EnZl1* this, PlayState* play) { Vec3f subCamAt = { -427.0f, 108.0, 26.0 }; Vec3f subCamEye = { -340.0f, 108.0f, 98.0f }; - UNUSED s32 pad1; + STACK_PAD(s32); Vec3f sp58 = { -434.0f, 84.0f, 0.0f }; u8 sp54[] = { 0x00, 0x00, 0x02 }; - UNUSED s32 pad2; + STACK_PAD(s32); Player* player = GET_PLAYER(play); AnimationHeader* animHeaderSeg; MessageContext* msgCtx = &play->msgCtx; @@ -365,13 +365,13 @@ void func_80B4B8B4(EnZl1* this, PlayState* play) { }; Vec3f subCamAt = { -421.0f, 143.0f, -5.0f }; Vec3f subCamEye = { -512.0f, 105.0f, -4.0f }; - UNUSED s32 pad1; + STACK_PAD(s32); f32 actionLength; CsCmdActorAction* npcAction; Vec3f sp74; Vec3f sp68; Vec3f velocity = { 0.0f, 0.0f, 0.0f }; - UNUSED s32 pad2; + STACK_PAD(s32); f32 frameCount; Vec3f sp48; @@ -415,7 +415,7 @@ void func_80B4B8B4(EnZl1* this, PlayState* play) { } void func_80B4BBC4(EnZl1* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 frameCount = Animation_GetLastFrame(&gChildZelda1Anim_00438); Player* player = GET_PLAYER(play); @@ -444,13 +444,13 @@ void func_80B4BC78(EnZl1* this, PlayState* play) { u8 sp84[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, }; - UNUSED s32 pad1; + STACK_PAD(s32); f32 actionLength; Vec3f sp70; Vec3f sp64; Vec3f velocity = { 0.0f, 0.0f, 0.0f }; CsCmdActorAction* npcAction; - UNUSED s32 pad2; + STACK_PAD(s32); f32 frameCount; if (SkelAnime_Update(&this->skelAnime) && (this->skelAnime.animation == &gChildZelda1Anim_10B38)) { @@ -487,7 +487,7 @@ void func_80B4BC78(EnZl1* this, PlayState* play) { } void func_80B4BF2C(EnZl1* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); MessageContext* msgCtx = &play->msgCtx; Player* player = GET_PLAYER(play); @@ -564,7 +564,7 @@ void func_80B4BF2C(EnZl1* this, PlayState* play) { } void EnZl1_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnZl1* this = (EnZl1*)thisx; if ((this->actionFunc != func_80B4B8B4) && (this->actionFunc != func_80B4BC78)) { diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index b75dc18c1f2..0ba435c1e6d 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -104,7 +104,7 @@ void EnZl2_Destroy(Actor* thisx, PlayState* play) { } void EnZl2_UpdateEyes(EnZl2* this) { - UNUSED s32 pad[4]; + STACK_PADS(s32, 4); s16* eyeTexIndex2 = &this->eyeTexIndex2; s16* blinkTimer = &this->blinkTimer; s16* eyeTexIndex = &this->eyeTexIndex; @@ -433,12 +433,12 @@ void func_80B4F230(EnZl2* this, s16 arg1, s32 arg2) { } s32 func_80B4F45C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) { - UNUSED s32 pad1; + STACK_PAD(s32); EnZl2* this = (EnZl2*)thisx; Mtx* sp74; MtxF sp34; Vec3s sp2C; - UNUSED s16 pad2; + STACK_PAD(s16); s16* unk_1DC = this->unk_1DC; if (limbIndex == 14) { @@ -533,7 +533,7 @@ s32 func_80B4F45C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s void EnZl2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) { EnZl2* this = (EnZl2*)thisx; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if (limbIndex == 10) { if ((this->unk_254 != 0) && (play->csCtx.frames >= 900)) { @@ -738,7 +738,7 @@ void func_80B50278(EnZl2* this, PlayState* play) { } void func_80B50304(EnZl2* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); ActorShape* shape = &this->actor.shape; CsCmdActorAction* npcAction = EnZl2_GetNpcAction(play, 0); f32 actionXDelta; @@ -1430,7 +1430,7 @@ void func_80B51D0C(EnZl2* this, PlayState* play) { } void func_80B51D24(EnZl2* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); u32 sfxId; SkelAnime* skelAnime = &this->skelAnime; @@ -1481,7 +1481,7 @@ void func_80B51EA8(EnZl2* this) { void func_80B51EBC(EnZl2* this, PlayState* play) { ActorShape* shape = &this->actor.shape; CsCmdActorAction* npcAction = EnZl2_GetNpcAction(play, 0); - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); this->actor.world.rot.y = shape->rot.y = npcAction->rot.y; func_80B4FD00(this, &gZelda2Anime1Anim_00B224, 0, 0.0f, 0); @@ -1565,10 +1565,10 @@ void func_80B52114(EnZl2* this, PlayState* play) { } void func_80B521A0(EnZl2* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); ObjectContext* objectCtx = &play->objectCtx; s32 bankIndex = Object_GetIndex(objectCtx, OBJECT_ZL2_ANIME1); - UNUSED s32 pad2; + STACK_PAD(s32); if (bankIndex < 0) { osSyncPrintf(VT_FGCOL(RED) "En_Zl2_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" VT_RST); @@ -1596,7 +1596,7 @@ void EnZl2_Update(Actor* thisx, PlayState* play) { void EnZl2_Init(Actor* thisx, PlayState* play) { EnZl2* this = (EnZl2*)thisx; ActorShape* shape = &thisx->shape; - UNUSED s32 pad; + STACK_PAD(s32); ActorShape_Init(shape, 0.0f, ActorShadow_DrawCircle, 30.0f); shape->shadowAlpha = 0; @@ -1628,7 +1628,7 @@ void func_80B523BC(EnZl2* this, PlayState* play) { } void func_80B523C8(EnZl2* this, PlayState* play) { - UNUSED s32 pad1[3]; + STACK_PADS(s32, 3); s16 eyeTexIndex = this->eyeTexIndex; s16 eyeTexIndex2 = this->eyeTexIndex2; void* eyeTex = sEyeTextures[eyeTexIndex]; @@ -1636,7 +1636,7 @@ void func_80B523C8(EnZl2* this, PlayState* play) { SkelAnime* skelAnime = &this->skelAnime; s16 mouthTexIndex = this->mouthTexIndex; void* mouthTex = sMouthTextures[mouthTexIndex]; - UNUSED s32 pad2; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_zl2.c", 1623); @@ -1655,13 +1655,13 @@ void func_80B523C8(EnZl2* this, PlayState* play) { } void func_80B525D4(EnZl2* this, PlayState* play) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); s16 eyeTexIndex = this->eyeTexIndex; void* eyeTex = sEyeTextures[eyeTexIndex]; s16 mouthTexIndex = this->mouthTexIndex; SkelAnime* skelAnime = &this->skelAnime; void* mouthTex = sMouthTextures[mouthTexIndex]; - UNUSED s32 pad2; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_zl2.c", 1663); diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index e08601c4a8f..58278658967 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -59,7 +59,7 @@ void func_80B533B0(Actor* thisx, PlayState* play) { void func_80B533FC(EnZl3* this, PlayState* play) { ColliderCylinder* collider = &this->collider; - UNUSED s32 pad[4]; + STACK_PADS(s32, 4); Collider_UpdateCylinder(&this->actor, collider); CollisionCheck_SetOC(play, &play->colChkCtx, &collider->base); @@ -91,7 +91,7 @@ BossGanon2* func_80B53488(EnZl3* this, PlayState* play) { } void EnZl3_UpdateEyes(EnZl3* this) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s16* eyeTexIndex = &this->eyeTexIndex; s16* blinkTimer = &this->blinkTimer; @@ -135,7 +135,7 @@ void func_80B536B4(EnZl3* this) { } void func_80B536C4(EnZl3* this) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Vec3s* vec1 = &this->unk_3F8.unk_08; Vec3s* vec2 = &this->unk_3F8.unk_0E; @@ -158,7 +158,7 @@ s32 func_80B537E8(EnZl3* this) { s16* rotY = &this->actor.world.rot.y; s16* unk_3D0 = &this->unk_3D0; s16 retVal; - UNUSED s16 pad[2]; + STACK_PADS(s16, 2); Math_SmoothStepToS(unk_3D0, ABS((s16)(yawTowardsPlayer - *rotY)), 5, 6200, 100); retVal = Math_SmoothStepToS(rotY, yawTowardsPlayer, 5, *unk_3D0, 100); @@ -581,7 +581,7 @@ void func_80B54360(EnZl3* this, s16 arg1, s32 arg2) { } s32 func_80B5458C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx, Gfx** gfx) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); EnZl3* this = (EnZl3*)thisx; s16* unk_28C = this->unk_28C; Mtx* sp78; @@ -685,9 +685,9 @@ s32 func_80B5458C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s void EnZl3_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) { EnZl3* this = (EnZl3*)thisx; - UNUSED s32 pad1; + STACK_PAD(s32); Vec3f sp34; - UNUSED s32 pad2; + STACK_PAD(s32); Vec3f sp24; Vec3f sp18; @@ -1014,7 +1014,7 @@ void func_80B5585C(EnZl3* this) { } void func_80B558A8(EnZl3* this) { - UNUSED s32 pad[4]; + STACK_PADS(s32, 4); s16 thisRotY = this->actor.world.rot.y; Vec3f* unk_338 = &this->unk_338; @@ -1534,7 +1534,7 @@ void func_80B56DEC(EnZl3* this) { } void func_80B56E38(EnZl3* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s32 sfxId; SkelAnime* sp20 = &this->skelAnime; @@ -1617,9 +1617,9 @@ s16 func_80B57104(EnZl3* this, s32 arg1) { } s32 func_80B571A8(EnZl3* this) { - UNUSED s32 pad1; + STACK_PAD(s32); s32 unk_314 = this->unk_314; - UNUSED s32 pad2; + STACK_PAD(s32); if (func_80B56F8C(this, unk_314 + 1) == 0) { return this->actor.shape.rot.y; @@ -1629,7 +1629,7 @@ s32 func_80B571A8(EnZl3* this) { } s32 func_80B571FC(EnZl3* this) { - UNUSED s32 pad; + STACK_PAD(s32); s32 unk_314 = this->unk_314; if (func_80B56F8C(this, unk_314) == 0) { @@ -1712,7 +1712,7 @@ s32 func_80B57458(EnZl3* this, PlayState* play) { f32 thisZ = thisPos->z; Player* player = GET_PLAYER(play); Vec3f* playerPos = &player->actor.world.pos; - UNUSED s32 pad; + STACK_PAD(s32); f32 playerX = playerPos->x; f32 playerZ = playerPos->z; f32 temp_f12 = playerX - thisX; @@ -1803,7 +1803,7 @@ void func_80B57754(EnZl3* this, PlayState* play) { } void func_80B577BC(PlayState* play, Vec3f* vec) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); Vec3f* playerPos = &player->actor.world.pos; f32 posX = vec->x; @@ -1824,7 +1824,7 @@ void func_80B57858(PlayState* play) { } s32 func_80B57890(EnZl3* this, PlayState* play) { - UNUSED u8 pad[2]; + STACK_PADS(u8, 2); u8 spawn = play->spawn; s16 sceneId = play->sceneId; s32 result = func_80B54DB4(this); @@ -1892,9 +1892,9 @@ void func_80B57AAC(EnZl3* this, s32 arg1, AnimationHeader* arg2) { } void func_80B57AE0(EnZl3* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); s16 shapeRotY = this->actor.shape.rot.y; - UNUSED s32 pad2; + STACK_PAD(s32); Vec3f* unk_354 = &this->unk_354; Vec3f* unk_348 = &this->unk_348; Vec3s* temp_v0; @@ -1957,13 +1957,13 @@ void func_80B57D60(EnZl3* this, PlayState* play) { } s32 func_80B57D80(EnZl3* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); s16* sp32 = &this->actor.shape.rot.y; struct_80034A14_arg1* unk_3F8 = &this->unk_3F8; Player* player = GET_PLAYER(play); s32 unk_314 = this->unk_314; s16 temp_v0 = func_80B57104(this, unk_314); - UNUSED s32 pad2; + STACK_PAD(s32); s16 phi_v1; unk_3F8->unk_18.y = player->actor.world.pos.y; @@ -2017,7 +2017,7 @@ s32 func_80B57F84(EnZl3* this, PlayState* play) { } void func_80B58014(EnZl3* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); s8 invincibilityTimer = player->invincibilityTimer; @@ -2072,7 +2072,7 @@ void func_80B58268(EnZl3* this, PlayState* play) { void func_80B582C8(EnZl3* this, PlayState* play) { f32* unk_3CC = &this->unk_3CC; - UNUSED s32 pad; + STACK_PAD(s32); if (*unk_3CC == kREG(14) + 10.0f) { *unk_3CC += 1.0f; @@ -2099,7 +2099,7 @@ void func_80B582C8(EnZl3* this, PlayState* play) { static u32 D_80B5A4BC = 0; void func_80B584B4(EnZl3* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); s8 invincibilityTimer = player->invincibilityTimer; Actor* nearbyEnTest = Actor_FindNearby(play, &this->actor, ACTOR_EN_TEST, ACTORCAT_ENEMY, 8000.0f); @@ -2127,7 +2127,7 @@ void func_80B584B4(EnZl3* this, PlayState* play) { } void func_80B58624(EnZl3* this, PlayState* play) { - UNUSED s32 pad[4]; + STACK_PADS(s32, 4); f32* unk_3CC = &this->unk_3CC; if (*unk_3CC == (kREG(18) + 10.0f)) { @@ -2237,7 +2237,7 @@ void func_80B58AAC(EnZl3* this, PlayState* play) { } void func_80B58C08(EnZl3* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Vec3f* unk_348 = &this->unk_348; Vec3f* unk_354 = &this->unk_354; Vec3f* thisPos = &this->actor.world.pos; @@ -2606,10 +2606,10 @@ void func_80B59B6C(EnZl3* this, PlayState* play) { } void func_80B59DB8(EnZl3* this, PlayState* play) { - UNUSED s32 pad1; + STACK_PAD(s32); ObjectContext* objCtx = &play->objectCtx; s32 objIndex = Object_GetIndex(objCtx, OBJECT_ZL2_ANIME2); - UNUSED s32 pad2; + STACK_PAD(s32); if (objIndex < 0) { osSyncPrintf(VT_FGCOL(RED) "En_Zl3_main_bankアニメーションのバンクを読めない!!!!!!!!!!!!\n" VT_RST); @@ -2645,7 +2645,7 @@ void EnZl3_Update(Actor* thisx, PlayState* play) { void EnZl3_Init(Actor* thisx, PlayState* play) { EnZl3* this = (EnZl3*)thisx; ActorShape* shape = &this->actor.shape; - UNUSED s32 pad; + STACK_PAD(s32); osSyncPrintf("ゼルダ姫のEn_Zl3_Actor_ct通すよ!!!!!!!!!!!!!!!!!!!!!!!!!\n"); ActorShape_Init(shape, 0.0f, ActorShadow_DrawCircle, 30.0f); @@ -2686,13 +2686,13 @@ void func_80B59FE8(EnZl3* this, PlayState* play) { } void func_80B59FF4(EnZl3* this, PlayState* play) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); s16 eyeTexIndex = this->eyeTexIndex; void* eyeTex = sEyeTextures[eyeTexIndex]; s16 mouthTexIndex = this->mouthTexIndex; SkelAnime* skelAnime = &this->skelAnime; void* mouthTex = sMouthTextures[mouthTexIndex]; - UNUSED s32 pad2; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_zl3.c", 2165); @@ -2711,13 +2711,13 @@ void func_80B59FF4(EnZl3* this, PlayState* play) { } void func_80B5A1D0(EnZl3* this, PlayState* play) { - UNUSED s32 pad1[2]; + STACK_PADS(s32, 2); s16 eyeTexIndex = this->eyeTexIndex; void* eyeTex = sEyeTextures[eyeTexIndex]; s16 mouthTexIndex = this->mouthTexIndex; SkelAnime* skelAnime = &this->skelAnime; void* mouthTex = sMouthTextures[mouthTexIndex]; - UNUSED s32 pad2; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_zl3.c", 2205); 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 a67119c887b..132f2c924dc 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -357,7 +357,7 @@ s32 EnZl4_InMovingAnim(EnZl4* this) { } void EnZl4_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnZl4* this = (EnZl4*)thisx; SkelAnime_InitFlex(play, &this->skelAnime, &gChildZeldaSkel, NULL, this->jointTable, this->morphTable, 18); @@ -393,7 +393,7 @@ void EnZl4_Init(Actor* thisx, PlayState* play) { } void EnZl4_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnZl4* this = (EnZl4*)thisx; Collider_DestroyCylinder(play, &this->collider); @@ -1250,7 +1250,7 @@ void EnZl4_TheEnd(EnZl4* this, PlayState* play) { } void EnZl4_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnZl4* this = (EnZl4*)thisx; if (this->actionFunc != EnZl4_TheEnd) { 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 c6d85bb84bb..cde864ce669 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -716,7 +716,7 @@ void EnZo_Dive(EnZo* this, PlayState* play) { void EnZo_Update(Actor* thisx, PlayState* play) { EnZo* this = (EnZo*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f pos; if ((s32)this->alpha != 0) { diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index 53a7f6d47be..7e219355e72 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -90,7 +90,7 @@ void EnfHG_Init(Actor* thisx, PlayState* play2) { } void EnfHG_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnfHG* this = (EnfHG*)thisx; osSyncPrintf("F DT1\n"); @@ -108,10 +108,10 @@ void EnfHG_SetupIntro(EnfHG* this, PlayState* play) { void EnfHG_Intro(EnfHG* this, PlayState* play) { static Vec3f audioVec = { 0.0f, 0.0f, 50.0f }; - UNUSED s32 pad1; + STACK_PAD(s32); Player* player = GET_PLAYER(play); BossGanondrof* bossGnd = (BossGanondrof*)this->actor.parent; - UNUSED s32 pad2[2]; + STACK_PADS(s32, 2); if (this->cutsceneState != INTRO_FINISH) { SkelAnime_Update(&this->skin.skelAnime); @@ -676,7 +676,7 @@ void EnfHG_Done(EnfHG* this, PlayState* play) { } void EnfHG_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); EnfHG* this = (EnfHG*)thisx; u8 i; @@ -712,7 +712,7 @@ void EnfHG_PostDraw(Actor* thisx, PlayState* play, Skin* skin) { void EnfHG_Draw(Actor* thisx, PlayState* play) { EnfHG* this = (EnfHG*)thisx; BossGanondrof* bossGnd = (BossGanondrof*)this->actor.parent; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_en_fhg.c", 2439); Gfx_SetupDL_25Opa(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.c b/src/overlays/actors/ovl_End_Title/z_end_title.c index f6ec65ca0a0..6f527534dc8 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.c +++ b/src/overlays/actors/ovl_End_Title/z_end_title.c @@ -113,7 +113,7 @@ void EndTitle_DrawFull(Actor* thisx, PlayState* play) { // Used in the Temple of Time void EndTitle_DrawNintendoLogo(Actor* thisx, PlayState* play) { EndTitle* this = (EndTitle*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s32 frames = play->csCtx.frames; if ((frames >= 1101) && (this->endAlpha < 255)) { diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 486428eb3ae..13b95697707 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -1170,7 +1170,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) { u8 materialFlag = 0; f32 rotY; s16 i; - UNUSED s32 pad; + STACK_PAD(s32); FishingEffect* firstEffect = effect; OPEN_DISPS(play->state.gfxCtx, "../z_fishing.c", 2271); @@ -1374,7 +1374,7 @@ void Fishing_DrawEffects(FishingEffect* effect, PlayState* play) { } void Fishing_DrawStreamSplash(PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_fishing.c", 2572); @@ -1416,7 +1416,7 @@ void Fishing_UpdateLine(PlayState* play, Vec3f* basePos, Vec3f* pos, Vec3f* rot, f32 dist; f32 spD8; s16 temp_s2; - UNUSED s32 pad; + STACK_PAD(s32); f32 temp_f20; Vec3f posSrc = { 0.0f, 0.0f, 0.0f }; Vec3f posStep; @@ -1784,7 +1784,7 @@ void Fishing_DrawLureAndLine(PlayState* play, Vec3f* linePos, Vec3f* lineRot) { Vec3f hookPos[2]; s16 i; s16 spB4 = D_80B7E144; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); OPEN_DISPS(play->state.gfxCtx, "../z_fishing.c", 3287); @@ -1952,7 +1952,7 @@ void Fishing_DrawRod(PlayState* play) { f32 spC0; Input* input = &play->state.input[0]; Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_fishing.c", 3600); @@ -2111,7 +2111,7 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) { f32 sp70; Vec3f sp64; Vec3f sp58; - UNUSED s32 pad; + STACK_PAD(s32); D_80B7E0AE++; @@ -2899,7 +2899,7 @@ void Fishing_UpdateFish(Actor* thisx, PlayState* play2) { u8 phi_v0_2; f32 temp_f0; f32 temp; - UNUSED s32 pad; + STACK_PAD(s32); f32 spA4; u16 spA2; u8 phi_a1; @@ -4382,7 +4382,7 @@ void Fishing_DrawPondProps(PlayState* play) { u8 materialFlag = 0; FishingProp* prop = &sPondProps[0]; s16 i; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_fishing.c", 7704); @@ -4677,7 +4677,7 @@ void Fishing_DrawGroupFishes(PlayState* play) { FishingGroupFish* fish = &sGroupFishes[0]; f32 scale; s16 i; - UNUSED s32 pad; + STACK_PAD(s32); if (sLinkAge == LINK_AGE_CHILD) { scale = 0.003325f; @@ -5083,7 +5083,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) { f32 target; f32 subCamAtMaxVelFrac; f32 lureDistXZ; - UNUSED s32 pad1; + STACK_PAD(s32); Player* player = GET_PLAYER(play); Input* input = &play->state.input[0]; @@ -5635,14 +5635,14 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) { play->envCtx.adjLight1Color[0] = play->envCtx.adjLight1Color[1] = play->envCtx.adjLight1Color[2] = D_80B7A658; if ((u8)D_80B7A650 > 0) { - UNUSED s32 pad2; + STACK_PAD(s32); Camera* mainCam = Play_GetCamera(play, CAM_ID_MAIN); s16 i; - UNUSED s32 pad3; + STACK_PAD(s32); Vec3f pos; Vec3f rot; Vec3f projectedPos; - UNUSED s32 pad4; + STACK_PAD(s32); rot.x = M_PI / 2.0f + 0.1f; rot.y = 1.0f; @@ -5711,7 +5711,7 @@ static void* sFishingOwnerEyeTexs[] = { }; void Fishing_DrawOwner(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Fishing* this = (Fishing*)thisx; Input* input = &play->state.input[0]; 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 4644d1f2dd3..07f6691d4fe 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -92,7 +92,7 @@ void ItemEtcetera_SetupAction(ItemEtcetera* this, ItemEtceteraActionFunc actionF void ItemEtcetera_Init(Actor* thisx, PlayState* play) { ItemEtcetera* this = (ItemEtcetera*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s32 type; s32 objBankIndex; diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c index b2cfbd06f00..dcc8e77a85c 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -182,7 +182,7 @@ void func_80B86CA8(ItemShield* this, PlayState* play) { } void func_80B86F68(ItemShield* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); MtxF* shield = &player->shieldMf; diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index 8415d82a688..fcc3b7b13d5 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -72,7 +72,7 @@ void MagicDark_DiamondUpdate(Actor* thisx, PlayState* play) { MagicDark* this = (MagicDark*)thisx; u8 phi_a0; Player* player = GET_PLAYER(play); - UNUSED s16 pad; + STACK_PAD(s16); s16 nayrusLoveTimer = gSaveContext.nayrusLoveTimer; s32 msgMode = play->msgCtx.msgMode; @@ -175,7 +175,7 @@ void MagicDark_DimLighting(PlayState* play, f32 intensity) { void MagicDark_OrbUpdate(Actor* thisx, PlayState* play) { MagicDark* this = (MagicDark*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); func_8002F974(&this->actor, NA_SE_PL_MAGIC_SOUL_BALL - SFX_FLAG); @@ -203,7 +203,7 @@ void MagicDark_OrbUpdate(Actor* thisx, PlayState* play) { void MagicDark_DiamondDraw(Actor* thisx, PlayState* play) { MagicDark* this = (MagicDark*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); u16 gameplayFrames = play->gameplayFrames; OPEN_DISPS(play->state.gfxCtx, "../z_magic_dark.c", 525); @@ -243,7 +243,7 @@ void MagicDark_OrbDraw(Actor* thisx, PlayState* play) { MagicDark* this = (MagicDark*)thisx; Vec3f pos; Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); f32 sp6C = play->state.frames & 0x1F; if (this->timer < 32) { diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c index 89c1c9b9aba..84fc31ab184 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -119,7 +119,7 @@ void MagicFire_UpdateBeforeCast(Actor* thisx, PlayState* play) { void MagicFire_Update(Actor* thisx, PlayState* play) { MagicFire* this = (MagicFire*)thisx; Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); if (1) {} this->actor.world.pos = player->actor.world.pos; @@ -218,9 +218,9 @@ void MagicFire_Update(Actor* thisx, PlayState* play) { void MagicFire_Draw(Actor* thisx, PlayState* play) { MagicFire* this = (MagicFire*)thisx; - UNUSED s32 pad1; + STACK_PAD(s32); u32 gameplayFrames = play->gameplayFrames; - UNUSED s32 pad2; + STACK_PAD(s32); s32 i; u8 alpha; diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index 754372bd53a..7aa04cb63aa 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -144,7 +144,7 @@ void MagicWind_Update(Actor* thisx, PlayState* play) { } s32 MagicWind_OverrideLimbDraw(PlayState* play, SkelCurve* skelCurve, s32 limbIndex, void* thisx) { - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_magic_wind.c", 615); 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 51d1f122850..38760b262d7 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -159,7 +159,7 @@ void MirRay_MakeShieldLight(MirRay* this, PlayState* play) { } void MirRay_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); MirRay* this = (MirRay*)thisx; MirRayDataEntry* dataEntry = &sMirRayData[this->actor.params]; @@ -237,7 +237,7 @@ void MirRay_Destroy(Actor* thisx, PlayState* play) { } void MirRay_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); MirRay* this = (MirRay*)thisx; Player* player = GET_PLAYER(play); @@ -266,7 +266,7 @@ void MirRay_SetIntensity(MirRay* this, PlayState* play) { f32 temp_f0; f32 temp_f0_2; f32 temp_f2_2; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); MtxF* shieldMtx = &player->shieldMf; 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 5c70b56f856..543cd4c4a53 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -134,9 +134,9 @@ void ObjBean_InitCollider(Actor* thisx, PlayState* play) { } void ObjBean_InitDynaPoly(ObjBean* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader; - UNUSED s32 pad2; + STACK_PAD(s32); colHeader = NULL; @@ -865,7 +865,7 @@ void func_80B90A34(ObjBean* this, PlayState* play) { } } void ObjBean_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ObjBean* this = (ObjBean*)thisx; if (this->timer > 0) { 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 87525ffb90a..b806ee55273 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c @@ -43,7 +43,7 @@ void ObjBlockstop_Update(Actor* thisx, PlayState* play) { DynaPolyActor* dynaPolyActor; Vec3f sp4C; s32 bgId; - UNUSED s32 pad; + STACK_PAD(s32); if (BgCheck_EntityLineTest2(&play->colCtx, &this->actor.home.pos, &this->actor.world.pos, &sp4C, &this->actor.floorPoly, false, false, true, true, &bgId, &this->actor)) { 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 f23e879ae44..7899ed393c3 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -122,7 +122,7 @@ void ObjBombiwa_Break(ObjBombiwa* this, PlayState* play) { void ObjBombiwa_Update(Actor* thisx, PlayState* play) { ObjBombiwa* this = (ObjBombiwa*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if ((func_80033684(play, &this->actor) != NULL) || ((this->collider.base.acFlags & AC_HIT) && (this->collider.info.acHitInfo->toucher.dmgFlags & DMG_HAMMER))) { diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c index 11a22f67351..c20b347d5fa 100644 --- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c +++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c @@ -42,7 +42,7 @@ static ColliderCylinderInitToActor sCylinderInit = { void ObjDekujr_Init(Actor* thisx, PlayState* play) { ObjDekujr* this = (ObjDekujr*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); if (gSaveContext.cutsceneIndex < 0xFFF0) { if (!LINK_IS_ADULT) { @@ -127,7 +127,7 @@ void ObjDekujr_ComeUp(ObjDekujr* this, PlayState* play) { void ObjDekujr_Update(Actor* thisx, PlayState* play) { ObjDekujr* this = (ObjDekujr*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index 5e9cc69ee7c..497627184d7 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -44,9 +44,9 @@ void ObjElevator_SetupAction(ObjElevator* this, ObjElevatorActionFunc actionFunc } void func_80B92B08(ObjElevator* this, PlayState* play, CollisionHeader* collision, s32 flag) { - UNUSED s16 pad1; + STACK_PAD(s16); CollisionHeader* colHeader = NULL; - UNUSED s16 pad2; + STACK_PAD(s16); Actor* thisx = &this->dyna.actor; DynaPolyActor_Init(&this->dyna, flag); 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 0d15ec9fc28..6aaa1ebaabe 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -91,7 +91,7 @@ void ObjHamishi_Shake(ObjHamishi* this) { } void ObjHamishi_Break(ObjHamishi* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f velocity; Vec3f pos; s16 phi_s0 = 1000; 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 d1774b1eaf3..70f4f6d79a3 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -53,9 +53,9 @@ void ObjHsblock_SetupAction(ObjHsblock* this, ObjHsblockActionFunc actionFunc) { } void func_80B93B68(ObjHsblock* this, PlayState* play, CollisionHeader* collision, s32 moveFlags) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad2[2]; + STACK_PADS(s32, 2); DynaPolyActor_Init(&this->dyna, moveFlags); CollisionHeader_GetVirtual(collision, &colHeader); 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 8d07448a477..a7fba9dd8a3 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 @@ -102,7 +102,7 @@ void ObjIcePoly_Init(Actor* thisx, PlayState* play) { } void ObjIcePoly_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ObjIcePoly* this = (ObjIcePoly*)thisx; if ((this->actor.params >= 0) && (this->actor.params < 3)) { @@ -113,7 +113,7 @@ void ObjIcePoly_Destroy(Actor* thisx, PlayState* play) { void ObjIcePoly_Idle(ObjIcePoly* this, PlayState* play) { static Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f pos; if (this->colliderIce.base.acFlags & AC_HIT) { @@ -182,14 +182,14 @@ void ObjIcePoly_Melt(ObjIcePoly* this, PlayState* play) { } void ObjIcePoly_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ObjIcePoly* this = (ObjIcePoly*)thisx; this->actionFunc(this, play); } void ObjIcePoly_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ObjIcePoly* this = (ObjIcePoly*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_obj_ice_poly.c", 421); 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 a1170ef5cfe..fe63899539f 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -88,7 +88,7 @@ void ObjKibako_InitCollider(Actor* thisx, PlayState* play) { } void ObjKibako_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ObjKibako* this = (ObjKibako*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -183,7 +183,7 @@ void ObjKibako_SetupIdle(ObjKibako* this) { } void ObjKibako_Idle(ObjKibako* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); if (Actor_HasParent(&this->actor, play)) { ObjKibako_SetupHeld(this); @@ -246,7 +246,7 @@ void ObjKibako_SetupThrown(ObjKibako* this) { } void ObjKibako_Thrown(ObjKibako* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if ((this->actor.bgCheckFlags & (BGCHECKFLAG_GROUND | BGCHECKFLAG_GROUND_TOUCH | BGCHECKFLAG_WALL)) || (this->collider.base.atFlags & AT_HIT)) { @@ -270,14 +270,14 @@ void ObjKibako_Thrown(ObjKibako* this, PlayState* play) { } void ObjKibako_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ObjKibako* this = (ObjKibako*)thisx; this->actionFunc(this, play); } void ObjKibako_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); UNUSED ObjKibako* this = (ObjKibako*)thisx; Gfx_DrawDListOpa(play, gSmallWoodenBoxDL); 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 4b69f999339..b52e286b6e5 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -65,7 +65,7 @@ void ObjKibako2_InitCollider(Actor* thisx, PlayState* play) { } void ObjKibako2_Break(ObjKibako2* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Vec3f* thisPos; Vec3f pos; Vec3f velocity; @@ -116,7 +116,7 @@ void ObjKibako2_SpawnCollectible(ObjKibako2* this, PlayState* play) { void ObjKibako2_Init(Actor* thisx, PlayState* play) { ObjKibako2* this = (ObjKibako2*)thisx; - UNUSED s16 pad; + STACK_PAD(s16); CollisionHeader* colHeader = NULL; u32 bgId; 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 5565b0c48e9..c0fce847009 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -62,9 +62,9 @@ void ObjLift_SetupAction(ObjLift* this, ObjLiftActionFunc actionFunc) { } void ObjLift_InitDynaPoly(ObjLift* this, PlayState* play, CollisionHeader* collision, s32 flags) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); DynaPolyActor_Init(&this->dyna, flags); CollisionHeader_GetVirtual(collision, &colHeader); @@ -80,7 +80,7 @@ void func_80B96160(ObjLift* this, PlayState* play) { Vec3f pos; Vec3f velocity; Vec3f* temp_s3; - UNUSED s32 pad; + STACK_PAD(s32); s32 i; temp_s3 = &this->dyna.actor.world.pos; @@ -135,7 +135,7 @@ void func_80B9651C(ObjLift* this) { } void func_80B96560(ObjLift* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 quakeIndex; if (DynaPolyActor_IsPlayerOnTop(&this->dyna)) { @@ -188,7 +188,7 @@ void func_80B967C0(ObjLift* this) { } void func_80B96840(ObjLift* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 bgId; Vec3f pos; 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 dda184f2176..fa26c69f04f 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -89,7 +89,7 @@ static InitChainEntry sInitChain[] = { }; void ObjLightswitch_InitCollider(ObjLightswitch* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Collider_InitJntSph(play, &this->collider); Collider_SetJntSph(play, &this->collider, &this->actor, &sColliderJntSphInit, this->colliderItems); @@ -136,7 +136,7 @@ void ObjLightswitch_SpawnDisappearEffects(ObjLightswitch* this, PlayState* play) f32 x; f32 y; f32 z; - UNUSED s32 pad; + STACK_PAD(s32); if (this->alpha >= (100 << 6)) { x = (CLAMP_MAX((1.0f - 1.0f / (255 << 6) * this->alpha) * 400.0f, 60.0f) - 30.0f + 30.0f) * Rand_ZeroOne(); @@ -444,7 +444,7 @@ void ObjLightswitch_DrawOpa(ObjLightswitch* this, PlayState* play) { } void ObjLightswitch_DrawXlu(ObjLightswitch* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f sp68; Vec3s sp60; 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 de13c853d49..fcb9e29f04b 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -136,7 +136,7 @@ void ObjMure_SpawnActors0(ObjMure* this, PlayState* play) { ActorContext* ac; s32 i; Vec3f pos; - UNUSED s32 pad; + STACK_PAD(s32); s32 maxChildren = ObjMure_GetMaxChildSpawns(this); for (i = 0; i < maxChildren; i++) { 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 2177e26449d..a2fc67b75af 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -141,7 +141,7 @@ void func_80B9ADCC(ObjMure3* this, PlayState* play) { } void ObjMure3_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ObjMure3* this = (ObjMure3*)thisx; if (Flags_GetSwitch(play, this->actor.params & 0x3F)) { 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 b2d80644512..305ca81bf96 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -84,9 +84,9 @@ static Vec2f sFaceDirection[] = { }; void ObjOshihiki_InitDynapoly(ObjOshihiki* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); DynaPolyActor_Init(&this->dyna, moveFlag); CollisionHeader_GetVirtual(collision, &colHeader); @@ -307,7 +307,7 @@ void ObjOshihiki_Init(Actor* thisx, PlayState* play2) { } void ObjOshihiki_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ObjOshihiki* this = (ObjOshihiki*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); @@ -419,7 +419,7 @@ s32 ObjOshihiki_CheckWall(PlayState* play, s16 angle, f32 direction, ObjOshihiki } s32 ObjOshihiki_MoveWithBlockUnder(ObjOshihiki* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ObjOshihiki* blockUnder = ObjOshihiki_GetBlockUnder(this, play); if ((blockUnder != NULL) && (blockUnder->stateFlags & PUSHBLOCK_SETUP_PUSH) && @@ -450,7 +450,7 @@ void ObjOshihiki_SetupOnScene(ObjOshihiki* this, PlayState* play) { } void ObjOshihiki_OnScene(ObjOshihiki* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); this->stateFlags |= PUSHBLOCK_ON_SCENE; @@ -611,7 +611,7 @@ void ObjOshihiki_Fall(ObjOshihiki* this, PlayState* play) { } void ObjOshihiki_Update(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ObjOshihiki* this = (ObjOshihiki*)thisx; this->stateFlags &= @@ -634,7 +634,7 @@ void ObjOshihiki_Update(Actor* thisx, PlayState* play) { } void ObjOshihiki_Draw(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ObjOshihiki* this = (ObjOshihiki*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_obj_oshihiki.c", 1289); 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 f67d96dfca6..2b20f69a9cb 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -190,9 +190,9 @@ void ObjSwitch_RotateY(Vec3f* dest, Vec3f* src, s16 rotY) { } void ObjSwitch_InitDynaPoly(ObjSwitch* this, PlayState* play, CollisionHeader* collision, s32 moveFlag) { - UNUSED s32 pad1; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; - UNUSED s32 pad2; + STACK_PAD(s32); DynaPolyActor_Init(&this->dyna, moveFlag); CollisionHeader_GetVirtual(collision, &colHeader); @@ -246,7 +246,7 @@ Actor* ObjSwitch_SpawnIce(ObjSwitch* this, PlayState* play) { } void ObjSwitch_SetOn(ObjSwitch* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 subType; if (Flags_GetSwitch(play, OBJSWITCH_SWITCH_FLAG(&this->dyna.actor))) { @@ -765,7 +765,7 @@ void ObjSwitch_DrawEye(ObjSwitch* this, PlayState* play) { gEyeSwitch1DL, // OBJSWITCH_SUBTYPE_ONCE gEyeSwitch2DL, // OBJSWITCH_SUBTYPE_TOGGLE }; - UNUSED s32 pad; + STACK_PAD(s32); s32 subType = OBJSWITCH_SUBTYPE(&this->dyna.actor); OPEN_DISPS(play->state.gfxCtx, "../z_obj_switch.c", 1459); @@ -794,7 +794,7 @@ void ObjSwitch_DrawCrystal(ObjSwitch* this, PlayState* play) { NULL, // OBJSWITCH_SUBTYPE_HOLD_INVERTED gCrystalSwitchCoreOpaDL // OBJSWITCH_SUBTYPE_SYNC }; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s32 subType = OBJSWITCH_SUBTYPE(&this->dyna.actor); func_8002ED80(&this->dyna.actor, play, 0); 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 894a070cbe1..ce250d4fb35 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -79,7 +79,7 @@ static s32 sLitTorchCount; void ObjSyokudai_Init(Actor* thisx, PlayState* play) { static u8 sColTypesStand[] = { 0x09, 0x0B, 0x0B }; - UNUSED s32 pad; + STACK_PAD(s32); ObjSyokudai* this = (ObjSyokudai*)thisx; s32 torchType = this->actor.params & 0xF000; @@ -109,7 +109,7 @@ void ObjSyokudai_Init(Actor* thisx, PlayState* play) { } void ObjSyokudai_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ObjSyokudai* this = (ObjSyokudai*)thisx; Collider_DestroyCylinder(play, &this->colliderStand); @@ -133,7 +133,7 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) { s32 interactionType; u32 dmgFlags; Vec3f tipToFlame; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); litTimeScale = torchCount; if (torchCount == 10) { @@ -258,7 +258,7 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) { void ObjSyokudai_Draw(Actor* thisx, PlayState* play) { static Gfx* displayLists[] = { gGoldenTorchDL, gTimedTorchDL, gWoodenTorchDL }; - UNUSED s32 pad; + STACK_PAD(s32); ObjSyokudai* this = (ObjSyokudai*)thisx; s32 timerMax; diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c index 8a003a83c35..6e2d11977ae 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c @@ -98,7 +98,7 @@ void ObjTimeblock_ToggleSwitchFlag(PlayState* play, s32 flag) { void ObjTimeblock_Init(Actor* thisx, PlayState* play) { ObjTimeblock* this = (ObjTimeblock*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); CollisionHeader* colHeader = NULL; DynaPolyActor_Init(&this->dyna, 0); @@ -140,7 +140,7 @@ void ObjTimeblock_Init(Actor* thisx, PlayState* play) { } void ObjTimeblock_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ObjTimeblock* this = (ObjTimeblock*)thisx; DynaPoly_DeleteBgActor(play, &play->colCtx.dyna, this->dyna.bgId); 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 51814bb0c17..82621b18437 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -153,7 +153,7 @@ void ObjTsubo_Destroy(Actor* thisx, PlayState* play2) { } void ObjTsubo_AirBreak(ObjTsubo* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); f32 rand; s16 angle; Vec3f pos; @@ -189,7 +189,7 @@ void ObjTsubo_AirBreak(ObjTsubo* this, PlayState* play) { } void ObjTsubo_WaterBreak(ObjTsubo* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); s16 angle; Vec3f pos = this->actor.world.pos; Vec3f velocity; @@ -234,7 +234,7 @@ void ObjTsubo_SetupIdle(ObjTsubo* this) { } void ObjTsubo_Idle(ObjTsubo* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s16 temp_v0; s32 phi_v1; @@ -302,7 +302,7 @@ void ObjTsubo_SetupThrown(ObjTsubo* this) { } void ObjTsubo_Thrown(ObjTsubo* this, PlayState* play) { - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if ((this->actor.bgCheckFlags & (BGCHECKFLAG_GROUND | BGCHECKFLAG_GROUND_TOUCH | BGCHECKFLAG_WALL)) || (this->collider.base.atFlags & AT_HIT)) { diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index 48708b36b61..7fd559d8037 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -74,7 +74,7 @@ void ObjWarp2block_Spawn(ObjWarp2block* this, PlayState* play) { } s32 func_80BA1ECC(ObjWarp2block* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); Actor* temp_a3; Player* player; Vec3f sp20; 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 47d48b4b244..4a266e6ad22 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -64,7 +64,7 @@ void ObjectKankyo_SetupAction(ObjectKankyo* this, ObjectKankyoActionFunc action) void ObjectKankyo_Init(Actor* thisx, PlayState* play) { ObjectKankyo* this = (ObjectKankyo*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); s16 i; for (i = 0; i < ARRAY_COUNT(this->effects); i++) { @@ -593,7 +593,7 @@ void ObjectKankyo_DrawSnow(Actor* thisx, PlayState* play2) { UNUSED Vec3f vec1 = { 0.0f, 0.0f, 0.0f }; UNUSED Vec3f vec2 = { 0.0f, 0.0f, 0.0f }; s16 i; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); if (!(play->cameraPtrs[CAM_ID_MAIN]->unk_14C & 0x100)) { OPEN_DISPS(play->state.gfxCtx, "../z_object_kankyo.c", 958); @@ -749,7 +749,7 @@ void ObjectKankyo_Lightning(ObjectKankyo* this, PlayState* play) { } void ObjectKankyo_DrawLightning(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); ObjectKankyo* this = (ObjectKankyo*)thisx; OPEN_DISPS(play->state.gfxCtx, "../z_object_kankyo.c", 1182); 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 45ab27921c4..5f0c28e1407 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -40,7 +40,7 @@ void OceffSpot_SetupAction(OceffSpot* this, OceffSpotActionFunc actionFunc) { } void OceffSpot_Init(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OceffSpot* this = (OceffSpot*)thisx; Actor_ProcessInitChain(&this->actor, sInitChain); @@ -63,7 +63,7 @@ void OceffSpot_Init(Actor* thisx, PlayState* play) { } void OceffSpot_Destroy(Actor* thisx, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); OceffSpot* this = (OceffSpot*)thisx; Player* player = GET_PLAYER(play); @@ -118,7 +118,7 @@ void OceffSpot_GrowCylinder(OceffSpot* this, PlayState* play) { void OceffSpot_Update(Actor* thisx, PlayState* play) { OceffSpot* this = (OceffSpot*)thisx; - UNUSED s32 pad; + STACK_PAD(s32); Player* player = GET_PLAYER(play); f32 temp; 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 c65daf6f8fe..7e9471cd020 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -67,7 +67,7 @@ void OceffWipe_Draw(Actor* thisx, PlayState* play) { u32 scroll = play->state.frames & 0xFF; OceffWipe* this = (OceffWipe*)thisx; f32 z; - UNUSED s32 pad; + STACK_PAD(s32); u8 alphaTable[3]; s32 i; Vec3f eye; 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 d7538b08cb3..b67d5e06a37 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -63,7 +63,7 @@ void OceffWipe2_Draw(Actor* thisx, PlayState* play) { OceffWipe2* this = (OceffWipe2*)thisx; f32 z; u8 alpha; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Vec3f eye; Vtx* vtxPtr; Vec3f quakeOffset; 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 33620cbf615..497647ed5d9 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -64,7 +64,7 @@ void OceffWipe3_Draw(Actor* thisx, PlayState* play) { OceffWipe3* this = (OceffWipe3*)thisx; f32 z; u8 alpha; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Vec3f eye; Vtx* vtxPtr; Vec3f quakeOffset; 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 e6d40046cfc..8266ad9fe22 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -62,7 +62,7 @@ void OceffWipe4_Draw(Actor* thisx, PlayState* play) { OceffWipe4* this = (OceffWipe4*)thisx; f32 z; u8 alpha; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); Vec3f eye; Vtx* vtxPtr; Vec3f quakeOffset; 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 6a4e569ec2b..b6b9f17fe1d 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -121,7 +121,7 @@ void ShotSun_TriggerFairy(ShotSun* this, PlayState* play) { void func_80BADF0C(ShotSun* this, PlayState* play) { Player* player = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); s32 params = this->actor.params & 0xFF; if (Math3D_Vec3fDistSq(&this->actor.world.pos, &player->actor.world.pos) > SQ(150.0f)) { @@ -156,7 +156,7 @@ void ShotSun_UpdateHyliaSun(ShotSun* this, PlayState* play) { Vec3s cylinderPos; Player* player = GET_PLAYER(play); EnItem00* collectible; - UNUSED s32 pad; + STACK_PAD(s32); Vec3f spawnPos; if (this->collider.base.acFlags & AC_HIT) { diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 07bd437d2db..8a72281cb01 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -1792,7 +1792,7 @@ void func_80832924(Player* this, struct_80832924* entry) { s32 data; s32 flags; u32 cont; - UNUSED s32 pad; + STACK_PAD(s32); do { data = ABS(entry->field); @@ -3381,7 +3381,7 @@ void func_80836BEC(Player* this, PlayState* play) { s32 sp1C = 0; s32 zTrigPressed = CHECK_BTN_ALL(sControlInput->cur.button, BTN_Z); Actor* actorToTarget; - UNUSED s32 pad; + STACK_PAD(s32); s32 holdTarget; s32 cond; @@ -3761,7 +3761,7 @@ static u32 D_80854488[][2] = { }; void func_80837948(PlayState* play, Player* this, s32 arg2) { - UNUSED s32 pad; + STACK_PAD(s32); u32 dmgFlags; s32 temp; @@ -4036,7 +4036,7 @@ void func_808382BC(Player* this) { } s32 func_808382DC(Player* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); s32 sp68 = false; s32 sp64; @@ -4582,7 +4582,7 @@ s32 func_80839800(Player* this, PlayState* play) { f32 sp74; Actor* doorActor; f32 sp6C; - UNUSED s32 pad; + STACK_PAD(s32); s32 frontRoom; Actor* attachedActor; LinkAnimationHeader* sp5C; @@ -5125,7 +5125,7 @@ s32 func_8083ADD4(PlayState* play, Player* this) { } void func_8083AE40(Player* this, s16 objectId) { - UNUSED s32 pad; + STACK_PAD(s32); u32 size; if (objectId != OBJECT_INVALID) { @@ -6337,7 +6337,7 @@ static LinkAnimationHeader* D_80854590[] = { }; s32 func_8083E318(PlayState* play, Player* this, CollisionPoly* floorPoly) { - UNUSED s32 pad; + STACK_PAD(s32); s16 playerVelYaw; Vec3f slopeNormal; s16 downwardSlopeYaw; @@ -6570,7 +6570,7 @@ s32 func_8083EC18(Player* this, PlayState* play, u32 interactWallFlags) { s32 i; f32 sp48; Vec3f* sp44 = &sp50[0]; - UNUSED s32 pad; + STACK_PAD(s32); CollisionPoly_GetVerticesByBgId(wallPoly, this->actor.wallBgId, &play->colCtx, sp50); @@ -8040,7 +8040,7 @@ static LinkAnimationHeader* D_808545CC[] = { }; void func_80842D20(PlayState* play, Player* this) { - UNUSED s32 pad; + STACK_PAD(s32); s32 sp28; if (func_80843188 != this->func_674) { @@ -8660,7 +8660,7 @@ void func_80844708(Player* this, PlayState* play) { s32 temp; s32 sp44; DynaPolyActor* wallPolyActor; - UNUSED s32 pad; + STACK_PAD(s32); f32 sp38; s16 sp36; @@ -9163,7 +9163,7 @@ void func_80845CA4(Player* this, PlayState* play) { s32 temp; f32 sp34; s32 sp30; - UNUSED s32 pad; + STACK_PAD(s32); if (!func_8083B040(this, play)) { if (this->unk_850 == 0) { @@ -10058,7 +10058,7 @@ void func_80847BA0(PlayState* play, Player* this) { CollisionPoly* wallPoly; s32 wallBgId; s16 sp9A; - UNUSED s32 pad1; + STACK_PAD(s32); D_80854798.y = 18.0f; D_80854798.z = this->ageProperties->unk_38 + 10.0f; @@ -10175,9 +10175,9 @@ void func_80847BA0(PlayState* play, Player* this) { f32 invFloorPolyNormalY; f32 floorPolyNormalZ; f32 sp4C; - UNUSED s32 pad1; + STACK_PAD(s32); f32 sp44; - UNUSED s32 pad2; + STACK_PAD(s32); if (this->actor.floorBgId != BGCHECK_SCENE) { DynaPoly_SetPlayerOnTop(&play->colCtx, this->actor.floorBgId); @@ -10217,7 +10217,7 @@ void func_80847BA0(PlayState* play, Player* this) { void Player_UpdateCamAndSeqModes(PlayState* play, Player* this) { u8 seqMode; - UNUSED s32 pad; + STACK_PAD(s32); Actor* unk_664; s32 camMode; @@ -10463,7 +10463,7 @@ static f32 sFloorConveyorSpeeds[CONVEYOR_SPEED_MAX - 1] = { }; void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { - UNUSED s32 pad1; + STACK_PAD(s32); sControlInput = input; @@ -10592,7 +10592,7 @@ void Player_UpdateCommon(Player* this, PlayState* play, Input* input) { f32 sp70 = this->linearVelocity; s16 sp6E = this->currentYaw; s16 yawDiff = this->actor.world.rot.y - sp6E; - UNUSED s32 pad2; + STACK_PAD(s32); if ((ABS(yawDiff) > 0x6000) && (this->actor.speedXZ != 0.0f)) { sp70 = 0.0f; @@ -10868,7 +10868,7 @@ void Player_Update(Actor* thisx, PlayState* play) { static Vec3f sDogSpawnPos; Player* this = (Player*)thisx; s32 dogParams; - UNUSED s32 pad; + STACK_PAD(s32); Input sp44; Actor* dog; @@ -11010,7 +11010,7 @@ void Player_Draw(Actor* thisx, PlayState* play2) { if (!(this->stateFlags2 & PLAYER_STATE2_29)) { OverrideLimbDrawOpa overrideLimbDraw = Player_OverrideLimbDrawGameplayDefault; s32 lod; - UNUSED s32 pad; + STACK_PAD(s32); if ((this->csMode != 0) || (func_8008E9C4(this) && 0) || (this->actor.projectedPos.z < 160.0f)) { lod = 0; @@ -13018,7 +13018,7 @@ void func_8084F698(Player* this, PlayState* play) { } void func_8084F710(Player* this, PlayState* play) { - UNUSED s32 pad; + STACK_PAD(s32); if ((this->unk_84F != 0) && (play->csCtx.frames < 0x131)) { this->actor.gravity = 0.0f; @@ -13237,7 +13237,7 @@ void func_8084FF7C(Player* this) { } void func_8085002C(Player* this) { - UNUSED s32 pad; + STACK_PAD(s32); s16 sp2A; s16 sp28; s16 sp26; @@ -14613,7 +14613,7 @@ void func_80852C0C(PlayState* play, Player* this, s32 csMode) { void func_80852C50(PlayState* play, Player* this, CsCmdActorAction* arg2) { CsCmdActorAction* linkCsAction = play->csCtx.linkAction; - UNUSED s32 pad; + STACK_PAD(s32); s32 sp24; if (play->csCtx.state == CS_STATE_UNSKIPPABLE_INIT) { @@ -14733,7 +14733,7 @@ s32 Player_InflictDamage(PlayState* play, s32 damage) { // Start talking with the given actor void func_80853148(PlayState* play, Actor* actor) { Player* this = GET_PLAYER(play); - UNUSED s32 pad; + STACK_PAD(s32); if ((this->targetActor != NULL) || (actor == this->naviActor) || CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_0 | ACTOR_FLAG_18)) { diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c index 94027832b1f..1a7fb158c03 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c @@ -58,7 +58,7 @@ u32 EffectSsBlast_Init(PlayState* play, u32 index, EffectSs* this, void* initPar void EffectSsBlast_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; MtxF mf; - UNUSED s32 pad; + STACK_PAD(s32); f32 radius; OPEN_DISPS(gfxCtx, "../z_eff_ss_blast.c", 170); diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c index d7c228cf0e6..83106f7474d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c @@ -48,7 +48,7 @@ void EffectSsBomb_Draw(PlayState* play, u32 index, EffectSs* this) { MtxF mfResult; MtxF mfTrans11DA0; Mtx* mtx; - UNUSED s32 pad; + STACK_PAD(s32); f32 scale; s16 color; diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c index 3205f4b91b8..f2705ef2dad 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c @@ -70,7 +70,7 @@ void EffectSsBomb2_DrawFade(PlayState* play, u32 index, EffectSs* this) { MtxF mfResult; MtxF mfTrans11DA0; Mtx* mtx; - UNUSED s32 pad; + STACK_PAD(s32); f32 scale; OPEN_DISPS(gfxCtx, "../z_eff_ss_bomb2.c", 298); @@ -112,7 +112,7 @@ void EffectSsBomb2_DrawLayered(PlayState* play, u32 index, EffectSs* this) { MtxF mtx2F; Mtx* mtx2; Mtx* mtx; - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); f32 scale; f32 depth; f32 layer2Scale = 0.925f; diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c index 021ae02172c..b1a9bc6f851 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c @@ -64,7 +64,7 @@ void EffectSsDFire_Draw(PlayState* play, u32 index, EffectSs* this) { MtxF mfScale; MtxF mfResult; MtxF mfTrans11DA0; - UNUSED s32 pad; + STACK_PAD(s32); void* object; Mtx* mtx; f32 scale; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c index 361c5d87fd8..d661def14eb 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c @@ -95,7 +95,7 @@ void EffectSsDeadDb_Draw(PlayState* play, u32 index, EffectSs* this) { void EffectSsDeadDb_Update(PlayState* play, u32 index, EffectSs* this) { f32 w; - UNUSED s32 pad; + STACK_PAD(s32); this->rTextIdx = (f32)((this->rReg11 - this->life) * 9) / this->rReg11; this->rScale += this->rScaleStep; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c index 1513805b651..2bfd213316e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c @@ -46,9 +46,9 @@ u32 EffectSsDeadDs_Init(PlayState* play, u32 index, EffectSs* this, void* initPa } void EffectSsDeadDs_Draw(PlayState* play, u32 index, EffectSs* this) { - UNUSED s32 pad1; + STACK_PAD(s32); f32 scale; - UNUSED s32 pad2[2]; + STACK_PADS(s32, 2); MtxF mf; f32 yIntersect; Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c index 98c0ad74ad5..b588085de68 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c @@ -85,7 +85,7 @@ void EffectSsDust_Draw(PlayState* play, u32 index, EffectSs* this) { MtxF mfScale; MtxF mfResult; MtxF mfTrans11DA0; - UNUSED s32 pad; + STACK_PAD(s32); Mtx* mtx; f32 scale; diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c index 0d73aa06a6d..d278dd0f0c1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c @@ -67,7 +67,7 @@ void EffectSsEnFire_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; f32 scale; s16 camYaw; - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); s16 redGreen; OPEN_DISPS(gfxCtx, "../z_eff_en_fire.c", 169); diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c index 316b4254891..1d95ad9f80c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c @@ -87,7 +87,7 @@ u32 EffectSsEnIce_Init(PlayState* play, u32 index, EffectSs* this, void* initPar void EffectSsEnIce_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - UNUSED s32 pad; + STACK_PAD(s32); f32 scale; Vec3f hiliteLightDir; u32 gameplayFrames; diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c index fa29206b68b..602d67d072a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c @@ -25,7 +25,7 @@ EffectSsInit Effect_Ss_Extra_InitVars = { u32 EffectSsExtra_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx) { EffectSsExtraInitParams* initParams = (EffectSsExtraInitParams*)initParamsx; - UNUSED s32 pad; + STACK_PAD(s32); s32 objBankIndex; uintptr_t oldSeg6; @@ -59,7 +59,7 @@ static void* sTextures[] = { }; void EffectSsExtra_Draw(PlayState* play, u32 index, EffectSs* this) { - UNUSED s32 pad; + STACK_PAD(s32); f32 scale = this->rScale / 100.0f; void* object = play->objectCtx.status[this->rObjBankIdx].segment; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c index 00eda308ff0..58bf8951405 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c @@ -44,7 +44,7 @@ u32 EffectSsFcircle_Init(PlayState* play, u32 index, EffectSs* this, void* initP void EffectSsFcircle_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - UNUSED s32 pad; + STACK_PAD(s32); f32 yScale; f32 xzScale; f32 scale; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c index fe8ae37c2de..246d0cbd1d8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c @@ -30,7 +30,7 @@ static Gfx D_809A5100[15]; u32 EffectSsFhgFlash_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx) { EffectSsFhgFlashInitParams* initParams = (EffectSsFhgFlashInitParams*)initParamsx; - UNUSED s32 pad; + STACK_PAD(s32); s32 objBankIdx; Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; Vec3f sp34 = { 0.0f, -1000.0f, 0.0f }; @@ -86,7 +86,7 @@ static Color_RGB8 sColors[] = { void EffectSsFhgFlash_DrawLightBall(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - UNUSED s32 pad; + STACK_PAD(s32); f32 scale; void* object; @@ -114,7 +114,7 @@ void EffectSsFhgFlash_DrawLightBall(PlayState* play, u32 index, EffectSs* this) void EffectSsFhgFlash_DrawShock(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - UNUSED s32 pad; + STACK_PAD(s32); f32 scale; scale = this->rScale / 100.0f; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c index 93fd8516247..5a1117eb393 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c @@ -67,7 +67,7 @@ u32 EffectSsFireTail_Init(PlayState* play, u32 index, EffectSs* this, void* init void EffectSsFireTail_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - UNUSED s32 pad; + STACK_PAD(s32); s16 yaw; Vec3f scale; f32 temp1; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c index 201fda0307a..33e9a908db2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c @@ -39,7 +39,7 @@ EffectSsInit Effect_Ss_G_Magma2_InitVars = { u32 EffectSsGMagma2_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx) { s32 objBankIndex = Object_GetIndex(&play->objectCtx, OBJECT_KINGDODONGO); - UNUSED s32 pad; + STACK_PAD(s32); if ((objBankIndex >= 0) && Object_IsLoaded(&play->objectCtx, objBankIndex)) { Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; @@ -73,7 +73,7 @@ u32 EffectSsGMagma2_Init(PlayState* play, u32 index, EffectSs* this, void* initP void EffectSsGMagma2_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - UNUSED s32 pad; + STACK_PAD(s32); f32 scale; void* object; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c index 4371ae470cb..e5d38a26b4d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c @@ -30,7 +30,7 @@ EffectSsInit Effect_Ss_G_Ripple_InitVars = { }; u32 EffectSsGRipple_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f zeroVec = { 0.0f, 0.0f, 0.0f }; WaterBox* waterBox; EffectSsGRippleInitParams* initParams = (EffectSsGRippleInitParams*)initParamsx; @@ -62,7 +62,7 @@ u32 EffectSsGRipple_Init(PlayState* play, u32 index, EffectSs* this, void* initP void EffectSsGRipple_DrawRipple(PlayState* play, EffectSs* this, void* segment) { GraphicsContext* gfxCtx = play->state.gfxCtx; f32 radius; - UNUSED s32 pad; + STACK_PAD(s32); MtxF mfTrans; MtxF mfScale; MtxF mfResult; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c index 43824862006..9d8132140dc 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c @@ -79,7 +79,7 @@ void EffectSsGSpk_Draw(PlayState* play, u32 index, EffectSs* this) { MtxF mfTrans11DA0; Mtx* mtx; f32 scale; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(gfxCtx, "../z_eff_ss_g_spk.c", 208); diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c index 68a50434b82..3d774019732 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c +++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c @@ -68,7 +68,7 @@ u32 EffectSsHahen_Init(PlayState* play, u32 index, EffectSs* this, void* initPar void EffectSsHahen_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - UNUSED s32 pad; + STACK_PAD(s32); f32 scale = this->rScale * 0.001f; OPEN_DISPS(gfxCtx, "../z_eff_hahen.c", 208); @@ -92,7 +92,7 @@ void EffectSsHahen_Draw(PlayState* play, u32 index, EffectSs* this) { // in the original game this function is hardcoded to be used only by the skull pots in Shadow Temple void EffectSsHahen_DrawGray(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - UNUSED s32 pad; + STACK_PAD(s32); f32 scale = this->rScale * 0.001f; OPEN_DISPS(gfxCtx, "../z_eff_hahen.c", 253); diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c index 65c646be7f8..bbe44d37092 100644 --- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c +++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c @@ -77,7 +77,7 @@ void EffectSsHitMark_Draw(PlayState* play, u32 index, EffectSs* this) { MtxF mfTrans11DA0; Mtx* mtx; f32 scale; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(gfxCtx, "../z_eff_ss_hitmark.c", 297); diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c index 730228b010d..c29b762e7cd 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c @@ -44,7 +44,7 @@ u32 EffectSsIcePiece_Init(PlayState* play, u32 index, EffectSs* this, void* init void EffectSsIcePiece_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - UNUSED s32 pad; + STACK_PAD(s32); f32 scale; u32 frames; f32 alpha; diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c index 6e07becff12..9d63238b375 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c @@ -22,7 +22,7 @@ EffectSsInit Effect_Ss_Ice_Smoke_InitVars = { u32 EffectSsIceSmoke_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx) { EffectSsIceSmokeInitParams* initParams = (EffectSsIceSmokeInitParams*)initParamsx; - UNUSED s32 pad; + STACK_PAD(s32); s32 objBankIdx; uintptr_t oldSeg6; @@ -51,7 +51,7 @@ u32 EffectSsIceSmoke_Init(PlayState* play, u32 index, EffectSs* this, void* init } void EffectSsIceSmoke_Draw(PlayState* play, u32 index, EffectSs* this) { - UNUSED s32 pad; + STACK_PAD(s32); void* object; Mtx* mtx; f32 scale; diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c index 319e2e3343f..fbf92b47fc9 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c @@ -42,7 +42,7 @@ u32 EffectSsKFire_Init(PlayState* play, u32 index, EffectSs* this, void* initPar void EffectSsKFire_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - UNUSED s32 pad; + STACK_PAD(s32); f32 xzScale; f32 yScale; diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c index 6d0fee54bae..cc5330d161b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c +++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c @@ -89,7 +89,7 @@ f32 func_809A9818(f32 arg0, f32 arg1) { void EffectSsKakera_Draw(PlayState* play, u32 index, EffectSs* this) { static Color_RGB8 colors[] = { { 255, 255, 255 }, { 235, 170, 130 } }; GraphicsContext* gfxCtx = play->state.gfxCtx; - UNUSED s32 pad; + STACK_PAD(s32); f32 scale; s32 colorIdx; diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c index b83d9b9d910..130b27b60ec 100644 --- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c +++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c @@ -77,7 +77,7 @@ u32 EffectSsKiraKira_Init(PlayState* play, u32 index, EffectSs* this, void* init void EffectSsKiraKira_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx; f32 scale; - UNUSED s32 pad; + STACK_PAD(s32); MtxF mfTrans; MtxF mfRotY; MtxF mfScale; diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c index 6abe13d5262..ebb0c7386ca 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c @@ -118,7 +118,7 @@ void EffectSsLightning_Draw(PlayState* play, u32 index, EffectSs* this) { } void EffectSsLightning_Update(PlayState* play, u32 index, EffectSs* this) { - UNUSED s32 pad; + STACK_PAD(s32); Vec3f pos; s16 yaw; f32 scale; diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c index 03b78cb1fae..ca9fa822480 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c @@ -79,7 +79,7 @@ void EffectSsSibuki_Draw(PlayState* play, u32 index, EffectSs* this) { } void EffectSsSibuki_Update(PlayState* play, u32 index, EffectSs* this) { - UNUSED s32 pad[3]; + STACK_PADS(s32, 3); f32 xzVelScale; s16 yaw; Player* player = GET_PLAYER(play); diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c index 95f224263f2..5f0e9ae0a42 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c +++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c @@ -30,7 +30,7 @@ u32 EffectSsSolderSrchBall_Init(PlayState* play, u32 index, EffectSs* this, void } void EffectSsSolderSrchBall_Update(PlayState* play, u32 index, EffectSs* this) { - UNUSED s32 pad; + STACK_PAD(s32); f32 playerPosDiffX; f32 playerPosDiffY; f32 playerPosDiffZ; diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c index f5ee8754059..88bca156ac8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c @@ -50,7 +50,7 @@ u32 EffectSsStick_Init(PlayState* play, u32 index, EffectSs* this, void* initPar void EffectSsStick_Draw(PlayState* play, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = play->state.gfxCtx; - UNUSED s32 pad; + STACK_PAD(s32); OPEN_DISPS(gfxCtx, "../z_eff_ss_stick.c", 153); diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index 79d3da61533..0fe41e9ac86 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -942,7 +942,7 @@ void FileSelect_DrawWindowContents(GameState* thisx) { s16 i; s16 quadVtxIndex; s16 isActive; - UNUSED s16 pad; + STACK_PAD(s16); OPEN_DISPS(this->state.gfxCtx, "../z_file_choose.c", 1940); @@ -1436,7 +1436,7 @@ void FileSelect_FadeOut(GameState* thisx) { void FileSelect_LoadGame(GameState* thisx) { FileSelectState* this = (FileSelectState*)thisx; u16 swordEquipValue; - UNUSED s32 pad; + STACK_PAD(s32); if (this->buttonIndex == FS_BTN_SELECT_FILE_1) { Audio_PlaySfxGeneral(NA_SE_SY_FSEL_DECIDE_L, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, @@ -1871,7 +1871,7 @@ void FileSelect_Destroy(GameState* thisx) { void FileSelect_Init(GameState* thisx) { FileSelectState* this = (FileSelectState*)thisx; u32 size = (uintptr_t)_title_staticSegmentRomEnd - (uintptr_t)_title_staticSegmentRomStart; - UNUSED s32 pad; + STACK_PAD(s32); SREG(30) = 1; osSyncPrintf("SIZE=%x\n", size); diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c index 63256950b0b..d5c5c200516 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c @@ -808,7 +808,7 @@ void FileSelect_DrawOptionsImpl(GameState* thisx) { s16 cursorGreen; s16 cursorBlue; s16 i; - UNUSED s16 pad; + STACK_PAD(s16); s16 vtx; OPEN_DISPS(this->state.gfxCtx, "../z_file_nameset_PAL.c", 848); diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index efc5c733817..fe3ebea74eb 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -301,7 +301,7 @@ static SceneSelectEntry sScenes[] = { void MapSelect_UpdateMenu(MapSelectState* this) { Input* input = &this->state.input[0]; - UNUSED s32 pad; + STACK_PAD(s32); SceneSelectEntry* selectedScene; if (this->verticalInputAccumulator == 0) { @@ -724,7 +724,7 @@ void MapSelect_Destroy(GameState* thisx) { void MapSelect_Init(GameState* thisx) { MapSelectState* this = (MapSelectState*)thisx; u32 size; - UNUSED s32 pad; + STACK_PAD(s32); this->state.main = MapSelect_Main; this->state.destroy = MapSelect_Destroy; diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index 5cefed0de65..57c1ab77fd8 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -59,11 +59,11 @@ void ConsoleLogo_Draw(ConsoleLogoState* this) { static Lights1 sTitleLights = gdSPDefLights1(100, 100, 100, 255, 255, 255, 69, 69, 69); u16 y; u16 idx; - UNUSED s32 pad1; + STACK_PAD(s32); Vec3f v3; Vec3f v1; Vec3f v2; - UNUSED s32 pad2[2]; + STACK_PADS(s32, 2); OPEN_DISPS(this->state.gfxCtx, "../z_title.c", 395); @@ -129,7 +129,7 @@ void ConsoleLogo_Main(GameState* thisx) { if (gIsCtrlr2Valid) { Gfx* gfx = POLY_OPA_DISP; - UNUSED s32 pad; + STACK_PAD(s32); ConsoleLogo_PrintBuildInfo(&gfx); POLY_OPA_DISP = gfx; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c index 6802a5c7610..346903543fd 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c @@ -67,9 +67,9 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { s16 sp21A; s16 sp218; s16 sp216; - UNUSED s16 pad1; + STACK_PAD(s16); s16 phi_v1; - UNUSED s16 pad2; + STACK_PAD(s16); s16 cursorItem; s16 sp208[3]; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c index ad460904713..c42eb6aab13 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c @@ -36,7 +36,7 @@ static s16 sSlotItems[] = { void KaleidoScope_DrawDebugEditorText(Gfx** gfxp) { GfxPrint printer; - UNUSED s32 pad[2]; + STACK_PADS(s32, 2); GfxPrint_Init(&printer); GfxPrint_Open(&printer, *gfxp); diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index 61b4e6194a6..d0473d87aec 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -24,7 +24,7 @@ void KaleidoScope_DrawEquipmentImage(PlayState* play, void* source, u32 width, u s32 textureHeight; s32 remainingSize; s32 textureSize; - UNUSED s32 pad; + STACK_PAD(s32); s32 i; OPEN_DISPS(play->state.gfxCtx, "../z_kaleido_equipment.c", 68); @@ -126,7 +126,7 @@ void KaleidoScope_DrawEquipment(PlayState* play) { u16 temp; u16 point; u16 rowStart; - UNUSED s16 pad; + STACK_PAD(s16); s16 cursorMoveResult; u16 cursorItem; u16 cursorSlot; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index a1fc5a6b9ef..1d5f28bd815 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -2439,7 +2439,7 @@ void KaleidoScope_UpdateCursorSize(PlayState* play) { void KaleidoScope_LoadDungeonMap(PlayState* play) { InterfaceContext* interfaceCtx = &play->interfaceCtx; - UNUSED s32 pad; + STACK_PAD(s32); DmaMgr_SendRequest1(interfaceCtx->mapSegment, (uintptr_t)_map_48x85_staticSegmentRomStart + (R_MAP_TEX_INDEX * 2040), 2040, @@ -2490,7 +2490,7 @@ void KaleidoScope_Update(PlayState* play) { s16 stepG; s16 stepB; s16 stepA; - UNUSED s32 pad; + STACK_PAD(s32); if ((R_PAUSE_MENU_MODE >= 3) && (((pauseCtx->state >= 4) && (pauseCtx->state <= 7)) || ((pauseCtx->state >= 0xA) && (pauseCtx->state <= 0x12)))) { From 12c613ec71ceb04b0d1f15612aeee4f8707f4426 Mon Sep 17 00:00:00 2001 From: Thar0 <17233964+Thar0@users.noreply.github.com> Date: Sun, 30 Oct 2022 02:39:06 +0000 Subject: [PATCH 06/14] Use stack padding for more variables not previously named pad --- src/code/sys_matrix.c | 4 ++-- src/code/z_camera.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index f112f4d0d29..4d7b1907c75 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -764,7 +764,7 @@ void Matrix_MtxFToYXZRotS(MtxF* mf, Vec3s* rotDest, s32 flag) { f32 temp; f32 temp2; f32 temp3; - UNUSED f32 temp4; + STACK_PAD(s32); temp = mf->xz; temp *= temp; @@ -817,7 +817,7 @@ void Matrix_MtxFToZYXRotS(MtxF* mf, Vec3s* rotDest, s32 flag) { f32 temp; f32 temp2; f32 temp3; - UNUSED f32 temp4; + STACK_PAD(s32); temp = mf->xx; temp *= temp; diff --git a/src/code/z_camera.c b/src/code/z_camera.c index d3d29960010..7307d46e2d9 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -6703,7 +6703,7 @@ s32 Camera_Special6(Camera* camera) { BgCamFuncData* bgCamFuncData; Vec3s bgCamRot; s16 fov; - UNUSED s32 sp54; + STACK_PAD(s32); f32 timerF; f32 timerDivisor; Special6ReadOnlyData* roData = &camera->paramData.spec6.roData; From a9b8ca83d815b9ad494c621927d674fcebd25613 Mon Sep 17 00:00:00 2001 From: Thar0 <17233964+Thar0@users.noreply.github.com> Date: Sun, 30 Oct 2022 02:50:21 +0000 Subject: [PATCH 07/14] Format --- src/code/sched.c | 3 +- src/code/z_actor.c | 4 +- src/code/z_bgcheck.c | 13 ++--- src/code/z_collision_check.c | 47 ++++++++++++------- src/code/z_demo.c | 2 +- src/code/z_kankyo.c | 4 +- src/code/z_parameter.c | 3 +- src/code/z_player_lib.c | 3 +- src/code/z_skelanime.c | 4 +- src/code/z_vismono.c | 2 +- .../ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c | 2 +- 11 files changed, 52 insertions(+), 35 deletions(-) diff --git a/src/code/sched.c b/src/code/sched.c index 87a9143c74b..1469b5610eb 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -650,7 +650,8 @@ void Sched_ThreadEntry(void* arg) { } } -void Sched_Init(Scheduler* sc, void* stack, OSPri priority, UNUSED UNK_TYPE arg3, UNUSED UNK_TYPE arg4, IrqMgr* irqMgr) { +void Sched_Init(Scheduler* sc, void* stack, OSPri priority, UNUSED UNK_TYPE arg3, UNUSED UNK_TYPE arg4, + IrqMgr* irqMgr) { bzero(sc, sizeof(Scheduler)); sc->isFirstSwap = true; diff --git a/src/code/z_actor.c b/src/code/z_actor.c index d2d2b644329..b1bbd5a75e2 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -4144,8 +4144,8 @@ void func_80035844(Vec3f* arg0, Vec3f* arg1, Vec3s* arg2, s32 arg3) { /** * Spawns En_Part (Dissipating Flames) actor as a child of the given actor. */ -Actor* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, s32 timer, UNUSED s16* arg5, PlayState* play, - s16 params, Gfx* dList) { +Actor* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, s32 timer, UNUSED s16* arg5, + PlayState* play, s16 params, Gfx* dList) { EnPart* spawnedEnPart; spawnedEnPart = (EnPart*)Actor_SpawnAsChild(&play->actorCtx, actor, play, ACTOR_EN_PART, spawnPos->x, spawnPos->y, diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index 90d32eac8cd..b7582f13dc9 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -652,8 +652,9 @@ f32 BgCheck_RaycastDownStatic(StaticLookup* lookup, CollisionContext* colCtx, u1 * returns true if `wallPolyPtr` was changed * `invXZlength` is 1 / sqrt( sq(poly.normal.x) + sq(poly.normal.z) ) */ -s32 BgCheck_ComputeWallDisplacement(CollisionContext* colCtx, CollisionPoly* poly, f32* posX, f32* posZ, f32 nx, UNUSED f32 ny, - f32 nz, f32 invXZlength, f32 planeDist, f32 radius, CollisionPoly** wallPolyPtr) { +s32 BgCheck_ComputeWallDisplacement(CollisionContext* colCtx, CollisionPoly* poly, f32* posX, f32* posZ, f32 nx, + UNUSED f32 ny, f32 nz, f32 invXZlength, f32 planeDist, f32 radius, + CollisionPoly** wallPolyPtr) { CollisionPoly* wallPoly; u32 surfaceData; u32 hasFlag27; @@ -3512,8 +3513,8 @@ s32 BgCheck_SphVsDynaWall(CollisionContext* colCtx, u16 xpFlags, f32* outX, f32* * `outPoly` returns the poly collided with * `outY` returns the y coordinate needed to not collide with `outPoly` */ -s32 BgCheck_CheckDynaCeilingList(UNUSED CollisionContext* colCtx, u16 xpFlags, DynaCollisionContext* dyna, SSList* ssList, - f32* outY, Vec3f* pos, f32 checkHeight, CollisionPoly** outPoly) { +s32 BgCheck_CheckDynaCeilingList(UNUSED CollisionContext* colCtx, u16 xpFlags, DynaCollisionContext* dyna, + SSList* ssList, f32* outY, Vec3f* pos, f32 checkHeight, CollisionPoly** outPoly) { s16 polyId; SSNode* curNode; CollisionPoly* poly; @@ -4408,8 +4409,8 @@ s32 func_800427B4(CollisionPoly* polyA, CollisionPoly* polyB, Vec3f* pointA, Vec /** * Draw a list of dyna polys, specified by `ssList` */ -void BgCheck_DrawDynaPolyList(PlayState* play, UNUSED CollisionContext* colCtx, DynaCollisionContext* dyna, SSList* ssList, - u8 r, u8 g, u8 b) { +void BgCheck_DrawDynaPolyList(PlayState* play, UNUSED CollisionContext* colCtx, DynaCollisionContext* dyna, + SSList* ssList, u8 r, u8 g, u8 b) { s16 curPolyId; CollisionPoly* poly; SSNode* curNode; diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 3d9ea6165e7..9f8945f42a8 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -272,7 +272,8 @@ s32 Collider_DestroyJntSphElementDim(UNUSED PlayState* play, UNUSED ColliderJntS return true; } -s32 Collider_SetJntSphElementDim(UNUSED PlayState* play, ColliderJntSphElementDim* dest, ColliderJntSphElementDimInit* src) { +s32 Collider_SetJntSphElementDim(UNUSED PlayState* play, ColliderJntSphElementDim* dest, + ColliderJntSphElementDimInit* src) { dest->limb = src->limb; dest->modelSphere = src->modelSphere; dest->scale = src->scale * 0.01f; @@ -2067,7 +2068,8 @@ void CollisionCheck_AC_QuadVsJntSph(PlayState* play, UNUSED CollisionCheckContex /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_CylVsCyl(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_CylVsCyl(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, + Collider* colAC) { ColliderCylinder* at = (ColliderCylinder*)colAT; ColliderCylinder* ac = (ColliderCylinder*)colAC; f32 deadSpace; @@ -2107,7 +2109,8 @@ void CollisionCheck_AC_CylVsCyl(PlayState* play, UNUSED CollisionCheckContext* c /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_CylVsTris(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_CylVsTris(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, + Collider* colAC) { ColliderCylinder* at = (ColliderCylinder*)colAT; ColliderTris* ac = (ColliderTris*)colAC; ColliderTrisElement* acElem; @@ -2143,7 +2146,8 @@ void CollisionCheck_AC_CylVsTris(PlayState* play, UNUSED CollisionCheckContext* /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_TrisVsCyl(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_TrisVsCyl(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, + Collider* colAC) { static Vec3f hitPos; ColliderTris* at = (ColliderTris*)colAT; ColliderTrisElement* atItem; @@ -2178,7 +2182,8 @@ void CollisionCheck_AC_TrisVsCyl(PlayState* play, UNUSED CollisionCheckContext* /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_CylVsQuad(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_CylVsQuad(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, + Collider* colAC) { static TriNorm tri1; static TriNorm tri2; static Vec3f hitPos; @@ -2222,7 +2227,8 @@ static s8 sBssDummy1; /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_QuadVsCyl(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_QuadVsCyl(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, + Collider* colAC) { static TriNorm tri1; static TriNorm tri2; static Vec3f hitPos; @@ -2274,7 +2280,8 @@ static s8 sBssDummy6; /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_TrisVsTris(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_TrisVsTris(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, + Collider* colAC) { static Vec3f hitPos; ColliderTris* at = (ColliderTris*)colAT; ColliderTrisElement* atItem; @@ -2320,7 +2327,8 @@ static s8 sBssDummy10; /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_TrisVsQuad(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_TrisVsQuad(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, + Collider* colAC) { static Vec3f hitPos; static TriNorm tri1; static TriNorm tri2; @@ -2362,7 +2370,8 @@ void CollisionCheck_AC_TrisVsQuad(PlayState* play, UNUSED CollisionCheckContext* /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_QuadVsTris(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_QuadVsTris(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, + Collider* colAC) { static Vec3f hitPos; static TriNorm tri1; static TriNorm tri2; @@ -2410,7 +2419,8 @@ void CollisionCheck_AC_QuadVsTris(PlayState* play, UNUSED CollisionCheckContext* /** * AC overlap check. Calculates the center of each collider element and the point of contact. */ -void CollisionCheck_AC_QuadVsQuad(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, Collider* colAC) { +void CollisionCheck_AC_QuadVsQuad(PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* colAT, + Collider* colAC) { static TriNorm acTris[2]; static Vec3f hitPos; static TriNorm atTris[2]; @@ -2727,7 +2737,8 @@ void CollisionCheck_SetOCvsOC(Collider* left, ColliderInfo* leftInfo, Vec3f* lef /** * OC overlap check for two JntSphs */ -void CollisionCheck_OC_JntSphVsJntSph(UNUSED PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* l, Collider* r) { +void CollisionCheck_OC_JntSphVsJntSph(UNUSED PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* l, + Collider* r) { ColliderJntSph* left = (ColliderJntSph*)l; ColliderJntSphElement* leftElem; ColliderJntSph* right = (ColliderJntSph*)r; @@ -2760,7 +2771,8 @@ void CollisionCheck_OC_JntSphVsJntSph(UNUSED PlayState* play, UNUSED CollisionCh /** * OC overlap check for a JntSph and Cylinder */ -void CollisionCheck_OC_JntSphVsCyl(UNUSED PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* l, Collider* r) { +void CollisionCheck_OC_JntSphVsCyl(UNUSED PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* l, + Collider* r) { ColliderJntSph* left = (ColliderJntSph*)l; ColliderJntSphElement* leftElem; ColliderCylinder* right = (ColliderCylinder*)r; @@ -2796,7 +2808,8 @@ void CollisionCheck_OC_CylVsJntSph(PlayState* play, CollisionCheckContext* colCh /** * OC overlap check for two Cylinders */ -void CollisionCheck_OC_CylVsCyl(UNUSED PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* l, Collider* r) { +void CollisionCheck_OC_CylVsCyl(UNUSED PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* l, + Collider* r) { ColliderCylinder* left = (ColliderCylinder*)l; ColliderCylinder* right = (ColliderCylinder*)r; f32 deadSpace; @@ -3059,8 +3072,8 @@ void CollisionCheck_Damage(PlayState* play, CollisionCheckContext* colChkCtx) { /** * Checks if the line ab intersects any of the ColliderJntSph's elements */ -s32 CollisionCheck_LineOC_JntSph(UNUSED PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* collider, Vec3f* a, - Vec3f* b) { +s32 CollisionCheck_LineOC_JntSph(UNUSED PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* collider, + Vec3f* a, Vec3f* b) { static Linef lineSeg; ColliderJntSph* jntSph = (ColliderJntSph*)collider; s32 i; @@ -3083,8 +3096,8 @@ s32 CollisionCheck_LineOC_JntSph(UNUSED PlayState* play, UNUSED CollisionCheckCo /** * Checks if the line segment ab intersects the ColliderCylinder */ -s32 CollisionCheck_LineOC_Cyl(UNUSED PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* collider, Vec3f* a, - Vec3f* b) { +s32 CollisionCheck_LineOC_Cyl(UNUSED PlayState* play, UNUSED CollisionCheckContext* colChkCtx, Collider* collider, + Vec3f* a, Vec3f* b) { static Vec3f intersectA; static Vec3f intersectB; ColliderCylinder* cylinder = (ColliderCylinder*)collider; diff --git a/src/code/z_demo.c b/src/code/z_demo.c index f125f112551..214e13682a6 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -35,7 +35,7 @@ u16 D_8011E1C4 = 0; typedef void (*CutsceneStateHandler)(PlayState*, CutsceneContext*); -void func_80064720(UNUSED PlayState* play, UNUSED CutsceneContext* csCtx); +void func_80064720(UNUSED PlayState* play, UNUSED CutsceneContext* csCtx); void func_80064760(PlayState* play, CutsceneContext* csCtx); void func_800647C0(PlayState* play, CutsceneContext* csCtx); void func_80068C3C(PlayState* play, CutsceneContext* csCtx); diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index a46ae358eec..eb26e028825 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -1449,8 +1449,8 @@ void Environment_DrawSunAndMoon(PlayState* play) { CLOSE_DISPS(play->state.gfxCtx, "../z_kankyo.c", 2429); } -void Environment_DrawSunLensFlare(PlayState* play, UNUSED EnvironmentContext* envCtx, UNUSED View* view, UNUSED GraphicsContext* gfxCtx, - Vec3f pos, UNUSED s32 arg5) { +void Environment_DrawSunLensFlare(PlayState* play, UNUSED EnvironmentContext* envCtx, UNUSED View* view, + UNUSED GraphicsContext* gfxCtx, Vec3f pos, UNUSED s32 arg5) { if ((play->envCtx.precipitation[PRECIP_RAIN_CUR] == 0) && (play->envCtx.skyboxConfig == 0)) { Environment_DrawLensFlare(play, &play->envCtx, &play->view, play->state.gfxCtx, pos, 2000, 370, Math_CosS(((void)0, gSaveContext.dayTime) - CLOCK_TIME(12, 0)) * 120.0f, 400, true); diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index b5311f7f544..7f53ff46f04 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -3063,7 +3063,8 @@ void Interface_Draw(PlayState* play) { static s16 magicArrowEffectsB[] = { 0, 255, 100 }; static s16 timerDigitLeftPos[] = { 16, 25, 34, 42, 51 }; static s16 digitWidth[] = { 9, 9, 8, 9, 9 }; - UNUSED static s16 D_80125B1C[][3] = { // most likely colors + UNUSED static s16 D_80125B1C[][3] = { + // most likely colors { 0, 150, 0 }, { 100, 255, 0 }, { 255, 255, 255 }, { 0, 0, 0 }, { 255, 255, 255 }, }; static s16 rupeeDigitsFirst[] = { 1, 0, 0 }; diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 99eadb813f9..ed123fbedfb 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -1667,7 +1667,8 @@ u8 sPauseModelGroupBySword[] = { PLAYER_MODELGROUP_BGS, // PLAYER_SWORD_BGS }; -s32 Player_OverrideLimbDrawPause(UNUSED PlayState* play, s32 limbIndex, Gfx** dList, UNUSED Vec3f* pos, UNUSED Vec3s* rot, void* arg) { +s32 Player_OverrideLimbDrawPause(UNUSED PlayState* play, s32 limbIndex, Gfx** dList, UNUSED Vec3f* pos, + UNUSED Vec3s* rot, void* arg) { u8* playerSwordAndShield = arg; //! @bug `playerSwordAndShield[0]` can be 0 (`PLAYER_SWORD_NONE`), which indexes `sPauseModelGroupBySword[-1]`. //! The result happens to be 0 (`PLAYER_MODELGROUP_0`) in vanilla, but weird values are likely to cause a crash. diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 58cee934133..84c78f39c81 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -1370,8 +1370,8 @@ s32 LinkAnimation_OnFrame(SkelAnime* skelAnime, f32 frame) { * Initializes a normal skeleton to a looping animation, dynamically allocating the frame tables if not provided. */ BAD_RETURN(s32) -SkelAnime_Init(UNUSED PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, AnimationHeader* animation, - Vec3s* jointTable, Vec3s* morphTable, s32 limbCount) { +SkelAnime_Init(UNUSED PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, + AnimationHeader* animation, Vec3s* jointTable, Vec3s* morphTable, s32 limbCount) { SkeletonHeader* skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); skelAnime->limbCount = skeletonHeader->limbCount + 1; diff --git a/src/code/z_vismono.c b/src/code/z_vismono.c index feec1c98fdb..4339f8ab42b 100644 --- a/src/code/z_vismono.c +++ b/src/code/z_vismono.c @@ -42,7 +42,7 @@ void VisMono_Destroy(VisMono* this) { SystemArena_FreeDebug(this->dList, "../z_vismono.c", 137); } -void VisMono_DesaturateTLUT(UNUSED VisMono* this, u16* tlut) { +void VisMono_DesaturateTLUT(UNUSED VisMono* this, u16* tlut) { s32 i; for (i = 0; i < 256; i++) { diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c index 6e138f27730..b7b169a5906 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c @@ -11,7 +11,7 @@ void BgGndDarkmeiro_Init(Actor* thisx, PlayState* play2); void BgGndDarkmeiro_Destroy(Actor* thisx, PlayState* play2); -void BgGndDarkmeiro_Update(Actor* thisx, PlayState* play2); +void BgGndDarkmeiro_Update(Actor* thisx, PlayState* play); void BgGndDarkmeiro_DrawInvisiblePath(Actor* thisx, PlayState* play); void BgGndDarkmeiro_DrawSwitchBlock(Actor* thisx, PlayState* play); void BgGndDarkmeiro_DrawStaticBlock(Actor* thisx, PlayState* play); From 65033c5f188d9bfd6e316eec9e2a84ab67524d18 Mon Sep 17 00:00:00 2001 From: Thar0 <17233964+Thar0@users.noreply.github.com> Date: Sun, 30 Oct 2022 16:34:58 +0000 Subject: [PATCH 08/14] Check unused parameter on gamestate overlays and pause menu Co-authored-by: Dragorn421 --- Makefile | 5 ++++- src/overlays/gamestates/ovl_file_choose/z_file_choose.c | 6 +++--- src/overlays/gamestates/ovl_opening/z_opening.c | 4 ++-- src/overlays/gamestates/ovl_select/z_select.c | 8 ++++---- src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c | 4 ++-- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 95cd521135e..bef97feae3b 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,10 @@ INC := -Iinclude -Isrc -Ibuild -I. # Check code syntax with host compiler CHECK_WARNINGS := -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -Wno-missing-braces -build/src/overlays/%.o: CHECK_WARNINGS += -Wno-unused-parameter +# Actors and effets are mostly callback functions and often don't use all arguments, +# ignore those warnings entirely instead of bloating their source with UNUSED. +build/src/overlays/actors/%.o: CHECK_WARNINGS += -Wno-unused-parameter +build/src/overlays/effects/%.o: CHECK_WARNINGS += -Wno-unused-parameter CPP := cpp MKLDSCRIPT := tools/mkldscript diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index 0fe41e9ac86..ecc2847b620 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -64,7 +64,7 @@ void FileSelect_InitModeUpdate(GameState* thisx) { } } -void FileSelect_InitModeDraw(GameState* thisx) { +void FileSelect_InitModeDraw(UNUSED GameState* thisx) { } /** @@ -281,7 +281,7 @@ void FileSelect_UpdateMainMenu(GameState* thisx) { /** * Update function for `CM_UNUSED_31` */ -void FileSelect_UnusedCM31(GameState* thisx) { +void FileSelect_UnusedCM31(UNUSED GameState* thisx) { } /** @@ -1865,7 +1865,7 @@ void FileSelect_InitContext(GameState* thisx) { } } -void FileSelect_Destroy(GameState* thisx) { +void FileSelect_Destroy(UNUSED GameState* thisx) { } void FileSelect_Init(GameState* thisx) { diff --git a/src/overlays/gamestates/ovl_opening/z_opening.c b/src/overlays/gamestates/ovl_opening/z_opening.c index e0d91871b65..2ab1a00fc01 100644 --- a/src/overlays/gamestates/ovl_opening/z_opening.c +++ b/src/overlays/gamestates/ovl_opening/z_opening.c @@ -16,7 +16,7 @@ void TitleSetup_SetupTitleScreen(TitleSetupState* this) { SET_NEXT_GAMESTATE(&this->state, Play_Init, PlayState); } -void func_80803C5C(TitleSetupState* this) { +void func_80803C5C(UNUSED TitleSetupState* this) { } void TitleSetup_Main(GameState* thisx) { @@ -27,7 +27,7 @@ void TitleSetup_Main(GameState* thisx) { func_80803C5C(this); } -void TitleSetup_Destroy(GameState* thisx) { +void TitleSetup_Destroy(UNUSED GameState* thisx) { } void TitleSetup_Init(GameState* thisx) { diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index fe3ebea74eb..67622fc2abc 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -566,7 +566,7 @@ static const char* sLoadingMessages[] = { GFXP_HIRAGANA "ｱﾜﾃﾅｲｱﾜﾃﾅｲ｡ﾋﾄﾔｽﾐﾋﾄﾔｽﾐ｡", }; -void MapSelect_PrintLoadingMessage(MapSelectState* this, GfxPrint* printer) { +void MapSelect_PrintLoadingMessage(UNUSED MapSelectState* this, GfxPrint* printer) { s32 randomMsg; GfxPrint_SetPos(printer, 10, 15); @@ -580,13 +580,13 @@ static const char* sAgeLabels[] = { GFXP_HIRAGANA "5(ﾜｶｽｷﾞ)", // "5(very young)" }; -void MapSelect_PrintAgeSetting(MapSelectState* this, GfxPrint* printer, s32 age) { +void MapSelect_PrintAgeSetting(UNUSED MapSelectState* this, GfxPrint* printer, s32 age) { GfxPrint_SetPos(printer, 4, 26); GfxPrint_SetColor(printer, 255, 255, 55, 255); GfxPrint_Printf(printer, "Age:%s", sAgeLabels[age]); } -void MapSelect_PrintCutsceneSetting(MapSelectState* this, GfxPrint* printer, u16 csIndex) { +void MapSelect_PrintCutsceneSetting(UNUSED MapSelectState* this, GfxPrint* printer, u16 csIndex) { char* label; GfxPrint_SetPos(printer, 4, 25); @@ -715,7 +715,7 @@ void MapSelect_Main(GameState* thisx) { MapSelect_Draw(this); } -void MapSelect_Destroy(GameState* thisx) { +void MapSelect_Destroy(UNUSED GameState* thisx) { osSyncPrintf("%c", BEL); // "view_cleanup will hang, so it won't be called" osSyncPrintf("*** view_cleanupはハングアップするので、呼ばない ***\n"); diff --git a/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c index 049c7445fb8..3e247cbcd4c 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c @@ -34,13 +34,13 @@ static const u32 sLineBytesImageSizes[] = { 0, 1, 2, 2 }; extern PauseMapMarksData gPauseMapMarkDataTable[]; -void PauseMapMark_Init(PlayState* play) { +void PauseMapMark_Init(UNUSED PlayState* play) { gBossMarkState = 0; gBossMarkScale = 1.0f; gLoadedPauseMarkDataTable = gPauseMapMarkDataTable; } -void PauseMapMark_Clear(PlayState* play) { +void PauseMapMark_Clear(UNUSED PlayState* play) { gLoadedPauseMarkDataTable = NULL; } From b23e049b43e69be01cf0e9ee3bd2566005626b42 Mon Sep 17 00:00:00 2001 From: Thar0 <17233964+Thar0@users.noreply.github.com> Date: Tue, 1 Nov 2022 19:01:34 +0000 Subject: [PATCH 09/14] Merge 2x u8 stack pads into 1x s16 stack pad in en_ik --- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 95634fb3355..4a8657c86ae 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -660,8 +660,7 @@ void func_80A75A38(EnIk* this, PlayState* play) { void func_80A75C38(EnIk* this, PlayState* play) { f32 temp_f0; - STACK_PAD(u8); - STACK_PAD(u8); + STACK_PAD(s16); u8 prevHealth; STACK_PAD(s32); Vec3f sp38; From 6e4c5315713fd083ed5b0bb7fe4cc7920cfb11c1 Mon Sep 17 00:00:00 2001 From: Thar0 <17233964+Thar0@users.noreply.github.com> Date: Wed, 2 Nov 2022 22:55:52 +0000 Subject: [PATCH 10/14] Remove UNUSED from function prototypes --- include/functions.h | 230 ++++++++++++++++++------------------- include/sched.h | 2 +- include/z64curve.h | 11 +- src/code/audio_load.c | 10 +- src/code/audio_synthesis.c | 4 +- src/code/z_demo.c | 2 +- src/code/z_en_a_keep.c | 16 +-- src/code/z_en_item00.c | 2 +- 8 files changed, 138 insertions(+), 139 deletions(-) diff --git a/include/functions.h b/include/functions.h index 0cfa9187271..4576533919c 100644 --- a/include/functions.h +++ b/include/functions.h @@ -28,8 +28,8 @@ void DmaMgr_Error(DmaRequest* req, const char* file, const char* errorName, cons const char* DmaMgr_GetFileNameImpl(uintptr_t vrom); const char* DmaMgr_GetFileName(uintptr_t vrom); void DmaMgr_ProcessMsg(DmaRequest* req); -void DmaMgr_ThreadEntry(UNUSED void* arg); -s32 DmaMgr_SendRequestImpl(DmaRequest* req, void* ram, uintptr_t vrom, u32 size, UNUSED u32 unk, OSMesgQueue* queue, OSMesg msg); +void DmaMgr_ThreadEntry(void* arg); +s32 DmaMgr_SendRequestImpl(DmaRequest* req, void* ram, uintptr_t vrom, u32 size, u32 unk, OSMesgQueue* queue, OSMesg msg); s32 DmaMgr_SendRequest0(void* ram, uintptr_t vrom, u32 size); void DmaMgr_Init(void); s32 DmaMgr_SendRequest2(DmaRequest* req, void* ram, uintptr_t vrom, u32 size, u32 unk5, OSMesgQueue* queue, OSMesg msg, @@ -49,7 +49,7 @@ void isPrintfInit(void); void osSyncPrintfUnused(const char* fmt, ...); void osSyncPrintf(const char* fmt, ...); void rmonPrintf(const char* fmt, ...); -void* is_proutSyncPrintf(UNUSED void* arg, const char* str, u32 count); +void* is_proutSyncPrintf(void* arg, const char* str, u32 count); void func_80002384(const char* exp, const char* file, u32 line); OSPiHandle* osDriveRomInit(void); void Mio0_Decompress(Yaz0Header* hdr, u8* dst); @@ -165,7 +165,7 @@ void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2); void EffectBlure_AddSpace(EffectBlure* this); void EffectBlure_Init1(void* thisx, void* initParamsx); void EffectBlure_Init2(void* thisx, void* initParamsx); -void EffectBlure_Destroy(UNUSED void* thisx); +void EffectBlure_Destroy(void* thisx); s32 EffectBlure_Update(void* thisx); void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx); void EffectShieldParticle_Init(void* thisx, void* initParamsx); @@ -173,7 +173,7 @@ void EffectShieldParticle_Destroy(void* thisx); s32 EffectShieldParticle_Update(void* thisx); void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx); void EffectSpark_Init(void* thisx, void* initParamsx); -void EffectSpark_Destroy(UNUSED void* thisx); +void EffectSpark_Destroy(void* thisx); s32 EffectSpark_Update(void* thisx); void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx); void func_80026230(PlayState* play, Color_RGBA8* color, s16 arg2, s16 arg3); @@ -188,10 +188,10 @@ void Effect_InitContext(PlayState* play); void Effect_Add(PlayState* play, s32* pIndex, s32 type, u8 arg3, u8 arg4, void* initParams); void Effect_DrawAll(GraphicsContext* gfxCtx); void Effect_UpdateAll(PlayState* play); -void Effect_Delete(UNUSED PlayState* play, s32 index); -void Effect_DeleteAll(UNUSED PlayState* play); +void Effect_Delete(PlayState* play, s32 index); +void Effect_DeleteAll(PlayState* play); void EffectSs_InitInfo(PlayState* play, s32 tableSize); -void EffectSs_ClearAll(UNUSED PlayState* play); +void EffectSs_ClearAll(PlayState* play); void EffectSs_Delete(EffectSs* effectSs); void EffectSs_Reset(EffectSs* effectSs); void EffectSs_Insert(PlayState* play, EffectSs* effectSs); @@ -363,7 +363,7 @@ void Flags_SetTempClear(PlayState* play, s32 flag); void Flags_UnsetTempClear(PlayState* play, s32 flag); s32 Flags_GetCollectible(PlayState* play, s32 flag); void Flags_SetCollectible(PlayState* play, s32 flag); -void TitleCard_InitBossName(UNUSED PlayState* play, TitleCardContext* titleCtx, void* texture, s16 x, s16 y, u8 width, +void TitleCard_InitBossName(PlayState* play, TitleCardContext* titleCtx, void* texture, s16 x, s16 y, u8 width, u8 height); void TitleCard_InitPlaceName(PlayState* play, TitleCardContext* titleCtx, void* texture, s32 x, s32 y, s32 width, s32 height, s32 delay); @@ -395,8 +395,8 @@ s32 func_8002DD78(Player* player); s32 func_8002DDE4(PlayState* play); s32 func_8002DDF4(PlayState* play); void func_8002DE04(PlayState* play, Actor* actorA, Actor* actorB); -void func_8002DE74(PlayState* play, UNUSED Player* player); -void Actor_MountHorse(UNUSED PlayState* play, Player* player, Actor* horse); +void func_8002DE74(PlayState* play, Player* player); +void Actor_MountHorse(PlayState* play, Player* player, Actor* horse); s32 func_8002DEEC(Player* player); void func_8002DF18(PlayState* play, Player* player); s32 func_8002DF38(PlayState* play, Actor* actor, u8 csMode); @@ -419,25 +419,25 @@ PosRot* Actor_GetFocus(PosRot* dest, Actor* actor); PosRot* Actor_GetWorld(PosRot* dest, Actor* actor); PosRot* Actor_GetWorldPosShapeRot(PosRot* arg0, Actor* actor); s32 func_8002F0C8(Actor* actor, Player* player, s32 flag); -u32 Actor_ProcessTalkRequest(Actor* actor, UNUSED PlayState* play); +u32 Actor_ProcessTalkRequest(Actor* actor, PlayState* play); s32 func_8002F1C4(Actor* actor, PlayState* play, f32 arg2, f32 arg3, u32 exchangeItemId); s32 func_8002F298(Actor* actor, PlayState* play, f32 arg2, u32 exchangeItemId); s32 func_8002F2CC(Actor* actor, PlayState* play, f32 arg2); s32 func_8002F2F4(Actor* actor, PlayState* play); -u32 Actor_TextboxIsClosing(UNUSED Actor* actor, PlayState* play); +u32 Actor_TextboxIsClosing(Actor* actor, PlayState* play); s8 func_8002F368(PlayState* play); void Actor_GetScreenPos(PlayState* play, Actor* actor, s16* x, s16* y); -u32 Actor_HasParent(Actor* actor, UNUSED PlayState* play); +u32 Actor_HasParent(Actor* actor, PlayState* play); s32 func_8002F434(Actor* actor, PlayState* play, s32 getItemId, f32 xzRange, f32 yRange); void func_8002F554(Actor* actor, PlayState* play, s32 getItemId); void func_8002F580(Actor* actor, PlayState* play); -u32 Actor_HasNoParent(Actor* actor, UNUSED PlayState* play); -void func_8002F5C4(Actor* actorA, Actor* actorB, UNUSED PlayState* play); +u32 Actor_HasNoParent(Actor* actor, PlayState* play); +void func_8002F5C4(Actor* actorA, Actor* actorB, PlayState* play); void func_8002F5F0(Actor* actor, PlayState* play); -s32 Actor_IsMounted(UNUSED PlayState* play, Actor* horse); +s32 Actor_IsMounted(PlayState* play, Actor* horse); u32 Actor_SetRideActor(PlayState* play, Actor* horse, s32 mountSide); -s32 Actor_NotMounted(UNUSED PlayState* play, Actor* horse); -void func_8002F698(PlayState* play, UNUSED Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6); +s32 Actor_NotMounted(PlayState* play, Actor* horse); +void func_8002F698(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6); void func_8002F6D4(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5); void func_8002F71C(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4); void func_8002F758(PlayState* play, Actor* actor, f32 arg2, s16 arg3, f32 arg4, u32 arg5); @@ -454,7 +454,7 @@ s32 func_8002F9EC(PlayState* play, Actor* actor, CollisionPoly* poly, s32 bgId, void Actor_DisableLens(PlayState* play); void Actor_InitContext(PlayState* play, ActorContext* actorCtx, ActorEntry* playerEntry); void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx); -s32 func_800314D4(UNUSED PlayState* play, Actor* actor, Vec3f* arg2, f32 arg3); +s32 func_800314D4(PlayState* play, Actor* actor, Vec3f* arg2, f32 arg3); void func_800315AC(PlayState* play, ActorContext* actorCtx); void func_80031A28(PlayState* play, ActorContext* actorCtx); void func_80031B14(PlayState* play, ActorContext* actorCtx); @@ -470,7 +470,7 @@ Actor* func_80032AF0(PlayState* play, ActorContext* actorCtx, Actor** actorPtr, Actor* Actor_Find(ActorContext* actorCtx, s32 actorId, s32 actorCategory); void Enemy_StartFinishingBlow(PlayState* play, Actor* actor); s16 func_80032CB4(s16* arg0, s16 arg1, s16 arg2, s16 arg3); -void BodyBreak_Alloc(BodyBreak* bodyBreak, s32 count, UNUSED PlayState* play); +void BodyBreak_Alloc(BodyBreak* bodyBreak, s32 count, PlayState* play); void BodyBreak_SetInfo(BodyBreak* bodyBreak, s32 limbIndex, s32 minLimbIndex, s32 maxLimbIndex, u32 count, Gfx** dList, s16 objectId); s32 BodyBreak_SpawnParts(Actor* actor, BodyBreak* bodyBreak, PlayState* play, s16 type); @@ -478,7 +478,7 @@ void Actor_SpawnFloorDustRing(PlayState* play, Actor* actor, Vec3f* posXZ, f32 r f32 randAccelWeight, s16 scale, s16 scaleStep, u8 useLighting); void func_80033480(PlayState* play, Vec3f* posBase, f32 randRangeDiameter, s32 amountMinusOne, s16 scaleBase, s16 scaleStep, u8 arg6); -Actor* Actor_GetCollidedExplosive(UNUSED PlayState* play, Collider* collider); +Actor* Actor_GetCollidedExplosive(PlayState* play, Collider* collider); Actor* func_80033684(PlayState* play, Actor* explosiveActor); Actor* Actor_GetProjectileActor(PlayState* play, Actor* refActor, f32 radius); void Actor_ChangeCategory(PlayState* play, ActorContext* actorCtx, Actor* actor, u8 actorCategory); @@ -509,7 +509,7 @@ void func_80034CC4(PlayState* play, SkelAnime* skelAnime, OverrideLimbDraw overr s16 func_80034DD4(Actor* actor, PlayState* play, s16 arg2, f32 arg3); void Animation_ChangeByInfo(SkelAnime* skelAnime, AnimationInfo* animationInfo, s32 index); void func_80034F54(PlayState* play, s16* arg1, s16* arg2, s32 arg3); -void Actor_Noop(UNUSED Actor* actor, UNUSED PlayState* play); +void Actor_Noop(Actor* actor, PlayState* play); void Gfx_DrawDListOpa(PlayState* play, Gfx* dlist); void Gfx_DrawDListXlu(PlayState* play, Gfx* dlist); Actor* Actor_FindNearby(PlayState* play, Actor* refActor, s16 actorId, u8 actorCategory, f32 range); @@ -521,7 +521,7 @@ u8 Actor_ApplyDamage(Actor* actor); void Actor_SetDropFlag(Actor* actor, ColliderInfo* colInfo, s32 freezeFlag); void Actor_SetDropFlagJntSph(Actor* actor, ColliderJntSph* jntSph, s32 freezeFlag); void func_80035844(Vec3f* arg0, Vec3f* arg1, Vec3s* arg2, s32 arg3); -Actor* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, s32 timer, UNUSED s16* arg5, +Actor* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, f32* arg3, s32 timer, s16* arg5, PlayState* play, s16 params, Gfx* dList); void func_800359B8(Actor* actor, s16 arg1, Vec3s* arg2); s32 Flags_GetEventChkInf(s32 flag); @@ -587,13 +587,13 @@ s32 BgCheck_AnyLineTest3(CollisionContext* colCtx, Vec3f* posA, Vec3f* posB, Vec s32 chkWall, s32 chkFloor, s32 chkCeil, s32 chkOneFace, s32* bgId); s32 BgCheck_SphVsFirstPoly(CollisionContext* colCtx, Vec3f* center, f32 radius); s32 DynaPoly_IsBgIdBgActor(s32 bgId); -void DynaPoly_DisableCollision(UNUSED PlayState* play, DynaCollisionContext* dyna, s32 bgId); -void DynaPoly_EnableCollision(UNUSED PlayState* play, DynaCollisionContext* dyna, s32 bgId); -void DynaPoly_DisableCeilingCollision(UNUSED PlayState* play, DynaCollisionContext* dyna, s32 bgId); -s32 DynaPoly_SetBgActor(UNUSED PlayState* play, DynaCollisionContext* dyna, Actor* actor, CollisionHeader* colHeader); +void DynaPoly_DisableCollision(PlayState* play, DynaCollisionContext* dyna, s32 bgId); +void DynaPoly_EnableCollision(PlayState* play, DynaCollisionContext* dyna, s32 bgId); +void DynaPoly_DisableCeilingCollision(PlayState* play, DynaCollisionContext* dyna, s32 bgId); +s32 DynaPoly_SetBgActor(PlayState* play, DynaCollisionContext* dyna, Actor* actor, CollisionHeader* colHeader); DynaPolyActor* DynaPoly_GetActor(CollisionContext* colCtx, s32 bgId); void DynaPoly_DeleteBgActor(PlayState* play, DynaCollisionContext* dyna, s32 bgId); -void DynaPoly_InvalidateLookup(UNUSED PlayState* play, DynaCollisionContext* dyna); +void DynaPoly_InvalidateLookup(PlayState* play, DynaCollisionContext* dyna); void DynaPoly_UnsetAllInteractFlags(PlayState* play, DynaCollisionContext* dyna, Actor* actor); void DynaPoly_UpdateContext(PlayState* play, DynaCollisionContext* dyna); void DynaPoly_UpdateBgActorTransforms(PlayState* play, DynaCollisionContext* dyna); @@ -633,9 +633,9 @@ s32 WaterBox_GetSurface2(PlayState* play, CollisionContext* colCtx, Vec3f* pos, WaterBox** outWaterBox); s32 WaterBox_GetSurfaceImpl(PlayState* play, CollisionContext* colCtx, f32 x, f32 z, f32* ySurface, WaterBox** outWaterBox); -u32 WaterBox_GetBgCamIndex(UNUSED CollisionContext* colCtx, WaterBox* waterBox); +u32 WaterBox_GetBgCamIndex(CollisionContext* colCtx, WaterBox* waterBox); u16 WaterBox_GetBgCamSetting(CollisionContext* colCtx, WaterBox* waterBox); -u32 WaterBox_GetLightIndex(UNUSED CollisionContext* colCtx, WaterBox* waterBox); +u32 WaterBox_GetLightIndex(CollisionContext* colCtx, WaterBox* waterBox); s32 func_80042708(CollisionPoly* polyA, CollisionPoly* polyB, Vec3f* point, Vec3f* closestPoint); s32 func_800427B4(CollisionPoly* polyA, CollisionPoly* polyB, Vec3f* pointA, Vec3f* pointB, Vec3f* closestPoint); void BgCheck_DrawDynaCollision(PlayState*, CollisionContext*); @@ -653,7 +653,7 @@ s32 DynaPolyActor_IsPlayerOnTop(DynaPolyActor* dynaActor); s32 DynaPolyActor_IsPlayerAbove(DynaPolyActor* dynaActor); s32 func_800435B4(DynaPolyActor* dynaActor); s32 func_800435D8(PlayState* play, DynaPolyActor* dynaActor, s16 arg2, s16 arg3, s16 arg4); -void Camera_Init(Camera* camera, UNUSED View* view, UNUSED CollisionContext* colCtx, PlayState* play); +void Camera_Init(Camera* camera, View* view, CollisionContext* colCtx, PlayState* play); void Camera_InitPlayerSettings(Camera* camera, Player* player); s16 Camera_ChangeStatus(Camera* camera, s16 status); Vec3s Camera_Update(Camera* camera); @@ -666,7 +666,7 @@ s16 Camera_GetInputDirYaw(Camera* camera); Vec3s* Camera_GetCamDir(Vec3s* dst, Camera* camera); s16 Camera_GetCamDirPitch(Camera* camera); s16 Camera_GetCamDirYaw(Camera* camera); -s32 Camera_RequestQuake(Camera* camera, UNUSED s32 unused, s16 y, s32 duration); +s32 Camera_RequestQuake(Camera* camera, s32 unused, s16 y, s32 duration); s32 Camera_SetParam(Camera* camera, s32 param, void* value); s32 func_8005AC48(Camera* camera, s16 arg1); s16 func_8005ACFC(Camera* camera, s16 arg1); @@ -674,12 +674,12 @@ s16 func_8005AD1C(Camera* camera, s16 arg1); s32 Camera_ResetAnim(Camera* camera); s32 Camera_SetCSParams(Camera* camera, CutsceneCameraPoint* atPoints, CutsceneCameraPoint* eyePoints, Player* player, s16 relativeToPlayer); -s32 Camera_ChangeDoorCam(Camera* camera, Actor* doorActor, s16 bgCamIndex, UNUSED f32 arg3, s16 timer1, s16 timer2, +s32 Camera_ChangeDoorCam(Camera* camera, Actor* doorActor, s16 bgCamIndex, f32 arg3, s16 timer1, s16 timer2, s16 timer3); s32 Camera_Copy(Camera* dstCamera, Camera* srcCamera); Vec3f* Camera_GetQuakeOffset(Vec3f* quakeOffset, Camera* camera); void Camera_SetCameraData(Camera* camera, s16 setDataFlags, void* data0, void* data1, s16 data2, s16 data3, - UNUSED UNK_TYPE arg6); + UNK_TYPE arg6); s32 func_8005B198(void); s16 func_8005B1A4(Camera* camera); DamageTable* DamageTable_Get(s32 index); @@ -775,7 +775,7 @@ u8 CollisionCheck_GetSwordDamage(s32 dmgFlags); void SaveContext_Init(void); s32 func_800635D0(s32); void Regs_Init(void); -void func_8006375C(UNUSED s32 arg0, UNUSED s32 arg1, UNUSED const char* text); +void func_8006375C(s32 arg0, s32 arg1, const char* text); void func_8006376C(u8 x, u8 y, u8 colorIndex, const char* text); void Regs_UpdateEditor(Input* input); void func_80063D7C(GraphicsContext* gfxCtx); @@ -784,9 +784,9 @@ DebugDispObject* DebugDisplay_AddObject(f32 posX, f32 posY, f32 posZ, s16 rotX, f32 scaleY, f32 scaleZ, u8 red, u8 green, u8 blue, u8 alpha, s16 type, GraphicsContext* gfxCtx); void DebugDisplay_DrawObjects(PlayState* play); -void func_8006450C(UNUSED PlayState* play, CutsceneContext* csCtx); -void func_80064520(UNUSED PlayState* play, CutsceneContext* csCtx); -void func_80064534(UNUSED PlayState* play, CutsceneContext* csCtx); +void func_8006450C(PlayState* play, CutsceneContext* csCtx); +void func_80064520(PlayState* play, CutsceneContext* csCtx); +void func_80064534(PlayState* play, CutsceneContext* csCtx); void func_80064558(PlayState* play, CutsceneContext* csCtx); void func_800645A0(PlayState* play, CutsceneContext* csCtx); void Cutscene_HandleEntranceTriggers(PlayState* play); @@ -805,8 +805,8 @@ void Flags_SetEnv(PlayState* play, s16 flag); void Flags_UnsetEnv(PlayState* play, s16 flag); s32 Flags_GetEnv(PlayState* play, s16 flag); s32 func_8006CFC0(s32 sceneId); -void func_8006D074(UNUSED PlayState* play); -void func_8006D0AC(UNUSED PlayState* play); +void func_8006D074(PlayState* play); +void func_8006D0AC(PlayState* play); void func_8006D0EC(PlayState* play, Player* player); void func_8006D684(PlayState* play, Player* player); void func_8006DC68(PlayState* play, Player* player); @@ -814,15 +814,15 @@ void func_8006DD9C(Actor* actor, Vec3f* arg1, s16 arg2); s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize); void KaleidoSetup_Update(PlayState* play); void KaleidoSetup_Init(PlayState* play); -void KaleidoSetup_Destroy(UNUSED PlayState* play); -void func_8006EE50(UNUSED Font* font, UNUSED u16 arg1, UNUSED u16 arg2); +void KaleidoSetup_Destroy(PlayState* play); +void func_8006EE50(Font* font, u16 arg1, u16 arg2); void Font_LoadChar(Font* font, u8 character, u16 codePointIndex); void Font_LoadMessageBoxIcon(Font* font, u16 icon); void Font_LoadOrderedFont(Font* font); s32 Environment_ZBufValToFixedPoint(s32 zBufferVal); u16 Environment_GetPixelDepth(s32 x, s32 y); -void Environment_GraphCallback(UNUSED GraphicsContext* gfxCtx, void* param); -void Environment_Init(PlayState* play2, EnvironmentContext* envCtx, UNUSED s32 arg2); +void Environment_GraphCallback(GraphicsContext* gfxCtx, void* param); +void Environment_Init(PlayState* play2, EnvironmentContext* envCtx, s32 arg2); u8 Environment_SmoothStepToU8(u8* pvalue, u8 target, u8 scale, u8 step, u8 minStep); u8 Environment_SmoothStepToS8(s8* pvalue, s8 target, u8 scale, u8 step, u8 minStep); f32 Environment_LerpWeight(u16 max, u16 min, u16 val); @@ -832,19 +832,19 @@ void Environment_EnableUnderwaterLights(PlayState* play, s32 waterLightsIndex); void Environment_DisableUnderwaterLights(PlayState* play); void Environment_Update(PlayState* play, EnvironmentContext* envCtx, LightContext* lightCtx, PauseContext* pauseCtx, MessageContext* msgCtx, GameOverContext* gameOverCtx, - UNUSED GraphicsContext* gfxCtx); + GraphicsContext* gfxCtx); void Environment_DrawSunAndMoon(PlayState* play); -void Environment_DrawSunLensFlare(PlayState* play, UNUSED EnvironmentContext* envCtx, UNUSED View* view, - UNUSED GraphicsContext* gfxCtx, Vec3f pos, UNUSED s32 arg5); +void Environment_DrawSunLensFlare(PlayState* play, EnvironmentContext* envCtx, View* view, + GraphicsContext* gfxCtx, Vec3f pos, s32 arg5); void Environment_DrawLensFlare(PlayState* play, EnvironmentContext* envCtx, View* view, - GraphicsContext* gfxCtx, Vec3f pos, UNUSED s32 arg5, s16 scale, f32 colorIntensity, + GraphicsContext* gfxCtx, Vec3f pos, s32 arg5, s16 scale, f32 colorIntensity, s16 glareStrength, u8 isSun); void Environment_DrawRain(PlayState* play, View* view, GraphicsContext* gfxCtx); void Environment_ChangeLightSetting(PlayState* play, u32 lightSetting); void Environment_DrawSkyboxFilters(PlayState* play); void Environment_UpdateLightningStrike(PlayState* play); -void Environment_AddLightningBolts(UNUSED PlayState* play, u8 num); -void Environment_DrawLightning(PlayState* play, UNUSED s32 arg1); +void Environment_AddLightningBolts(PlayState* play, u8 num); +void Environment_DrawLightning(PlayState* play, s32 arg1); void Environment_PlaySceneSequence(PlayState* play); void Environment_DrawCustomLensFlare(PlayState* play); void Environment_InitGameOverLights(PlayState* play); @@ -913,10 +913,10 @@ void LightContext_Init(PlayState* play, LightContext* lightCtx); void LightContext_SetAmbientColor(LightContext* lightCtx, u8 r, u8 g, u8 b); void LightContext_SetFog(LightContext* lightCtx, u8 r, u8 g, u8 b, s16 fogNear, s16 fogFar); Lights* LightContext_NewLights(LightContext* lightCtx, GraphicsContext* gfxCtx); -void LightContext_InitList(UNUSED PlayState* play, LightContext* lightCtx); +void LightContext_InitList(PlayState* play, LightContext* lightCtx); void LightContext_DestroyList(PlayState* play, LightContext* lightCtx); -LightNode* LightContext_InsertLight(UNUSED PlayState* play, LightContext* lightCtx, LightInfo* info); -void LightContext_RemoveLight(UNUSED PlayState* play, LightContext* lightCtx, LightNode* node); +LightNode* LightContext_InsertLight(PlayState* play, LightContext* lightCtx, LightInfo* info); +void LightContext_RemoveLight(PlayState* play, LightContext* lightCtx, LightNode* node); Lights* Lights_NewAndDraw(GraphicsContext* gfxCtx, u8 ambientR, u8 ambientG, u8 ambientB, u8 numLights, u8 r, u8 g, u8 b, s8 x, s8 y, s8 z); Lights* Lights_New(GraphicsContext* gfxCtx, u8 ambientR, u8 ambientG, u8 ambientB); @@ -939,7 +939,7 @@ void ZeldaArena_Init(void* start, u32 size); void ZeldaArena_Cleanup(void); u8 ZeldaArena_IsInitialized(void); void MapMark_Init(PlayState* play); -void MapMark_ClearPointers(UNUSED PlayState* play); +void MapMark_ClearPointers(PlayState* play); void MapMark_Draw(PlayState* play); void PreNmiBuff_Init(PreNmiBuff* this); void PreNmiBuff_SetReset(PreNmiBuff* this); @@ -962,7 +962,7 @@ s32 OnePointCutscene_AttentionSetSfx(PlayState* play, Actor* actor, s32 sfxId); void OnePointCutscene_EnableAttention(void); void OnePointCutscene_DisableAttention(void); s32 OnePointCutscene_CheckForCategory(PlayState* play, s32 actorCategory); -void OnePointCutscene_Noop(UNUSED PlayState* play, UNUSED s32 arg1); +void OnePointCutscene_Noop(PlayState* play, s32 arg1); void Map_SavePlayerInitialInfo(PlayState* play); void Map_SetFloorPalettesData(PlayState* play, s16 floor); void Map_InitData(PlayState* play, s16 room); @@ -990,14 +990,14 @@ s32 Inventory_ConsumeFairy(PlayState* play); void Interface_SetDoAction(PlayState* play, u16 action); void Interface_SetNaviCall(PlayState* play, u16 naviCallState); void Interface_LoadActionLabelB(PlayState* play, u16 action); -s32 Health_ChangeBy(UNUSED PlayState* play, s16 amount); +s32 Health_ChangeBy(PlayState* play, s16 amount); void Rupees_ChangeBy(s16 rupeeChange); void Inventory_ChangeAmmo(s16 item, s16 ammoChange); -void Magic_Fill(UNUSED PlayState* play); -void Magic_Reset(UNUSED PlayState* play); +void Magic_Fill(PlayState* play); +void Magic_Reset(PlayState* play); s32 Magic_RequestChange(PlayState* play, s16 amount, s16 type); void func_80088AA0(s16 arg0); -void func_80088AF0(UNUSED PlayState* play); +void func_80088AF0(PlayState* play); void func_80088B34(s16 arg0); void Interface_Draw(PlayState* play); void Interface_Update(PlayState* play); @@ -1028,18 +1028,18 @@ u8 Player_GetMask(PlayState* play); Player* Player_UnsetMask(PlayState* play); s32 Player_HasMirrorShieldEquipped(PlayState* play); s32 Player_HasMirrorShieldSetToDraw(PlayState* play); -s32 Player_ActionToMagicSpell(UNUSED Player* this, s32 itemAction); +s32 Player_ActionToMagicSpell(Player* this, s32 itemAction); s32 Player_HoldsHookshot(Player* this); s32 func_8008F128(Player* this); s32 Player_ActionToMeleeWeapon(s32 itemAction); s32 Player_GetMeleeWeaponHeld(Player* this); s32 Player_HoldsTwoHandedWeapon(Player* this); s32 Player_HoldsBrokenKnife(Player* this); -s32 Player_ActionToBottle(UNUSED Player* this, s32 itemAction); +s32 Player_ActionToBottle(Player* this, s32 itemAction); s32 Player_GetBottleHeld(Player* this); -s32 Player_ActionToExplosive(UNUSED Player* this, s32 itemAction); +s32 Player_ActionToExplosive(Player* this, s32 itemAction); s32 Player_GetExplosiveHeld(Player* this); -s32 func_8008F2BC(UNUSED Player* this, s32 itemAction); +s32 func_8008F2BC(Player* this, s32 itemAction); s32 func_8008F2F8(PlayState* play); void Player_DrawImpl(PlayState* play, void** skeleton, Vec3s* jointTable, s32 dListCount, s32 lod, s32 tunic, s32 boots, s32 face, OverrideLimbDrawOpa overrideLimbDraw, PostLimbDrawOpa postLimbDraw, @@ -1054,7 +1054,7 @@ s32 Player_OverrideLimbDrawGameplayCrawling(PlayState* play, s32 limbIndex, Gfx* void* thisx); u8 func_80090480(PlayState* play, ColliderQuad* collider, WeaponInfo* weaponInfo, Vec3f* newTip, Vec3f* newBase); void Player_DrawGetItem(PlayState* play, Player* this); -void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, UNUSED Vec3s* rot, void* thisx); +void Player_PostLimbDrawGameplay(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx); u32 func_80091738(PlayState* play, u8* segment, SkelAnime* skelAnime); void Player_DrawPause(PlayState* play, u8* segment, SkelAnime* skelAnime, Vec3f* pos, Vec3s* rot, f32 scale, s32 sword, s32 tunic, s32 shield, s32 boots); @@ -1108,16 +1108,16 @@ Gfx* Gfx_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1 Gfx* Gfx_EnvColor(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a); void Gfx_SetupFrame(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b); void func_80095974(GraphicsContext* gfxCtx); -void func_80095AA0(UNUSED PlayState* play, UNUSED Room* room, UNUSED Input* input, UNUSED s32 arg3); +void func_80095AA0(PlayState* play, Room* room, Input* input, s32 arg3); void Room_DrawBackground2D(Gfx** gfxP, void* tex, void* tlut, u16 width, u16 height, u8 fmt, u8 siz, u16 tlutMode, u16 tlutCount, f32 offsetX, f32 offsetY); -void func_80096FD4(UNUSED PlayState* play, Room* room); +void func_80096FD4(PlayState* play, Room* room); u32 func_80096FE8(PlayState* play, RoomContext* roomCtx); s32 func_8009728C(PlayState* play, RoomContext* roomCtx, s32 roomNum); s32 func_800973FC(PlayState* play, RoomContext* roomCtx); void Room_Draw(PlayState* play, Room* room, u32 flags); void func_80097534(PlayState* play, RoomContext* roomCtx); -void Sample_Destroy(UNUSED GameState* thisx); +void Sample_Destroy(GameState* thisx); void Sample_Init(GameState* thisx); void Inventory_ChangeEquipment(s16 equipment, u16 value); u8 Inventory_DeleteEquipment(PlayState* play, s16 equipment); @@ -1129,7 +1129,7 @@ s32 Object_GetIndex(ObjectContext* objectCtx, s16 objectId); s32 Object_IsLoaded(ObjectContext* objectCtx, s32 bankIndex); void func_800981B8(ObjectContext* objectCtx); s32 Scene_ExecuteCommands(PlayState* play, SceneCmd* sceneCmd); -void TransitionActor_InitContext(UNUSED GameState* state, TransitionActorContext* transiActorCtx); +void TransitionActor_InitContext(GameState* state, TransitionActorContext* transiActorCtx); void Scene_SetTransitionForNextEntrance(PlayState* play); void Scene_Draw(PlayState* play); void SkelAnime_DrawLod(PlayState* play, void** skeleton, Vec3s* jointTable, @@ -1152,8 +1152,8 @@ Gfx* SkelAnime_DrawFlex(PlayState* play, void** skeleton, Vec3s* jointTable, s32 OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, void* arg, Gfx* gfx); void SkelAnime_InterpFrameTable(s32 limbCount, Vec3s* dst, Vec3s* start, Vec3s* target, f32 weight); void AnimationContext_Reset(AnimationContext* animationCtx); -void AnimationContext_SetNextQueue(UNUSED PlayState* play); -void AnimationContext_DisableQueue(UNUSED PlayState* play); +void AnimationContext_SetNextQueue(PlayState* play); +void AnimationContext_DisableQueue(PlayState* play); void AnimationContext_SetLoadFrame(PlayState* play, LinkAnimationHeader* animation, s32 frame, s32 limbCount, Vec3s* frameTable); void AnimationContext_SetCopyAll(PlayState* play, s32 vecCount, Vec3s* dst, Vec3s* src); @@ -1168,7 +1168,7 @@ void SkelAnime_InitLink(PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeade void LinkAnimation_SetUpdateFunction(SkelAnime* skelAnime); s32 LinkAnimation_Update(PlayState* play, SkelAnime* skelAnime); void LinkAnimation_AnimateFrame(PlayState* play, SkelAnime* skelAnime); -void Animation_SetMorph(UNUSED PlayState* play, SkelAnime* skelAnime, f32 morphFrames); +void Animation_SetMorph(PlayState* play, SkelAnime* skelAnime, f32 morphFrames); void LinkAnimation_Change(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation, f32 playSpeed, f32 startFrame, f32 endFrame, u8 mode, f32 morphFrames); void LinkAnimation_PlayOnce(PlayState* play, SkelAnime* skelAnime, LinkAnimationHeader* animation); @@ -1192,11 +1192,11 @@ void LinkAnimation_BlendToMorph(PlayState* play, SkelAnime* skelAnime, LinkAnima Vec3s* blendTable); void LinkAnimation_EndLoop(SkelAnime* skelAnime); s32 LinkAnimation_OnFrame(SkelAnime* skelAnime, f32 frame); -BAD_RETURN(s32) SkelAnime_Init(UNUSED PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, +BAD_RETURN(s32) SkelAnime_Init(PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, AnimationHeader* animation, Vec3s* jointTable, Vec3s* morphTable, s32 limbCount); -BAD_RETURN(s32) SkelAnime_InitFlex(UNUSED PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeader* skeletonHeaderSeg, +BAD_RETURN(s32) SkelAnime_InitFlex(PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeader* skeletonHeaderSeg, AnimationHeader* animation, Vec3s* jointTable, Vec3s* morphTable, s32 limbCount); -BAD_RETURN(s32) SkelAnime_InitSkin(UNUSED PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, +BAD_RETURN(s32) SkelAnime_InitSkin(PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, AnimationHeader* animation); s32 SkelAnime_Update(SkelAnime* skelAnime); void Animation_ChangeImpl(SkelAnime* skelAnime, AnimationHeader* animation, f32 playSpeed, f32 startFrame, f32 endFrame, @@ -1215,12 +1215,12 @@ void SkelAnime_CopyFrameTableTrue(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src, void SkelAnime_CopyFrameTableFalse(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src, u8* copyFlag); void SkelAnime_UpdateTranslation(SkelAnime* skelAnime, Vec3f* diff, s16 angle); s32 Animation_OnFrame(SkelAnime* skelAnime, f32 frame); -void SkelAnime_Free(SkelAnime* skelAnime, UNUSED PlayState* play); +void SkelAnime_Free(SkelAnime* skelAnime, PlayState* play); void SkelAnime_CopyFrameTable(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src); void Skin_UpdateVertices(MtxF* mtx, SkinVertex* skinVertices, SkinLimbModif* modifEntry, Vtx* vtxBuf, Vec3f* pos); void Skin_DrawAnimatedLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, s32 arg3, s32 drawFlags); -void Skin_DrawLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, Gfx* dlistOverride, UNUSED s32 drawFlags); +void Skin_DrawLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, Gfx* dlistOverride, s32 drawFlags); void func_800A6330(Actor* actor, PlayState* play, Skin* skin, SkinPostDraw postDraw, s32 setTranslation); void func_800A6360(Actor* actor, PlayState* play, Skin* skin, SkinPostDraw postDraw, SkinOverrideLimbDraw overrideLimbDraw, s32 setTranslation); @@ -1251,7 +1251,7 @@ void SkinMatrix_SetRotateAxis(MtxF* mf, s16 angle, f32 axisX, f32 axisY, f32 axi void Sram_InitNewSave(void); void Sram_InitDebugSave(void); void Sram_OpenSave(SramContext* sramCtx); -void Sram_WriteSave(UNUSED SramContext* sramCtx); +void Sram_WriteSave(SramContext* sramCtx); void Sram_VerifyAndLoadAllSaves(FileSelectState* fileSelect, SramContext* sramCtx); void Sram_InitSave(FileSelectState* fileSelect, SramContext* sramCtx); void Sram_EraseSave(FileSelectState* fileSelect, SramContext* sramCtx); @@ -1259,7 +1259,7 @@ void Sram_CopySave(FileSelectState* fileSelect, SramContext* sramCtx); void Sram_WriteSramHeader(SramContext* sramCtx); void Sram_InitSram(GameState* gameState, SramContext* sramCtx); void Sram_Alloc(GameState* gameState, SramContext* sramCtx); -void Sram_Init(UNUSED PlayState* play, UNUSED SramContext* sramCtx); +void Sram_Init(PlayState* play, SramContext* sramCtx); void SsSram_Init(u32 addr, u8 handleType, u8 handleDomain, u8 handleLatency, u8 handlePageSize, u8 handleRelDuration, u8 handlePulse, u32 handleSpeed); void SsSram_Dma(void* dramAddr, size_t size, s32 direction); @@ -1296,22 +1296,22 @@ void ViMode_Configure(ViMode* viMode, s32 mode, s32 type, s32 unk_70, s32 unk_74 void ViMode_Save(ViMode* viMode); void ViMode_Load(ViMode* viMode); void ViMode_Init(ViMode* viMode); -void ViMode_Destroy(UNUSED ViMode* viMode); +void ViMode_Destroy(ViMode* viMode); void ViMode_ConfigureFeatures(ViMode* viMode, s32 viFeatures); void ViMode_Update(ViMode* viMode, Input* input); void func_800ACE70(struct_801664F0* this); -void func_800ACE90(UNUSED struct_801664F0* this); +void func_800ACE90(struct_801664F0* this); void func_800ACE98(struct_801664F0* this, Gfx** gfxp); void VisMono_Init(VisMono* this); void VisMono_Destroy(VisMono* this); void VisMono_Draw(VisMono* this, Gfx** gfxp); void func_800AD920(struct_80166500* this); -void func_800AD950(UNUSED struct_80166500* this); +void func_800AD950(struct_80166500* this); void func_800AD958(struct_80166500* this, Gfx** gfxp); void Skybox_Init(GameState* state, SkyboxContext* skyboxCtx, s16 skyboxId); Mtx* SkyboxDraw_UpdateMatrix(SkyboxContext* skyboxCtx, f32 x, f32 y, f32 z); void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId, s16 blend, f32 x, f32 y, f32 z); -void SkyboxDraw_Update(UNUSED SkyboxContext* skyboxCtx); +void SkyboxDraw_Update(SkyboxContext* skyboxCtx); void PlayerCall_InitFuncPtrs(void); void TransitionUnk_InitGraphics(TransitionUnk* this); void TransitionUnk_InitData(TransitionUnk* this); @@ -1319,10 +1319,10 @@ void TransitionUnk_Destroy(TransitionUnk* this); TransitionUnk* TransitionUnk_Init(TransitionUnk* this, s32 row, s32 col); void TransitionUnk_SetData(TransitionUnk* this); void TransitionUnk_Draw(TransitionUnk* this, Gfx**); -void func_800B23E8(UNUSED TransitionUnk* this); +void func_800B23E8(TransitionUnk* this); void TransitionTriforce_Start(void* thisx); void* TransitionTriforce_Init(void* thisx); -void TransitionTriforce_Destroy(UNUSED void* thisx); +void TransitionTriforce_Destroy(void* thisx); void TransitionTriforce_Update(void* thisx, s32 updateRate); void TransitionTriforce_SetColor(void* thisx, u32 color); void TransitionTriforce_SetType(void* thisx, s32 type); @@ -1330,7 +1330,7 @@ void TransitionTriforce_Draw(void* thisx, Gfx** gfxP); s32 TransitionTriforce_IsDone(void* thisx); void TransitionWipe_Start(void* thisx); void* TransitionWipe_Init(void* thisx); -void TransitionWipe_Destroy(UNUSED void* thisx); +void TransitionWipe_Destroy(void* thisx); void TransitionWipe_Update(void* thisx, s32 updateRate); void TransitionWipe_Draw(void* thisx, Gfx** gfxP); s32 TransitionWipe_IsDone(void* thisx); @@ -1338,7 +1338,7 @@ void TransitionWipe_SetType(void* thisx, s32 type); void TransitionWipe_SetColor(void* thisx, u32 color); void TransitionCircle_Start(void* thisx); void* TransitionCircle_Init(void* thisx); -void TransitionCircle_Destroy(UNUSED void* thisx); +void TransitionCircle_Destroy(void* thisx); void TransitionCircle_Update(void* thisx, s32 updateRate); void TransitionCircle_Draw(void* thisx, Gfx** gfxP); s32 TransitionCircle_IsDone(void* thisx); @@ -1347,7 +1347,7 @@ void TransitionCircle_SetColor(void* thisx, u32 color); void TransitionCircle_SetUnkColor(void* thisx, u32 unkColor); void TransitionFade_Start(void* thisx); void* TransitionFade_Init(void* thisx); -void TransitionFade_Destroy(UNUSED void* thisx); +void TransitionFade_Destroy(void* thisx); void TransitionFade_Update(void* thisx, s32 updateRate); void TransitionFade_Draw(void* thisx, Gfx** gfxP); s32 TransitionFade_IsDone(void* thisx); @@ -1363,17 +1363,17 @@ void Letterbox_Update(s32 updateRate); void DbCamera_Init(DbCamera* dbCamera, Camera* cameraPtr); void DbgCamera_Enable(DbCamera* dbCamera, Camera* cam); void DbCamera_Update(DbCamera* dbCamera, Camera* cam); -void DbCamera_Reset(UNUSED Camera* cam, DbCamera* dbCam); +void DbCamera_Reset(Camera* cam, DbCamera* dbCam); void func_800BB0A0(f32 u, Vec3f* pos, f32* roll, f32* viewAngle, f32* point0, f32* point1, f32* point2, f32* point3); s32 func_800BB2B4(Vec3f* pos, f32* roll, f32* fov, CutsceneCameraPoint* point, s16* keyFrame, f32* curFrame); s32 Mempak_Init(s32 controllerNb); -s32 Mempak_GetFreeBytes(UNUSED s32 controllerNb); -s32 Mempak_FindFile(UNUSED s32 controllerNb, char start, char end); -s32 Mempak_Write(UNUSED s32 controllerNb, char idx, void* buffer, s32 offset, s32 size); -s32 Mempak_Read(UNUSED s32 controllerNb, char idx, void* buffer, s32 offset, s32 size); -s32 Mempak_Alloc(UNUSED s32 controllerNb, char* idx, s32 size); -s32 Mempak_DeleteFile(UNUSED s32 controllerNb, char idx); -s32 Mempak_GetFileSize(UNUSED s32 controllerNb, char idx); +s32 Mempak_GetFreeBytes(s32 controllerNb); +s32 Mempak_FindFile(s32 controllerNb, char start, char end); +s32 Mempak_Write(s32 controllerNb, char idx, void* buffer, s32 offset, s32 size); +s32 Mempak_Read(s32 controllerNb, char idx, void* buffer, s32 offset, s32 size); +s32 Mempak_Alloc(s32 controllerNb, char* idx, s32 size); +s32 Mempak_DeleteFile(s32 controllerNb, char idx); +s32 Mempak_GetFileSize(s32 controllerNb, char idx); void KaleidoManager_LoadOvl(KaleidoMgrOverlay* ovl); void KaleidoManager_ClearOvl(KaleidoMgrOverlay* ovl); void KaleidoManager_Init(PlayState* play); @@ -1463,7 +1463,7 @@ void THA_Dt(TwoHeadArena* tha); void AudioMgr_StopAllSfx(void); void func_800C3C80(AudioMgr* audioMgr); void AudioMgr_HandleRetrace(AudioMgr* audioMgr); -void AudioMgr_HandlePreNMI(UNUSED AudioMgr* audioMgr); +void AudioMgr_HandlePreNMI(AudioMgr* audioMgr); void AudioMgr_ThreadEntry(void* arg0); void AudioMgr_Unlock(AudioMgr* audioMgr); void AudioMgr_Init(AudioMgr* audioMgr, void* stack, OSPri pri, OSId id, Scheduler* sched, IrqMgr* irqMgr); @@ -1493,10 +1493,10 @@ void Graph_UCodeFaultClient(Gfx* workBuf); void Graph_InitTHGA(GraphicsContext* gfxCtx); GameStateOverlay* Graph_GetNextGameState(GameState* gameState); void Graph_Init(GraphicsContext* gfxCtx); -void Graph_Destroy(UNUSED GraphicsContext* gfxCtx); +void Graph_Destroy(GraphicsContext* gfxCtx); void Graph_TaskSet00(GraphicsContext* gfxCtx); void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState); -void Graph_ThreadEntry(UNUSED void* arg); +void Graph_ThreadEntry(void* arg); void* Graph_Alloc(GraphicsContext* gfxCtx, size_t size); void* Graph_Alloc2(GraphicsContext* gfxCtx, size_t size); void Graph_OpenDisps(Gfx** dispRefs, GraphicsContext* gfxCtx, const char* file, s32 line); @@ -1512,12 +1512,12 @@ void Main_LogSystemHeap(void); void Main(void* arg); void SpeedMeter_InitImpl(SpeedMeter* this, u32 arg1, u32 y); void SpeedMeter_Init(SpeedMeter* this); -void SpeedMeter_Destroy(UNUSED SpeedMeter* this); +void SpeedMeter_Destroy(SpeedMeter* this); void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx); void SpeedMeter_InitAllocEntry(SpeedMeterAllocEntry* this, u32 maxval, u32 val, u16 backColor, u16 foreColor, u32 ulx, u32 lrx, u32 uly, u32 lry); void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxCtx); -void SpeedMeter_DrawAllocEntries(UNUSED SpeedMeter* meter, GraphicsContext* gfxCtx, GameState* state); +void SpeedMeter_DrawAllocEntries(SpeedMeter* meter, GraphicsContext* gfxCtx, GameState* state); void SysCfb_Init(s32 n64dd); void* SysCfb_GetFbPtr(s32 idx); void* SysCfb_GetFbEnd(void); @@ -1591,8 +1591,8 @@ s32 Math3D_TriVsTriIntersect(TriNorm* ta, TriNorm* tb, Vec3f* intersect); s32 Math3D_XZInSphere(Sphere16* sphere, f32 x, f32 z); s32 Math3D_XYInSphere(Sphere16* sphere, f32 x, f32 y); s32 Math3D_YZInSphere(Sphere16* sphere, f32 y, f32 z); -void Math3D_DrawSphere(UNUSED PlayState* play, UNUSED Sphere16* sph); -void Math3D_DrawCylinder(UNUSED PlayState* play, UNUSED Cylinder16* cyl); +void Math3D_DrawSphere(PlayState* play, Sphere16* sph); +void Math3D_DrawCylinder(PlayState* play, Cylinder16* cyl); s16 Math_Atan2S(f32 x, f32 y); f32 Math_Atan2F(f32 x, f32 y); void Matrix_Init(GameState* gameState); @@ -1649,7 +1649,7 @@ void DebugArena_Init(void* start, u32 size); void DebugArena_Cleanup(void); u8 DebugArena_IsInitialized(void); void UCodeDisas_Init(UCodeDisas*); -void UCodeDisas_Destroy(UNUSED UCodeDisas*); +void UCodeDisas_Destroy(UCodeDisas*); void UCodeDisas_Disassemble(UCodeDisas*, Gfx*); void UCodeDisas_RegisterUCode(UCodeDisas*, s32, UCodeInfo*); void UCodeDisas_SetCurUCode(UCodeDisas*, void*); @@ -1678,16 +1678,16 @@ void* AudioHeap_AllocSampleCache(u32 size, s32 fontId, void* sampleAddr, s8 medi void AudioHeap_ApplySampleBankCache(s32 sampleBankId); void AudioLoad_DecreaseSampleDmaTtls(void); void* AudioLoad_DmaSampleData(u32 devAddr, u32 size, s32 arg2, u8* dmaIndexRef, s32 medium); -void AudioLoad_InitSampleDmaBuffers(UNUSED s32 numNotes); +void AudioLoad_InitSampleDmaBuffers(s32 numNotes); s32 AudioLoad_IsFontLoadComplete(s32 fontId); s32 AudioLoad_IsSeqLoadComplete(s32 seqId); void AudioLoad_SetFontLoadStatus(s32 fontId, s32 loadStatus); void AudioLoad_SetSeqLoadStatus(s32 seqId, s32 loadStatus); void AudioLoad_SyncLoadSeqParts(s32 seqId, s32 arg1); s32 AudioLoad_SyncLoadInstrument(s32 fontId, s32 instId, s32 drumId); -void AudioLoad_AsyncLoadSeq(s32 seqId, UNUSED s32 arg1, s32 retData, OSMesgQueue* retQueue); -void AudioLoad_AsyncLoadSampleBank(s32 sampleBankId, UNUSED s32 arg1, s32 retData, OSMesgQueue* retQueue); -void AudioLoad_AsyncLoadFont(s32 fontId, UNUSED s32 arg1, s32 retData, OSMesgQueue* retQueue); +void AudioLoad_AsyncLoadSeq(s32 seqId, s32 arg1, s32 retData, OSMesgQueue* retQueue); +void AudioLoad_AsyncLoadSampleBank(s32 sampleBankId, s32 arg1, s32 retData, OSMesgQueue* retQueue); +void AudioLoad_AsyncLoadFont(s32 fontId, s32 arg1, s32 retData, OSMesgQueue* retQueue); u8* AudioLoad_GetFontsForSequence(s32 seqId, u32* outNumFonts); void AudioLoad_DiscardSeqFonts(s32 seqId); s32 AudioLoad_SyncInitSeqPlayer(s32 playerIdx, s32 seqId, s32 arg2); @@ -1759,7 +1759,7 @@ f32 Audio_GetVibratoFreqScale(VibratoState* vib); void Audio_NoteVibratoUpdate(Note* note); void Audio_NoteVibratoInit(Note* note); void Audio_NotePortamentoInit(Note* note); -void Audio_AdsrInit(AdsrState* adsr, EnvelopePoint* envelope, UNUSED s16* volOut); +void Audio_AdsrInit(AdsrState* adsr, EnvelopePoint* envelope, s16* volOut); f32 Audio_AdsrUpdate(AdsrState* adsr); void AudioSeq_SequenceChannelDisable(SequenceChannel* channel); void AudioSeq_SequencePlayerDisableAsFinished(SequencePlayer* seqPlayer); @@ -1845,7 +1845,7 @@ void Audio_PlayNatureAmbienceSequence(u8 natureAmbienceId); void Audio_Init(void); void Audio_InitSound(void); void func_800F7170(void); -void func_800F71BC(UNUSED s32 arg0); +void func_800F71BC(s32 arg0); void Audio_SetSfxBanksMute(u16 muteMask); void Audio_QueueSeqCmdMute(u8 channelIdx); void Audio_ClearBGMMute(u8 channelIdx); @@ -1880,7 +1880,7 @@ void GfxPrint_SetPosPx(GfxPrint* this, s32 x, s32 y); void GfxPrint_SetPos(GfxPrint* this, s32 x, s32 y); void GfxPrint_SetBasePosPx(GfxPrint* this, s32 x, s32 y); void GfxPrint_Init(GfxPrint* this); -void GfxPrint_Destroy(UNUSED GfxPrint* this); +void GfxPrint_Destroy(GfxPrint* this); void GfxPrint_Open(GfxPrint* this, Gfx* dList); Gfx* GfxPrint_Close(GfxPrint* this); s32 GfxPrint_Printf(GfxPrint* this, const char* fmt, ...); @@ -1984,7 +1984,7 @@ void __osFree(Arena* arena, void* ptr); void __osFree_NoLockDebug(Arena* arena, void* ptr, const char* file, s32 line); void __osFreeDebug(Arena* arena, void* ptr, const char* file, s32 line); void* __osRealloc(Arena* arena, void* ptr, u32 newSize); -void* __osReallocDebug(Arena* arena, void* ptr, u32 newSize, UNUSED const char* file, UNUSED s32 line); +void* __osReallocDebug(Arena* arena, void* ptr, u32 newSize, const char* file, s32 line); void ArenaImpl_GetSizes(Arena* arena, u32* outMaxFree, u32* outFree, u32* outAlloc); void __osDisplayArena(Arena* arena); void ArenaImpl_FaultClient(Arena* arena); @@ -2015,7 +2015,7 @@ f32 sinf(f32 angle); s16 sins(u16 angle); OSTask* _VirtualToPhysicalTask(OSTask* intp); void osSpTaskLoad(OSTask* intp); -void osSpTaskStartGo(UNUSED OSTask* tp); +void osSpTaskStartGo(OSTask* tp); void __osSiCreateAccessQueue(void); void __osSiGetAccess(void); void __osSiRelAccess(void); @@ -2133,10 +2133,10 @@ void GameOver_Update(PlayState* play); void Interface_Destroy(PlayState* play); void Interface_Init(PlayState* play); void Message_Init(PlayState* play); -void Regs_InitData(UNUSED PlayState* play); +void Regs_InitData(PlayState* play); void Setup_Init(GameState* thisx); -void Setup_Destroy(UNUSED GameState* thisx); +void Setup_Destroy(GameState* thisx); void ConsoleLogo_Init(GameState* thisx); void ConsoleLogo_Destroy(GameState* thisx); void MapSelect_Init(GameState* thisx); diff --git a/include/sched.h b/include/sched.h index c3fd06e965a..e37d6821d63 100644 --- a/include/sched.h +++ b/include/sched.h @@ -66,6 +66,6 @@ typedef struct { } Scheduler; // size = 0x258 void Sched_Notify(Scheduler* sc); -void Sched_Init(Scheduler* sc, void* stack, OSPri priority, UNUSED UNK_TYPE arg3, UNUSED UNK_TYPE arg4, IrqMgr* irqMgr); +void Sched_Init(Scheduler* sc, void* stack, OSPri priority, UNK_TYPE arg3, UNK_TYPE arg4, IrqMgr* irqMgr); #endif diff --git a/include/z64curve.h b/include/z64curve.h index c340c2a6bf0..a526effcb8f 100644 --- a/include/z64curve.h +++ b/include/z64curve.h @@ -3,7 +3,6 @@ #include "ultra64/types.h" #include "z64math.h" -#include "macros.h" struct PlayState; @@ -51,13 +50,13 @@ typedef void (*PostCurveLimbDraw)(struct PlayState* play, SkelCurve* skelCuve, s f32 Curve_Interpolate(f32 x, CurveInterpKnot* knots, s32 knotCount); void SkelCurve_Clear(SkelCurve* skelCurve); -s32 SkelCurve_Init(UNUSED struct PlayState* play, SkelCurve* skelCurve, CurveSkeletonHeader* skeletonHeaderSeg, - UNUSED CurveAnimationHeader* animation); -void SkelCurve_Destroy(UNUSED struct PlayState* play, SkelCurve* skelCurve); +s32 SkelCurve_Init(struct PlayState* play, SkelCurve* skelCurve, CurveSkeletonHeader* skeletonHeaderSeg, + CurveAnimationHeader* animation); +void SkelCurve_Destroy(struct PlayState* play, SkelCurve* skelCurve); void SkelCurve_SetAnim(SkelCurve* skelCurve, CurveAnimationHeader* animation, f32 arg2, f32 endFrame, f32 curFrame, f32 playSpeed); -s32 SkelCurve_Update(UNUSED struct PlayState* play, SkelCurve* skelCurve); -void SkelCurve_Draw(UNUSED Actor* actor, struct PlayState* play, SkelCurve* skelCurve, OverrideCurveLimbDraw overrideLimbDraw, +s32 SkelCurve_Update(struct PlayState* play, SkelCurve* skelCurve); +void SkelCurve_Draw(Actor* actor, struct PlayState* play, SkelCurve* skelCurve, OverrideCurveLimbDraw overrideLimbDraw, PostCurveLimbDraw postLimbDraw, s32 lod, void* data); // ZAPD compatibility typedefs diff --git a/src/code/audio_load.c b/src/code/audio_load.c index bced30fef66..e7629d7f81a 100644 --- a/src/code/audio_load.c +++ b/src/code/audio_load.c @@ -27,11 +27,11 @@ typedef struct { typedef void SoundFontData; /* forward declarations */ -s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, UNUSED s32 arg2); +s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2); SoundFontData* AudioLoad_SyncLoadFont(u32 fontId); Sample* AudioLoad_GetFontSample(s32 fontId, s32 instId); void AudioLoad_ProcessAsyncLoads(s32 resetStatus); -void AudioLoad_ProcessAsyncLoadUnkMedium(UNUSED AudioAsyncLoad* asyncLoad, UNUSED s32 resetStatus); +void AudioLoad_ProcessAsyncLoadUnkMedium(AudioAsyncLoad* asyncLoad, s32 resetStatus); void AudioLoad_ProcessAsyncLoad(AudioAsyncLoad* asyncLoad, s32 resetStatus); void AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, SoundFontData* fontData, SampleBankRelocInfo* sampleBankReloc, s32 isAsync); @@ -43,16 +43,16 @@ u32 AudioLoad_GetRealTableIndex(s32 tableType, u32 id); void* AudioLoad_SearchCaches(s32 tableType, s32 id); AudioTable* AudioLoad_GetLoadTable(s32 tableType); void AudioLoad_SyncDma(u32 devAddr, u8* ramAddr, u32 size, s32 medium); -void AudioLoad_SyncDmaUnkMedium(UNUSED u32 devAddr, UNUSED u8* addr, UNUSED u32 size, UNUSED s32 unkMediumParam); +void AudioLoad_SyncDmaUnkMedium(u32 devAddr, u8* addr, u32 size, s32 unkMediumParam); s32 AudioLoad_Dma(OSIoMesg* mesg, u32 priority, s32 direction, u32 devAddr, void* ramAddr, u32 size, - OSMesgQueue* reqQueue, s32 medium, UNUSED const char* dmaFuncType); + OSMesgQueue* reqQueue, s32 medium, const char* dmaFuncType); void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData, OSMesgQueue* retQueue); AudioAsyncLoad* AudioLoad_StartAsyncLoadUnkMedium(s32 unkMediumParam, u32 devAddr, void* ramAddr, s32 size, s32 medium, s32 nChunks, OSMesgQueue* retQueue, s32 retMsg); AudioAsyncLoad* AudioLoad_StartAsyncLoad(u32 devAddr, void* ramAddr, u32 size, s32 medium, s32 nChunks, OSMesgQueue* retQueue, s32 retMsg); void AudioLoad_AsyncDma(AudioAsyncLoad* asyncLoad, u32 size); -void AudioLoad_AsyncDmaUnkMedium(UNUSED u32 devAddr, UNUSED void* ramAddr, UNUSED u32 size, UNUSED s16 arg3); +void AudioLoad_AsyncDmaUnkMedium(u32 devAddr, void* ramAddr, u32 size, s16 arg3); u8* AudioLoad_SyncLoadSeq(s32 seqId); s32 AudioLoad_ProcessSamplePreloads(s32 resetStatus); void AudioLoad_DmaSlowCopy(AudioSlowLoad* slowLoad, s32 size); diff --git a/src/code/audio_synthesis.c b/src/code/audio_synthesis.c index 0f2cc98025d..3f152a70d80 100644 --- a/src/code/audio_synthesis.c +++ b/src/code/audio_synthesis.c @@ -24,13 +24,13 @@ Acmd* AudioSynth_LoadRingBufferPart(Acmd* cmd, u16 dmem, u16 startPos, s32 size, Acmd* AudioSynth_SaveBufferOffset(Acmd* cmd, u16 dmem, u16 offset, s32 size, s16* buf); Acmd* AudioSynth_SaveRingBufferPart(Acmd* cmd, u16 dmem, u16 startPos, s32 size, SynthesisReverb* reverb); Acmd* AudioSynth_DoOneAudioUpdate(s16* aiBuf, s32 aiBufLen, Acmd* cmd, s32 updateIndex); -Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, UNUSED s16* aiBuf, +Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s16* aiBuf, s32 aiBufLen, Acmd* cmd, s32 updateIndex); Acmd* AudioSynth_LoadWaveSamples(Acmd* cmd, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s32 numSamplesToLoad); Acmd* AudioSynth_ApplyHaasEffect(Acmd* cmd, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s32 size, s32 flags, s32 haasEffectDelaySide); Acmd* AudioSynth_ProcessEnvelope(Acmd* cmd, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s32 aiBufLen, - u16 dmemSrc, s32 haasEffectDelaySide, UNUSED s32 flags); + u16 dmemSrc, s32 haasEffectDelaySide, s32 flags); Acmd* AudioSynth_FinalResample(Acmd* cmd, NoteSynthesisState* synthState, s32 size, u16 pitch, u16 inpDmem, s32 resampleFlags); diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 214e13682a6..66eb1eab836 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -35,7 +35,7 @@ u16 D_8011E1C4 = 0; typedef void (*CutsceneStateHandler)(PlayState*, CutsceneContext*); -void func_80064720(UNUSED PlayState* play, UNUSED CutsceneContext* csCtx); +void func_80064720(PlayState* play, CutsceneContext* csCtx); void func_80064760(PlayState* play, CutsceneContext* csCtx); void func_800647C0(PlayState* play, CutsceneContext* csCtx); void func_80068C3C(PlayState* play, CutsceneContext* csCtx); diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index be962b5d1cc..ad584596107 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -12,14 +12,14 @@ void EnAObj_Draw(Actor* thisx, PlayState* play); void EnAObj_WaitFinishedTalking(EnAObj* this, PlayState* play); void EnAObj_WaitTalk(EnAObj* this, PlayState* play); -void EnAObj_BlockRot(EnAObj* this, UNUSED PlayState* play); -void EnAObj_BoulderFragment(EnAObj* this, UNUSED PlayState* play); -void EnAObj_Block(EnAObj* this, UNUSED PlayState* play); - -void EnAObj_SetupWaitTalk(EnAObj* this, UNUSED s16 type); -void EnAObj_SetupBlockRot(EnAObj* this, UNUSED s16 type); -void EnAObj_SetupBoulderFragment(EnAObj* this, UNUSED s16 type); -void EnAObj_SetupBlock(EnAObj* this, UNUSED s16 type); +void EnAObj_BlockRot(EnAObj* this, PlayState* play); +void EnAObj_BoulderFragment(EnAObj* this, PlayState* play); +void EnAObj_Block(EnAObj* this, PlayState* play); + +void EnAObj_SetupWaitTalk(EnAObj* this, s16 type); +void EnAObj_SetupBlockRot(EnAObj* this, s16 type); +void EnAObj_SetupBoulderFragment(EnAObj* this, s16 type); +void EnAObj_SetupBlock(EnAObj* this, s16 type); ActorInit En_A_Obj_InitVars = { ACTOR_EN_A_OBJ, diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index c614fa505d9..170997ac7ed 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -10,7 +10,7 @@ void EnItem00_Destroy(Actor* thisx, PlayState* play); void EnItem00_Update(Actor* thisx, PlayState* play); void EnItem00_Draw(Actor* thisx, PlayState* play); -void func_8001DFC8(EnItem00* this, UNUSED PlayState* play); +void func_8001DFC8(EnItem00* this, PlayState* play); void func_8001E1C8(EnItem00* this, PlayState* play); void func_8001E304(EnItem00* this, PlayState* play); void EnItem00_Collected(EnItem00* this, PlayState* play); From 9846caa2f960d4f90323fc2c2059261ca69abe81 Mon Sep 17 00:00:00 2001 From: Tharo <17233964+Thar0@users.noreply.github.com> Date: Thu, 3 Nov 2022 20:29:24 +0000 Subject: [PATCH 11/14] Suggested changes Co-authored-by: Dragorn421 --- include/sched.h | 1 - src/code/audio_synthesis.c | 1 - 2 files changed, 2 deletions(-) diff --git a/include/sched.h b/include/sched.h index e37d6821d63..48ecc7b245f 100644 --- a/include/sched.h +++ b/include/sched.h @@ -3,7 +3,6 @@ #include "ultra64.h" #include "irqmgr.h" -#include "macros.h" #define OS_SC_NEEDS_RDP 0x0001 // Task uses the RDP #define OS_SC_NEEDS_RSP 0x0002 // Task uses the RSP diff --git a/src/code/audio_synthesis.c b/src/code/audio_synthesis.c index 3f152a70d80..138034b4d5b 100644 --- a/src/code/audio_synthesis.c +++ b/src/code/audio_synthesis.c @@ -155,7 +155,6 @@ Acmd* AudioSynth_Update(Acmd* cmdStart, s32* cmdCnt, s16* aiStart, s32 aiBufLen) Acmd* cmdP; s32 i; s32 j; - UNUSED SynthesisReverb* reverb; cmdP = cmdStart; for (i = gAudioCtx.audioBufferParameters.updatesPerFrame; i > 0; i--) { From 72e2752c24aedb0fdb73fac804b39d80c748a645 Mon Sep 17 00:00:00 2001 From: Thar0 <17233964+Thar0@users.noreply.github.com> Date: Thu, 7 Sep 2023 21:14:34 +0100 Subject: [PATCH 12/14] More unused variables --- src/code/db_camera.c | 3 +- src/code/z_collision_check.c | 28 +++++++++---------- src/code/z_onepointdemo_data.inc.c | 4 +-- src/code/z_skin.c | 2 +- .../actors/ovl_Arms_Hook/z_arms_hook.c | 6 ++-- .../actors/ovl_Bg_Dodoago/z_bg_dodoago.c | 2 +- .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c | 2 +- .../ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c | 3 +- .../ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c | 2 +- .../ovl_Bg_Mizu_Water/z_bg_mizu_water.c | 4 +-- .../actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c | 2 +- .../actors/ovl_Bg_Treemouth/z_bg_treemouth.c | 3 +- .../z_boss_dodongo_data.inc.c | 2 +- src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 2 +- src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c | 2 +- .../ovl_Boss_Ganon2/z_boss_ganon2_data.inc.c | 8 ++---- src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 4 +-- src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 2 +- src/overlays/actors/ovl_Demo_Du/z_demo_du.c | 2 +- .../actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 3 +- .../actors/ovl_Efc_Erupc/z_efc_erupc.c | 2 +- src/overlays/actors/ovl_En_Am/z_en_am.c | 4 +-- .../actors/ovl_En_Bigokuta/z_en_bigokuta.c | 2 +- src/overlays/actors/ovl_En_Box/z_en_box.c | 2 +- .../actors/ovl_En_Clear_Tag/z_en_clear_tag.c | 4 +-- .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 2 +- .../actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c | 2 +- .../actors/ovl_En_G_Switch/z_en_g_switch.c | 2 +- .../ovl_En_Ganon_Mant/z_en_ganon_mant.c | 8 +++--- .../ovl_En_Ganon_Organ/z_en_ganon_organ.c | 2 +- src/overlays/actors/ovl_En_GeldB/z_en_geldb.c | 2 +- src/overlays/actors/ovl_En_Go2/z_en_go2.c | 2 +- .../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 2 +- src/overlays/actors/ovl_En_Hata/z_en_hata.c | 5 ++-- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 3 +- .../z_en_horse_game_check.c | 2 +- .../ovl_En_Horse_Normal/z_en_horse_normal.c | 12 +++----- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 3 +- src/overlays/actors/ovl_En_Jj/z_en_jj.c | 4 +-- .../actors/ovl_En_Jsjutan/z_en_jsjutan.c | 2 +- .../actors/ovl_En_Kanban/z_en_kanban.c | 2 +- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 6 ++-- src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 2 +- .../ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c | 4 +-- src/overlays/actors/ovl_En_Sda/z_en_sda.c | 6 ++-- src/overlays/actors/ovl_En_Tr/z_en_tr.c | 2 +- .../ovl_En_Zl1/z_en_zl1_camera_data.inc.c | 4 +-- src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 2 +- src/overlays/actors/ovl_Fishing/z_fishing.c | 2 +- .../actors/ovl_Item_Shield/z_item_shield.c | 4 +-- .../actors/ovl_Magic_Dark/z_magic_dark.c | 3 +- .../actors/ovl_player_actor/z_player.c | 5 ++-- .../ovl_file_choose/z_file_choose.c | 2 +- .../ovl_kaleido_scope/z_kaleido_scope_PAL.c | 2 +- 54 files changed, 92 insertions(+), 107 deletions(-) diff --git a/src/code/db_camera.c b/src/code/db_camera.c index 8234d7134ac..f66bdb600e8 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -1759,8 +1759,7 @@ char D_8012D128[] = GFXP_KATAKANA "ﾄ-ﾀﾙ "; char D_8012D13C[] = GFXP_KATAKANA "ｷ- / "; s32 func_800B91B0(Camera* cam, DebugCam* debugCam) { - s32 pointCount; - s32 curPoint; + STACK_PADS(s32, 2); while (sDebugCamCuts[D_8016110C].letter == '?') { D_8016110C++; diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 8e3eb14e70c..2b61ff2b059 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -2221,8 +2221,8 @@ void CollisionCheck_AC_CylVsQuad(PlayState* play, UNUSED CollisionCheckContext* } } -static s8 sBssDummy0; -static s8 sBssDummy1; +UNUSED static s8 sBssDummy0; +UNUSED static s8 sBssDummy1; /** * AC overlap check. Calculates the center of each collider element and the point of contact. @@ -2272,10 +2272,10 @@ void CollisionCheck_AC_QuadVsCyl(PlayState* play, UNUSED CollisionCheckContext* } } -static s8 sBssDummy3; -static s8 sBssDummy4; -static s8 sBssDummy5; -static s8 sBssDummy6; +UNUSED static s8 sBssDummy3; +UNUSED static s8 sBssDummy4; +UNUSED static s8 sBssDummy5; +UNUSED static s8 sBssDummy6; /** * AC overlap check. Calculates the center of each collider element and the point of contact. @@ -2319,10 +2319,10 @@ void CollisionCheck_AC_TrisVsTris(PlayState* play, UNUSED CollisionCheckContext* } } -static s8 sBssDummy7; -static s8 sBssDummy8; -static s8 sBssDummy9; -static s8 sBssDummy10; +UNUSED static s8 sBssDummy7; +UNUSED static s8 sBssDummy8; +UNUSED static s8 sBssDummy9; +UNUSED static s8 sBssDummy10; /** * AC overlap check. Calculates the center of each collider element and the point of contact. @@ -3237,10 +3237,10 @@ void Collider_SetTrisDim(PlayState* play, ColliderTris* collider, s32 index, Col // In order to reproduce this behavior, we need a specific number of bss variables in the file before that point. // For this, we introduce a certain amount of dummy variables throughout the file, which we fit inside padding added // by the compiler between structs like TriNorm and/or Vec3f, so they don't take space in bss. -static s8 sBssDummy11; -static s8 sBssDummy12; -static s8 sBssDummy13; -static s8 sBssDummy14; +UNUSED static s8 sBssDummy11; +UNUSED static s8 sBssDummy12; +UNUSED static s8 sBssDummy13; +UNUSED static s8 sBssDummy14; /** * Updates the world spheres for all of the collider's JntSph elements attached to the specified limb diff --git a/src/code/z_onepointdemo_data.inc.c b/src/code/z_onepointdemo_data.inc.c index f88e9e39b8d..0105575d197 100644 --- a/src/code/z_onepointdemo_data.inc.c +++ b/src/code/z_onepointdemo_data.inc.c @@ -43,7 +43,7 @@ static CutsceneCameraPoint sCrawlspaceForwardsEyePoints[9] = { { CS_CAM_CONTINUE, 0, 0, 60.0f, { 0, 63, 119 } }, { CS_CAM_STOP, 0, 0, 60.0f, { 0, 62, 119 } }, { CS_CAM_STOP, 0, 0, 60.0f, { 0, 62, 119 } }, }; -static s16 sCrawlspaceUnused = 9; +UNUSED static s16 sCrawlspaceUnused = 9; static s16 sCrawlspaceTimer = 90; static s16 sCrawlspaceActionParam = 1; static CutsceneCameraPoint sCrawlspaceBackwardsEyePoints[10] = { @@ -114,7 +114,7 @@ static CutsceneCameraPoint D_80120820[12] = { { CS_CAM_CONTINUE, 1, 0, 65.0f, { 75, 18, 123 } }, { CS_CAM_CONTINUE, 1, 0, 65.0f, { 75, 10, 123 } }, { CS_CAM_STOP, 0, 0, 65.0f, { 75, 10, 122 } }, { CS_CAM_STOP, 0, 0, 65.0f, { 75, 10, 122 } }, }; -static s16 D_801208E0 = 12; +UNUSED static s16 D_801208E0 = 12; static s16 D_801208E4 = 90; static s16 D_801208E8 = 8; diff --git a/src/code/z_skin.c b/src/code/z_skin.c index da82c7f06da..6d01361b2be 100644 --- a/src/code/z_skin.c +++ b/src/code/z_skin.c @@ -2,7 +2,7 @@ MtxF gSkinLimbMatrices[60]; // holds matrices for each limb of the skeleton currently being drawn -static s32 sUnused; +UNUSED static s32 sUnused; void Skin_UpdateVertices(MtxF* mtx, SkinVertex* skinVertices, SkinLimbModif* modifEntry, Vtx* vtxBuf, Vec3f* pos) { Vtx* vtx; 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 1cd41d3d6a2..8b61e8c5d73 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -43,10 +43,10 @@ static ColliderQuadInit sQuadInit = { { { { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } } }, }; -static Vec3f sUnusedVec1 = { 0.0f, 0.5f, 0.0f }; -static Vec3f sUnusedVec2 = { 0.0f, 0.5f, 0.0f }; +UNUSED static Vec3f sUnusedVec1 = { 0.0f, 0.5f, 0.0f }; +UNUSED static Vec3f sUnusedVec2 = { 0.0f, 0.5f, 0.0f }; -static Color_RGB8 sUnusedColors[] = { +UNUSED static Color_RGB8 sUnusedColors[] = { { 255, 255, 100 }, { 255, 255, 50 }, }; diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index e1844efb37c..386d528dd03 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -76,7 +76,7 @@ static s16 sFirstExplosiveFlag = false; static u8 sDisableBombCatcher; -static u8 sUnused[90]; // unknown length +UNUSED static u8 sUnused[90]; // unknown length static s32 sTimer; 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 4104790c876..8292790248b 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 @@ -52,7 +52,7 @@ void BgDyYoseizo_SpawnEffect(BgDyYoseizo* this, Vec3f* initPos, Vec3f* initVeloc void BgDyYoseizo_UpdateEffects(BgDyYoseizo* this, PlayState* play); void BgDyYoseizo_DrawEffects(BgDyYoseizo* this, PlayState* play); -static s32 sUnusedGetItemIds[] = { GI_FARORES_WIND, GI_NAYRUS_LOVE, GI_DINS_FIRE }; +UNUSED static s32 sUnusedGetItemIds[] = { GI_FARORES_WIND, GI_NAYRUS_LOVE, GI_DINS_FIRE }; ActorInit Bg_Dy_Yoseizo_InitVars = { ACTOR_BG_DY_YOSEIZO, diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c index 3ed7c168bb8..9b62e239f7d 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c @@ -41,8 +41,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -// Unused -static u32 D_8087E3FC[] = { +UNUSED static u32 D_8087E3FC[] = { 0x00000000, 0x00000000, 0x00000000, 0xC8C800FF, 0xFF0000FF, }; diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c index 2c74103283d..c57d7f72c57 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c @@ -22,7 +22,7 @@ void func_808992E8(BgJyaIronobj* this, PlayState* play); void BgJyaIronobj_SpawnPillarParticles(BgJyaIronobj* this, PlayState* play, EnIk* enIk); void BgJyaIronobj_SpawnThroneParticles(BgJyaIronobj* this, PlayState* play, EnIk* enIk); -static int sUnused = 0; +UNUSED static int sUnused = 0; ActorInit Bg_Jya_Ironobj_InitVars = { ACTOR_BG_JYA_IRONOBJ, diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index d00668d6eec..ef90edb24fe 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -41,8 +41,8 @@ ActorInit Bg_Mizu_Water_InitVars = { (ActorFunc)BgMizuWater_Draw, }; -static f32 sUnused1 = 0; -static f32 sUnused2 = 110.0f; +UNUSED static f32 sUnused1 = 0; +UNUSED static f32 sUnused2 = 110.0f; static u32 sWaterBoxIndices[] = { 2, 3, 5, 7, 12, 20, 21, 22 }; diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c index 359f19101c9..f5e9cf27999 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c @@ -14,7 +14,7 @@ void BgSstFloor_Destroy(Actor* thisx, PlayState* play); void BgSstFloor_Update(Actor* thisx, PlayState* play); void BgSstFloor_Draw(Actor* thisx, PlayState* play); -static s32 sUnkValues[] = { 0, 0, 0 }; // Unused, probably a zero vector +UNUSED static s32 sUnkValues[] = { 0, 0, 0 }; // Probably a zero vector ActorInit Bg_Sst_Floor_InitVars = { ACTOR_BG_SST_FLOOR, diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index 31d5c91f3aa..e0873987030 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -49,8 +49,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32(uncullZoneDownward, 300, ICHAIN_STOP), }; -// unused -static f32 D_808BD9C4[] = { +UNUSED static f32 D_808BD9C4[] = { -2746.0f, 545.0f, 4694.0f, -2654.0f, 146.0f, 4534.0f, }; diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c index 3a62ce5333f..f8e98287394 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c @@ -235,6 +235,6 @@ static ColliderJntSphInit sJntSphInit = { sJntSphElementsInit, }; -static Vec3f sUnkZeroVec = { 0.0f, 0.0f, 0.0f }; +UNUSED static Vec3f sUnkZeroVec = { 0.0f, 0.0f, 0.0f }; #include "assets/overlays/ovl_Boss_Dodongo/ovl_Boss_Dodongo.c" diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index b415851f239..dde90217684 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -1695,7 +1695,7 @@ s32 BossFd_OverrideLeftArmDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3 } static s16 sBodyIndex[] = { 0, 95, 90, 85, 80, 75, 70, 65, 60, 55, 50, 45, 40, 35, 30, 25, 20, 15, 10, 5 }; -static s16 sManeIndex[] = { 0, 28, 26, 24, 22, 20, 18, 16, 14, 12, 10 }; // Unused +UNUSED static s16 sManeIndex[] = { 0, 28, 26, 24, 22, 20, 18, 16, 14, 12, 10 }; void BossFd_DrawMane(PlayState* play, BossFd* this, Vec3f* manePos, Vec3f* maneRot, f32* maneScale, u8 mode) { f32 sp140[] = { 0.0f, 10.0f, 17.0f, 20.0f, 19.5f, 18.0f, 17.0f, 15.0f, 15.0f, 15.0f }; diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index ff3e032d92a..d4817bcdf43 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -392,7 +392,7 @@ void BossFd2_SetupBreatheFire(BossFd2* this, PlayState* play) { this->work[FD2_ACTION_STATE] = 0; } -static Vec3f sUnkVec = { 0.0f, 0.0f, 50.0f }; // Unused? BossFd uses a similar array for its fire breath sfx. +UNUSED static Vec3f sUnkVec = { 0.0f, 0.0f, 50.0f }; // Unused? BossFd uses a similar array for its fire breath sfx. void BossFd2_BreatheFire(BossFd2* this, PlayState* play) { s16 i; diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.inc.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.inc.c index 407e0f020dc..5ab41213ddd 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.inc.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.inc.c @@ -329,7 +329,7 @@ static s16 D_809071CC[] = { 1, -1, 1, 1, 3, 4, 1, 6, 7, 2, 9, 10, 2, 12, 13 }; static u8 D_809071EC[] = { 3, 2, 2, 1, 3, 3, 1, 3, 3, 1, 0, 3, 1, 0, 3 }; // padding -static u32 D_809071FC[2] = { 0 }; +UNUSED static u32 D_809071FC[2] = { 0 }; #include "assets/overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.c" @@ -339,8 +339,7 @@ static EnZl3* sZelda; static Actor* D_8090EB30; -// unused -static UNK_TYPE D_8090EB34; +UNUSED static UNK_TYPE D_8090EB34; static BossGanon2Effect sEffects[BOSS_GANON2_EFFECT_COUNT]; @@ -348,8 +347,7 @@ static s32 sSeed1; static s32 sSeed2; static s32 sSeed3; -// unused -static UNK_TYPE D_809105DC; +UNUSED static UNK_TYPE D_809105DC; static Vec3f D_809105D8[4]; diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index 62aa20a76eb..459492d7676 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -227,8 +227,8 @@ static Vec3f sSubCamEyePoints[] = { static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f }; static u32 sBodyStatic = false; -// Unreferenced. Maybe two zero vectors? -static u32 sUnkValues[] = { 0, 0, 0, 0, 0, 0 }; +// Maybe two zero vectors? +UNUSED static u32 sUnkValues[] = { 0, 0, 0, 0, 0, 0 }; static Color_RGBA8 sBodyColor = { 255, 255, 255, 255 }; static Color_RGBA8 sStaticColor = { 0, 0, 0, 255 }; diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index 1f03939a5a3..6fa7bb1787d 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -3270,7 +3270,7 @@ void BossVa_Draw(Actor* thisx, PlayState* play) { CLOSE_DISPS(play->state.gfxCtx, "../z_boss_va.c", 4673); } -static s32 sUnkValue = 0x009B0000; // Unreferenced? Possibly a color +UNUSED static s32 sUnkValue = 0x009B0000; // Possibly a color void BossVa_UpdateEffects(PlayState* play) { BossVaEffect* effect = sEffects; diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index 559a8c46db5..4b2c19ab299 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -14,7 +14,7 @@ void DemoDu_Destroy(Actor* thisx, PlayState* play); void DemoDu_Update(Actor* thisx, PlayState* play); void DemoDu_Draw(Actor* thisx, PlayState* play); -static s32 sUnused = 0; +UNUSED static s32 sUnused = 0; #pragma asmproc recurse #include "z_demo_du_cutscene_data.inc.c" 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 c912878fea0..1af9b26781d 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -59,8 +59,7 @@ static s16 sObjIds[] = { OBJECT_GAMEPLAY_KEEP, OBJECT_GAMEPLAY_KEEP, OBJECT_GAMEPLAY_KEEP, }; -// unused, presumed to be floats -static f32 D_8098C314[] = { +UNUSED static f32 D_8098C314[] = { 0.0f, 150.0f, }; diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c index 1f0983b5dc2..29e3c2170b5 100644 --- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c +++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c @@ -185,7 +185,7 @@ void EfcErupc_DrawEffects(EfcErupcEffect* effect, PlayState* play) { CLOSE_DISPS(gfxCtx, "../z_efc_erupc.c", 399); } -static Color_RGB8 D_8099D770[] = { +UNUSED static Color_RGB8 D_8099D770[] = { { 255, 128, 0 }, { 255, 0, 0 }, { 255, 255, 0 }, 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 aebab8f6401..684ba5cac79 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -925,8 +925,8 @@ void EnAm_Update(Actor* thisx, PlayState* play) { } } -static Vec3f sUnused1 = { 1100.0f, -700.0f, 0.0f }; -static Vec3f sUnused2 = { 0.0f, 0.0f, 0.0f }; +UNUSED static Vec3f sUnused1 = { 1100.0f, -700.0f, 0.0f }; +UNUSED static Vec3f sUnused2 = { 0.0f, 0.0f, 0.0f }; void EnAm_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { EnAm* this = (EnAm*)thisx; 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 b719793b70a..286e48fedc9 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -152,7 +152,7 @@ static InitChainEntry sInitChain[] = { }; // possibly color data -static s32 sUnused[] = { 0xFFFFFFFF, 0x969696FF }; +UNUSED static s32 sUnused[] = { 0xFFFFFFFF, 0x969696FF }; void EnBigokuta_Init(Actor* thisx, PlayState* play) { EnBigokuta* this = (EnBigokuta*)thisx; 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 f1d65e14e05..cfc184254e1 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -69,7 +69,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_U8(targetMode, 0, ICHAIN_STOP), }; -static UNK_TYPE sUnused; +UNUSED static UNK_TYPE sUnused; void EnBox_SetupAction(EnBox* this, EnBoxActionFunc actionFunc) { this->actionFunc = actionFunc; 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 cfb6c5c2f48..a7be0deda3d 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 @@ -74,8 +74,8 @@ static ColliderCylinderInit sLaserCylinderInit = { { 15, 30, 10, { 0, 0, 0 } }, }; -static UNK_TYPE4 D_809D5C98 = 0; // unused -static UNK_TYPE4 D_809D5C9C = 0; // unused +UNUSED static UNK_TYPE4 D_809D5C98 = 0; +UNUSED static UNK_TYPE4 D_809D5C9C = 0; static EnClearTagEffect sEffects[CLEAR_TAG_EFFECT_COUNT]; diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index 6851555b328..def101fd65e 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -24,7 +24,7 @@ static s16 sEnExRuppyCollectibleTypes[] = { }; // Unused, as the function sets these directly -static s16 sRupeeValues[] = { +UNUSED static s16 sRupeeValues[] = { 1, 5, 20, 500, 50, }; diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index c7b61b8cded..ff4b1843910 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -696,7 +696,7 @@ void EnFhgFire_Update(Actor* thisx, PlayState* play) { this->updateFunc(this, play); } -static void* sDustTextures[] = { +UNUSED static void* sDustTextures[] = { gDust1Tex, gDust2Tex, gDust3Tex, gDust4Tex, gDust5Tex, gDust6Tex, gDust7Tex, gDust8Tex, }; diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index feb554feb15..bb3cbc63e35 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -60,7 +60,7 @@ static ColliderCylinderInit sCylinderInit = { }; // Unused, but probably intended to be this -static s16 sRupeeTypes[] = { +UNUSED static s16 sRupeeTypes[] = { ITEM00_RUPEE_GREEN, ITEM00_RUPEE_BLUE, ITEM00_RUPEE_RED, ITEM00_RUPEE_ORANGE, ITEM00_RUPEE_PURPLE, }; diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c index 07f6c80c288..c9fbfb69aeb 100644 --- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c +++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c @@ -59,7 +59,7 @@ static f32 sBackSwayCoefficients[GANON_MANT_NUM_JOINTS] = { 0.0f, 1.0f, 0.5f, 0.25f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, }; -static f32 D_80A24DB4[] = { +UNUSED static f32 D_80A24DB4[] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, }; @@ -68,7 +68,7 @@ static f32 sSideSwayCoefficients[GANON_MANT_NUM_JOINTS] = { 0.0f, 1.0f, 0.9f, 0.8f, 0.7f, 0.6f, 0.5f, 0.4f, 0.3f, 0.2f, 0.1f, 0.0f, }; -static f32 D_80A24E00[] = { +UNUSED static f32 D_80A24E00[] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, }; @@ -76,7 +76,7 @@ static f32 sDistMultipliers[GANON_MANT_NUM_JOINTS] = { 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.1f, 1.2f, 1.3f, 1.4f, 1.5f, 1.6f, 1.7f, }; -static f32 D_80A24E48[] = { +UNUSED static f32 D_80A24E48[] = { 1.8f, }; @@ -95,7 +95,7 @@ static u16 sVerticesMap[GANON_MANT_NUM_STRANDS * GANON_MANT_NUM_JOINTS] = { #define MANT_TEX_WIDTH 32 #define MANT_TEX_HEIGHT 64 -static u64 sForceAlignment = 0; +UNUSED static u64 sForceAlignment = 0; #include "assets/overlays/ovl_En_Ganon_Mant/ovl_En_Ganon_Mant.c" diff --git a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c index 371eb5de04c..73f8645758d 100644 --- a/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c +++ b/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c @@ -26,7 +26,7 @@ ActorInit En_Ganon_Organ_InitVars = { (ActorFunc)EnGanonOrgan_Draw, }; -static u64 sForceAlignment = 0; +UNUSED static u64 sForceAlignment = 0; #include "assets/overlays/ovl_En_Ganon_Organ/ovl_En_Ganon_Organ.c" diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index 2f1e2dd9d98..03c10da1069 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -209,7 +209,7 @@ static InitChainEntry sInitChain[] = { ICHAIN_F32_DIV1000(gravity, -3000, ICHAIN_STOP), }; -static Vec3f sUnusedOffset = { 1100.0f, -700.0f, 0.0f }; +UNUSED static Vec3f sUnusedOffset = { 1100.0f, -700.0f, 0.0f }; void EnGeldB_SetupAction(EnGeldB* this, EnGeldBActionFunc actionFunc) { this->actionFunc = actionFunc; diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index ae35cc1d6a2..bb5d785a517 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -168,7 +168,7 @@ static EnGo2DustEffectData sDustEffectData[2][4] = { }, }; -static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f }; +UNUSED static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f }; void EnGo2_SpawnEffectDust(EnGo2* this, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u8 initialTimer, f32 scale, f32 scaleStep) { 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 f9869f5980f..a1ebeb1688d 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -84,7 +84,7 @@ static ColliderJntSphInit sJntSphInit = { static CollisionCheckInfoInit sColChkInfoInit = { 0, 12, 60, MASS_HEAVY }; -static f32 sUnused[] = { 10.0f, 9.2f }; +UNUSED static f32 sUnused[] = { 10.0f, 9.2f }; void EnGoroiwa_UpdateCollider(EnGoroiwa* this) { static f32 yOffsets[] = { 0.0f, 59.5f }; 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 01d35d65ed5..d3030924791 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -27,7 +27,8 @@ ActorInit En_Hata_InitVars = { }; // Unused Collider and CollisionCheck data -static ColliderCylinderInit sCylinderInit = { + +UNUSED static ColliderCylinderInit sCylinderInit = { { COLTYPE_NONE, AT_NONE, @@ -47,7 +48,7 @@ static ColliderCylinderInit sCylinderInit = { { 16, 246, 0, { 0, 0, 0 } }, }; -static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE }; +UNUSED static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE }; void EnHata_Init(Actor* thisx, PlayState* play) { EnHata* this = (EnHata*)thisx; 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 17b4c0c6688..186e88fdea6 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -3816,8 +3816,7 @@ void EnHorse_PostDraw(Actor* thisx, PlayState* play, Skin* skin) { CollisionCheck_SetAC(play, &play->colChkCtx, &this->jntSph.base); } -// unused -static s32 D_80A667DC[] = { 0, 3, 7, 14 }; +UNUSED static s32 D_80A667DC[] = { 0, 3, 7, 14 }; s32 EnHorse_OverrideLimbDraw(Actor* thisx, PlayState* play, s32 limbIndex, Skin* arg3) { static void* eyeTextures[] = { 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 14babcca42e..46d8d663a9c 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 @@ -70,7 +70,7 @@ static f32 sFinishLine[4] = { -200.0f, 80.0f, -2300.0f, -1470.0f }; static f32 sRanchExit[4] = { 800.0f, 1000.0f, -2900.0f, -2700.0f }; -static Vec3f sUnusedZeroVec = { 0.0f, 0.0f, 0.0f }; +UNUSED static Vec3f sUnusedZeroVec = { 0.0f, 0.0f, 0.0f }; static Vec3f sFencePos[] = { { 820.0f, -44.0f, -1655.0f }, { 1497.0f, -21.0f, -1198.0f }, { 1655.0f, -44.0f, -396.0f }, diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index e7fdef53bd9..3503822ee16 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -126,24 +126,20 @@ static ColliderJntSphInit sJntSphInit = { static CollisionCheckInfoInit sColChkInfoInit = { 10, 35, 100, MASS_HEAVY }; -// Unused -static EnHorseNormalUnkStruct1 D_80A6D428[] = { +UNUSED static EnHorseNormalUnkStruct1 D_80A6D428[] = { { { 1058, 1, 384 }, 7 }, { { 1653, 39, -381 }, 6 }, { { 1606, 1, -1048 }, 6 }, { { 1053, 1, -1620 }, 6 }, { { -1012, 1, -1633 }, 7 }, { { -1655, 1, -918 }, 6 }, { { -1586, 1, -134 }, 6 }, { { -961, 1, 403 }, 7 }, }; -// Unused -static EnHorseNormalUnkStruct2 D_80A6D468 = { ARRAY_COUNT(D_80A6D428), D_80A6D428 }; +UNUSED static EnHorseNormalUnkStruct2 D_80A6D468 = { ARRAY_COUNT(D_80A6D428), D_80A6D428 }; -// Unused -static EnHorseNormalUnkStruct1 D_80A6D470[] = { +UNUSED static EnHorseNormalUnkStruct1 D_80A6D470[] = { { { 88, 0, 2078 }, 10 }, { { 2482, 376, 4631 }, 7 }, { { 2228, -28, 6605 }, 12 }, { { 654, -100, 8864 }, 7 }, { { -297, -500, 10667 }, 12 }, { { -5303, -420, 10640 }, 10 }, { { -6686, -500, 7760 }, 10 }, { { -5260, 100, 5411 }, 7 }, { { -3573, -269, 3893 }, 10 }, }; -// Unused -static EnHorseNormalUnkStruct2 D_80A6D4B8 = { ARRAY_COUNT(D_80A6D470), D_80A6D470 }; +UNUSED static EnHorseNormalUnkStruct2 D_80A6D4B8 = { ARRAY_COUNT(D_80A6D470), D_80A6D470 }; void func_80A6B250(EnHorseNormal* this) { static s32 D_80A6D4C0[] = { 0, 16 }; 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 3d783c622a3..5b85af98e76 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -897,8 +897,7 @@ s32 EnIk_OverrideLimbDrawEnemy(PlayState* play, s32 limbIndex, Gfx** dList, Vec3 return false; } -// unused -static Vec3f D_80A78470 = { 300.0f, 0.0f, 0.0f }; +UNUSED static Vec3f D_80A78470 = { 300.0f, 0.0f, 0.0f }; static Vec3f D_80A7847C[] = { { 800.0f, -200.0f, -5200.0f }, diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c index 7aad14e845a..dadb3a61792 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c @@ -40,12 +40,12 @@ ActorInit En_Jj_InitVars = { (ActorFunc)EnJj_Draw, }; -static s32 sUnused = 0; +UNUSED static s32 sUnused = 0; #pragma asmproc recurse #include "z_en_jj_cutscene_data.inc.c" -static s32 sUnused2[] = { 0, 0 }; +UNUSED static s32 sUnused2[] = { 0, 0 }; static ColliderCylinderInit sCylinderInit = { { diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c index 35f9a67f759..1c7788e6c21 100644 --- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c +++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c @@ -31,7 +31,7 @@ static u8 sShadowTex[0x800]; static Vec3s D_80A8EE10[0x90]; -static s32 sUnused[2] = { 0, 0 }; +UNUSED static u64 sForceAlignment = 0; #include "assets/overlays/ovl_En_Jsjutan/ovl_En_Jsjutan.c" 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 52d384e976f..c2c8b615ce1 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -795,7 +795,7 @@ static f32 sCutAngles[] = { /* CUT_VERT_R */ 0.00f * M_PI, }; -static s32 sUnused[] = { 0, 0, 0 }; // Unused zero vector? +UNUSED static s32 sUnused[] = { 0, 0, 0 }; // Unused zero vector? #include "assets/overlays/ovl_En_Kanban/ovl_En_Kanban.c" 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 26bc1f27d73..ade34eae62b 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -112,8 +112,7 @@ ActorInit En_Ossan_InitVars = { NULL, }; -// Unused collider -static ColliderCylinderInitType1 sCylinderInit = { +UNUSED static ColliderCylinderInitType1 sCylinderInit = { { COLTYPE_NONE, AT_NONE, @@ -138,8 +137,7 @@ static s16 sMaskPaymentPrice[] = { 10, 30, 20, 50 }; // item yaw offsets static s16 sItemShelfRot[] = { 0xEAAC, 0xEAAC, 0xEAAC, 0xEAAC, 0x1554, 0x1554, 0x1554, 0x1554 }; -// unused values? -static s16 D_80AC8904[] = { 0x001E, 0x001F, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025 }; +UNUSED static s16 D_80AC8904[] = { 0x001E, 0x001F, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025 }; static char* sShopkeeperPrintName[] = { "コキリの店 ", // "Kokiri Shop" diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index b5b3ca130f4..536d50fe985 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -104,7 +104,7 @@ static void* sMouthTextures[] = { gRutoChildMouthOpenTex, }; -static s32 sUnused = 0; +UNUSED static s32 sUnused = 0; #pragma asmproc recurse #include "z_en_ru1_cutscene_data.inc.c" diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c index 93b710cd9eb..a7ea7b71f0a 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1_cutscene_data.inc.c @@ -110,7 +110,7 @@ static CutsceneData D_80AF0880[] = { CS_END(), }; -static u32 D_80AF10A0 = 0; +UNUSED static u32 D_80AF10A0 = 0; static CutsceneData D_80AF10A4[] = { CS_BEGIN_CUTSCENE(14, 1299), @@ -199,7 +199,7 @@ static CutsceneData D_80AF10A4[] = { CS_END(), }; -static u32 D_80AF1724 = 0; +UNUSED static u32 D_80AF1724 = 0; static CutsceneData D_80AF1728[] = { CS_BEGIN_CUTSCENE(7, 1160), 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 a7443e5a338..9dbed6d1b4c 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -72,8 +72,8 @@ static Vec3f D_80AFA180[] = { { 1.0f, -2.0f, -0.2f }, { 0.0f, -3.0f, -0.5f }, }; -// Unused, identical to D_80AFA180 -static Vec3f D_80AFA288[] = { +// Identical to D_80AFA180 +UNUSED static Vec3f D_80AFA288[] = { { -1.0f, 2.0f, -0.2f }, { 0.0f, 2.0f, -0.5f }, { 1.0f, 2.0f, -0.2f }, { -2.0f, 1.0f, -0.5f }, { -1.0f, 1.0f, -0.2f }, { 0.0f, 1.0f, -0.2f }, { 1.0f, 1.0f, -0.2f }, { 2.0f, 1.0f, -0.5f }, { -2.0f, 0.0f, -0.5f }, { -1.0f, 0.0f, -0.2f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 0.0f, -0.2f }, @@ -82,7 +82,7 @@ static Vec3f D_80AFA288[] = { { 1.0f, -2.0f, -0.2f }, { 0.0f, -3.0f, -0.5f }, }; -static u32 D_80AFA390[] = { 0, 0 }; +UNUSED static u32 D_80AFA390[] = { 0, 0 }; #include "assets/overlays/ovl_En_Sda/ovl_En_Sda.c" diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c index 2038add766a..c8b938b660a 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -37,7 +37,7 @@ ActorInit En_Tr_InitVars = { // The first elements of these animation arrays are for Koume, the second for Kotake -static AnimationHeader* unused[] = { +UNUSED static AnimationHeader* unused[] = { &gKotakeKoumeStandingBroomOverRightShoulderAnim, &gKotakeKoumeStandingBroomOverLeftShoulderAnim, }; diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c index fb4776673e3..73a076b800f 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1_camera_data.inc.c @@ -1,7 +1,7 @@ #include "z_en_zl1.h" #include "z64cutscene_commands.h" -static CutsceneCameraDirection D_80B4D5C0[] = { +UNUSED static CutsceneCameraDirection D_80B4D5C0[] = { { { -440.0f, 117.0f, 0.0f }, { -490.0f, 120.0f, 0.0f }, 0, 45 }, { { -484.0f, 122.0f, -29.0f }, { -480.0f, 116.0f, 18.0f }, 0, 80 }, { { -413.0f, 136.0f, -72.0f }, { -403.0f, 141.0f, -89.0f }, 0, 25 }, @@ -199,7 +199,7 @@ static CutsceneCameraPoint D_80B4E4CC[] = { { -1, 0, 0, 20.799965f, { -549, 124, 29 } }, { -1, 0, 0, 20.799965f, { -549, 124, 29 } }, }; -static CutsceneCameraMove D_80B4E54C[] = { +UNUSED static CutsceneCameraMove D_80B4E54C[] = { { D_80B4D72C, D_80B4D7AC, 0 }, { D_80B4D82C, D_80B4D8CC, 0 }, { D_80B4D96C, D_80B4DA4C, 0 }, { D_80B4DB2C, D_80B4DBBC, 0 }, { D_80B4DC4C, D_80B4DD3C, 0 }, { D_80B4DE2C, D_80B4DF0C, 0 }, { D_80B4DFEC, D_80B4E08C, 0 }, { D_80B4E12C, D_80B4E1BC, 0 }, { D_80B4E24C, D_80B4E2CC, 0 }, diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 4393594ff91..b5ee570b152 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -1816,7 +1816,7 @@ void func_80B577BC(PlayState* play, Vec3f* vec) { static Vec3f D_80B5A498 = { 148.0f, 260.0f, -87.0f }; static Vec3f D_80B5A4A4 = { -12.0f, 260.0f, -147.0f }; -static Vec3f D_80B5A4B0 = { 42.0f, 260.0f, 13.0f }; +UNUSED static Vec3f D_80B5A4B0 = { 42.0f, 260.0f, 13.0f }; void func_80B57858(PlayState* play) { func_80B577BC(play, &D_80B5A498); diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index eb03303a309..555419c677f 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -339,7 +339,7 @@ static ColliderJntSphInit sJntSphInit = { static f32 sFishGroupVar = 0.0f; static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f }; -static Vec3f sUnusedVec = { 0.0f, 0.0f, 2000.0f }; +UNUSED static Vec3f sUnusedVec = { 0.0f, 0.0f, 2000.0f }; static Fishing* sFishingMain; static u8 sReelLock; diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c index 01baac92351..5cdd2edbaa4 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -50,8 +50,8 @@ ActorInit Item_Shield_InitVars = { (ActorFunc)ItemShield_Draw, }; -static Color_RGBA8 unused = { 255, 255, 0, 255 }; -static Color_RGBA8 unused2 = { 255, 0, 0, 255 }; +UNUSED static Color_RGBA8 unused = { 255, 255, 0, 255 }; +UNUSED static Color_RGBA8 unused2 = { 255, 0, 0, 255 }; void ItemShield_SetupAction(ItemShield* this, ItemShieldActionFunc actionFunc) { this->actionFunc = actionFunc; diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index fcc3b7b13d5..8b5c78e84d7 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -32,8 +32,7 @@ ActorInit Magic_Dark_InitVars = { #include "assets/overlays/ovl_Magic_Dark/ovl_Magic_Dark.c" -// unused -static Color_RGBA8 D_80B88B10[] = { { 50, 100, 150, 200 }, { 255, 200, 150, 100 } }; +UNUSED static Color_RGBA8 D_80B88B10[] = { { 50, 100, 150, 200 }, { 255, 200, 150, 100 } }; void MagicDark_Init(Actor* thisx, PlayState* play) { MagicDark* this = (MagicDark*)thisx; diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index d812f7eb3fb..1b55930a678 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -6417,7 +6417,7 @@ s32 Player_HandleSlopes(PlayState* play, Player* this, CollisionPoly* floorPoly) } // unknown data (unused) -static s32 D_80854598[] = { +UNUSED static s32 D_80854598[] = { 0xFFDB0871, 0xF8310000, 0x00940470, 0xF3980000, 0xFFB504A9, 0x0C9F0000, 0x08010402, }; @@ -14275,8 +14275,7 @@ void func_808519C0(PlayState* play, Player* this, CsCmdActorCue* cue) { func_80845964(play, this, cue, 0.0f, 0, 1); } -// unused -static LinkAnimationHeader* D_80855190[] = { +UNUSED static LinkAnimationHeader* D_80855190[] = { &gPlayerAnim_link_demo_back_to_past, &gPlayerAnim_clink_demo_goto_future, }; diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index 39c22782607..3ed83b0bfc1 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -3,7 +3,7 @@ #include "assets/textures/title_static/title_static.h" #include "assets/textures/parameter_static/parameter_static.h" -static s16 sUnused = 106; +UNUSED static s16 sUnused = 106; static s16 sScreenFillAlpha = 255; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index cf86415172e..e9aaf644aa9 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -208,7 +208,7 @@ static void* sSavePromptTexs[] = { gPauseSavePromptFRATex, }; -static void* sSaveConfirmationTexs[] = { +UNUSED static void* sSaveConfirmationTexs[] = { gPauseSaveConfirmationENGTex, gPauseSaveConfirmationGERTex, gPauseSaveConfirmationFRATex, From c8e11d0168c2d109fa606263fe115b13b34a986d Mon Sep 17 00:00:00 2001 From: Thar0 <17233964+Thar0@users.noreply.github.com> Date: Sun, 21 Jul 2024 23:54:46 +0100 Subject: [PATCH 13/14] Fix merge, updated for new versions --- Makefile | 4 +- include/attributes.h | 9 +- include/macros.h | 10 +- src/audio/general.c | 4 +- src/audio/sfx.c | 2 +- src/boot/logutils.c | 2 +- src/boot/stackcheck.c | 2 +- src/boot/z_std_dma.c | 14 +- src/code/__osMalloc.c | 2 +- src/code/code_800ACE70.c | 97 - src/code/code_800AD920.c | 60 - src/code/db_camera.c | 4 + src/code/game.c | 9 +- src/code/graph.c | 4 +- src/code/relocation.c | 2 +- src/code/sched.c | 2 +- src/code/sys_cfb.c | 2 +- src/code/sys_math3d.c | 2 +- src/code/sys_rumble.c | 2 +- src/code/ucode_disas.c | 4 + src/code/z_actor.c | 12 +- src/code/z_bgcheck.c | 6 +- src/code/z_camera.c | 53 +- src/code/z_demo.c | 2 +- src/code/z_horse.c | 5 +- src/code/z_jpeg.c | 4 +- src/code/z_message.c | 2 +- src/code/z_onepointdemo.c | 4 +- src/code/z_onepointdemo_data.inc.c | 3830 ----------------- src/code/z_parameter.c | 4 +- src/code/z_play.c | 2 +- src/code/z_skelanime.c | 8 +- src/code/z_sram.c | 2 +- src/code/z_viscvg.c | 2 +- src/code/z_vismono.c | 2 +- src/code/z_viszbuf.c | 2 +- .../ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c | 2 +- .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 2 +- src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 2 +- src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 2 +- src/overlays/actors/ovl_En_Ik/z_en_ik.c | 2 +- .../actors/ovl_En_Torch2/z_en_torch2.c | 8 +- src/overlays/actors/ovl_En_fHG/z_en_fhg.c | 2 +- src/overlays/actors/ovl_Fishing/z_fishing.c | 2 +- .../actors/ovl_player_actor/z_player.c | 4 +- .../ovl_file_choose/z_file_choose.c | 4 +- src/overlays/gamestates/ovl_select/z_select.c | 2 +- 47 files changed, 122 insertions(+), 4087 deletions(-) delete mode 100644 src/code/code_800ACE70.c delete mode 100644 src/code/code_800AD920.c delete mode 100644 src/code/z_onepointdemo_data.inc.c diff --git a/Makefile b/Makefile index 5364ae94321..02de59f6e3b 100644 --- a/Makefile +++ b/Makefile @@ -143,8 +143,8 @@ CHECK_WARNINGS += -Werror=implicit-function-declaration # Actors and effets are mostly callback functions and often don't use all arguments, # ignore those warnings entirely in these directories. -build/src/overlays/actors/%.o: CHECK_WARNINGS += -Wno-unused-parameter -build/src/overlays/effects/%.o: CHECK_WARNINGS += -Wno-unused-parameter +$(BUILD_DIR)/src/overlays/actors/%.o: CHECK_WARNINGS += -Wno-unused-parameter +$(BUILD_DIR)/src/overlays/effects/%.o: CHECK_WARNINGS += -Wno-unused-parameter # The `cpp` command behaves differently on macOS (it behaves as if # `-traditional-cpp` was passed) so we use `gcc -E` instead. diff --git a/include/attributes.h b/include/attributes.h index f58cc8122d5..928b278bdfa 100644 --- a/include/attributes.h +++ b/include/attributes.h @@ -5,8 +5,15 @@ #define __attribute__(x) #endif -#define UNUSED __attribute__((unused)) #define FALLTHROUGH __attribute__((fallthrough)) #define NORETURN __attribute__((noreturn)) +#define UNUSED __attribute__((unused)) +// Unused in non-debug versions only +#if OOT_DEBUG +#define UNUSED_NDEBUG +#else +#define UNUSED_NDEBUG __attribute__((unused)) +#endif + #endif diff --git a/include/macros.h b/include/macros.h index fddff89a5bb..874f0126ead 100644 --- a/include/macros.h +++ b/include/macros.h @@ -4,7 +4,9 @@ #ifndef GLUE #define GLUE(a,b) a##b #endif +#ifndef GLUE2 #define GLUE2(a,b) GLUE(a,b) +#endif #ifndef AVOID_UB #define BAD_RETURN(type) type @@ -216,10 +218,10 @@ struct GraphicsContext; #else -#define OPEN_DISPS(gfxCtx, file, line) \ - { \ - GraphicsContext* __gfxCtx = gfxCtx; \ - s32 __dispPad +#define OPEN_DISPS(gfxCtx, file, line) \ + { \ + UNUSED GraphicsContext* __gfxCtx = gfxCtx; \ + UNUSED s32 __dispPad #define CLOSE_DISPS(gfxCtx, file, line) \ (void)0; \ diff --git a/src/audio/general.c b/src/audio/general.c index 5e88692a800..a1fd642ef38 100644 --- a/src/audio/general.c +++ b/src/audio/general.c @@ -2320,10 +2320,10 @@ void AudioOcarina_ResetStaffs(void) { #if OOT_DEBUG #include "debug.inc.c" #else -void AudioDebug_Draw(GfxPrint* printer) { +void AudioDebug_Draw(UNUSED GfxPrint* printer) { } -void AudioDebug_ScrPrt(const char* str, u16 num) { +void AudioDebug_ScrPrt(UNUSED const char* str, UNUSED u16 num) { } #endif diff --git a/src/audio/sfx.c b/src/audio/sfx.c index 18f83324bbe..f605d359c10 100644 --- a/src/audio/sfx.c +++ b/src/audio/sfx.c @@ -68,7 +68,7 @@ void Audio_ClearBGMMute(u8 channelIndex) { } void Audio_PlaySfxGeneral(u16 sfxId, Vec3f* pos, u8 token, f32* freqScale, f32* vol, s8* reverbAdd) { - u8 i; + UNUSED_NDEBUG u8 i; SfxRequest* req; if (!gSfxBankMuted[SFX_BANK_SHIFT(sfxId)]) { diff --git a/src/boot/logutils.c b/src/boot/logutils.c index 68fcda21a4e..e370f81e0bb 100644 --- a/src/boot/logutils.c +++ b/src/boot/logutils.c @@ -103,7 +103,7 @@ void LogUtils_LogThreadId(const char* name, int line) { #endif void LogUtils_HungupThread(const char* name, int line) { - OSId threadId = osGetThreadId(NULL); + UNUSED_NDEBUG OSId threadId = osGetThreadId(NULL); PRINTF("*** HungUp in thread %d, [%s:%d] ***\n", threadId, name, line); Fault_AddHungupAndCrash(name, line); diff --git a/src/boot/stackcheck.c b/src/boot/stackcheck.c index aa0972d2f81..e99e4a08d5a 100644 --- a/src/boot/stackcheck.c +++ b/src/boot/stackcheck.c @@ -74,7 +74,7 @@ void StackCheck_Cleanup(StackEntry* entry) { u32 StackCheck_GetState(StackEntry* entry) { u32* last; - u32 used; + UNUSED_NDEBUG u32 used; u32 free; u32 ret; diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 56ba80c7a64..c949126e269 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -281,7 +281,7 @@ NORETURN void DmaMgr_Error(DmaRequest* req, const char* filename, const char* er * @param vrom Virtual ROM location * @return Pointer to associated filename */ -const char* DmaMgr_FindFileName(uintptr_t vrom) { +const char* DmaMgr_FindFileName(UNUSED_NDEBUG uintptr_t vrom) { #if OOT_DEBUG DmaEntry* iter = gDmaDataTable; const char** name = sDmaMgrFileNames; @@ -304,7 +304,7 @@ const char* DmaMgr_FindFileName(uintptr_t vrom) { #endif } -const char* DmaMgr_GetFileName(uintptr_t vrom) { +const char* DmaMgr_GetFileName(UNUSED_NDEBUG uintptr_t vrom) { #if OOT_DEBUG const char* ret = DmaMgr_FindFileName(vrom); @@ -331,7 +331,7 @@ void DmaMgr_ProcessRequest(DmaRequest* req) { size_t romSize; u8 found = false; DmaEntry* iter; - const char* filename; + UNUSED_NDEBUG const char* filename; #if OOT_DEBUG // Get the filename (for debugging) @@ -479,7 +479,7 @@ void DmaMgr_ThreadEntry(UNUSED void* arg) { */ s32 DmaMgr_RequestAsync(DmaRequest* req, void* ram, uintptr_t vrom, size_t size, UNUSED u32 unk, OSMesgQueue* queue, OSMesg msg) { - static s32 sDmaMgrQueueFullLogged = 0; + UNUSED_NDEBUG static s32 sDmaMgrQueueFullLogged = 0; #if OOT_DEBUG if ((ram == NULL) || (osMemSize < OS_K0_TO_PHYSICAL(ram) + size) || (vrom & 1) || (vrom > 0x4000000) || @@ -541,9 +541,9 @@ s32 DmaMgr_RequestSync(void* ram, uintptr_t vrom, size_t size) { } void DmaMgr_Init(void) { - const char** name; - s32 idx; - DmaEntry* iter; + UNUSED_NDEBUG const char** name; + UNUSED_NDEBUG s32 idx; + UNUSED_NDEBUG DmaEntry* iter; // DMA the dma data table to RAM DmaMgr_DmaRomToRam((uintptr_t)_dmadataSegmentRomStart, _dmadataSegmentStart, diff --git a/src/code/__osMalloc.c b/src/code/__osMalloc.c index 7c7b5aa8cda..5b0f1de4052 100644 --- a/src/code/__osMalloc.c +++ b/src/code/__osMalloc.c @@ -464,7 +464,7 @@ void* __osMallocR(Arena* arena, u32 size) { return alloc; } -void __osFree_NoLock(Arena* arena, void* ptr) { +void __osFree_NoLock(UNUSED_NDEBUG Arena* arena, void* ptr) { ArenaNode* node; ArenaNode* next; ArenaNode* prev; diff --git a/src/code/code_800ACE70.c b/src/code/code_800ACE70.c deleted file mode 100644 index baffc1b39a3..00000000000 --- a/src/code/code_800ACE70.c +++ /dev/null @@ -1,97 +0,0 @@ -#include "global.h" - -// Note : This file is related to z_vismono, the original name was probably z_vis - -Gfx D_8012AC00[] = { - gsDPSetOtherMode(G_AD_PATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_CONV | G_TF_POINT | G_TT_NONE | G_TL_TILE | - G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, - G_AC_NONE | G_ZS_PRIM | G_RM_VISCVG | G_RM_VISCVG2), - gsDPFillRectangle(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1), - gsDPPipeSync(), - gsDPSetBlendColor(0, 0, 0, 8), - gsSPEndDisplayList(), -}; - -Gfx D_8012AC28[] = { - gsDPSetOtherMode(G_AD_PATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_CONV | G_TF_POINT | G_TT_NONE | G_TL_TILE | - G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, - G_AC_NONE | G_ZS_PRIM | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | - GBL_c1(G_BL_CLR_FOG, G_BL_A_FOG, G_BL_CLR_MEM, G_BL_A_MEM) | - GBL_c2(G_BL_CLR_FOG, G_BL_A_FOG, G_BL_CLR_MEM, G_BL_A_MEM)), - gsDPFillRectangle(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1), - gsSPEndDisplayList(), -}; - -Gfx D_8012AC40[] = { - gsDPSetOtherMode(G_AD_PATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_CONV | G_TF_POINT | G_TT_NONE | G_TL_TILE | - G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, - G_AC_NONE | G_ZS_PRIM | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_MEM, G_BL_A_MEM) | - GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_MEM, G_BL_A_MEM)), - - gsDPFillRectangle(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1), - gsSPEndDisplayList(), -}; - -Gfx D_8012AC58[] = { - gsDPSetCombineMode(G_CC_PRIMITIVE, G_CC_PRIMITIVE), - gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_DISABLE | G_CK_NONE | G_TC_CONV | G_TF_POINT | G_TT_NONE | G_TL_TILE | - G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, - G_AC_NONE | G_ZS_PRIM | G_RM_CLD_SURF | G_RM_CLD_SURF2), - gsDPFillRectangle(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1), - gsDPSetOtherMode(G_AD_PATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_CONV | G_TF_POINT | G_TT_NONE | G_TL_TILE | - G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, - G_AC_NONE | G_ZS_PRIM | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | - GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_MEM, G_BL_A_MEM) | - GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_MEM, G_BL_A_MEM)), - gsDPFillRectangle(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1), - gsSPEndDisplayList(), -}; - -// Init -void func_800ACE70(struct_801664F0* this) { - this->type = 0; - this->setScissor = false; - this->color.r = 255; - this->color.g = 255; - this->color.b = 255; - this->color.a = 255; -} - -// Destroy -void func_800ACE90(UNUSED struct_801664F0* this) { -} - -// Draw -void func_800ACE98(struct_801664F0* this, Gfx** gfxp) { - Gfx* gfx = *gfxp; - - gDPPipeSync(gfx++); - gDPSetPrimDepth(gfx++, 0xFFFF, 0xFFFF); - - if (this->setScissor == true) { - gDPSetScissor(gfx++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); - } - - switch (this->type) { - case 1: - gSPDisplayList(gfx++, D_8012AC40); - break; - case 2: - gDPSetColor(gfx++, G_SETPRIMCOLOR, this->color.rgba); - gSPDisplayList(gfx++, D_8012AC58); - break; - case 3: - gDPSetColor(gfx++, G_SETBLENDCOLOR, this->color.rgba); - gSPDisplayList(gfx++, D_8012AC00); - break; - case 4: - gDPSetColor(gfx++, G_SETFOGCOLOR, this->color.rgba); - gSPDisplayList(gfx++, D_8012AC28); - break; - } - - gDPPipeSync(gfx++); - *gfxp = gfx; -} diff --git a/src/code/code_800AD920.c b/src/code/code_800AD920.c deleted file mode 100644 index b8702be33ce..00000000000 --- a/src/code/code_800AD920.c +++ /dev/null @@ -1,60 +0,0 @@ -#include "global.h" - -// Note : This file is related to z_vismono, the original name was probably z_vis - -// z-buffer -extern u16 D_0E000000[]; - -// Init -void func_800AD920(struct_80166500* this) { - this->useRgba = false; - this->setScissor = false; - this->primColor.r = 255; - this->primColor.g = 255; - this->primColor.b = 255; - this->primColor.a = 255; - this->envColor.a = 255; - this->envColor.r = 0; - this->envColor.g = 0; - this->envColor.b = 0; -} - -// Destroy -void func_800AD950(UNUSED struct_80166500* this) { -} - -// Draw -void func_800AD958(struct_80166500* this, Gfx** gfxp) { - Gfx* gfx = *gfxp; - u16* tex = D_0E000000; - s32 fmt = !this->useRgba ? G_IM_FMT_IA : G_IM_FMT_RGBA; - s32 y; - s32 height = 6; - - gDPPipeSync(gfx++); - if (this->setScissor == true) { - gDPSetScissor(gfx++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); - } - - gDPSetOtherMode(gfx++, - G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_POINT | G_TT_NONE | G_TL_TILE | - G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, - G_AC_NONE | G_ZS_PRIM | G_RM_OPA_SURF | G_RM_OPA_SURF2); - gDPSetCombineLERP(gfx++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT); - - gDPSetColor(gfx++, G_SETPRIMCOLOR, this->primColor.rgba); - gDPSetColor(gfx++, G_SETENVCOLOR, this->envColor.rgba); - - for (y = 0; y <= SCREEN_HEIGHT - height; y += height) { - gDPLoadTextureBlock(gfx++, tex, fmt, G_IM_SIZ_16b, SCREEN_WIDTH, height, 0, G_TX_NOMIRROR | G_TX_CLAMP, - G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - - gSPTextureRectangle(gfx++, 0, y << 2, SCREEN_WIDTH << 2, (y + height) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, - 1 << 10); - tex += SCREEN_WIDTH * height; - } - - gDPPipeSync(gfx++); - *gfxp = gfx; -} diff --git a/src/code/db_camera.c b/src/code/db_camera.c index 1a475027946..4ade8923e32 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -1,5 +1,7 @@ #include "global.h" +#if OOT_DEBUG + #define DEBUG_CAM_CONTROLLER_PORT 2 static PlayState* sPlay; @@ -2365,3 +2367,5 @@ void func_800BB060(void) { int func_800BB06C(void) { return sDebugCamPtr->unk_00 == 2 && sDebugCamAnim.unk_0A != 0; } + +#endif diff --git a/src/code/game.c b/src/code/game.c index 220108e864a..cf155b2a765 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -64,7 +64,7 @@ void GameState_SetFBFilter(Gfx** gfxP) { *gfxP = gfx; } -void func_800C4344(GameState* gameState) { +void func_800C4344(UNUSED_NDEBUG GameState* gameState) { #if OOT_DEBUG Input* selectedInput; s32 hexDumpSize; @@ -400,8 +400,8 @@ void GameState_Realloc(GameState* gameState, size_t size) { } void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* gfxCtx) { - OSTime startTime; - OSTime endTime; + UNUSED_NDEBUG OSTime startTime; + UNUSED_NDEBUG OSTime endTime; PRINTF("game コンストラクタ開始\n"); // "game constructor start" gameState->gfxCtx = gfxCtx; @@ -416,7 +416,8 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g gameState->size = (u32)(gameState->init = NULL); { - s32 requiredScopeTemp; + STACK_PAD(s32); + endTime = osGetTime(); // "game_set_next_game_null processing time %d us" PRINTF("game_set_next_game_null 処理時間 %d us\n", OS_CYCLES_TO_USEC(endTime - startTime)); diff --git a/src/code/graph.c b/src/code/graph.c index d27753e2b64..0ae60c61ec3 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -488,7 +488,7 @@ void Graph_ThreadEntry(UNUSED void* arg) { } void* Graph_Alloc(GraphicsContext* gfxCtx, size_t size) { - TwoHeadGfxArena* thga = &gfxCtx->polyOpa; + UNUSED_NDEBUG TwoHeadGfxArena* thga = &gfxCtx->polyOpa; if (HREG(59) == 1) { PRINTF("graph_alloc siz=%d thga size=%08x bufp=%08x head=%08x tail=%08x\n", size, thga->size, thga->start, @@ -498,7 +498,7 @@ void* Graph_Alloc(GraphicsContext* gfxCtx, size_t size) { } void* Graph_Alloc2(GraphicsContext* gfxCtx, size_t size) { - TwoHeadGfxArena* thga = &gfxCtx->polyOpa; + UNUSED_NDEBUG TwoHeadGfxArena* thga = &gfxCtx->polyOpa; if (HREG(59) == 1) { PRINTF("graph_alloc siz=%d thga size=%08x bufp=%08x head=%08x tail=%08x\n", size, thga->size, thga->start, diff --git a/src/code/relocation.c b/src/code/relocation.c index 48b04d8b04a..144c442d1e5 100644 --- a/src/code/relocation.c +++ b/src/code/relocation.c @@ -58,7 +58,7 @@ void Overlay_Relocate(void* allocatedRamAddr, OverlayRelocationSection* ovlReloc u32 dbg; s32 relocOffset = 0; u32 relocatedValue = 0; - uintptr_t unrelocatedAddress = 0; + UNUSED_NDEBUG uintptr_t unrelocatedAddress = 0; uintptr_t relocatedAddress = 0; STACK_PAD(s32); diff --git a/src/code/sched.c b/src/code/sched.c index 4e24b8d20b5..ce7a909a721 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -126,7 +126,7 @@ void Sched_SwapFrameBuffer(Scheduler* sc, CfbInfo* cfbInfo) { Sched_SwapFrameBufferImpl(cfbInfo); } -void Sched_HandlePreNMI(Scheduler* sc) { +void Sched_HandlePreNMI(UNUSED_NDEBUG Scheduler* sc) { #if OOT_DEBUG OSTime now; diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c index 041c72659c6..f3953f870e7 100644 --- a/src/code/sys_cfb.c +++ b/src/code/sys_cfb.c @@ -5,7 +5,7 @@ uintptr_t sSysCfbEnd; void SysCfb_Init(s32 n64dd) { u32 screenSize; - uintptr_t tmpFbEnd; + UNUSED_NDEBUG uintptr_t tmpFbEnd; if (osMemSize >= 0x800000) { // "8MB or more memory is installed" diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 2d013911600..f25398782f9 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -8,7 +8,7 @@ // For retail BSS ordering, the block number of cbf in Math3D_CylVsCylOverlapCenterDist // must be 0. -#pragma increment_block_number 108 +#pragma increment_block_number 109 s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB, Vec3f* lineAClosestToB, Vec3f* lineBClosestToA); diff --git a/src/code/sys_rumble.c b/src/code/sys_rumble.c index fdb204af570..9be36ef7dee 100644 --- a/src/code/sys_rumble.c +++ b/src/code/sys_rumble.c @@ -146,7 +146,7 @@ void RumbleMgr_Init(RumbleMgr* rumbleMgr) { rumbleMgr->updateEnabled = true; } -void RumbleMgr_Destroy(RumbleMgr* rumbleMgr) { +void RumbleMgr_Destroy(UNUSED_NDEBUG RumbleMgr* rumbleMgr) { #if OOT_DEBUG bzero(rumbleMgr, sizeof(RumbleMgr)); #endif diff --git a/src/code/ucode_disas.c b/src/code/ucode_disas.c index 17da885a6b1..e22d0f85911 100644 --- a/src/code/ucode_disas.c +++ b/src/code/ucode_disas.c @@ -1,5 +1,7 @@ #include "global.h" +#if OOT_DEBUG + typedef struct { /* 0x00 */ u32 value; /* 0x04 */ const char* name; @@ -1243,3 +1245,5 @@ void UCodeDisas_RegisterUCode(UCodeDisas* this, s32 count, UCodeInfo* ucodeArray void UCodeDisas_SetCurUCode(UCodeDisas* this, void* ptr) { UCodeDisas_SetCurUCodeImpl(this, ptr); } + +#endif diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 70a485d5456..fe7218e1661 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -837,8 +837,8 @@ void Actor_Init(Actor* actor, PlayState* play) { } void Actor_Destroy(Actor* actor, PlayState* play) { - ActorOverlay* overlayEntry; - char* name; + UNUSED_NDEBUG ActorOverlay* overlayEntry; + UNUSED_NDEBUG char* name; if (actor->destroy != NULL) { actor->destroy(actor, play); @@ -2307,7 +2307,7 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) { } void Actor_FaultPrint(Actor* actor, char* command) { - ActorOverlay* overlayEntry; + UNUSED_NDEBUG ActorOverlay* overlayEntry; char* name; if ((actor == NULL) || (actor->overlayEntry == NULL)) { @@ -2563,7 +2563,7 @@ void func_800315AC(PlayState* play, ActorContext* actorCtx) { while (actor != NULL) { ActorOverlay* overlayEntry = actor->overlayEntry; - char* actorName = overlayEntry->name != NULL ? overlayEntry->name : ""; + UNUSED_NDEBUG char* actorName = overlayEntry->name != NULL ? overlayEntry->name : ""; gDPNoOpString(POLY_OPA_DISP++, actorName, i); gDPNoOpString(POLY_XLU_DISP++, actorName, i); @@ -2830,7 +2830,7 @@ Actor* Actor_Spawn(ActorContext* actorCtx, PlayState* play, s16 actorId, f32 pos s32 objectSlot; ActorOverlay* overlayEntry; uintptr_t temp; - char* name; + UNUSED_NDEBUG char* name; u32 overlaySize; overlayEntry = &gActorOverlayTable[actorId]; @@ -3020,7 +3020,7 @@ Actor* Actor_SpawnEntry(ActorContext* actorCtx, ActorEntry* actorEntry, PlayStat } Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, PlayState* play) { - char* name; + UNUSED_NDEBUG char* name; Player* player; Actor* newHead; ActorOverlay* overlayEntry; diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index 74f5b48df18..cd62ce20019 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -1053,7 +1053,7 @@ s32 BgCheck_SphVsFirstStaticPolyList(SSNode* node, u16 xpFlags, CollisionContext Vec3s* vtxList = colCtx->colHeader->vtxList; while (true) { - u16 nextId; + STACK_PAD(s16); s16 curPolyId = node->polyId; CollisionPoly* curPoly = &polyList[curPolyId]; @@ -1540,9 +1540,9 @@ void BgCheck_Allocate(CollisionContext* colCtx, PlayState* play, CollisionHeader }; u32 tblMax; u32 memSize; - u32 lookupTblMemSize; + UNUSED_NDEBUG u32 lookupTblMemSize; s32 customNodeListMax; - SSNodeList* nodeList; + STACK_PAD(s32); u32 customMemSize; s32 useCustomSubdivisions; s32 i; diff --git a/src/code/z_camera.c b/src/code/z_camera.c index b7de4fdbc8b..3680e31d5b8 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -606,10 +606,10 @@ Vec3s* Camera_GetBgCamFuncData(Camera* camera) { */ s32 Camera_GetBgCamIndex(Camera* camera, s32* bgId, CollisionPoly* poly) { s32 bgCamIndex; - PosRot playerPosRot; + UNUSED PosRot playerPosRot; s32 ret; - playerPosRot = Actor_GetWorldPosShapeRot(&camera->player->actor); // unused. + playerPosRot = Actor_GetWorldPosShapeRot(&camera->player->actor); bgCamIndex = SurfaceType_GetBgCamIndex(&camera->play->colCtx, poly, *bgId); if (BgCheck_GetBgCamSettingImpl(&camera->play->colCtx, bgCamIndex, *bgId) == CAM_SET_NONE) { @@ -857,10 +857,10 @@ f32 Camera_ClampLERPScale(Camera* camera, f32 maxLERPScale) { return ret; } -void Camera_CopyDataToRegs(Camera* camera, s16 mode) { - CameraModeValue* values; - CameraModeValue* valueP; - s32 i; +void Camera_CopyDataToRegs(Camera* camera, UNUSED_NDEBUG s16 mode) { + UNUSED_NDEBUG CameraModeValue* values; + UNUSED_NDEBUG CameraModeValue* valueP; + UNUSED_NDEBUG s32 i; #if OOT_DEBUG if (PREG(82)) { @@ -941,7 +941,7 @@ void Camera_UpdateInterface(s16 interfaceField) { Vec3f Camera_BGCheckCorner(Vec3f* linePointA, Vec3f* linePointB, CamColChk* pointAColChk, CamColChk* pointBColChk) { Vec3f closestPoint; - bool result; + UNUSED_NDEBUG s32 result; result = func_800427B4(pointAColChk->poly, pointBColChk->poly, linePointA, linePointB, &closestPoint); #if OOT_DEBUG @@ -2340,7 +2340,7 @@ s32 Camera_Jump1(Camera* camera) { VecGeo eyeDiffGeo; VecGeo eyeDiffTarget; PosRot* playerPosRot = &camera->playerPosRot; - PosRot playerhead; + UNUSED PosRot playerhead; STACK_PAD(s16); Jump1ReadOnlyData* roData = &camera->paramData.jump1.roData; Jump1ReadWriteData* rwData = &camera->paramData.jump1.rwData; @@ -2483,7 +2483,7 @@ s32 Camera_Jump2(Camera* camera) { VecGeo adjAtToEyeDir; VecGeo bgChkPara; VecGeo atToEyeNextDir; - VecGeo atToEyeDir; + UNUSED VecGeo atToEyeDir; f32 temp_f14; f32 temp_f16; f32 sp90; @@ -2661,7 +2661,7 @@ s32 Camera_Jump3(Camera* camera) { Vec3f* eye = &camera->eye; Vec3f* at = &camera->at; Vec3f* eyeNext = &camera->eyeNext; - s32 prevMode; + UNUSED_NDEBUG s32 prevMode; f32 spC4; f32 spC0; f32 spBC; @@ -3459,13 +3459,13 @@ s32 Camera_KeepOn3(Camera* camera) { Actor* colChkActors[2]; VecGeo targetToPlayerDir; VecGeo atToEyeAdj; - VecGeo atToEyeDir; + UNUSED VecGeo atToEyeDir; VecGeo atToEyeNextDir; s32 i; s32 angleCnt; s16 sp82; s16 sp80; - PosRot playerPosRot; + UNUSED PosRot playerPosRot; PosRot* camPlayerPosRot = &camera->playerPosRot; KeepOn3ReadOnlyData* roData = &camera->paramData.keep3.roData; KeepOn3ReadWriteData* rwData = &camera->paramData.keep3.rwData; @@ -3644,7 +3644,7 @@ s32 Camera_KeepOn4(Camera* camera) { f32 temp_f0_2; CollisionPoly* spC0; VecGeo spB8; - VecGeo spB0; + UNUSED VecGeo spB0; VecGeo spA8; s16* temp_s0 = &camera->data2; s16 spA2; @@ -4179,7 +4179,7 @@ s32 Camera_Fixed3(Camera* camera) { Vec3f* eyeNext = &camera->eyeNext; VecGeo atGeo; BgCamFuncData* bgCamFuncData; - VecGeo eyeAtOffset; + UNUSED VecGeo eyeAtOffset; Fixed3ReadOnlyData* roData = &camera->paramData.fixd3.roData; Fixed3ReadWriteData* rwData = &camera->paramData.fixd3.rwData; STACK_PAD(s32); @@ -4337,7 +4337,7 @@ s32 Camera_Subj3(Camera* camera) { Vec3f* at = &camera->at; Vec3f* eyeNext = &camera->eyeNext; Vec3f sp98; - Vec3f sp8C; + UNUSED Vec3f sp8C; VecGeo sp84; VecGeo sp7C; VecGeo tGeo; @@ -4350,7 +4350,7 @@ s32 Camera_Subj3(Camera* camera) { Subj3ReadOnlyData* roData = &camera->paramData.subj3.roData; Subj3ReadWriteData* rwData = &camera->paramData.subj3.rwData; CameraModeValue* values; - Vec3f* atTemp; + STACK_PAD(s32); f32 playerHeight; sp60 = Actor_GetFocus(&camera->player->actor); @@ -4484,8 +4484,7 @@ s32 Camera_Subj4(Camera* camera) { VecGeo targetOffset; VecGeo atEyeOffset; s16 eyeToAtYaw; - STACK_PAD(s32); - f32 temp; + STACK_PADS(s32, 2); Subj4ReadOnlyData* roData = &camera->paramData.subj4.roData; Subj4ReadWriteData* rwData = &camera->paramData.subj4.rwData; @@ -4732,7 +4731,7 @@ s32 Camera_Unique1(Camera* camera) { VecGeo eyeAtOffset; VecGeo eyeNextAtOffset; PosRot* playerPosRot = &camera->playerPosRot; - PosRot playerhead; + UNUSED PosRot playerhead; Unique1ReadOnlyData* roData = &camera->paramData.uniq1.roData; Unique1ReadWriteData* rwData = &camera->paramData.uniq1.rwData; STACK_PAD(s32); @@ -4775,7 +4774,7 @@ s32 Camera_Unique1(Camera* camera) { camera->animState++; } - playerhead = Actor_GetFocus(&camera->player->actor); // unused + playerhead = Actor_GetFocus(&camera->player->actor); camera->yawUpdateRateInv = Camera_LERPCeilF(100.0f, camera->yawUpdateRateInv, CAM_UPDATE_RATE_STEP_SCALE_XZ, 0.1f); camera->pitchUpdateRateInv = @@ -6969,7 +6968,7 @@ s32 Camera_Special5(Camera* camera) { CamColChk sp7C; VecGeo sp74; VecGeo sp6C; - VecGeo sp64; + UNUSED VecGeo sp64; VecGeo sp5C; PosRot* playerPosRot = &camera->playerPosRot; Special5ReadOnlyData* roData = &camera->paramData.spec5.roData; @@ -7171,7 +7170,7 @@ s32 Camera_Special6(Camera* camera) { Vec3f eyePosCalc; Vec3f eyeAnim; Vec3f atAnim; - VecGeo eyeAtOffset; + UNUSED VecGeo eyeAtOffset; PosRot* playerPosRot = &camera->playerPosRot; BgCamFuncData* bgCamFuncData; Vec3s bgCamRot; @@ -7451,7 +7450,7 @@ void Camera_Init(Camera* camera, UNUSED View* view, UNUSED CollisionContext* col __osMemset(camera, 0, sizeof(Camera)); if (sInitRegs) { - s32 i; + UNUSED_NDEBUG s32 i; #if OOT_DEBUG for (i = 0; i < sOREGInitCnt; i++) { @@ -7636,9 +7635,9 @@ void Camera_InitDataUsingPlayer(Camera* camera, Player* player) { } s16 Camera_ChangeStatus(Camera* camera, s16 status) { - CameraModeValue* values; - CameraModeValue* valueP; - s32 i; + UNUSED_NDEBUG CameraModeValue* values; + UNUSED_NDEBUG CameraModeValue* valueP; + UNUSED_NDEBUG s32 i; #if OOT_DEBUG if (PREG(82)) { @@ -8576,7 +8575,7 @@ s32 Camera_RequestSetting(Camera* camera, s16 setting) { s32 Camera_RequestBgCam(Camera* camera, s32 requestedBgCamIndex) { s16 requestedCamSetting; - s16 settingChangeSuccessful; + UNUSED_NDEBUG s16 settingChangeSuccessful; if ((requestedBgCamIndex == -1) || (requestedBgCamIndex == camera->bgCamIndex)) { camera->behaviorFlags |= CAM_BEHAVIOR_BG_PROCESSED; diff --git a/src/code/z_demo.c b/src/code/z_demo.c index e079e24e7eb..25b17073e2f 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -122,7 +122,7 @@ u16 gCamAtPointAppliedFrame; // For retail BSS ordering, the block number of sReturnToCamId must be greater // than that of gCamAtPointAppliedFrame (declared in variables.h). -#pragma increment_block_number 180 +#pragma increment_block_number 181 // Cam ID to return to when a scripted cutscene is finished s16 sReturnToCamId; diff --git a/src/code/z_horse.c b/src/code/z_horse.c index cf2726b9524..09c9a39b03c 100644 --- a/src/code/z_horse.c +++ b/src/code/z_horse.c @@ -70,7 +70,7 @@ void func_8006D0EC(PlayState* play, Player* player) { horseActor->room = -1; } else if ((gSaveContext.save.entranceIndex == ENTR_LON_LON_RANCH_7) && GET_EVENTCHKINF(EVENTCHKINF_EPONA_OBTAINED)) { - Actor* horseActor = + UNUSED_NDEBUG Actor* horseActor = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, -25.0f, 0.0f, -1600.0f, 0, -0x4000, 0, 1); ASSERT(horseActor != NULL, "horse_actor != NULL", "../z_horse.c", 389); } else if ((play->sceneId == gSaveContext.save.info.horseData.sceneId) && @@ -97,7 +97,8 @@ void func_8006D0EC(PlayState* play, Player* player) { } } else if ((play->sceneId == SCENE_LON_LON_RANCH) && !Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) && (DREG(1) == 0)) { - Actor* horseActor = Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, 0.0f, 0.0f, -500.0f, 0, 0, 0, 1); + UNUSED_NDEBUG Actor* horseActor = + Actor_Spawn(&play->actorCtx, play, ACTOR_EN_HORSE, 0.0f, 0.0f, -500.0f, 0, 0, 0, 1); ASSERT(horseActor != NULL, "horse_actor != NULL", "../z_horse.c", 443); } else if (Flags_GetEventChkInf(EVENTCHKINF_EPONA_OBTAINED) || (DREG(1) != 0)) { for (i = 0; i < ARRAY_COUNT(horseSpawns); i++) { diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c index 2613a86a87c..fec55187c8d 100644 --- a/src/code/z_jpeg.c +++ b/src/code/z_jpeg.c @@ -229,7 +229,7 @@ void Jpeg_ParseMarkers(u8* ptr, JpegContext* ctx) { } } -s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) { +s32 Jpeg_Decode(void* data, void* zbuffer, void* work, UNUSED_NDEBUG u32 workSize) { s32 y; s32 x; u32 j; @@ -239,7 +239,7 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) { JpegDecoder decoder; JpegDecoderState state; JpegWork* workBuff; - OSTime diff; + UNUSED_NDEBUG OSTime diff; OSTime time; OSTime curTime; diff --git a/src/code/z_message.c b/src/code/z_message.c index e02809e5d19..347720f9baf 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -3132,7 +3132,7 @@ void Message_Update(PlayState* play) { MessageContext* msgCtx = &play->msgCtx; InterfaceContext* interfaceCtx = &play->interfaceCtx; Player* player = GET_PLAYER(play); - Input* input = &play->state.input[0]; + UNUSED_NDEBUG Input* input = &play->state.input[0]; s16 var; s16 focusScreenPosX; s16 averageY; diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index f8615dcb9dd..a2847a09c64 100644 --- a/src/code/z_onepointdemo.c +++ b/src/code/z_onepointdemo.c @@ -50,7 +50,7 @@ static CutsceneCameraPoint sCrawlspaceForwardsEyePoints[9] = { { CS_CAM_CONTINUE, 0, 0, 60.0f, { 0, 63, 119 } }, { CS_CAM_STOP, 0, 0, 60.0f, { 0, 62, 119 } }, { CS_CAM_STOP, 0, 0, 60.0f, { 0, 62, 119 } }, }; -static s16 sCrawlspaceUnused = 9; +UNUSED static s16 sCrawlspaceUnused = 9; static s16 sCrawlspaceTimer = 90; static s16 sCrawlspaceActionParam = 1; static CutsceneCameraPoint sCrawlspaceBackwardsEyePoints[10] = { @@ -121,7 +121,7 @@ static CutsceneCameraPoint D_80120820[12] = { { CS_CAM_CONTINUE, 1, 0, 65.0f, { 75, 18, 123 } }, { CS_CAM_CONTINUE, 1, 0, 65.0f, { 75, 10, 123 } }, { CS_CAM_STOP, 0, 0, 65.0f, { 75, 10, 122 } }, { CS_CAM_STOP, 0, 0, 65.0f, { 75, 10, 122 } }, }; -static s16 D_801208E0 = 12; +UNUSED static s16 D_801208E0 = 12; static s16 D_801208E4 = 90; static s16 D_801208E8 = 8; diff --git a/src/code/z_onepointdemo_data.inc.c b/src/code/z_onepointdemo_data.inc.c deleted file mode 100644 index 0105575d197..00000000000 --- a/src/code/z_onepointdemo_data.inc.c +++ /dev/null @@ -1,3830 +0,0 @@ -#include "global.h" - -static CutsceneCameraPoint D_8012013C[14] = { - { CS_CAM_CONTINUE, 25, 40, 70.79991f, { -1814, 533, -1297 } }, - { CS_CAM_CONTINUE, 20, 40, 70.99991f, { -1805, 434, -1293 } }, - { CS_CAM_CONTINUE, 10, 30, 60.0f, { -1794, 323, -1280 } }, - { CS_CAM_CONTINUE, 5, 25, 60.0f, { -1817, 218, -1270 } }, - { CS_CAM_CONTINUE, 3, 20, 60.0f, { -1836, 168, -1243 } }, - { CS_CAM_CONTINUE, 0, 20, 60.0f, { -1905, 115, -1193 } }, - { CS_CAM_CONTINUE, 0, 30, 55.0f, { -1969, 58, -1212 } }, - { CS_CAM_CONTINUE, 0, 30, 55.0f, { -1969, 31, -1164 } }, - { CS_CAM_CONTINUE, 0, 30, 60.0f, { -1969, 54, -1209 } }, - { CS_CAM_CONTINUE, 0, 30, 60.0f, { -1973, 35, -1206 } }, - { CS_CAM_CONTINUE, 0, 50, 60.0f, { -1974, 12, -1179 } }, - { CS_CAM_CONTINUE, 0, 50, 60.0f, { -1974, 12, -1179 } }, - { CS_CAM_STOP, 0, 50, 60.0f, { -1974, 12, -1179 } }, - { CS_CAM_STOP, 0, 30, 60.0f, { -1974, 12, -1179 } }, -}; -static CutsceneCameraPoint D_8012021C[14] = { - { CS_CAM_CONTINUE, 0, 0, 60.0f, { -1751, 604, -1233 } }, { CS_CAM_CONTINUE, 0, 0, 60.0f, { -1752, 516, -1233 } }, - { CS_CAM_CONTINUE, 0, 0, 60.0f, { -1751, 417, -1233 } }, { CS_CAM_CONTINUE, 0, 0, 60.0f, { -1767, 306, -1219 } }, - { CS_CAM_CONTINUE, 0, 0, 60.0f, { -1776, 257, -1205 } }, { CS_CAM_CONTINUE, 0, 0, 60.0f, { -1881, 147, -1149 } }, - { CS_CAM_CONTINUE, 0, 0, 60.0f, { -1969, 72, -1077 } }, { CS_CAM_CONTINUE, 0, 0, 60.0f, { -1969, 7, -1048 } }, - { CS_CAM_CONTINUE, 0, 0, 60.0f, { -1969, 1, -1030 } }, { CS_CAM_CONTINUE, 0, 0, 60.0f, { -1987, 17, -1076 } }, - { CS_CAM_CONTINUE, 0, 0, 60.0f, { -2007, 10, -1004 } }, { CS_CAM_CONTINUE, 0, 0, 60.0f, { -2007, 10, -1004 } }, - { CS_CAM_STOP, 0, 0, 60.0f, { -2007, 10, -1004 } }, { CS_CAM_STOP, 0, 0, 60.0f, { -2007, 10, -1004 } }, -}; -static s16 D_801202FC = 13; -static s16 D_80120300 = 210; -static s16 D_80120304 = 0; - -static CutsceneCameraPoint sCrawlspaceAtPoints[9] = { - { CS_CAM_CONTINUE, 0, 10, 40.0f, { 0, 4, 0 } }, { CS_CAM_CONTINUE, 0, 10, 40.000004f, { 0, 4, 0 } }, - { CS_CAM_CONTINUE, 0, 10, 50.0f, { 0, 9, 0 } }, { CS_CAM_CONTINUE, 0, 12, 55.0f, { 0, 12, 0 } }, - { CS_CAM_CONTINUE, 0, 15, 61.0f, { 0, 18, 0 } }, { CS_CAM_CONTINUE, 0, 20, 65.0f, { 0, 29, 0 } }, - { CS_CAM_CONTINUE, 0, 40, 60.0f, { 0, 34, 0 } }, { CS_CAM_STOP, 0, 40, 60.0f, { 0, 34, 0 } }, - { CS_CAM_STOP, 0, 10, 60.0f, { 0, 34, 0 } }, -}; -static CutsceneCameraPoint sCrawlspaceForwardsEyePoints[9] = { - { CS_CAM_CONTINUE, 0, 0, 60.0f, { 0, 9, 45 } }, { CS_CAM_CONTINUE, 0, 0, 60.0f, { 0, 8, 50 } }, - { CS_CAM_CONTINUE, 0, 0, 60.0f, { 0, 17, 58 } }, { CS_CAM_CONTINUE, 0, 0, 60.0f, { 0, 21, 78 } }, - { CS_CAM_CONTINUE, 0, 0, 60.0f, { 0, 46, 109 } }, { CS_CAM_CONTINUE, 0, 0, 60.0f, { 0, 58, 118 } }, - { CS_CAM_CONTINUE, 0, 0, 60.0f, { 0, 63, 119 } }, { CS_CAM_STOP, 0, 0, 60.0f, { 0, 62, 119 } }, - { CS_CAM_STOP, 0, 0, 60.0f, { 0, 62, 119 } }, -}; -UNUSED static s16 sCrawlspaceUnused = 9; -static s16 sCrawlspaceTimer = 90; -static s16 sCrawlspaceActionParam = 1; -static CutsceneCameraPoint sCrawlspaceBackwardsEyePoints[10] = { - { CS_CAM_CONTINUE, 0, 0, 60.0f, { 0, 9, -45 } }, { CS_CAM_CONTINUE, 0, 0, 60.0f, { 0, 9, -45 } }, - { CS_CAM_CONTINUE, 0, 0, 60.0f, { 0, 8, -50 } }, { CS_CAM_CONTINUE, 0, 0, 60.0f, { 0, 17, -58 } }, - { CS_CAM_CONTINUE, 0, 0, 60.0f, { 0, 21, -78 } }, { CS_CAM_CONTINUE, 0, 0, 60.0f, { 0, 46, -109 } }, - { CS_CAM_CONTINUE, 0, 0, 60.0f, { 0, 58, -118 } }, { CS_CAM_CONTINUE, 0, 0, 60.0f, { 0, 63, -119 } }, - { CS_CAM_STOP, 0, 0, 60.0f, { 0, 62, -119 } }, { CS_CAM_STOP, 0, 0, 60.0f, { 0, 62, -119 } }, -}; - -static CutsceneCameraPoint D_801204D4[14] = { - { CS_CAM_CONTINUE, -15, 40, 80.600006f, { -60, 332, 183 } }, - { CS_CAM_CONTINUE, -22, 30, 80.600006f, { -60, 332, 183 } }, - { CS_CAM_CONTINUE, -20, 38, 80.600006f, { -118, 344, 41 } }, - { CS_CAM_CONTINUE, -18, 32, 80.600006f, { -80, 251, -8 } }, - { CS_CAM_CONTINUE, -12, 28, 80.600006f, { -64, 259, -28 } }, - { CS_CAM_CONTINUE, -8, 22, 80.600006f, { -79, 200, -342 } }, - { CS_CAM_CONTINUE, -5, 10, 65.80005f, { -110, 140, -549 } }, - { CS_CAM_CONTINUE, -2, 8, 65.2f, { -74, 109, -507 } }, - { CS_CAM_CONTINUE, 0, 10, 65.80002f, { -32, 78, -680 } }, - { CS_CAM_CONTINUE, 0, 20, 85.199936f, { 25, 127, -950 } }, - { CS_CAM_CONTINUE, 0, 30, 85.199936f, { 25, 127, -950 } }, - { CS_CAM_CONTINUE, 0, 40, 85.199936f, { 25, 127, -950 } }, - { CS_CAM_STOP, 6, 30, 85.199936f, { 25, 127, -950 } }, - { CS_CAM_STOP, 0, 30, 85.199936f, { 25, 127, -950 } }, -}; -static CutsceneCameraPoint D_801205B4[14] = { - { CS_CAM_CONTINUE, 0, 0, 60.0f, { -225, 785, -242 } }, - { CS_CAM_CONTINUE, -21, 0, 80.600006f, { -245, 784, -242 } }, - { CS_CAM_CONTINUE, -21, 0, 80.600006f, { -288, 485, -379 } }, - { CS_CAM_CONTINUE, -21, 0, 80.600006f, { -250, 244, -442 } }, - { CS_CAM_CONTINUE, -21, 0, 80.600006f, { -163, 21, -415 } }, - { CS_CAM_CONTINUE, -21, 0, 80.600006f, { -98, 86, -520 } }, - { CS_CAM_CONTINUE, -21, 0, 80.600006f, { -86, 31, -816 } }, - { CS_CAM_CONTINUE, -21, 0, 80.600006f, { -74, 18, -931 } }, - { CS_CAM_CONTINUE, 1, 0, 80.600006f, { -91, 80, -1220 } }, - { CS_CAM_CONTINUE, 0, 0, 85.199936f, { 14, 153, -1340 } }, - { CS_CAM_CONTINUE, 0, 0, 85.199936f, { 28, 125, -1340 } }, - { CS_CAM_CONTINUE, 0, 0, 85.199936f, { 48, 124, -1340 } }, - { CS_CAM_STOP, 0, 0, 85.199936f, { 48, 124, -1502 } }, - { CS_CAM_STOP, 0, 0, 85.199936f, { 48, 124, -1262 } }, -}; -static s16 D_80120694 = 14; -static s16 D_80120698 = 190; -static s16 D_8012069C = 8; - -static CutsceneCameraPoint D_801206A0[12] = { - { CS_CAM_CONTINUE, 6, 20, 80.0f, { -96, 40, 170 } }, { CS_CAM_CONTINUE, 6, 20, 80.0f, { -96, 40, 170 } }, - { CS_CAM_CONTINUE, 6, 20, 70.0f, { -70, 35, 150 } }, { CS_CAM_CONTINUE, 5, 10, 60.0f, { -57, 34, 133 } }, - { CS_CAM_CONTINUE, 4, 25, 65.0f, { -22, 32, 110 } }, { CS_CAM_CONTINUE, 3, 12, 60.0f, { -9, 33, 98 } }, - { CS_CAM_CONTINUE, 3, 5, 65.0f, { -3, 29, 87 } }, { CS_CAM_CONTINUE, 2, 10, 65.0f, { -1, 15, 84 } }, - { CS_CAM_CONTINUE, 1, 200, 65.0f, { 0, 17, 82 } }, { CS_CAM_CONTINUE, 1, 500, 65.0f, { 0, 18, 82 } }, - { CS_CAM_STOP, 8, 50, 65.0f, { 0, 18, 82 } }, { CS_CAM_STOP, 11, 60, 65.0f, { 0, 18, 82 } }, -}; -static CutsceneCameraPoint D_80120760[12] = { - { CS_CAM_CONTINUE, 6, 0, 80.0f, { -50, 10, 180 } }, { CS_CAM_CONTINUE, 6, 0, 80.0f, { -50, 20, 180 } }, - { CS_CAM_CONTINUE, 6, 0, 70.0f, { -40, 30, 177 } }, { CS_CAM_CONTINUE, 5, 0, 65.0f, { 0, 35, 172 } }, - { CS_CAM_CONTINUE, 4, 0, 65.0f, { 34, 35, 162 } }, { CS_CAM_CONTINUE, 3, 0, 65.0f, { 61, 32, 147 } }, - { CS_CAM_CONTINUE, 3, 0, 65.0f, { 72, 30, 128 } }, { CS_CAM_CONTINUE, 2, 0, 65.0f, { 74, 20, 125 } }, - { CS_CAM_CONTINUE, 1, 0, 65.0f, { 75, 18, 123 } }, { CS_CAM_CONTINUE, 1, 0, 65.0f, { 75, 10, 123 } }, - { CS_CAM_STOP, 0, 0, 65.0f, { 75, 10, 122 } }, { CS_CAM_STOP, 0, 0, 65.0f, { 75, 10, 122 } }, -}; -static CutsceneCameraPoint D_80120820[12] = { - { CS_CAM_CONTINUE, 6, 0, 80.0f, { 85, 5, 170 } }, { CS_CAM_CONTINUE, 6, 0, 80.0f, { 85, 10, 170 } }, - { CS_CAM_CONTINUE, 6, 0, 70.0f, { 80, 20, 167 } }, { CS_CAM_CONTINUE, 5, 0, 65.0f, { 74, 25, 165 } }, - { CS_CAM_CONTINUE, 4, 0, 65.0f, { 63, 30, 162 } }, { CS_CAM_CONTINUE, 3, 0, 65.0f, { 66, 34, 147 } }, - { CS_CAM_CONTINUE, 3, 0, 65.0f, { 72, 34, 128 } }, { CS_CAM_CONTINUE, 2, 0, 65.0f, { 74, 20, 125 } }, - { CS_CAM_CONTINUE, 1, 0, 65.0f, { 75, 18, 123 } }, { CS_CAM_CONTINUE, 1, 0, 65.0f, { 75, 10, 123 } }, - { CS_CAM_STOP, 0, 0, 65.0f, { 75, 10, 122 } }, { CS_CAM_STOP, 0, 0, 65.0f, { 75, 10, 122 } }, -}; -UNUSED static s16 D_801208E0 = 12; -static s16 D_801208E4 = 90; -static s16 D_801208E8 = 8; - -static OnePointCsFull D_801208EC[3] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8), - 0x0101, - 1, - 0, - 60.0f, - 1.0f, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 1, - 0, - 60.0f, - 1.0f, - { 0.0f, -10.0f, 0.0f }, - { 0.0f, 0.0f, 150.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80120964[2] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 1, - 0, - 60.0f, - 1.0f, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0xA121, - 1, - 0, - 75.0f, - 0.6f, - { 0.0f, -10.0f, 0.0f }, - { 0.0f, 0.0f, 150.0f }, - }, -}; - -static OnePointCsFull D_801209B4[4] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8), - 0x0101, - 1, - 0, - 60.0f, - 0.9f, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x0100, - 29, - 0, - 45.0f, - 0.1f, - { 0.0f, -10.0f, 0.0f }, - { 0.0f, 0.0f, 150.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 10, - 0, - 60.0f, - 0.2f, - { 0.0f, -10.0f, 0.0f }, - { 0.0f, 0.0f, 150.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80120A54[3] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2525, - 1, - 0, - 75.0f, - 0.1f, - { 0.0f, 20.0f, -10.0f }, - { 0.0f, 10.0f, -40.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 9, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0022, - 5000, - 0, - 75.0f, - 0.005f, - { 0.0f, 0.0f, -10.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80120ACC[5] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0442, - 10, - 0, - 40.0f, - 1.0f, - { -10.0f, 45.0f, 20.0f }, - { 20.0f, 30.0f, 160.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_21, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 40.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x0442, - 10, - 0, - 40.0f, - 1.0f, - { -10.0f, 45.0f, 20.0f }, - { 20.0f, 30.0f, 160.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_21, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 40.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80120B94[11] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x2142, - 1, - 0, - 40.0f, - 1.0f, - { 20.0f, 40.0f, 20.0f }, - { -20.0f, 0.0f, -30.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0404, - 19, - 5, - 70.0f, - 0.01f, - { 0.0f, 30.0f, 20.0f }, - { 120.0f, 60.0f, 120.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0404, - 20, - 0, - 60.0f, - 0.01f, - { 0.0f, 20.0f, 20.0f }, - { 120.0f, 60.0f, 120.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0404, - 40, - -10, - 50.0f, - 0.02f, - { 0.0f, 30.0f, 20.0f }, - { 120.0f, 60.0f, 120.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4141, - 1, - 0, - 40.0f, - 1.0f, - { 0.0f, -10.0f, 20.0f }, - { 0.0f, 20.0f, 50.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0404, - 19, - 0, - 70.0f, - 0.01f, - { 0.0f, 30.0f, 20.0f }, - { 120.0f, 60.0f, 120.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0404, - 40, - 10, - 50.0f, - 0.01f, - { 0.0f, 20.0f, 20.0f }, - { 120.0f, 60.0f, 120.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0404, - 70, - 0, - 60.0f, - 0.01f, - { 0.0f, 30.0f, 20.0f }, - { 120.0f, 60.0f, 120.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4141, - 1, - 0, - 50.0f, - 1.0f, - { 0.0f, -10.0f, 0.0f }, - { 80.0f, 20.0f, 60.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_13, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4141, - 150, - 0, - 50.0f, - 1.0f, - { 0.0f, 5.0f, 0.0f }, - { 0.0f, 4.0f, 120.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_24, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 50.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80120D4C[7] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x2142, - 1, - 0, - 40.0f, - 1.0f, - { 20.0f, 40.0f, 20.0f }, - { -20.0f, 0.0f, -30.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0404, - 19, - 5, - 70.0f, - 0.01f, - { 0.0f, 30.0f, 20.0f }, - { 120.0f, 60.0f, 120.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0404, - 20, - 0, - 60.0f, - 0.01f, - { 0.0f, 20.0f, 20.0f }, - { 120.0f, 60.0f, 120.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0404, - 40, - -10, - 50.0f, - 0.02f, - { 0.0f, 30.0f, 20.0f }, - { 120.0f, 60.0f, 120.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4141, - 1, - 0, - 50.0f, - 1.0f, - { 0.0f, -10.0f, 0.0f }, - { 80.0f, 20.0f, 60.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_13, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4141, - 150, - 0, - 50.0f, - 1.0f, - { 0.0f, 5.0f, 0.0f }, - { 0.0f, 4.0f, 120.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_24, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 50.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80120E64[8] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, true, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x2142, - 20, - 0, - 50.0f, - 1.0f, - { -25.0f, 20.0f, 0.0f }, - { 0.0f, 0.0f, 5.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, true, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 80, - 0, - 50.0f, - 1.0f, - { -25.0f, 20.0f, 0.0f }, - { 0.0f, 0.0f, 5.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, true, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 8, - 0, - 60.0f, - 0.1f, - { -25.0f, 20.0f, 0.0f }, - { 0.0f, 0.0f, 5.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, true, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 15, - 4, - 55.0f, - 0.05f, - { -50.0f, 20.0f, 20.0f }, - { 0.0f, 0.0f, 5.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, true, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 15, - -4, - 50.0f, - 0.05f, - { 0.0f, 20.0f, 0.0f }, - { 0.0f, 0.0f, 5.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, true, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 15, - 0, - 50.0f, - 0.1f, - { -25.0f, 20.0f, 0.0f }, - { 0.0f, 0.0f, 5.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, true, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 40, - 0, - 50.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80120FA4[6] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x2143, - 30, - 0, - 70.0f, - 0.4f, - { 0.0f, 40.0f, 50.0f }, - { 30.0f, 10.0f, -50.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_21, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 50.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2222, - 10, - 0, - 42.0f, - 1.0f, - { 0.0f, 40.0f, 0.0f }, - { 0.0f, 85.0f, 45.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_16, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 50.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2121, - 10, - 0, - 60.0f, - 1.0f, - { 0.0f, 10.0f, 0.0f }, - { 30.0f, 10.0f, -80.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80121094[3] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8), - 0x2101, - 20, - 0, - 50.0f, - 1.0f, - { 3840.0f, 10.0f, 950.0f }, - { 0.0f, 0.0f, 5.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x2101, - 50, - 0, - 55.0f, - 1.0f, - { 4000.0f, 50.0f, 1000.0f }, - { 0.0f, 0.0f, 5.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_8012110C[3] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, true, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_5), - 0x2142, - 1, - 0, - 50.0f, - 1.0f, - { -25.0f, 20.0f, 0.0f }, - { 0.0f, 0.0f, 5.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, true, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2121, - 10, - 0, - 60.0f, - 1.0f, - { 0.0f, 10.0f, 0.0f }, - { 0.0f, 10.0f, -80.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80121184[2] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x0101, - 40, - 0, - -1.0f, - 0.1f, - { 0.0f, 10.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_801211D4[2] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8), - 0x0101, - 50, - 0, - 60.0f, - 1.0f, - { 0.0f, 10.0f, 0.0f }, - { -10.0f, 85.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80121224[6] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x4141, - 2, - 0, - 60.0f, - 1.0f, - { 0.0f, 5.0f, 10.0f }, - { 0.0f, 0.0f, 45.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4141, - 18, - 0, - 45.0f, - 1.0f, - { 0.0f, 5.0f, 10.0f }, - { 0.0f, -10.0f, 50.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_52), - 0x4104, - 80, - 0, - 70.0f, - 0.05f, - { 0.0f, 0.0f, 60.0f }, - { 0.0f, 250.0f, -50.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x0000, - 20, - 0, - 70.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0421, - 60, - 0, - 50.0f, - 1.0f, - { 0.0f, -30.0f, 20.0f }, - { 10.0f, 5.0f, -50.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80121314[1] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8), - 0x4141, - 1000, - 0, - 75.0f, - 0.6f, - { 0.0f, 0.0f, 10.0f }, - { 0.0f, 0.0f, 100.0f }, - }, -}; - -static OnePointCsFull D_8012133C[3] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x0141, - 40, - 0, - 75.0f, - 1.0f, - { 0.0f, 60.0f, 0.0f }, - { 0.0f, 0.0f, 100.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2121, - 20, - 0, - 60.0f, - 0.2f, - { 0.0f, -10.0f, -10.0f }, - { 0.0f, 10.0f, -100.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_801213B4[5] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8), - 0xC2C2, - 40, - 0, - 70.0f, - 1.0f, - { 80.0f, 0.0f, 20.0f }, - { 20.0f, 0.0f, 80.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0xC2C2, - 120, - 0, - 70.0f, - 0.1f, - { 80.0f, 0.0f, 20.0f }, - { 20.0f, 0.0f, 80.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_83), - 0xC2C2, - 30, - 0, - 50.0f, - 1.0f, - { 60.0f, 0.0f, 20.0f }, - { 60.0f, 0.0f, 60.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_69), - 0x4222, - 30, - 0, - 60.0f, - 0.1f, - { 0.0f, 50.0f, 0.0f }, - { 5.0f, 30.0f, 220.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 75.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_8012147C[4] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x0101, - 40, - 0, - 45.0f, - 1.0f, - { 820.0f, 1600.0f, -400.0f }, - { 777.0f, 1577.0f, -577.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x0142, - 1, - 0, - 50.0f, - 1.0f, - { -50.0f, 80.0f, 0.0f }, - { 900.0f, 1575.0f, 850.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8), - 0x0142, - 89, - -4, - 80.0f, - 0.07f, - { -50.0f, 70.0f, 0.0f }, - { 975.0f, 1575.0f, 770.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_8012151C[2] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x0101, - 29, - 0, - 60.0f, - 1.0f, - { -700.0f, 875.0f, -100.0f }, - { -550.0f, 920.0f, -150.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_8012156C[2] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_77), - 0x4242, - 1, - 0, - 65.0f, - 1.0f, - { 60.0f, 30.0f, 0.0f }, - { 50.0f, 20.0f, 150.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - -1, - 0, - 65.0f, - 1.0f, - { -50.0f, 60.0f, 0.0f }, - { -60.0f, 40.0f, 150.0f }, - }, -}; - -static OnePointCsFull D_801215BC[1] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 5, - 0, - 65.0f, - 1.0f, - { -1185.0f, 655.0f, 1185.0f }, - { -1255.0f, 735.0f, 1255.0f }, - }, -}; - -static OnePointCsFull D_801215E4[10] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8), - 0x4141, - 20, - 0, - 30.0f, - 1.0f, - { 0.0f, 120.0f, 0.0f }, - { -10.0f, 140.0f, -90.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x0101, - 1, - 4, - 75.0f, - 1.0f, - { -1360.0f, -940.0f, -3343.0f }, - { -1060.0f, -980.0f, -3325.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4141, - 129, - 0, - 75.0f, - 0.5f, - { 0.0f, 50.0f, 0.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0303, - 30, - 0, - 70.0f, - 0.05f, - { 0.0f, 80.0f, 0.0f }, - { -10.0f, 120.0f, 10.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_9), - 0x0101, - 40, - -5, - 70.0f, - 1.0f, - { -973.0f, -924.0f, -3263.0f }, - { -1190.0f, -1010.0f, -3365.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x0101, - 1, - 0, - 75.0f, - 1.0f, - { -1355.0f, -700.0f, -3340.0f }, - { -1040.0f, -940.0f, -3345.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 60, - 0, - 45.0f, - 0.8f, - { -1370.0f, -875.0f, -3345.0f }, - { -1230.0f, -885.0f, -3345.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 10, - 0, - 70.0f, - 1.0f, - { -1370.0f, -875.0f, -3345.0f }, - { -1210.0f, -900.0f, -3420.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 20, - 0, - 70.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80121774[4] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8), - 0x0101, - 1, - -2, - 75.0f, - 1.0f, - { -1340.0f, -860.0f, -3345.0f }, - { -1415.0f, -940.0f, -3520.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x0142, - 39, - 2, - 70.0f, - 1.0f, - { 0.0f, -20.0f, 10.0f }, - { -1140.0f, -1010.0f, -3560.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_5), - 0x0121, - 20, - 0, - 60.0f, - 1.0f, - { 0.0f, -20.0f, 20.0f }, - { -1220.0f, -1005.0f, -3660.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80121814[4] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_76), - 0x0101, - 5, - 0, - 40.0f, - 1.0f, - { -1400.0f, -540.0f, -3327.0f }, - { -1254.0f, -20.0f, -3357.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 70, - 0, - 75.0f, - 0.75f, - { -1327.0f, 100.0f, -3342.0f }, - { -1320.0f, 350.0f, -3540.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2121, - 10, - 0, - 60.0f, - 0.75f, - { 0.0f, 10.0f, 0.0f }, - { 0.0f, 20.0f, -150.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_801218B4[2] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 60, - 0, - 65.0f, - 1.0f, - { 0.0f, 350.0f, -1520.0f }, - { 0.0f, 715.0f, -885.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 100, - 0, - 70.0f, - 0.02f, - { 0.0f, 75.0f, -1335.0f }, - { 0.0f, 20.0f, -1190.0f }, - }, -}; - -static OnePointCsFull D_80121904[2] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 50, - 10, - 65.0f, - 1.0f, - { 165.0f, 85.0f, -920.0f }, - { 65.0f, -30.0f, -720.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -1, - -1.0f, - -1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80121954[3][2] = { - { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 20, - 5, - 60.0f, - 1.0f, - { -700.0f, 940.0f, 300.0f }, - { -765.0f, 1000.0f, 335.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 80, - -10, - 70.0f, - 0.1f, - { -540.0f, 875.0f, 245.0f }, - { -585.0f, 900.0f, 335.0f }, - }, - }, - { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 40, - -30, - 70.0f, - 1.0f, - { -80.0f, 115.0f, -180.0f }, - { -5.0f, 240.0f, -190.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 60, - 20, - 70.0f, - 0.1f, - { -100.0f, 350.0f, -175.0f }, - { -5.0f, 240.0f, -190.0f }, - }, - }, - { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 80, - 5, - 70.0f, - 0.2f, - { 960.0f, 900.0f, 260.0f }, - { 970.0f, 950.0f, 250.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 20, - 5, - 70.0f, - 1.0f, - { 960.0f, 900.0f, 260.0f }, - { 970.0f, 950.0f, 250.0f }, - }, - }, -}; - -static OnePointCsFull D_80121A44[12] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, true, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_5), - 0x2121, - 10, - 0, - 60.0f, - 1.0f, - { 0.0f, -5.0f, 0.0f }, - { 0.0f, 0.0f, -80.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, true, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x4242, - 30, - 0, - 50.0f, - 1.0f, - { 0.0f, 45.0f, 0.0f }, - { 0.0f, 45.0f, 50.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_21, true, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, true, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_5), - 0x2222, - 40, - 5, - 50.0f, - 1.0f, - { 0.0f, 50.0f, 0.0f }, - { 0.0f, 50.0f, 50.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, true, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x4242, - 40, - 5, - 60.0f, - 1.0f, - { 30.0f, 30.0f, 15.0f }, - { 70.0f, 30.0f, -40.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_21, true, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, true, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 30, - -5, - 50.0f, - 1.0f, - { 20.0f, 30.0f, -5.0f }, - { 0.0f, 70.0f, 70.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_16, true, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, true, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x2242, - 40, - 0, - 45.0f, - 1.0f, - { 0.0f, 30.0f, 30.0f }, - { 25.0f, 60.0f, -60.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, true, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x22C2, - 140, - 0, - 60.0f, - 0.04f, - { 0.0f, 0.0f, 30.0f }, - { 25.0f, 60.0f, -60.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_9, true, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2222, - 20, - 0, - 60.0f, - 0.8f, - { 0.0f, 50.0f, 0.0f }, - { 0.0f, 60.0f, -60.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80121C24[7] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_5), - 0x0101, - 1, - 0, - 60.0f, - 1.0f, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 89, - 0, - 50.0f, - 0.4f, - { 125.0f, 320.0f, -1500.0f }, - { 125.0f, 500.0f, -1150.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8), - 0x0101, - 40, - 4, - 55.0f, - 1.0f, - { 0.0f, 375.0f, -1440.0f }, - { 5.0f, 365.0f, -1315.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 40, - -4, - 55.0f, - 1.0f, - { 250.0f, 375.0f, -1440.0f }, - { 235.0f, 365.0f, -1315.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 100, - 0, - 95.0f, - 1.0f, - { 125.0f, 345.0f, -1500.0f }, - { 125.0f, 255.0f, -1350.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 100, - 0, - 60.0f, - 1.0f, - { 125.0f, 325.0f, -1500.0f }, - { 125.0f, 480.0f, -1000.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80121D3C[3] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 1, - 0, - 60.0f, - 1.0f, - { 1023.0f, 738.0f, -2628.0f }, - { 993.0f, 770.0f, -2740.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 4, - 0, - 50.0f, - 1.0f, - { 1255.0f, 350.0f, -1870.0f }, - { 1240.0f, 575.0f, -2100.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - -1, - 0, - 75.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80121DB4[9] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 40, - 0, - 70.0f, - 1.0f, - { 4290.0f, -1332.0f, -1900.0f }, - { 4155.0f, -1360.0f, -1840.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 60, - 0, - 70.0f, - 1.0f, - { 4215.0f, -975.0f, -2095.0f }, - { 4070.0f, -1000.0f, -2025.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 5, - 0, - 70.0f, - 1.0f, - { 4215.0f, -975.0f, -2095.0f }, - { 4070.0f, -1000.0f, -2025.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 80, - 8, - 75.0f, - 1.0f, - { 4010.0f, -1152.0f, -1728.0f }, - { 3997.0f, -1194.0f, -1629.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_57), - 0x2121, - 1, - 8, - 75.0f, - 1.0f, - { 20.0f, 20.0f, 0.0f }, - { 50.0f, 30.0f, 200.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2121, - 99, - 2, - 70.0f, - 0.02f, - { -20.0f, 0.0f, 20.0f }, - { 300.0f, 50.0f, -500.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_9, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_56), - 0x2121, - 149, - -20, - 70.0f, - 0.1f, - { 100.0f, 50.0f, -100.0f }, - { 5000.0f, 1055.0f, -2250.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2121, - 1, - 0, - 60.0f, - 1.0f, - { 0.0f, -20.0f, 0.0f }, - { 0.0f, 20.0f, -150.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -1, - -1.0f, - -1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80121F1C[4] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8), - 0x0101, - 10, - 0, - 60.0f, - 1.0f, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2121, - 10, - 0, - 50.0f, - 0.5f, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 150.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_2), - 0x2121, - 23, - 0, - 50.0f, - 0.5f, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 150.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -1, - -1.0f, - -1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80121FBC[4] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 5, - 0, - 60.0f, - 1.0f, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 10, - 0, - 30.0f, - 1.0f, - { -2130.0f, 2885.0f, -1055.0f }, - { -2085.0f, 2875.0f, -1145.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 30, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -1, - -1.0f, - -1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_8012205C[3] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x42C2, - 1, - 0, - 50.0f, - 1.0f, - { 0.0f, 220.0f, 0.0f }, - { 0.0f, 220.0f, 240.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0080, - 29, - 0, - 50.0f, - 1.0f, - { 0.0f, 220.0f, 0.0f }, - { 0.0f, 220.0f, 240.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x21A1, - 10, - 0, - 60.0f, - 1.0f, - { 0.0f, -10.0f, 0.0f }, - { 0.0f, 10.0f, -200.0f }, - }, -}; - -static OnePointCsFull D_801220D4[5] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x0101, - 5, - 0, - 60.0f, - 1.0f, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4141, - 10, - 5, - 55.0f, - 0.75f, - { 400.0f, -50.0f, 800.0f }, - { 600.0f, -60.0f, 800.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4141, - 15, - 10, - 40.0f, - 0.75f, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 10.0f, 200.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 25, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -1, - -1.0f, - -1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_8012219C[7] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2121, - 5, - 0, - 60.0f, - 1.0f, - { 0.0f, -5.0f, 0.0f }, - { 0.0f, 0.0f, -80.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 15, - 0, - 40.0f, - 0.4f, - { 0.0f, 60.0f, -20.0f }, - { 0.0f, 60.0f, 100.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 20, - 0, - 40.0f, - 1.0f, - { 0.0f, 60.0f, -20.0f }, - { 0.0f, 60.0f, 100.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 20, - 0, - 60.0f, - 1.0f, - { 20.0f, 60.0f, 20.0f }, - { 40.0f, 60.0f, -80.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_16, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 90, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -1, - -1.0f, - -1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_801222B4[5] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 20, - 10, - 45.0f, - 1.0f, - { -1200.0f, 730.0f, -860.0f }, - { -1100.0f, 500.0f, -1025.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 20, - 10, - 45.0f, - 0.1f, - { -880.0f, 480.0f, -860.0f }, - { -1100.0f, 500.0f, -1025.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, false, false), - ONEPOINT_CS_INIT_FIELD_ACTORCAT(ACTORCAT_BG), - 0x0101, - 20, - 10, - 45.0f, - 0.1f, - { -880.0f, 500.0f, -860.0f }, - { -1100.0f, 500.0f, -1025.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, false, false), - ONEPOINT_CS_INIT_FIELD_ACTORCAT(ACTORCAT_DOOR), - 0x0101, - 5, - 10, - 45.0f, - 0.1f, - { -880.0f, 500.0f, -860.0f }, - { -1100.0f, 500.0f, -1025.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -1, - -1.0f, - -1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_8012237C[2] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 20, - -2, - 65.0f, - 1.0f, - { -625.0f, 185.0f, -685.0f }, - { -692.0f, 226.0f, -515.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -1, - -1.0f, - -1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_801223CC[6] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 20, - 0, - 55.0f, - 1.0f, - { 60.0f, 1130.0f, -1430.0f }, - { 60.0f, 1130.0f, -1190.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 18, - -13, - 68.0f, - 1.0f, - { 60.0f, 1130.0f, -1445.0f }, - { 180.0f, 1170.0f, -1240.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 16, - 18, - 75.0f, - 1.0f, - { 42.0f, 1040.0f, -1400.0f }, - { -20.0f, 940.0f, -1280.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 4, - 0, - 60.0f, - 1.0f, - { 60.0f, 1100.0f, -1465.0f }, - { 60.0f, 1100.0f, -1180.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 32, - 0, - 70.0f, - 1.0f, - { 60.0f, 1100.0f, -1030.0f }, - { 60.0f, 1150.0f, -740.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -1, - -1.0f, - -1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_801224BC[7] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 5, - 0, - 70.0f, - 1.0f, - { 60.0f, 1800.0f, -920.0f }, - { 60.0f, 1860.0f, -800.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 20, - 0, - 70.0f, - 0.1f, - { 60.0f, 1720.0f, -920.0f }, - { 60.0f, 1780.0f, -800.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_16, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0142, - 1, - 0, - 75.0f, - 1.0f, - { 0.0f, 70.0f, 0.0f }, - { 60.0f, 990.0f, -690.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0142, - 119, - 0, - 75.0f, - 0.05f, - { 0.0f, 70.0f, 0.0f }, - { 60.0f, 990.0f, -690.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 20, - 0, - 60.0f, - 0.1f, - { 0.0f, 70.0f, 0.0f }, - { 0.0f, 100.0f, 200.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -1, - -1.0f, - -1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_801225D4[5] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8), - 0x0101, - 1, - 0, - 50.0f, - 1.0f, - { 4100.0f, 1200.0f, -1400.0f }, - { 3900.0f, 1100.0f, -1400.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_59), - 0x0101, - 60, - 4, - 50.0f, - 0.94f, - { 4100.0f, 965.0f, -1385.0f }, - { 3790.0f, 825.0f, -1325.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 90, - -5, - 130.0f, - 0.02f, - { 4100.0f, 975.0f, -1375.0f }, - { 3735.0f, 715.0f, -1325.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8), - 0x2323, - 2, - 0, - 60.0f, - 1.0f, - { 0.0f, 60.0f, 0.0f }, - { -10.0f, 15.0f, -200.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_8012269C[3] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 20, - 2, - 45.0f, - 1.0f, - { 975.0f, 225.0f, -1195.0f }, - { 918.0f, 228.0f, -1228.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_16, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -1, - -1.0f, - -1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80122714[4] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 20, - 0, - 45.0f, - 1.0f, - { -915.0f, -2185.0f, 6335.0f }, - { -915.0f, -2290.0f, 6165.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - -1, - 0, - 80.0f, - 0.8f, - { -920.0f, -2270.0f, 6140.0f }, - { -920.0f, -2280.0f, 6070.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 20, - 0, - 80.0f, - 0.9f, - { -920.0f, -2300.0f, 6140.0f }, - { -920.0f, -2300.0f, 6070.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -1, - -1.0f, - -1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_801227B4[6] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 30, - 0, - 60.0f, - 1.0f, - { 1400.0f, 100.0f, -170.0f }, - { 1250.0f, 100.0f, -170.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 130, - 0, - 60.0f, - 0.2f, - { 0.0f, -5.0f, 0.0f }, - { -150.0f, -5.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_16, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0303, - 69, - 0, - 85.0f, - 1.0f, - { -40.0f, 0.0f, 0.0f }, - { -40.0f, 0.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0303, - 20, - 0, - 60.0f, - 1.0f, - { 10.0f, 0.0f, 0.0f }, - { 10.0f, 0.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -1, - -1.0f, - -1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_801228A4[5] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x0101, - 20, - 5, - 30.0f, - 1.0f, - { 800.0f, -40.0f, 2170.0f }, - { 512.0f, 142.0f, 2020.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 20, - -2, - 70.0f, - 0.8f, - { 800.0f, -40.0f, 2170.0f }, - { 512.0f, 142.0f, 2020.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_8), - 0x0101, - 90, - 2, - 62.0f, - 1.0f, - { 1140.0f, 125.0f, 1920.0f }, - { 1255.0f, 150.0f, 1785.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2121, - 10, - 0, - 60.0f, - 1.0f, - { 0.0f, 10.0f, 0.0f }, - { 30.0f, 10.0f, -80.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_8012296C[4] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 20, - -10, - 70.0f, - 1.0f, - { -930.0f, 765.0f, -3075.0f }, - { -700.0f, 700.0f, -3075.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 80, - -10, - 70.0f, - 0.05f, - { -930.0f, 205.0f, -3075.0f }, - { -700.0f, 140.0f, -3075.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 120, - 0, - 70.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80122A0C[2] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 60, - 4, - 50.0f, - 1.0f, - { 0.0f, 400.0f, -1000.0f }, - { -200.0f, 500.0f, -850.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 50.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80122A5C[8] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 1, - -15, - 70.0f, - 1.0f, - { 230.0f, 3675.0f, -4230.0f }, - { -45.0f, 3650.0f, -4415.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_21, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 1, - 0, - 60.0f, - 1.0f, - { -120.0f, 2187.0f, -3286.0f }, - { -110.0f, 2162.0f, -3262.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_21, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 55, - 0, - 60.0f, - 1.0f, - { -38.0f, 1467.0f, -1102.0f }, - { 64.0f, 1423.0f, -1188.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 1, - -15, - 70.0f, - 1.0f, - { 230.0f, 3675.0f, -4230.0f }, - { -20.0f, 3650.0f, -4400.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_16, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80122B9C[3] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 60, - 0, - 65.0f, - 1.0f, - { 1095.0f, 2890.0f, -2980.0f }, - { 1166.0f, 2695.0f, -2710.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 60, - 15, - 65.0f, - 1.0f, - { 566.0f, 4654.0f, -4550.0f }, - { 606.0f, 5160.0f, -4740.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80122C14[1] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 999, - 0, - 85.0f, - 1.0f, - { -15.0f, 185.0f, 160.0f }, - { -15.0f, 210.0f, 250.0f }, - }, -}; - -static OnePointCsFull D_80122C3C[1] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 999, - -2, - 70.0f, - 1.0f, - { -62.0f, 60.0f, -315.0f }, - { -115.0f, 30.0f, -445.0f }, - }, -}; - -static OnePointCsFull D_80122C64[1] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 999, - 3, - 70.0f, - 1.0f, - { -40.0f, 80.0f, 375.0f }, - { -85.0f, 45.0f, 485.0f }, - }, -}; - -static OnePointCsFull D_80122C8C[1] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 999, - 5, - 60.0f, - 1.0f, - { -70.0f, 140.0f, 25.0f }, - { 10.0f, 180.0f, 195.0f }, - }, -}; - -static OnePointCsFull D_80122CB4[2] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 5, - 0, - 60.0f, - 1.0f, - { 0.0f, 0.0f, 1000.0f }, - { 0.0f, 0.0f, 1100.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - -1, - 0, - 60.0f, - 1.0f, - { 0.0f, 0.0f, -100.0f }, - { 0.0f, 0.0f, 0.0f }, - }, -}; - -static OnePointCsFull D_80122D04[2] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 10, - 0, - 60.0f, - 1.0f, - { 0.0f, 0.0f, -100.0f }, - { 0.0f, 0.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - -1, - 0, - 60.0f, - 1.0f, - { 0.0f, 0.0f, 1000.0f }, - { 0.0f, 0.0f, 1100.0f }, - }, -}; - -static OnePointCsFull D_80122D54[3] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 1, - -4, - 50.0f, - 1.0f, - { 230.0f, 65.0f, 300.0f }, - { 50.0f, 50.0f, 225.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_16, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -1, - -1.0f, - -1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80122DCC[3] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 1, - 0, - 50.0f, - 1.0f, - { 0.0f, 5.0f, -145.0f }, - { 0.0f, 55.0f, 55.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_16, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_17, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -1, - -1.0f, - -1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80122E44[2][7] = { - { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2222, - 10, - 5, - 90.0f, - 0.2f, - { 50.0f, 100.0f, 140.0f }, - { -30.0f, 10.0f, -20.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 20, - 0, - 90.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4343, - 30, - -5, - 50.0f, - 0.2f, - { -10.0f, 80.0f, 10.0f }, - { 20.0f, 20.0f, 120.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_16, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -5, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x4343, - 160, - 10, - 80.0f, - 0.005f, - { -50.0f, 60.0f, 0.0f }, - { -100.0f, 20.0f, 50.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0501, - 50, - 0, - 60.0f, - 1.0f, - { 0.0f, -10.0f, 0.0f }, - { 0.0f, 10.0f, 80.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_19, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -1, - -1.0f, - -1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - }, - { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2222, - 10, - -5, - 90.0f, - 0.2f, - { -50.0f, 100.0f, 140.0f }, - { 30.0f, 10.0f, -20.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 20, - 0, - 90.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4343, - 30, - 5, - 50.0f, - 0.2f, - { 10.0f, 80.0f, 10.0f }, - { -20.0f, 20.0f, 120.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_16, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 5, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x4343, - 160, - -10, - 80.0f, - 0.005f, - { 50.0f, 60.0f, 0.0f }, - { 100.0f, 20.0f, 50.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0501, - 50, - 0, - 60.0f, - 1.0f, - { 0.0f, -10.0f, 0.0f }, - { 0.0f, 10.0f, 80.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_19, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - -1, - -1.0f, - -1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - }, -}; - -static OnePointCsFull D_80123074[5] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0xA2A2, - 2, - 8, - 70.0f, - 1.0f, - { -27.0f, -96.0f, 25.0f }, - { 37.0f, -5.0f, 100.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0xA2A2, - 38, - 4, - 60.0f, - 1.0f, - { 64.0f, -109.0f, 55.0f }, - { 37.0f, 150.0f, 155.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0xA2A2, - 2, - 8, - 70.0f, - 1.0f, - { 45.0f, 123.0f, 45.0f }, - { 70.0f, 5.0f, 125.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0xA2A2, - 58, - 4, - 60.0f, - 0.9f, - { 82.0f, 95.0f, 55.0f }, - { 25.0f, -175.0f, 180.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_8012313C[3] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0xA2A2, - 20, - 8, - 70.0f, - 1.0f, - { 65.0f, -150.0f, 50.0f }, - { 30.0f, 10.0f, 90.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0xA2A2, - 100, - 0, - 60.0f, - 1.0f, - { 70.0f, -160.0f, 50.0f }, - { 25.0f, 180.0f, 180.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_801231B4[4] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_HUD_VISIBILITY(HUD_VISIBILITY_A_HEARTS_MAGIC_FORCE), - 0x4343, - 1, - 0, - 50.0f, - 1.0f, - { 0.0f, 20.0f, 0.0f }, - { 0.0f, 5.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, true), - ONEPOINT_CS_INIT_FIELD_HUD_VISIBILITY(HUD_VISIBILITY_A_HEARTS_MAGIC_FORCE), - 0x4343, - 48, - 0, - 50.0f, - 0.75f, - { 0.0f, 80.0f, 0.0f }, - { 0.0f, 15.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_HUD_VISIBILITY(HUD_VISIBILITY_A_HEARTS_MAGIC_FORCE), - 0x4343, - 1, - 5, - 45.0f, - 1.0f, - { 0.0f, 0.0f, 30.0f }, - { 30.0f, 120.0f, 60.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, true), - ONEPOINT_CS_INIT_FIELD_HUD_VISIBILITY(HUD_VISIBILITY_A_HEARTS_MAGIC_FORCE), - 0x4343, - -1, - 0, - -1.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80123254[2] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 1, - 0, - 60.0f, - 1.0f, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, false), - ONEPOINT_CS_INIT_FIELD_HUD_VISIBILITY(HUD_VISIBILITY_A_HEARTS_MAGIC_FORCE), - 0x0101, - 49, - 0, - 50.0f, - 0.05f, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - }, -}; - -static OnePointCsFull D_801232A4[1] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_69), - 0x0101, - 9999, - 0, - 60.0f, - 1.0f, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - }, -}; - -static OnePointCsFull D_801232CC[5] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 45, - -3, - 65.0f, - 1.0f, - { -52.0f, 84.0f, -846.0f }, - { -159.0f, 33.0f, -729.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_16, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 10, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2121, - 15, - 0, - 60.0f, - 1.0f, - { 10.0f, -5.0f, 0.0f }, - { 0.0f, 0.0f, -150.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80123394[5] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 45, - 3, - 65.0f, - 1.0f, - { -16.0f, 87.0f, -829.0f }, - { 98.0f, 24.0f, -714.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_16, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 10, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2121, - 15, - 0, - 60.0f, - 1.0f, - { 10.0f, -5.0f, 0.0f }, - { 0.0f, 0.0f, -150.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_8012345C[4] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x4242, - 40, - 0, - 40.0f, - 1.0f, - { 0.0f, 50.0f, -40.0f }, - { 0.0f, 60.0f, -160.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_77), - 0x4242, - 40, - 0, - 60.0f, - 0.3f, - { 0.0f, 90.0f, -40.0f }, - { 0.0f, 60.0f, -160.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_4, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x2121, - 10, - 0, - 60.0f, - 0.2f, - { 0.0f, -10.0f, 10.0f }, - { 0.0f, 10.0f, -80.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_801234FC[5] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_1, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_5), - 0x0441, - 10, - 0, - 70.0f, - 1.0f, - { 0.0f, -10.0f, 20.0f }, - { 0.0f, 0.0f, 120.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4141, - 30, - 0, - 50.0f, - 0.1f, - { 0.0f, -10.0f, 20.0f }, - { 0.0f, 10.0f, 80.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_16, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2121, - 10, - 0, - 60.0f, - 0.9f, - { 0.0f, -10.0f, 0.0f }, - { 0.0f, 10.0f, -80.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_801235C4[5] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_PLAYER_CS(PLAYER_CSMODE_1), - 0x4141, - 1, - 0, - 50.0f, - 1.0f, - { 0.0f, -10.0f, 20.0f }, - { 0.0f, 10.0f, 60.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0441, - 39, - 0, - 70.0f, - 0.1f, - { 0.0f, -10.0f, 20.0f }, - { 0.0f, 0.0f, 100.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_16, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x2121, - 15, - 0, - 60.0f, - 0.9f, - { 0.0f, -10.0f, 0.0f }, - { 0.0f, 10.0f, -80.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_8012368C[4] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 10, - 0, - 60.0f, - 1.0f, - { -1110.0f, -180.0f, -840.0f }, - { -985.0f, -220.0f, -840.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 70, - -45, - 75.0f, - 1.0f, - { -1060.0f, -160.0f, -840.0f }, - { -1005.0f, -230.0f, -840.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 10, - -45, - 75.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 180, - 9, - 80.0f, - 1.0f, - { -1205.0f, -175.0f, -840.0f }, - { -1305.0f, -230.0f, -828.0f }, - }, -}; - -static OnePointCsFull D_8012372C[4] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0142, - 10, - 0, - 70.0f, - 1.0f, - { 0.0f, 80.0f, 0.0f }, - { -1650.0f, 200.0f, -2920.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0142, - 110, - -2, - 50.0f, - 0.5f, - { 0.0f, 150.0f, 0.0f }, - { -1320.0f, 170.0f, -2900.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_11, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 100, - 2, - 70.0f, - 0.1f, - { 0.0f, 150.0f, 50.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_3, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 60, - 2, - 45.0f, - 0.01f, - { 0.0f, 150.0f, 50.0f }, - { 0.0f, 200.0f, -80.0f }, - }, -}; - -static OnePointCsFull D_801237CC[5] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, true), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 20, - 0, - 50.0f, - 1.0f, - { 0.0f, 50.0f, -10.0f }, - { 0.0f, 0.0f, 100.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_10, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 80, - 0, - 75.0f, - 1.0f, - { 2900.0f, 1300.0f, 530.0f }, - { 2800.0f, 1190.0f, 540.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 10, - 0, - 75.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_2, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 55, - 0, - 75.0f, - 1.0f, - { 2900.0f, 1300.0f, 530.0f }, - { 1500.0f, 1415.0f, 650.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 100, - -45, - 75.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; - -static OnePointCsFull D_80123894[3] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 60, - 0, - 60.0f, - 1.0f, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 30, - 0, - 50.0f, - 1.0f, - { 0.0f, 28.0f, 0.0f }, - { 0.0f, 20.0f, 40.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_13, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 120, - 0, - 180.0f, - 0.4f, - { 0.0f, -5.0f, 0.0f }, - { 0.0f, 2.0f, 40.0f }, - }, -}; - -static OnePointCsFull D_8012390C[2] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 30, - 0, - 60.0f, - 1.0f, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 180, - 0, - 60.0f, - 1.0f, - { 0.0f, 78.0f, 0.0f }, - { 0.0f, 78.0f, 200.0f }, - }, -}; - -static OnePointCsFull D_8012395C[3] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0101, - 60, - 0, - 60.0f, - 1.0f, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 30, - 0, - 50.0f, - 1.0f, - { 0.0f, 28.0f, 0.0f }, - { 0.0f, 20.0f, -45.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_13, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 120, - 0, - 180.0f, - 0.4f, - { 0.0f, -5.0f, 0.0f }, - { 0.0f, 2.0f, 45.0f }, - }, -}; - -static OnePointCsFull D_801239D4[3] = { - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_15, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 5, - 0, - 60.0f, - 1.0f, - { 0.0f, 20.0f, 0.0f }, - { 0.0f, 40.0f, -120.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_9, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x4242, - 0, - 0, - 60.0f, - 1.0f, - { 0.0f, 20.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - }, - { - ONEPOINT_CS_ACTION(ONEPOINT_CS_ACTION_ID_18, false, false), - ONEPOINT_CS_INIT_FIELD_NONE, - 0x0000, - 1, - 0, - 60.0f, - 1.0f, - { -1.0f, -1.0f, -1.0f }, - { -1.0f, -1.0f, -1.0f }, - }, -}; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 6c28dd492cd..94b632bdeed 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -2190,8 +2190,8 @@ void Interface_LoadActionLabelB(PlayState* play, u16 action) { * @return false if player is out of health */ s32 Health_ChangeBy(UNUSED PlayState* play, s16 amount) { - u16 heartCount; - u16 healthLevel; + UNUSED_NDEBUG u16 heartCount; + UNUSED_NDEBUG u16 healthLevel; // "＊＊＊＊＊ Fluctuation=%d (now=%d, max=%d) ＊＊＊" PRINTF("＊＊＊＊＊ 増減=%d (now=%d, max=%d) ＊＊＊", amount, gSaveContext.save.info.playerData.health, diff --git a/src/code/z_play.c b/src/code/z_play.c index f95cc89a88b..ef3c37c51a4 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -1475,7 +1475,7 @@ void Play_InitScene(PlayState* this, s32 spawn) { void Play_SpawnScene(PlayState* this, s32 sceneId, s32 spawn) { SceneTableEntry* scene = &gSceneTable[sceneId]; - u32 size; + UNUSED_NDEBUG u32 size; scene->unk_13 = 0; this->loadedScene = scene; diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 81fc0bb5eca..af82ce8f679 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -1092,7 +1092,7 @@ void AnimTaskQueue_Update(PlayState* play, AnimTaskQueue* animTaskQueue) { */ void SkelAnime_InitLink(PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeader* skeletonHeaderSeg, LinkAnimationHeader* animation, s32 flags, Vec3s* jointTable, Vec3s* morphTable, - s32 limbBufCount) { + UNUSED_NDEBUG s32 limbBufCount) { FlexSkeletonHeader* skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); s32 headerJointCount = skeletonHeader->sh.limbCount; s32 limbCount; @@ -1427,7 +1427,8 @@ s32 LinkAnimation_OnFrame(SkelAnime* skelAnime, f32 frame) { * Initializes a normal skeleton to a looping animation, dynamically allocating the frame tables if not provided. */ BAD_RETURN(s32) SkelAnime_Init(UNUSED PlayState* play, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, - AnimationHeader* animation, Vec3s* jointTable, Vec3s* morphTable, s32 limbCount) { + AnimationHeader* animation, Vec3s* jointTable, Vec3s* morphTable, + UNUSED_NDEBUG s32 limbCount) { SkeletonHeader* skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); skelAnime->limbCount = skeletonHeader->limbCount + 1; @@ -1457,7 +1458,8 @@ BAD_RETURN(s32) SkelAnime_Init(UNUSED PlayState* play, SkelAnime* skelAnime, Ske * Initializes a flex skeleton to a looping animation, dynamically allocating the frame tables if not given. */ BAD_RETURN(s32) SkelAnime_InitFlex(UNUSED PlayState* play, SkelAnime* skelAnime, FlexSkeletonHeader* skeletonHeaderSeg, - AnimationHeader* animation, Vec3s* jointTable, Vec3s* morphTable, s32 limbCount) { + AnimationHeader* animation, Vec3s* jointTable, Vec3s* morphTable, + UNUSED_NDEBUG s32 limbCount) { FlexSkeletonHeader* skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); skelAnime->limbCount = skeletonHeader->sh.limbCount + 1; diff --git a/src/code/z_sram.c b/src/code/z_sram.c index 2bb093626ca..ce8764de296 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -876,7 +876,7 @@ void Sram_WriteSramHeader(SramContext* sramCtx) { SsSram_ReadWrite(OS_K1_TO_PHYSICAL(0xA8000000), sramCtx->readBuff, SRAM_HEADER_SIZE, OS_WRITE); } -void Sram_InitSram(GameState* gameState, SramContext* sramCtx) { +void Sram_InitSram(UNUSED_NDEBUG GameState* gameState, SramContext* sramCtx) { u16 i; PRINTF("sram_initialize( Game *game, Sram *sram )\n"); diff --git a/src/code/z_viscvg.c b/src/code/z_viscvg.c index 9caf39a3f85..422b07ca66f 100644 --- a/src/code/z_viscvg.c +++ b/src/code/z_viscvg.c @@ -100,7 +100,7 @@ void VisCvg_Init(VisCvg* this) { this->vis.primColor.a = 255; } -void VisCvg_Destroy(VisCvg* this) { +void VisCvg_Destroy(UNUSED VisCvg* this) { } void VisCvg_Draw(VisCvg* this, Gfx** gfxP) { diff --git a/src/code/z_vismono.c b/src/code/z_vismono.c index 742a1fc0a4a..e17fa41a8cb 100644 --- a/src/code/z_vismono.c +++ b/src/code/z_vismono.c @@ -184,7 +184,7 @@ void VisMono_Draw(VisMono* this, Gfx** gfxP) { } void VisMono_DrawOld(VisMono* this) { - Gfx* dListEnd; + UNUSED_NDEBUG Gfx* dListEnd; if (this->tlut == NULL) { this->tlut = SYSTEM_ARENA_MALLOC(256 * G_IM_SIZ_16b_BYTES, "../z_vismono.c", 283); diff --git a/src/code/z_viszbuf.c b/src/code/z_viszbuf.c index 3e9f15eb527..8201c38fa77 100644 --- a/src/code/z_viszbuf.c +++ b/src/code/z_viszbuf.c @@ -61,7 +61,7 @@ void VisZBuf_Init(VisZBuf* this) { // clang-format on } -void VisZBuf_Destroy(VisZBuf* this) { +void VisZBuf_Destroy(UNUSED VisZBuf* this) { } void VisZBuf_Draw(VisZBuf* this, Gfx** gfxP) { diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c index a8e3c1ad7ef..dbd8f839544 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c @@ -126,7 +126,7 @@ void BgJyaBigmirror_HandleMirRay(Actor* thisx, PlayState* play) { { 60.0f, 1800.0f, -310.0f }, }; BgJyaBigmirror* this = (BgJyaBigmirror*)thisx; - s32 puzzleSolved; + STACK_PAD(s32); s32 lightBeamToggles[3]; s32 i; s32 mirRayObjectSlot; diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index 38f88367d35..42193c20de8 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -1673,7 +1673,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) { this->subCamAt.y = 1117.0f; this->subCamAt.z = -11.0f; } else { - f32 phi_f0; + STACK_PAD(s32); s32 phi_a1; if (this->unk_398 < 30) { 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 d80c9a08300..30a8421c201 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -113,7 +113,7 @@ void EnGe2_ChangeAction(EnGe2* this, s32 i) { void EnGe2_Init(Actor* thisx, PlayState* play) { EnGe2* this = (EnGe2*)thisx; - s16 params = this->actor.params; + UNUSED s16 params = this->actor.params; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 36.0f); SkelAnime_InitFlex(play, &this->skelAnime, &gGerudoPurpleSkel, NULL, this->jointTable, this->morphTable, 22); 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 13a545dc1de..7b70ee2914c 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -896,7 +896,7 @@ void EnGirlA_Noop(EnGirlA* this, PlayState* play) { void EnGirlA_SetItemDescription(PlayState* play, EnGirlA* this) { ShopItemEntry* tmp = &sShopItemEntries[this->actor.params]; - s32 params = this->actor.params; + UNUSED s32 params = this->actor.params; if ((this->actor.params >= SI_KEATON_MASK) && (this->actor.params <= SI_MASK_OF_TRUTH)) { s32 maskId = this->actor.params - SI_KEATON_MASK; 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 922383fdd74..717f85bbeb8 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -724,7 +724,7 @@ void EnIk_UpdateDamage(EnIk* this, PlayState* play) { } else if (this->bodyCollider.base.acFlags & AC_HIT) { STACK_PAD(s16); u8 prevHealth; - s32 damageEffect; + STACK_PAD(s32); Vec3f sparksPos = this->actor.world.pos; sparksPos.y += 50.0f; 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 3adc036e252..f29ce528e52 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -203,7 +203,7 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { Camera* mainCam; s16 sp66; s8 stickY; - STACK_PAD(s32); + u32 temp; Actor* attackItem; s16 sp5A = player->actor.shape.rot.y - this->actor.shape.rot.y; @@ -545,12 +545,12 @@ void EnTorch2_Update(Actor* thisx, PlayState* play2) { // Updates Dark Link's "controller". The conditional seems to cause him to // stop targeting and hold shield if he's been holding it long enough. - sp54 = input->prev.button ^ input->cur.button; - input->press.button = input->cur.button & sp54; + temp = input->prev.button ^ input->cur.button; + input->press.button = input->cur.button & temp; if (CHECK_BTN_ANY(input->cur.button, BTN_R)) { input->cur.button = ((sCounterState == 0) && (this->meleeWeaponState == 0)) ? BTN_R : input->cur.button ^ BTN_R; } - input->rel.button = input->prev.button & sp54; + input->rel.button = input->prev.button & temp; input->prev.button = input->cur.button & (u16) ~(BTN_A | BTN_B); PadUtils_UpdateRelXY(input); diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index 4a3ac2dff74..849d411bf6b 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -650,7 +650,7 @@ void EnfHG_Retreat(EnfHG* this, PlayState* play) { BossGanondrof* bossGnd = (BossGanondrof*)this->actor.parent; s16 paintingIdxReal; s16 paintingIdxFake; - Actor* child; + UNUSED_NDEBUG Actor* child; if (this->actor.params != GND_REAL_BOSS) { this->killActor = true; diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 487c5b2124a..04d6d3312cf 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -12,7 +12,7 @@ #include "terminal.h" // For retail BSS ordering, the block number of sStreamSfxProjectedPos must be 0. -#pragma increment_block_number 208 +#pragma increment_block_number 209 #define FLAGS ACTOR_FLAG_4 diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index ce76b125589..f33f4a88a81 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -3891,7 +3891,7 @@ static s32 (*sActionChangeFuncs[])(Player* this, PlayState* play) = { * */ s32 Player_TryActionChangeList(PlayState* play, Player* this, s8* actionChangeList, s32 updateUpperBody) { - s32 i; + STACK_PAD(s32); if (!(this->stateFlags1 & (PLAYER_STATE1_0 | PLAYER_STATE1_7 | PLAYER_STATE1_29))) { if (updateUpperBody) { @@ -11505,7 +11505,9 @@ void Player_Update(Actor* thisx, PlayState* play) { Player_UpdateCommon(this, play, &input); +#if OOT_DEBUG skip_update:; +#endif { STACK_PAD(s32); diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index cefa29007de..8128341ccb0 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -379,8 +379,8 @@ void FileSelect_PulsateCursor(GameState* thisx) { static s16 cursorAlphaTargets[] = { 70, 200 }; FileSelectState* this = (FileSelectState*)thisx; s16 alphaStep; - SramContext* sramCtx = &this->sramCtx; - Input* debugInput = &this->state.input[2]; + UNUSED_NDEBUG SramContext* sramCtx = &this->sramCtx; + UNUSED_NDEBUG Input* debugInput = &this->state.input[2]; #if OOT_DEBUG if (CHECK_BTN_ALL(debugInput->press.button, BTN_DLEFT)) { diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index 97f59955115..2d630dbf678 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -706,7 +706,7 @@ void MapSelect_Main(GameState* thisx) { MapSelect_Draw(this); } -void MapSelect_Destroy(GameState* thisx) { +void MapSelect_Destroy(UNUSED GameState* thisx) { PRINTF("%c", BEL); // "view_cleanup will hang, so it won't be called" PRINTF("*** view_cleanupはハングアップするので、呼ばない ***\n"); From 84d4e5e91c8dc55249ba897000f1fee1e914c24b Mon Sep 17 00:00:00 2001 From: Thar0 <17233964+Thar0@users.noreply.github.com> Date: Mon, 22 Jul 2024 00:09:12 +0100 Subject: [PATCH 14/14] Format --- src/code/sched.c | 3 ++- src/code/z_player_lib.c | 4 ++-- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 2 +- src/overlays/actors/ovl_En_Xc/z_en_xc.c | 2 +- src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 20 +++++++++---------- src/overlays/actors/ovl_Fishing/z_fishing.c | 6 +++--- src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 2 +- .../actors/ovl_Obj_Elevator/z_obj_elevator.c | 2 +- .../actors/ovl_Obj_Hsblock/z_obj_hsblock.c | 2 +- src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c | 2 +- .../actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c | 2 +- .../actors/ovl_Obj_Switch/z_obj_switch.c | 2 +- .../ovl_Obj_Warp2block/z_obj_warp2block.c | 2 +- .../actors/ovl_player_actor/z_player.c | 6 +++--- .../misc/ovl_kaleido_scope/z_kaleido_scope.c | 5 +++-- 15 files changed, 32 insertions(+), 30 deletions(-) diff --git a/src/code/sched.c b/src/code/sched.c index ce7a909a721..34569ae7562 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -642,7 +642,8 @@ void Sched_ThreadEntry(void* arg) { } } -void Sched_Init(Scheduler* sc, void* stack, OSPri priority, UNUSED u8 viModeType, UNUSED UNK_TYPE arg4, IrqMgr* irqMgr) { +void Sched_Init(Scheduler* sc, void* stack, OSPri priority, UNUSED u8 viModeType, UNUSED UNK_TYPE arg4, + IrqMgr* irqMgr) { bzero(sc, sizeof(Scheduler)); sc->isFirstSwap = true; diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 4d4a5148167..20abf9066b5 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -1169,12 +1169,12 @@ s32 Player_OverrideLimbDrawGameplayCommon(PlayState* play, s32 limbIndex, Gfx** Matrix_RotateZ(BINANG_TO_RAD(this->unk_6C0), MTXMODE_APPLY); } } else if (limbIndex == PLAYER_LIMB_L_THIGH) { - STACK_PAD(s32); + STACK_PAD(s32); func_8008F87C(play, this, &this->skelAnime, pos, rot, PLAYER_LIMB_L_THIGH, PLAYER_LIMB_L_SHIN, PLAYER_LIMB_L_FOOT); } else if (limbIndex == PLAYER_LIMB_R_THIGH) { - STACK_PAD(s32); + STACK_PAD(s32); func_8008F87C(play, this, &this->skelAnime, pos, rot, PLAYER_LIMB_R_THIGH, PLAYER_LIMB_R_SHIN, PLAYER_LIMB_R_FOOT); 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 406e4950705..7d939a8ad00 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -888,7 +888,7 @@ void EnOssan_State_StartConversation(EnOssan* this, PlayState* play, Player* pla if (this->actor.params == OSSAN_TYPE_MASK && dialogState == TEXT_STATE_CHOICE) { if (!EnOssan_TestEndInteraction(this, play, &play->state.input[0]) && Message_ShouldAdvance(play)) { - STACK_PAD(s32); + STACK_PAD(s32); switch (play->msgCtx.choiceIndex) { case 0: diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index 8a1c1a3ba86..a4e1b1bc48f 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -2390,7 +2390,7 @@ s32 EnXc_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* po if (this->unk_30C != 0) { if (limbIndex == 9) { - STACK_PAD(s32); + STACK_PAD(s32); rot->x += this->interactInfo.torsoRot.y; rot->y -= this->interactInfo.torsoRot.x; diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 7aae9ff7d59..49f7f89430d 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -316,25 +316,25 @@ void func_80B53B64(EnZl3* this, s16 z, s32 idx) { if (idx == 2 && (action == 5 || action == 24)) { if (phi_v1 != 0) { - STACK_PAD(s32); + STACK_PAD(s32); phi_v0 -= (phi_v1 - phi_v0) / 10; } } else if (idx == 2 && action == 22 && skelAnime->mode == 2) { if (phi_v1 != 0) { - STACK_PAD(s32); + STACK_PAD(s32); phi_v0 -= (phi_v1 - phi_v0) / 10; } } else if (idx == 2 && (action == 20 || action == 21) && skelAnime->mode == 2) { if (phi_v1 != 0) { - STACK_PAD(s32); + STACK_PAD(s32); phi_v0 -= (phi_v1 - phi_v0) / 10; } } else { if (phi_v1 != 0) { - STACK_PAD(s32); + STACK_PAD(s32); phi_v0 += (phi_v1 - phi_v0) / 16; } @@ -707,7 +707,7 @@ void EnZl3_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot, if (limbIndex == 13) { Vec3f sp34 = D_80B5A46C; - STACK_PAD(s32); + STACK_PAD(s32); Matrix_MultVec3f(&sp34, &this->unk_31C); } else if (limbIndex == 14) { @@ -813,7 +813,7 @@ void func_80B55054(EnZl3* this) { f32* temp_v0 = &this->unk_2EC; if (*temp_v0 < 19.0f) { - STACK_PAD(s32); + STACK_PAD(s32); ((DoorWarp1*)child)->crystalAlpha = (20.0f - *temp_v0) * 12.75f; *temp_v0 += 1.0f; @@ -1797,7 +1797,7 @@ void func_80B5764C(EnZl3* this, PlayState* play) { s32 func_80B576C8(EnZl3* this, PlayState* play) { if (func_80B575F0(this, play)) { - STACK_PAD(s32); + STACK_PAD(s32); if (this->unk_3D8 == 0) { return 1; @@ -2009,7 +2009,7 @@ s32 func_80B57D80(EnZl3* this, PlayState* play) { void func_80B57EAC(EnZl3* this, PlayState* play) { if (func_80B57324(this, play)) { - STACK_PAD(s32); + STACK_PAD(s32); this->action = 26; } else { @@ -2053,7 +2053,7 @@ void func_80B58014(EnZl3* this, PlayState* play) { this->action = 29; func_80B538B0(this); } else if (func_80B57C8C(this) && func_80B57F84(this, play)) { - STACK_PAD(s32); + STACK_PAD(s32); OnePointCutscene_Init(play, 4000, -99, &this->actor, CAM_ID_MAIN); this->unk_3D0 = 0; @@ -2164,7 +2164,7 @@ void func_80B58624(EnZl3* this, PlayState* play) { func_80B54E14(this, &gZelda2Anime2Anim_008050, 0, -12.0f, 0); func_80B5772C(this, play); } else if (*unk_3CC == kREG(19) + 20.0f) { - STACK_PAD(s32); + STACK_PAD(s32); *unk_3CC += 1.0f; this->actor.textId = 0x71AC; diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 04d6d3312cf..763feba3455 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -1519,7 +1519,7 @@ void Fishing_UpdateLine(PlayState* play, Vec3f* basePos, Vec3f* pos, Vec3f* rot, } if (sLureEquipped == FS_LURE_SINKING) { - STACK_PAD(s32); + STACK_PAD(s32); if (spD8 < phi_f12) { phi_f12 = ((sqrtf(sqDistXZ) - 920.0f) * 0.147f) + WATER_SURFACE_Y(play); @@ -2371,7 +2371,7 @@ void Fishing_UpdateLure(Fishing* this, PlayState* play) { for (i = 0; i < 50; i++) { f32 sp7C = Rand_ZeroFloat(1.5f) + 0.5f; f32 sp78 = Rand_ZeroFloat(6.28f); - STACK_PAD(s32); + STACK_PAD(s32); sp9C.x = sinf(sp78) * sp7C; sp9C.z = cosf(sp78) * sp7C; @@ -5298,7 +5298,7 @@ void Fishing_UpdateOwner(Actor* thisx, PlayState* play2) { #if OOT_DEBUG if (KREG(0) != 0) { - STACK_PADS(s32, 3); + STACK_PADS(s32, 3); KREG(0) = 0; sLureEquipped = FS_LURE_STOCK; 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 04594c7df87..80ec1035905 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -143,7 +143,7 @@ void ObjBean_InitDynaPoly(ObjBean* this, PlayState* play, CollisionHeader* colli #if OOT_DEBUG if (this->dyna.bgId == BG_ACTOR_MAX) { - STACK_PAD(s32); + STACK_PAD(s32); PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_bean.c", 374, this->dyna.actor.id, this->dyna.actor.params); diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index d8982441c7f..16c9f957c88 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -53,7 +53,7 @@ void func_80B92B08(ObjElevator* this, PlayState* play, CollisionHeader* collisio #if OOT_DEBUG if (this->dyna.bgId == BG_ACTOR_MAX) { - STACK_PAD(s32); + STACK_PAD(s32); PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_elevator.c", 136, this->dyna.actor.id, this->dyna.actor.params); 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 3809cd70d16..b7925343662 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -62,7 +62,7 @@ void func_80B93B68(ObjHsblock* this, PlayState* play, CollisionHeader* collision #if OOT_DEBUG if (this->dyna.bgId == BG_ACTOR_MAX) { - STACK_PAD(s32); + STACK_PAD(s32); PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_hsblock.c", 163, this->dyna.actor.id, this->dyna.actor.params); 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 c28b1116361..9a9b2ae740d 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -71,7 +71,7 @@ void ObjLift_InitDynaPoly(ObjLift* this, PlayState* play, CollisionHeader* colli #if OOT_DEBUG if (this->dyna.bgId == BG_ACTOR_MAX) { - STACK_PAD(s32); + STACK_PAD(s32); PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_lift.c", 188, this->dyna.actor.id, this->dyna.actor.params); 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 0d5b53a9665..c0ed5679a94 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -94,7 +94,7 @@ void ObjOshihiki_InitDynapoly(ObjOshihiki* this, PlayState* play, CollisionHeade #if OOT_DEBUG if (this->dyna.bgId == BG_ACTOR_MAX) { - STACK_PAD(s32); + STACK_PAD(s32); // "Warning : move BG registration failure" PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 280, 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 e98072075b5..a9939ae0781 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -199,7 +199,7 @@ void ObjSwitch_InitDynaPoly(ObjSwitch* this, PlayState* play, CollisionHeader* c #if OOT_DEBUG if (this->dyna.bgId == BG_ACTOR_MAX) { - STACK_PAD(s32); + STACK_PAD(s32); // "Warning : move BG registration failure" PRINTF("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_switch.c", 531, diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index e9ecffc9791..a756a09ce64 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -77,7 +77,7 @@ s32 func_80BA1ECC(ObjWarp2block* this, PlayState* play) { if (DynaPolyActor_IsPlayerAbove(&this->dyna)) { return 0; } else { - STACK_PAD(s32); + STACK_PAD(s32); Actor* temp_a3 = this->dyna.actor.child; Player* player = GET_PLAYER(play); Vec3f sp20; diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index f33f4a88a81..c453d7603bd 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -8186,7 +8186,7 @@ void func_80841EE4(Player* this, PlayState* play) { f32 temp2; if (this->unk_864 < 1.0f) { - STACK_PAD(s32); + STACK_PAD(s32); temp1 = R_UPDATE_RATE * 0.5f; @@ -11509,7 +11509,7 @@ void Player_Update(Actor* thisx, PlayState* play) { skip_update:; #endif { - STACK_PAD(s32); + STACK_PAD(s32); MREG(52) = this->actor.world.pos.x; MREG(53) = this->actor.world.pos.y; @@ -13165,7 +13165,7 @@ void Player_Action_8084E3C4(Player* this, PlayState* play) { this->stateFlags2 &= ~(PLAYER_STATE2_23 | PLAYER_STATE2_24 | PLAYER_STATE2_25); this->unk_6A8 = NULL; } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_02) { - STACK_PAD(s32); + STACK_PAD(s32); gSaveContext.respawn[RESPAWN_MODE_RETURN].entranceIndex = sWarpSongEntrances[play->msgCtx.lastPlayedSong]; gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams = 0x5FF; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c index 4c5a636f1e0..b37505d01e6 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c @@ -415,8 +415,9 @@ static s16 sCursorColors[][3] = { static void* sSavePromptTexs[] = LANGUAGE_ARRAY(gPauseSavePromptJPNTex, gPauseSavePromptENGTex, gPauseSavePromptGERTex, gPauseSavePromptFRATex); -UNUSED static void* sSaveConfirmationTexs[] = LANGUAGE_ARRAY(gPauseSaveConfirmationJPNTex, gPauseSaveConfirmationENGTex, - gPauseSaveConfirmationGERTex, gPauseSaveConfirmationFRATex); +UNUSED static void* sSaveConfirmationTexs[] = + LANGUAGE_ARRAY(gPauseSaveConfirmationJPNTex, gPauseSaveConfirmationENGTex, gPauseSaveConfirmationGERTex, + gPauseSaveConfirmationFRATex); static void* sContinuePromptTexs[] = LANGUAGE_ARRAY(gContinuePlayingJPNTex, gContinuePlayingENGTex, gContinuePlayingGERTex, gContinuePlayingFRATex);