From 146fbb0d1b19eb63c9eca3d26a88632975952966 Mon Sep 17 00:00:00 2001 From: Baoulettes Date: Mon, 27 Jun 2022 16:29:52 +0200 Subject: [PATCH] Open & Close _DISP __FILE__ & __LINE__ clean up --- soh/include/macros.h | 16 +- soh/soh/Enhancements/debugger/colViewer.cpp | 4 +- soh/src/code/flg_set.c | 4 +- soh/src/code/game.c | 12 +- soh/src/code/graph.c | 16 +- soh/src/code/speed_meter.c | 8 +- soh/src/code/z_actor.c | 72 +++--- soh/src/code/z_cheap_proc.c | 8 +- soh/src/code/z_collision_check.c | 4 +- soh/src/code/z_debug.c | 4 +- soh/src/code/z_debug_display.c | 8 +- soh/src/code/z_demo.c | 4 +- soh/src/code/z_draw.c | 104 ++++----- soh/src/code/z_eff_blure.c | 32 +-- soh/src/code/z_eff_shield_particle.c | 4 +- soh/src/code/z_eff_spark.c | 4 +- soh/src/code/z_eff_ss_dead.c | 24 +- soh/src/code/z_effect_soft_sprite_old_init.c | 4 +- soh/src/code/z_en_a_keep.c | 4 +- soh/src/code/z_en_item00.c | 16 +- soh/src/code/z_fcurve_data_skelanime.c | 4 +- soh/src/code/z_kankyo.c | 40 ++-- soh/src/code/z_lifemeter.c | 4 +- soh/src/code/z_lights.c | 8 +- soh/src/code/z_map_exp.c | 8 +- soh/src/code/z_map_mark.c | 4 +- soh/src/code/z_message_PAL.c | 8 +- soh/src/code/z_moji.c | 8 +- soh/src/code/z_parameter.c | 28 +-- soh/src/code/z_play.c | 4 +- soh/src/code/z_player_lib.c | 28 +-- soh/src/code/z_prenmi.c | 4 +- soh/src/code/z_rcp.c | 184 ++++++++-------- soh/src/code/z_room.c | 16 +- soh/src/code/z_sample.c | 4 +- soh/src/code/z_scene_table.c | 208 +++++++++--------- soh/src/code/z_skelanime.c | 32 +-- soh/src/code/z_skin.c | 16 +- soh/src/code/z_view.c | 24 +- soh/src/code/z_vr_box_draw.c | 4 +- .../actors/ovl_Arms_Hook/z_arms_hook.c | 4 +- .../actors/ovl_Arrow_Fire/z_arrow_fire.c | 4 +- .../actors/ovl_Arrow_Ice/z_arrow_ice.c | 4 +- .../actors/ovl_Arrow_Light/z_arrow_light.c | 4 +- .../actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c | 4 +- .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c | 4 +- .../actors/ovl_Bg_Dodoago/z_bg_dodoago.c | 4 +- .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c | 8 +- .../ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c | 4 +- .../ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c | 4 +- .../ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c | 4 +- .../ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c | 8 +- .../ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c | 4 +- .../ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c | 4 +- .../overlays/actors/ovl_Bg_Haka/z_bg_haka.c | 4 +- .../actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c | 8 +- .../actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c | 4 +- .../actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c | 4 +- .../ovl_Bg_Haka_Water/z_bg_haka_water.c | 4 +- .../ovl_Bg_Heavy_Block/z_bg_heavy_block.c | 4 +- .../ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c | 4 +- .../z_bg_hidan_firewall.c | 4 +- .../ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c | 4 +- .../ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c | 4 +- .../ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c | 4 +- .../z_bg_hidan_kowarerukabe.c | 4 +- .../ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c | 4 +- .../z_bg_hidan_rsekizou.c | 4 +- .../ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c | 4 +- .../ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c | 4 +- .../ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c | 4 +- .../actors/ovl_Bg_Ingate/z_bg_ingate.c | 4 +- .../ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c | 4 +- .../actors/ovl_Bg_Jya_Block/z_bg_jya_block.c | 4 +- .../z_bg_jya_bombchuiwa.c | 8 +- .../actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c | 12 +- .../ovl_Bg_Jya_Megami/z_bg_jya_megami.c | 8 +- .../ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c | 4 +- .../ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c | 4 +- .../ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c | 4 +- .../ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c | 4 +- .../ovl_Bg_Mizu_Water/z_bg_mizu_water.c | 4 +- .../overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c | 4 +- .../ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c | 4 +- .../ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c | 4 +- .../ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c | 4 +- .../ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c | 4 +- .../ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c | 4 +- .../ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c | 4 +- .../z_bg_mori_kaitenkabe.c | 4 +- .../z_bg_mori_rakkatenjo.c | 4 +- .../actors/ovl_Bg_Po_Event/z_bg_po_event.c | 4 +- .../ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c | 4 +- .../actors/ovl_Bg_Pushbox/z_bg_pushbox.c | 4 +- .../z_bg_spot00_hanebasi.c | 8 +- .../ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c | 4 +- .../z_bg_spot01_idohashira.c | 4 +- .../z_bg_spot01_idomizu.c | 4 +- .../z_bg_spot01_idosoko.c | 4 +- .../z_bg_spot02_objects.c | 8 +- .../ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c | 4 +- .../z_bg_spot06_objects.c | 4 +- .../ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c | 4 +- .../ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c | 4 +- .../ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c | 4 +- .../ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c | 4 +- .../z_bg_spot16_bombstone.c | 4 +- .../z_bg_spot16_doughnut.c | 8 +- .../z_bg_spot17_bakudankabe.c | 8 +- .../ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c | 4 +- .../actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c | 4 +- .../ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c | 8 +- .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c | 4 +- .../actors/ovl_Bg_Treemouth/z_bg_treemouth.c | 4 +- .../actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c | 4 +- .../actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c | 4 +- .../actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c | 4 +- soh/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c | 4 +- .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 12 +- .../overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 16 +- .../overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c | 20 +- .../actors/ovl_Boss_Ganon/z_boss_ganon.c | 48 ++-- .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 60 ++--- .../ovl_Boss_Ganondrof/z_boss_ganondrof.c | 4 +- .../actors/ovl_Boss_Goma/z_boss_goma.c | 8 +- .../overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 20 +- .../overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 12 +- .../overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 64 +++--- .../overlays/actors/ovl_Boss_Va/z_boss_va.c | 24 +- .../overlays/actors/ovl_Demo_6K/z_demo_6k.c | 24 +- .../overlays/actors/ovl_Demo_Du/z_demo_du.c | 8 +- .../overlays/actors/ovl_Demo_Ec/z_demo_ec.c | 12 +- .../actors/ovl_Demo_Effect/z_demo_effect.c | 44 ++-- .../overlays/actors/ovl_Demo_Ext/z_demo_ext.c | 4 +- .../actors/ovl_Demo_Geff/z_demo_geff.c | 8 +- .../overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 8 +- .../overlays/actors/ovl_Demo_Go/z_demo_go.c | 4 +- .../overlays/actors/ovl_Demo_Gt/z_demo_gt.c | 32 +-- .../overlays/actors/ovl_Demo_Ik/z_demo_ik.c | 16 +- .../overlays/actors/ovl_Demo_Im/z_demo_im.c | 8 +- .../actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 28 +-- .../actors/ovl_Demo_Kekkai/z_demo_kekkai.c | 8 +- .../overlays/actors/ovl_Demo_Sa/z_demo_sa.c | 8 +- .../overlays/actors/ovl_Demo_Shd/z_demo_shd.c | 4 +- .../actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c | 8 +- .../overlays/actors/ovl_Door_Ana/z_door_ana.c | 4 +- .../actors/ovl_Door_Gerudo/z_door_gerudo.c | 4 +- .../actors/ovl_Door_Killer/z_door_killer.c | 4 +- .../actors/ovl_Door_Shutter/z_door_shutter.c | 4 +- .../actors/ovl_Door_Warp1/z_door_warp1.c | 12 +- .../actors/ovl_Efc_Erupc/z_efc_erupc.c | 8 +- .../overlays/actors/ovl_Eff_Dust/z_eff_dust.c | 8 +- .../overlays/actors/ovl_Elf_Msg/z_elf_msg.c | 4 +- .../overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c | 4 +- soh/src/overlays/actors/ovl_En_Am/z_en_am.c | 4 +- soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c | 4 +- .../actors/ovl_En_Anubice/z_en_anubice.c | 4 +- .../ovl_En_Anubice_Fire/z_en_anubice_fire.c | 4 +- .../overlays/actors/ovl_En_Arrow/z_en_arrow.c | 4 +- soh/src/overlays/actors/ovl_En_Ba/z_en_ba.c | 4 +- soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c | 4 +- .../actors/ovl_En_Bdfire/z_en_bdfire.c | 4 +- .../actors/ovl_En_Bigokuta/z_en_bigokuta.c | 12 +- .../overlays/actors/ovl_En_Bili/z_en_bili.c | 4 +- .../actors/ovl_En_Blkobj/z_en_blkobj.c | 8 +- soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c | 4 +- .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 4 +- .../actors/ovl_En_Bom_Chu/z_en_bom_chu.c | 4 +- .../overlays/actors/ovl_En_Bombf/z_en_bombf.c | 4 +- .../overlays/actors/ovl_En_Boom/z_en_boom.c | 4 +- soh/src/overlays/actors/ovl_En_Box/z_en_box.c | 4 +- .../actors/ovl_En_Bubble/z_en_bubble.c | 4 +- .../overlays/actors/ovl_En_Butte/z_en_butte.c | 4 +- soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c | 4 +- soh/src/overlays/actors/ovl_En_Bx/z_en_bx.c | 4 +- .../actors/ovl_En_Clear_Tag/z_en_clear_tag.c | 8 +- soh/src/overlays/actors/ovl_En_Cs/z_en_cs.c | 4 +- .../overlays/actors/ovl_En_Daiku/z_en_daiku.c | 8 +- .../z_en_daiku_kakariko.c | 8 +- .../actors/ovl_En_Dekubaba/z_en_dekubaba.c | 20 +- soh/src/overlays/actors/ovl_En_Dh/z_en_dh.c | 4 +- .../ovl_En_Diving_Game/z_en_diving_game.c | 4 +- .../actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c | 4 +- .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c | 12 +- soh/src/overlays/actors/ovl_En_Dog/z_en_dog.c | 4 +- .../overlays/actors/ovl_En_Door/z_en_door.c | 4 +- soh/src/overlays/actors/ovl_En_Du/z_en_du.c | 4 +- .../actors/ovl_En_Dy_Extra/z_en_dy_extra.c | 4 +- .../overlays/actors/ovl_En_Eiyer/z_en_eiyer.c | 4 +- soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c | 4 +- .../actors/ovl_En_Encount2/z_en_encount2.c | 4 +- .../actors/ovl_En_Ex_Item/z_en_ex_item.c | 4 +- .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 4 +- soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c | 12 +- .../actors/ovl_En_Fd_Fire/z_en_fd_fire.c | 4 +- .../actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c | 4 +- .../actors/ovl_En_Fire_Rock/z_en_fire_rock.c | 4 +- .../actors/ovl_En_Firefly/z_en_firefly.c | 8 +- .../actors/ovl_En_Floormas/z_en_floormas.c | 8 +- soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c | 8 +- soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c | 4 +- soh/src/overlays/actors/ovl_En_Fw/z_en_fw.c | 4 +- soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c | 8 +- .../actors/ovl_En_G_Switch/z_en_g_switch.c | 12 +- .../ovl_En_Ganon_Mant/z_en_ganon_mant.c | 4 +- .../ovl_En_Ganon_Organ/z_en_ganon_organ.c | 4 +- soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c | 8 +- soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 8 +- soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 4 +- soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c | 8 +- .../overlays/actors/ovl_En_GeldB/z_en_geldb.c | 8 +- soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c | 4 +- soh/src/overlays/actors/ovl_En_Go/z_en_go.c | 16 +- soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c | 16 +- .../overlays/actors/ovl_En_Goma/z_en_goma.c | 8 +- soh/src/overlays/actors/ovl_En_Gs/z_en_gs.c | 4 +- .../overlays/actors/ovl_En_Guest/z_en_guest.c | 8 +- .../actors/ovl_En_Heishi2/z_en_heishi2.c | 8 +- .../overlays/actors/ovl_En_Holl/z_en_holl.c | 4 +- .../actors/ovl_En_Honotrap/z_en_honotrap.c | 8 +- .../overlays/actors/ovl_En_Horse/z_en_horse.c | 4 +- .../z_en_horse_link_child.c | 4 +- .../ovl_En_Horse_Normal/z_en_horse_normal.c | 4 +- soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c | 12 +- .../actors/ovl_En_Ice_Hono/z_en_ice_hono.c | 4 +- soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c | 24 +- soh/src/overlays/actors/ovl_En_In/z_en_in.c | 8 +- .../overlays/actors/ovl_En_Ishi/z_en_ishi.c | 4 +- soh/src/overlays/actors/ovl_En_Jj/z_en_jj.c | 4 +- .../actors/ovl_En_Jsjutan/z_en_jsjutan.c | 4 +- .../actors/ovl_En_Kanban/z_en_kanban.c | 4 +- .../actors/ovl_En_Karebaba/z_en_karebaba.c | 8 +- soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c | 4 +- soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c | 4 +- .../overlays/actors/ovl_En_Light/z_en_light.c | 4 +- .../actors/ovl_En_M_Thunder/z_en_m_thunder.c | 4 +- soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c | 4 +- soh/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c | 8 +- soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c | 8 +- soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c | 4 +- soh/src/overlays/actors/ovl_En_Md/z_en_md.c | 4 +- soh/src/overlays/actors/ovl_En_Mm/z_en_mm.c | 4 +- soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c | 4 +- soh/src/overlays/actors/ovl_En_Mu/z_en_mu.c | 4 +- soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c | 16 +- soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c | 4 +- .../actors/ovl_En_Niw_Girl/z_en_niw_girl.c | 4 +- .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c | 4 +- .../actors/ovl_En_Nutsball/z_en_nutsball.c | 4 +- soh/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c | 4 +- soh/src/overlays/actors/ovl_En_Ny/z_en_ny.c | 8 +- .../overlays/actors/ovl_En_Okuta/z_en_okuta.c | 4 +- .../overlays/actors/ovl_En_Ossan/z_en_ossan.c | 44 ++-- soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c | 4 +- .../overlays/actors/ovl_En_Part/z_en_part.c | 4 +- .../actors/ovl_En_Peehat/z_en_peehat.c | 8 +- .../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 | 12 +- .../ovl_En_Po_Sisters/z_en_po_sisters.c | 4 +- soh/src/overlays/actors/ovl_En_Poh/z_en_poh.c | 12 +- soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c | 4 +- .../overlays/actors/ovl_En_Reeba/z_en_reeba.c | 4 +- soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c | 8 +- soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c | 4 +- soh/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 8 +- soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 8 +- soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c | 4 +- .../ovl_En_Scene_Change/z_en_scene_change.c | 4 +- soh/src/overlays/actors/ovl_En_Sda/z_en_sda.c | 4 +- .../actors/ovl_En_Shopnuts/z_en_shopnuts.c | 4 +- .../actors/ovl_En_Siofuki/z_en_siofuki.c | 4 +- soh/src/overlays/actors/ovl_En_Skb/z_en_skb.c | 4 +- soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c | 8 +- .../actors/ovl_En_Skjneedle/z_en_skjneedle.c | 4 +- soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 4 +- soh/src/overlays/actors/ovl_En_St/z_en_st.c | 4 +- soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c | 8 +- .../actors/ovl_En_Stream/z_en_stream.c | 4 +- soh/src/overlays/actors/ovl_En_Sw/z_en_sw.c | 12 +- .../ovl_En_Syateki_Niw/z_en_syateki_niw.c | 4 +- soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c | 4 +- .../ovl_En_Takara_Man/z_en_takara_man.c | 4 +- .../overlays/actors/ovl_En_Tana/z_en_tana.c | 8 +- .../overlays/actors/ovl_En_Test/z_en_test.c | 4 +- soh/src/overlays/actors/ovl_En_Tg/z_en_tg.c | 4 +- .../overlays/actors/ovl_En_Tite/z_en_tite.c | 4 +- soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c | 12 +- .../actors/ovl_En_Torch2/z_en_torch2.c | 4 +- soh/src/overlays/actors/ovl_En_Tp/z_en_tp.c | 4 +- soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c | 4 +- .../overlays/actors/ovl_En_Vali/z_en_vali.c | 8 +- .../actors/ovl_En_Vb_Ball/z_en_vb_ball.c | 4 +- .../actors/ovl_En_Viewer/z_en_viewer.c | 28 +-- soh/src/overlays/actors/ovl_En_Vm/z_en_vm.c | 4 +- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 8 +- .../actors/ovl_En_Weiyer/z_en_weiyer.c | 4 +- soh/src/overlays/actors/ovl_En_Wf/z_en_wf.c | 4 +- .../actors/ovl_En_Wood02/z_en_wood02.c | 4 +- soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c | 20 +- .../actors/ovl_En_Yukabyun/z_en_yukabyun.c | 4 +- soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c | 4 +- soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c | 4 +- soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c | 8 +- soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 8 +- soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c | 4 +- soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c | 16 +- soh/src/overlays/actors/ovl_En_fHG/z_en_fhg.c | 4 +- .../actors/ovl_End_Title/z_end_title.c | 12 +- .../overlays/actors/ovl_Fishing/z_fishing.c | 40 ++-- .../actors/ovl_Item_B_Heart/z_item_b_heart.c | 4 +- .../actors/ovl_Item_Shield/z_item_shield.c | 4 +- .../actors/ovl_Magic_Dark/z_magic_dark.c | 8 +- .../actors/ovl_Magic_Fire/z_magic_fire.c | 4 +- .../actors/ovl_Magic_Wind/z_magic_wind.c | 8 +- .../overlays/actors/ovl_Mir_Ray/z_mir_ray.c | 4 +- .../overlays/actors/ovl_Obj_Comb/z_obj_comb.c | 4 +- .../actors/ovl_Obj_Dekujr/z_obj_dekujr.c | 4 +- .../actors/ovl_Obj_Hamishi/z_obj_hamishi.c | 4 +- .../actors/ovl_Obj_Hsblock/z_obj_hsblock.c | 4 +- .../actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c | 4 +- .../ovl_Obj_Lightswitch/z_obj_lightswitch.c | 8 +- .../actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c | 4 +- .../actors/ovl_Obj_Switch/z_obj_switch.c | 12 +- .../actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 4 +- .../ovl_Obj_Timeblock/z_obj_timeblock.c | 4 +- .../ovl_Obj_Warp2block/z_obj_warp2block.c | 4 +- .../ovl_Object_Kankyo/z_object_kankyo.c | 20 +- .../actors/ovl_Oceff_Spot/z_oceff_spot.c | 4 +- .../actors/ovl_Oceff_Storm/z_oceff_storm.c | 8 +- .../actors/ovl_Oceff_Wipe/z_oceff_wipe.c | 4 +- .../actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c | 4 +- .../actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c | 4 +- .../actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c | 4 +- .../actors/ovl_player_actor/z_player.c | 12 +- .../ovl_Effect_Ss_Blast/z_eff_ss_blast.c | 4 +- .../ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c | 4 +- .../ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c | 8 +- .../ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c | 4 +- .../ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c | 4 +- .../ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c | 4 +- .../ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c | 4 +- .../ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c | 4 +- .../z_eff_ss_dt_bubble.c | 4 +- .../ovl_Effect_Ss_Dust/z_eff_ss_dust.c | 4 +- .../ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c | 4 +- .../ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c | 4 +- .../ovl_Effect_Ss_Extra/z_eff_ss_extra.c | 4 +- .../ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c | 4 +- .../z_eff_ss_fhg_flash.c | 8 +- .../z_eff_ss_fire_tail.c | 4 +- .../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 | 4 +- .../ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c | 8 +- .../ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c | 4 +- .../z_eff_ss_ice_piece.c | 4 +- .../z_eff_ss_ice_smoke.c | 4 +- .../ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c | 4 +- .../ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c | 4 +- .../z_eff_ss_kirakira.c | 4 +- .../z_eff_ss_lightning.c | 4 +- .../ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c | 4 +- .../ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c | 4 +- .../z_eff_ss_solder_srch_ball.c | 4 +- .../ovl_Effect_Ss_Stick/z_eff_ss_stick.c | 4 +- .../ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c | 4 +- .../ovl_file_choose/z_file_choose.c | 20 +- .../ovl_file_choose/z_file_nameset_PAL.c | 20 +- .../overlays/gamestates/ovl_select/z_select.c | 12 +- .../overlays/gamestates/ovl_title/z_title.c | 8 +- .../ovl_kaleido_scope/z_kaleido_collect.c | 4 +- .../misc/ovl_kaleido_scope/z_kaleido_debug.c | 8 +- .../ovl_kaleido_scope/z_kaleido_equipment.c | 8 +- .../misc/ovl_kaleido_scope/z_kaleido_item.c | 8 +- .../ovl_kaleido_scope/z_kaleido_map_PAL.c | 8 +- .../ovl_kaleido_scope/z_kaleido_scope_PAL.c | 24 +- .../misc/ovl_kaleido_scope/z_lmap_mark.c | 4 +- 378 files changed, 1682 insertions(+), 1682 deletions(-) diff --git a/soh/include/macros.h b/soh/include/macros.h index b794b1777..0cdd613f8 100644 --- a/soh/include/macros.h +++ b/soh/include/macros.h @@ -140,34 +140,34 @@ extern GraphicsContext* __gfxCtx; // __gfxCtx shouldn't be used directly. // Use the DISP macros defined above when writing to display buffers. #ifndef NDEBUG -#define OPEN_DISPS(gfxCtx, file, line) \ +#define OPEN_DISPS(gfxCtx) \ { \ void FrameInterpolation_RecordOpenChild(const void* a, int b); \ - FrameInterpolation_RecordOpenChild(file, line); \ + FrameInterpolation_RecordOpenChild(__FILE__, __LINE__); \ GraphicsContext* __gfxCtx; \ Gfx* dispRefs[4]; \ __gfxCtx = gfxCtx; \ (void)__gfxCtx; \ - Graph_OpenDisps(dispRefs, gfxCtx, file, line) + Graph_OpenDisps(dispRefs, gfxCtx, __FILE__, __LINE__) #else -#define OPEN_DISPS(gfxCtx, file, line) \ +#define OPEN_DISPS(gfxCtx) \ { \ void FrameInterpolation_RecordOpenChild(const void* a, int b); \ - FrameInterpolation_RecordOpenChild(file, line); \ + FrameInterpolation_RecordOpenChild(__FILE__, __LINE__); \ GraphicsContext* __gfxCtx; \ __gfxCtx = gfxCtx; \ (void)__gfxCtx; #endif #ifndef NDEBUG -#define CLOSE_DISPS(gfxCtx, file, line) \ +#define CLOSE_DISPS(gfxCtx) \ {void FrameInterpolation_RecordCloseChild(void); \ FrameInterpolation_RecordCloseChild();} \ - Graph_CloseDisps(dispRefs, gfxCtx, file, line); \ + Graph_CloseDisps(dispRefs, gfxCtx, __FILE__, __LINE__); \ } \ (void)0 #else -#define CLOSE_DISPS(gfxCtx, file, line) \ +#define CLOSE_DISPS(gfxCtx) \ {void FrameInterpolation_RecordCloseChild(void); \ FrameInterpolation_RecordCloseChild();} \ (void)0; \ diff --git a/soh/soh/Enhancements/debugger/colViewer.cpp b/soh/soh/Enhancements/debugger/colViewer.cpp index dce1e5d3d..88cee79b1 100644 --- a/soh/soh/Enhancements/debugger/colViewer.cpp +++ b/soh/soh/Enhancements/debugger/colViewer.cpp @@ -698,7 +698,7 @@ void DrawColViewer() { return; } - OPEN_DISPS(gGlobalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gGlobalCtx->state.gfxCtx); opaDl.push_back(gsSPEndDisplayList()); gSPDisplayList(POLY_OPA_DISP++, opaDl.data()); @@ -706,5 +706,5 @@ void DrawColViewer() { xluDl.push_back(gsSPEndDisplayList()); gSPDisplayList(POLY_XLU_DISP++, xluDl.data()); - CLOSE_DISPS(gGlobalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gGlobalCtx->state.gfxCtx); } diff --git a/soh/src/code/flg_set.c b/soh/src/code/flg_set.c index 00188631c..54bbd21e8 100644 --- a/soh/src/code/flg_set.c +++ b/soh/src/code/flg_set.c @@ -40,7 +40,7 @@ void FlagSet_Update(GlobalContext* globalCtx) { Gfx* gfx; Gfx* polyOpa; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); { GfxPrint printer; @@ -148,5 +148,5 @@ void FlagSet_Update(GlobalContext* globalCtx) { globalCtx->pauseCtx.debugState = 0; } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/code/game.c b/soh/src/code/game.c index ee0d9880c..f6d55828d 100644 --- a/soh/src/code/game.c +++ b/soh/src/code/game.c @@ -143,7 +143,7 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) { Gfx* newDList; Gfx* polyOpaP; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); newDList = Graph_GfxPlusOne(polyOpaP = POLY_OPA_DISP); gSPDisplayList(OVERLAY_DISP++, newDList); @@ -184,7 +184,7 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) { if (1) {} - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); func_80063D7C(gfxCtx); @@ -195,7 +195,7 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) { } void GameState_SetFrameBuffer(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPSegment(POLY_OPA_DISP++, 0, 0); gSPSegment(POLY_OPA_DISP++, 0xF, gfxCtx->curFrameBuffer); @@ -207,14 +207,14 @@ void GameState_SetFrameBuffer(GraphicsContext* gfxCtx) { gSPSegment(OVERLAY_DISP++, 0xF, gfxCtx->curFrameBuffer); gSPSegment(OVERLAY_DISP++, 0xE, gZBuffer); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_800C49F4(GraphicsContext* gfxCtx) { Gfx* newDlist; Gfx* polyOpaP; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); newDlist = Graph_GfxPlusOne(polyOpaP = POLY_OPA_DISP); gSPDisplayList(OVERLAY_DISP++, newDlist); @@ -225,7 +225,7 @@ void func_800C49F4(GraphicsContext* gfxCtx) { if (1) {} - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void PadMgr_RequestPadData(PadMgr*, Input*, s32); diff --git a/soh/src/code/graph.c b/soh/src/code/graph.c index 8b7ca738d..bf0e1f5f7 100644 --- a/soh/src/code/graph.c +++ b/soh/src/code/graph.c @@ -225,9 +225,9 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) { task->output_buff_size = (u64*)((u8*)gGfxSPTaskOutputBuffer + sizeof(gGfxSPTaskOutputBuffer)); task->data_ptr = (u64*)gfxCtx->workBuffer; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); task->data_size = (uintptr_t)WORK_DISP - (uintptr_t)gfxCtx->workBuffer; - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); { s32 pad2; } // Necessary to match stack usage @@ -272,29 +272,29 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { gameState->unk_A0 = 0; Graph_InitTHGA(gfxCtx); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gDPNoOpString(WORK_DISP++, "WORK_DISP 開始", 0); gDPNoOpString(POLY_OPA_DISP++, "POLY_OPA_DISP 開始", 0); gDPNoOpString(POLY_XLU_DISP++, "POLY_XLU_DISP 開始", 0); gDPNoOpString(OVERLAY_DISP++, "OVERLAY_DISP 開始", 0); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); GameState_ReqPadData(gameState); GameState_Update(gameState); Debug_Draw(); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gDPNoOpString(WORK_DISP++, "WORK_DISP 終了", 0); gDPNoOpString(POLY_OPA_DISP++, "POLY_OPA_DISP 終了", 0); gDPNoOpString(POLY_XLU_DISP++, "POLY_XLU_DISP 終了", 0); gDPNoOpString(OVERLAY_DISP++, "OVERLAY_DISP 終了", 0); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPBranchList(WORK_DISP++, gfxCtx->polyOpaBuffer); gSPBranchList(POLY_OPA_DISP++, gfxCtx->polyXluBuffer); @@ -305,7 +305,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { gDPFullSync(OVERLAY_DISP++); gSPEndDisplayList(OVERLAY_DISP++); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); if (HREG(80) == 10 && HREG(93) == 2) { HREG(80) = 7; diff --git a/soh/src/code/speed_meter.c b/soh/src/code/speed_meter.c index 55d96fabc..27a042b82 100644 --- a/soh/src/code/speed_meter.c +++ b/soh/src/code/speed_meter.c @@ -55,7 +55,7 @@ void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx) { uly = this->y; lry = this->y + 2; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); /*! @bug if gIrqMgrRetraceTime is 0, CLOSE_DISPS will never be reached */ if (gIrqMgrRetraceTime == 0) { @@ -98,7 +98,7 @@ void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx) { OVERLAY_DISP = gfx; - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void SpeedMeter_InitAllocEntry(SpeedMeterAllocEntry* this, u32 maxval, u32 val, u16 backColor, u16 foreColor, u32 ulx, @@ -123,7 +123,7 @@ void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxC LOG_NUM("this->maxval", this->maxval, __FILE__, __LINE__); osSyncPrintf(VT_RST); } else { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); View_Init(&view, gfxCtx); view.flags = 0xA; @@ -146,7 +146,7 @@ void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxC gDPPipeSync(gfx++); OVERLAY_DISP = gfx; - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } } diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c index cad88d4b8..042eca79e 100644 --- a/soh/src/code/z_actor.c +++ b/soh/src/code/z_actor.c @@ -93,7 +93,7 @@ void ActorShadow_Draw(Actor* actor, Lights* lights, GlobalContext* globalCtx, Gf temp1 = actor->world.pos.y - actor->floorHeight; if (temp1 >= -50.0f && temp1 < 500.0f) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_OPA_DISP = Gfx_CallSetupDL(POLY_OPA_DISP, 0x2C); @@ -124,7 +124,7 @@ void ActorShadow_Draw(Actor* actor, Lights* lights, GlobalContext* globalCtx, Gf G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, dlist); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } } @@ -148,7 +148,7 @@ void ActorShadow_DrawFoot(GlobalContext* globalCtx, Light* light, MtxF* arg2, s3 f32 sp58; s32 pad2[2]; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 0, (u32)(((arg3 * 0.00005f) > 1.0f ? 1.0f : (arg3 * 0.00005f)) * arg4) & 0xFF); @@ -164,7 +164,7 @@ void ActorShadow_DrawFoot(GlobalContext* globalCtx, Light* light, MtxF* arg2, s3 G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, gFootShadowDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void ActorShadow_DrawFeet(Actor* actor, Lights* lights, GlobalContext* globalCtx) { @@ -200,7 +200,7 @@ void ActorShadow_DrawFeet(Actor* actor, Lights* lights, GlobalContext* globalCtx Vec3f* feetPosPtr = actor->shape.feetPos; f32* floorHeightPtr = floorHeight; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_OPA_DISP = Gfx_CallSetupDL(POLY_OPA_DISP, 0x2C); @@ -267,7 +267,7 @@ void ActorShadow_DrawFeet(Actor* actor, Lights* lights, GlobalContext* globalCtx } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -416,7 +416,7 @@ void func_8002C0C0(TargetContext* targetCtx, Actor* actor, GlobalContext* global void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { Actor* actor = targetCtx->targetedActor; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (targetCtx->unk_48 != 0) { TargetContextEntry* entry; @@ -531,7 +531,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { FrameInterpolation_RecordCloseChild(); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, GlobalContext* globalCtx) { @@ -1050,7 +1050,7 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) { titleY = (titleCtx->y * 4) - (height * 2); doubleWidth = width * 2; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); height = (width * height > 0x1000) ? 0x1000 / width : height; titleSecondY = titleY + (height * 4); @@ -1098,7 +1098,7 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) { titleSecondY + (height * 4), G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -1691,11 +1691,11 @@ Gfx* func_8002E830(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* Hilite* func_8002EABC(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* gfxCtx) { Hilite* hilite; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); POLY_OPA_DISP = func_8002E830(object, eye, lightDir, gfxCtx, POLY_OPA_DISP, &hilite); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); return hilite; } @@ -1703,11 +1703,11 @@ Hilite* func_8002EABC(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContex Hilite* func_8002EB44(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* gfxCtx) { Hilite* hilite; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); POLY_XLU_DISP = func_8002E830(object, eye, lightDir, gfxCtx, POLY_XLU_DISP, &hilite); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); return hilite; } @@ -1733,13 +1733,13 @@ void func_8002EBCC(Actor* actor, GlobalContext* globalCtx, s32 flag) { displayList = Graph_Alloc(globalCtx->state.gfxCtx, 2 * sizeof(Gfx)); displayListHead = displayList; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPSetHilite1Tile(displayListHead++, 1, hilite, 0x10, 0x10); gSPEndDisplayList(displayListHead); gSPSegment(POLY_OPA_DISP++, 0x07, displayList); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -1759,13 +1759,13 @@ void func_8002ED80(Actor* actor, GlobalContext* globalCtx, s32 flag) { displayList = Graph_Alloc(globalCtx->state.gfxCtx, 2 * sizeof(Gfx)); displayListHead = displayList; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPSetHilite1Tile(displayListHead++, 1, hilite, 0x10, 0x10); gSPEndDisplayList(displayListHead); gSPSegment(POLY_XLU_DISP++, 0x07, displayList); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -2156,7 +2156,7 @@ void Actor_DrawFaroresWindPointer(GlobalContext* globalCtx) { s32 lightRadius = -1; s32 params; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); params = gSaveContext.respawn[RESPAWN_MODE_TOP].data; @@ -2293,7 +2293,7 @@ void Actor_DrawFaroresWindPointer(GlobalContext* globalCtx) { ((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z), 255, 255, 255, lightRadius); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80030488(GlobalContext* globalCtx) { @@ -2519,7 +2519,7 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) { Fault_AddClient(&faultClient, Actor_FaultPrint, actor, "Actor_draw"); FrameInterpolation_RecordOpenChild(actor, 0); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); lights = LightContext_NewLights(&globalCtx->lightCtx, globalCtx->state.gfxCtx); @@ -2575,7 +2575,7 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) { actor->shape.shadowDraw(actor, lights, globalCtx); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); FrameInterpolation_RecordCloseChild(); Fault_RemoveClient(&faultClient); @@ -2596,7 +2596,7 @@ void func_80030ED8(Actor* actor) { } void func_80030FA8(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gDPLoadTextureBlock(POLY_XLU_DISP++, gLensOfTruthMaskTex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_MIRROR | G_TX_CLAMP, G_TX_MIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD); @@ -2611,7 +2611,7 @@ void func_80030FA8(GraphicsContext* gfxCtx) { gSPWideTextureRectangle(POLY_XLU_DISP++, x, 0, x + abs(x), 960, G_TX_RENDERTILE, 0, 0, 0, 0); gSPWideTextureRectangle(POLY_XLU_DISP++, 0, 0, w, 960, G_TX_RENDERTILE, 2240, 1600, 576, 597); gDPPipeSync(POLY_XLU_DISP++); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_8003115C(GlobalContext* globalCtx, s32 numInvisibleActors, Actor** invisibleActors) { @@ -2621,7 +2621,7 @@ void func_8003115C(GlobalContext* globalCtx, s32 numInvisibleActors, Actor** inv gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ START", 0); // "Magic lens START" @@ -2682,7 +2682,7 @@ void func_8003115C(GlobalContext* globalCtx, s32 numInvisibleActors, Actor** inv gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ END", 0); // "Magic lens END" - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } s32 func_800314B0(GlobalContext* globalCtx, Actor* actor) { @@ -2720,7 +2720,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) { invisibleActorCounter = 0; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); actorListEntry = &actorCtx->actorLists[0]; @@ -2810,7 +2810,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) { CollisionCheck_DrawCollision(globalCtx, &globalCtx->colChkCtx); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80031A28(GlobalContext* globalCtx, ActorContext* actorCtx) { @@ -3820,7 +3820,7 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) Vec3f sp50; CollisionPoly* sp4C; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (0) {} // Necessary to match @@ -3847,7 +3847,7 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, gCircleShadowDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80033DB8(GlobalContext* globalCtx, s16 arg1, s16 arg2) { @@ -3916,7 +3916,7 @@ void Actor_DrawDoorLock(GlobalContext* globalCtx, s32 frame, s32 type) { entry = &sDoorLocksInfo[type]; chainRotZ = entry->chainsRotZInit; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Translate(0.0f, entry->yShift, 500.0f, MTXMODE_APPLY); Matrix_Get(&baseMtxF); @@ -3953,7 +3953,7 @@ void Actor_DrawDoorLock(GlobalContext* globalCtx, s32 frame, s32 type) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, entry->lockDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_8003424C(GlobalContext* globalCtx, Vec3f* arg1) { @@ -4195,7 +4195,7 @@ Gfx* func_80034B54(GraphicsContext* gfxCtx) { void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, Actor* actor, s16 alpha) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -4207,12 +4207,12 @@ void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbD POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, overrideLimbDraw, postLimbDraw, actor, POLY_OPA_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, Actor* actor, s16 alpha) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -4223,7 +4223,7 @@ void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbD POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, overrideLimbDraw, postLimbDraw, actor, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s16 func_80034DD4(Actor* actor, GlobalContext* globalCtx, s16 arg2, f32 arg3) { diff --git a/soh/src/code/z_cheap_proc.c b/soh/src/code/z_cheap_proc.c index b1b44d1e6..ccc42452c 100644 --- a/soh/src/code/z_cheap_proc.c +++ b/soh/src/code/z_cheap_proc.c @@ -1,23 +1,23 @@ #include "global.h" void Gfx_DrawDListOpa(GlobalContext* globalCtx, Gfx* dlist) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, dlist); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Gfx_DrawDListXlu(GlobalContext* globalCtx, Gfx* dlist) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, dlist); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/code/z_collision_check.c b/soh/src/code/z_collision_check.c index ce4c136e2..c45a6c915 100644 --- a/soh/src/code/z_collision_check.c +++ b/soh/src/code/z_collision_check.c @@ -55,7 +55,7 @@ void Collider_DrawPoly(GraphicsContext* gfxCtx, Vec3f* vA, Vec3f* vB, Vec3f* vC, f32 nz; f32 originDist; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0xFF, r, g, b, 50); @@ -97,7 +97,7 @@ void Collider_DrawPoly(GraphicsContext* gfxCtx, Vec3f* vA, Vec3f* vB, Vec3f* vC, gSPVertex(POLY_OPA_DISP++, vtxTbl, 3, 0); gSP1Triangle(POLY_OPA_DISP++, 0, 1, 2, 0); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } s32 Collider_InitBase(GlobalContext* globalCtx, Collider* collider) { diff --git a/soh/src/code/z_debug.c b/soh/src/code/z_debug.c index 3ab72709f..6a4a7c4d8 100644 --- a/soh/src/code/z_debug.c +++ b/soh/src/code/z_debug.c @@ -222,7 +222,7 @@ void func_80063D7C(GraphicsContext* gfxCtx) { if (!CVar_GetS32("gDebugEnabled", 0)) return; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); GfxPrint_Init(&printer); sp78 = POLY_OPA_DISP; @@ -246,7 +246,7 @@ void func_80063D7C(GraphicsContext* gfxCtx) { if (1) {} - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); GfxPrint_Destroy(&printer); } diff --git a/soh/src/code/z_debug_display.c b/soh/src/code/z_debug_display.c index d86f3009c..8bd38b390 100644 --- a/soh/src/code/z_debug_display.c +++ b/soh/src/code/z_debug_display.c @@ -67,7 +67,7 @@ void DebugDisplay_DrawObjects(GlobalContext* globalCtx) { } void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, void* texture, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80094678(globalCtx->state.gfxCtx); @@ -85,11 +85,11 @@ void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, void* texture, GlobalCo G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, gDebugSpriteDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, void* dlist, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_8009435C(globalCtx->state.gfxCtx); @@ -104,5 +104,5 @@ void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, void* dlist, GlobalConte G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, dlist); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/code/z_demo.c b/soh/src/code/z_demo.c index 1fe252ff4..f912949b1 100644 --- a/soh/src/code/z_demo.c +++ b/soh/src/code/z_demo.c @@ -1916,7 +1916,7 @@ void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) { if (0) {} // Also necessary to match if (BREG(0) != 0) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); prevDisplayList = POLY_OPA_DISP; displayList = Graph_GfxPlusOne(POLY_OPA_DISP); @@ -1926,7 +1926,7 @@ void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) { Graph_BranchDlist(prevDisplayList, displayList); POLY_OPA_DISP = displayList; - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } csCtx->frames++; diff --git a/soh/src/code/z_draw.c b/soh/src/code/z_draw.c index 83765df41..4688bc6a9 100644 --- a/soh/src/code/z_draw.c +++ b/soh/src/code/z_draw.c @@ -382,33 +382,33 @@ void GetItem_Draw(GlobalContext* globalCtx, s16 drawId) { void GetItem_DrawMaskOrBombchu(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093BA8(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawSoldOut(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 5); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawBlueFire(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -428,13 +428,13 @@ void GetItem_DrawBlueFire(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawPoes(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -457,13 +457,13 @@ void GetItem_DrawPoes(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawFairy(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -485,13 +485,13 @@ void GetItem_DrawFairy(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawMirrorShield(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, @@ -508,13 +508,13 @@ void GetItem_DrawMirrorShield(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawSkullToken(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -530,13 +530,13 @@ void GetItem_DrawSkullToken(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawEggOrMedallion(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093BA8(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -544,13 +544,13 @@ void GetItem_DrawEggOrMedallion(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawCompass(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -562,13 +562,13 @@ void GetItem_DrawCompass(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawPotion(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, @@ -588,13 +588,13 @@ void GetItem_DrawPotion(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[4]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[5]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawGoronSword(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, @@ -605,13 +605,13 @@ void GetItem_DrawGoronSword(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawDekuNuts(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, @@ -622,13 +622,13 @@ void GetItem_DrawDekuNuts(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawRecoveryHeart(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, @@ -639,13 +639,13 @@ void GetItem_DrawRecoveryHeart(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawFish(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, @@ -656,26 +656,26 @@ void GetItem_DrawFish(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawOpa0(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawOpa0Xlu1(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -687,13 +687,13 @@ void GetItem_DrawOpa0Xlu1(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawXlu01(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -701,13 +701,13 @@ void GetItem_DrawXlu01(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawOpa10Xlu2(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -720,13 +720,13 @@ void GetItem_DrawOpa10Xlu2(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawMagicArrow(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -739,13 +739,13 @@ void GetItem_DrawMagicArrow(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawMagicSpell(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, @@ -758,13 +758,13 @@ void GetItem_DrawMagicSpell(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawOpa1023(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -774,13 +774,13 @@ void GetItem_DrawOpa1023(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[2]); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[3]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawOpa10Xlu32(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -794,13 +794,13 @@ void GetItem_DrawOpa10Xlu32(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawSmallRupee(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Scale(0.7f, 0.7f, 0.7f, MTXMODE_APPLY); @@ -816,13 +816,13 @@ void GetItem_DrawSmallRupee(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawScale(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, @@ -836,13 +836,13 @@ void GetItem_DrawScale(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawBulletBag(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -857,13 +857,13 @@ void GetItem_DrawBulletBag(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[4]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawWallet(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -877,5 +877,5 @@ void GetItem_DrawWallet(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[6]); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[7]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/code/z_eff_blure.c b/soh/src/code/z_eff_blure.c index 61efbdbe4..81ae4eeb1 100644 --- a/soh/src/code/z_eff_blure.c +++ b/soh/src/code/z_eff_blure.c @@ -382,11 +382,11 @@ void EffectBlure_GetComputedValues(EffectBlure* this, s32 index, f32 ratio, Vec3 } void EffectBlure_SetupSmooth(EffectBlure* this, GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } // original name: "SQ_NoInterpolate_disp" @@ -403,7 +403,7 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement* Vec3f sp60; Vec3f sp54; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); Math_Vec3s_ToVec3f(&sp6C, &this->elements[0].p2); @@ -483,7 +483,7 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement* gSP2Triangles(POLY_XLU_DISP++, 0, 1, 2, 0, 0, 2, 3, 0); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElement* elem, s32 index, @@ -514,7 +514,7 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem Color_RGBA8 sp144; Vec3f sp138; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); Math_Vec3s_ToVec3f(&sp138, &this->elements[0].p2); @@ -656,7 +656,7 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem gSP2Triangles(POLY_XLU_DISP++, 12, 13, 15, 0, 12, 15, 14, 0); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectBlure_DrawSmooth(EffectBlure* this2, GraphicsContext* gfxCtx) { @@ -668,7 +668,7 @@ void EffectBlure_DrawSmooth(EffectBlure* this2, GraphicsContext* gfxCtx) { MtxF sp5C; Mtx* mtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (this->numElements < 2) { return; @@ -710,19 +710,19 @@ void EffectBlure_DrawSmooth(EffectBlure* this2, GraphicsContext* gfxCtx) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectBlure_SetupSimple(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectBlure_SetupSimpleAlt(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gDPPipeSync(POLY_XLU_DISP++); POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26); @@ -743,7 +743,7 @@ void EffectBlure_SetupSimpleAlt(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* gDPSetEnvColor(POLY_XLU_DISP++, this->altEnvColor.r, this->altEnvColor.g, this->altEnvColor.b, this->altEnvColor.a); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void (*sSetupHandlers[])(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vtx) = { @@ -757,7 +757,7 @@ s32 D_80115788 = 0; // unused void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vtx) { Mtx* mtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); sSetupHandlers[this->drawMode](gfxCtx, this, vtx); gDPPipeSync(POLY_XLU_DISP++); @@ -829,7 +829,7 @@ void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this, } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } Vtx_t D_8011578C[] = { @@ -949,7 +949,7 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) { s32 phi_t2; FrameInterpolation_RecordOpenChild(this, 0); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -1061,6 +1061,6 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); FrameInterpolation_RecordCloseChild(); } diff --git a/soh/src/code/z_eff_shield_particle.c b/soh/src/code/z_eff_shield_particle.c index 1612fce90..a5d9ca53f 100644 --- a/soh/src/code/z_eff_shield_particle.c +++ b/soh/src/code/z_eff_shield_particle.c @@ -157,7 +157,7 @@ void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) { Color_RGBA8 envColor; FrameInterpolation_RecordOpenChild(this, 0); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (this != NULL) { POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26); @@ -215,6 +215,6 @@ void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); FrameInterpolation_RecordCloseChild(); } diff --git a/soh/src/code/z_eff_spark.c b/soh/src/code/z_eff_spark.c index a9a1cc63a..445fd7fea 100644 --- a/soh/src/code/z_eff_spark.c +++ b/soh/src/code/z_eff_spark.c @@ -155,7 +155,7 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) { f32 ratio; FrameInterpolation_RecordOpenChild(this, 0); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (this != NULL) { gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -276,6 +276,6 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) { } end: - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); FrameInterpolation_RecordCloseChild(); } diff --git a/soh/src/code/z_eff_ss_dead.c b/soh/src/code/z_eff_ss_dead.c index 3fb5684ec..63e4d0112 100644 --- a/soh/src/code/z_eff_ss_dead.c +++ b/soh/src/code/z_eff_ss_dead.c @@ -5,7 +5,7 @@ void func_80026230(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a Gfx* displayListHead; f32 absCos; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); displayListHead = POLY_OPA_DISP; cos = Math_CosS((0x8000 / arg3) * arg2); @@ -25,7 +25,7 @@ void func_80026230(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a if (1) {} // Necessary to match - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80026400(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3) { @@ -33,7 +33,7 @@ void func_80026400(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a f32 cos; if (arg3 != 0) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); cos = Math_CosS((0x4000 / arg3) * arg2); displayListHead = POLY_OPA_DISP; @@ -46,19 +46,19 @@ void func_80026400(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a if (1) {} // Necessary to match - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } void func_80026608(GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPPipeSync(POLY_OPA_DISP++); POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3) { @@ -66,7 +66,7 @@ void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a Gfx* displayListHead; f32 absCos; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); displayListHead = POLY_XLU_DISP; cos = Math_CosS((0x8000 / arg3) * arg2); @@ -86,14 +86,14 @@ void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a if (1) {} // Necessary to match - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80026860(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3) { f32 cos; Gfx* displayListHead; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); displayListHead = POLY_XLU_DISP; cos = Math_CosS((0x4000 / arg3) * arg2); @@ -106,16 +106,16 @@ void func_80026860(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a if (1) {} // Necessary to match - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80026A6C(GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPPipeSync(POLY_XLU_DISP++); POLY_XLU_DISP = Gameplay_SetFog(globalCtx, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/code/z_effect_soft_sprite_old_init.c b/soh/src/code/z_effect_soft_sprite_old_init.c index 7a668c503..e3efdffaa 100644 --- a/soh/src/code/z_effect_soft_sprite_old_init.c +++ b/soh/src/code/z_effect_soft_sprite_old_init.c @@ -51,7 +51,7 @@ void EffectSs_DrawGEffect(GlobalContext* globalCtx, EffectSs* this, void* textur Mtx* mtx; void* object = globalCtx->objectCtx.status[this->rgObjBankIdx].segment; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); scale = this->rgScale * 0.0025f; SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); @@ -73,7 +73,7 @@ void EffectSs_DrawGEffect(GlobalContext* globalCtx, EffectSs* this, void* textur gSPDisplayList(POLY_XLU_DISP++, this->gfx); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } // EffectSsDust Spawn Functions diff --git a/soh/src/code/z_en_a_keep.c b/soh/src/code/z_en_a_keep.c index b18a8b957..ccf39c649 100644 --- a/soh/src/code/z_en_a_keep.c +++ b/soh/src/code/z_en_a_keep.c @@ -348,7 +348,7 @@ void EnAObj_Update(Actor* thisx, GlobalContext* globalCtx) { void EnAObj_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 type = thisx->params; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -364,5 +364,5 @@ void EnAObj_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDLists[type]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c index 5380bd51e..8b3ada132 100644 --- a/soh/src/code/z_en_item00.c +++ b/soh/src/code/z_en_item00.c @@ -1244,7 +1244,7 @@ void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx) { s32 pad; s32 texIndex; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); @@ -1262,7 +1262,7 @@ void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gRupeeDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -1271,7 +1271,7 @@ void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx) { void EnItem00_DrawCollectible(EnItem00* this, GlobalContext* globalCtx) { s32 texIndex = this->actor.params - 3; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP); @@ -1289,7 +1289,7 @@ void EnItem00_DrawCollectible(EnItem00* this, GlobalContext* globalCtx) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, gItemDropDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -1298,7 +1298,7 @@ void EnItem00_DrawCollectible(EnItem00* this, GlobalContext* globalCtx) { void EnItem00_DrawHeartContainer(EnItem00* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); @@ -1312,7 +1312,7 @@ void EnItem00_DrawHeartContainer(EnItem00* this, GlobalContext* globalCtx) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, gHeartContainerInteriorDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -1321,7 +1321,7 @@ void EnItem00_DrawHeartContainer(EnItem00* this, GlobalContext* globalCtx) { void EnItem00_DrawHeartPiece(EnItem00* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); func_8002ED80(&this->actor, globalCtx, 0); @@ -1329,7 +1329,7 @@ void EnItem00_DrawHeartPiece(EnItem00* this, GlobalContext* globalCtx) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, gHeartPieceInteriorDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** diff --git a/soh/src/code/z_fcurve_data_skelanime.c b/soh/src/code/z_fcurve_data_skelanime.c index 142404f3e..c7ad6ab36 100644 --- a/soh/src/code/z_fcurve_data_skelanime.c +++ b/soh/src/code/z_fcurve_data_skelanime.c @@ -104,7 +104,7 @@ void SkelCurve_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, SkelAnimeCurve* OverrideCurveLimbDraw overrideLimbDraw, PostCurveLimbDraw postLimbDraw, s32 lod, void* data) { SkelCurveLimb* limb = SEGMENTED_TO_VIRTUAL(skelCurve->limbList[limbIndex]); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); @@ -175,7 +175,7 @@ void SkelCurve_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, SkelAnimeCurve* SkelCurve_DrawLimb(globalCtx, limb->nextLimbIdx, skelCurve, overrideLimbDraw, postLimbDraw, lod, data); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void SkelCurve_Draw(Actor* actor, GlobalContext* globalCtx, SkelAnimeCurve* skelCurve, diff --git a/soh/src/code/z_kankyo.c b/soh/src/code/z_kankyo.c index 9ecb0e684..6b8a2b854 100644 --- a/soh/src/code/z_kankyo.c +++ b/soh/src/code/z_kankyo.c @@ -949,7 +949,7 @@ void Environment_Update(GlobalContext* globalCtx, EnvironmentContext* envCtx, Li Gfx* displayList; Gfx* prevDisplayList; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); prevDisplayList = POLY_OPA_DISP; displayList = Graph_GfxPlusOne(POLY_OPA_DISP); @@ -959,7 +959,7 @@ void Environment_Update(GlobalContext* globalCtx, EnvironmentContext* envCtx, Li Graph_BranchDlist(prevDisplayList, displayList); POLY_OPA_DISP = displayList; if (1) {} - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } if ((envCtx->unk_BF != 0xFF) && (envCtx->unk_DC != 2) && (envCtx->unk_BD != envCtx->unk_BF) && @@ -1302,7 +1302,7 @@ void Environment_DrawSunAndMoon(GlobalContext* globalCtx) { f32 scale; f32 temp; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (globalCtx->csCtx.state != 0) { Math_SmoothStepToF(&globalCtx->envCtx.sunPos.x, @@ -1397,7 +1397,7 @@ void Environment_DrawSunAndMoon(GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Environment_DrawSunLensFlare(GlobalContext* globalCtx, EnvironmentContext* envCtx, View* view, @@ -1461,7 +1461,7 @@ void Environment_DrawLensFlare(GlobalContext* globalCtx, EnvironmentContext* env LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, }; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); dist = Math3D_Vec3f_DistXYZ(&pos, &view->eye) / 12.0f; @@ -1615,7 +1615,7 @@ void Environment_DrawLensFlare(GlobalContext* globalCtx, EnvironmentContext* env } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } f32 func_800746DC(void) { @@ -1642,7 +1642,7 @@ void Environment_DrawRain(GlobalContext* globalCtx, View* view, GraphicsContext* Player* player = GET_PLAYER(globalCtx); if (!(globalCtx->cameraPtrs[0]->unk_14C & 0x100) && (globalCtx->envCtx.unk_EE[2] == 0)) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); vec.x = view->lookAt.x - view->eye.x; vec.y = view->lookAt.y - view->eye.y; @@ -1724,7 +1724,7 @@ void Environment_DrawRain(GlobalContext* globalCtx, View* view, GraphicsContext* } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } } @@ -1758,7 +1758,7 @@ void Environment_DrawSkyboxFilters(GlobalContext* globalCtx) { (globalCtx->skyboxId == SKYBOX_UNSET_1D)) { f32 alpha; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_800938B4(globalCtx->state.gfxCtx); @@ -1776,11 +1776,11 @@ void Environment_DrawSkyboxFilters(GlobalContext* globalCtx) { globalCtx->lightCtx.fogColor[2], 255.0f * alpha); gDPFillRectangle(POLY_OPA_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } if (globalCtx->envCtx.customSkyboxFilter) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_800938B4(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, globalCtx->envCtx.skyboxFilterColor[0], @@ -1788,18 +1788,18 @@ void Environment_DrawSkyboxFilters(GlobalContext* globalCtx) { globalCtx->envCtx.skyboxFilterColor[3]); gDPFillRectangle(POLY_OPA_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } void Environment_DrawLightningFlash(GlobalContext* globalCtx, u8 red, u8 green, u8 blue, u8 alpha) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_800938B4(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, red, green, blue, alpha); gDPFillRectangle(POLY_OPA_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Environment_UpdateLightningStrike(GlobalContext* globalCtx) { @@ -1914,7 +1914,7 @@ void Environment_DrawLightning(GlobalContext* globalCtx, s32 unused) { Vec3f unused1 = { 0.0f, 0.0f, 0.0f }; Vec3f unused2 = { 0.0f, 0.0f, 0.0f }; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); for (i = 0; i < ARRAY_COUNT(sLightningBolts); i++) { switch (sLightningBolts[i].state) { @@ -1973,7 +1973,7 @@ void Environment_DrawLightning(GlobalContext* globalCtx, s32 unused) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Environment_PlaySceneSequence(GlobalContext* globalCtx) { @@ -2239,7 +2239,7 @@ void func_800766C4(GlobalContext* globalCtx) { void Environment_FillScreen(GraphicsContext* gfxCtx, u8 red, u8 green, u8 blue, u8 alpha, u8 drawFlags) { if (alpha != 0) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (drawFlags & FILL_SCREEN_OPA) { POLY_OPA_DISP = func_800937C0(POLY_OPA_DISP); @@ -2262,7 +2262,7 @@ void Environment_FillScreen(GraphicsContext* gfxCtx, u8 red, u8 green, u8 blue, gDPFillRectangle(POLY_XLU_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } } @@ -2413,7 +2413,7 @@ void Environment_DrawSandstorm(GlobalContext* globalCtx, u8 sandstormState) { sp94 = (s32)(D_8015FDB0 * (9.0f / 6.0f)); sp92 = (s32)(D_8015FDB0 * (6.0f / 6.0f)); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_XLU_DISP = func_80093F34(POLY_XLU_DISP); gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_NOISE); @@ -2429,7 +2429,7 @@ void Environment_DrawSandstorm(GlobalContext* globalCtx, u8 sandstormState) { gSPWideTextureRectangle(POLY_XLU_DISP++, OTRGetRectDimensionFromLeftEdge(0) << 2, 0, OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH) << 2, 0x03C0, G_TX_RENDERTILE, 0, 0, 0x008C, -0x008C); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); D_8015FDB0 += (s32)sp98; } diff --git a/soh/src/code/z_lifemeter.c b/soh/src/code/z_lifemeter.c index ffbac1c5a..43fd66084 100644 --- a/soh/src/code/z_lifemeter.c +++ b/soh/src/code/z_lifemeter.c @@ -412,7 +412,7 @@ void HealthMeter_Draw(GlobalContext* globalCtx) { u8* curBgImgLoaded = NULL; s32 ddHeartCountMinusOne = gSaveContext.inventory.defenseHearts - 1; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (!(gSaveContext.health % 0x10)) { fullHeartCount--; @@ -584,7 +584,7 @@ void HealthMeter_Draw(GlobalContext* globalCtx) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void HealthMeter_HandleCriticalAlarm(GlobalContext* globalCtx) { diff --git a/soh/src/code/z_lights.c b/soh/src/code/z_lights.c index 10006ff4d..5125cb7a9 100644 --- a/soh/src/code/z_lights.c +++ b/soh/src/code/z_lights.c @@ -67,7 +67,7 @@ void Lights_Draw(Lights* lights, GraphicsContext* gfxCtx) { #if 1 - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPNumLights(POLY_OPA_DISP++, lights->numLights); gSPNumLights(POLY_XLU_DISP++, lights->numLights); @@ -88,7 +88,7 @@ void Lights_Draw(Lights* lights, GraphicsContext* gfxCtx) { gSPLight(POLY_OPA_DISP++, &lights->l.a, i); gSPLight(POLY_XLU_DISP++, &lights->l.a, i); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); #endif } @@ -417,7 +417,7 @@ void Lights_DrawGlow(GlobalContext* globalCtx) { node = globalCtx->lightCtx.listHead; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_XLU_DISP = func_800947AC(POLY_XLU_DISP++); gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_NOISE); @@ -449,5 +449,5 @@ void Lights_DrawGlow(GlobalContext* globalCtx) { node = node->next; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/code/z_map_exp.c b/soh/src/code/z_map_exp.c index e8f8a07cb..4dfda5f4b 100644 --- a/soh/src/code/z_map_exp.c +++ b/soh/src/code/z_map_exp.c @@ -599,7 +599,7 @@ void Minimap_DrawCompassIcons(GlobalContext* globalCtx) { Player* player = GET_PLAYER(globalCtx); s16 tempX, tempZ; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (globalCtx->interfaceCtx.minimapAlpha >= 0xAA) { func_80094A14(globalCtx->state.gfxCtx); @@ -639,7 +639,7 @@ void Minimap_DrawCompassIcons(GlobalContext* globalCtx) { gSPDisplayList(OVERLAY_DISP++, gCompassArrowDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Minimap_Draw(GlobalContext* globalCtx) { @@ -647,7 +647,7 @@ void Minimap_Draw(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; s32 mapIndex = gSaveContext.mapIndex; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (globalCtx->pauseCtx.state < 4) { switch (globalCtx->sceneNum) { @@ -819,7 +819,7 @@ void Minimap_Draw(GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s16 Map_GetFloorTextIndexOffset(s32 mapIndex, s32 floor) { diff --git a/soh/src/code/z_map_mark.c b/soh/src/code/z_map_mark.c index 06e0edfe6..3425118b8 100644 --- a/soh/src/code/z_map_mark.c +++ b/soh/src/code/z_map_mark.c @@ -96,7 +96,7 @@ void MapMark_DrawForDungeon(GlobalContext* globalCtx) { mapMarkIconData = &sLoadedMarkDataTable[dungeon][interfaceCtx->mapRoomNum][0]; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); while (true) { if (mapMarkIconData->markType == MAP_MARK_NONE) { @@ -145,7 +145,7 @@ void MapMark_DrawForDungeon(GlobalContext* globalCtx) { mapMarkIconData++; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void MapMark_Draw(GlobalContext* globalCtx) { diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c index 6e07eda03..02214de2f 100644 --- a/soh/src/code/z_message_PAL.c +++ b/soh/src/code/z_message_PAL.c @@ -2919,7 +2919,7 @@ void Message_DrawDebugVariableChanged(s16* var, GraphicsContext* gfxCtx) { static s16 sFillTimer = 0; s32 pad; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (sVarLastValue != *var) { sVarLastValue = *var; @@ -2940,7 +2940,7 @@ void Message_DrawDebugVariableChanged(s16* var, GraphicsContext* gfxCtx) { gDPFillRectangle(POLY_OPA_DISP++, 40, 120, 60, 140); // 20x20 white box gDPPipeSync(POLY_OPA_DISP++); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void Message_DrawDebugText(GlobalContext* globalCtx, Gfx** p) { @@ -2966,7 +2966,7 @@ void Message_Draw(GlobalContext* globalCtx) { Gfx* polyOpaP; s16 watchVar; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); watchVar = gSaveContext.scarecrowCustomSongSet; Message_DrawDebugVariableChanged(&watchVar, globalCtx->state.gfxCtx); @@ -2985,7 +2985,7 @@ void Message_Draw(GlobalContext* globalCtx) { gSPEndDisplayList(plusOne++); Graph_BranchDlist(polyOpaP, plusOne); POLY_OPA_DISP = plusOne; - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Message_Update(GlobalContext* globalCtx) { diff --git a/soh/src/code/z_moji.c b/soh/src/code/z_moji.c index 8236a7c53..ff6c04800 100644 --- a/soh/src/code/z_moji.c +++ b/soh/src/code/z_moji.c @@ -73,7 +73,7 @@ void Moji_SetPosition(s32 gridX, s32 gridY) { void Moji_DrawChar(GraphicsContext* gfxCtx, char c) { s32 pad[2]; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if ((u32)gMojiFontTLUTs & 0xF) { osSyncPrintf("moji_tlut --> %X\n", gMojiFontTLUTs); @@ -87,7 +87,7 @@ void Moji_DrawChar(GraphicsContext* gfxCtx, char c) { (sScreenPosY + DISP_CHAR_HEIGHT) << 2, G_TX_RENDERTILE, GET_TEX_CHAR_S(c), GET_TEX_CHAR_T(c), (1 << 10) * TEX_CHAR_WIDTH / DISP_CHAR_WIDTH, (1 << 10) * TEX_CHAR_HEIGHT / DISP_CHAR_HEIGHT); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } /** @@ -99,7 +99,7 @@ void Moji_DrawChar(GraphicsContext* gfxCtx, char c) { void Moji_DrawString(GraphicsContext* gfxCtx, const char* str) { s32 i; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if ((u32)gMojiFontTex & 0xF) { osSyncPrintf("font_ff --> %X\n", gMojiFontTex); @@ -140,5 +140,5 @@ void Moji_DrawString(GraphicsContext* gfxCtx, const char* str) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 2470a4f3a..a7c65c9b9 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -2835,7 +2835,7 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; s16 magicBarY; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (gSaveContext.magicLevel != 0) { if (gSaveContext.healthCapacity > 0xA0) { @@ -2921,7 +2921,7 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80088AA0(s16 arg0) { @@ -2961,7 +2961,7 @@ void func_80088B34(s16 arg0) { } void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gDPLoadTextureBlock_4b(OVERLAY_DISP++, texture, G_IM_FMT_IA, DO_ACTION_TEX_WIDTH, DO_ACTION_TEX_HEIGHT, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, @@ -2969,7 +2969,7 @@ void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) { gSP1Quadrangle(OVERLAY_DISP++, 0, 2, 3, 1, 0); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void Interface_DrawItemButtons(GlobalContext* globalCtx) { @@ -2988,7 +2988,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { s16 C_Up_BTN_Pos[] = { C_UP_BUTTON_X+Right_HUD_Margin, C_UP_BUTTON_Y+(Top_HUD_Margin*-1) }; s16 C_Down_BTN_Pos[] = { C_DOWN_BUTTON_X+Right_HUD_Margin, C_DOWN_BUTTON_Y+(Top_HUD_Margin*-1) }; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); // B Button Color & Texture // Also loads the Item Button Texture reused by other buttons afterwards @@ -3184,7 +3184,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } int16_t gItemIconX[] = { B_BUTTON_X, C_LEFT_BUTTON_X, C_DOWN_BUTTON_X, C_RIGHT_BUTTON_X, @@ -3195,7 +3195,7 @@ int16_t gItemIconWidth[] = { 30, 24, 24, 24, 16, 16, 16, 16 }; int16_t gItemIconDD[] = { 550, 680, 680, 680, 1024, 1024, 1024, 1024 }; void Interface_DrawItemIconTexture(GlobalContext* globalCtx, void* texture, s16 button) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPLoadTextureBlock(OVERLAY_DISP++, texture, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); @@ -3207,7 +3207,7 @@ void Interface_DrawItemIconTexture(GlobalContext* globalCtx, void* texture, s16 (gItemIconY[button] + (Top_HUD_Margin * -1) + gItemIconWidth[button]) << 2, G_TX_RENDERTILE, 0, 0, gItemIconDD[button] << 1, gItemIconDD[button] << 1); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } const char* _gAmmoDigit0Tex[] = @@ -3225,7 +3225,7 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) { s16 i; s16 ammo; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); i = gSaveContext.equips.buttonItems[button]; @@ -3278,13 +3278,13 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) { gItemAmmoY[button] + (Top_HUD_Margin * -1), 8, 8, 1 << 10, 1 << 10); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Interface_DrawActionButton(GlobalContext* globalCtx, f32 x, f32 y) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Translate(-137.0f + x, 97.0f - y, XREG(18) / 10.0f, MTXMODE_NEW); Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); @@ -3300,7 +3300,7 @@ void Interface_DrawActionButton(GlobalContext* globalCtx, f32 x, f32 y) { gSP1Quadrangle(OVERLAY_DISP++, 0, 2, 3, 1, 0); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Interface_InitVertices(GlobalContext* globalCtx) { @@ -3464,7 +3464,7 @@ void Interface_Draw(GlobalContext* globalCtx) { s16 svar6; bool fullUi = !CVar_GetS32("gMinimalUI", 0) || !R_MINIMAP_DISABLED || globalCtx->pauseCtx.state != 0; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); // Invalidate Do Action textures as they may have changed gSPInvalidateTexCache(OVERLAY_DISP++, interfaceCtx->doActionSegment); @@ -4350,7 +4350,7 @@ void Interface_Draw(GlobalContext* globalCtx) { gDPFillRectangle(OVERLAY_DISP++, 0, 0, gScreenWidth - 1, gScreenHeight - 1); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Interface_Update(GlobalContext* globalCtx) { diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index 1eca53822..089da3bcb 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -1065,7 +1065,7 @@ void Gameplay_Draw(GlobalContext* globalCtx) { Lights* sp228; Vec3f sp21C; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSegments[4] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[globalCtx->objectCtx.mainKeepIndex].segment); gSegments[5] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment); @@ -1341,7 +1341,7 @@ void Gameplay_Draw(GlobalContext* globalCtx) { POLY_OPA_DISP = gfxP; } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void Gameplay_Main(GameState* thisx) { diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index d52f8445b..f018540cd 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -719,7 +719,7 @@ void func_8008F470(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable, s32 eyeIndex = (jointTable[22].x & 0xF) - 1; s32 mouthIndex = (jointTable[22].x >> 4) - 1; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (eyeIndex < 0) { eyeIndex = sEyeMouthIndexes[face][0]; @@ -814,7 +814,7 @@ void func_8008F470(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable, } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } Vec3f D_8012602C = { 0.0f, 0.0f, 0.0f }; @@ -1166,7 +1166,7 @@ void func_800906D4(GlobalContext* globalCtx, Player* this, Vec3f* newTipPos) { void Player_DrawGetItemImpl(GlobalContext* globalCtx, Player* this, Vec3f* refPos, s32 drawIdPlusOne) { f32 height = (this->exchangeItemId != EXCH_ITEM_NONE) ? 6.0f : 14.0f; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSegments[6] = VIRTUAL_TO_PHYSICAL(this->giObjectSegment); @@ -1180,7 +1180,7 @@ void Player_DrawGetItemImpl(GlobalContext* globalCtx, Player* this, Vec3f* refPo GetItem_Draw(globalCtx, drawIdPlusOne - 1); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Player_DrawGetItem(GlobalContext* globalCtx, Player* this) { @@ -1226,7 +1226,7 @@ void Player_DrawHookshotReticle(GlobalContext* globalCtx, Player* this, f32 arg2 if (1) {} if (BgCheck_AnyLineTest3(&globalCtx->colCtx, &sp8C, &sp80, &sp74, &sp9C, 1, 1, 1, 1, &bgId)) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); WORLD_OVERLAY_DISP = Gfx_CallSetupDL(WORLD_OVERLAY_DISP, 0x07); @@ -1242,7 +1242,7 @@ void Player_DrawHookshotReticle(GlobalContext* globalCtx, Player* this, f32 arg2 gSPSegment(WORLD_OVERLAY_DISP++, 0x06, globalCtx->objectCtx.status[this->actor.objBankIndex].segment); gSPDisplayList(WORLD_OVERLAY_DISP++, gLinkAdultHookshotReticleDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -1308,7 +1308,7 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* if (this->itemActionParam == PLAYER_AP_STICK) { Vec3f sp124[3]; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->actor.scale.y >= 0.0f) { D_80126080.x = this->unk_85C * 5000.0f; @@ -1328,7 +1328,7 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gLinkChildLinkDekuStickDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } else if ((this->actor.scale.y >= 0.0f) && (this->swordState != 0)) { Vec3f spE4[3]; @@ -1343,14 +1343,14 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* } else if ((*dList != NULL) && (this->leftHandType == 7)) { Color_RGB8* bottleColor = &sBottleColors[Player_ActionToBottle(this, this->itemActionParam)]; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetEnvColor(POLY_XLU_DISP++, bottleColor->r, bottleColor->g, bottleColor->b, 0); gSPDisplayList(POLY_XLU_DISP++, sBottleDLists[(gSaveContext.linkAge)]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } if (this->actor.scale.y >= 0.0f) { @@ -1386,7 +1386,7 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* } else if ((this->rightHandType == 11) || (this->rightHandType == 12)) { BowStringData* stringData = &sBowStringData[gSaveContext.linkAge]; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); Matrix_Translate(stringData->pos.x, stringData->pos.y, stringData->pos.z, MTXMODE_APPLY); @@ -1423,7 +1423,7 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } else if ((this->actor.scale.y >= 0.0f) && (this->rightHandType == 10)) { Matrix_Get(&this->shieldMf); func_80090604(globalCtx, this, &this->shieldQuad, D_80126154); @@ -1590,7 +1590,7 @@ void func_80091A24(GlobalContext* globalCtx, void* seg04, void* seg06, SkelAnime Mtx* perspMtx = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx)); Mtx* lookAtMtx = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx)); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x00, NULL); @@ -1660,7 +1660,7 @@ void func_80091A24(GlobalContext* globalCtx, void* seg04, void* seg06, SkelAnime POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP++); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } uintptr_t SelectedAnim = 0; // Current Animaiton on the menu diff --git a/soh/src/code/z_prenmi.c b/soh/src/code/z_prenmi.c index b448384de..f76255b23 100644 --- a/soh/src/code/z_prenmi.c +++ b/soh/src/code/z_prenmi.c @@ -30,7 +30,7 @@ void PreNMI_Draw(PreNMIContext* this) { osSyncPrintf(VT_COL(YELLOW, BLACK) "prenmi_draw\n" VT_RST); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x00, NULL); func_80095248(gfxCtx, 0, 0, 0); @@ -38,7 +38,7 @@ void PreNMI_Draw(PreNMIContext* this) { gDPSetFillColor(POLY_OPA_DISP++, (GPACK_RGBA5551(255, 255, 255, 1) << 16) | GPACK_RGBA5551(255, 255, 255, 1)); gDPFillRectangle(POLY_OPA_DISP++, 0, this->timer + 100, SCREEN_WIDTH - 1, this->timer + 100); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void PreNMI_Main(GameState* thisx) { diff --git a/soh/src/code/z_rcp.c b/soh/src/code/z_rcp.c index 474a12575..ecd0ae1dd 100644 --- a/soh/src/code/z_rcp.c +++ b/soh/src/code/z_rcp.c @@ -928,83 +928,83 @@ Gfx* func_80093808(Gfx* gfx) { } void func_80093848(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x3A]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_800938B4(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x39]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80093920(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x32]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_8009398C(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x33]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_800939F8(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x34]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80093A64(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x35]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80093AD0(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x36]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80093B3C(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x37]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80093BA8(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x1A]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80093C14(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x19]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80093C80(GlobalContext* globalCtx) { @@ -1013,52 +1013,52 @@ void func_80093C80(GlobalContext* globalCtx) { func_80093D18(gfxCtx); if (globalCtx->roomCtx.curRoom.unk_03 == 3) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gDPSetColorDither(POLY_OPA_DISP++, G_CD_DISABLE); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } } void func_80093D18(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x19]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80093D84(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x19]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80093DF0(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x1F]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80093E5C(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x20]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80093EC8(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x21]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } Gfx* func_80093F34(Gfx* gfx) { @@ -1072,35 +1072,35 @@ Gfx* func_80093F58(Gfx* gfx) { } void func_80093F7C(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); POLY_OPA_DISP = func_80093F58(POLY_OPA_DISP); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80093FD8(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x23]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80094044(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x2C]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_800940B0(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x24]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } Gfx* func_8009411C(Gfx* gfx) { @@ -1109,67 +1109,67 @@ Gfx* func_8009411C(Gfx* gfx) { } void func_80094140(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x1C]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_800941AC(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x2B]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80094218(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x2D]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80094284(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(OVERLAY_DISP++, sSetupDL[0x2E]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_800942F0(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x26]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_8009435C(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x04]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_800943C8(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x25]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80094434(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x02]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } Gfx* func_800944A0(Gfx* gfx) { @@ -1178,27 +1178,27 @@ Gfx* func_800944A0(Gfx* gfx) { } void func_800944C4(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); POLY_OPA_DISP = func_800944A0(POLY_OPA_DISP); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_800944C4_KAL(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); POLY_KAL_DISP = func_800944A0(POLY_KAL_DISP); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80094520(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); OVERLAY_DISP = func_800944A0(OVERLAY_DISP); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_8009457C(Gfx** gfxp) { @@ -1208,27 +1208,27 @@ void func_8009457C(Gfx** gfxp) { } void func_800945A0(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x28]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_8009460C(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x29]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80094678(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x2F]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } Gfx* func_800946E4(Gfx* gfx) { @@ -1288,76 +1288,76 @@ Gfx* func_80094968(Gfx* gfx) { } void func_800949A8(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x2A]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_800949A8_KAL(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_KAL_DISP++, sSetupDL[0x2A]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80094A14(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(OVERLAY_DISP++, sSetupDL[0x2A]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80094A80(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x30]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80094AEC(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x31]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80094B58(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x1B]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80094BC4(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x3C]); gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80094C50(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x3D]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80094CBC(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x38]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80094D28(Gfx** gfxp) { @@ -1369,11 +1369,11 @@ void func_80094D28(Gfx** gfxp) { } void func_80094D4C(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x3B]); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } Gfx* Gfx_BranchTexScroll(Gfx** gfxp, u32 x, u32 y, s32 width, s32 height) { @@ -1454,7 +1454,7 @@ Gfx* Gfx_EnvColor(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a) { } void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sFillSetupDL); gSPDisplayList(POLY_XLU_DISP++, sFillSetupDL); @@ -1545,16 +1545,16 @@ void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80095974(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sFillSetupDL); gDPSetScissor(POLY_OPA_DISP++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth, gScreenHeight); gDPSetDepthImage(POLY_OPA_DISP++, gZBuffer); gDPSetColorImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/code/z_room.c b/soh/src/code/z_room.c index 899dc49fc..0a391d187 100644 --- a/soh/src/code/z_room.c +++ b/soh/src/code/z_room.c @@ -37,7 +37,7 @@ void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags) { PolygonType0* polygon0; PolygonDlist* polygonDlist; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (flags & 1) { func_800342EC(&D_801270A0, globalCtx); @@ -67,7 +67,7 @@ void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags) { polygonDlist++; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } #define SHAPE_SORT_MAX 64 @@ -99,7 +99,7 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) { PolygonDlist2* temp; f32 temp_f2; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (flags & 1) { func_800342EC(&D_801270A0, globalCtx); //gSPSegment(POLY_OPA_DISP++, 0x03, room->segment); @@ -215,7 +215,7 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) { iREG(88) = sp9C - 1; - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } //#define JPEG_MARKER 0xFFD8FFE0 @@ -344,7 +344,7 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) { u32 sp94; u32 sp90; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); camera = GET_ACTIVE_CAM(globalCtx); sp9C = (camera->setting == CAM_SET_PREREND_FIXED); @@ -390,7 +390,7 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) { gSPDisplayList(POLY_XLU_DISP++, polygonDlist->xlu); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } BgImage* func_80096A74(PolygonType1* polygon1, GlobalContext* globalCtx) { @@ -439,7 +439,7 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) { u32 sp90; u32 sp8C; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); camera = GET_ACTIVE_CAM(globalCtx); sp98 = (camera->setting == CAM_SET_PREREND_FIXED); @@ -485,7 +485,7 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) { gSPDisplayList(POLY_XLU_DISP++, polygonDlist->xlu); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Room Draw Polygon Type 1 diff --git a/soh/src/code/z_sample.c b/soh/src/code/z_sample.c index 5e0ae74d6..c4d01991f 100644 --- a/soh/src/code/z_sample.c +++ b/soh/src/code/z_sample.c @@ -11,7 +11,7 @@ void Sample_Draw(SampleContext* this) { GraphicsContext* gfxCtx = this->state.gfxCtx; View* view = &this->view; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x00, NULL); gSPSegment(POLY_OPA_DISP++, 0x01, this->staticSegment); @@ -36,7 +36,7 @@ void Sample_Draw(SampleContext* this) { gDPSetCombineMode(POLY_OPA_DISP++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 0, 0); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void Sample_Main(GameState* thisx) { diff --git a/soh/src/code/z_scene_table.c b/soh/src/code/z_scene_table.c index 3b535c818..4aea76ec5 100644 --- a/soh/src/code/z_scene_table.c +++ b/soh/src/code/z_scene_table.c @@ -976,12 +976,12 @@ void func_800994A0(GlobalContext* globalCtx) { // Scene Draw Config 0 void func_80099550(GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sDefaultDisplayList); gSPDisplayList(POLY_XLU_DISP++, sDefaultDisplayList); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* D_8012A2F8[] = { @@ -993,7 +993,7 @@ void* D_8012A2F8[] = { void func_800995DC(GlobalContext* globalCtx) { u32 gameplayFrames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, @@ -1006,14 +1006,14 @@ void func_800995DC(GlobalContext* globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A2F8[gSaveContext.nightFlag])); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 28 void func_80099760(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1023,7 +1023,7 @@ void func_80099760(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* gDCEntranceTextures[] = { @@ -1041,7 +1041,7 @@ void func_80099878(GlobalContext* globalCtx) { s32 pad; Gfx* displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 2 * sizeof(Gfx[3])); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gDCEntranceTextures[gSaveContext.nightFlag])); @@ -1071,7 +1071,7 @@ void func_80099878(GlobalContext* globalCtx) { gDPSetEnvColor(displayListHead++, 255, 255, 255, globalCtx->roomCtx.unk_74[BGDODOAGO_EYE_RIGHT]); gSPEndDisplayList(displayListHead); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 30 @@ -1079,7 +1079,7 @@ void func_80099BD8(GlobalContext* globalCtx) { f32 temp; Gfx* displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 18 * sizeof(Gfx)); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); temp = globalCtx->roomCtx.unk_74[0] / 255.0f; @@ -1123,7 +1123,7 @@ void func_80099BD8(GlobalContext* globalCtx) { gDPSetEnvColor(displayListHead++, 0, 0, 0, globalCtx->roomCtx.unk_74[1]); gSPEndDisplayList(displayListHead); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); if (gSaveContext.sceneSetupIndex == 5) { gCustomLensFlareOn = true; @@ -1140,7 +1140,7 @@ void func_80099BD8(GlobalContext* globalCtx) { void func_8009A45C(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16)); @@ -1163,14 +1163,14 @@ void func_8009A45C(GlobalContext* globalCtx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 32 void func_8009A798(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 256, 64, 64)); @@ -1191,14 +1191,14 @@ void func_8009A798(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 33 void func_8009A9DC(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1214,14 +1214,14 @@ void func_8009A9DC(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 48 void func_8009AB98(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16)); @@ -1232,14 +1232,14 @@ void func_8009AB98(GlobalContext* globalCtx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 39 void func_8009ACA8(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1253,14 +1253,14 @@ void func_8009ACA8(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 24 void func_8009AE30(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; @@ -1280,7 +1280,7 @@ void func_8009AE30(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sThievesHideoutEntranceTextures[] = { @@ -1292,7 +1292,7 @@ void* sThievesHideoutEntranceTextures[] = { void func_8009AFE0(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32)); @@ -1301,7 +1301,7 @@ void func_8009AFE0(GlobalContext* globalCtx) { gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sThievesHideoutEntranceTextures[gSaveContext.nightFlag])); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* D_8012A330[] = { @@ -1315,7 +1315,7 @@ void func_8009B0FC(GlobalContext* globalCtx) { s32 spB0; s32 spAC; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (1) {} // Necessary to match @@ -1378,14 +1378,14 @@ void func_8009B0FC(GlobalContext* globalCtx) { { s32 pad[2]; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 29 void func_8009B86C(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -1397,14 +1397,14 @@ void func_8009B86C(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 145); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 34 void func_8009B9BC(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 4, 16)); @@ -1412,14 +1412,14 @@ void func_8009B9BC(GlobalContext* globalCtx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 35 void func_8009BAA4(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1437,7 +1437,7 @@ void func_8009BAA4(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 36 @@ -1449,7 +1449,7 @@ void func_8009BC44(GlobalContext* globalCtx) { sp83 = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; @@ -1476,7 +1476,7 @@ void func_8009BC44(GlobalContext* globalCtx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, sp83, sp83, sp83, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Screen Shake for Ganon's Tower Collapse @@ -1507,7 +1507,7 @@ void func_8009C0AC(GlobalContext* globalCtx) { sp7B = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -1530,7 +1530,7 @@ void func_8009C0AC(GlobalContext* globalCtx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, sp7B, sp7B, sp7B, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); if (Flags_GetSwitch(globalCtx, 0x37)) { if ((globalCtx->sceneNum == SCENE_GANON_DEMO) || (globalCtx->sceneNum == SCENE_GANON_FINAL) || @@ -1551,7 +1551,7 @@ void func_8009C3EC(GlobalContext* globalCtx) { if (0) {} // Necessary to match - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sIceCavernEntranceTextures[gSaveContext.nightFlag])); @@ -1570,14 +1570,14 @@ void func_8009C3EC(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 42 void func_8009C608(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16)); @@ -1597,14 +1597,14 @@ void func_8009C608(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 43 void func_8009C8B8(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -1621,14 +1621,14 @@ void func_8009C8B8(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 47 void func_8009CAC0(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1641,7 +1641,7 @@ void func_8009CAC0(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sGTGEntranceTextures[] = { @@ -1655,7 +1655,7 @@ void func_8009CC00(GlobalContext* globalCtx) { if (0) {} // Necessary to match - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGTGEntranceTextures[gSaveContext.nightFlag])); @@ -1674,7 +1674,7 @@ void func_8009CC00(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } Gfx* Gfx_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, @@ -1700,7 +1700,7 @@ Gfx* Gfx_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y void func_8009CF84(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1715,14 +1715,14 @@ void func_8009CF84(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 41 void func_8009D0E8(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1740,7 +1740,7 @@ void func_8009D0E8(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sLonLonHouseEntranceTextures[] = { @@ -1750,7 +1750,7 @@ void* sLonLonHouseEntranceTextures[] = { // Scene Draw Config 44 void func_8009D31C(GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); { s32 pad[2]; } @@ -1762,7 +1762,7 @@ void func_8009D31C(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sGuardHouseView2Textures[] = { @@ -1778,7 +1778,7 @@ void* sGuardHouseView1Textures[] = { void func_8009D438(GlobalContext* globalCtx) { s32 var; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (LINK_IS_ADULT) { var = 1; @@ -1795,14 +1795,14 @@ void func_8009D438(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 46 void func_8009D5B4(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32)); @@ -1816,7 +1816,7 @@ void func_8009D5B4(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sForestTempleEntranceTextures[] = { @@ -1830,7 +1830,7 @@ void func_8009D758(GlobalContext* globalCtx) { if (0) {} // Necessary to match - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sForestTempleEntranceTextures[gSaveContext.nightFlag])); @@ -1849,7 +1849,7 @@ void func_8009D758(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sSpiritTempleEntranceTextures[] = { @@ -1859,13 +1859,13 @@ void* sSpiritTempleEntranceTextures[] = { // Scene Draw Config 25 void func_8009D974(GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); { s32 pad[2]; } gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sSpiritTempleEntranceTextures[gSaveContext.nightFlag])); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 1 @@ -1875,7 +1875,7 @@ void func_8009DA30(GlobalContext* globalCtx) { displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 3 * sizeof(Gfx)); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1911,7 +1911,7 @@ void func_8009DA30(GlobalContext* globalCtx) { gSPEndDisplayList(displayListHead); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sKakarikoWindowTextures[] = { @@ -1921,7 +1921,7 @@ void* sKakarikoWindowTextures[] = { // Scene Draw Config 2 void func_8009DD5C(GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); { s32 pad[2]; } @@ -1933,14 +1933,14 @@ void func_8009DD5C(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 3 void func_8009DE78(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1959,7 +1959,7 @@ void func_8009DE78(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 4 @@ -1976,7 +1976,7 @@ void func_8009E0B8(GlobalContext* globalCtx) { if (1) {} if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x09, @@ -2015,14 +2015,14 @@ void func_8009E0B8(GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (s16)(-globalCtx->roomCtx.unk_74[0] * 0.02f), 32, 16, 1, 0, (s16)(-globalCtx->roomCtx.unk_74[0] * 0.02f), 32, 16)); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 5 void func_8009E54C(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if ((gSaveContext.sceneSetupIndex > 3) || (LINK_IS_ADULT && !(gSaveContext.eventChkInf[6] & 0x200))) { globalCtx->roomCtx.unk_74[0] = 87; @@ -2039,7 +2039,7 @@ void func_8009E54C(GlobalContext* globalCtx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sZorasDomainEntranceTextures[] = { @@ -2052,7 +2052,7 @@ void func_8009E730(GlobalContext* globalCtx) { u32 gameplayFrames; u32 var; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; var = 127 - (gameplayFrames * 1) % 128; @@ -2068,14 +2068,14 @@ void func_8009E730(GlobalContext* globalCtx) { { s32 pad[2]; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 7 void func_8009E8C0(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -2093,14 +2093,14 @@ void func_8009E8C0(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 8 void func_8009EAD8(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -2128,7 +2128,7 @@ void func_8009EAD8(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 9 @@ -2137,7 +2137,7 @@ void func_8009EE44(GlobalContext* globalCtx) { if (0) {} // Necessary to match - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -2161,14 +2161,14 @@ void func_8009EE44(GlobalContext* globalCtx) { globalCtx->roomCtx.unk_74[1]++; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 10 void func_8009F074(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -2180,7 +2180,7 @@ void func_8009F074(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* D_8012A380[] = { @@ -2190,20 +2190,20 @@ void* D_8012A380[] = { // Scene Draw Config 11 void func_8009F1B4(GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); { s32 pad[2]; } gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A380[gSaveContext.nightFlag])); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 12 void func_8009F270(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -2219,14 +2219,14 @@ void func_8009F270(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 13 void func_8009F40C(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -2242,14 +2242,14 @@ void func_8009F40C(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 14 void func_8009F5D4(GlobalContext* globalCtx) { Gfx* displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 3 * sizeof(Gfx)); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, displayListHead); @@ -2277,7 +2277,7 @@ void func_8009F5D4(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 15 @@ -2286,7 +2286,7 @@ void func_8009F7D4(GlobalContext* globalCtx) { s8 sp6E = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8; u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; sp6F = (sp6F >> 1) + 192; @@ -2302,7 +2302,7 @@ void func_8009F7D4(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sGoronCityEntranceTextures[] = { @@ -2314,7 +2314,7 @@ void* sGoronCityEntranceTextures[] = { void func_8009F9D0(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -2331,7 +2331,7 @@ void func_8009F9D0(GlobalContext* globalCtx) { { s32 pad[2]; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sLonLonRanchWindowTextures[] = { @@ -2341,7 +2341,7 @@ void* sLonLonRanchWindowTextures[] = { // Scene Draw Config 17 void func_8009FB74(GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); { s32 pad[2]; } @@ -2353,14 +2353,14 @@ void func_8009FB74(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 18 void func_8009FC90(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -2377,7 +2377,7 @@ void func_8009FC90(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 64); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } f32 D_8012A398 = 0.0f; @@ -2388,7 +2388,7 @@ void func_8009FE58(GlobalContext* globalCtx) { u32 gameplayFrames; f32 temp; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; if (globalCtx->sceneNum == SCENE_BDAN) { @@ -2459,14 +2459,14 @@ void func_8009FE58(GlobalContext* globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x0D, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__)); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 26 void func_800A0334(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -2485,7 +2485,7 @@ void func_800A0334(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 52 @@ -2502,7 +2502,7 @@ void func_800A057C(GlobalContext* globalCtx) { void func_800A059C(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -2515,7 +2515,7 @@ void func_800A059C(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void (*sSceneDrawHandlers[])(GlobalContext*) = { @@ -2548,14 +2548,14 @@ void Scene_Draw(GlobalContext* globalCtx) { HREG(94) = 0; } - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (HREG(81) == 1) { gSPDisplayList(POLY_OPA_DISP++, sDefaultDisplayList); gSPDisplayList(POLY_XLU_DISP++, sDefaultDisplayList); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); if (HREG(82) == 1) { sSceneDrawHandlers[globalCtx->sceneConfig](globalCtx); diff --git a/soh/src/code/z_skelanime.c b/soh/src/code/z_skelanime.c index 9150d97c7..d6633fcdd 100644 --- a/soh/src/code/z_skelanime.c +++ b/soh/src/code/z_skelanime.c @@ -25,7 +25,7 @@ void SkelAnime_DrawLimbLod(GlobalContext* globalCtx, s32 limbIndex, void** skele Vec3f pos; Vec3s rot; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); limb = (LodLimb*)SEGMENTED_TO_VIRTUAL(skeleton[limbIndex]); @@ -62,7 +62,7 @@ void SkelAnime_DrawLimbLod(GlobalContext* globalCtx, s32 limbIndex, void** skele SkelAnime_DrawLimbLod(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, lod); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -84,7 +84,7 @@ void SkelAnime_DrawLod(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa return; } - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); @@ -114,7 +114,7 @@ void SkelAnime_DrawLod(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -148,10 +148,10 @@ void SkelAnime_DrawFlexLimbLod(GlobalContext* globalCtx, s32 limbIndex, void** s if (newDList != NULL) { Matrix_ToMtx(*mtx, __FILE__, __LINE__); { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, *mtx, G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, newDList); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } (*mtx)++; } else if (limbDList != NULL) { @@ -197,7 +197,7 @@ void SkelAnime_DrawFlexLod(GlobalContext* globalCtx, void** skeleton, Vec3s* joi return; } - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0xD, mtx); Matrix_Push(); @@ -235,7 +235,7 @@ void SkelAnime_DrawFlexLod(GlobalContext* globalCtx, void** skeleton, Vec3s* joi Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -248,7 +248,7 @@ void SkelAnime_DrawLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** skele Vec3f pos; Vec3s rot; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); limb = (StandardLimb*)SEGMENTED_TO_VIRTUAL(skeleton[limbIndex]); @@ -282,7 +282,7 @@ void SkelAnime_DrawLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** skele if (limb->sibling != LIMB_DONE) { SkelAnime_DrawLimbOpa(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -303,7 +303,7 @@ void SkelAnime_DrawOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa return; } - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); rootLimb = (StandardLimb*)SEGMENTED_TO_VIRTUAL(skeleton[0]); @@ -333,7 +333,7 @@ void SkelAnime_DrawOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -348,7 +348,7 @@ void SkelAnime_DrawFlexLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** s Vec3f pos; Vec3s rot; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); @@ -390,7 +390,7 @@ void SkelAnime_DrawFlexLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** s SkelAnime_DrawFlexLimbOpa(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, limbMatricies); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -415,7 +415,7 @@ void SkelAnime_DrawFlexOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* joi return; } - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0xD, mtx); @@ -454,7 +454,7 @@ void SkelAnime_DrawFlexOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* joi } Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** diff --git a/soh/src/code/z_skin.c b/soh/src/code/z_skin.c index fbcd99fdf..bd5f2288c 100644 --- a/soh/src/code/z_skin.c +++ b/soh/src/code/z_skin.c @@ -59,7 +59,7 @@ void Skin_ApplyLimbModifications(GraphicsContext* gfxCtx, Skin* skin, s32 limbIn Vec3f spD0; SkinTransformation* transformationEntry; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); skeleton = (SkinLimb**)SEGMENTED_TO_VIRTUAL(skin->skeletonHeader->segment); data = SEGMENTED_TO_VIRTUAL(((SkinLimb*)SEGMENTED_TO_VIRTUAL(skeleton[limbIndex]))->segment); @@ -130,7 +130,7 @@ void Skin_ApplyLimbModifications(GraphicsContext* gfxCtx, Skin* skin, s32 limbIn vtxEntry->index = (vtxEntry->index == 0) ? 1 : 0; - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } /** @@ -141,7 +141,7 @@ void Skin_DrawAnimatedLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, s SkinLimb** skeleton; SkinAnimatedLimbData* data; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); skeleton = SEGMENTED_TO_VIRTUAL(skin->skeletonHeader->segment); data = SEGMENTED_TO_VIRTUAL(((SkinLimb*)SEGMENTED_TO_VIRTUAL(skeleton[limbIndex]))->segment); @@ -152,7 +152,7 @@ void Skin_DrawAnimatedLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, s gSPDisplayList(POLY_OPA_DISP++, data->dlist); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } /** @@ -163,7 +163,7 @@ void Skin_DrawLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, Gfx* dlis SkinLimb** skeleton; s32 pad; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); skeleton = SEGMENTED_TO_VIRTUAL(skin->skeletonHeader->segment); @@ -182,7 +182,7 @@ void Skin_DrawLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, Gfx* dlis } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void Skin_DrawImpl(Actor* actor, GlobalContext* globalCtx, Skin* skin, SkinPostDraw postDraw, @@ -193,7 +193,7 @@ void Skin_DrawImpl(Actor* actor, GlobalContext* globalCtx, Skin* skin, SkinPostD GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; s32 pad; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (!(drawFlags & SKIN_DRAW_FLAG_CUSTOM_TRANSFORMS)) { Skin_ApplyAnimTransformations(skin, gSkinLimbMatrices, actor, setTranslation); @@ -235,7 +235,7 @@ void Skin_DrawImpl(Actor* actor, GlobalContext* globalCtx, Skin* skin, SkinPostD } close_disps: - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } // allows specifying PostLimbDraw and setTranslation diff --git a/soh/src/code/z_view.c b/soh/src/code/z_view.c index db0937bbf..7df6e72ff 100644 --- a/soh/src/code/z_view.c +++ b/soh/src/code/z_view.c @@ -181,7 +181,7 @@ void func_800AA550(View* view) { ASSERT(lrx <= SCREEN_WIDTH, "lrx <= SCREEN_WD", __FILE__, __LINE__); ASSERT(lry <= SCREEN_HEIGHT, "lry <= SCREEN_HT", __FILE__, __LINE__); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gDPPipeSync(POLY_OPA_DISP++); gDPSetScissor(POLY_OPA_DISP++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); @@ -190,7 +190,7 @@ void func_800AA550(View* view) { gDPPipeSync(POLY_KAL_DISP++); gDPSetScissor(POLY_KAL_DISP++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_800AA76C(View* view, f32 x, f32 y, f32 z) { @@ -293,7 +293,7 @@ s32 func_800AAA9C(View* view) { Mtx* viewing; GraphicsContext* gfxCtx = view->gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); vp = Graph_Alloc(gfxCtx, sizeof(Vp)); LogUtils_CheckNullPointer("vp", vp, __FILE__, __LINE__); @@ -460,7 +460,7 @@ s32 func_800AAA9C(View* view) { gSPMatrix(POLY_KAL_DISP++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); FrameInterpolation_RecordCloseChild(); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); return 1; } @@ -470,7 +470,7 @@ s32 func_800AB0A8(View* view) { Mtx* projection; GraphicsContext* gfxCtx = view->gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); vp = Graph_Alloc(gfxCtx, sizeof(Vp)); LogUtils_CheckNullPointer("vp", vp, __FILE__, __LINE__); @@ -497,7 +497,7 @@ s32 func_800AB0A8(View* view) { gSPMatrix(POLY_XLU_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); gSPMatrix(POLY_KAL_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); return 1; } @@ -509,7 +509,7 @@ s32 func_800AB2C4(View* view) { gfxCtx = view->gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); vp = Graph_Alloc(gfxCtx, sizeof(Vp)); LogUtils_CheckNullPointer("vp", vp, __FILE__, __LINE__); @@ -532,7 +532,7 @@ s32 func_800AB2C4(View* view) { gSPMatrix(OVERLAY_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); return 1; } @@ -547,7 +547,7 @@ s32 func_800AB560(View* view) { Mtx* viewing; GraphicsContext* gfxCtx = view->gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); vp = Graph_Alloc(gfxCtx, sizeof(Vp)); LogUtils_CheckNullPointer("vp", vp, __FILE__, __LINE__); @@ -592,19 +592,19 @@ s32 func_800AB560(View* view) { gSPMatrix(OVERLAY_DISP++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); return 1; } s32 func_800AB944(View* view) { - OPEN_DISPS(view->gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(view->gfxCtx); func_800ABE74(view->eye.x, view->eye.y, view->eye.z); guLookAt(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z, view->up.x, view->up.y, view->up.z); - CLOSE_DISPS(view->gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(view->gfxCtx); return 1; } diff --git a/soh/src/code/z_vr_box_draw.c b/soh/src/code/z_vr_box_draw.c index ec02df106..b5ffbbfe1 100644 --- a/soh/src/code/z_vr_box_draw.c +++ b/soh/src/code/z_vr_box_draw.c @@ -14,7 +14,7 @@ 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) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); FrameInterpolation_RecordOpenChild(NULL, FrameInterpolation_GetCameraEpoch()); func_800945A0(gfxCtx); @@ -89,7 +89,7 @@ void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyb //gsSPShaderTest2(POLY_OPA_DISP++); FrameInterpolation_RecordCloseChild(); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void SkyboxDraw_Update(SkyboxContext* skyboxCtx) { diff --git a/soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c b/soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c index 25fd93368..62815cf48 100644 --- a/soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -306,7 +306,7 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) { f32 sp58; if ((player->actor.draw != NULL) && (player->rightHandType == 15)) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if ((ArmsHook_Shoot != this->actionFunc) || (this->timer <= 0)) { Matrix_MultVec3f(&D_80865B70, &this->unk_1E8); @@ -335,6 +335,6 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gLinkAdultHookshotChainDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 0ac6052d5..426ec0285 100644 --- a/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -204,7 +204,7 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx2) { if (1) {} tranform = (arrow->hitFlags & 2) ? &this->actor : &arrow->actor; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Translate(tranform->world.pos.x, tranform->world.pos.y, tranform->world.pos.z, MTXMODE_NEW); Matrix_RotateY(tranform->shape.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); @@ -242,6 +242,6 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx2) { 255 - stateFrames % 256, 511 - (stateFrames * 10) % 512, 64, 64)); gSPDisplayList(POLY_XLU_DISP++, sModelDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index c40a31011..561656bc8 100644 --- a/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -203,7 +203,7 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) { if (1) {} tranform = (arrow->hitFlags & 2) ? &this->actor : &arrow->actor; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Translate(tranform->world.pos.x, tranform->world.pos.y, tranform->world.pos.z, MTXMODE_NEW); Matrix_RotateY(tranform->shape.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); @@ -241,6 +241,6 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) { 511 - (stateFrames * 10) % 512, 511 - (stateFrames * 10) % 512, 4, 16)); gSPDisplayList(POLY_XLU_DISP++, sModelDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index 3ca39d5d7..5c63210d9 100644 --- a/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -201,7 +201,7 @@ void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) { if (1) {} tranform = (arrow->hitFlags & 2) ? &this->actor : &arrow->actor; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Translate(tranform->world.pos.x, tranform->world.pos.y, tranform->world.pos.z, MTXMODE_NEW); Matrix_RotateY(tranform->shape.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); @@ -239,6 +239,6 @@ void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) { 511 - (stateFrames * 10) % 512, 511 - (stateFrames * 30) % 512, 8, 16)); gSPDisplayList(POLY_XLU_DISP++, sModelDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/soh/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index 9c5791de8..34561e84f 100644 --- a/soh/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/soh/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -202,7 +202,7 @@ void BgBowlWall_Draw(Actor* thisx, GlobalContext* globalCtx2) { BgBowlWall* this = (BgBowlWall*)thisx; u32 frames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x8, @@ -217,5 +217,5 @@ void BgBowlWall_Draw(Actor* thisx, GlobalContext* globalCtx2) { gSPDisplayList(POLY_OPA_DISP++, gBowlingRound2WallDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index e999b3412..0104b197e 100644 --- a/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -294,7 +294,7 @@ void BgBreakwall_Draw(Actor* thisx, GlobalContext* globalCtx) { BgBreakwall* this = (BgBreakwall*)thisx; if (this->bombableWallDList != NULL) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -315,6 +315,6 @@ void BgBreakwall_Draw(Actor* thisx, GlobalContext* globalCtx) { CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index 67cbd0f2b..60a8ebadd 100644 --- a/soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -309,7 +309,7 @@ void BgDodoago_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgDodoago_Draw(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (Flags_GetEventChkInf(0xB0)) { func_80093D18(globalCtx->state.gfxCtx); @@ -318,7 +318,7 @@ void BgDodoago_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gDodongoLowerJawDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BgDodoago_Reset(void) { diff --git a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index 0df765ae8..13dbe0e10 100644 --- a/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -894,7 +894,7 @@ static void* sMouthTextures[] = { void BgDyYoseizo_Draw(Actor* thisx, GlobalContext* globalCtx) { BgDyYoseizo* this = (BgDyYoseizo*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->actionFunc != BgDyYoseizo_Vanish) { func_80093D18(globalCtx->state.gfxCtx); @@ -909,7 +909,7 @@ void BgDyYoseizo_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, BgDyYoseizo_OverrideLimbDraw, NULL, this); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); BgDyYoseizo_ParticleDraw(this, globalCtx); } @@ -1010,7 +1010,7 @@ void BgDyYoseizo_ParticleDraw(BgDyYoseizo* this, GlobalContext* globalCtx) { BgDyYoseizoParticle* particle = this->particles; s16 i; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D84(globalCtx->state.gfxCtx); for (i = 0; i < 200; i++, particle++) { @@ -1037,5 +1037,5 @@ void BgDyYoseizo_ParticleDraw(BgDyYoseizo* this, GlobalContext* globalCtx) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index 1f985e8b0..dd28864b6 100644 --- a/soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -257,7 +257,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) { BossGanon* ganondorf; f32 spBC = -30.0f; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); actor = globalCtx->actorCtx.actorLists[ACTORCAT_BOSS].head; while (actor != NULL) { @@ -368,5 +368,5 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) { actor = actor->next; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/soh/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index f02b5dc92..e4407377c 100644 --- a/soh/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/soh/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c @@ -124,7 +124,7 @@ void BgGateShutter_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgGateShutter_Draw(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -132,5 +132,5 @@ void BgGateShutter_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gKakarikoGuardGateDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index c1026b3c9..37e754faa 100644 --- a/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -100,7 +100,7 @@ void BgGjyoBridge_Update(Actor* thisx, GlobalContext* globalCtx) { void BgGjyoBridge_Draw(Actor* thisx, GlobalContext* globalCtx) { BgGjyoBridge* this = (BgGjyoBridge*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -117,5 +117,5 @@ void BgGjyoBridge_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gRainbowBridgeDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c index 25c84cc70..6c70afa00 100644 --- a/soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c +++ b/soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c @@ -197,19 +197,19 @@ void BgGndDarkmeiro_DrawSwitchBlock(Actor* thisx, GlobalContext* globalCtx) { this->timer2 = vanishTimer * 8; } - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); //! @bug Due to a bug in the display list, the transparency data is not used. gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 198, 202, 208, this->timer2); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); Gfx_DrawDListXlu(globalCtx, gClearBlockDL); } } void BgGndDarkmeiro_DrawStaticBlock(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 198, 202, 208, 255); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); Gfx_DrawDListXlu(globalCtx, gClearBlockDL); } diff --git a/soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c b/soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c index 53e21a734..bcbd6be35 100644 --- a/soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c +++ b/soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c @@ -140,12 +140,12 @@ void BgGndFiremeiro_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgGndFiremeiro_Draw(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_800943C8(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gFireTrialPlatformDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c b/soh/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c index 3eb6859ab..58961dd94 100644 --- a/soh/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c +++ b/soh/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c @@ -201,12 +201,12 @@ void BgGndSoulmeiro_Draw(Actor* thisx, GlobalContext* globalCtx) { switch (params) { case 0: - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, dLists[params]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); break; case 1: Gfx_DrawDListXlu(globalCtx, dLists[params]); diff --git a/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c index a7ef574c0..088c584aa 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c @@ -148,7 +148,7 @@ void BgHaka_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgHaka_Draw(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -161,5 +161,5 @@ void BgHaka_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gGravestoneEarthDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index 3f89b2f42..cddc35222 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -319,7 +319,7 @@ void BgHakaGate_DrawFlame(BgHakaGate* this, GlobalContext* globalCtx) { f32 scale; if (this->vFlameScale > 0) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (1) {} @@ -337,7 +337,7 @@ void BgHakaGate_DrawFlame(BgHakaGate* this, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -356,7 +356,7 @@ void BgHakaGate_Draw(Actor* thisx, GlobalContext* globalCtx) { } else { func_80093D18(globalCtx->state.gfxCtx); if (thisx->params == BGHAKAGATE_FLOOR) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Get(¤tMtxF); Matrix_Translate(0.0f, 0.0f, -2000.0f, MTXMODE_APPLY); Matrix_RotateX(this->vOpenAngle * (M_PI / 0x8000), MTXMODE_APPLY); @@ -371,7 +371,7 @@ void BgHakaGate_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_010C10); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } else { Gfx_DrawDListOpa(globalCtx, displayLists[thisx->params]); } diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c b/soh/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c index f47555c07..eb796961a 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c @@ -198,7 +198,7 @@ void BgHakaShip_Draw(Actor* thisx, GlobalContext* globalCtx) { BgHakaShip* this = (BgHakaShip*)thisx; f32 angleTemp; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); if (this->dyna.actor.params == 0) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -220,7 +220,7 @@ void BgHakaShip_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_00E910); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); if (this->actionFunc == BgHakaShip_CutsceneStationary || this->actionFunc == BgHakaShip_Move) { s32 pad; Vec3f sp2C; diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c b/soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c index 9aaa4d72e..49a9ba325 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c @@ -222,7 +222,7 @@ void BgHakaTubo_Update(Actor* thisx, GlobalContext* globalCtx) { void BgHakaTubo_DrawFlameCircle(BgHakaTubo* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); Matrix_Translate(this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y + 235.0f, this->dyna.actor.world.pos.z, @@ -239,7 +239,7 @@ void BgHakaTubo_DrawFlameCircle(BgHakaTubo* this, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffFireCircleDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BgHakaTubo_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c b/soh/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c index 14d25b14a..31328d6d5 100644 --- a/soh/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c +++ b/soh/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c @@ -112,7 +112,7 @@ void BgHakaWater_Draw(Actor* thisx, GlobalContext* globalCtx) { f32 temp; s32 pad2; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); if (this->isLowered) { @@ -144,5 +144,5 @@ void BgHakaWater_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBotwWaterFallDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c index 4b2e53240..88096cfa7 100644 --- a/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c +++ b/soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c @@ -489,7 +489,7 @@ void BgHeavyBlock_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; Player* player = GET_PLAYER(globalCtx); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (BgHeavyBlock_LiftedUp == this->actionFunc) { Matrix_SetTranslateRotateYXZ(player->leftHandPos.x, player->leftHandPos.y, player->leftHandPos.z, @@ -508,7 +508,7 @@ void BgHeavyBlock_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gHeavyBlockEntirePillarDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BgHeavyBlock_DrawPiece(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index fe7075a5f..288353ddb 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -242,7 +242,7 @@ void BgHidanCurtain_Update(Actor* thisx, GlobalContext* globalCtx2) { void BgHidanCurtain_Draw(Actor* thisx, GlobalContext* globalCtx) { BgHidanCurtain* this = (BgHidanCurtain*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 220, 0, this->alpha); @@ -258,5 +258,5 @@ void BgHidanCurtain_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gEffFireCircleDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c index ceb38ab5c..e7c5ec86d 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c @@ -202,7 +202,7 @@ static void* sFireballTexs[] = { void BgHidanFirewall_Draw(Actor* thisx, GlobalContext* globalCtx) { BgHidanFirewall* this = (BgHidanFirewall*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x14); @@ -213,5 +213,5 @@ void BgHidanFirewall_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gFireTempleFireballUpperHalfDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c index 49d0c6dc0..d9b774951 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c @@ -251,7 +251,7 @@ void BgHidanFwbig_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; f32 height; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -274,5 +274,5 @@ void BgHidanFwbig_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gFireTempleBigFireWallDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c index 5a922b643..d0f9a7595 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c @@ -397,7 +397,7 @@ void BgHidanHamstep_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgHidanHamstep_Draw(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -410,5 +410,5 @@ void BgHidanHamstep_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gFireTempleStoneStep2DL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c index 30247025e..0dab0e7ee 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c @@ -151,7 +151,7 @@ void BgHidanKousi_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgHidanKousi_Draw(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -159,5 +159,5 @@ void BgHidanKousi_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, sMetalFencesDLs[thisx->params & 0xFF]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index 4562c4e7a..54d90998b 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -324,7 +324,7 @@ void BgHidanKowarerukabe_Update(Actor* thisx, GlobalContext* globalCtx) { void BgHidanKowarerukabe_Draw(Actor* thisx, GlobalContext* globalCtx) { BgHidanKowarerukabe* this = (BgHidanKowarerukabe*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -334,5 +334,5 @@ void BgHidanKowarerukabe_Draw(Actor* thisx, GlobalContext* globalCtx) { Collider_UpdateSpheres(0, &this->collider); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c index b13ad1c6a..e9dd1bf86 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c @@ -353,7 +353,7 @@ static void* sVerticalFlamesTexs[] = { void func_8088BC40(GlobalContext* globalCtx, BgHidanRock* this) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x14); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x01, 255, 255, 0, 150); @@ -375,7 +375,7 @@ void func_8088BC40(GlobalContext* globalCtx, BgHidanRock* this) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gFireTempleBigVerticalFlameDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BgHidanRock_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c index 03c98e6a7..03b4c597a 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c @@ -229,7 +229,7 @@ void BgHidanRsekizou_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; MtxF mf; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -259,5 +259,5 @@ void BgHidanRsekizou_Draw(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c index fe82553d3..0e26c6043 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c @@ -395,7 +395,7 @@ void BgHidanSekizou_Draw(Actor* thisx, GlobalContext* globalCtx2) { s32 i; s32 sp6C[4]; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -430,5 +430,5 @@ void BgHidanSekizou_Draw(Actor* thisx, GlobalContext* globalCtx2) { } } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c index 37821a7a0..a295633b4 100644 --- a/soh/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c +++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c @@ -279,7 +279,7 @@ Gfx* func_8088EB54(GlobalContext* globalCtx, BgHidanSima* this, Gfx* gfx) { void BgHidanSima_Draw(Actor* thisx, GlobalContext* globalCtx) { BgHidanSima* this = (BgHidanSima*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -294,5 +294,5 @@ void BgHidanSima_Draw(Actor* thisx, GlobalContext* globalCtx) { POLY_XLU_DISP = func_8088EB54(globalCtx, this, POLY_XLU_DISP); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/soh/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index 7666126b2..5f4907d98 100644 --- a/soh/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/soh/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -388,7 +388,7 @@ void BgIceShelter_Draw(Actor* thisx, GlobalContext* globalCtx2) { GlobalContext* globalCtx = globalCtx2; BgIceShelter* this = (BgIceShelter*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -435,5 +435,5 @@ void BgIceShelter_Draw(Actor* thisx, GlobalContext* globalCtx2) { break; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/soh/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index 9e306b610..4b306e990 100644 --- a/soh/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/soh/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -104,7 +104,7 @@ void BgInGate_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgInGate_Draw(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -113,5 +113,5 @@ void BgInGate_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gIngoGateDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c index 71f39ef20..5d3af99f5 100644 --- a/soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c +++ b/soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c @@ -213,7 +213,7 @@ void BgJyaBigmirror_DrawLightBeam(Actor* thisx, GlobalContext* globalCtx) { BgJyaBigmirror* this = (BgJyaBigmirror*)thisx; Actor* lift; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); lift = Actor_Find(&globalCtx->actorCtx, ACTOR_BG_JYA_LIFT, ACTORCAT_BG); if (lift != NULL) { @@ -235,7 +235,7 @@ void BgJyaBigmirror_DrawLightBeam(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gBigMirror2DL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BgJyaBigmirror_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c b/soh/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c index 6d04eb9d1..e3af24221 100644 --- a/soh/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c +++ b/soh/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c @@ -64,7 +64,7 @@ void BgJyaBlock_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgJyaBlock_Draw(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -74,5 +74,5 @@ void BgJyaBlock_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_OPA_DISP++, 232, 210, 176, 255); gSPDisplayList(POLY_OPA_DISP++, gPushBlockDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/soh/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index e470611e6..eb1ff98a3 100644 --- a/soh/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/soh/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -197,18 +197,18 @@ void BgJyaBombchuiwa_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgJyaBombchuiwa_DrawRock(GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBombchuiwa2DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BgJyaBombchuiwa_DrawLight(Actor* thisx, GlobalContext* globalCtx) { BgJyaBombchuiwa* this = (BgJyaBombchuiwa*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -217,7 +217,7 @@ void BgJyaBombchuiwa_DrawLight(Actor* thisx, GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, CLAMP_MAX((u32)(this->lightRayIntensity * 255.0f), 255)); gSPDisplayList(POLY_XLU_DISP++, gBombchuiwaLight2DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BgJyaBombchuiwa_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index b5fc08db0..fd803a245 100644 --- a/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -531,21 +531,21 @@ void BgJyaCobra_Update(Actor* thisx, GlobalContext* globalCtx2) { } void func_80896CB4(GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gCobra2DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80896D78(BgJyaCobra* this, GlobalContext* globalCtx) { s32 pad; Vec3s sp44; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); sp44.x = D_80897308[this->dyna.actor.params & 3] + this->dyna.actor.shape.rot.x; @@ -559,7 +559,7 @@ void func_80896D78(BgJyaCobra* this, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s32)(this->unk_18C * 140.0f)); gSPDisplayList(POLY_XLU_DISP++, gCobra3DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BgJyaCobra_DrawShadow(BgJyaCobra* this, GlobalContext* globalCtx) { @@ -568,7 +568,7 @@ void BgJyaCobra_DrawShadow(BgJyaCobra* this, GlobalContext* globalCtx) { Vec3f sp64; Vec3s* phi_a3; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80094044(globalCtx->state.gfxCtx); @@ -602,7 +602,7 @@ void BgJyaCobra_DrawShadow(BgJyaCobra* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, sShadowDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BgJyaCobra_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c b/soh/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c index 3b5947efb..72a2ab235 100644 --- a/soh/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c +++ b/soh/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c @@ -297,7 +297,7 @@ static void* sLeftSideCrumbles[] = { }; void BgJyaMegami_DrawFace(BgJyaMegami* this, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sRightSideCrumbles[this->crumbleIndex])); @@ -306,7 +306,7 @@ void BgJyaMegami_DrawFace(BgJyaMegami* this, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gMegami1DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } static Gfx* sDLists[] = { @@ -320,7 +320,7 @@ void BgJyaMegami_DrawExplode(BgJyaMegami* this, GlobalContext* globalCtx) { BgJyaMegamiPiece* piece; u32 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -339,7 +339,7 @@ void BgJyaMegami_DrawExplode(BgJyaMegami* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, sDLists[i]); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BgJyaMegami_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c index 6b3927a87..894d67197 100644 --- a/soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c +++ b/soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c @@ -123,7 +123,7 @@ void BgMenkuriEye_Draw(Actor* thisx, GlobalContext* globalCtx) { BgMenkuriEye* this = (BgMenkuriEye*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); if (Flags_GetSwitch(globalCtx, this->actor.params)) { gDPSetEnvColor(POLY_XLU_DISP++, 200, 0, 0, 255); @@ -139,7 +139,7 @@ void BgMenkuriEye_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gGTGEyeStatueEyeDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BgMenkuriEye_Reset(void) { diff --git a/soh/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/soh/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index a9e98f94a..0d3ec8fd2 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/soh/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -505,7 +505,7 @@ void BgMizuBwall_Draw(Actor* thisx, GlobalContext* globalCtx2) { GlobalContext* globalCtx = globalCtx2; u32 frames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (1) {} frames = globalCtx->gameplayFrames; @@ -527,5 +527,5 @@ void BgMizuBwall_Draw(Actor* thisx, GlobalContext* globalCtx2) { if (this->dList != NULL) { gSPDisplayList(POLY_OPA_DISP++, this->dList); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c b/soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c index ad6bb3092..ff68fcd59 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c +++ b/soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c @@ -365,7 +365,7 @@ void BgMizuMovebg_Draw(Actor* thisx, GlobalContext* globalCtx2) { if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); frames = globalCtx->gameplayFrames; func_80093D18(globalCtx->state.gfxCtx); @@ -393,5 +393,5 @@ void BgMizuMovebg_Draw(Actor* thisx, GlobalContext* globalCtx2) { gSPDisplayList(POLY_OPA_DISP++, this->dlist); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/soh/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c index dd62618d6..0ceb33066 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c +++ b/soh/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c @@ -158,7 +158,7 @@ void BgMizuShutter_Draw(BgMizuShutter* thisx, GlobalContext* globalCtx) { s32 pad; BgMizuShutter* this = (BgMizuShutter*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -166,5 +166,5 @@ void BgMizuShutter_Draw(BgMizuShutter* thisx, GlobalContext* globalCtx) { if (this->displayList != NULL) { gSPDisplayList(POLY_OPA_DISP++, this->displayList); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index cac82f24e..bc7a0c524 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -329,7 +329,7 @@ void BgMizuWater_Draw(Actor* thisx, GlobalContext* globalCtx) { BgMizuWater* this = (BgMizuWater*)thisx; s32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; func_80093D84(globalCtx->state.gfxCtx); @@ -346,5 +346,5 @@ void BgMizuWater_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gObjectMizuObjectsWaterDL_004B20); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c b/soh/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c index fdecbda40..e6ed2476c 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c +++ b/soh/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c @@ -107,7 +107,7 @@ void BgMjin_Draw(Actor* thisx, GlobalContext* globalCtx) { BgMjin* this = (BgMjin*)thisx; Gfx* dlist; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (thisx->params != 0) { s32 objBankIndex = Object_GetIndex(&globalCtx->objectCtx, sObjectIDs[thisx->params - 1]); @@ -127,5 +127,5 @@ void BgMjin_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, dlist); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index 006c125c6..ae84e6530 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -244,7 +244,7 @@ void BgMoriBigst_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; BgMoriBigst* this = (BgMoriBigst*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); @@ -253,5 +253,5 @@ void BgMoriBigst_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gMoriBigstDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/soh/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c index 722c59669..8de74a7e0 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c +++ b/soh/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c @@ -252,7 +252,7 @@ void BgMoriElevator_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; BgMoriElevator* this = (BgMoriElevator*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); @@ -260,5 +260,5 @@ void BgMoriElevator_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gMoriElevatorDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c b/soh/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c index d78e4c39a..143a5e2be 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c +++ b/soh/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c @@ -282,7 +282,7 @@ void BgMoriHashigo_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; BgMoriHashigo* this = (BgMoriHashigo*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); if (1) {} gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); @@ -298,5 +298,5 @@ void BgMoriHashigo_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gMoriHashigoLadderDL); break; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c b/soh/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c index 4a8277a7b..df3589306 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c +++ b/soh/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c @@ -162,7 +162,7 @@ void BgMoriHashira4_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; BgMoriHashira4* this = (BgMoriHashira4*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); @@ -171,5 +171,5 @@ void BgMoriHashira4_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, sDisplayLists[this->dyna.actor.params]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c index a14b7607a..1f6da5cd0 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c +++ b/soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c @@ -232,7 +232,7 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, GlobalContext* globalCtx) { s8 objIndex; MtxF mtx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIdx].segment); @@ -279,7 +279,7 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gTreasureChestBossKeyChestSideAndTopDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BgMoriHineri_Reset() { diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/soh/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c index 86b317fc0..29e13a8a7 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c +++ b/soh/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c @@ -163,7 +163,7 @@ void BgMoriIdomizu_Draw(Actor* thisx, GlobalContext* globalCtx) { BgMoriIdomizu* this = (BgMoriIdomizu*)thisx; u32 gameplayFrames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -180,5 +180,5 @@ void BgMoriIdomizu_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gMoriIdomizuWaterDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c index 1a79cd538..69fc76d4e 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c +++ b/soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c @@ -161,7 +161,7 @@ void BgMoriKaitenkabe_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; BgMoriKaitenkabe* this = (BgMoriKaitenkabe*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); @@ -171,5 +171,5 @@ void BgMoriKaitenkabe_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gMoriKaitenkabeDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c b/soh/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c index 7044c0263..2f7255b4b 100644 --- a/soh/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c +++ b/soh/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c @@ -222,7 +222,7 @@ void BgMoriRakkatenjo_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; BgMoriRakkatenjo* this = (BgMoriRakkatenjo*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment); @@ -232,5 +232,5 @@ void BgMoriRakkatenjo_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gMoriRakkatenjoDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c index b9a3667d3..44dd621b7 100644 --- a/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c +++ b/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c @@ -605,7 +605,7 @@ void BgPoEvent_Draw(Actor* thisx, GlobalContext* globalCtx) { f32 sp48; s32 pad2; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); if ((this->type == 3) || (this->type == 2)) { if (this->actionFunc == BgPoEvent_PaintingEmpty) { @@ -620,7 +620,7 @@ void BgPoEvent_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, displayLists[this->type]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); if ((this->type == 0) || (this->type == 1)) { sp48 = (833.0f - this->dyna.actor.world.pos.y) * 0.0025f; diff --git a/soh/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c b/soh/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c index 90fb47b53..192a61cb7 100644 --- a/soh/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c +++ b/soh/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c @@ -150,7 +150,7 @@ void BgPoSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) { u8 green; u8 blue; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -187,5 +187,5 @@ void BgPoSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c b/soh/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c index a0ad5cb8c..e97b546ac 100644 --- a/soh/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c +++ b/soh/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c @@ -78,12 +78,12 @@ void BgPushbox_Update(Actor* thisx, GlobalContext* globalCtx) { void BgPushbox_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, gBlockSmallDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c index fe09b76ca..93bd1d379 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c @@ -260,7 +260,7 @@ void BgSpot00Hanebasi_DrawTorches(Actor* thisx, GlobalContext* globalCtx2) { f32 angle; s32 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -288,14 +288,14 @@ void BgSpot00Hanebasi_DrawTorches(Actor* thisx, GlobalContext* globalCtx2) { gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BgSpot00Hanebasi_Draw(Actor* thisx, GlobalContext* globalCtx) { Vec3f basePos = { 158.0f, 10.0f, 400.0f }; Vec3f newPos; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -327,5 +327,5 @@ void BgSpot00Hanebasi_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gHyruleFieldCastleDrawbridgeChainsDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c b/soh/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c index 663afd292..7f4b11508 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c @@ -76,7 +76,7 @@ void BgSpot01Fusya_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgSpot01Fusya_Draw(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -84,5 +84,5 @@ void BgSpot01Fusya_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gKakarikoWindmillSailsDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/soh/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index e640c1774..db3e6f6e0 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c @@ -321,7 +321,7 @@ void BgSpot01Idohashira_Init(Actor* thisx, GlobalContext* globalCtx) { void func_808AB700(BgSpot01Idohashira* this, GlobalContext* globalCtx) { GraphicsContext* localGfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(localGfxCtx, __FILE__, __LINE__); + OPEN_DISPS(localGfxCtx); func_80093D18(localGfxCtx); @@ -330,7 +330,7 @@ void func_808AB700(BgSpot01Idohashira* this, GlobalContext* globalCtx) { func_808AAF34(this, globalCtx); gSPDisplayList(POLY_OPA_DISP++, gKakarikoWellArchDL); - CLOSE_DISPS(localGfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(localGfxCtx); } void BgSpot01Idohashira_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c b/soh/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c index 9109d05ba..bed1c6141 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c @@ -70,7 +70,7 @@ void BgSpot01Idomizu_Update(Actor* thisx, GlobalContext* globalCtx) { void BgSpot01Idomizu_Draw(Actor* thisx, GlobalContext* globalCtx) { u32 frames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -84,5 +84,5 @@ void BgSpot01Idomizu_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gKakarikoWellWaterDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c b/soh/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c index 372608e42..0cde6a722 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c @@ -70,7 +70,7 @@ void BgSpot01Idosoko_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgSpot01Idosoko_Draw(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -78,5 +78,5 @@ void BgSpot01Idosoko_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gKakarikoBOTWStoneDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index 2a5b35cc2..a53667b17 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c @@ -226,7 +226,7 @@ void func_808ACCB8(Actor* thisx, GlobalContext* globalCtx) { u8 greenEnv; u8 blueEnv; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[0] != NULL && globalCtx->csCtx.npcActions[0]->action == 2) { @@ -265,7 +265,7 @@ void func_808ACCB8(Actor* thisx, GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_808AD3D4(BgSpot02Objects* this, GlobalContext* globalCtx) { @@ -288,7 +288,7 @@ void func_808AD450(Actor* thisx, GlobalContext* globalCtx) { s32 pad; f32 lerp; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[2] != NULL) { u16 temp_v1 = globalCtx->csCtx.npcActions[2]->urot.z * 0.00549325f; @@ -329,5 +329,5 @@ void func_808AD450(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c b/soh/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c index 85233ba14..9650ffdc2 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c @@ -121,7 +121,7 @@ void BgSpot03Taki_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; @@ -150,7 +150,7 @@ void BgSpot03Taki_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, object_spot03_object_DL_001580); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); this->bufferIndex = this->bufferIndex == 0; diff --git a/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index 854e3a837..daed6ae57 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -432,7 +432,7 @@ void BgSpot06Objects_DrawLakeHyliaWater(BgSpot06Objects* this, GlobalContext* gl s32 pad; s32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -456,7 +456,7 @@ void BgSpot06Objects_DrawLakeHyliaWater(BgSpot06Objects* this, GlobalContext* gl gSPDisplayList(POLY_XLU_DISP++, gLakeHyliaHighWaterDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BgSpot06Objects_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c b/soh/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c index d952deb11..231cc19df 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c @@ -70,7 +70,7 @@ void BgSpot07Taki_Draw(Actor* thisx, GlobalContext* globalCtx) { BgSpot07Taki* this = (BgSpot07Taki*)thisx; u32 frames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); frames = globalCtx->gameplayFrames; if (LINK_IS_ADULT) { func_80093D18(globalCtx->state.gfxCtx); @@ -115,5 +115,5 @@ void BgSpot07Taki_Draw(Actor* thisx, GlobalContext* globalCtx) { } else { gSPDisplayList(POLY_XLU_DISP++, object_spot07_object_DL_0032D8); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/soh/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index e96733569..a85d9c5ec 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -169,7 +169,7 @@ void BgSpot09Obj_Draw(Actor* thisx, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, sDLists[thisx->params]); if (thisx->params == 3) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -177,6 +177,6 @@ void BgSpot09Obj_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gCarpentersTentEntranceDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/soh/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c index 285be3d2b..01b667cc4 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c @@ -151,7 +151,7 @@ void BgSpot11Oasis_Update(Actor* thisx, GlobalContext* globalCtx) { void BgSpot11Oasis_Draw(Actor* thisx, GlobalContext* globalCtx) { u32 gameplayFrames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -159,5 +159,5 @@ void BgSpot11Oasis_Draw(Actor* thisx, GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gSPDisplayList(POLY_XLU_DISP++, gDesertColossusOasisDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c b/soh/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c index 22bced110..2f1769207 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c @@ -95,7 +95,7 @@ void BgSpot15Saku_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgSpot15Saku_Draw(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -103,5 +103,5 @@ void BgSpot15Saku_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gLonLonCorralFenceDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/soh/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index bc2394bb6..a4c0fad81 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c @@ -535,7 +535,7 @@ void BgSpot16Bombstone_Draw(Actor* thisx, GlobalContext* globalCtx) { BgSpot16Bombstone* this = (BgSpot16Bombstone*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -551,7 +551,7 @@ void BgSpot16Bombstone_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, this->dList); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BgSpot16Bombstone_Reset(void) { diff --git a/soh/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/soh/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c index 1ae16f9b5..3f078702a 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c @@ -122,7 +122,7 @@ void BgSpot16Doughnut_Draw(Actor* thisx, GlobalContext* globalCtx) { u32 scroll = globalCtx->gameplayFrames & 0xFFFF; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -142,14 +142,14 @@ void BgSpot16Doughnut_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gDeathMountainCloudCircleNormalDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Draw function for outwardly expanding and dissipating void BgSpot16Doughnut_DrawExpanding(Actor* thisx, GlobalContext* globalCtx) { BgSpot16Doughnut* this = (BgSpot16Doughnut*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -159,5 +159,5 @@ void BgSpot16Doughnut_DrawExpanding(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); gSPDisplayList(POLY_XLU_DISP++, gDeathMountainCloudCircleNormalDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c b/soh/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c index 241ce711a..ccfc1bd8d 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c @@ -128,7 +128,7 @@ void BgSpot17Bakudankabe_Draw(Actor* thisx, GlobalContext* globalCtx) { s8 r = coss(globalCtx->gameplayFrames * 1500) >> 8; s8 g = coss(globalCtx->gameplayFrames * 1500) >> 8; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -142,9 +142,9 @@ void BgSpot17Bakudankabe_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gCraterBombableWallDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -152,5 +152,5 @@ void BgSpot17Bakudankabe_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gCraterBombableWallCracksDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c b/soh/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c index a143aef81..714161d63 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c @@ -55,7 +55,7 @@ void func_808B746C(Actor* thisx, GlobalContext* globalCtx) { void func_808B7478(Actor* thisx, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); Matrix_RotateY((s16)(Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)) - thisx->shape.rot.y + 0x8000) * @@ -71,5 +71,5 @@ void func_808B7478(Actor* thisx, GlobalContext* globalCtx) { if (1) {} - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/soh/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c index cbdc2024c..b8b86519f 100644 --- a/soh/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c +++ b/soh/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c @@ -126,7 +126,7 @@ void BgSstFloor_Update(BgSstFloor* thisx, GlobalContext* globalCtx) { void BgSstFloor_Draw(BgSstFloor* thisx, GlobalContext* globalCtx) { BgSstFloor* this = (BgSstFloor*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); Matrix_Scale(1.0f, this->drumHeight * -0.0025f, 1.0f, MTXMODE_APPLY); @@ -135,5 +135,5 @@ void BgSstFloor_Draw(BgSstFloor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gBongoDrumDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c b/soh/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c index e1fdf29f3..d27589893 100644 --- a/soh/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c +++ b/soh/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c @@ -85,7 +85,7 @@ void BgTokiHikari_Draw(Actor* thisx, GlobalContext* globalCtx) { void func_808BA018(BgTokiHikari* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -106,7 +106,7 @@ void func_808BA018(BgTokiHikari* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, object_toki_objects_DL_007EE0); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_808BA204(BgTokiHikari* this, GlobalContext* globalCtx) { @@ -136,7 +136,7 @@ void func_808BA274(BgTokiHikari* this, GlobalContext* globalCtx) { void func_808BA2CC(BgTokiHikari* this, GlobalContext* globalCtx) { s32 pad[2]; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Translate(0.0f, 276.0f, 1122.0f, MTXMODE_NEW); Matrix_Scale(0.32f, 0.32f, this->unk_14C * 7.0f, MTXMODE_APPLY); Matrix_RotateZ(M_PI, MTXMODE_APPLY); @@ -181,5 +181,5 @@ void func_808BA2CC(BgTokiHikari* this, GlobalContext* globalCtx) { gSPDisplayListOffset(POLY_XLU_DISP++, object_toki_objects_DL_0009C0, 10); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index dd4eb7ca2..9bfea8f21 100644 --- a/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -164,7 +164,7 @@ void BgTokiSwd_Draw(Actor* thisx, GlobalContext* globalCtx2) { BgTokiSwd* this = (BgTokiSwd*)thisx; s32 pad[3]; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -176,5 +176,5 @@ void BgTokiSwd_Draw(Actor* thisx, GlobalContext* globalCtx2) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, object_toki_objects_DL_001BD0); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index 92be10875..f1dabf527 100644 --- a/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -228,7 +228,7 @@ void BgTreemouth_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; u16 alpha = 500; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -248,5 +248,5 @@ void BgTreemouth_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gDekuTreeMouthDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c b/soh/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c index 452671b47..420dea28f 100644 --- a/soh/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c +++ b/soh/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c @@ -150,10 +150,10 @@ void BgVbSima_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgVbSima_Draw(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gVolvagiaPlatformDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c b/soh/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c index 80d0a9897..79f49ec05 100644 --- a/soh/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c +++ b/soh/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c @@ -177,7 +177,7 @@ void BgYdanHasi_Draw(Actor* thisx, GlobalContext* globalCtx) { if (this->dyna.actor.params == HASI_WATER_BLOCK || this->dyna.actor.params == HASI_THREE_BLOCKS) { Gfx_DrawDListOpa(globalCtx, dLists[this->dyna.actor.params]); } else { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, @@ -188,6 +188,6 @@ void BgYdanHasi_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDTWaterPlaneDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c b/soh/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c index 27fef7c4a..e28cc927a 100644 --- a/soh/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c +++ b/soh/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c @@ -424,7 +424,7 @@ void BgYdanSp_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 i; MtxF mtxF; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); if (thisx->params == WEB_WALL) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -456,5 +456,5 @@ void BgYdanSp_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gDTWebFloorDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c b/soh/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c index 0359ee880..476f40e83 100644 --- a/soh/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/soh/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -123,14 +123,14 @@ void BgZg_Init(Actor* thisx, GlobalContext* globalCtx) { void func_808C0EEC(BgZg* this, GlobalContext* globalCtx) { GraphicsContext* localGfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(localGfxCtx, __FILE__, __LINE__); + OPEN_DISPS(localGfxCtx); func_80093D18(localGfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(localGfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseBarsDL); - CLOSE_DISPS(localGfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(localGfxCtx); } void BgZg_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 1eb35d38a..4f5172187 100644 --- a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -1074,7 +1074,7 @@ block_1: Matrix_TranslateRotateZYX(pos, rot); if (*dList != NULL) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); mtxScaleZ = 1.0f; mtxScaleY = 1.0f; @@ -1101,7 +1101,7 @@ block_1: gSPDisplayList(POLY_OPA_DISP++, *dList); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } { s32 pad; } // Required to match return 1; @@ -1133,7 +1133,7 @@ void BossDodongo_Draw(Actor* thisx, GlobalContext* globalCtx) { BossDodongo* this = (BossDodongo*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); if ((this->unk_1C0 >= 2) && (this->unk_1C0 & 1)) { @@ -1151,7 +1151,7 @@ void BossDodongo_Draw(Actor* thisx, GlobalContext* globalCtx) { POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); BossDodongo_DrawEffects(globalCtx); } @@ -1691,7 +1691,7 @@ void BossDodongo_DrawEffects(GlobalContext* globalCtx) { eff = (BossDodongoEffect*)globalCtx->specialEffects; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D84(globalCtx->state.gfxCtx); unkMtx = &globalCtx->billboardMtxF; @@ -1717,5 +1717,5 @@ void BossDodongo_DrawEffects(GlobalContext* globalCtx) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index 09be78e50..6dd150b3a 100644 --- a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -1524,7 +1524,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) { s16 i; BossFdEffect* firstEffect = effect; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); for (i = 0; i < 180; i++, effect++) { if (effect->type == BFD_FX_EMBER) { @@ -1643,7 +1643,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void BossFd_Draw(Actor* thisx, GlobalContext* globalCtx) { @@ -1652,7 +1652,7 @@ void BossFd_Draw(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf("FD DRAW START\n"); if (this->actionFunc != BossFd_Wait) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); if (this->work[BFD_DAMAGE_FLASH_TIMER] & 2) { POLY_OPA_DISP = Gfx_SetFog(POLY_OPA_DISP, 255, 255, 255, 0, 900, 1099); @@ -1660,7 +1660,7 @@ void BossFd_Draw(Actor* thisx, GlobalContext* globalCtx) { BossFd_DrawBody(globalCtx, this); POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } osSyncPrintf("FD DRAW END\n"); @@ -1733,7 +1733,7 @@ void BossFd_DrawMane(GlobalContext* globalCtx, BossFd* this, Vec3f* manePos, Vec f32 phi_f20; f32 phi_f22; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); maneLength = this->skinSegments; maneLength = CLAMP_MAX(maneLength, 10); @@ -1779,7 +1779,7 @@ void BossFd_DrawMane(GlobalContext* globalCtx, BossFd* this, Vec3f* manePos, Vec gSPDisplayList(POLY_XLU_DISP++, gVolvagiaManeModelDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 BossFd_OverrideHeadDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { @@ -1839,7 +1839,7 @@ void BossFd_DrawBody(GlobalContext* globalCtx, BossFd* this) { f32 temp_float; Mtx* tempMat = Graph_Alloc(globalCtx->state.gfxCtx, 18 * sizeof(Mtx)); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->skinSegments != 0) { gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeState])); } @@ -1993,5 +1993,5 @@ void BossFd_DrawBody(GlobalContext* globalCtx, BossFd* this) { Matrix_Pop(); osSyncPrintf("END\n"); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index dd61fa0fb..24950d59f 100644 --- a/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -1027,15 +1027,15 @@ s32 BossFd2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis } if ((limbIndex == 32) || (limbIndex == 35) || (limbIndex == 36)) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, (s8)bossFd->fwork[BFD_HEAD_TEX2_ALPHA]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } else { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, (s8)bossFd->fwork[BFD_BODY_TEX2_ALPHA]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } if ((0 < limbIndex) && (limbIndex < 16)) { *dList = NULL; @@ -1076,7 +1076,7 @@ void BossFd2_UpdateMane(BossFd2* this, GlobalContext* globalCtx, Vec3f* head, Ve Vec3f spB0; f32 xyScale; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); gDPPipeSync(POLY_OPA_DISP++); @@ -1157,7 +1157,7 @@ void BossFd2_UpdateMane(BossFd2* this, GlobalContext* globalCtx, Vec3f* head, Ve gSPDisplayList(POLY_XLU_DISP++, gHoleVolvagiaManeModelDL); } Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BossFd2_DrawMane(BossFd2* this, GlobalContext* globalCtx) { @@ -1165,7 +1165,7 @@ void BossFd2_DrawMane(BossFd2* this, GlobalContext* globalCtx) { BossFd* bossFd = (BossFd*)this->actor.parent; s16 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (1) {} for (i = 0; i < 10; i++) { this->centerMane.scale[i] = 1.5f + 0.3f * Math_SinS(5596.0f * this->work[FD2_VAR_TIMER] + i * 0x3200); @@ -1189,7 +1189,7 @@ void BossFd2_DrawMane(BossFd2* this, GlobalContext* globalCtx) { BossFd2_UpdateMane(this, globalCtx, &this->leftMane.head, this->leftMane.pos, this->leftMane.rot, this->leftMane.pull, this->leftMane.scale); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BossFd2_Draw(Actor* thisx, GlobalContext* globalCtx) { @@ -1197,7 +1197,7 @@ void BossFd2_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; BossFd2* this = (BossFd2*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); osSyncPrintf("FD2 draw start \n"); if (this->actionFunc != BossFd2_Wait) { func_80093D18(globalCtx->state.gfxCtx); @@ -1219,5 +1219,5 @@ void BossFd2_Draw(Actor* thisx, GlobalContext* globalCtx) { BossFd2_DrawMane(this, globalCtx); POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index acca17ca6..fa9098d23 100644 --- a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -3270,14 +3270,14 @@ void BossGanon_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList } else if (limbIndex == 19) { Matrix_MultVec3f(&D_808E4DB8, &this->actor.focus.pos); } else if (limbIndex == 11) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_MultVec3f(&D_808E4DB8, &this->unk_208); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_ganon_DL_00BE90)); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } else if (limbIndex == 6) { Matrix_MultVec3f(&D_808E4DC4, &this->unk_238); } else if (limbIndex == 10) { @@ -3350,7 +3350,7 @@ void BossGanon_DrawShock(BossGanon* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; s16 i; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if ((this->unk_2E8 != 0) || (this->unk_2E6 != 0)) { func_80093D84(globalCtx->state.gfxCtx); @@ -3398,7 +3398,7 @@ void BossGanon_DrawShock(BossGanon* this, GlobalContext* globalCtx) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void BossGanon_DrawHandLightBall(BossGanon* this, GlobalContext* globalCtx) { @@ -3406,7 +3406,7 @@ void BossGanon_DrawHandLightBall(BossGanon* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; s32 alpha; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (this->handLightBallScale > 0.0f) { func_80093D84(globalCtx->state.gfxCtx); @@ -3437,7 +3437,7 @@ void BossGanon_DrawHandLightBall(BossGanon* this, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfLightCoreDL); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } } @@ -3447,7 +3447,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; s16 i; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (this->unk_284 > 0.0f) { func_80093D84(globalCtx->state.gfxCtx); @@ -3522,7 +3522,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, GlobalContext* globalCtx) { Matrix_Pop(); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } } @@ -3530,7 +3530,7 @@ void BossGanon_DrawTriforce(BossGanon* this, GlobalContext* globalCtx) { s32 pad; if (this->fwork[GDF_TRIFORCE_PRIM_A] > 0.0f) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); @@ -3574,7 +3574,7 @@ void BossGanon_DrawTriforce(BossGanon* this, GlobalContext* globalCtx) { Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -3582,7 +3582,7 @@ void BossGanon_DrawDarkVortex(BossGanon* this, GlobalContext* globalCtx) { s32 pad; if (this->fwork[GDF_VORTEX_ALPHA] > 0.0f) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); gDPPipeSync(POLY_XLU_DISP++); @@ -3609,7 +3609,7 @@ void BossGanon_DrawDarkVortex(BossGanon* this, GlobalContext* globalCtx) { Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -3763,7 +3763,7 @@ void BossGanon_DrawShadowTexture(void* tex, BossGanon* this, GlobalContext* glob f32 zOffset; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 0, 50); @@ -3784,7 +3784,7 @@ void BossGanon_DrawShadowTexture(void* tex, BossGanon* this, GlobalContext* glob G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD); gSPDisplayList(POLY_OPA_DISP++, gDorfShadowModelDL); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void BossGanon_Draw(Actor* thisx, GlobalContext* globalCtx) { @@ -3794,7 +3794,7 @@ void BossGanon_Draw(Actor* thisx, GlobalContext* globalCtx) { shadowTex = Graph_Alloc(globalCtx->state.gfxCtx, 64 * 64); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -3833,7 +3833,7 @@ void BossGanon_Draw(Actor* thisx, GlobalContext* globalCtx) { BossGanon_GenShadowTexture(shadowTex, this, globalCtx); BossGanon_DrawShadowTexture(shadowTex, this, globalCtx); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 BossGanon_CheckFallingPlatforms(BossGanon* this, GlobalContext* globalCtx, Vec3f* checkPos) { @@ -4136,7 +4136,7 @@ void BossGanon_LightBall_Draw(Actor* thisx, GlobalContext* globalCtx) { f32 alpha; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -4176,7 +4176,7 @@ void BossGanon_LightBall_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_808E1EB4(Actor* thisx, GlobalContext* globalCtx2) { @@ -4283,7 +4283,7 @@ void func_808E229C(Actor* thisx, GlobalContext* globalCtx2) { s16 i; s32 temp; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 0); @@ -4301,7 +4301,7 @@ void func_808E229C(Actor* thisx, GlobalContext* globalCtx2) { gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_808E2544(Actor* thisx, GlobalContext* globalCtx) { @@ -4565,7 +4565,7 @@ void func_808E324C(Actor* thisx, GlobalContext* globalCtx) { mtx = Graph_Alloc(globalCtx->state.gfxCtx, 12 * sizeof(Mtx)); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 255, (s8)this->fwork[GDF_FWORK_1]); @@ -4595,7 +4595,7 @@ void func_808E324C(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BossGanon_UpdateEffects(GlobalContext* globalCtx) { @@ -4822,7 +4822,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { GanondorfEffect* eff = globalCtx->specialEffects; GanondorfEffect* effFirst = eff; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D84(globalCtx->state.gfxCtx); for (i = 0; i < 200; i++, eff++) { @@ -5033,7 +5033,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } #include "overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h" diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index 34ebfc057..73619088b 100644 --- a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -105,12 +105,12 @@ void BossGanon2_SetObjectSegment(BossGanon2* this, GlobalContext* globalCtx, s32 gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[objectIdx].segment); if (setRSPSegment) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[objectIdx].segment); gSPSegment(POLY_XLU_DISP++, 0x06, globalCtx->objectCtx.status[objectIdx].segment); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -2411,7 +2411,7 @@ void func_809034E4(Vec3f* arg0, Vec3f* arg1) { } void func_80903F38(BossGanon2* this, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->unk_312 != 0) { func_809034E4(&this->unk_200, &this->unk_20C); @@ -2430,14 +2430,14 @@ void func_80903F38(BossGanon2* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00BB80); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80904108(BossGanon2* this, GlobalContext* globalCtx) { s32 pad; if (this->unk_324 > 0.0f) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); gDPPipeSync(POLY_XLU_DISP++); @@ -2453,7 +2453,7 @@ void func_80904108(BossGanon2* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00E1C0)); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -2464,7 +2464,7 @@ void func_80904340(BossGanon2* this, GlobalContext* globalCtx) { f32 sin; f32 cos; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); if ((this->unk_330 != 0) || (this->unk_328 != 0)) { @@ -2505,14 +2505,14 @@ void func_80904340(BossGanon2* this, GlobalContext* globalCtx) { } Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_8090464C(BossGanon2* this, GlobalContext* globalCtx) { s32 pad; if (this->unk_1B4 > 0.0f) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); gDPPipeSync(POLY_XLU_DISP++); @@ -2527,7 +2527,7 @@ void func_8090464C(BossGanon2* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00CCD8)); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -2536,7 +2536,7 @@ s32 BossGanon2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d s32 pad; BossGanon2* this = (BossGanon2*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (limbIndex == 15) { rot->y += this->unk_31A; @@ -2558,7 +2558,7 @@ s32 BossGanon2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d *dList = NULL; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); return 0; } @@ -2568,7 +2568,7 @@ void BossGanon2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis BossGanon2* this = (BossGanon2*)thisx; Vec3f sp4C; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); D_80907120.z = 17000.0f; D_8090712C.z = 3000.0f; @@ -2627,14 +2627,14 @@ void BossGanon2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80904D88(BossGanon2* this, GlobalContext* globalCtx) { s32 pad; s16 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->unk_30C > 0.0f) { func_80093D84(globalCtx->state.gfxCtx); @@ -2658,13 +2658,13 @@ void func_80904D88(BossGanon2* this, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80904FC8(BossGanon2* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->unk_384 > 0.0f) { func_80093D84(globalCtx->state.gfxCtx); @@ -2685,14 +2685,14 @@ void func_80904FC8(BossGanon2* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00B378)); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_8090523C(BossGanon2* this, GlobalContext* globalCtx) { Player* player; f32 phi_f20; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->unk_38C > 0.0f) { s8 i; @@ -2722,7 +2722,7 @@ void func_8090523C(BossGanon2* this, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BossGanon2_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { @@ -2733,13 +2733,13 @@ void BossGanon2_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi Matrix_MultVec3f(&D_80906D60, &this->unk_234[temp_v1]); } if (limbIndex == 11) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_ganon_DL_00BE90)); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } else if (limbIndex == 10) { Matrix_MultVec3f(&D_80907164, &this->unk_1B8); } @@ -2749,7 +2749,7 @@ void func_80905674(BossGanon2* this, GlobalContext* globalCtx) { s32 pad; if (this->unk_380 > 0.0f) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); gDPPipeSync(POLY_XLU_DISP++); @@ -2768,7 +2768,7 @@ void func_80905674(BossGanon2* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00EC40)); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -2777,7 +2777,7 @@ void BossGanon2_Draw(Actor* thisx, GlobalContext* globalCtx) { BossGanon2* this = (BossGanon2*)thisx; s16 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -2844,7 +2844,7 @@ void BossGanon2_Draw(Actor* thisx, GlobalContext* globalCtx) { D_80910638 = 0; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); func_809060E8(globalCtx); } @@ -2920,7 +2920,7 @@ void func_809060E8(GlobalContext* globalCtx) { effects = effect = globalCtx->specialEffects; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -2981,7 +2981,7 @@ void func_809060E8(GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80906538(BossGanon2* this, u8* shadowTexture, f32 arg2) { @@ -3081,7 +3081,7 @@ void BossGanon2_DrawShadowTexture(void* shadowTexture, BossGanon2* this, GlobalC GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; s16 alpha; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -3102,7 +3102,7 @@ void BossGanon2_DrawShadowTexture(void* shadowTexture, BossGanon2* this, GlobalC G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD); gSPDisplayList(POLY_OPA_DISP++, ovl_Boss_Ganon2_DL_00B3F0); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void BossGanon2_Reset(void) { diff --git a/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index b82c41f71..b8e1b608b 100644 --- a/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -1505,7 +1505,7 @@ void BossGanondrof_Draw(Actor* thisx, GlobalContext* globalCtx) { BossGanondrof* this = (BossGanondrof*)thisx; EnfHG* horse; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); osSyncPrintf("MOVE P = %x\n", this->actor.update); osSyncPrintf("STOP TIMER = %d ==============\n", this->actor.freezeTimer); horse = (EnfHG*)this->actor.child; @@ -1537,6 +1537,6 @@ void BossGanondrof_Draw(Actor* thisx, GlobalContext* globalCtx) { BossGanondrof_PostLimbDraw, this); osSyncPrintf("DRAW 22\n"); POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); osSyncPrintf("DRAW END %d\n", this->actor.params); } diff --git a/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index e17fe6144..bad6de9f0 100644 --- a/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -1961,7 +1961,7 @@ s32 BossGoma_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi BossGoma* this = (BossGoma*)thisx; s32 doNotDrawLimb = false; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, (s16)this->mainEnvColor[0], (s16)this->mainEnvColor[1], (s16)this->mainEnvColor[2], @@ -2043,7 +2043,7 @@ s32 BossGoma_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi break; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); return doNotDrawLimb; } @@ -2126,7 +2126,7 @@ Gfx* BossGoma_NoBackfaceCullingDlist(GraphicsContext* gfxCtx) { void BossGoma_Draw(Actor* thisx, GlobalContext* globalCtx) { BossGoma* this = (BossGoma*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); Matrix_Translate(0.0f, -4000.0f, 0.0f, MTXMODE_APPLY); @@ -2148,7 +2148,7 @@ void BossGoma_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawOpa(globalCtx, this->skelanime.skeleton, this->skelanime.jointTable, BossGoma_OverrideLimbDraw, BossGoma_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BossGoma_SpawnChildGohma(BossGoma* this, GlobalContext* globalCtx, s16 i) { diff --git a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index ab170c4e6..87291120b 100644 --- a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -2444,7 +2444,7 @@ void BossMo_DrawTentacle(BossMo* this, GlobalContext* globalCtx) { f32 phi_f22; Vec3f sp110; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); sp110.x = globalCtx->envCtx.dirLight1.params.dir.x; sp110.y = globalCtx->envCtx.dirLight1.params.dir.y; @@ -2563,13 +2563,13 @@ void BossMo_DrawTentacle(BossMo* this, GlobalContext* globalCtx) { } Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BossMo_DrawWater(BossMo* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (1) {} Matrix_Push(); @@ -2593,14 +2593,14 @@ void BossMo_DrawWater(BossMo* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gMorphaWaterDL); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BossMo_DrawCore(Actor* thisx, GlobalContext* globalCtx) { s32 pad; BossMo* this = (BossMo*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->actor.world.pos.y > MO_WATER_LEVEL(globalCtx)) { BossMo_DrawWater(this, globalCtx); } @@ -2719,7 +2719,7 @@ void BossMo_DrawCore(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gMorphaWaterDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); BossMo_DrawEffects(globalCtx->specialEffects, globalCtx); } @@ -2729,7 +2729,7 @@ void BossMo_DrawTent(Actor* thisx, GlobalContext* globalCtx) { BossMo* this = (BossMo*)thisx; u16 scroll; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (1) {} func_80093D18(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, (s8)(this->baseAlpha * 1.5f)); @@ -2748,7 +2748,7 @@ void BossMo_DrawTent(Actor* thisx, GlobalContext* globalCtx) { if (this->drawActor) { BossMo_DrawTentacle(this, globalCtx); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BossMo_UpdateEffects(BossMo* this, GlobalContext* globalCtx) { @@ -2911,7 +2911,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; BossMoEffect* effectHead = effect; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); Matrix_Push(); for (i = 0; i < ARRAY_COUNT(sEffects); i++, effect++) { @@ -3048,7 +3048,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) { } Matrix_Pop(); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void BossMo_Unknown(void) { diff --git a/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index 336d0e108..ef9aac04c 100644 --- a/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -2707,7 +2707,7 @@ s32 BossSst_OverrideHandTrailDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** void BossSst_DrawHand(Actor* thisx, GlobalContext* globalCtx) { BossSst* this = (BossSst*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -2757,7 +2757,7 @@ void BossSst_DrawHand(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); BossSst_DrawEffect(&this->actor, globalCtx); } @@ -2859,7 +2859,7 @@ void BossSst_DrawHead(Actor* thisx, GlobalContext* globalCtx) { s32 pad; BossSst* this = (BossSst*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_7)) { func_80093D18(globalCtx->state.gfxCtx); @@ -2924,7 +2924,7 @@ void BossSst_DrawHead(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, sIntroVanishDList); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); SkinMatrix_Vec3fMtxFMultXYZ(&globalCtx->viewProjectionMtxF, &this->actor.focus.pos, &this->center); BossSst_DrawEffect(&this->actor, globalCtx); @@ -3154,7 +3154,7 @@ void BossSst_DrawEffect(Actor* thisx, GlobalContext* globalCtx) { BossSstEffect* effect; if (this->effectMode != BONGO_NULL) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); if (this->effectMode == BONGO_ICE) { @@ -3223,7 +3223,7 @@ void BossSst_DrawEffect(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 6786d030a..dd81daa30 100644 --- a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -3177,7 +3177,7 @@ void BossTw_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V }; BossTw* this = (BossTw*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); switch (limbIndex) { case 21: @@ -3219,13 +3219,13 @@ void BossTw_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V break; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80941BC0(BossTw* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); func_80093D84(globalCtx->state.gfxCtx); @@ -3263,13 +3263,13 @@ void func_80941BC0(BossTw* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A790)); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80942180(BossTw* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); @@ -3311,14 +3311,14 @@ void func_80942180(BossTw* this, GlobalContext* globalCtx) { Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_809426F0(BossTw* this, GlobalContext* globalCtx) { s32 pad; s16 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (u8)(-this->work[CS_TIMER_2] * 15), 0x20, 0x40, 1, 0, 0, @@ -3365,14 +3365,14 @@ void func_809426F0(BossTw* this, GlobalContext* globalCtx) { Matrix_Pop(); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80942C70(Actor* thisx, GlobalContext* globalCtx) { BossTw* this = (BossTw*)thisx; s16 alpha; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->beamDist != 0.0f) { Matrix_Push(); @@ -3413,13 +3413,13 @@ void func_80942C70(Actor* thisx, GlobalContext* globalCtx) { Matrix_Pop(); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80943028(Actor* thisx, GlobalContext* globalCtx) { BossTw* this = (BossTw*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y + 57.0f, this->actor.world.pos.z, MTXMODE_NEW); @@ -3438,7 +3438,7 @@ void func_80943028(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gCircleShadowDL)); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } static void* sEyeTextures[] = { @@ -3453,7 +3453,7 @@ void BossTw_Draw(Actor* thisx, GlobalContext* globalCtx2) { BossTw* this = (BossTw*)thisx; Player* player = GET_PLAYER(globalCtx); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->visible) { gSPSegment(POLY_OPA_DISP++, 10, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeTexIdx])); @@ -3525,7 +3525,7 @@ void BossTw_Draw(Actor* thisx, GlobalContext* globalCtx2) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* D_8094A9B0[] = { @@ -3538,7 +3538,7 @@ s32 BossTw_TwinrovaOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx void* thisx) { BossTw* this = (BossTw*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); switch (limbIndex) { case 21: @@ -3592,7 +3592,7 @@ s32 BossTw_TwinrovaOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx *dList = NULL; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); return false; } @@ -3605,7 +3605,7 @@ void BossTw_TwinrovaPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** BossTw* this = (BossTw*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); switch (limbIndex) { case 34: @@ -3635,7 +3635,7 @@ void BossTw_TwinrovaPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** break; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BossTw_ShieldChargeDraw(BossTw* this, GlobalContext* globalCtx) { @@ -3644,7 +3644,7 @@ void BossTw_ShieldChargeDraw(BossTw* this, GlobalContext* globalCtx) { s16 temp_t0; s16 temp_a0; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); @@ -3737,13 +3737,13 @@ void BossTw_ShieldChargeDraw(BossTw* this, GlobalContext* globalCtx) { Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BossTw_SpawnPortalDraw(BossTw* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment( @@ -3782,14 +3782,14 @@ void BossTw_SpawnPortalDraw(BossTw* this, GlobalContext* globalCtx) { Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80944C50(BossTw* this, GlobalContext* globalCtx) { s32 pad; f32 scale; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); Matrix_Translate(0.0f, 750.0f, 0.0f, MTXMODE_NEW); @@ -3824,7 +3824,7 @@ void func_80944C50(BossTw* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01EEB0)); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BossTw_TwinrovaDraw(Actor* thisx, GlobalContext* globalCtx2) { @@ -3832,7 +3832,7 @@ void BossTw_TwinrovaDraw(Actor* thisx, GlobalContext* globalCtx2) { GlobalContext* globalCtx = globalCtx2; BossTw* this = (BossTw*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->visible) { func_80093D18(globalCtx->state.gfxCtx); @@ -3864,7 +3864,7 @@ void BossTw_TwinrovaDraw(Actor* thisx, GlobalContext* globalCtx2) { func_80944C50(this, globalCtx); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BossTw_BlastFire(BossTw* this, GlobalContext* globalCtx) { @@ -4404,7 +4404,7 @@ void BossTw_BlastDraw(Actor* thisx, GlobalContext* globalCtx2) { s16 tailIdx; s16 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -4458,7 +4458,7 @@ void BossTw_BlastDraw(Actor* thisx, GlobalContext* globalCtx2) { break; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BossTw_DrawDeathBall(Actor* thisx, GlobalContext* globalCtx2) { @@ -4468,7 +4468,7 @@ void BossTw_DrawDeathBall(Actor* thisx, GlobalContext* globalCtx2) { s16 tailIdx; s16 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -4514,7 +4514,7 @@ void BossTw_DrawDeathBall(Actor* thisx, GlobalContext* globalCtx2) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BossTw_UpdateEffects(GlobalContext* globalCtx) { @@ -4870,7 +4870,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { effectHead = currentEffect; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -5068,7 +5068,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { currentEffect++; } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void BossTw_TwinrovaSetupArriveAtTarget(BossTw* this, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index 612da3fd7..4b6f0c9de 100644 --- a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -2874,7 +2874,7 @@ s32 BossVa_BodyOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d BossVa* this = (BossVa*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (limbIndex == 20) { gDPPipeSync(POLY_OPA_DISP++); @@ -2894,7 +2894,7 @@ s32 BossVa_BodyOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d rot->x -= 0xCCC; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); return false; } @@ -2903,7 +2903,7 @@ void BossVa_BodyPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis Vec3f sp78 = { 0.0f, 0.0f, 0.0f }; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (limbIndex == 6) { if (sFightPhase < PHASE_3) { @@ -2966,7 +2966,7 @@ void BossVa_BodyPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis Matrix_MultVec3f(&sp78, &this->unk_274); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 BossVa_SupportOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, @@ -3157,7 +3157,7 @@ s32 BossVa_BariOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d void BossVa_BariPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { BossVa* this = (BossVa*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (limbIndex == 2) { gSPSegment(POLY_XLU_DISP++, 0x0A, @@ -3172,7 +3172,7 @@ void BossVa_BariPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis gSPDisplayList(POLY_XLU_DISP++, *dList); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BossVa_Draw(Actor* thisx, GlobalContext* globalCtx) { @@ -3187,7 +3187,7 @@ void BossVa_Draw(Actor* thisx, GlobalContext* globalCtx) { Vec3f sp74 = { -15.0f, 40.0f, 0.0f }; Color_RGBA8 unused = { 250, 250, 230, 200 }; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); paramsPtr = &this->actor.params; @@ -3292,7 +3292,7 @@ void BossVa_Draw(Actor* thisx, GlobalContext* globalCtx) { BossVa_DrawDoor(globalCtx, sDoorState); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } static s32 sUnkValue = 0x009B0000; // Unreferenced? Possibly a color @@ -3518,7 +3518,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) { BossVaEffect* effectHead = effect; Camera* camera = Gameplay_GetCamera(globalCtx, sCsCamera); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); for (i = 0; i < ARRAY_COUNT(sVaEffects); i++, effect++) { if (effect->type == VA_LARGE_SPARK) { @@ -3734,7 +3734,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void BossVa_SpawnSpark(GlobalContext* globalCtx, BossVaEffect* effect, BossVa* this, Vec3f* offset, s16 scale, @@ -4006,7 +4006,7 @@ void BossVa_DrawDoor(GlobalContext* globalCtx, s16 scale) { f32 segAngle = 0.0f; s32 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Translate(0.0f, 80.0f, 400.0f, MTXMODE_NEW); Matrix_RotateY(M_PI, MTXMODE_APPLY); @@ -4031,7 +4031,7 @@ void BossVa_DrawDoor(GlobalContext* globalCtx, s16 scale) { gSPDisplayList(POLY_OPA_DISP++, doorPieceDispList[i]); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void BossVa_Reset(void) { diff --git a/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index b4603bea3..4f03b33c7 100644 --- a/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -564,7 +564,7 @@ void func_80967FFC(Actor* thisx, GlobalContext* globalCtx) { s32 pad; u16 timer1 = this->timer1; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); Matrix_RotateX(-M_PI / 2, MTXMODE_APPLY); @@ -597,7 +597,7 @@ void func_80967FFC(Actor* thisx, GlobalContext* globalCtx) { if ((s16)i) {} } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80968298(Actor* thisx, GlobalContext* globalCtx) { @@ -611,7 +611,7 @@ void func_80968298(Actor* thisx, GlobalContext* globalCtx) { s32 i2; u8 alpha; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); alpha = (s32)(this->unk_170 * 255.0f); POLY_XLU_DISP = func_800937C0(POLY_XLU_DISP); @@ -647,7 +647,7 @@ void func_80968298(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, 50, 50, 50, 255); gSPDisplayList(POLY_XLU_DISP++, object_demo_6k_DL_001040); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_8096865C(Actor* thisx, GlobalContext* globalCtx) { @@ -655,7 +655,7 @@ void func_8096865C(Actor* thisx, GlobalContext* globalCtx) { s32 pad; Gfx* displayList; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (!(this->flags & 1)) { if (this->actor.params > 8) { @@ -681,7 +681,7 @@ void func_8096865C(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, displayList); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_809688C4(Actor* thisx, GlobalContext* globalCtx2) { @@ -692,7 +692,7 @@ void func_809688C4(Actor* thisx, GlobalContext* globalCtx2) { if ((i = (globalCtx->csCtx.state != CS_STATE_IDLE) && (globalCtx->csCtx.npcActions[1] != NULL)) && (globalCtx->csCtx.npcActions[1]->action != 1)) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 255, 255); @@ -716,7 +716,7 @@ void func_809688C4(Actor* thisx, GlobalContext* globalCtx2) { gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -729,7 +729,7 @@ void func_80968B70(Actor* thisx, GlobalContext* globalCtx) { if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); @@ -766,7 +766,7 @@ void func_80968B70(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, envColor[0], envColor[1], envColor[2], 128); gSPDisplayList(POLY_XLU_DISP++, object_gnd_magic_DL_001190); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80968FB0(Actor* thisx, GlobalContext* globalCtx) { @@ -779,7 +779,7 @@ void func_80968FB0(Actor* thisx, GlobalContext* globalCtx) { if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); scaleFactor = ((s16)D_809693CC[(frames * 4) & 0xF] * 0.01f) + 1.0f; @@ -795,7 +795,7 @@ void func_80968FB0(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, 255, 200, 0, 255); gSPDisplayList(POLY_XLU_DISP++, gGlowCircleSmallDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_809691BC(Demo6K* this, GlobalContext* globalCtx, s32 params) { diff --git a/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index 687634c47..0a1ca6ffd 100644 --- a/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -805,7 +805,7 @@ void DemoDu_Draw_02(Actor* thisx, GlobalContext* globalCtx2) { void* mouthTexture = sMouthTextures[mouthTexIndex]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -820,7 +820,7 @@ void DemoDu_Draw_02(Actor* thisx, GlobalContext* globalCtx2) { POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, 0, 0, 0, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void DemoDu_InitCs_Credits(DemoDu* this, GlobalContext* globalCtx) { @@ -1000,7 +1000,7 @@ void DemoDu_Draw_01(Actor* thisx, GlobalContext* globalCtx2) { void* mouthTexture = sMouthTextures[mouthTexIndex]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -1015,7 +1015,7 @@ void DemoDu_Draw_01(Actor* thisx, GlobalContext* globalCtx2) { SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } static DemoDuDrawFunc sDrawFuncs[] = { diff --git a/soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index 5d2ce1f44..dfe31118c 100644 --- a/soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -254,7 +254,7 @@ void DemoEc_DrawSkeleton(DemoEc* this, GlobalContext* globalCtx, void* eyeTextur SkelAnime* skelAnime = &this->skelAnime; s32 pad; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D18(gfxCtx); @@ -271,7 +271,7 @@ void DemoEc_DrawSkeleton(DemoEc* this, GlobalContext* globalCtx, void* eyeTextur gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]); POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, overrideLimbDraw, postLimbDraw, &this->actor, POLY_OPA_DISP); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void DemoEc_DrawSkeletonCustomColor(DemoEc* this, GlobalContext* globalCtx, Gfx* arg2, Gfx* arg3, u8* color1, @@ -280,7 +280,7 @@ void DemoEc_DrawSkeletonCustomColor(DemoEc* this, GlobalContext* globalCtx, Gfx* GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D18(gfxCtx); @@ -308,7 +308,7 @@ void DemoEc_DrawSkeletonCustomColor(DemoEc* this, GlobalContext* globalCtx, Gfx* POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, overrideLimbDraw, postLimbDraw, &this->actor, POLY_OPA_DISP); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void DemoEc_UseDrawObject(DemoEc* this, GlobalContext* globalCtx) { @@ -316,13 +316,13 @@ void DemoEc_UseDrawObject(DemoEc* this, GlobalContext* globalCtx) { s32 drawObjBankIndex = this->drawObjBankIndex; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[drawObjBankIndex].segment); gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[drawObjBankIndex].segment); if (!globalCtx) {} - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void DemoEc_UseAnimationObject(DemoEc* this, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 836cfc6ab..6145afe2b 100644 --- a/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -1669,7 +1669,7 @@ void DemoEffect_DrawJewel(Actor* thisx, GlobalContext* globalCtx2) { GlobalContext* globalCtx = globalCtx2; u32 frames = this->jewel.timer; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (!DemoEffect_CheckCsAction(this, globalCtx, 1)) { if (1) {} @@ -1720,7 +1720,7 @@ void DemoEffect_DrawJewel(Actor* thisx, GlobalContext* globalCtx2) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -1731,7 +1731,7 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) { DemoEffect* parent = (DemoEffect*)this->actor.parent; u32 frames = globalCtx->gameplayFrames & 0xFFFF; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (parent != NULL) { gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 255, 255, 170, parent->triforceSpot.crystalLightOpacity); @@ -1768,7 +1768,7 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gCrystalLightDL); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -1778,7 +1778,7 @@ void DemoEffect_DrawFireBall(Actor* thisx, GlobalContext* globalCtx) { DemoEffect* this = (DemoEffect*)thisx; u32 frames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 64, 64, 255, 200, 0, 255); gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 255); func_80093D84(globalCtx->state.gfxCtx); @@ -1789,7 +1789,7 @@ void DemoEffect_DrawFireBall(Actor* thisx, GlobalContext* globalCtx) { POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 128 - ((frames * 20) % 128) - 1, 32, 32)); gSPDisplayList(POLY_XLU_DISP++, gCreationFireBallDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -1801,7 +1801,7 @@ void DemoEffect_DrawGodLgt(Actor* thisx, GlobalContext* globalCtx) { s32 pad; u32 frames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (!DemoEffect_CheckCsAction(this, globalCtx, 2)) { if (gSaveContext.entranceIndex == 0x00A0) { @@ -1849,7 +1849,7 @@ void DemoEffect_DrawGodLgt(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gGoldenGoddessBodyDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -1860,7 +1860,7 @@ void DemoEffect_DrawLightEffect(Actor* thisx, GlobalContext* globalCtx) { u8* alpha; Gfx* disp; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (!DemoEffect_CheckCsAction(this, globalCtx, 1)) { @@ -1891,7 +1891,7 @@ void DemoEffect_DrawLightEffect(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -1901,7 +1901,7 @@ void DemoEffect_DrawBlueOrb(Actor* thisx, GlobalContext* globalCtx) { DemoEffect* this = (DemoEffect*)thisx; s32 pad2; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 188, 255, 255, this->blueOrb.alpha); gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 255); func_80093D84(globalCtx->state.gfxCtx); @@ -1911,7 +1911,7 @@ void DemoEffect_DrawBlueOrb(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); this->blueOrb.rotation += 0x01F4; gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -1922,7 +1922,7 @@ void DemoEffect_DrawLgtShower(Actor* thisx, GlobalContext* globalCtx) { s32 pad; u32 frames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 64, 64, 255, 255, 160, this->lgtShower.alpha); gDPSetEnvColor(POLY_XLU_DISP++, 50, 200, 0, 255); func_80093D84(globalCtx->state.gfxCtx); @@ -1932,7 +1932,7 @@ void DemoEffect_DrawLgtShower(Actor* thisx, GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (frames * 5) % 1024, 0, 256, 64, 1, (frames * 10) % 128, 512 - ((frames * 50) % 512), 32, 16)); gSPDisplayList(POLY_XLU_DISP++, gEnliveningLightDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -1943,7 +1943,7 @@ void DemoEffect_DrawLightRing(Actor* thisx, GlobalContext* globalCtx2) { GlobalContext* globalCtx = globalCtx2; u32 frames = this->lightRing.timer; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 170, 255, 255, this->lightRing.alpha); @@ -1955,7 +1955,7 @@ void DemoEffect_DrawLightRing(Actor* thisx, GlobalContext* globalCtx2) { 1, 0, 0, 8, 1024)); gSPDisplayList(POLY_XLU_DISP++, gGoldenGoddessLightRingDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -1967,7 +1967,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) { Vtx* vertices = ResourceMgr_LoadVtxByName(SEGMENTED_TO_VIRTUAL(gTriforceVtx)); u32 frames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (gSaveContext.entranceIndex != 0x0400 || globalCtx->csCtx.frames < 885) { func_80093D84(globalCtx->state.gfxCtx); @@ -2020,7 +2020,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) { } } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -2048,14 +2048,14 @@ s32 DemoEffect_DrawTimewarpLimbs(GlobalContext* globalCtx, SkelAnimeCurve* skelC DemoEffect* this = (DemoEffect*)thisx; u32 frames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, 170, 255, 255, 255); gDPSetEnvColor(POLY_XLU_DISP++, this->envXluColor[0], this->envXluColor[1], this->envXluColor[2], 255); gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (frames * 6) % 1024, 256 - ((frames * 16) % 256) - 1, 256, 64, 1, (frames * 4) % 512, 128 - ((frames * 12) % 128) - 1, 128, 32)); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); if (limbIndex == 0) { LimbTransform* transform = &skelCuve->transforms[0]; @@ -2077,11 +2077,11 @@ void DemoEffect_DrawTimeWarp(Actor* thisx, GlobalContext* globalCtx) { if (effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_LARGE || effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_SMALL || Flags_GetEnv(globalCtx, 1) || gSaveContext.sceneSetupIndex >= 4 || gSaveContext.entranceIndex == 0x0324) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 25); Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY); SkelCurve_Draw(thisx, globalCtx, &this->skelCurve, DemoEffect_DrawTimewarpLimbs, NULL, 1, this); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c b/soh/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c index 8652f728c..b464e5dea 100644 --- a/soh/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c +++ b/soh/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c @@ -192,7 +192,7 @@ void DemoExt_DrawVortex(Actor* thisx, GlobalContext* globalCtx) { gfxCtx = globalCtx->state.gfxCtx; mtx = Graph_Alloc(gfxCtx, sizeof(Mtx)); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); Matrix_Push(); Matrix_Scale(scale->x, scale->y, scale->z, MTXMODE_APPLY); Matrix_RotateZYX((s16)(kREG(16) + 0x4000), this->rotationPitch, kREG(18), MTXMODE_APPLY); @@ -213,7 +213,7 @@ void DemoExt_DrawVortex(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gPhantomWarpDL); gSPPopMatrix(POLY_XLU_DISP++, G_MTX_MODELVIEW); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } static DemoExtDrawFunc sDrawFuncs[] = { diff --git a/soh/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/soh/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c index fdc87721f..8fa92b5b9 100644 --- a/soh/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/soh/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -73,7 +73,7 @@ void DemoGeff_Init(Actor* thisx, GlobalContext* globalCtx) { void func_80977EA8(GlobalContext* globalCtx, Gfx* dlist) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D18(gfxCtx); @@ -82,7 +82,7 @@ void func_80977EA8(GlobalContext* globalCtx, Gfx* dlist) { gSPDisplayList(POLY_OPA_DISP++, dlist); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) { @@ -90,7 +90,7 @@ void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) { s32 objBankIndex = this->objBankIndex; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[objBankIndex].segment); gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[objBankIndex].segment); @@ -98,7 +98,7 @@ void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) { // Necessary to match if (!globalCtx) {} - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80978030(DemoGeff* this, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/soh/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index 4b8cc14e6..d5a346387 100644 --- a/soh/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/soh/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -270,7 +270,7 @@ void DemoGj_DrawCommon(DemoGj* this, GlobalContext* globalCtx, Gfx* displayList) if (kREG(0) == 0) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D18(gfxCtx); @@ -280,7 +280,7 @@ void DemoGj_DrawCommon(DemoGj* this, GlobalContext* globalCtx, Gfx* displayList) gSPDisplayList(POLY_OPA_DISP++, displayList); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } } @@ -296,7 +296,7 @@ void DemoGj_DrawRotated(DemoGj* this, GlobalContext* globalCtx, Gfx* displayList gfxCtx = globalCtx->state.gfxCtx; matrix = Graph_Alloc(gfxCtx, sizeof(Mtx)); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); Matrix_Push(); Matrix_RotateZYX(x, y, z, MTXMODE_APPLY); @@ -309,7 +309,7 @@ void DemoGj_DrawRotated(DemoGj* this, GlobalContext* globalCtx, Gfx* displayList gSPDisplayList(POLY_OPA_DISP++, displayList); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void DemoGj_SetupRotation(DemoGj* this, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/soh/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index cdb6cc862..44b108884 100644 --- a/soh/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/soh/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -331,7 +331,7 @@ void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) { void* eyeTexture = sEyeTextures[eyeTexIdx]; void* mouthTexture = gGoronCsMouthSmileTex; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); @@ -340,7 +340,7 @@ void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void DemoGo_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index 22bf64bc0..5f071a542 100644 --- a/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -650,7 +650,7 @@ void DemoGt_Draw1(DemoGt* this, GlobalContext* globalCtx) { spB4 = Graph_Alloc(gfxCtx, sizeof(Mtx)); sp98 = 1.0f - Math_CosS(spC6); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); spA8.x = Math_CosS(spB8); spA8.y = 0.0f; @@ -688,7 +688,7 @@ void DemoGt_Draw1(DemoGt* this, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, spB4, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gTowerCollapseCsFlameSmokeDL); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_8097F904_Init1(DemoGt* this, GlobalContext* globalCtx) { @@ -853,7 +853,7 @@ void DemoGt_Draw2(DemoGt* this, GlobalContext* globalCtx) { s32* unk178; s32 pad; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D18(gfxCtx); unk198 = this->unk_198; @@ -866,7 +866,7 @@ void DemoGt_Draw2(DemoGt* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsCollapsedStructureInnerDL); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80980110_Init2(DemoGt* this, GlobalContext* globalCtx) { @@ -1168,7 +1168,7 @@ void DemoGt_Update10(DemoGt* this, GlobalContext* globalCtx) { void DemoGt_Draw3(DemoGt* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D18(gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), @@ -1176,7 +1176,7 @@ void DemoGt_Draw3(DemoGt* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsCollapsedStructureOuterDL); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80980F00_Init5(DemoGt* this, GlobalContext* globalCtx) { @@ -1271,7 +1271,7 @@ void DemoGt_Draw4(DemoGt* this, GlobalContext* globalCtx2) { sp60 = Graph_Alloc(gfxCtx, sizeof(Mtx)); sp44 = 1.0f - Math_CosS(sp76); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); sp54.x = Math_CosS(sp68); sp54.y = 0.0f; @@ -1298,7 +1298,7 @@ void DemoGt_Draw4(DemoGt* this, GlobalContext* globalCtx2) { gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsStandalonePillarDL); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } } @@ -1390,7 +1390,7 @@ void DemoGt_Draw5(DemoGt* this, GlobalContext* globalCtx) { sp60 = Graph_Alloc(gfxCtx, sizeof(Mtx)); sp44 = 1 - Math_CosS(sp76); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); sp54.x = Math_CosS(sp68); sp54.y = 0.0f; @@ -1417,7 +1417,7 @@ void DemoGt_Draw5(DemoGt* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsStandalonePillarDL); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_809818A4_Init7(DemoGt* this, GlobalContext* globalCtx) { @@ -1486,7 +1486,7 @@ void DemoGt_Draw6(DemoGt* this, GlobalContext* globalCtx) { sp64 = Graph_Alloc(gfxCtx, sizeof(Mtx)); sp48 = 1.0f - Math_CosS(sp78); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); sp58.x = Math_CosS(sp6C); sp58.y = 0.0f; @@ -1509,7 +1509,7 @@ void DemoGt_Draw6(DemoGt* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsStandalonePillarDL); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80981C94_Init23(DemoGt* this, GlobalContext* globalCtx) { @@ -1578,7 +1578,7 @@ void DemoGt_Draw7(DemoGt* this, GlobalContext* globalCtx) { sp5C = Graph_Alloc(gfxCtx, sizeof(Mtx)); sp40 = 1.0f - Math_CosS(sp6E); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); sp50.x = Math_CosS(sp60); sp50.y = 0.0f; @@ -1600,7 +1600,7 @@ void DemoGt_Draw7(DemoGt* this, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, sp5C, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsWalkwayDL); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80982054_Init24(DemoGt* this, GlobalContext* globalCtx) { @@ -1669,7 +1669,7 @@ void DemoGt_Draw8(DemoGt* this, GlobalContext* globalCtx) { sp5C = Graph_Alloc(gfxCtx, sizeof(Mtx)); sp40 = 1.0f - Math_CosS(sp6E); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); sp50.x = Math_CosS(sp60); sp50.y = 0.0f; @@ -1691,7 +1691,7 @@ void DemoGt_Draw8(DemoGt* this, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, sp5C, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsAlternativeWalkwayDL); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } static DemoGtUpdateFunc sUpdateFuncs[] = { diff --git a/soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c index df0e85c7c..330c56ae1 100644 --- a/soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -259,7 +259,7 @@ void DemoIk_Type1PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi DemoIk* this = (DemoIk*)thisx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (limbIndex == 1) { switch (this->actor.params) { case 0: @@ -274,7 +274,7 @@ void DemoIk_Type1PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi break; } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void DemoIk_Type1Draw(DemoIk* this, GlobalContext* globalCtx) { @@ -282,7 +282,7 @@ void DemoIk_Type1Draw(DemoIk* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); func_80093D18(gfxCtx); func_80093D84(gfxCtx); @@ -290,7 +290,7 @@ void DemoIk_Type1Draw(DemoIk* this, GlobalContext* globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x09, DemoIk_SetColors(gfxCtx, 255, 40, 0, 40, 0, 0)); gSPSegment(POLY_OPA_DISP++, 0x0A, DemoIk_SetColors(gfxCtx, 255, 255, 255, 20, 40, 30)); SkelAnime_DrawOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, NULL, DemoIk_Type1PostLimbDraw, this); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void DemoIk_Type2Init(DemoIk* this, GlobalContext* globalCtx) { @@ -417,7 +417,7 @@ void DemoIk_Type2PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; f32 frame = DemoIk_GetCurFrame(this); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (limbIndex == 1 && (frame >= 30.0f)) { switch (this->actor.params) { case 3: @@ -442,7 +442,7 @@ void DemoIk_Type2PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi break; } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void DemoIk_Type2Draw(DemoIk* this, GlobalContext* globalCtx) { @@ -450,7 +450,7 @@ void DemoIk_Type2Draw(DemoIk* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); func_80093D18(gfxCtx); func_80093D84(gfxCtx); @@ -459,7 +459,7 @@ void DemoIk_Type2Draw(DemoIk* this, GlobalContext* globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x0A, DemoIk_SetColors(gfxCtx, 255, 255, 255, 20, 40, 30)); SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, DemoIk_Type2OverrideLimbDraw, DemoIk_Type2PostLimbDraw, this); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } static DemoIkActionFunc sActionFuncs[] = { diff --git a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index 355855273..287f9f450 100644 --- a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -524,7 +524,7 @@ void DemoIm_DrawTranslucent(DemoIm* this, GlobalContext* globalCtx) { void* eyeTex = sEyeTextures[eyeIndex]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -536,7 +536,7 @@ void DemoIm_DrawTranslucent(DemoIm* this, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, NULL, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80985E60(DemoIm* this, GlobalContext* globalCtx) { @@ -1187,7 +1187,7 @@ void DemoIm_DrawSolid(DemoIm* this, GlobalContext* globalCtx) { void* eyeTexture = sEyeTextures[eyeIndex]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -1199,7 +1199,7 @@ void DemoIm_DrawSolid(DemoIm* this, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, DemoIm_OverrideLimbDraw, DemoIm_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void DemoIm_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index 9122c3aee..de93381f6 100644 --- a/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -522,7 +522,7 @@ void DemoKankyo_DrawRain(Actor* thisx, GlobalContext* globalCtx) { f32 translateZ; s16 j; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); for (i = 0; i < 30; i++) { s32 pad[2]; @@ -625,14 +625,14 @@ void DemoKankyo_DrawRain(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, object_efc_star_field_DL_000080); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void DemoKankyo_DrawRock(Actor* thisx, GlobalContext* globalCtx) { DemoKankyo* this = (DemoKankyo*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW); @@ -646,7 +646,7 @@ void DemoKankyo_DrawRock(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, object_efc_star_field_DL_000DE0); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void DemoKankyo_DrawClouds(Actor* thisx, GlobalContext* globalCtx) { @@ -657,7 +657,7 @@ void DemoKankyo_DrawClouds(Actor* thisx, GlobalContext* globalCtx) { f32 dy; f32 dz; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); for (i = 0; i < 30; i++) { dx = -(Math_SinS(this->unk_150[i].unk_20 - 0x8000) * 120.0f) * (30.0f + (i / 30.0f) * 10.0f); @@ -683,14 +683,14 @@ void DemoKankyo_DrawClouds(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gEffDustDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void DemoKankyo_DrawDoorOfTime(Actor* thisx, GlobalContext* globalCtx) { DemoKankyo* this = (DemoKankyo*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); Matrix_Translate(-this->unk_150[0].unk_18, 0.0f, 0.0f, MTXMODE_APPLY); @@ -702,14 +702,14 @@ void DemoKankyo_DrawDoorOfTime(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, object_toki_objects_DL_007578); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void DemoKankyo_DrawLightPlane(Actor* thisx, GlobalContext* globalCtx) { DemoKankyo* this = (DemoKankyo*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (globalCtx->csCtx.state == CS_STATE_IDLE || gSaveContext.sceneSetupIndex >= 4) { func_80093D84(globalCtx->state.gfxCtx); @@ -721,7 +721,7 @@ void DemoKankyo_DrawLightPlane(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, object_toki_objects_DL_008390); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void DemoKankyo_Vec3fCopy(Vec3f* src, Vec3f* dst) { @@ -772,7 +772,7 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, GlobalContext* globalCtx) { PosRot posRot; u8 linkAge = gSaveContext.linkAge; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->sparkleCounter < 30) { this->sparkleCounter += 2; @@ -886,7 +886,7 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void DemoKankyo_DrawSparkles(Actor* thisx, GlobalContext* globalCtx) { @@ -908,7 +908,7 @@ void DemoKankyo_DrawSparkles(Actor* thisx, GlobalContext* globalCtx) { s16 i; PosRot posRot; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->sparkleCounter < 20) { this->sparkleCounter++; @@ -988,5 +988,5 @@ void DemoKankyo_DrawSparkles(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index 0531821d5..5049223d3 100644 --- a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -286,7 +286,7 @@ void DemoKekkai_DrawTrialBarrier(Actor* thisx, GlobalContext* globalCtx2) { energyVtx[i].v.cn[3] = alphas[alphaIndex[i]]; } colorIndex = (this->actor.params - 1) * 6; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); Matrix_Push(); Matrix_Translate(0.0f, 1200.0f, 0.0f, MTXMODE_APPLY); @@ -315,7 +315,7 @@ void DemoKekkai_DrawTrialBarrier(Actor* thisx, GlobalContext* globalCtx2) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frames * 5, frames * -10, 0x20, 0x20, 1, frames * 5, frames * -10, 0x20, 0x40)); gSPDisplayList(POLY_XLU_DISP++, gTrialBarrierEnergyDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -325,7 +325,7 @@ void DemoKekkai_DrawTowerBarrier(Actor* thisx, GlobalContext* globalCtx) { s32 scroll; scroll = (s32)this->barrierScroll & 0xFFFF; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -334,7 +334,7 @@ void DemoKekkai_DrawTowerBarrier(Actor* thisx, GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 2, scroll * -4, 0x20, 0x40, 1, scroll * 2, scroll * -4, 0x20, 0x40)); gSPDisplayList(POLY_XLU_DISP++, gTowerBarrierDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void DemoKekkai_Reset(void) { diff --git a/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 7454abbfa..b4bb5f0ee 100644 --- a/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -464,7 +464,7 @@ void DemoSa_DrawXlu(DemoSa* this, GlobalContext* globalCtx) { void* sp6C = sMouthTextures[mouthIndex]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -477,7 +477,7 @@ void DemoSa_DrawXlu(DemoSa* this, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, NULL, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_8098F390(DemoSa* this, GlobalContext* globalCtx) { @@ -802,7 +802,7 @@ void DemoSa_DrawOpa(DemoSa* this, GlobalContext* globalCtx) { void* mouthTex = sMouthTextures[mouthIndex]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -815,7 +815,7 @@ void DemoSa_DrawOpa(DemoSa* this, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, DemoSa_OverrideLimbDraw, NULL, &this->actor); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void DemoSa_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c b/soh/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c index 43c991964..b0c286911 100644 --- a/soh/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/soh/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -104,7 +104,7 @@ void DemoShd_Draw(Actor* thisx, GlobalContext* globalCtx) { if (1) {} // Necessary to match, can be anywhere in the function - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -122,5 +122,5 @@ void DemoShd_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, D_809934B8); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/soh/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c index 3e79f4f2d..607a04a7c 100644 --- a/soh/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c +++ b/soh/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c @@ -136,7 +136,7 @@ s32 DemoTreLgt_PostLimbDraw(GlobalContext* globalCtx, SkelAnimeCurve* skelCurve, s32 pad; DemoTreLgt* this = (DemoTreLgt*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (globalCtx->state.frames * 2) % 256, 0, 64, 32, 1, (globalCtx->state.frames * -2) % 256, 0, 64, 32)); @@ -147,14 +147,14 @@ s32 DemoTreLgt_PostLimbDraw(GlobalContext* globalCtx, SkelAnimeCurve* skelCurve, gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 180, this->unk_174); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void DemoTreLgt_Draw(Actor* thisx, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; DemoTreLgt* this = (DemoTreLgt*)thisx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (this->action != DEMO_TRE_LGT_ACTION_ANIMATE) { return; @@ -164,5 +164,5 @@ void DemoTreLgt_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, 200, 255, 0, 0); SkelCurve_Draw(&this->actor, globalCtx, &this->skelCurve, DemoTreLgt_PostLimbDraw, NULL, 1, thisx); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index 381cd6c07..ed38e6da0 100644 --- a/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -174,12 +174,12 @@ void DoorAna_Update(Actor* thisx, GlobalContext* globalCtx) { } void DoorAna_Draw(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gGrottoDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c b/soh/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c index 67c1b6568..939c52e50 100644 --- a/soh/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c +++ b/soh/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c @@ -144,7 +144,7 @@ void DoorGerudo_Update(Actor* thisx, GlobalContext* globalCtx) { void DoorGerudo_Draw(Actor* thisx, GlobalContext* globalCtx) { DoorGerudo* this = (DoorGerudo*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -157,5 +157,5 @@ void DoorGerudo_Draw(Actor* thisx, GlobalContext* globalCtx) { Actor_DrawDoorLock(globalCtx, this->unk_166, DOORLOCK_NORMAL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/soh/src/overlays/actors/ovl_Door_Killer/z_door_killer.c index 3066cc5b9..324bbbc95 100644 --- a/soh/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/soh/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -498,9 +498,9 @@ void DoorKiller_SetTexture(Actor* thisx, GlobalContext* globalCtx) { DoorKiller* this = (DoorKiller*)thisx; void* doorTexture = this->texture; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, doorTexture); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void DoorKiller_DrawDoor(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index 631098139..168a8d1c7 100644 --- a/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -707,7 +707,7 @@ void DoorShutter_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad[2]; ShutterInfo* sp70 = &sShutterInfo[this->unk_16C]; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -761,7 +761,7 @@ void DoorShutter_Draw(Actor* thisx, GlobalContext* globalCtx) { : ((this->unk_16C == 6) ? DOORLOCK_NORMAL_SPIRIT : DOORLOCK_NORMAL)); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index cda22f73c..485bee353 100644 --- a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -881,7 +881,7 @@ void DoorWarp1_Update(Actor* thisx, GlobalContext* globalCtx) { void DoorWarp1_DrawBlueCrystal(DoorWarp1* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -891,7 +891,7 @@ void DoorWarp1_DrawBlueCrystal(DoorWarp1* this, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, NULL, &this->actor, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); SkelAnime_Update(&this->skelAnime); } @@ -904,7 +904,7 @@ void DoorWarp1_DrawPurpleCrystal(DoorWarp1* this, GlobalContext* globalCtx) { eye.y = (Math_CosS(globalCtx->state.frames * 200) * 120.0f) * 80.0f; eye.z = (Math_CosS(globalCtx->state.frames * 200) * 120.0f) * 80.0f; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); func_8002EB44(&this->actor.world.pos, &eye, &eye, globalCtx->state.gfxCtx); @@ -915,7 +915,7 @@ void DoorWarp1_DrawPurpleCrystal(DoorWarp1* this, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, NULL, &this->actor, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); SkelAnime_Update(&this->skelAnime); } @@ -929,7 +929,7 @@ void DoorWarp1_DrawWarp(DoorWarp1* this, GlobalContext* globalCtx) { f32 xzScale; f32 temp_f0; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); temp_f0 = 1.0f - (2.0f - this->unk_194) / 1.7f; if (this->actor.params != WARP_YELLOW && this->actor.params != WARP_DESTINATION && @@ -1020,7 +1020,7 @@ void DoorWarp1_DrawWarp(DoorWarp1* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gWarpPortalDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void DoorWarp1_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c b/soh/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c index 020295120..618ddd4e5 100644 --- a/soh/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c +++ b/soh/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c @@ -115,7 +115,7 @@ void EfcErupc_Draw(Actor* thisx, GlobalContext* globalCtx) { EfcErupc* this = (EfcErupc*)thisx; u16 csAction; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -156,7 +156,7 @@ void EfcErupc_Draw(Actor* thisx, GlobalContext* globalCtx) { } } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); EfcErupc_DrawParticles(this->particles, globalCtx); } @@ -165,7 +165,7 @@ void EfcErupc_DrawParticles(EfcErupcParticles* particles, GlobalContext* globalC s16 i; s32 pad; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); for (i = 0; i < EFC_ERUPC_NUM_PARTICLES; i++, particles++) { if (particles->isActive) { func_80093D84(globalCtx->state.gfxCtx); @@ -182,7 +182,7 @@ void EfcErupc_DrawParticles(EfcErupcParticles* particles, GlobalContext* globalC gSPDisplayList(POLY_XLU_DISP++, object_efc_erupc_DL_0027D8); } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } static Color_RGB8 D_8099D770[] = { diff --git a/soh/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/soh/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index d6e75821b..a6aed8d7d 100644 --- a/soh/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/soh/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -269,7 +269,7 @@ void EffDust_DrawFunc_8099E4F4(Actor* thisx, GlobalContext* globalCtx2) { s32 i; f32 aux; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D18(gfxCtx); @@ -304,7 +304,7 @@ void EffDust_DrawFunc_8099E4F4(Actor* thisx, GlobalContext* globalCtx2) { if (0) {} } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffDust_DrawFunc_8099E784(Actor* thisx, GlobalContext* globalCtx2) { @@ -317,7 +317,7 @@ void EffDust_DrawFunc_8099E784(Actor* thisx, GlobalContext* globalCtx2) { f32 aux; Player* player = GET_PLAYER(globalCtx); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D18(gfxCtx); @@ -363,7 +363,7 @@ void EffDust_DrawFunc_8099E784(Actor* thisx, GlobalContext* globalCtx2) { distanceTraveled++; } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffDust_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c index 69efd9d1c..a8831e2f2 100644 --- a/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -175,7 +175,7 @@ void ElfMsg_Update(Actor* thisx, GlobalContext* globalCtx) { void ElfMsg_Draw(Actor* thisx, GlobalContext* globalCtx) { #ifdef ZELDA_DEBUG - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (R_NAVI_MSG_REGION_ALPHA == 0) { return; @@ -198,6 +198,6 @@ void ElfMsg_Draw(Actor* thisx, GlobalContext* globalCtx) gSPDisplayList(POLY_XLU_DISP++, sCylinderDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); #endif } diff --git a/soh/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/soh/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c index ee080b149..2baa4a332 100644 --- a/soh/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/soh/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -154,7 +154,7 @@ void ElfMsg2_Update(Actor* thisx, GlobalContext* globalCtx) { void ElfMsg2_Draw(Actor* thisx, GlobalContext* globalCtx) { #if ZELDA_DEBUG - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (R_NAVI_MSG_REGION_ALPHA == 0) { return; @@ -167,6 +167,6 @@ void ElfMsg2_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, D_809ADC38); gSPDisplayList(POLY_XLU_DISP++, sCubeDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); #endif } diff --git a/soh/src/overlays/actors/ovl_En_Am/z_en_am.c b/soh/src/overlays/actors/ovl_En_Am/z_en_am.c index dc7b6b142..09b7def23 100644 --- a/soh/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/soh/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -946,7 +946,7 @@ void EnAm_Draw(Actor* thisx, GlobalContext* globalCtx) { Vec3f sp68; EnAm* this = (EnAm*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, this->textureBlend); @@ -971,5 +971,5 @@ void EnAm_Draw(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c index c40eec780..eca34552f 100644 --- a/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -319,7 +319,7 @@ void EnAni_Draw(Actor* thisx, GlobalContext* globalCtx) { EnAni* this = (EnAni*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_800943C8(globalCtx->state.gfxCtx); @@ -328,5 +328,5 @@ void EnAni_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnAni_OverrideLimbDraw, EnAni_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/soh/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c index 016add9b7..3bace1525 100644 --- a/soh/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/soh/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -478,14 +478,14 @@ void EnAnubice_PostLimbDraw(struct GlobalContext* globalCtx, s32 limbIndex, Gfx* Vec3f pos = { 0.0f, 0.0f, 0.0f }; if (limbIndex == ANUBICE_LIMB_HEAD) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gAnubiceEyesDL); Matrix_MultVec3f(&pos, &this->fireballPos); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/soh/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c index 1f07e8a6b..9d375794e 100644 --- a/soh/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c +++ b/soh/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c @@ -222,7 +222,7 @@ void EnAnubiceFire_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad[2]; s32 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 0, 255); @@ -256,5 +256,5 @@ void EnAnubiceFire_Draw(Actor* thisx, GlobalContext* globalCtx) { } Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index 4b7ead079..3d13dc421 100644 --- a/soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -462,7 +462,7 @@ void EnArrow_Draw(Actor* thisx, GlobalContext* globalCtx) { } else if (this->actor.speedXZ != 0.0f) { alpha = (Math_CosS(this->timer * 5000) * 127.5f) + 127.5f; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093C14(globalCtx->state.gfxCtx); @@ -489,7 +489,7 @@ void EnArrow_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Pop(); Matrix_RotateY(this->actor.world.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } func_809B4800(this, globalCtx); diff --git a/soh/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/soh/src/overlays/actors/ovl_En_Ba/z_en_ba.c index 676e32b26..a971d33cf 100644 --- a/soh/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/soh/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -479,7 +479,7 @@ void EnBa_Draw(Actor* thisx, GlobalContext* globalCtx) { Mtx* mtx = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx) * 14); Vec3f unused = { 0.0f, 0.0f, 448.0f }; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); if (this->actor.params < EN_BA_DEAD_BLOB) { Matrix_Push(); @@ -520,5 +520,5 @@ void EnBa_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, object_bxa_DL_001D80); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c index a004b064c..ac73605ef 100644 --- a/soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -1280,7 +1280,7 @@ void EnBb_Draw(Actor* thisx, GlobalContext* globalCtx) { Vec3f blureVtx1; Vec3f blureVtx2; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); blureBase1.z = this->maxSpeed * 80.0f; blureBase2.z = this->maxSpeed * 80.0f; @@ -1348,5 +1348,5 @@ void EnBb_Draw(Actor* thisx, GlobalContext* globalCtx) { } } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/soh/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c index 6c9f70dec..61c8f5cf8 100644 --- a/soh/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c +++ b/soh/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c @@ -204,7 +204,7 @@ void EnBdfire_DrawFire(EnBdfire* this, GlobalContext* globalCtx) { s16 temp; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); temp = this->unk_156 & 7; Matrix_ReplaceRotation(&globalCtx->billboardMtxF); func_80094BC4(globalCtx->state.gfxCtx); @@ -220,7 +220,7 @@ void EnBdfire_DrawFire(EnBdfire* this, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_kingdodongo_DL_01D950); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnBdfire_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/soh/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index d785a5039..73d33ad28 100644 --- a/soh/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/soh/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -817,7 +817,7 @@ s32 EnBigokuta_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d if (limbIndex == 15) { if (this->actionFunc == func_809BE058 || this->actionFunc == func_809BE180) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->actionFunc == func_809BE058) { temp_hi = this->unk_196 % 12; @@ -839,10 +839,10 @@ s32 EnBigokuta_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, temp_f0, temp_f0, temp_f0, 255); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } else if (limbIndex == 10) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->actionFunc == func_809BE26C) { intensity = this->unk_196 * (255.0f / 38); } else { @@ -851,7 +851,7 @@ s32 EnBigokuta_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, intensity, intensity, intensity, intensity); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } else if (limbIndex == 17 && this->actionFunc == func_809BE26C) { if (this->unk_198 < 5) { Matrix_Scale((this->unk_198 * 0.2f * 0.25f) + 1.0f, 1.0f, 1.0f, MTXMODE_APPLY); @@ -869,7 +869,7 @@ s32 EnBigokuta_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d void EnBigokuta_Draw(Actor* thisx, GlobalContext* globalCtx) { EnBigokuta* this = (EnBigokuta*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if ((this->actionFunc != func_809BE26C) || (this->unk_196 != 0) || (this->unk_198 != 0)) { func_80093D18(globalCtx->state.gfxCtx); @@ -897,5 +897,5 @@ void EnBigokuta_Draw(Actor* thisx, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, NULL, NULL, NULL, POLY_XLU_DISP); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/soh/src/overlays/actors/ovl_En_Bili/z_en_bili.c index 71c272a3b..9d74d03ce 100644 --- a/soh/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/soh/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -751,7 +751,7 @@ static void* sTentaclesTextures[] = { void EnBili_Draw(Actor* thisx, GlobalContext* globalCtx) { EnBili* this = (EnBili*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); this->tentaclesTexIndex = CLAMP_MAX(this->tentaclesTexIndex, 7); @@ -766,5 +766,5 @@ void EnBili_Draw(Actor* thisx, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnBili_OverrideLimbDraw, NULL, this, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c b/soh/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c index f51909e8b..b1eb370f1 100644 --- a/soh/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c +++ b/soh/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c @@ -131,7 +131,7 @@ void EnBlkobj_Update(Actor* thisx, GlobalContext* globalCtx) { void EnBlkobj_DrawAlpha(GlobalContext* globalCtx, Gfx* dList, s32 alpha) { Gfx* segment; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (alpha == 255) { segment = sSetupOpaDL; @@ -143,7 +143,7 @@ void EnBlkobj_DrawAlpha(GlobalContext* globalCtx, Gfx* dList, s32 alpha) { gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, alpha); gSPDisplayList(POLY_XLU_DISP++, dList); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnBlkobj_Draw(Actor* thisx, GlobalContext* globalCtx) { @@ -152,7 +152,7 @@ void EnBlkobj_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 illusionAlpha; u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -171,5 +171,5 @@ void EnBlkobj_Draw(Actor* thisx, GlobalContext* globalCtx) { EnBlkobj_DrawAlpha(globalCtx, gIllusionRoomIllusionDL, illusionAlpha); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 143d6c260..5fea38283 100644 --- a/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -362,7 +362,7 @@ void EnBom_Draw(Actor* thisx, GlobalContext* globalCtx) { if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (thisx->params == BOMB_BODY) { func_80093D18(globalCtx->state.gfxCtx); @@ -382,5 +382,5 @@ void EnBom_Draw(Actor* thisx, GlobalContext* globalCtx) { Collider_UpdateSpheres(0, &this->explosionCollider); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index 601ad1aa2..a70b24637 100644 --- a/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -526,12 +526,12 @@ void EnBomBowlMan_Draw(Actor* thisx, GlobalContext* globalCtx) { static void* eyeTextures[] = { gChuGirlEyeOpenTex, gChuGirlEyeHalfTex, gChuGirlEyeClosedTex }; EnBomBowlMan* this = (EnBomBowlMan*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTextureIndex])); SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnBomBowlMan_OverrideLimbDraw, NULL, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index ca37286e5..7fb13c61f 100644 --- a/soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -484,7 +484,7 @@ void EnBomChu_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 blinkHalfPeriod; s32 blinkTime; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); @@ -513,5 +513,5 @@ void EnBomChu_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gBombchuDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c b/soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c index 7bef0e0a0..276fcffe6 100644 --- a/soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -484,7 +484,7 @@ void EnBombf_Draw(Actor* thisx, GlobalContext* globalCtx) { if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (thisx->params <= BOMBFLOWER_BODY) { func_80093D18(globalCtx->state.gfxCtx); @@ -511,5 +511,5 @@ void EnBombf_Draw(Actor* thisx, GlobalContext* globalCtx) { Collider_UpdateSpheres(0, &this->explosionCollider); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/soh/src/overlays/actors/ovl_En_Boom/z_en_boom.c index f656875ad..f0e3e2ee6 100644 --- a/soh/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/soh/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -255,7 +255,7 @@ void EnBoom_Draw(Actor* thisx, GlobalContext* globalCtx) { Vec3f vec1; Vec3f vec2; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_RotateY(this->actor.world.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_RotateZ(0x1F40 * (M_PI / 0x8000), MTXMODE_APPLY); @@ -274,5 +274,5 @@ void EnBoom_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gBoomerangRefDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c index 14ae611e2..9be5bc9e2 100644 --- a/soh/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/soh/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -616,7 +616,7 @@ Gfx* func_809CA518(GraphicsContext* gfxCtx) { void EnBox_Draw(Actor* thisx, GlobalContext* globalCtx) { EnBox* this = (EnBox*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); /* this->dyna.actor.flags & ACTOR_FLAG_7 is set by Init (if type is 4 or 6) @@ -644,5 +644,5 @@ void EnBox_Draw(Actor* thisx, GlobalContext* globalCtx) { EnBox_PostLimbDraw, this, POLY_XLU_DISP); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/soh/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index b82e6a164..9caceb91c 100644 --- a/soh/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/soh/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -409,7 +409,7 @@ void EnBubble_Draw(Actor* thisx, GlobalContext* globalCtx) { EnBubble* this = (EnBubble*)thisx; u32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->actionFunc != EnBubble_Disappear) { func_80093D84(globalCtx->state.gfxCtx); @@ -427,7 +427,7 @@ void EnBubble_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gBubbleDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); if (this->actionFunc != EnBubble_Disappear) { this->actor.shape.shadowScale = (f32)((this->expansionWidth + 1.0f) * 0.2f); diff --git a/soh/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/soh/src/overlays/actors/ovl_En_Butte/z_en_butte.c index a7fb40569..87fd2338d 100644 --- a/soh/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/soh/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -115,7 +115,7 @@ void EnButte_DrawTransformationEffect(EnButte* this, GlobalContext* globalCtx) { s32 alpha; Vec3s camDir; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093C14(globalCtx->state.gfxCtx); @@ -136,7 +136,7 @@ void EnButte_DrawTransformationEffect(EnButte* this, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 210, 255); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffFlash1DL)); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } static InitChainEntry sInitChain[] = { diff --git a/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c index a1b0eecbb..ba4a56e62 100644 --- a/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -846,7 +846,7 @@ void EnBw_Draw(Actor* thisx, GlobalContext* globalCtx2) { Vec3f icePos; s32 iceIndex; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->color1.a == 0xFF) { func_80093D18(globalCtx->state.gfxCtx); @@ -902,7 +902,7 @@ void EnBw_Draw(Actor* thisx, GlobalContext* globalCtx2) { EffectSsEnIce_SpawnFlyingVec3f(globalCtx, thisx, &icePos, 0x96, 0x96, 0x96, 0xFA, 0xEB, 0xF5, 0xFF, 1.3f); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnBw_Reset(void) { diff --git a/soh/src/overlays/actors/ovl_En_Bx/z_en_bx.c b/soh/src/overlays/actors/ovl_En_Bx/z_en_bx.c index 50b48a44b..703a82665 100644 --- a/soh/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/soh/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -206,7 +206,7 @@ void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx) { Mtx* mtx = Graph_Alloc(globalCtx->state.gfxCtx, 4 * sizeof(Mtx)); s16 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -243,5 +243,5 @@ void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, object_bxa_DL_0022F0); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/soh/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c index 0ba39bfc6..3b4c73e39 100644 --- a/soh/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c +++ b/soh/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -686,7 +686,7 @@ void EnClearTag_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnClearTag* this = (EnClearTag*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->drawMode != CLEAR_TAG_DRAW_MODE_EFFECT) { func_80093D84(globalCtx->state.gfxCtx); @@ -766,7 +766,7 @@ void EnClearTag_Draw(Actor* thisx, GlobalContext* globalCtx) { EnClearTag_DrawEffects(globalCtx); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -896,7 +896,7 @@ void EnClearTag_DrawEffects(GlobalContext* globalCtx) { EnClearTagEffect* effect = (EnClearTagEffect*)globalCtx->specialEffects; EnClearTagEffect* firstEffect = effect; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -1022,7 +1022,7 @@ void EnClearTag_DrawEffects(GlobalContext* globalCtx) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EnClearTag_Reset(void) { diff --git a/soh/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/soh/src/overlays/actors/ovl_En_Cs/z_en_cs.c index 7f422cc0b..aaa52ec33 100644 --- a/soh/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/soh/src/overlays/actors/ovl_En_Cs/z_en_cs.c @@ -462,7 +462,7 @@ void EnCs_Draw(Actor* thisx, GlobalContext* globalCtx) { EnCs* this = (EnCs*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeIndex])); @@ -486,7 +486,7 @@ void EnCs_Draw(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 EnCs_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { diff --git a/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index 5548742e4..5185adfc2 100644 --- a/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -589,7 +589,7 @@ void EnDaiku_Update(Actor* thisx, GlobalContext* globalCtx) { void EnDaiku_Draw(Actor* thisx, GlobalContext* globalCtx) { EnDaiku* this = (EnDaiku*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -606,7 +606,7 @@ void EnDaiku_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnDaiku_OverrideLimbDraw, EnDaiku_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 EnDaiku_OverrideLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { @@ -632,12 +632,12 @@ void EnDaiku_PostLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Vec3s static Vec3f targetPosHeadLocal = { 700, 1100, 0 }; EnDaiku* this = (EnDaiku*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (limb == 15) { // head Matrix_MultVec3f(&targetPosHeadLocal, &this->actor.focus.pos); gSPDisplayList(POLY_OPA_DISP++, hairDLists[this->actor.params & 3]); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/soh/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index 88094570a..99cae7589 100644 --- a/soh/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/soh/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -530,20 +530,20 @@ void EnDaikuKakariko_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** static Vec3f unkVec = { 700.0f, 1100.0f, 0.0f }; EnDaikuKakariko* this = (EnDaikuKakariko*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (limbIndex == 15) { Matrix_MultVec3f(&unkVec, &this->actor.focus.pos); gSPDisplayList(POLY_OPA_DISP++, carpenterHeadDLists[this->actor.params & 3]); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnDaikuKakariko_Draw(Actor* thisx, GlobalContext* globalCtx) { EnDaikuKakariko* this = (EnDaikuKakariko*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -560,5 +560,5 @@ void EnDaikuKakariko_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnDaikuKakariko_OverrideLimbDraw, EnDaikuKakariko_PostLimbDraw, thisx); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/soh/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index 9c3333e95..7518616b3 100644 --- a/soh/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/soh/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -1149,7 +1149,7 @@ void EnDekubaba_Update(Actor* thisx, GlobalContext* globalCtx) { void EnDekubaba_DrawStemRetracted(EnDekubaba* this, GlobalContext* globalCtx) { f32 horizontalScale; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); horizontalScale = this->size * 0.01f; @@ -1163,7 +1163,7 @@ void EnDekubaba_DrawStemRetracted(EnDekubaba* this, GlobalContext* globalCtx) { Actor_SetFocus(&this->actor, 0.0f); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnDekubaba_DrawStemExtended(EnDekubaba* this, GlobalContext* globalCtx) { @@ -1175,7 +1175,7 @@ void EnDekubaba_DrawStemExtended(EnDekubaba* this, GlobalContext* globalCtx) { f32 scale; s32 stemSections; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->actionFunc == EnDekubaba_PrunedSomersault) { stemSections = 2; @@ -1230,11 +1230,11 @@ void EnDekubaba_DrawStemExtended(EnDekubaba* this, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnDekubaba_DrawStemBasePruned(EnDekubaba* this, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_RotateZYX(this->stemSectionAngle[2], this->actor.shape.rot.y, 0, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -1243,14 +1243,14 @@ void EnDekubaba_DrawStemBasePruned(EnDekubaba* this, GlobalContext* globalCtx) { Collider_UpdateSpheres(55, &this->collider); Collider_UpdateSpheres(56, &this->collider); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnDekubaba_DrawBaseShadow(EnDekubaba* this, GlobalContext* globalCtx) { MtxF mtx; f32 horizontalScale; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80094044(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, 255); @@ -1263,7 +1263,7 @@ void EnDekubaba_DrawBaseShadow(EnDekubaba* this, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gCircleShadowDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnDekubaba_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { @@ -1279,7 +1279,7 @@ void EnDekubaba_Draw(Actor* thisx, GlobalContext* globalCtx) { f32 scale; if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); if (this->actionFunc != EnDekubaba_DeadStickDrop) { @@ -1316,7 +1316,7 @@ void EnDekubaba_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gDekuBabaStickDropDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } //OTRTODO fix this one diff --git a/soh/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/soh/src/overlays/actors/ovl_En_Dh/z_en_dh.c index ca428a474..ea49f0def 100644 --- a/soh/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/soh/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -547,7 +547,7 @@ void EnDh_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnDh* this = (EnDh*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->alpha == 255) { func_80093D18(globalCtx->state.gfxCtx); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, this->alpha); @@ -578,5 +578,5 @@ void EnDh_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_dh_DL_007FC0); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index 9677da18f..837fcfd64 100644 --- a/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -562,7 +562,7 @@ void EnDivingGame_Draw(Actor* thisx, GlobalContext* globalCtx) { EnDivingGame* this = (EnDivingGame*)thisx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); gSPSegment(POLY_OPA_DISP++, 0x0C, EnDivingGame_EmptyDList(globalCtx->state.gfxCtx)); @@ -570,5 +570,5 @@ void EnDivingGame_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnDivingGame_OverrideLimbDraw, NULL, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index f0f2c0192..eac4b69ee 100644 --- a/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -431,7 +431,7 @@ void EnDntJiji_Draw(Actor* thisx, GlobalContext* globalCtx) { static void* blinkTex[] = { gDntJijiEyeOpenTex, gDntJijiEyeHalfTex, gDntJijiEyeShutTex }; EnDntJiji* this = (EnDntJiji*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); Matrix_Push(); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(blinkTex[this->eyeState])); @@ -442,5 +442,5 @@ void EnDntJiji_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gDntJijiFlowerDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index 3044d9c7a..8c6013f28 100644 --- a/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -825,11 +825,11 @@ s32 EnDntNomal_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d EnDntNomal* this = (EnDntNomal*)thisx; if ((limbIndex == 1) || (limbIndex == 3) || (limbIndex == 4) || (limbIndex == 5) || (limbIndex == 6)) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, sLeafColors[this->type - ENDNTNOMAL_STAGE].r, sLeafColors[this->type - ENDNTNOMAL_STAGE].g, sLeafColors[this->type - ENDNTNOMAL_STAGE].b, 255); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } return false; } @@ -853,7 +853,7 @@ void EnDntNomal_DrawStageScrub(Actor* thisx, GlobalContext* globalCtx) { Vec3f dustScale = { 0.25f, 0.25f, 0.25f }; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(blinkTex[this->eyeState])); SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnDntNomal_OverrideLimbDraw, @@ -866,7 +866,7 @@ void EnDntNomal_DrawStageScrub(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gDntStageFlowerDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); if (this->actionFunc == EnDntNomal_StageCelebrate) { func_80033C30(&this->actor.world.pos, &dustScale, 255, globalCtx); } @@ -875,7 +875,7 @@ void EnDntNomal_DrawStageScrub(Actor* thisx, GlobalContext* globalCtx) { void EnDntNomal_DrawTargetScrub(Actor* thisx, GlobalContext* globalCtx) { EnDntNomal* this = (EnDntNomal*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, EnDntNomal_PostLimbDraw, this); @@ -884,5 +884,5 @@ void EnDntNomal_DrawTargetScrub(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gHintNutsFlowerDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/soh/src/overlays/actors/ovl_En_Dog/z_en_dog.c index 2d805d39e..55e5b0100 100644 --- a/soh/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/soh/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -473,7 +473,7 @@ void EnDog_Draw(Actor* thisx, GlobalContext* globalCtx) { EnDog* this = (EnDog*)thisx; Color_RGBA8 colors[] = { { 255, 255, 200, 0 }, { 150, 100, 50, 0 } }; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -484,5 +484,5 @@ void EnDog_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnDog_OverrideLimbDraw, EnDog_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Door/z_en_door.c b/soh/src/overlays/actors/ovl_En_Door/z_en_door.c index 24f7b6ab4..655c91303 100644 --- a/soh/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/soh/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -333,7 +333,7 @@ void EnDoor_Draw(Actor* thisx, GlobalContext* globalCtx) { EnDoor* this = (EnDoor*)thisx; if (this->actor.objBankIndex == this->requiredObjBankIndex) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnDoor_OverrideLimbDraw, @@ -350,6 +350,6 @@ void EnDoor_Draw(Actor* thisx, GlobalContext* globalCtx) { Actor_DrawDoorLock(globalCtx, this->lockTimer, DOORLOCK_NORMAL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_En_Du/z_en_du.c b/soh/src/overlays/actors/ovl_En_Du/z_en_du.c index 12c126ca3..0c6f90375 100644 --- a/soh/src/overlays/actors/ovl_En_Du/z_en_du.c +++ b/soh/src/overlays/actors/ovl_En_Du/z_en_du.c @@ -629,7 +629,7 @@ void EnDu_Draw(Actor* thisx, GlobalContext* globalCtx) { }; EnDu* this = (EnDu*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTexIndex])); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(mouthTextures[this->mouthTexIndex])); @@ -637,5 +637,5 @@ void EnDu_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80034BA0(globalCtx, &this->skelAnime, EnDu_OverrideLimbDraw, EnDu_PostLimbDraw, &this->actor, 255); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c b/soh/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c index a6d8156bc..be010a913 100644 --- a/soh/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c +++ b/soh/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c @@ -110,7 +110,7 @@ void EnDyExtra_Draw(Actor* thisx, GlobalContext* globalCtx) { } } - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, @@ -124,5 +124,5 @@ void EnDyExtra_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, envColors[this->type].r, envColors[this->type].g, envColors[this->type].b, 128); gSPDisplayList(POLY_XLU_DISP++, gGreatFairySpiralBeamDL); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/soh/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index b28ae2c65..408390871 100644 --- a/soh/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/soh/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -697,7 +697,7 @@ s32 EnEiyer_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis void EnEiyer_Draw(Actor* thisx, GlobalContext* globalCtx) { EnEiyer* this = (EnEiyer*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->actionFunc != EnEiyer_Dead) { func_80093D18(globalCtx->state.gfxCtx); @@ -714,5 +714,5 @@ void EnEiyer_Draw(Actor* thisx, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelanime.skeleton, this->skelanime.jointTable, EnEiyer_OverrideLimbDraw, NULL, this, POLY_XLU_DISP); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c index 7209a7381..38a481937 100644 --- a/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -1502,7 +1502,7 @@ void EnElf_Draw(Actor* thisx, GlobalContext* globalCtx) { if (!(player->stateFlags1 & 0x100000) || (kREG(90) < this->actor.projectedPos.z)) { dListHead = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Gfx) * 4); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80094B58(globalCtx->state.gfxCtx); @@ -1528,7 +1528,7 @@ void EnElf_Draw(Actor* thisx, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnElf_OverrideLimbDraw, NULL, this, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } } diff --git a/soh/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/soh/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index e293a8e01..bdba28d7d 100644 --- a/soh/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/soh/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -345,7 +345,7 @@ void EnEncount2_ParticleDraw(Actor* thisx, GlobalContext* globalCtx) { s16 i; s32 objBankIndex; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_EFC_STAR_FIELD); @@ -369,5 +369,5 @@ void EnEncount2_ParticleDraw(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c index e9894d9cb..3c431a161 100644 --- a/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c +++ b/soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c @@ -498,7 +498,7 @@ void EnExItem_DrawMagic(EnExItem* this, GlobalContext* globalCtx, s16 magicIndex void EnExItem_DrawKey(EnExItem* this, GlobalContext* globalCtx, s32 index) { static void* keySegments[] = { gDropKeySmallTex }; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_8009460C(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -506,7 +506,7 @@ void EnExItem_DrawKey(EnExItem* this, GlobalContext* globalCtx, s32 index) { gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(keySegments[index])); gSPDisplayList(POLY_OPA_DISP++, gItemDropDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnExItem_DrawRupee(EnExItem* this, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index 2850052f2..5bbfc7048 100644 --- a/soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c @@ -383,7 +383,7 @@ void EnExRuppy_Draw(Actor* thisx, GlobalContext* globalCtx) { EnExRuppy* this = (EnExRuppy*)thisx; if (!this->invisible) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); func_8002EBCC(thisx, globalCtx, 0); @@ -392,6 +392,6 @@ void EnExRuppy_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(rupeeTextures[this->colorIdx])); gSPDisplayList(POLY_OPA_DISP++, gRupeeDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c index dee476cbd..87d45be91 100644 --- a/soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -766,7 +766,7 @@ void EnFd_Draw(Actor* thisx, GlobalContext* globalCtx) { frames = globalCtx->state.frames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); EnFd_DrawDots(this, globalCtx); @@ -790,7 +790,7 @@ void EnFd_Draw(Actor* thisx, GlobalContext* globalCtx) { this->skelAnime.dListCount, EnFd_OverrideLimbDraw, EnFd_PostLimbDraw, this, POLY_XLU_DISP); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnFd_AddEffect(EnFd* this, u8 type, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u8 timer, f32 scale, @@ -882,7 +882,7 @@ void EnFd_DrawFlames(EnFd* this, GlobalContext* globalCtx) { s16 idx; EnFdEffect* eff = this->effects; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); firstDone = false; if (1) {} func_80093D84(globalCtx->state.gfxCtx); @@ -906,7 +906,7 @@ void EnFd_DrawFlames(EnFd* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gFlareDancerSquareParticleDL); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnFd_DrawDots(EnFd* this, GlobalContext* globalCtx) { @@ -914,7 +914,7 @@ void EnFd_DrawDots(EnFd* this, GlobalContext* globalCtx) { s16 firstDone; EnFdEffect* eff = this->effects; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); firstDone = false; func_80093D84(globalCtx->state.gfxCtx); @@ -939,5 +939,5 @@ void EnFd_DrawDots(EnFd* this, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/soh/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c index 629c5a486..17083cc90 100644 --- a/soh/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c +++ b/soh/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c @@ -247,7 +247,7 @@ void EnFdFire_Draw(Actor* thisx, GlobalContext* globalCtx) { f32 sp84; f32 sp80; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW); sp8E = Math_Vec3f_Yaw(&scale, &this->actor.velocity) - Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)); @@ -283,5 +283,5 @@ void EnFdFire_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c b/soh/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c index 6619a86d0..056f0abdd 100644 --- a/soh/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c +++ b/soh/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c @@ -700,7 +700,7 @@ void EnFhgFire_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnFhgFire* this = (EnFhgFire*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->actor.params == FHGFIRE_LIGHTNING_BURST) { func_80093D84(globalCtx->state.gfxCtx); @@ -753,5 +753,5 @@ void EnFhgFire_Draw(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf("FF DRAW 2\n"); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/soh/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index 463e6a09c..38dc72b50 100644 --- a/soh/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/soh/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -382,7 +382,7 @@ void EnFireRock_Draw(Actor* thisx, GlobalContext* globalCtx) { EnFireRock* this = (EnFireRock*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Translate(thisx->world.pos.x + this->relativePos.x, thisx->world.pos.y + this->relativePos.y, thisx->world.pos.z + this->relativePos.z, MTXMODE_NEW); Matrix_RotateX(DEG_TO_RAD(this->rockRotation.x), MTXMODE_APPLY); @@ -395,5 +395,5 @@ void EnFireRock_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, object_efc_star_field_DL_000DE0); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/soh/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index 00db25e6e..8ed8cb4fb 100644 --- a/soh/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/soh/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -804,7 +804,7 @@ void EnFirefly_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList void EnFirefly_Draw(Actor* thisx, GlobalContext* globalCtx) { EnFirefly* this = (EnFirefly*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); if (this->onFire) { @@ -815,13 +815,13 @@ void EnFirefly_Draw(Actor* thisx, GlobalContext* globalCtx) { POLY_OPA_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnFirefly_OverrideLimbDraw, EnFirefly_PostLimbDraw, &this->actor, POLY_OPA_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnFirefly_DrawInvisible(Actor* thisx, GlobalContext* globalCtx) { EnFirefly* this = (EnFirefly*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); if (this->onFire) { @@ -832,5 +832,5 @@ void EnFirefly_DrawInvisible(Actor* thisx, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnFirefly_OverrideLimbDraw, EnFirefly_PostLimbDraw, this, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/soh/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index e4d246ecc..508c1c5fb 100644 --- a/soh/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/soh/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -1109,7 +1109,7 @@ static Color_RGBA8 sMergeColor = { 0, 255, 0, 0 }; void EnFloormas_Draw(Actor* thisx, GlobalContext* globalCtx) { EnFloormas* this = (EnFloormas*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); if (this->collider.base.colType == COLTYPE_HARD) { @@ -1123,13 +1123,13 @@ void EnFloormas_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80026608(globalCtx); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnFloormas_DrawHighlighted(Actor* thisx, GlobalContext* globalCtx) { EnFloormas* this = (EnFloormas*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); if (this->collider.base.colType == COLTYPE_HARD) { @@ -1142,5 +1142,5 @@ void EnFloormas_DrawHighlighted(Actor* thisx, GlobalContext* globalCtx) { func_80026A6C(globalCtx); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c index e47034f7c..1f0588b8f 100644 --- a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -1037,14 +1037,14 @@ void EnFr_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec EnFr* this = (EnFr*)thisx; if ((limbIndex == 7) || (limbIndex == 8)) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, *dList); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -1057,7 +1057,7 @@ void EnFr_Draw(Actor* thisx, GlobalContext* globalCtx) { EnFr* this = (EnFr*)thisx; s16 frogIndex = this->actor.params - 1; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); // For the frogs 2 HP, the frog with the next note and the butterfly lights up lightRadius = this->isButterflyDrawn ? 95 : -1; @@ -1077,7 +1077,7 @@ void EnFr_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawOpa(globalCtx, this->skelAnimeButterfly.skeleton, this->skelAnimeButterfly.jointTable, NULL, NULL, NULL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnFr_Reset(void) { diff --git a/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c index d38cfa144..a3ca2bb04 100644 --- a/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -298,7 +298,7 @@ void EnFu_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnFu* this = (EnFu*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_800943C8(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesSegments[this->facialExpression])); @@ -306,5 +306,5 @@ void EnFu_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelanime.skeleton, this->skelanime.jointTable, this->skelanime.dListCount, EnFu_OverrideLimbDraw, EnFu_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/soh/src/overlays/actors/ovl_En_Fw/z_en_fw.c index 550614bca..b8cd304b3 100644 --- a/soh/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/soh/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -458,7 +458,7 @@ void EnFw_DrawDust(EnFw* this, GlobalContext* globalCtx) { s16 i; s16 idx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); firstDone = false; func_80093D84(globalCtx->state.gfxCtx); @@ -487,5 +487,5 @@ void EnFw_DrawDust(EnFw* this, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c index 2c25262e5..9e26f1b8f 100644 --- a/soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -717,7 +717,7 @@ void EnFz_Draw(Actor* thisx, GlobalContext* globalCtx) { index = (6 - this->actor.colChkInfo.health) >> 1; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (1) {} @@ -740,7 +740,7 @@ void EnFz_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, displayLists[index]); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); EnFz_DrawIceSmoke(this, globalCtx); } @@ -861,7 +861,7 @@ void EnFz_DrawIceSmoke(EnFz* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; u8 texLoaded = false; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -889,5 +889,5 @@ void EnFz_DrawIceSmoke(EnFz* this, GlobalContext* globalCtx) { iceSmoke++; } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/soh/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index 9ffdea8f8..d91b00f6d 100644 --- a/soh/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/soh/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -455,12 +455,12 @@ void EnGSwitch_DrawPot(Actor* thisx, GlobalContext* globalCtx) { EnGSwitch* this = (EnGSwitch*)thisx; if (!this->broken) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, object_tsubo_DL_0017C0); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -474,14 +474,14 @@ void EnGSwitch_DrawRupee(Actor* thisx, GlobalContext* globalCtx) { if (1) {} if (!this->broken) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sRupeeTextures[this->colorIdx])); gSPDisplayList(POLY_OPA_DISP++, gRupeeDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } if (this->type == ENGSWITCH_TARGET_RUPEE) { EnGSwitch_DrawEffects(this, globalCtx); @@ -551,7 +551,7 @@ void EnGSwitch_DrawEffects(EnGSwitch* this, GlobalContext* globalCtx) { f32 scale; s32 pad; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D18(globalCtx->state.gfxCtx); for (i = 0; i < this->numEffects; i++, effect++) { if (effect->flag) { @@ -567,5 +567,5 @@ void EnGSwitch_DrawEffects(EnGSwitch* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gRupeeDL); } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c b/soh/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c index 5a3fc383c..2ee8016ed 100644 --- a/soh/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c +++ b/soh/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c @@ -364,7 +364,7 @@ void EnGanonMant_Update(Actor* thisx, GlobalContext* globalCtx) { void EnGanonMant_DrawCloak(GlobalContext* globalCtx, EnGanonMant* this) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_NEW); @@ -385,7 +385,7 @@ void EnGanonMant_DrawCloak(GlobalContext* globalCtx, EnGanonMant* this) { // draw cloak gSPDisplayList(POLY_OPA_DISP++, gMantDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnGanonMant_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c b/soh/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c index b525d651f..002625021 100644 --- a/soh/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c +++ b/soh/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c @@ -93,7 +93,7 @@ Gfx* func_80A28148(GraphicsContext* gfxCtx, BossGanon* dorf) { void EnGanonOrgan_Draw(Actor* thisx, GlobalContext* globalCtx) { BossGanon* dorf = (BossGanon*)thisx->parent; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); osSyncPrintf("ORGAN DRAW 1\n"); func_80093D18(globalCtx->state.gfxCtx); @@ -113,5 +113,5 @@ void EnGanonOrgan_Draw(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf("ORGAN DRAW 2\n"); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c index 3c0a5b483..993398947 100644 --- a/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c +++ b/soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c @@ -423,7 +423,7 @@ void EnGb_Draw(Actor* thisx, GlobalContext* globalCtx) { EnGb* this = (EnGb*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -436,7 +436,7 @@ void EnGb_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, NULL, NULL, &this->dyna.actor); EnGb_DrawCagedSouls(this, globalCtx); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnGb_UpdateCagedSouls(EnGb* this, GlobalContext* globalCtx) { @@ -517,7 +517,7 @@ void EnGb_DrawCagedSouls(EnGb* this, GlobalContext* globalCtx) { s32 pad; s32 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -550,5 +550,5 @@ void EnGb_DrawCagedSouls(EnGb* this, GlobalContext* globalCtx) { Matrix_Pop(); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index fd51bdd47..b18ce4a2f 100644 --- a/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -789,26 +789,26 @@ s32 EnGe1_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, void EnGe1_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { EnGe1* this = (EnGe1*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (limbIndex == GE1_LIMB_HEAD) { gSPDisplayList(POLY_OPA_DISP++, sHairstyleDLists[this->hairstyle]); Matrix_MultVec3f(&D_80A327A8, &this->actor.focus.pos); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnGe1_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnGe1* this = (EnGe1*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_800943C8(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIndex])); SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnGe1_OverrideLimbDraw, EnGe1_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index 91e74777b..7f393b60e 100644 --- a/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -646,7 +646,7 @@ void EnGe2_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnGe2* this = (EnGe2*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_800943C8(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeIndex])); @@ -654,5 +654,5 @@ void EnGe2_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnGe2_OverrideLimbDraw, EnGe2_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index eca5ad6c8..a4b5df234 100644 --- a/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -241,7 +241,7 @@ s32 EnGe3_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, // This is a hack to fix the color-changing clothes this Gerudo has on N64 versions default: - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); switch (limbIndex) { case GELDB_LIMB_NECK: break; @@ -260,7 +260,7 @@ s32 EnGe3_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, gDPSetEnvColor(POLY_OPA_DISP++, 140, 0, 0, 255); break; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); break; } return false; @@ -284,7 +284,7 @@ void EnGe3_Draw(Actor* thisx, GlobalContext* globalCtx2) { EnGe3* this = (EnGe3*)thisx; GlobalContext* globalCtx = globalCtx2; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_800943C8(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeIndex])); @@ -292,5 +292,5 @@ void EnGe3_Draw(Actor* thisx, GlobalContext* globalCtx2) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnGe3_OverrideLimbDraw, EnGe3_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index 2b132202d..262eb9386 100644 --- a/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/soh/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -1430,7 +1430,7 @@ s32 EnGeldB_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis void* thisx) { EnGeldB* this = (EnGeldB*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (limbIndex == GELDB_LIMB_NECK) { rot->z += this->headRot.x; rot->x += this->headRot.y; @@ -1446,7 +1446,7 @@ s32 EnGeldB_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 140, 0, 0, 255); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); return false; } @@ -1551,7 +1551,7 @@ void EnGeldB_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnGeldB* this = (EnGeldB*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (1) {} if ((this->spinAttackState >= 2) && SkelAnime_Update(&this->skelAnime)) { @@ -1605,7 +1605,7 @@ void EnGeldB_Draw(Actor* thisx, GlobalContext* globalCtx) { } } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 EnGeldB_DodgeRanged(GlobalContext* globalCtx, EnGeldB* this) { diff --git a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c index 2f10f88f4..8010a112b 100644 --- a/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -320,7 +320,7 @@ void EnGm_Draw(Actor* thisx, GlobalContext* globalCtx) { EnGm* this = (EnGm*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTexIndex])); @@ -328,7 +328,7 @@ void EnGm_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, NULL, NULL, &this->actor); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); func_80A3E090(this); } diff --git a/soh/src/overlays/actors/ovl_En_Go/z_en_go.c b/soh/src/overlays/actors/ovl_En_Go/z_en_go.c index ec0c7cdc2..8b4ff20c0 100644 --- a/soh/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/soh/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -1044,7 +1044,7 @@ void EnGo_Update(Actor* thisx, GlobalContext* globalCtx) { void EnGo_DrawCurledUp(EnGo* this, GlobalContext* globalCtx) { Vec3f D_80A41BB4 = { 0.0f, 0.0f, 0.0f }; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); func_80093D18(globalCtx->state.gfxCtx); @@ -1057,13 +1057,13 @@ void EnGo_DrawCurledUp(EnGo* this, GlobalContext* globalCtx) { Matrix_MultVec3f(&D_80A41BB4, &this->actor.focus.pos); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnGo_DrawRolling(EnGo* this, GlobalContext* globalCtx) { Vec3f D_80A41BC0 = { 0.0f, 0.0f, 0.0f }; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); func_80093D18(globalCtx->state.gfxCtx); @@ -1075,7 +1075,7 @@ void EnGo_DrawRolling(EnGo* this, GlobalContext* globalCtx) { Matrix_MultVec3f(&D_80A41BC0, &this->actor.focus.pos); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 EnGo_OverrideLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { @@ -1123,7 +1123,7 @@ void EnGo_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec void EnGo_Draw(Actor* thisx, GlobalContext* globalCtx) { EnGo* this = (EnGo*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); EnGo_UpdateDust(this); Matrix_Push(); @@ -1145,7 +1145,7 @@ void EnGo_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnGo_OverrideLimbDraw, EnGo_PostLimbDraw, &this->actor); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); EnGo_DrawDust(this, globalCtx); } } @@ -1206,7 +1206,7 @@ void EnGo_DrawDust(EnGo* this, GlobalContext* globalCtx) { s16 index; s16 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); firstDone = false; func_80093D84(globalCtx->state.gfxCtx); if (1) {} @@ -1233,5 +1233,5 @@ void EnGo_DrawDust(EnGo* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gGoronDL_00FD50); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c index 49f76f792..843726986 100644 --- a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -223,7 +223,7 @@ void EnGo2_DrawDust(EnGo2* this, GlobalContext* globalCtx) { s16 index; s16 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); firstDone = false; func_80093D84(globalCtx->state.gfxCtx); @@ -252,7 +252,7 @@ void EnGo2_DrawDust(EnGo2* this, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 EnGo2_SpawnDust(EnGo2* this, u8 initialTimer, f32 scale, f32 scaleStep, s32 numDustEffects, f32 radius, @@ -1969,12 +1969,12 @@ void EnGo2_Update(Actor* thisx, GlobalContext* globalCtx) { s32 EnGo2_DrawCurledUp(EnGo2* this, GlobalContext* globalCtx) { Vec3f D_80A48554 = { 0.0f, 0.0f, 0.0f }; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gGoronDL_00BD80); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); Matrix_MultVec3f(&D_80A48554, &this->actor.focus.pos); return 1; @@ -1985,14 +1985,14 @@ s32 EnGo2_DrawRolling(EnGo2* this, GlobalContext* globalCtx) { Vec3f D_80A48560 = { 0.0f, 0.0f, 0.0f }; f32 speedXZ; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); speedXZ = this->actionFunc == EnGo2_ReverseRolling ? 0.0f : this->actor.speedXZ; Matrix_RotateZYX((globalCtx->state.frames * ((s16)speedXZ * 1400)), 0, this->actor.shape.rot.z, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gGoronDL_00C140); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); Matrix_MultVec3f(&D_80A48560, &this->actor.focus.pos); return 1; } @@ -2054,7 +2054,7 @@ void EnGo2_Draw(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc == EnGo2_ContinueRolling) { EnGo2_DrawRolling(this, globalCtx); } else { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTexIndex])); @@ -2062,6 +2062,6 @@ void EnGo2_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnGo2_OverrideLimbDraw, EnGo2_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/soh/src/overlays/actors/ovl_En_Goma/z_en_goma.c index 021d42ca2..929f7ef35 100644 --- a/soh/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/soh/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -750,7 +750,7 @@ void EnGoma_Update(Actor* thisx, GlobalContext* globalCtx) { s32 EnGoma_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { EnGoma* this = (EnGoma*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPSetEnvColor(POLY_OPA_DISP++, (s16)this->eyeEnvColor[0], (s16)this->eyeEnvColor[1], (s16)this->eyeEnvColor[2], 255); @@ -762,7 +762,7 @@ s32 EnGoma_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList (s16)(Rand_ZeroOne() * 255.0f), 255); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); return 0; } @@ -783,7 +783,7 @@ void EnGoma_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 y; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); switch (this->gomaType) { @@ -839,7 +839,7 @@ void EnGoma_Draw(Actor* thisx, GlobalContext* globalCtx) { } break; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnGoma_Debris(EnGoma* this, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/soh/src/overlays/actors/ovl_En_Gs/z_en_gs.c index edb4e559a..b44a35cfb 100644 --- a/soh/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/soh/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -566,7 +566,7 @@ void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx) { u32 frames; if (!(this->unk_19E & 8)) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); frames = globalCtx->gameplayFrames; func_80093D18(globalCtx->state.gfxCtx); @@ -611,6 +611,6 @@ void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/soh/src/overlays/actors/ovl_En_Guest/z_en_guest.c index a82f80f8a..6b16f06ab 100644 --- a/soh/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/soh/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -184,7 +184,7 @@ s32 EnGuest_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis EnGuest* this = (EnGuest*)thisx; Vec3s sp3C; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (limbIndex == 15) { *dList = object_boj_DL_0059B0; @@ -206,7 +206,7 @@ s32 EnGuest_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis rot->z += Math_CosS(this->unk_2EC[limbIndex]) * 200.0f; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); return false; } @@ -220,7 +220,7 @@ void EnGuest_Draw(Actor* thisx, GlobalContext* globalCtx) { EnGuest* this = (EnGuest*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -231,5 +231,5 @@ void EnGuest_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnGuest_OverrideLimbDraw, NULL, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index 66b0e5f32..06358bb71 100644 --- a/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/soh/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -826,13 +826,13 @@ void EnHeishi2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList } void EnHeishi2_DrawKingGuard(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gHeishiKingGuardDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnHeishi2_Draw(Actor* thisx, GlobalContext* globalCtx) { @@ -840,7 +840,7 @@ void EnHeishi2_Draw(Actor* thisx, GlobalContext* globalCtx) { Mtx* mtx; s32 linkObjBankIndex; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -861,5 +861,5 @@ void EnHeishi2_Draw(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/soh/src/overlays/actors/ovl_En_Holl/z_en_holl.c index 0e99ac9a2..b23af1e13 100644 --- a/soh/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/soh/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -329,7 +329,7 @@ void EnHoll_Draw(Actor* thisx, GlobalContext* globalCtx) { // Only draw the plane if not invisible if (this->planeAlpha != 0) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->planeAlpha == 255) { gfxP = POLY_OPA_DISP; @@ -354,6 +354,6 @@ void EnHoll_Draw(Actor* thisx, GlobalContext* globalCtx) { POLY_XLU_DISP = gfxP; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/soh/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index 95625f661..a8f6db85d 100644 --- a/soh/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/soh/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -495,7 +495,7 @@ void EnHonotrap_DrawEye(Actor* thisx, GlobalContext* globalCtx) { }; EnHonotrap* this = (EnHonotrap*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeState])); @@ -503,14 +503,14 @@ void EnHonotrap_DrawEye(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gEyeSwitch2DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnHonotrap_DrawFlame(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnHonotrap* this = (EnHonotrap*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); this->flameScroll -= 20; @@ -526,7 +526,7 @@ void EnHonotrap_DrawFlame(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnHonotrap_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c index 3f30a411b..4e9f6934c 100644 --- a/soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/soh/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -3807,7 +3807,7 @@ s32 EnHorse_OverrideLimbDraw(Actor* thisx, GlobalContext* globalCtx, s32 limbInd EnHorse* this = (EnHorse*)thisx; s32 drawOriginalLimb = true; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (limbIndex == 13 && this->type == HORSE_EPONA) { u8 index = eyeBlinkIndexes[this->blinkTimer]; @@ -3816,7 +3816,7 @@ s32 EnHorse_OverrideLimbDraw(Actor* thisx, GlobalContext* globalCtx, s32 limbInd Skin_DrawLimb(globalCtx->state.gfxCtx, &this->skin, limbIndex, gHorseIngoGerudoSaddleDL, 0); drawOriginalLimb = false; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); return drawOriginalLimb; } diff --git a/soh/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/soh/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index 54da97e8e..d538bac31 100644 --- a/soh/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/soh/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -604,7 +604,7 @@ void EnHorseLinkChild_PostDraw(Actor* thisx, GlobalContext* globalCtx, Skin* ski s32 EnHorseLinkChild_OverrideLimbDraw(Actor* thisx, GlobalContext* globalCtx, s32 arg2, Skin* skin) { EnHorseLinkChild* this = (EnHorseLinkChild*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (arg2 == 0xD) { u8 index = sEyeIndexOrder[this->eyeTexIndex]; @@ -612,7 +612,7 @@ s32 EnHorseLinkChild_OverrideLimbDraw(Actor* thisx, GlobalContext* globalCtx, s3 gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[index])); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); return 1; } diff --git a/soh/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/soh/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index 3da247105..46be86fe4 100644 --- a/soh/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/soh/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -637,7 +637,7 @@ void EnHorseNormal_Draw(Actor* thisx, GlobalContext* globalCtx) { EnHorseNormal* this = (EnHorseNormal*)thisx; Mtx* mtx2; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (globalCtx->sceneNum != SCENE_SPOT20 || globalCtx->sceneNum != SCENE_MALON_STABLE) { func_80A6C8E0(this, globalCtx); @@ -712,5 +712,5 @@ void EnHorseNormal_Draw(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c index 152df83da..0d3910553 100644 --- a/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -1103,7 +1103,7 @@ s32 EnHy_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (limbIndex == 15) { gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->objBankIndexHead].segment); @@ -1138,7 +1138,7 @@ s32 EnHy_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, rot->z += Math_CosS(this->unk_23C[limbIndex]) * 200.0f; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); return false; } @@ -1148,7 +1148,7 @@ void EnHy_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec s32 pad; Vec3f sp3C = { 400.0f, 0.0f, 0.0f }; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (limbIndex == 7) { gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->objBankIndexSkel2].segment); @@ -1163,7 +1163,7 @@ void EnHy_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec Matrix_MultVec3f(&sp3C, &this->actor.focus.pos); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } Gfx* EnHy_SetEnvColor(GraphicsContext* globalCtx, u8 envR, u8 envG, u8 envB, u8 envA) { @@ -1182,7 +1182,7 @@ void EnHy_Draw(Actor* thisx, GlobalContext* globalCtx) { Color_RGBA8 envColorSeg9; Color_RGBA8 envColorSeg10; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->actionFunc != EnHy_InitImpl) { func_80093D18(globalCtx->state.gfxCtx); @@ -1238,5 +1238,5 @@ void EnHy_Draw(Actor* thisx, GlobalContext* globalCtx) { this->skelAnime.dListCount, EnHy_OverrideLimbDraw, EnHy_PostLimbDraw, &this->actor); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index e5c7e30b4..3fc35f84f 100644 --- a/soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/soh/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -375,7 +375,7 @@ void EnIceHono_Draw(Actor* thisx, GlobalContext* globalCtx) { EnIceHono* this = (EnIceHono*)thisx; u32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, @@ -394,5 +394,5 @@ void EnIceHono_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 9d2affdd6..c9e4795e3 100644 --- a/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -853,7 +853,7 @@ void EnIk_PostLimbDraw3(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve Vec3f spE8; EnIk* this = (EnIk*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->unk_2FB & 1) { BodyBreak_SetInfo(&this->bodyBreak, limbIndex, 26, 27, 28, dList, BODYBREAK_OBJECT_DEFAULT); @@ -923,13 +923,13 @@ void EnIk_PostLimbDraw3(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve break; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80A76798(Actor* thisx, GlobalContext* globalCtx) { EnIk* this = (EnIk*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -954,7 +954,7 @@ void func_80A76798(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnIk_OverrideLimbDraw3, EnIk_PostLimbDraw3, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnIk_StartMusic(void) { @@ -1164,7 +1164,7 @@ s32 EnIk_OverrideLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, void EnIk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); switch (limbIndex) { case 13: { @@ -1205,7 +1205,7 @@ void EnIk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve } } break; } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80A77844(EnIk* this, GlobalContext* globalCtx) { @@ -1213,7 +1213,7 @@ void func_80A77844(EnIk* this, GlobalContext* globalCtx) { SkelAnime* skelAnime = &this->skelAnime; s32 pad[2]; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); func_80093D18(gfxCtx); @@ -1224,7 +1224,7 @@ void func_80A77844(EnIk* this, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, EnIk_OverrideLimbDraw2, EnIk_PostLimbDraw2, this); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80A779DC(EnIk* this, GlobalContext* globalCtx) { @@ -1326,7 +1326,7 @@ s32 EnIk_OverrideLimbDraw1(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, void EnIk_PostLimbDraw1(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); switch (limbIndex) { case 12: @@ -1356,7 +1356,7 @@ void EnIk_PostLimbDraw1(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve break; } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80A77ED0(EnIk* this, GlobalContext* globalCtx) { @@ -1367,7 +1367,7 @@ void func_80A77EDC(EnIk* this, GlobalContext* globalCtx) { SkelAnime* skelAnime = &this->skelAnime; s32 pad[2]; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); func_80093D18(gfxCtx); @@ -1378,7 +1378,7 @@ void func_80A77EDC(EnIk* this, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, EnIk_OverrideLimbDraw1, EnIk_PostLimbDraw1, this); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } static EnIkDrawFunc sDrawFuncs[] = { func_80A77ED0, func_80A77EDC, func_80A77844 }; diff --git a/soh/src/overlays/actors/ovl_En_In/z_en_in.c b/soh/src/overlays/actors/ovl_En_In/z_en_in.c index 92258e85c..e7d13846b 100644 --- a/soh/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/soh/src/overlays/actors/ovl_En_In/z_en_in.c @@ -973,7 +973,7 @@ void EnIn_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec EnIn* this = (EnIn*)thisx; Vec3f D_80A7B9A8 = { 1600.0, 0.0f, 0.0f }; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (limbIndex == INGO_HEAD_LIMB) { Matrix_MultVec3f(&D_80A7B9A8, &this->actor.focus.pos); @@ -986,7 +986,7 @@ void EnIn_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec gSPDisplayList(POLY_OPA_DISP++, gIngoChildEraPitchForkDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnIn_Draw(Actor* thisx, GlobalContext* globalCtx) { @@ -994,7 +994,7 @@ void EnIn_Draw(Actor* thisx, GlobalContext* globalCtx) { EnIn* this = (EnIn*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->actionFunc != func_80A79FB0) { func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeIndex])); @@ -1002,7 +1002,7 @@ void EnIn_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnIn_OverrideLimbDraw, EnIn_PostLimbDraw, &this->actor); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnIn_Reset(void) { diff --git a/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index aaf8355b7..2bdee1a6e 100644 --- a/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -482,7 +482,7 @@ void EnIshi_DrawSmall(EnIshi* this, GlobalContext* globalCtx) { } void EnIshi_DrawLarge(EnIshi* this, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -490,7 +490,7 @@ void EnIshi_DrawLarge(EnIshi* this, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255); gSPDisplayList(POLY_OPA_DISP++, gSilverRockDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } static EnIshiDrawFunc sDrawFuncs[] = { EnIshi_DrawSmall, EnIshi_DrawLarge }; diff --git a/soh/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/soh/src/overlays/actors/ovl_En_Jj/z_en_jj.c index a5c2bd271..101a10b4d 100644 --- a/soh/src/overlays/actors/ovl_En_Jj/z_en_jj.c +++ b/soh/src/overlays/actors/ovl_En_Jj/z_en_jj.c @@ -310,7 +310,7 @@ void EnJj_Draw(Actor* thisx, GlobalContext* globalCtx2) { GlobalContext* globalCtx = globalCtx2; EnJj* this = (EnJj*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_800943C8(globalCtx->state.gfxCtx); Matrix_Translate(0.0f, (cosf(this->skelAnime.curFrame * (M_PI / 41.0f)) * 10.0f) - 10.0f, 0.0f, MTXMODE_APPLY); @@ -319,5 +319,5 @@ void EnJj_Draw(Actor* thisx, GlobalContext* globalCtx2) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, NULL, NULL, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c index 814e1dba1..abfc22717 100644 --- a/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c +++ b/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c @@ -375,7 +375,7 @@ void EnJsjutan_Draw(Actor* thisx, GlobalContext* globalCtx2) { s16 i; Actor* parent = thisx->parent; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (thisx->params == ENJSJUTAN_TYPE_01) { thisx->world.pos.x = parent->world.pos.x; @@ -451,5 +451,5 @@ void EnJsjutan_Draw(Actor* thisx, GlobalContext* globalCtx2) { } gSPDisplayList(POLY_OPA_DISP++, sModelDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/soh/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index 285e1cc86..105090035 100644 --- a/soh/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/soh/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -790,7 +790,7 @@ void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx) { s16 i; u8* shadowTex = Graph_Alloc(globalCtx->state.gfxCtx, 0x400); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPDisplayList(POLY_OPA_DISP++, object_kanban_DL_000C30); @@ -892,5 +892,5 @@ void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, sShadowDL); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/soh/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index f4ac6f6ea..ad0dbd8f9 100644 --- a/soh/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/soh/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -443,7 +443,7 @@ void EnKarebaba_Update(Actor* thisx, GlobalContext* globalCtx) { void EnKarebaba_DrawBaseShadow(EnKarebaba* this, GlobalContext* globalCtx) { MtxF mf; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80094044(globalCtx->state.gfxCtx); @@ -455,7 +455,7 @@ void EnKarebaba_DrawBaseShadow(EnKarebaba* this, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gCircleShadowDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnKarebaba_Draw(Actor* thisx, GlobalContext* globalCtx) { @@ -467,7 +467,7 @@ void EnKarebaba_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 stemSections; f32 scale; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -534,7 +534,7 @@ void EnKarebaba_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80026608(globalCtx); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); if (this->boundFloor != NULL) { EnKarebaba_DrawBaseShadow(this, globalCtx); diff --git a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c index 56d4bb287..fcd6a6cd2 100644 --- a/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -1348,7 +1348,7 @@ void EnKo_Draw(Actor* thisx, GlobalContext* globalCtx) { this->actor.shape.shadowAlpha = this->modelAlpha; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if ((s16)this->modelAlpha == 255) { gSPSegment(POLY_OPA_DISP++, 0x08, EnKo_SetEnvColor(globalCtx->state.gfxCtx, tunicColor.r, tunicColor.g, tunicColor.b, 255)); @@ -1366,5 +1366,5 @@ void EnKo_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80034CC4(globalCtx, &this->skelAnime, EnKo_OverrideLimbDraw, EnKo_PostLimbDraw, &this->actor, this->modelAlpha); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c index 9b3ef1d5e..757d7c864 100644 --- a/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -496,12 +496,12 @@ void EnKz_Draw(Actor* thisx, GlobalContext* globalCtx) { }; EnKz* this = (EnKz*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeSegments[this->eyeIdx])); func_800943C8(globalCtx->state.gfxCtx); SkelAnime_DrawFlexOpa(globalCtx, this->skelanime.skeleton, this->skelanime.jointTable, this->skelanime.dListCount, EnKz_OverrideLimbDraw, EnKz_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Light/z_en_light.c b/soh/src/overlays/actors/ovl_En_Light/z_en_light.c index 9925cdf29..5d83c1122 100644 --- a/soh/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/soh/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -160,7 +160,7 @@ void EnLight_Draw(Actor* thisx, GlobalContext* globalCtx) { flameParams = &D_80A9E840[this->actor.params & 0xF]; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -196,5 +196,5 @@ void EnLight_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, dList); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/soh/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index c143bdc25..d945b3554 100644 --- a/soh/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/soh/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -323,7 +323,7 @@ void EnMThunder_Draw(Actor* thisx, GlobalContext* globalCtx2) { f32 phi_f14; s32 phi_t1; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); Matrix_Scale(0.02f, 0.02f, 0.02f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -393,5 +393,5 @@ void EnMThunder_Draw(Actor* thisx, GlobalContext* globalCtx2) { gSPDisplayList(POLY_XLU_DISP++, gSpinAttackChargingDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index ae266b534..fe81ea8e1 100644 --- a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -451,7 +451,7 @@ void EnMa1_Draw(Actor* thisx, GlobalContext* globalCtx) { f32 distFromCamera; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); camera = GET_ACTIVE_CAM(globalCtx); distFromCamera = Math_Vec3f_DistXZ(&this->actor.world.pos, &camera->eye); @@ -464,5 +464,5 @@ void EnMa1_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnMa1_OverrideLimbDraw, EnMa1_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/soh/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index 70555ef31..dcca4a915 100644 --- a/soh/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/soh/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -356,7 +356,7 @@ void EnMa2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve EnMa2* this = (EnMa2*)thisx; Vec3f vec = { 900.0f, 0.0f, 0.0f }; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (limbIndex == MALON_ADULT_HEAD_LIMB) { Matrix_MultVec3f(&vec, &this->actor.focus.pos); @@ -365,7 +365,7 @@ void EnMa2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve gSPDisplayList(POLY_OPA_DISP++, gMalonAdultBasketDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnMa2_Draw(Actor* thisx, GlobalContext* globalCtx) { @@ -377,7 +377,7 @@ void EnMa2_Draw(Actor* thisx, GlobalContext* globalCtx) { f32 someFloat; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); camera = GET_ACTIVE_CAM(globalCtx); someFloat = Math_Vec3f_DistXZ(&this->actor.world.pos, &camera->eye); @@ -390,5 +390,5 @@ void EnMa2_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnMa2_OverrideLimbDraw, EnMa2_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index 812af5202..52ae9407a 100644 --- a/soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/soh/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -336,7 +336,7 @@ void EnMa3_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve EnMa3* this = (EnMa3*)thisx; Vec3f vec = { 900.0f, 0.0f, 0.0f }; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (limbIndex == MALON_ADULT_LIMB_HEAD) { Matrix_MultVec3f(&vec, &this->actor.focus.pos); @@ -346,7 +346,7 @@ void EnMa3_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve gSPDisplayList(POLY_OPA_DISP++, gMalonAdultBasketDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnMa3_Draw(Actor* thisx, GlobalContext* globalCtx) { @@ -357,7 +357,7 @@ void EnMa3_Draw(Actor* thisx, GlobalContext* globalCtx) { f32 someFloat; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); camera = GET_ACTIVE_CAM(globalCtx); someFloat = Math_Vec3f_DistXZ(&this->actor.world.pos, &camera->eye); @@ -370,5 +370,5 @@ void EnMa3_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnMa3_OverrideLimbDraw, EnMa3_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c index 90035b301..58a70b673 100644 --- a/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/soh/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -987,7 +987,7 @@ void EnMag_Draw(Actor* thisx, GlobalContext* globalCtx) { Gfx* gfx; Gfx* gfxRef; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gfxRef = POLY_OPA_DISP; gfx = Graph_GfxPlusOne(gfxRef); @@ -999,5 +999,5 @@ void EnMag_Draw(Actor* thisx, GlobalContext* globalCtx) { Graph_BranchDlist(gfxRef, gfx); POLY_OPA_DISP = gfx; - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Md/z_en_md.c b/soh/src/overlays/actors/ovl_En_Md/z_en_md.c index e2fb07247..5cd9473fb 100644 --- a/soh/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/soh/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -859,7 +859,7 @@ void EnMd_Draw(Actor* thisx, GlobalContext* globalCtx) { }; EnMd* this = (EnMd*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->alpha == 255) { gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIdx])); @@ -869,5 +869,5 @@ void EnMd_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80034CC4(globalCtx, &this->skelAnime, EnMd_OverrideLimbDraw, EnMd_PostLimbDraw, &this->actor, this->alpha); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/soh/src/overlays/actors/ovl_En_Mm/z_en_mm.c index 99883ebf6..4d47cbb6c 100644 --- a/soh/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/soh/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -517,7 +517,7 @@ void EnMm_Draw(Actor* thisx, GlobalContext* globalCtx) { if (0) {} - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(mouthTextures[this->mouthTexIndex])); @@ -560,7 +560,7 @@ void EnMm_Draw(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 EnMm_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { diff --git a/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index 0c6929250..e4fe5018f 100644 --- a/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -311,12 +311,12 @@ void EnMm2_Draw(Actor* thisx, GlobalContext* globalCtx) { static void* mouthTextures[] = { gRunningManMouthOpenTex, gRunningManMouthClosedTex }; EnMm2* this = (EnMm2*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(mouthTextures[this->mouthTexIndex])); SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnMm2_OverrideLimbDraw, EnMm2_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 EnMm2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { diff --git a/soh/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/soh/src/overlays/actors/ovl_En_Mu/z_en_mu.c index 99f8241e1..c72369e9f 100644 --- a/soh/src/overlays/actors/ovl_En_Mu/z_en_mu.c +++ b/soh/src/overlays/actors/ovl_En_Mu/z_en_mu.c @@ -208,7 +208,7 @@ void EnMu_Draw(Actor* thisx, GlobalContext* globalCtx) { u8 segmentId[] = { 0x08, 0x09, 0x0A, 0x0B, 0x0C }; s32 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Translate(-1200.0f, 0.0f, -1400.0f, MTXMODE_APPLY); for (i = 0; i < 5; i++) { gSPSegment(POLY_OPA_DISP++, segmentId[i], @@ -218,5 +218,5 @@ void EnMu_Draw(Actor* thisx, GlobalContext* globalCtx) { } SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnMu_OverrideLimbDraw, EnMu_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c index 19d77e777..905d01c8e 100644 --- a/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -547,7 +547,7 @@ void EnNb_DrawTransparency(EnNb* this, GlobalContext* globalCtx) { void* eyeTex = sEyeTextures[eyeSegIdx]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTex)); @@ -557,7 +557,7 @@ void EnNb_DrawTransparency(EnNb* this, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, NULL, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnNb_InitKidnap(EnNb* this, GlobalContext* globalCtx) { @@ -955,7 +955,7 @@ void func_80AB2E70(EnNb* this, GlobalContext* globalCtx) { s32 pad; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gNabooruEyeWideTex)); @@ -965,7 +965,7 @@ void func_80AB2E70(EnNb* this, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, &this->actor); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 func_80AB2FC0(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { @@ -985,7 +985,7 @@ void func_80AB2FE4(EnNb* this, GlobalContext* globalCtx) { void* eyeTexture = sEyeTextures[eyeIdx]; s32 pad1; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); @@ -995,7 +995,7 @@ void func_80AB2FE4(EnNb* this, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, func_80AB2FC0, NULL, &this->actor); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnNb_SetupCreditsSpawn(EnNb* this, GlobalContext* globalCtx) { @@ -1500,7 +1500,7 @@ void EnNb_DrawDefault(EnNb* this, GlobalContext* globalCtx) { void* eyeTexture = sEyeTextures[eyeIdx]; s32 pad1; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); @@ -1510,7 +1510,7 @@ void EnNb_DrawDefault(EnNb* this, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, EnNb_OverrideLimbDraw, EnNb_PostLimbDraw, &this->actor); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } static EnNbDrawFunc sDrawFuncs[] = { diff --git a/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 48e91f143..106c41edb 100644 --- a/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -1204,7 +1204,7 @@ void EnNiw_FeatherDraw(EnNiw* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; EnNiwFeather* feather = &this->feathers[0]; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -1225,7 +1225,7 @@ void EnNiw_FeatherDraw(EnNiw* this, GlobalContext* globalCtx) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EnNiw_Reset(void) { diff --git a/soh/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/soh/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index ba11cbbf4..501ba8e63 100644 --- a/soh/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/soh/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -251,7 +251,7 @@ void EnNiwGirl_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; Vec3f sp4C = sConstVec3f; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeIndex])); @@ -259,5 +259,5 @@ void EnNiwGirl_Draw(Actor* thisx, GlobalContext* globalCtx) { EnNiwGirlOverrideLimbDraw, NULL, this); func_80033C30(&this->actor.world.pos, &sp4C, 255, globalCtx); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index 4ab12a833..b633b047b 100644 --- a/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/soh/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -572,7 +572,7 @@ void EnNiwLady_Draw(Actor* thisx, GlobalContext* globalCtx) { EnNiwLady* this = (EnNiwLady*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->unk_27E != 0) { func_80093D18(globalCtx->state.gfxCtx); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); @@ -581,5 +581,5 @@ void EnNiwLady_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnNiwLady_OverrideLimbDraw, NULL, this); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/soh/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index d5b3a27cc..3023486f4 100644 --- a/soh/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/soh/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -170,7 +170,7 @@ void EnNutsball_Update(Actor* thisx, GlobalContext* globalCtx) { void EnNutsball_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (CVar_GetS32("gNewDrops", 0) != 0) { func_80093D18(globalCtx->state.gfxCtx); @@ -193,5 +193,5 @@ void EnNutsball_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, sDLists[thisx->params]); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/soh/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index 15739ff9d..24020c0cc 100644 --- a/soh/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/soh/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -154,7 +154,7 @@ void EnNwc_DrawChicks(EnNwc* this, GlobalContext* globalCtx) { MtxF floorMat; EnNwcChick* chick; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093C80(globalCtx); dList1 = POLY_XLU_DISP; @@ -199,7 +199,7 @@ void EnNwc_DrawChicks(EnNwc* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gCuccoChickShadowDL); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnNwc_Init(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/soh/src/overlays/actors/ovl_En_Ny/z_en_ny.c index 5274867b3..2fb06e097 100644 --- a/soh/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/soh/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -524,7 +524,7 @@ void EnNy_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnNy* this = (EnNy*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Collider_UpdateSpheres(0, &this->collider); func_8002ED80(&this->actor, globalCtx, 1); func_80093D84(globalCtx->state.gfxCtx); @@ -546,7 +546,7 @@ void EnNy_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gEnNySpikeDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); if (this->unk_1CA != 0) { Vec3f tempVec; Vec3f* fireOffset; @@ -570,7 +570,7 @@ void EnNy_DrawDeathEffect(Actor* thisx, GlobalContext* globalCtx) { f32 scale; s32 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gDPSetEnvColor(POLY_OPA_DISP++, 0x00, 0x00, 0x00, 0xFF); gDPSetRenderMode(POLY_OPA_DISP++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2); @@ -586,7 +586,7 @@ void EnNy_DrawDeathEffect(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gEnNyRockBodyDL); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); if (this->unk_1CA != 0) { Vec3f tempVec; Vec3f* fireOffset; diff --git a/soh/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/soh/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index 325c50592..d8c5626c7 100644 --- a/soh/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/soh/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -755,7 +755,7 @@ void EnOkuta_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnOkuta_OverrideLimbDraw, NULL, this); } else { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (CVar_GetS32("gNewDrops", 0) != 0) { func_80093D18(globalCtx->state.gfxCtx); @@ -776,6 +776,6 @@ void EnOkuta_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gOctorokProjectileDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 1b8130658..57d5a221a 100644 --- a/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/soh/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -2266,7 +2266,7 @@ void EnOssan_DrawCursor(GlobalContext* globalCtx, EnOssan* this, f32 x, f32 y, f f32 w; s32 dsdx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (drawCursor != 0) { func_80094520(globalCtx->state.gfxCtx); gDPSetPrimColor(OVERLAY_DISP++, 0, 0, this->cursorColorR, this->cursorColorG, this->cursorColorB, @@ -2281,7 +2281,7 @@ void EnOssan_DrawCursor(GlobalContext* globalCtx, EnOssan* this, f32 x, f32 y, f dsdx = (1.0f / z) * 1024.0f; gSPTextureRectangle(OVERLAY_DISP++, ulx, uly, lrx, lry, G_TX_RENDERTILE, 0, 0, dsdx, dsdx); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnOssan_DrawTextRec(GlobalContext* globalCtx, s32 r, s32 g, s32 b, s32 a, f32 x, f32 y, f32 z, s32 s, s32 t, @@ -2291,7 +2291,7 @@ void EnOssan_DrawTextRec(GlobalContext* globalCtx, s32 r, s32 g, s32 b, s32 a, f f32 w, h; s32 dsdx, dtdy; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPPipeSync(OVERLAY_DISP++); gDPSetPrimColor(OVERLAY_DISP++, 0, 0, r, g, b, a); @@ -2306,14 +2306,14 @@ void EnOssan_DrawTextRec(GlobalContext* globalCtx, s32 r, s32 g, s32 b, s32 a, f lrx = (x + w) * 4.0f; lry = (y + h) * 4.0f; gSPTextureRectangle(OVERLAY_DISP++, ulx, uly, lrx, lry, G_TX_RENDERTILE, s, t, dsdx, dtdy); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnOssan_DrawStickDirectionPrompts(GlobalContext* globalCtx, EnOssan* this) { s32 drawStickLeftPrompt = this->stickLeftPrompt.isEnabled; s32 drawStickRightPrompt = this->stickRightPrompt.isEnabled; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (drawStickLeftPrompt || drawStickRightPrompt) { func_80094520(globalCtx->state.gfxCtx); gDPSetCombineMode(OVERLAY_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); @@ -2348,7 +2348,7 @@ void EnOssan_DrawStickDirectionPrompts(GlobalContext* globalCtx, EnOssan* this) this->stickRightPrompt.z, 0, 0, 1.0f, 1.0f); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnOssan_DrawBazaarShopkeeper(Actor* thisx, GlobalContext* globalCtx) { @@ -2356,7 +2356,7 @@ void EnOssan_DrawBazaarShopkeeper(Actor* thisx, GlobalContext* globalCtx) { EnOssan* this = (EnOssan*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sBazaarShopkeeperEyeTextures[this->eyeTextureIdx])); @@ -2365,7 +2365,7 @@ void EnOssan_DrawBazaarShopkeeper(Actor* thisx, GlobalContext* globalCtx) { EnOssan_DrawCursor(globalCtx, this, this->cursorX, this->cursorY, this->cursorZ, this->drawCursor); EnOssan_DrawStickDirectionPrompts(globalCtx, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 EnOssan_OverrideLimbDrawKokiriShopkeeper(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, @@ -2378,7 +2378,7 @@ s32 EnOssan_OverrideLimbDrawKokiriShopkeeper(GlobalContext* globalCtx, s32 limbI EnOssan* this = (EnOssan*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (limbIndex == 15) { gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->objBankIndex2].segment); @@ -2387,7 +2387,7 @@ s32 EnOssan_OverrideLimbDrawKokiriShopkeeper(GlobalContext* globalCtx, s32 limbI gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(sKokiriShopkeeperEyeTextures[this->eyeTextureIdx])); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); return 0; } @@ -2411,7 +2411,7 @@ void EnOssan_DrawKokiriShopkeeper(Actor* thisx, GlobalContext* globalCtx) { EnOssan* this = (EnOssan*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); @@ -2424,7 +2424,7 @@ void EnOssan_DrawKokiriShopkeeper(Actor* thisx, GlobalContext* globalCtx) { EnOssan_DrawCursor(globalCtx, this, this->cursorX, this->cursorY, this->cursorZ, this->drawCursor); EnOssan_DrawStickDirectionPrompts(globalCtx, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnOssan_DrawGoronShopkeeper(Actor* thisx, GlobalContext* globalCtx) { @@ -2432,7 +2432,7 @@ void EnOssan_DrawGoronShopkeeper(Actor* thisx, GlobalContext* globalCtx) { EnOssan* this = (EnOssan*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGoronShopkeeperEyeTextures[this->eyeTextureIdx])); @@ -2442,7 +2442,7 @@ void EnOssan_DrawGoronShopkeeper(Actor* thisx, GlobalContext* globalCtx) { EnOssan_DrawCursor(globalCtx, this, this->cursorX, this->cursorY, this->cursorZ, this->drawCursor); EnOssan_DrawStickDirectionPrompts(globalCtx, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 EnOssan_OverrideLimbDrawZoraShopkeeper(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, @@ -2460,7 +2460,7 @@ void EnOssan_DrawZoraShopkeeper(Actor* thisx, GlobalContext* globalCtx) { EnOssan* this = (EnOssan*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); @@ -2472,7 +2472,7 @@ void EnOssan_DrawZoraShopkeeper(Actor* thisx, GlobalContext* globalCtx) { EnOssan_DrawCursor(globalCtx, this, this->cursorX, this->cursorY, this->cursorZ, this->drawCursor); EnOssan_DrawStickDirectionPrompts(globalCtx, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnOssan_DrawPotionShopkeeper(Actor* thisx, GlobalContext* globalCtx) { @@ -2481,7 +2481,7 @@ void EnOssan_DrawPotionShopkeeper(Actor* thisx, GlobalContext* globalCtx) { EnOssan* this = (EnOssan*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sPotionShopkeeperEyeTextures[this->eyeTextureIdx])); @@ -2490,7 +2490,7 @@ void EnOssan_DrawPotionShopkeeper(Actor* thisx, GlobalContext* globalCtx) { EnOssan_DrawCursor(globalCtx, this, this->cursorX, this->cursorY, this->cursorZ, this->drawCursor); EnOssan_DrawStickDirectionPrompts(globalCtx, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnOssan_DrawHappyMaskShopkeeper(Actor* thisx, GlobalContext* globalCtx) { @@ -2498,7 +2498,7 @@ void EnOssan_DrawHappyMaskShopkeeper(Actor* thisx, GlobalContext* globalCtx) { EnOssan* this = (EnOssan*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -2509,7 +2509,7 @@ void EnOssan_DrawHappyMaskShopkeeper(Actor* thisx, GlobalContext* globalCtx) { EnOssan_DrawCursor(globalCtx, this, this->cursorX, this->cursorY, this->cursorZ, this->drawCursor); EnOssan_DrawStickDirectionPrompts(globalCtx, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnOssan_DrawBombchuShopkeeper(Actor* thisx, GlobalContext* globalCtx) { @@ -2518,7 +2518,7 @@ void EnOssan_DrawBombchuShopkeeper(Actor* thisx, GlobalContext* globalCtx) { EnOssan* this = (EnOssan*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -2528,5 +2528,5 @@ void EnOssan_DrawBombchuShopkeeper(Actor* thisx, GlobalContext* globalCtx) { EnOssan_DrawCursor(globalCtx, this, this->cursorX, this->cursorY, this->cursorZ, this->drawCursor); EnOssan_DrawStickDirectionPrompts(globalCtx, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c index d03f376e8..78e21bfa0 100644 --- a/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -1333,14 +1333,14 @@ void EnOwl_Draw(Actor* thisx, GlobalContext* globalCtx) { EnOwl* this = (EnOwl*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_800943C8(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 8, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTexIndex])); SkelAnime_DrawFlexOpa(globalCtx, this->curSkelAnime->skeleton, this->curSkelAnime->jointTable, this->curSkelAnime->dListCount, EnOwl_OverrideLimbDraw, EnOwl_PostLimbUpdate, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnOwl_ChangeMode(EnOwl* this, EnOwlActionFunc actionFunc, OwlFunc arg2, SkelAnime* skelAnime, diff --git a/soh/src/overlays/actors/ovl_En_Part/z_en_part.c b/soh/src/overlays/actors/ovl_En_Part/z_en_part.c index b7c35bcd6..49ff5805b 100644 --- a/soh/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/soh/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -276,7 +276,7 @@ Gfx* func_80ACEAC0(GraphicsContext* gfxCtx, u8 primR, u8 primG, u8 primB, u8 env void EnPart_Draw(Actor* thisx, GlobalContext* globalCtx) { EnPart* this = (EnPart*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (thisx->params > 0) { Matrix_RotateZ(this->rotZ, MTXMODE_APPLY); @@ -313,5 +313,5 @@ void EnPart_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, this->displayList); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/soh/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index b3873ce94..3b2953445 100644 --- a/soh/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/soh/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -1012,7 +1012,7 @@ s32 EnPeehat_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi } if (limbIndex == 3 || (limbIndex == 23 && (this->state == PEAHAT_STATE_DYING || this->state == PEAHAT_STATE_3 || this->state == PEAHAT_STATE_4))) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); Matrix_RotateX(this->jiggleRot * 0.115f, MTXMODE_APPLY); @@ -1026,7 +1026,7 @@ s32 EnPeehat_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, *dList); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); return true; } return false; @@ -1046,7 +1046,7 @@ void EnPeehat_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, // is Adult Peahat if (limbIndex == 3 && this->actor.params <= 0) { damageYRot = 0.0f; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); Matrix_Translate(-1000.0f, 0.0f, 0.0f, MTXMODE_APPLY); Collider_UpdateSpheres(0, &this->colJntSph); @@ -1060,7 +1060,7 @@ void EnPeehat_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, *dList); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/soh/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c index 0747ac9a8..bfe5d80a0 100644 --- a/soh/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c +++ b/soh/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c @@ -254,7 +254,7 @@ void EnPoDesert_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis void EnPoDesert_Draw(Actor* thisx, GlobalContext* globalCtx) { EnPoDesert* this = (EnPoDesert*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x0A, Gfx_EnvColor(globalCtx->state.gfxCtx, 255, 85, 0, 255)); gSPSegment(POLY_XLU_DISP++, 0x08, @@ -267,5 +267,5 @@ void EnPoDesert_Draw(Actor* thisx, GlobalContext* globalCtx) { } POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnPoDesert_OverrideLimbDraw, EnPoDesert_PostLimbDraw, &this->actor, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/soh/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index 158e2c52f..02e0afdcf 100644 --- a/soh/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/soh/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -783,7 +783,7 @@ void EnPoField_DrawFlame(EnPoField* this, GlobalContext* globalCtx) { s32 pad; if (this->flameTimer != 0) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, @@ -803,7 +803,7 @@ void EnPoField_DrawFlame(EnPoField* this, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -929,7 +929,7 @@ void EnPoField_Draw(Actor* thisx, GlobalContext* globalCtx) { EnPoFieldInfo* info = &sPoFieldInfo[this->actor.params]; if (this->actionFunc != EnPoField_WaitForSpawn) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x0A, @@ -958,7 +958,7 @@ void EnPoField_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gPoeFieldLanternDL); gSPDisplayList(POLY_OPA_DISP++, gPoeFieldLanternTopDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } EnPoField_DrawFlame(this, globalCtx); } @@ -978,7 +978,7 @@ void EnPoField_DrawSoul(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnPoFieldInfo* info = &sPoFieldInfo[this->actor.params]; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->actionFunc == EnPoField_SoulIdle) { func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x0A, @@ -1004,7 +1004,7 @@ void EnPoField_DrawSoul(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gPoeFieldSoulDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); EnPoField_DrawFlame(this, globalCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/soh/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index 889bece58..c0bb0cac8 100644 --- a/soh/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/soh/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -381,7 +381,7 @@ void EnPoRelay_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList f32 rand; Vec3f vec; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); rand = Rand_ZeroOne(); this->lightColor.r = (s16)(rand * 30.0f) + 225; this->lightColor.g = (s16)(rand * 100.0f) + 155; @@ -390,26 +390,26 @@ void EnPoRelay_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList gDPSetEnvColor(POLY_OPA_DISP++, this->lightColor.r, this->lightColor.g, this->lightColor.b, 128); gSPDisplayList(POLY_OPA_DISP++, gDampeLanternDL); if (1) {} - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); Matrix_MultVec3f(&D_80AD8D48, &vec); Lights_PointNoGlowSetInfo(&this->lightInfo, vec.x, vec.y, vec.z, this->lightColor.r, this->lightColor.g, this->lightColor.b, 200); } else if (limbIndex == 8) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gDampeHaloDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } void EnPoRelay_Draw(Actor* thisx, GlobalContext* globalCtx) { EnPoRelay* this = (EnPoRelay*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyesTextures[this->eyeTextureIdx])); SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, NULL, EnPoRelay_PostLimbDraw, &this->actor); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index 68ee86728..bb11b06e4 100644 --- a/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/soh/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -1349,7 +1349,7 @@ void EnPoSisters_Draw(Actor* thisx, GlobalContext* globalCtx) { Color_RGBA8* temp_s7 = &D_80ADD6F0[this->unk_194]; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80ADC55C(this); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -1416,7 +1416,7 @@ void EnPoSisters_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnPoSisters_Reset(void) { diff --git a/soh/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/soh/src/overlays/actors/ovl_En_Poh/z_en_poh.c index 97853f826..6209797b9 100644 --- a/soh/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/soh/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -1074,7 +1074,7 @@ void EnPoh_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve void EnPoh_DrawRegular(Actor* thisx, GlobalContext* globalCtx) { EnPoh* this = (EnPoh*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80AE067C(this); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -1095,7 +1095,7 @@ void EnPoh_DrawRegular(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, this->info->lanternDisplayList); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnPoh_DrawComposer(Actor* thisx, GlobalContext* globalCtx) { @@ -1103,7 +1103,7 @@ void EnPoh_DrawComposer(Actor* thisx, GlobalContext* globalCtx) { Color_RGBA8* sp90; Color_RGBA8* phi_t0; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80AE067C(this); if (this->actor.params == EN_POH_SHARP) { sp90 = &D_80AE1B4C; @@ -1150,7 +1150,7 @@ void EnPoh_DrawComposer(Actor* thisx, GlobalContext* globalCtx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, sp90->r, sp90->g, sp90->b, 255); gSPDisplayList(POLY_OPA_DISP++, gPoeComposerLanternTopDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnPoh_UpdateDead(Actor* thisx, GlobalContext* globalCtx) { @@ -1166,7 +1166,7 @@ void EnPoh_UpdateDead(Actor* thisx, GlobalContext* globalCtx) { void EnPoh_DrawSoul(Actor* thisx, GlobalContext* globalCtx) { EnPoh* this = (EnPoh*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->actionFunc == EnPoh_Death) { func_80093D18(globalCtx->state.gfxCtx); @@ -1198,5 +1198,5 @@ void EnPoh_DrawSoul(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, this->info->soulDisplayList); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 4629eda60..5a1beea42 100644 --- a/soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -894,7 +894,7 @@ void EnRd_Draw(Actor* thisx, GlobalContext* globalCtx) { EnRd* this = (EnRd*)thisx; Vec3f thisPos = thisx->world.pos; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->unk_314 == 0xFF) { func_80093D18(globalCtx->state.gfxCtx); @@ -923,5 +923,5 @@ void EnRd_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80033C30(&thisPos, &D_80AE4958, this->unk_314, globalCtx); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/soh/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index 52451082a..7818d9e04 100644 --- a/soh/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/soh/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -652,7 +652,7 @@ void EnReeba_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnReeba* this = (EnReeba*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -664,7 +664,7 @@ void EnReeba_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawOpa(globalCtx, this->skelanime.skeleton, this->skelanime.jointTable, NULL, NULL, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); if (BREG(0)) { Vec3f debugPos; diff --git a/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c index aa35a2bb8..1d4fdceb8 100644 --- a/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -301,7 +301,7 @@ void func_80AE7D94(EnRl* this, GlobalContext* globalCtx) { void* tex = D_80AE81A0[temp]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -313,7 +313,7 @@ void func_80AE7D94(EnRl* this, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, NULL, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } static EnRlActionFunc sActionFuncs[] = { @@ -350,7 +350,7 @@ void func_80AE7FDC(EnRl* this, GlobalContext* globalCtx) { void* tex = D_80AE81A0[temp]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -361,7 +361,7 @@ void func_80AE7FDC(EnRl* this, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, &this->actor); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } static EnRlDrawFunc sDrawFuncs[] = { diff --git a/soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c index d825630e3..eedf7bf4b 100644 --- a/soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -845,7 +845,7 @@ void EnRr_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 i; Mtx* segMtx = Graph_Alloc(globalCtx->state.gfxCtx, 4 * sizeof(Mtx)); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (1) {} func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x0C, segMtx); @@ -881,7 +881,7 @@ void EnRr_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_MultVec3f(&zeroVec, &this->mouthPos); gSPDisplayList(POLY_XLU_DISP++, gLikeLikeDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); if (this->effectTimer != 0) { Vec3f effectPos; s16 effectTimer = this->effectTimer - 1; diff --git a/soh/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/soh/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 3b608df20..4b55990da 100644 --- a/soh/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/soh/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -2316,7 +2316,7 @@ void EnRu1_DrawOpa(EnRu1* this, GlobalContext* globalCtx) { void* mouthTex = sMouthTextures[mouthIndex]; s32 pad1; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -2329,7 +2329,7 @@ void EnRu1_DrawOpa(EnRu1* this, GlobalContext* globalCtx) { POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, EnRu1_OverrideLimbDraw, EnRu1_PostLimbDraw, this, POLY_OPA_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnRu1_DrawXlu(EnRu1* this, GlobalContext* globalCtx) { @@ -2341,7 +2341,7 @@ void EnRu1_DrawXlu(EnRu1* this, GlobalContext* globalCtx) { void* mouthTex = sMouthTextures[mouthIndex]; s32 pad1; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -2354,7 +2354,7 @@ void EnRu1_DrawXlu(EnRu1* this, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, EnRu1_OverrideLimbDraw, NULL, this, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnRu1_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index 938792654..d822a9448 100644 --- a/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -472,7 +472,7 @@ void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { void* tex = sEyeTextures[temp]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -484,7 +484,7 @@ void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, NULL, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80AF3394(EnRu2* this, GlobalContext* globalCtx) { @@ -800,7 +800,7 @@ void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) { void* tex = sEyeTextures[temp]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -812,7 +812,7 @@ void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnRu2_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c index d044248d9..fbf5f011e 100644 --- a/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/soh/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -803,7 +803,7 @@ void EnSa_Draw(Actor* thisx, GlobalContext* globalCtx) { }; EnSa* this = (EnSa*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->alpha == 255) { gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->rightEyeIndex])); @@ -817,5 +817,5 @@ void EnSa_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80034CC4(globalCtx, &this->skelAnime, EnSa_OverrideLimbDraw, EnSa_PostLimbDraw, &this->actor, this->alpha); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c b/soh/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c index 09d44ca1c..c559dd598 100644 --- a/soh/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c +++ b/soh/src/overlays/actors/ovl_En_Scene_Change/z_en_scene_change.c @@ -58,12 +58,12 @@ void EnSceneChange_Draw(Actor* thisx, GlobalContext* globalCtx) { displayList = Graph_Alloc(globalCtx->state.gfxCtx, 0x3C0); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); displayListHead = displayList; gSPSegment(POLY_OPA_DISP++, 0x0C, displayListHead); func_80093D18(globalCtx->state.gfxCtx); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/soh/src/overlays/actors/ovl_En_Sda/z_en_sda.c index 1b662dddb..6e359bc80 100644 --- a/soh/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/soh/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -340,7 +340,7 @@ void func_80AF9C70(u8* shadowTexture, Player* player, GlobalContext* globalCtx) s16 phi_s1; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); osSyncPrintf("SDA D 1\n"); func_80094044(globalCtx->state.gfxCtx); @@ -368,5 +368,5 @@ void func_80AF9C70(u8* shadowTexture, Player* player, GlobalContext* globalCtx) gSPDisplayList(POLY_XLU_DISP++, D_80AFA3F8); } osSyncPrintf("SDA D 2\n"); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c b/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c index c69da48ac..2508d695b 100644 --- a/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c +++ b/soh/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c @@ -275,7 +275,7 @@ void EnShopnuts_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis f32 z; if ((limbIndex == 9) && (this->actionFunc == EnShopnuts_ThrowNut)) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); curFrame = this->skelAnime.curFrame; if (curFrame <= 6.0f) { y = 1.0f - (curFrame * 0.0833f); @@ -296,7 +296,7 @@ void EnShopnuts_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gBusinessScrubNoseDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/soh/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c index 229f3f933..b9c317fd0 100644 --- a/soh/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c +++ b/soh/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c @@ -282,7 +282,7 @@ void EnSiofuki_Draw(Actor* thisx, GlobalContext* globalCtx) { u32 y; u32 gameplayFrames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); Matrix_Translate(0.0f, this->unk_170, 0.0f, MTXMODE_APPLY); Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); @@ -292,7 +292,7 @@ void EnSiofuki_Draw(Actor* thisx, GlobalContext* globalCtx) { y = gameplayFrames * -15; gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, x, y, 64, 64, 1, x, y, 64, 64)); gSPDisplayList(POLY_XLU_DISP++, object_siofuki_DL_000B70); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); if (this->sfxFlags & 1) { f32 heightRatio; diff --git a/soh/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/soh/src/overlays/actors/ovl_En_Skb/z_en_skb.c index 70936b64e..4a7236508 100644 --- a/soh/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/soh/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -522,11 +522,11 @@ s32 EnSkb_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, if (limbIndex == 11) { if ((this->unk_283 & 2) == 0) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); color = ABS((s16)(Math_SinS((globalCtx->gameplayFrames * 0x1770)) * 95.0f)) + 160; gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, color, color, color, 255); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } else { *dList = NULL; } diff --git a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c index 79254dd1f..4e05e2967 100644 --- a/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -1602,7 +1602,7 @@ s32 EnSkj_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, } void EnSkj_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if ((limbIndex == 11) && (gSaveContext.itemGetInf[3] & 0x200)) { func_80093D18(globalCtx->state.gfxCtx); @@ -1614,7 +1614,7 @@ void EnSkj_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve Matrix_Pop(); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } Gfx* EnSkj_TranslucentDL(GraphicsContext* gfxCtx, u32 alpha) { @@ -1646,7 +1646,7 @@ void EnSkj_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnSkj* this = (EnSkj*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -1659,5 +1659,5 @@ void EnSkj_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnSkj_OverrideLimbDraw, EnSkj_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c b/soh/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c index 483584d89..0e0a6f741 100644 --- a/soh/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c +++ b/soh/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c @@ -101,12 +101,12 @@ void EnSkjneedle_Update(Actor* thisx, GlobalContext* globalCtx2) { void EnSkjneedle_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gSKJNeedleDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index dd16e2a1b..09677fa9c 100644 --- a/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/soh/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -878,9 +878,9 @@ void EnSsh_Draw(Actor* thisx, GlobalContext* globalCtx) { EnSsh_CheckBodyStickHit(this, globalCtx); EnSsh_Sway(this); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(blinkTex[this->blinkState])); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnSsh_OverrideLimbDraw, EnSsh_PostLimbDraw, &this->actor); } diff --git a/soh/src/overlays/actors/ovl_En_St/z_en_st.c b/soh/src/overlays/actors/ovl_En_St/z_en_st.c index e5b84dd47..3346f8d80 100644 --- a/soh/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/soh/src/overlays/actors/ovl_En_St/z_en_st.c @@ -1052,7 +1052,7 @@ void EnSt_Update(Actor* thisx, GlobalContext* globalCtx) { s32 EnSt_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dListP, Vec3f* pos, Vec3s* rot, void* thisx) { EnSt* this = (EnSt*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); switch (limbIndex) { case 1: if (this->gaveDamageSpinTimer != 0 && this->swayTimer == 0) { @@ -1069,7 +1069,7 @@ s32 EnSt_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dListP, gDPSetEnvColor(POLY_OPA_DISP++, this->teethR, this->teethG, this->teethB, 0); break; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); return false; } diff --git a/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c index e3b8f5e36..5a57cf71a 100644 --- a/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/soh/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -369,11 +369,11 @@ void EnSth_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve if (limbIndex == 15) { Matrix_MultVec3f(&D_80B0B49C, &this->actor.focus.pos); if (this->actor.params != 0) { // Children - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPDisplayList(POLY_OPA_DISP++, D_80B0A3C0); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } } @@ -392,7 +392,7 @@ void EnSth_Draw(Actor* thisx, GlobalContext* globalCtx) { EnSth* this = (EnSth*)thisx; Color_RGB8* envColor1; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[this->objectBankIdx].segment); func_800943C8(globalCtx->state.gfxCtx); @@ -409,5 +409,5 @@ void EnSth_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnSth_OverrideLimbDraw, EnSth_PostLimbDraw, &this->actor); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/soh/src/overlays/actors/ovl_En_Stream/z_en_stream.c index e5a656db2..912e27310 100644 --- a/soh/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/soh/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -132,7 +132,7 @@ void EnStream_Draw(Actor* thisx, GlobalContext* globalCtx) { u32 multipliedFrames; u32 frames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -141,5 +141,5 @@ void EnStream_Draw(Actor* thisx, GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frames * 30, -multipliedFrames, 0x40, 0x40, 1, multipliedFrames, -multipliedFrames, 0x40, 0x40)); gSPDisplayList(POLY_XLU_DISP++, object_stream_DL_000950); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/soh/src/overlays/actors/ovl_En_Sw/z_en_sw.c index 0f282079e..e3d3cad6b 100644 --- a/soh/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/soh/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -906,7 +906,7 @@ s32 EnSw_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, EnSw* this = (EnSw*)thisx; Vec3f sp3C = { 0.0f, 0.0f, 0.0f }; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (((this->actor.params & 0xE000) >> 0xD) != 0) { switch (limbIndex) { @@ -961,7 +961,7 @@ s32 EnSw_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Collider_UpdateSpheres(limbIndex, &this->collider); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); return false; } @@ -972,7 +972,7 @@ void EnSw_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec void func_80B0EDB8(GlobalContext* globalCtx, Color_RGBA8* arg1, s16 arg2, s16 arg3) { f32 temp_f2; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); temp_f2 = (11500.0f / arg3) * (arg3 - arg2); @@ -982,17 +982,17 @@ void func_80B0EDB8(GlobalContext* globalCtx, Color_RGBA8* arg1, s16 arg2, s16 ar POLY_OPA_DISP = Gfx_SetFog2(POLY_OPA_DISP, arg1->r, arg1->g, arg1->b, arg1->a, 0, (s16)temp_f2); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80B0EEA4(GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnSw_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index f992a802f..cf78b88fb 100644 --- a/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/soh/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -766,7 +766,7 @@ void func_80B13464(EnSyatekiNiw* this, GlobalContext* globalCtx) { EnSyatekiNiw_1* ptr = &this->unk_348[0]; u8 flag = 0; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -789,5 +789,5 @@ void func_80B13464(EnSyatekiNiw* this, GlobalContext* globalCtx) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c index cd09e945b..9bf316389 100644 --- a/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/soh/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -1211,7 +1211,7 @@ void EnTa_Draw(Actor* thisx, GlobalContext* globalCtx) { EnTa* this = (EnTa*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_800943C8(globalCtx->state.gfxCtx); @@ -1221,5 +1221,5 @@ void EnTa_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnTa_OverrideLimbDraw, EnTa_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c index 23c642782..5cc65866f 100644 --- a/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c +++ b/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c @@ -220,12 +220,12 @@ void EnTakaraMan_Draw(Actor* thisx, GlobalContext* globalCtx) { }; EnTakaraMan* this = (EnTakaraMan*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTextureIdx])); SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnTakaraMan_OverrideLimbDraw, NULL, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Tana/z_en_tana.c b/soh/src/overlays/actors/ovl_En_Tana/z_en_tana.c index cbe92e18d..77a14f1a1 100644 --- a/soh/src/overlays/actors/ovl_En_Tana/z_en_tana.c +++ b/soh/src/overlays/actors/ovl_En_Tana/z_en_tana.c @@ -73,20 +73,20 @@ void EnTana_Update(Actor* thisx, GlobalContext* globalCtx) { void EnTana_DrawWoodenShelves(Actor* thisx, GlobalContext* globalCtx) { EnTana* this = (EnTana*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, sShelfDLists[thisx->params]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnTana_DrawStoneShelves(Actor* thisx, GlobalContext* globalCtx) { EnTana* this = (EnTana*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sStoneTextures[thisx->params])); @@ -94,5 +94,5 @@ void EnTana_DrawStoneShelves(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, sShelfDLists[thisx->params]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Test/z_en_test.c b/soh/src/overlays/actors/ovl_En_Test/z_en_test.c index 117d3ea96..e6359960e 100644 --- a/soh/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/soh/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -1823,13 +1823,13 @@ s32 EnTest_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList rot->y -= this->headRot.x; rot->z += this->headRot.z; } else if (limbIndex == STALFOS_LIMB_HEAD) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 80 + ABS((s16)(Math_SinS(globalCtx->gameplayFrames * 2000) * 175.0f)), 0, 0, 255); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } if ((this->actor.params == STALFOS_TYPE_INVISIBLE) && !CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_7)) { diff --git a/soh/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/soh/src/overlays/actors/ovl_En_Tg/z_en_tg.c index be396c1d5..9e36d4b8e 100644 --- a/soh/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/soh/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -181,7 +181,7 @@ Gfx* EnTg_SetColor(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b, u8 a) { void EnTg_Draw(Actor* thisx, GlobalContext* globalCtx) { EnTg* this = (EnTg*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Translate(0.0f, 0.0f, -560.0f, MTXMODE_APPLY); // Set the guy's shoes and shirt to royal blue @@ -192,5 +192,5 @@ void EnTg_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnTg_OverrideLimbDraw, EnTg_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/soh/src/overlays/actors/ovl_En_Tite/z_en_tite.c index 67be0b186..d425f3426 100644 --- a/soh/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/soh/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -980,7 +980,7 @@ void EnTite_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** limbDLis void EnTite_Draw(Actor* thisx, GlobalContext* globalCtx) { EnTite* this = (EnTite*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); Collider_UpdateSpheres(0, &this->collider); if (this->actor.params == TEKTITE_BLUE) { @@ -994,7 +994,7 @@ void EnTite_Draw(Actor* thisx, GlobalContext* globalCtx) { } SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, EnTite_PostLimbDraw, thisx); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); if (this->spawnIceTimer != 0) { // Spawn chunks of ice all over the tektite's body diff --git a/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 25173a668..b2bb9ef21 100644 --- a/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -92,7 +92,7 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { s16 alpha; s16 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gfxSetup = 0; @@ -127,7 +127,7 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { eff++; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 EnTkEff_CreateDflt(EnTk* this, Vec3f* pos, u8 duration, f32 size, f32 growth, f32 yAccelMax) { @@ -688,11 +688,11 @@ void EnTk_Update(Actor* thisx, GlobalContext* globalCtx) { } void func_80B1D200(GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPDisplayList(POLY_OPA_DISP++, gDampeShovelDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 EnTk_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { @@ -742,7 +742,7 @@ void EnTk_Draw(Actor* thisx, GlobalContext* globalCtx) { EnTkEff_Draw(this, globalCtx); Matrix_Pop(); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -751,5 +751,5 @@ void EnTk_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnTk_OverrideLimbDraw, EnTk_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/soh/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index 396d7733f..98597fbda 100644 --- a/soh/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/soh/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -770,7 +770,7 @@ void EnTorch2_Draw(Actor* thisx, GlobalContext* globalCtx2) { Player* this = (Player*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093C80(globalCtx); func_80093D84(globalCtx->state.gfxCtx); if (sAlpha == 255) { @@ -790,5 +790,5 @@ void EnTorch2_Draw(Actor* thisx, GlobalContext* globalCtx2) { this->skelAnime.dListCount, EnTorch2_OverrideLimbDraw, EnTorch2_PostLimbDraw, this, POLY_XLU_DISP); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/soh/src/overlays/actors/ovl_En_Tp/z_en_tp.c index 93af6a7ac..5e2cdd83b 100644 --- a/soh/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/soh/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -730,7 +730,7 @@ void EnTp_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnTp* this = (EnTp*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->unk_150 != 2) { if ((thisx->params <= TAILPASARAN_HEAD) || (thisx->params == TAILPASARAN_HEAD_DYING)) { @@ -759,7 +759,7 @@ void EnTp_Draw(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); if ((thisx->params <= TAILPASARAN_TAIL) || (thisx->params == TAILPASARAN_TAIL_DYING)) { Collider_UpdateSpheres(0, &this->collider); diff --git a/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c index 0460c4b46..7545b4995 100644 --- a/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -437,13 +437,13 @@ void EnTr_Draw(Actor* thisx, GlobalContext* globalCtx) { } else { this->actor.shape.shadowDraw = ActorShadow_DrawCircle; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_800943C8(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeIndex])); func_8002EBCC(&this->actor, globalCtx, 0); SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnTr_OverrideLimbDraw, NULL, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/soh/src/overlays/actors/ovl_En_Vali/z_en_vali.c index d70f937cc..b22059fe2 100644 --- a/soh/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/soh/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -723,7 +723,7 @@ void EnVali_DrawBody(EnVali* this, GlobalContext* globalCtx) { f32 curFrame; Vec3f scale = { 1.0f, 1.0f, 1.0f }; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Get(&mtx); curFrame = this->skelAnime.curFrame; @@ -769,7 +769,7 @@ void EnVali_DrawBody(EnVali* this, GlobalContext* globalCtx) { Matrix_Put(&mtx); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } static Gfx D_80B28998[] = { @@ -788,7 +788,7 @@ void EnVali_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnVali* this = (EnVali*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, @@ -805,5 +805,5 @@ void EnVali_Draw(Actor* thisx, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnVali_OverrideLimbDraw, EnVali_PostLimbDraw, this, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/soh/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index a71d752bd..5ce4404ea 100644 --- a/soh/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/soh/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -302,7 +302,7 @@ void EnVbBall_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnVbBall* this = (EnVbBall*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (1) {} // needed for match func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -322,5 +322,5 @@ void EnVbBall_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gCircleShadowDL)); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/soh/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index 5a59b5bbd..d5952dbec 100644 --- a/soh/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/soh/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -504,12 +504,12 @@ s32 EnViewer_Ganondorf3OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, void EnViewer_Ganondorf9PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { if (limbIndex == 11) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_ganon_DL_00BE90)); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -526,7 +526,7 @@ void EnViewer_DrawGanondorf(EnViewer* this, GlobalContext* globalCtx) { s16 frames = 0; s16 type; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); type = this->actor.params >> 8; if (type == ENVIEWER_TYPE_3_GANONDORF || type == ENVIEWER_TYPE_5_GANONDORF || type == ENVIEWER_TYPE_7_GANONDORF || type == ENVIEWER_TYPE_8_GANONDORF) { @@ -573,7 +573,7 @@ void EnViewer_DrawGanondorf(EnViewer* this, GlobalContext* globalCtx) { } else { SkelAnime_DrawOpa(globalCtx, this->skin.skelAnime.skeleton, this->skin.skelAnime.jointTable, NULL, NULL, this); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnViewer_DrawHorse(EnViewer* this, GlobalContext* globalCtx) { @@ -610,15 +610,15 @@ void EnViewer_ZeldaPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d if (globalCtx->sceneNum == SCENE_TOKINOMA) { if (limbIndex == 16) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPDisplayList(POLY_OPA_DISP++, gChildZeldaOcarinaOfTimeDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } } void EnViewer_DrawZelda(EnViewer* this, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (globalCtx->sceneNum == SCENE_SPOT00) { // Hyrule Field if (globalCtx->csCtx.frames < 771) { gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gChildZeldaEyeInTex)); @@ -662,7 +662,7 @@ void EnViewer_DrawZelda(EnViewer* this, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skin.skelAnime.skeleton, this->skin.skelAnime.jointTable, this->skin.skelAnime.dListCount, EnViewer_ZeldaOverrideLimbDraw, EnViewer_ZeldaPostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 EnViewer_ImpaOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, @@ -674,14 +674,14 @@ s32 EnViewer_ImpaOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** } void EnViewer_DrawImpa(EnViewer* this, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gImpaEyeOpenTex)); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(gImpaEyeOpenTex)); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]); SkelAnime_DrawFlexOpa(globalCtx, this->skin.skelAnime.skeleton, this->skin.skelAnime.jointTable, this->skin.skelAnime.dListCount, EnViewer_ImpaOverrideLimbDraw, NULL, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } static EnViewerDrawFunc sDrawFuncs[] = { @@ -696,7 +696,7 @@ void EnViewer_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; s16 type; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->isVisible) { type = this->actor.params >> 8; if (type <= ENVIEWER_TYPE_2_ZELDA) { // zelda's horse, impa and zelda @@ -710,7 +710,7 @@ void EnViewer_Draw(Actor* thisx, GlobalContext* globalCtx) { sDrawFuncs[this->drawFuncIndex](this, globalCtx); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnViewer_UpdatePosition(EnViewer* this, GlobalContext* globalCtx) { @@ -810,7 +810,7 @@ void EnViewer_DrawFireEffects(EnViewer* this2, GlobalContext* globalCtx) { EnViewer* this = this2; s16 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); for (i = 0; i < ARRAY_COUNT(this->fireEffects); i++) { switch (this->fireEffects[i].state) { case 0: @@ -857,7 +857,7 @@ void EnViewer_DrawFireEffects(EnViewer* this2, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, SEG_ADDR(1, 0), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnViewer_UpdateGanondorfCape(GlobalContext* globalCtx, EnViewer* this) { diff --git a/soh/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/soh/src/overlays/actors/ovl_En_Vm/z_en_vm.c index 94690680c..c8b1a9c44 100644 --- a/soh/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/soh/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -520,7 +520,7 @@ void EnVm_Draw(Actor* thisx, GlobalContext* globalCtx2) { GlobalContext* globalCtx = globalCtx2; Vec3f actorPos; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -553,5 +553,5 @@ void EnVm_Draw(Actor* thisx, GlobalContext* globalCtx2) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gBeamosLaserDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/soh/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 4b2ef0508..d2c1299bc 100644 --- a/soh/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/soh/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -585,7 +585,7 @@ void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) { return; } - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80094044(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, 255); @@ -605,7 +605,7 @@ void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, gCircleShadowDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 EnWallMas_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, @@ -624,7 +624,7 @@ s32 EnWallMas_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dL void EnWallMas_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { if (limbIndex == 2) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); Matrix_Translate(1600.0f, -700.0f, -1700.0f, MTXMODE_APPLY); @@ -637,7 +637,7 @@ void EnWallMas_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/soh/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c index f46f7070f..fb867e533 100644 --- a/soh/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/soh/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -630,7 +630,7 @@ s32 EnWeiyer_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi void EnWeiyer_Draw(Actor* thisx, GlobalContext* globalCtx) { EnWeiyer* this = (EnWeiyer*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->actionFunc != func_80B33338) { func_80093D18(globalCtx->state.gfxCtx); @@ -646,5 +646,5 @@ void EnWeiyer_Draw(Actor* thisx, GlobalContext* globalCtx) { EnWeiyer_OverrideLimbDraw, NULL, &this->actor, POLY_XLU_DISP); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/soh/src/overlays/actors/ovl_En_Wf/z_en_wf.c index b2a7acd6c..79617b6a2 100644 --- a/soh/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/soh/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -1430,7 +1430,7 @@ static void* sWolfosWhiteEyeTextures[] = { gWolfosWhiteEyeOpenTex, gWolfosWhiteE void EnWf_Draw(Actor* thisx, GlobalContext* globalCtx) { EnWf* this = (EnWf*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); // This conditional will always evaluate to true, since unk_300 is false whenever action is // WOLFOS_ACTION_WAIT_TO_APPEAR. @@ -1459,7 +1459,7 @@ void EnWf_Draw(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 EnWf_DodgeRanged(GlobalContext* globalCtx, EnWf* this) { diff --git a/soh/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/soh/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index f06bdbd8a..d52aae653 100644 --- a/soh/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/soh/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -424,7 +424,7 @@ void EnWood02_Draw(Actor* thisx, GlobalContext* globalCtx) { u8 green; u8 blue; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); type = this->actor.params; if ((type == WOOD_TREE_OVAL_GREEN_SPAWNER) || (type == WOOD_TREE_OVAL_GREEN_SPAWNED) || @@ -460,5 +460,5 @@ void EnWood02_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, D_80B3BF54[this->drawType & 0xF]); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c index 83f4f1d49..3ba36d46b 100644 --- a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -1078,7 +1078,7 @@ void EnXc_DrawPullingOutHarp(Actor* thisx, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; s32 pad2; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTexture)); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 20, 0); @@ -1088,7 +1088,7 @@ void EnXc_DrawPullingOutHarp(Actor* thisx, GlobalContext* globalCtx) { func_8002EBCC(&this->actor, globalCtx, 0); SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, EnXc_PullingOutHarpOverrideLimbDraw, NULL, this); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EnXc_DrawHarp(Actor* thisx, GlobalContext* globalCtx) { @@ -1100,7 +1100,7 @@ void EnXc_DrawHarp(Actor* thisx, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; s32 pad2; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTexture)); @@ -1111,7 +1111,7 @@ void EnXc_DrawHarp(Actor* thisx, GlobalContext* globalCtx) { func_8002EBCC(&this->actor, globalCtx, 0); SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, EnXc_HarpOverrideLimbDraw, NULL, this); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80B3EBF0(EnXc* this, GlobalContext* globalCtx) { @@ -1713,7 +1713,7 @@ void EnXc_DrawTriforce(Actor* thisx, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; s32 pad2; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (this->unk_2BC != 0) { Mtx* mtx = Graph_Alloc(gfxCtx, sizeof(Mtx)); s32* primColor = this->triforcePrimColor; @@ -1739,7 +1739,7 @@ void EnXc_DrawTriforce(Actor* thisx, GlobalContext* globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTexture)); SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, EnXc_TriforceOverrideLimbDraw, EnXc_TriforcePostLimbDraw, this); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_80B40590(EnXc* this, GlobalContext* globalCtx) { @@ -2135,13 +2135,13 @@ void EnXc_DrawSquintingEyes(Actor* thisx, GlobalContext* globalCtx) { SkelAnime* skelAnime = &this->skelAnime; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_80093D18(gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gSheikEyeSquintingTex)); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(gSheikEyeSquintingTex)); SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, NULL); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EnXc_InitTempleOfTime(EnXc* this, GlobalContext* globalCtx) { @@ -2389,14 +2389,14 @@ void EnXc_DrawDefault(Actor* thisx, GlobalContext* globalCtx) { GraphicsContext* localGfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = localGfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); func_80093D18(gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeSegment)); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeSegment)); SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, EnXc_OverrideLimbDraw, EnXc_PostLimbDraw, this); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } static EnXcDrawFunc sDrawFuncs[] = { diff --git a/soh/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c b/soh/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c index d8931c3fd..1eb42b053 100644 --- a/soh/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/soh/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -147,7 +147,7 @@ void EnYukabyun_Update(Actor* thisx, GlobalContext* globalCtx) { void EnYukabyun_Draw(Actor* thisx, GlobalContext* globalCtx) { EnYukabyun* this = (EnYukabyun*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80B43F64[this->unk_152])); @@ -155,5 +155,5 @@ void EnYukabyun_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gFloorTileEnemyDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c index fcb1af22d..93c5fd90c 100644 --- a/soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -2235,7 +2235,7 @@ void EnZf_Draw(Actor* thisx, GlobalContext* globalCtx) { EnZf* this = (EnZf*)thisx; ; // Extra ";" required for matching. Cannot be if (1) {} or the like. Typo? - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_8002EBCC(thisx, globalCtx, 1); @@ -2271,7 +2271,7 @@ void EnZf_Draw(Actor* thisx, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnZf_OverrideLimbDraw, EnZf_PostLimbDraw, this, POLY_XLU_DISP); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnZf_SetupCircleAroundPlayer(EnZf* this, f32 speed) { diff --git a/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index 2b253ea6d..ee2af34de 100644 --- a/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/soh/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -617,7 +617,7 @@ void EnZl1_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve void EnZl1_Draw(Actor* thisx, GlobalContext* globalCtx) { EnZl1* this = (EnZl1*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(this->unk_1F4)); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(this->unk_1F8)); @@ -627,5 +627,5 @@ void EnZl1_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnZl1_OverrideLimbDraw, EnZl1_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index 402ebf50d..10e3ed98a 100644 --- a/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/soh/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -1641,7 +1641,7 @@ void func_80B523C8(EnZl2* this, GlobalContext* globalCtx) { void* mouthTex = sMouthTextures[mouthTexIndex]; s32 pad1; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -1654,7 +1654,7 @@ void func_80B523C8(EnZl2* this, GlobalContext* globalCtx) { POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, EnZl2_OverrideLimbDraw, EnZl2_PostLimbDraw, this, POLY_OPA_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80B525D4(EnZl2* this, GlobalContext* globalCtx) { @@ -1666,7 +1666,7 @@ void func_80B525D4(EnZl2* this, GlobalContext* globalCtx) { void* mouthTex = sMouthTextures[mouthTexIndex]; s32 pad1; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -1679,7 +1679,7 @@ void func_80B525D4(EnZl2* this, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, EnZl2_OverrideLimbDraw, NULL, this, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnZl2_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 80c72c3e6..0fb546d23 100644 --- a/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -2705,7 +2705,7 @@ void func_80B59FF4(EnZl3* this, GlobalContext* globalCtx) { void* mouthTex = sMouthTextures[mouthTexIndex]; s32 pad2; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -2718,7 +2718,7 @@ void func_80B59FF4(EnZl3* this, GlobalContext* globalCtx) { POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, EnZl3_OverrideLimbDraw, EnZl3_PostLimbDraw, this, POLY_OPA_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80B5A1D0(EnZl3* this, GlobalContext* globalCtx) { @@ -2730,7 +2730,7 @@ void func_80B5A1D0(EnZl3* this, GlobalContext* globalCtx) { void* mouthTex = sMouthTextures[mouthTexIndex]; s32 pad2; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -2743,7 +2743,7 @@ void func_80B5A1D0(EnZl3* this, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, EnZl3_OverrideLimbDraw, NULL, this, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } static EnZl3DrawFunc sDrawFuncs[] = { diff --git a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index ef6e82116..7347d12c5 100644 --- a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -1289,12 +1289,12 @@ void EnZl4_Draw(Actor* thisx, GlobalContext* globalCtx) { gChildZeldaEyeSquintTex, gChildZeldaEyeOutTex, gChildZeldaEyeInTex, }; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTex[this->rightEyeState])); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTex[this->leftEyeState])); gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(mouthTex[this->mouthState])); func_80093D18(globalCtx->state.gfxCtx); SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnZl4_OverrideLimbDraw, EnZl4_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c index 172ed7534..847a64ca9 100644 --- a/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -180,7 +180,7 @@ void EnZo_DrawRipples(EnZo* this, GlobalContext* globalCtx) { u8 setup; effect = this->effects; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); setup = false; func_80093D84(globalCtx->state.gfxCtx); for (i = 0; i < ARRAY_COUNT(this->effects); i++) { @@ -204,7 +204,7 @@ void EnZo_DrawRipples(EnZo* this, GlobalContext* globalCtx) { } effect++; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnZo_DrawBubbles(EnZo* this, GlobalContext* globalCtx) { @@ -212,7 +212,7 @@ void EnZo_DrawBubbles(EnZo* this, GlobalContext* globalCtx) { s16 i; u8 setup; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); setup = false; func_80093D84(globalCtx->state.gfxCtx); for (i = 0; i < ARRAY_COUNT(this->effects); i++) { @@ -239,7 +239,7 @@ void EnZo_DrawBubbles(EnZo* this, GlobalContext* globalCtx) { } effect++; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnZo_DrawSplashes(EnZo* this, GlobalContext* globalCtx) { @@ -248,7 +248,7 @@ void EnZo_DrawSplashes(EnZo* this, GlobalContext* globalCtx) { u8 setup; effect = this->effects; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); setup = false; func_80093D84(globalCtx->state.gfxCtx); for (i = 0; i < ARRAY_COUNT(this->effects); i++) { @@ -274,7 +274,7 @@ void EnZo_DrawSplashes(EnZo* this, GlobalContext* globalCtx) { } effect++; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EnZo_TreadWaterRipples(EnZo* this, f32 scale, f32 targetScale, u8 alpha) { @@ -808,7 +808,7 @@ void EnZo_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Pop(); if ((s32)this->alpha != 0) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->alpha == 255.0f) { gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTexture])); @@ -818,6 +818,6 @@ void EnZo_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80034CC4(globalCtx, &this->skelAnime, EnZo_OverrideLimbDraw, EnZo_PostLimbDraw, thisx, this->alpha); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/soh/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index a38e69ae0..ad29739a5 100644 --- a/soh/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/soh/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -715,7 +715,7 @@ void EnfHG_Draw(Actor* thisx, GlobalContext* globalCtx) { BossGanondrof* bossGnd = (BossGanondrof*)this->actor.parent; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); POLY_OPA_DISP = ((bossGnd->work[GND_INVINC_TIMER] & 4) && (bossGnd->flyMode == GND_FLY_PAINTING)) @@ -725,5 +725,5 @@ void EnfHG_Draw(Actor* thisx, GlobalContext* globalCtx) { (s32)this->warpColorFilterUnk2 + 1000); func_800A6330(&this->actor, globalCtx, &this->skin, EnfHG_PostDraw, SKIN_TRANSFORM_IS_FHG); POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_End_Title/z_end_title.c b/soh/src/overlays/actors/ovl_End_Title/z_end_title.c index c81636f82..ae691eac9 100644 --- a/soh/src/overlays/actors/ovl_End_Title/z_end_title.c +++ b/soh/src/overlays/actors/ovl_End_Title/z_end_title.c @@ -55,7 +55,7 @@ void EndTitle_DrawFull(Actor* thisx, GlobalContext* globalCtx) { mf = &player->mf_9E0; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); // Draw the Triforce on Link's left hand func_80093D84(globalCtx->state.gfxCtx); @@ -68,9 +68,9 @@ void EndTitle_DrawFull(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sTriforceDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); // Draw title cards on the screen if ((frameCount > 890) && (this->endAlpha < 200)) { @@ -112,7 +112,7 @@ void EndTitle_DrawFull(Actor* thisx, GlobalContext* globalCtx) { 1 << 10); if (D_801614B0.a > 0) gsSPGrayscale(OVERLAY_DISP++, true); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Used in the Temple of Time @@ -125,11 +125,11 @@ void EndTitle_DrawNintendoLogo(Actor* thisx, GlobalContext* globalCtx) { this->endAlpha += 3; } - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); OVERLAY_DISP = func_80093F34(OVERLAY_DISP); gDPSetPrimColor(OVERLAY_DISP++, 0, 0x80, 0, 0, 0, this->endAlpha); gSPDisplayList(OVERLAY_DISP++, sPresentedByNintendoDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c index 4dcaf4a89..68dec9e94 100644 --- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -1183,7 +1183,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { s32 pad; FishingEffect* firstEffect = effect; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); @@ -1396,13 +1396,13 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Fishing_DrawStreamSplash(GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, globalCtx->gameplayFrames * 1, @@ -1417,7 +1417,7 @@ void Fishing_DrawStreamSplash(GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gFishingStreamSplashDL)); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s32 func_80B6C2EC(Vec3f* vec) { @@ -1600,7 +1600,7 @@ void Fishing_DrawLureHook(GlobalContext* globalCtx, Vec3f* pos, Vec3f* refPos, u Vec3f posStep; Player* player = GET_PLAYER(globalCtx); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); @@ -1684,7 +1684,7 @@ void Fishing_DrawLureHook(GlobalContext* globalCtx, Vec3f* pos, Vec3f* refPos, u Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Fishing_UpdateSinkingLure(GlobalContext* globalCtx) { @@ -1761,7 +1761,7 @@ void Fishing_DrawSinkingLure(GlobalContext* globalCtx) { s16 i; f32 scale; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Fishing_UpdateSinkingLure(globalCtx); @@ -1801,7 +1801,7 @@ void Fishing_DrawSinkingLure(GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Fishing_DrawLureAndLine(GlobalContext* globalCtx, Vec3f* linePos, Vec3f* lineRot) { @@ -1813,7 +1813,7 @@ void Fishing_DrawLureAndLine(GlobalContext* globalCtx, Vec3f* linePos, Vec3f* li s32 pad; Player* player = GET_PLAYER(globalCtx); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); Matrix_Push(); @@ -1955,7 +1955,7 @@ void Fishing_DrawLureAndLine(GlobalContext* globalCtx, Vec3f* linePos, Vec3f* li Matrix_Pop(); func_80093D84(globalCtx->state.gfxCtx); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } static f32 sRodScales[22] = { @@ -1980,7 +1980,7 @@ void Fishing_DrawRod(GlobalContext* globalCtx) { Player* player = GET_PLAYER(globalCtx); s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (D_80B7FDA8 != 0) { D_80B7FDA8--; @@ -2108,7 +2108,7 @@ void Fishing_DrawRod(GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } static Vec3f D_80B7AF94 = { 0.0f, 0.0f, 0.0f }; @@ -4411,7 +4411,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) { s16 i; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); @@ -4518,7 +4518,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) { Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Fishing_UpdateGroupFishes(GlobalContext* globalCtx) { @@ -4722,7 +4722,7 @@ void Fishing_DrawGroupFishes(GlobalContext* globalCtx) { if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); for (i = 0; i < GROUP_FISH_COUNT; i++) { if (fish->type != FS_GROUP_FISH_NONE) { @@ -4746,7 +4746,7 @@ void Fishing_DrawGroupFishes(GlobalContext* globalCtx) { fish++; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } static u16 D_80B7AFB8[] = { 0x4096, 0x408D, 0x408E, 0x408F, 0x4094, 0x4095 }; @@ -5730,7 +5730,7 @@ s32 Fishing_OwnerOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** void Fishing_OwnerPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { if (limbIndex == 8) { // Head - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_MultVec3f(&sZeroVec, &sOwnerHeadPos); if (D_80B7A688 == 1) { @@ -5739,7 +5739,7 @@ void Fishing_OwnerPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dL gSPDisplayList(POLY_OPA_DISP++, SEGMENTED_TO_VIRTUAL(gFishingOwnerHairDL)); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -5754,7 +5754,7 @@ void Fishing_DrawOwner(Actor* thisx, GlobalContext* globalCtx) { Fishing* this = (Fishing*)thisx; Input* input = &globalCtx->state.input[0]; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -5818,5 +5818,5 @@ void Fishing_DrawOwner(Actor* thisx, GlobalContext* globalCtx) { Fishing_DrawSinkingLure(globalCtx); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c index c83d3984d..1d59973ac 100644 --- a/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c +++ b/soh/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c @@ -81,7 +81,7 @@ void ItemBHeart_Draw(Actor* thisx, GlobalContext* globalCtx) { Actor* actorIt; u8 flag = false; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); actorIt = globalCtx->actorCtx.actorLists[ACTORCAT_ITEMACTION].head; @@ -107,5 +107,5 @@ void ItemBHeart_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gGiHeartContainerDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/soh/src/overlays/actors/ovl_Item_Shield/z_item_shield.c index 20850456f..917ada6ee 100644 --- a/soh/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/soh/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -220,11 +220,11 @@ void ItemShield_Draw(Actor* thisx, GlobalContext* globalCtx) { ItemShield* this = (ItemShield*)thisx; if (!(this->unk_19C & 2)) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, SEGMENTED_TO_VIRTUAL(gLinkChildDekuShieldDL)); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index 1c89444f4..6862fec4a 100644 --- a/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/soh/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -201,7 +201,7 @@ void MagicDark_DiamondDraw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; u16 gameplayFrames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -231,7 +231,7 @@ void MagicDark_DiamondDraw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, sDiamondModelDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void MagicDark_OrbDraw(Actor* thisx, GlobalContext* globalCtx) { @@ -261,7 +261,7 @@ void MagicDark_OrbDraw(Actor* thisx, GlobalContext* globalCtx) { pos.z -= (this->actor.scale.x * 300.0f * Math_CosS(Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx))) * Math_CosS(Camera_GetCamDirPitch(GET_ACTIVE_CAM(globalCtx)))); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 170, 255, 255, 255); @@ -280,5 +280,5 @@ void MagicDark_OrbDraw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c index 191b2153e..ea03e1575 100644 --- a/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -219,7 +219,7 @@ void MagicFire_Draw(Actor* thisx, GlobalContext* globalCtx) { u8 alpha; if (this->action > 0) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_XLU_DISP = func_800937C0(POLY_XLU_DISP); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, (u8)(s32)(60 * this->screenTintIntensity), (u8)(s32)(20 * this->screenTintIntensity), (u8)(s32)(0 * this->screenTintIntensity), @@ -247,7 +247,7 @@ void MagicFire_Draw(Actor* thisx, GlobalContext* globalCtx) { 511 - ((gameplayFrames * 5) % 512), 64, 64, 1, (gameplayFrames * 2) % 256, 255 - ((gameplayFrames * 20) % 256), 32, 32)); gSPDisplayList(POLY_XLU_DISP++, sModelDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); alpha = (s32)(this->alphaMultiplier * 255); Vtx* vertices = ResourceMgr_LoadVtxByName(sSphereVtx); diff --git a/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index 97112df76..be2cd81dd 100644 --- a/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -146,7 +146,7 @@ void MagicWind_Update(Actor* thisx, GlobalContext* globalCtx) { s32 MagicWind_OverrideLimbDraw(GlobalContext* globalCtx, SkelAnimeCurve* skelCurve, s32 limbIndex, void* thisx) { MagicWind* this = (MagicWind*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (limbIndex == 1) { gSPSegment(POLY_XLU_DISP++, 8, @@ -163,7 +163,7 @@ s32 MagicWind_OverrideLimbDraw(GlobalContext* globalCtx, SkelAnimeCurve* skelCur 0xFF - ((globalCtx->state.frames * 0xA) & 0xFF), 0x40, 0x40)); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); return true; } @@ -172,12 +172,12 @@ void MagicWind_Draw(Actor* thisx, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; MagicWind* this = (MagicWind*)thisx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (this->actionFunc != MagicWind_WaitForTimer) { POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 25); SkelCurve_Draw(thisx, globalCtx, &this->skelCurve, MagicWind_OverrideLimbDraw, NULL, 1, NULL); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index f0880d205..199912b7d 100644 --- a/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/soh/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -492,7 +492,7 @@ void MirRay_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Mult(&player->shieldMf, MTXMODE_NEW); MirRay_SetIntensity(this, globalCtx); if (!(this->reflectIntensity <= 0.0f)) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); Matrix_Scale(1.0f, 1.0f, this->reflectIntensity * 5.0f, MTXMODE_APPLY); @@ -529,7 +529,7 @@ void MirRay_Draw(Actor* thisx, GlobalContext* globalCtx) { D_80B8E670 = 1; - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } } diff --git a/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index 1fed0125d..cc513948f 100644 --- a/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/soh/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -205,7 +205,7 @@ void ObjComb_Update(Actor* thisx, GlobalContext* globalCtx) { void ObjComb_Draw(Actor* thisx, GlobalContext* globalCtx) { ObjComb* this = (ObjComb*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -224,5 +224,5 @@ void ObjComb_Draw(Actor* thisx, GlobalContext* globalCtx) { Collider_UpdateSpheres(0, &this->collider); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c b/soh/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c index f68302547..f7a83f45a 100644 --- a/soh/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c +++ b/soh/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c @@ -150,7 +150,7 @@ void ObjDekujr_Update(Actor* thisx, GlobalContext* globalCtx) { void ObjDekujr_Draw(Actor* thisx, GlobalContext* globalCtx) { u32 frameCount; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -167,5 +167,5 @@ void ObjDekujr_Draw(Actor* thisx, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_dekujr_DL_0032D8); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/soh/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index bc9948289..71e56a53d 100644 --- a/soh/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/soh/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -195,7 +195,7 @@ void ObjHamishi_Update(Actor* thisx, GlobalContext* globalCtx) { } void ObjHamishi_Draw(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -204,5 +204,5 @@ void ObjHamishi_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 170, 130, 255); gSPDisplayList(POLY_OPA_DISP++, gSilverRockDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c b/soh/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c index a78a26440..968b75758 100644 --- a/soh/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/soh/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -149,7 +149,7 @@ void ObjHsblock_Draw(Actor* thisx, GlobalContext* globalCtx) { Color_RGB8* color; Color_RGB8 defaultColor; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -168,5 +168,5 @@ void ObjHsblock_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_OPA_DISP++, color->r, color->g, color->b, 255); gSPDisplayList(POLY_OPA_DISP++, sDLists[thisx->params & 3]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/soh/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c index 5cc99509f..b54686092 100644 --- a/soh/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c +++ b/soh/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -193,7 +193,7 @@ void ObjIcePoly_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; ObjIcePoly* this = (ObjIcePoly*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); func_8002ED80(&this->actor, globalCtx, 0); Matrix_RotateZYX(0x500, 0, -0x500, MTXMODE_APPLY); @@ -206,5 +206,5 @@ void ObjIcePoly_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, 0, 50, 100, this->alpha); gSPDisplayList(POLY_XLU_DISP++, gEffIceFragment3DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/soh/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index 9bc58b306..86b8f39a7 100644 --- a/soh/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/soh/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -400,7 +400,7 @@ void ObjLightswitch_DrawOpa(ObjLightswitch* this, GlobalContext* globalCtx) { Vec3f pos; Vec3s rot; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gDPSetEnvColor(POLY_OPA_DISP++, (u8)(this->color[0] >> 6), (u8)(this->color[1] >> 6), (u8)(this->color[2] >> 6), @@ -442,7 +442,7 @@ void ObjLightswitch_DrawOpa(ObjLightswitch* this, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, object_lightswitch_DL_000408); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void ObjLightswitch_DrawXlu(ObjLightswitch* this, GlobalContext* globalCtx) { @@ -450,7 +450,7 @@ void ObjLightswitch_DrawXlu(ObjLightswitch* this, GlobalContext* globalCtx) { Vec3f sp68; Vec3s sp60; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->color[0] >> 6), (u8)(this->color[1] >> 6), (u8)(this->color[2] >> 6), @@ -483,7 +483,7 @@ void ObjLightswitch_DrawXlu(ObjLightswitch* this, GlobalContext* globalCtx) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_lightswitch_DL_000408); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void ObjLightswitch_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/soh/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index 74bca2968..712584623 100644 --- a/soh/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/soh/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -654,7 +654,7 @@ void ObjOshihiki_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; ObjOshihiki* this = (ObjOshihiki*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (ObjOshihiki_MoveWithBlockUnder(this, globalCtx)) { Matrix_Translate(this->underDistX * 10.0f, 0.0f, this->underDistZ * 10.0f, MTXMODE_APPLY); } @@ -682,5 +682,5 @@ void ObjOshihiki_Draw(Actor* thisx, GlobalContext* globalCtx) { } gSPDisplayList(POLY_OPA_DISP++, gPushBlockDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index e9e79cce0..305eb3c26 100644 --- a/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -731,7 +731,7 @@ void ObjSwitch_DrawEye(ObjSwitch* this, GlobalContext* globalCtx) { s32 pad; s32 subType = (this->dyna.actor.params >> 4 & 7); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -739,7 +739,7 @@ void ObjSwitch_DrawEye(ObjSwitch* this, GlobalContext* globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[subType][this->eyeTexIndex])); gSPDisplayList(POLY_OPA_DISP++, eyeDlists[subType]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void ObjSwitch_DrawCrystal(ObjSwitch* this, GlobalContext* globalCtx) { @@ -756,16 +756,16 @@ void ObjSwitch_DrawCrystal(ObjSwitch* this, GlobalContext* globalCtx) { if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, xluDLists[subType]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -781,7 +781,7 @@ void ObjSwitch_DrawCrystal(ObjSwitch* this, GlobalContext* globalCtx) { this->x2TexScroll, this->y2TexScroll, 0x20, 0x20)); gSPDisplayList(POLY_OPA_DISP++, opaDLists[subType]); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } static ObjSwitchActionFunc sDrawFuncs[] = { diff --git a/soh/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/soh/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index fa1acf100..e0a940e13 100644 --- a/soh/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/soh/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -265,7 +265,7 @@ void ObjSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) { timerMax = (((this->actor.params >> 6) & 0xF) * 50) + 100; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -304,5 +304,5 @@ void ObjSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/soh/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c index 7259b4aae..d56193b9a 100644 --- a/soh/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c +++ b/soh/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c @@ -335,7 +335,7 @@ void ObjTimeblock_Draw(Actor* thisx, GlobalContext* globalCtx) { if (((ObjTimeblock*)thisx)->isVisible) { Color_RGB8* primColor = &sPrimColors[thisx->home.rot.z & 7]; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -343,6 +343,6 @@ void ObjTimeblock_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, primColor->r, primColor->g, primColor->b, 255); gSPDisplayList(POLY_OPA_DISP++, gSongOfTimeBlockDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } diff --git a/soh/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/soh/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index cd2d68e3b..c4415f441 100644 --- a/soh/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/soh/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -308,7 +308,7 @@ void ObjWarp2block_Draw(Actor* thisx, GlobalContext* globalCtx) { sp44 = &sColors[thisx->home.rot.z & 7]; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), @@ -316,5 +316,5 @@ void ObjWarp2block_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sp44->r, sp44->g, sp44->b, 255); gSPDisplayList(POLY_OPA_DISP++, gSongOfTimeBlockDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index b692cba12..3a639daa2 100644 --- a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -499,7 +499,7 @@ void ObjectKankyo_DrawFairies(ObjectKankyo* this2, GlobalContext* globalCtx2) { s16 i; if (!(globalCtx->cameraPtrs[0]->unk_14C & 0x100)) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x14); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gSunTex)); gSPDisplayList(POLY_XLU_DISP++, gKokiriDustMoteTextureLoadDL); @@ -573,7 +573,7 @@ void ObjectKankyo_DrawFairies(ObjectKankyo* this2, GlobalContext* globalCtx2) { gSPDisplayList(POLY_XLU_DISP++, gKokiriDustMoteDL); FrameInterpolation_RecordCloseChild(); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -596,7 +596,7 @@ void ObjectKankyo_DrawSnow(ObjectKankyo* this2, GlobalContext* globalCtx2) { s32 pad2; if (!(globalCtx->cameraPtrs[0]->unk_14C & 0x100)) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (globalCtx->envCtx.unk_EE[2] < globalCtx->envCtx.unk_EE[3]) { if (globalCtx->state.frames % 16 == 0) { globalCtx->envCtx.unk_EE[2] += 2; @@ -714,7 +714,7 @@ void ObjectKankyo_DrawSnow(ObjectKankyo* this2, GlobalContext* globalCtx2) { gDPPipeSync(POLY_XLU_DISP++); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -747,7 +747,7 @@ void ObjectKankyo_DrawLightning(ObjectKankyo* this, GlobalContext* globalCtx) { s32 pad; s32 pad2; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->effects[0].state == 1) { Matrix_Translate(globalCtx->csCtx.npcActions[0]->startPos.x, globalCtx->csCtx.npcActions[0]->startPos.y, @@ -766,7 +766,7 @@ void ObjectKankyo_DrawLightning(ObjectKankyo* this, GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void ObjectKankyo_SunGraveSparkInit(ObjectKankyo* this, GlobalContext* globalCtx) { @@ -811,7 +811,7 @@ void ObjectKankyo_DrawSunGraveSpark(ObjectKankyo* this2, GlobalContext* globalCt Vec3f end; f32 weight; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (globalCtx->csCtx.state != 0) { if (globalCtx->csCtx.npcActions[1] != NULL && globalCtx->csCtx.npcActions[1]->action == 2 && this->requiredObjectLoaded) { @@ -867,7 +867,7 @@ void ObjectKankyo_DrawSunGraveSpark(ObjectKankyo* this2, GlobalContext* globalCt } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void ObjectKankyo_InitBeams(ObjectKankyo* this, GlobalContext* globalCtx) { @@ -921,7 +921,7 @@ void ObjectKankyo_DrawBeams(ObjectKankyo* this2, GlobalContext* globalCtx2) { f32 beamYaw[] = { 29.9f, 90.0f, 150.0f, 30.0f, 90.0f, -30.1f }; f32 beamPitch[] = { 103.4f, 103.8f, 103.6f, -103.4f, -103.5f, 103.5f }; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->requiredObjectLoaded) { for (i = 0; i < 6; i++) { @@ -946,7 +946,7 @@ void ObjectKankyo_DrawBeams(ObjectKankyo* this2, GlobalContext* globalCtx2) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void ObjectKankyo_Reset(void) { diff --git a/soh/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/soh/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index 00b341c0c..84b9c6169 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/soh/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -150,7 +150,7 @@ void OceffSpot_Draw(Actor* thisx, GlobalContext* globalCtx) { OceffSpot* this = (OceffSpot*)thisx; u32 scroll = globalCtx->state.frames & 0xFFFF; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -161,5 +161,5 @@ void OceffSpot_Draw(Actor* thisx, GlobalContext* globalCtx) { 0, scroll * (-8), 32, 32)); gSPDisplayList(POLY_XLU_DISP++, sCylinderModelDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index b2da0377d..4d041427e 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -127,7 +127,7 @@ void OceffStorm_Draw2(Actor* thisx, GlobalContext* globalCtx) { u32 scroll = globalCtx->state.frames & 0xFFF; OceffStorm* this = (OceffStorm*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPPipeSync(POLY_XLU_DISP++); @@ -144,7 +144,7 @@ void OceffStorm_Draw2(Actor* thisx, GlobalContext* globalCtx) { OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH) << 2, 0x03C0, G_TX_RENDERTILE, 0, 0, 0x008C, -0x008C); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void OceffStorm_Draw(Actor* thisx, GlobalContext* globalCtx) { @@ -152,7 +152,7 @@ void OceffStorm_Draw(Actor* thisx, GlobalContext* globalCtx) { OceffStorm* this = (OceffStorm*)thisx; Vtx* vtxPtr = ResourceMgr_LoadVtxByName(sCylinderVtx); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -172,7 +172,7 @@ void OceffStorm_Draw(Actor* thisx, GlobalContext* globalCtx) { 1, scroll * 8, (0 - scroll) * 12, 32, 32)); gSPDisplayList(POLY_XLU_DISP++, sCylinderModelDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); OceffStorm_Draw2(&this->actor, globalCtx); } diff --git a/soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index 418e6ca4c..c1ad66a28 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -78,7 +78,7 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) { eye = GET_ACTIVE_CAM(globalCtx)->eye; Camera_GetSkyboxOffset(&vec, GET_ACTIVE_CAM(globalCtx)); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->timer < 32) { z = Math_SinS(this->timer << 9) * 1400; @@ -125,5 +125,5 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) { 0 - scroll, scroll * (-2), 32, 32)); gSPDisplayList(POLY_XLU_DISP++, sFrustumDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index dc9bdb7f8..1cc03b59c 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -88,7 +88,7 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) { vtxPtr[11].v.cn[3] = vtxPtr[13].v.cn[3] = vtxPtr[15].v.cn[3] = vtxPtr[16].v.cn[3] = vtxPtr[18].v.cn[3] = vtxPtr[20].v.cn[3] = alpha; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -107,5 +107,5 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) { scroll * (-6), 0, 64, 64)); gSPDisplayList(POLY_XLU_DISP++, sFrustumDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index 960bc5368..4a99ed270 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -89,7 +89,7 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) { vtxPtr[11].v.cn[3] = vtxPtr[13].v.cn[3] = vtxPtr[15].v.cn[3] = vtxPtr[17].v.cn[3] = vtxPtr[19].v.cn[3] = vtxPtr[21].v.cn[3] = alpha; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -108,5 +108,5 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) { scroll * 8, scroll * (-8), 64, 64)); gSPDisplayList(POLY_XLU_DISP++, sFrustumDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index 37250e15c..be72550ef 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -84,7 +84,7 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) { vtxPtr[11].v.cn[3] = vtxPtr[13].v.cn[3] = vtxPtr[15].v.cn[3] = vtxPtr[17].v.cn[3] = vtxPtr[19].v.cn[3] = vtxPtr[21].v.cn[3] = alpha; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -107,5 +107,5 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) { scroll * (-1), scroll, 32, 32)); gSPDisplayListOffset(POLY_XLU_DISP++, sMaterial2DL, 11); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c index 60eb91b81..a3f1e7870 100644 --- a/soh/src/overlays/actors/ovl_player_actor/z_player.c +++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c @@ -10400,7 +10400,7 @@ void func_80848EF8(Player* this, GlobalContext* globalCtx) { rectLeft = OTRGetRectDimensionFromLeftEdge(26); } - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPPipeSync(OVERLAY_DISP++); gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, DefaultIconA); gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); @@ -10420,7 +10420,7 @@ void func_80848EF8(Player* this, GlobalContext* globalCtx) { gDPLoadTextureBlock(OVERLAY_DISP++, gStoneOfAgonyIconTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 24, 24, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gDPSetOtherMode(OVERLAY_DISP++, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_IA16 | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, G_AC_NONE | G_ZS_PRIM | G_RM_XLU_SURF | G_RM_XLU_SURF2); gSPWideTextureRectangle(OVERLAY_DISP++, rectLeft << 2, rectTop << 2, (rectLeft + rectWidth) << 2, (rectTop + rectHeight) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } if (this->unk_6A0 > 4000000.0f) { @@ -10933,7 +10933,7 @@ void Player_DrawGameplay(GlobalContext* globalCtx, Player* this, s32 lod, Gfx* c OverrideLimbDrawOpa overrideLimbDraw) { static s32 D_8085486C = 255; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x0C, cullDList); gSPSegment(POLY_XLU_DISP++, 0x0C, cullDList); @@ -11003,7 +11003,7 @@ void Player_DrawGameplay(GlobalContext* globalCtx, Player* this, s32 lod, Gfx* c } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Player_Draw(Actor* thisx, GlobalContext* globalCtx2) { @@ -11037,7 +11037,7 @@ void Player_Draw(Actor* thisx, GlobalContext* globalCtx2) { rot.y = 32300; rot.x = rot.z = 0; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); if (!(this->stateFlags2 & PLAYER_STATE2_29)) { @@ -11131,7 +11131,7 @@ void Player_Draw(Actor* thisx, GlobalContext* globalCtx2) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Player_Destroy(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c b/soh/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c index a11c2f2a4..2e757d501 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c @@ -61,7 +61,7 @@ void EffectSsBlast_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { s32 pad; f32 radius; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); radius = this->rScale * 0.0025f; @@ -75,7 +75,7 @@ void EffectSsBlast_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, this->gfx); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsBlast_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c b/soh/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c index aa26f3e55..8da0061ef 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c @@ -54,7 +54,7 @@ void EffectSsBomb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { if (1) {} - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); scale = this->rScale / 100.0f; @@ -79,7 +79,7 @@ void EffectSsBomb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gDPPipeSync(POLY_XLU_DISP++); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsBomb_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c b/soh/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c index 4d03ab8af..dacb35d87 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c @@ -73,7 +73,7 @@ void EffectSsBomb2_DrawFade(GlobalContext* globalCtx, u32 index, EffectSs* this) s32 pad; f32 scale; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); scale = this->rScale * 0.01f; SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); @@ -96,7 +96,7 @@ void EffectSsBomb2_DrawFade(GlobalContext* globalCtx, u32 index, EffectSs* this) if (1) {} if (1) {} - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsBomb2_DrawLayered(GlobalContext* globalCtx, u32 index, EffectSs* this) { @@ -118,7 +118,7 @@ void EffectSsBomb2_DrawLayered(GlobalContext* globalCtx, u32 index, EffectSs* th f32 layer2Scale = 0.925f; s32 i; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); depth = this->rDepth; scale = this->rScale * 0.01f; @@ -161,7 +161,7 @@ void EffectSsBomb2_DrawLayered(GlobalContext* globalCtx, u32 index, EffectSs* th if (1) {} if (1) {} - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsBomb2_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c b/soh/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c index 413ec2bfb..d306f908f 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c @@ -41,7 +41,7 @@ void EffectSsBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; f32 scale = this->rScale / 100.0f; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); @@ -53,7 +53,7 @@ void EffectSsBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gSPSegment(POLY_OPA_DISP++, 0x08, this->gfx); gSPDisplayList(POLY_OPA_DISP++, SEGMENTED_TO_VIRTUAL(gEffBubbleDL)); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsBubble_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c b/soh/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c index 62756ea5f..120bae418 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c @@ -71,7 +71,7 @@ void EffectSsDFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { object = globalCtx->objectCtx.status[this->rObjBankIdx].segment; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (Object_GetIndex(&globalCtx->objectCtx, OBJECT_DODONGO) > -1) { gSegments[6] = VIRTUAL_TO_PHYSICAL(object); @@ -96,7 +96,7 @@ void EffectSsDFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsDFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c b/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c index 2d6bcd292..b80c2139a 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c @@ -70,7 +70,7 @@ void EffectSsDeadDb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { Mtx* mtx; f32 scale; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); scale = this->rScale * 0.01f; @@ -90,7 +90,7 @@ void EffectSsDeadDb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gSPDisplayList(POLY_XLU_DISP++, this->gfx); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsDeadDb_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c b/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c index 5b51e25ac..f9c8eff71 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c @@ -97,7 +97,7 @@ void EffectSsDeadDd_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { Mtx* mtx; f32 scale; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); scale = this->rScale * 0.01f; SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); @@ -117,7 +117,7 @@ void EffectSsDeadDd_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gSPDisplayList(POLY_XLU_DISP++, gLensFlareCircleDL); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsDeadDd_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c b/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c index 2264c1678..e275729ae 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c @@ -55,7 +55,7 @@ void EffectSsDeadDs_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { Vec3f pos; CollisionPoly* floorPoly; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); scale = this->rScale * 0.01f; func_80094BC4(globalCtx->state.gfxCtx); @@ -105,7 +105,7 @@ void EffectSsDeadDs_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { PRIMITIVE, 0); gSPDisplayList(POLY_XLU_DISP++, gLensFlareCircleDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EffectSsDeadDs_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c b/soh/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c index 37c6933e8..5297c189e 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c @@ -76,7 +76,7 @@ void EffectSsDtBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; f32 scale; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); scale = this->rScale * 0.004f; Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); @@ -91,7 +91,7 @@ void EffectSsDtBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) gSPSegment(POLY_XLU_DISP++, 0x08, this->gfx); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffBubbleDL)); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsDtBubble_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c b/soh/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c index 8200791e6..4189a1f01 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c @@ -89,7 +89,7 @@ void EffectSsDust_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { Mtx* mtx; f32 scale; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); scale = this->rScale * 0.0025f; SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); @@ -125,7 +125,7 @@ void EffectSsDust_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gSPDisplayList(POLY_XLU_DISP++, this->gfx); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsDust_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c b/soh/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c index 9f43a2325..6a37f0718 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c @@ -70,7 +70,7 @@ void EffectSsEnFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { s32 pad[3]; s16 redGreen; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); camYaw = (Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)) + 0x8000); @@ -100,7 +100,7 @@ void EffectSsEnFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } typedef struct { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/soh/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c index 618deb19e..ed982b677 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c @@ -96,7 +96,7 @@ void EffectSsEnIce_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { scale = this->rScale * 0.01f; gameplayFrames = globalCtx->gameplayFrames; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (this->rAlphaMode != 0) { alpha = this->life * 12; @@ -130,7 +130,7 @@ void EffectSsEnIce_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, (u32)alpha); gSPDisplayList(POLY_XLU_DISP++, gEffIceFragment2DL); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsEnIce_UpdateFlying(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c b/soh/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c index 4d402b034..24e1f50c2 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c @@ -63,7 +63,7 @@ void EffectSsExtra_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { f32 scale = this->rScale / 100.0f; void* object = globalCtx->objectCtx.status[this->rObjBankIdx].segment; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gSegments[6] = VIRTUAL_TO_PHYSICAL(object); gSPSegment(POLY_XLU_DISP++, 0x06, object); @@ -76,7 +76,7 @@ void EffectSsExtra_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rScoreIdx])); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_yabusame_point_DL_000DC0)); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EffectSsExtra_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c b/soh/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c index f1a47ed17..ba1a1c553 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c @@ -49,7 +49,7 @@ void EffectSsFcircle_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { f32 xzScale; f32 scale; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); scale = (this->rScale * (0.5f + (this->life * 0.025f))) * 0.01f; yScale = (this->rHeight * 0.001f) * scale; @@ -68,7 +68,7 @@ void EffectSsFcircle_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0); gSPDisplayList(POLY_XLU_DISP++, this->gfx); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsFcircle_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c b/soh/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c index b885b3010..fc9294907 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c @@ -93,7 +93,7 @@ void EffectSsFhgFlash_DrawLightBall(GlobalContext* globalCtx, u32 index, EffectS scale = this->rScale / 100.0f; object = globalCtx->objectCtx.status[this->rObjBankIdx].segment; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); @@ -109,7 +109,7 @@ void EffectSsFhgFlash_DrawLightBall(GlobalContext* globalCtx, u32 index, EffectS G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, this->gfx); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsFhgFlash_DrawShock(GlobalContext* globalCtx, u32 index, EffectSs* this) { @@ -119,7 +119,7 @@ void EffectSsFhgFlash_DrawShock(GlobalContext* globalCtx, u32 index, EffectSs* t scale = this->rScale / 100.0f; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); @@ -142,7 +142,7 @@ void EffectSsFhgFlash_DrawShock(GlobalContext* globalCtx, u32 index, EffectSs* t G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, this->gfx); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsFhgFlash_UpdateLightBall(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c b/soh/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c index 2ac48918e..afdfcc805 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c @@ -74,7 +74,7 @@ void EffectSsFireTail_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) f32 temp2; f32 dist; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); scale.x = scale.y = scale.z = 0.0f; @@ -134,7 +134,7 @@ void EffectSsFireTail_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsFireTail_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c b/soh/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c index 7d7b11b9e..413df625e 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c @@ -80,7 +80,7 @@ void EffectSsGMagma2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { scale = this->rScale / 100.0f; object = globalCtx->objectCtx.status[this->rObjBankIdx].segment; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); @@ -100,7 +100,7 @@ void EffectSsGMagma2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx])); gSPDisplayList(POLY_XLU_DISP++, this->gfx); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsGMagma2_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c b/soh/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c index fe5f81e69..311998111 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c @@ -69,7 +69,7 @@ void EffectSsGRipple_DrawRipple(GlobalContext* globalCtx, EffectSs* this, void* Mtx* mtx; f32 yPos; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (globalCtx) {} @@ -98,7 +98,7 @@ void EffectSsGRipple_DrawRipple(GlobalContext* globalCtx, EffectSs* this, void* gSPDisplayList(POLY_XLU_DISP++, this->gfx); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsGRipple_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c b/soh/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c index 43ba3c6ff..0a2bc0bfa 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c @@ -81,7 +81,7 @@ void EffectSsGSpk_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { f32 scale; s32 pad; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); scale = this->rScale * 0.0025f; SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); @@ -103,7 +103,7 @@ void EffectSsGSpk_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { if (1) {} if (1) {} - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsGSpk_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c b/soh/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c index 793685494..569618921 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c @@ -71,7 +71,7 @@ void EffectSsHahen_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { s32 pad; f32 scale = this->rScale * 0.001f; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (this->rObjId != -1) { gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment); @@ -86,7 +86,7 @@ void EffectSsHahen_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { func_80093D18(globalCtx->state.gfxCtx); gSPDisplayList(POLY_OPA_DISP++, this->gfx); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } // in the original game this function is hardcoded to be used only by the skull pots in Shadow Temple @@ -95,7 +95,7 @@ void EffectSsHahen_DrawGray(GlobalContext* globalCtx, u32 index, EffectSs* this) s32 pad; f32 scale = this->rScale * 0.001f; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (this->rObjId != -1) { gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment); @@ -113,7 +113,7 @@ void EffectSsHahen_DrawGray(GlobalContext* globalCtx, u32 index, EffectSs* this) gDPSetPrimColor(POLY_OPA_DISP++, 0x0, 0x01, 100, 100, 120, 255); gSPDisplayList(POLY_OPA_DISP++, this->gfx); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsHahen_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c b/soh/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c index 480965705..9e73e1f08 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c @@ -79,7 +79,7 @@ void EffectSsHitMark_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { f32 scale; s32 pad; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); scale = this->rScale / 100.0f; @@ -98,7 +98,7 @@ void EffectSsHitMark_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0); gSPDisplayList(POLY_XLU_DISP++, this->gfx); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsHitMark_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/soh/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c index 113b70059..854f6c004 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c @@ -52,7 +52,7 @@ void EffectSsIcePiece_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) scale = this->rScale * 0.01f; frames = globalCtx->state.frames; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if ((this->rLifespan > 0) && (this->life < (this->rLifespan >> 1))) { alpha = ((this->life * 2.0f) / this->rLifespan); @@ -75,7 +75,7 @@ void EffectSsIcePiece_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) 0x40, 0x20)); gSPDisplayList(POLY_XLU_DISP++, gEffIceFragment1DL); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsIcePiece_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c b/soh/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c index a1e391f25..f31dd92d2 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c @@ -59,7 +59,7 @@ void EffectSsIceSmoke_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) object = globalCtx->objectCtx.status[this->rObjBankIdx].segment; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); objBankIdx = Object_GetIndex(&globalCtx->objectCtx, OBJECT_FZ); @@ -89,7 +89,7 @@ void EffectSsIceSmoke_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) this->life = -1; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void EffectSsIceSmoke_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/soh/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c index 47a6afcdd..426062286 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c @@ -49,7 +49,7 @@ void EffectSsKFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { xzScale = this->rXZScale / 10000.0f; yScale = this->rYScale / 10000.0f; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_Scale(xzScale, yScale, xzScale, MTXMODE_APPLY); @@ -79,7 +79,7 @@ void EffectSsKFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsKFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c b/soh/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c index 3de6c1e0e..c4fbe5598 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c @@ -96,7 +96,7 @@ void EffectSsKakera_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { scale = this->rScale / 256.0f; colorIdx = this->rColorIdx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if (this->rObjId != KAKERA_OBJECT_DEFAULT) { if ((((this->rReg4 >> 7) & 1) << 7) == 0x80) { @@ -133,7 +133,7 @@ void EffectSsKakera_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gSPDisplayList(POLY_OPA_DISP++, this->gfx); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_809A9BA8(EffectSs* this, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c b/soh/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c index cba0ca042..0c78e4e72 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c @@ -89,7 +89,7 @@ void EffectSsKiraKira_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) scale = this->rScale / 10000.0f; gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); SkinMatrix_SetRotateZYX(&mfRotY, 0, 0, this->rYaw); @@ -110,7 +110,7 @@ void EffectSsKiraKira_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) gSPDisplayList(POLY_XLU_DISP++, this->gfx); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void func_809AABF0(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c b/soh/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c index 4b435ab3b..933347fc6 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c @@ -83,7 +83,7 @@ void EffectSsLightning_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) s16 texIdx; f32 xzScale; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); yScale = this->rScale * 0.01f; texIdx = this->rLifespan - this->life; @@ -114,7 +114,7 @@ void EffectSsLightning_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) gSPDisplayList(POLY_XLU_DISP++, this->gfx); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsLightning_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c b/soh/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c index 1c4b7a955..49b04708b 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c @@ -63,7 +63,7 @@ void EffectSsSibuki_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; f32 scale = this->rScale / 100.0f; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); @@ -75,7 +75,7 @@ void EffectSsSibuki_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gSPSegment(POLY_OPA_DISP++, 0x08, this->gfx); gSPDisplayList(POLY_OPA_DISP++, SEGMENTED_TO_VIRTUAL(gEffBubbleDL)); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsSibuki_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c b/soh/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c index a4b1a2f1a..708d42e1a 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c @@ -59,7 +59,7 @@ void EffectSsSibuki2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; f32 scale = this->rScale / 100.0f; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); @@ -71,7 +71,7 @@ void EffectSsSibuki2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(bubbleTextures[this->rTexIdx])); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffUnusedBubblesDL)); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsSibuki2_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c b/soh/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c index a8952883b..66509ba23 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c @@ -232,7 +232,7 @@ void EffectSsSolderSrchBall_Draw(GlobalContext* globalCtx, u32 index, EffectSs* u32 blc2; s16* seenLink = this->actor; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); rm = Z_CMP | IM_RD | CVG_DST_FULL | FORCE_BL | ZMODE_XLU; blc1 = GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA); blc2 = GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA); @@ -250,5 +250,5 @@ void EffectSsSolderSrchBall_Draw(GlobalContext* globalCtx, u32 index, EffectSs* } draw_ico_sphere(&POLY_XLU_DISP, this->pos.x, this->pos.y, this->pos.z, 30.0f, gfxCtx); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } \ No newline at end of file diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c b/soh/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c index e1a46ea2e..0807808e9 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c @@ -52,7 +52,7 @@ void EffectSsStick_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; s32 pad; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW); @@ -71,7 +71,7 @@ void EffectSsStick_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gSPSegment(POLY_OPA_DISP++, 0x0C, gCullBackDList); gSPDisplayList(POLY_OPA_DISP++, this->gfx); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsStick_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c b/soh/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c index 78272ba0a..0f4782319 100644 --- a/soh/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c +++ b/soh/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c @@ -56,7 +56,7 @@ void EffectSsStone1_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { f32 mfW; f32 scale; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->viewProjectionMtxF, &this->pos, &mfVec, &mfW); scale = (mfW < 1500.0f) ? 3.0f : (mfW / 1500.0f) * 3.0f; @@ -71,7 +71,7 @@ void EffectSsStone1_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) { gDPSetEnvColor(POLY_XLU_DISP++, drawParams->envColor.r, drawParams->envColor.g, drawParams->envColor.b, 255); gSPDisplayList(POLY_XLU_DISP++, gUnknownEffStoneDL); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void EffectSsStone1_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) { diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index 9b83e492b..fe1dcbe5e 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -755,7 +755,7 @@ void FileChoose_DrawFileInfo(GameState* thisx, s16 fileIndex, s16 isActive) { if (1) {} - OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(this->state.gfxCtx); gDPPipeSync(POLY_OPA_DISP++); gDPSetCombineLERP(POLY_OPA_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, @@ -835,7 +835,7 @@ void FileChoose_DrawFileInfo(GameState* thisx, s16 fileIndex, s16 isActive) { } } - CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(this->state.gfxCtx); } static void* sFileInfoBoxTextures[] = { @@ -895,7 +895,7 @@ void FileChoose_DrawWindowContents(GameState* thisx) { s16 isActive; s16 pad; - OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(this->state.gfxCtx); // draw title label gDPPipeSync(POLY_OPA_DISP++); @@ -1114,7 +1114,7 @@ void FileChoose_DrawWindowContents(GameState* thisx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); - CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(this->state.gfxCtx); } void FileChoose_ConfigModeDraw(GameState* thisx) { @@ -1123,7 +1123,7 @@ void FileChoose_ConfigModeDraw(GameState* thisx) { f32 eyeY; f32 eyeZ; - OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(this->state.gfxCtx); gDPPipeSync(POLY_OPA_DISP++); eyeX = 1000.0f * Math_CosS(ZREG(11)) - 1000.0f * Math_SinS(ZREG(11)); @@ -1254,7 +1254,7 @@ void FileChoose_ConfigModeDraw(GameState* thisx) { FrameInterpolation_RecordCloseChild(); - CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(this->state.gfxCtx); } /** @@ -1555,7 +1555,7 @@ void FileChoose_SelectModeDraw(GameState* thisx) { f32 eyeY; f32 eyeZ; - OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(this->state.gfxCtx); gDPPipeSync(POLY_OPA_DISP++); @@ -1604,7 +1604,7 @@ void FileChoose_SelectModeDraw(GameState* thisx) { gDPPipeSync(POLY_OPA_DISP++); FileChoose_SetView(this, 0.0f, 0.0f, 64.0f); - CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(this->state.gfxCtx); } static void (*gFileSelectDrawFuncs[])(GameState*) = { @@ -1632,7 +1632,7 @@ void FileChoose_Main(GameState* thisx) { gSaveContext.skyboxTime += 0x10; } - OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(this->state.gfxCtx); this->n64ddFlag = 0; @@ -1781,7 +1781,7 @@ void FileChoose_Main(GameState* thisx) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 0, sScreenFillAlpha); gDPFillRectangle(POLY_OPA_DISP++, 0, 0, gScreenWidth - 1, gScreenHeight - 1); - CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(this->state.gfxCtx); } void FileChoose_InitContext(GameState* thisx) { diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c index 16e2ccb63..2a754c7df 100644 --- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c +++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c @@ -19,13 +19,13 @@ static s16 D_80812544[] = { }; void FileChoose_DrawCharacter(GraphicsContext* gfxCtx, void* texture, s16 vtx) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gDPLoadTextureBlock_4b(POLY_OPA_DISP++, texture, G_IM_FMT_I, 16, 16, 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); gSP1Quadrangle(POLY_OPA_DISP++, vtx, vtx + 2, vtx + 3, vtx + 1, 0); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void FileChoose_SetKeyboardVtx(GameState* thisx) { @@ -118,7 +118,7 @@ void FileChoose_SetNameEntryVtx(GameState* thisx) { if (1) {} if (1) {} - OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(this->state.gfxCtx); gDPPipeSync(POLY_OPA_DISP++); gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, @@ -238,7 +238,7 @@ void FileChoose_SetNameEntryVtx(GameState* thisx) { this->nameEntryVtx[0x29].v.tc[0] = this->nameEntryVtx[0x2B].v.tc[0] = 0x500; } - CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(this->state.gfxCtx); } void FileChoose_DrawKeyboard(GameState* thisx) { @@ -248,7 +248,7 @@ void FileChoose_DrawKeyboard(GameState* thisx) { s16 tmp; s16 vtx = 0; - OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(this->state.gfxCtx); func_800949A8(this->state.gfxCtx); gDPSetCycleType(POLY_OPA_DISP++, G_CYC_2CYCLE); @@ -270,7 +270,7 @@ void FileChoose_DrawKeyboard(GameState* thisx) { gSPVertex(POLY_OPA_DISP++, &this->keyboardVtx[0x100], 4, 0); FileChoose_DrawCharacter(this->state.gfxCtx, font->fontBuf + D_808123F0[i] * FONT_CHAR_TEX_SIZE, 0); - CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(this->state.gfxCtx); } void FileChoose_DrawNameEntry(GameState* thisx) { @@ -283,7 +283,7 @@ void FileChoose_DrawNameEntry(GameState* thisx) { s16 validName; char* filename = Save_GetSaveMetaInfo(this->buttonIndex)->playerName; - OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(this->state.gfxCtx); FileChoose_SetKeyboardVtx(&this->state); FileChoose_SetNameEntryVtx(&this->state); @@ -494,7 +494,7 @@ void FileChoose_DrawNameEntry(GameState* thisx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA); - CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(this->state.gfxCtx); } /** @@ -818,7 +818,7 @@ void FileChoose_DrawOptionsImpl(GameState* thisx) { s16 j; s16 vtx; - OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(this->state.gfxCtx); cursorRed = ABS(cursorPrimRed - cursorPrimColors[cursorPulseDir][0]) / cursorFlashTimer; cursorGreen = ABS(cursorPrimGreen - cursorPrimColors[cursorPulseDir][1]) / cursorFlashTimer; @@ -1006,7 +1006,7 @@ void FileChoose_DrawOptionsImpl(GameState* thisx) { gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0); Matrix_Pop(); - CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(this->state.gfxCtx); } void FileChoose_DrawOptions(GameState* thisx) { diff --git a/soh/src/overlays/gamestates/ovl_select/z_select.c b/soh/src/overlays/gamestates/ovl_select/z_select.c index 02f782635..859d07f3b 100644 --- a/soh/src/overlays/gamestates/ovl_select/z_select.c +++ b/soh/src/overlays/gamestates/ovl_select/z_select.c @@ -513,7 +513,7 @@ void Select_DrawMenu(SelectContext* this) { GraphicsContext* gfxCtx = this->state.gfxCtx; GfxPrint* printer; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x00, NULL); func_80095248(gfxCtx, 0, 0, 0); @@ -530,14 +530,14 @@ void Select_DrawMenu(SelectContext* this) { POLY_OPA_DISP = GfxPrint_Close(printer); GfxPrint_Destroy(printer); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void Select_DrawLoadingScreen(SelectContext* this) { GraphicsContext* gfxCtx = this->state.gfxCtx; GfxPrint* printer; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x00, NULL); func_80095248(gfxCtx, 0, 0, 0); @@ -552,13 +552,13 @@ void Select_DrawLoadingScreen(SelectContext* this) { POLY_OPA_DISP = GfxPrint_Close(printer); GfxPrint_Destroy(printer); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void Select_Draw(SelectContext* this) { GraphicsContext* gfxCtx = this->state.gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x00, NULL); func_80095248(gfxCtx, 0, 0, 0); @@ -571,7 +571,7 @@ void Select_Draw(SelectContext* this) { Select_DrawMenu(this); } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void Select_Main(GameState* thisx) { diff --git a/soh/src/overlays/gamestates/ovl_title/z_title.c b/soh/src/overlays/gamestates/ovl_title/z_title.c index a253742d4..f90f75eca 100644 --- a/soh/src/overlays/gamestates/ovl_title/z_title.c +++ b/soh/src/overlays/gamestates/ovl_title/z_title.c @@ -166,7 +166,7 @@ void Title_Draw(TitleContext* this) { Vec3f v2; s32 pad2[2]; - OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(this->state.gfxCtx); v3.x = 69; v3.y = 69; @@ -216,7 +216,7 @@ void Title_Draw(TitleContext* this) { sTitleRotY += 300; - CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(this->state.gfxCtx); } void Title_Main(GameState* thisx) { @@ -288,7 +288,7 @@ void Title_Main(GameState* thisx) { return; } - OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(this->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0, NULL); gSPSegment(POLY_OPA_DISP++, 1, this->staticSegment); @@ -316,7 +316,7 @@ void Title_Main(GameState* thisx) { SET_NEXT_GAMESTATE(&this->state, Opening_Init, OpeningContext); } - CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(this->state.gfxCtx); } void Title_Destroy(GameState* thisx) { diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c index b926b6c94..23ce66d57 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c @@ -76,7 +76,7 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx s16 sp208[3]; bool dpad = CVar_GetS32("gDpadPauseName", 0); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if ((!pauseCtx->unk_1E4 || (pauseCtx->unk_1E4 == 5) || (pauseCtx->unk_1E4 == 8)) && (pauseCtx->pageIndex == PAUSE_QUEST)) { @@ -694,7 +694,7 @@ void KaleidoScope_DrawQuestStatus(GlobalContext* globalCtx, GraphicsContext* gfx } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } s32 KaleidoScope_UpdateQuestStatusPoint(PauseContext* pauseCtx, s32 point) { diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c index d4a51dc6e..25415a08a 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c @@ -82,7 +82,7 @@ void KaleidoScope_DrawDebugEditorText(Gfx** gfxp) { extern const char* digitTextures[]; void KaleidoScope_DrawDigit(GlobalContext* globalCtx, s32 digit, s32 rectLeft, s32 rectTop) { - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPLoadTextureBlock(POLY_KAL_DISP++, digitTextures[digit], G_IM_FMT_I, G_IM_SIZ_8b, 8, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, @@ -90,7 +90,7 @@ void KaleidoScope_DrawDigit(GlobalContext* globalCtx, s32 digit, s32 rectLeft, s gSPTextureRectangle(POLY_KAL_DISP++, rectLeft << 2, rectTop << 2, (rectLeft + 8) << 2, (rectTop + 16) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void KaleidoScope_DrawDebugEditor(GlobalContext* globalCtx) { @@ -110,7 +110,7 @@ void KaleidoScope_DrawDebugEditor(GlobalContext* globalCtx) { s16 y; s32 dBtnInput = input->cur.button & (BTN_DUP | BTN_DDOWN | BTN_DLEFT | BTN_DRIGHT); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); pauseCtx->stickRelX = input->rel.stick_x; pauseCtx->stickRelY = input->rel.stick_y; @@ -650,5 +650,5 @@ void KaleidoScope_DrawDebugEditor(GlobalContext* globalCtx) { pauseCtx->debugState = 0; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index 36f44c9b5..02ca258d3 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -27,7 +27,7 @@ void KaleidoScope_DrawEquipmentImage(GlobalContext* globalCtx, void* source, u32 s32 pad; s32 i; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPPipeSync(POLY_KAL_DISP++); gDPSetCombineMode(POLY_KAL_DISP++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); @@ -86,7 +86,7 @@ void KaleidoScope_DrawEquipmentImage(GlobalContext* globalCtx, void* source, u32 vtxIndex += 4; } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } Vec3s link_kaleido_rot = { 0, 32300, 0 }; // Default rotation link face us. @@ -166,7 +166,7 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) { s16 oldCursorPoint; bool dpad = CVar_GetS32("gDpadPauseName", 0); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPPipeSync(POLY_KAL_DISP++); gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, ZREG(39), ZREG(40), ZREG(41), pauseCtx->alpha); @@ -682,5 +682,5 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) { if (gUpgradeMasks[0]) {} - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c index e2596dbcf..4d6239780 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c @@ -20,7 +20,7 @@ void KaleidoScope_DrawAmmoCount(PauseContext* pauseCtx, GraphicsContext* gfxCtx, s16 ammo; s16 i; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); ammo = AMMO(item); @@ -67,7 +67,7 @@ void KaleidoScope_DrawAmmoCount(PauseContext* pauseCtx, GraphicsContext* gfxCtx, gSP1Quadrangle(POLY_KAL_DISP++, 0, 2, 3, 1, 0); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void KaleidoScope_SetCursorVtx(PauseContext* pauseCtx, u16 index, Vtx* vtx) { @@ -98,7 +98,7 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) { s16 moveCursorResult; bool dpad = CVar_GetS32("gDpadPauseName", 0); - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); func_800949A8(globalCtx->state.gfxCtx); @@ -465,7 +465,7 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void KaleidoScope_SetupItemEquip(GlobalContext* globalCtx, u16 item, u16 slot, s16 animX, s16 animY) { diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c index a135f1637..9e9d2791e 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c @@ -54,7 +54,7 @@ void KaleidoScope_DrawDungeonMap(GlobalContext* globalCtx, GraphicsContext* gfxC u16 rgba16; bool dpad = CVar_GetS32("gDpadPauseName", 0); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if ((pauseCtx->state == 6) && (pauseCtx->unk_1E4 == 0) && (pauseCtx->pageIndex == PAUSE_MAP)) { pauseCtx->cursorColorSet = 0; @@ -358,7 +358,7 @@ void KaleidoScope_DrawDungeonMap(GlobalContext* globalCtx, GraphicsContext* gfxC gDPPipeSync(POLY_KAL_DISP++); gDPSetTextureFilter(POLY_KAL_DISP++, G_TF_BILERP); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void KaleidoScope_DrawWorldMap(GlobalContext* globalCtx, GraphicsContext* gfxCtx) { @@ -421,7 +421,7 @@ void KaleidoScope_DrawWorldMap(GlobalContext* globalCtx, GraphicsContext* gfxCtx s16 stepB; bool dpad = CVar_GetS32("gDpadPauseName", 0); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if ((pauseCtx->state == 6) && (pauseCtx->unk_1E4 == 0) && (pauseCtx->pageIndex == PAUSE_MAP)) { pauseCtx->cursorColorSet = 0; @@ -741,5 +741,5 @@ void KaleidoScope_DrawWorldMap(GlobalContext* globalCtx, GraphicsContext* gfxCtx gDPPipeSync(POLY_KAL_DISP++); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c index 57c53c11a..892bc4019 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c @@ -853,14 +853,14 @@ void KaleidoScope_MoveCursorToSpecialPos(GlobalContext* globalCtx, u16 specialPo } void KaleidoScope_DrawQuadTextureRGBA32(GraphicsContext* gfxCtx, void* texture, u16 width, u16 height, u16 point) { - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); gDPLoadTextureBlock(POLY_KAL_DISP++, texture, G_IM_FMT_RGBA, G_IM_SIZ_32b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); gSP1Quadrangle(POLY_KAL_DISP++, point, point + 2, point + 3, point + 1, 0); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void KaleidoScope_SetDefaultCursor(GlobalContext* globalCtx) { @@ -981,7 +981,7 @@ void KaleidoScope_DrawCursor(GlobalContext* globalCtx, u16 pageIndex) { PauseContext* pauseCtx = &globalCtx->pauseCtx; u16 temp; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); temp = pauseCtx->unk_1E4; @@ -1036,7 +1036,7 @@ void KaleidoScope_DrawCursor(GlobalContext* globalCtx, u16 pageIndex) { gDPSetEnvColor(POLY_KAL_DISP++, 0, 0, 0, 255); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } Gfx* KaleidoScope_DrawPageSections(Gfx* gfx, Vtx* vertices, void** textures) { @@ -1131,7 +1131,7 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) { s16 stepB; FrameInterpolation_RecordOpenChild(NULL, pauseCtx->state + pauseCtx->pageIndex * 100); - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); if ((pauseCtx->state < 8) || (pauseCtx->state > 0x11)) { if (pauseCtx->state != 7) { @@ -1553,7 +1553,7 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) { } } - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); FrameInterpolation_RecordCloseChild(); } @@ -1617,7 +1617,7 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) { s16 i; s16 j; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); stepR = ABS(D_808321A0 - D_8082ADF0[D_8082AE04][0]) / D_8082AE00; stepG = ABS(D_808321A2 - D_8082ADF0[D_8082AE04][1]) / D_8082AE00; @@ -2050,7 +2050,7 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void KaleidoScope_UpdateNamePanel(GlobalContext* globalCtx) { @@ -2938,7 +2938,7 @@ void KaleidoScope_InitVertices(GlobalContext* globalCtx, GraphicsContext* gfxCtx void KaleidoScope_DrawGameOver(GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(gfxCtx); func_800944C4(gfxCtx); @@ -2977,7 +2977,7 @@ void KaleidoScope_DrawGameOver(GlobalContext* globalCtx) { gSPTextureRectangle(POLY_KAL_DISP++, (VREG(87) + 128) << 2, VREG(88) << 2, (VREG(87) + 192) << 2, (VREG(88) + 32) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); - CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(gfxCtx); } void KaleidoScope_Draw(GlobalContext* globalCtx) { @@ -2985,7 +2985,7 @@ void KaleidoScope_Draw(GlobalContext* globalCtx) { PauseContext* pauseCtx = &globalCtx->pauseCtx; InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); pauseCtx->stickRelX = input->rel.stick_x; pauseCtx->stickRelY = input->rel.stick_y; @@ -3027,7 +3027,7 @@ void KaleidoScope_Draw(GlobalContext* globalCtx) { func_800AAA50(&globalCtx->view, 15); - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } uint32_t _bswap32(uint32_t a) diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c index 0b26c805c..6e443583e 100644 --- a/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c +++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c @@ -53,7 +53,7 @@ void PauseMapMark_DrawForDungeon(GlobalContext* globalCtx) { mapMarkData = &gLoadedPauseMarkDataTable[R_MAP_TEX_INDEX >> 1][i]; - OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx); while (true) { if (mapMarkData->markType == PAUSE_MAP_MARK_NONE) { @@ -144,7 +144,7 @@ void PauseMapMark_DrawForDungeon(GlobalContext* globalCtx) { Matrix_Pop(); } - CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void PauseMapMark_Draw(GlobalContext* globalCtx) {