From 2e793f0d5619c3e55e4498fbfc82e80e3c120fb7 Mon Sep 17 00:00:00 2001 From: Baoulettes Date: Sun, 26 Jun 2022 22:54:35 +0200 Subject: [PATCH] Almost all overlay --- .../ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c | 8 +- .../z_bg_spot08_iceblock.c | 4 +- .../ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c | 8 +- .../ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c | 6 +- .../ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c | 2 +- .../ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c | 2 +- .../ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c | 4 +- .../ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c | 6 +- .../z_bg_spot16_bombstone.c | 14 +- .../z_bg_spot16_doughnut.c | 12 +- .../z_bg_spot17_bakudankabe.c | 12 +- .../ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c | 6 +- .../ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c | 2 +- .../ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c | 6 +- .../actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c | 6 +- .../ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c | 18 +-- .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c | 6 +- .../actors/ovl_Bg_Treemouth/z_bg_treemouth.c | 6 +- .../actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c | 6 +- .../actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c | 6 +- .../actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c | 12 +- soh/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c | 6 +- .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 16 +-- .../overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 32 ++--- .../overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c | 22 +-- .../actors/ovl_Boss_Ganon/z_boss_ganon.c | 102 +++++++------- .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 94 ++++++------- .../ovl_Boss_Ganondrof/z_boss_ganondrof.c | 4 +- .../actors/ovl_Boss_Goma/z_boss_goma.c | 12 +- .../overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 42 +++--- .../overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 20 +-- .../overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 132 +++++++++--------- .../overlays/actors/ovl_Boss_Va/z_boss_va.c | 54 +++---- .../overlays/actors/ovl_Demo_6K/z_demo_6k.c | 44 +++--- .../overlays/actors/ovl_Demo_Du/z_demo_du.c | 4 +- .../overlays/actors/ovl_Demo_Ec/z_demo_ec.c | 12 +- .../actors/ovl_Demo_Effect/z_demo_effect.c | 84 +++++------ .../overlays/actors/ovl_Demo_Ext/z_demo_ext.c | 6 +- .../actors/ovl_Demo_Geff/z_demo_geff.c | 10 +- .../overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 12 +- .../overlays/actors/ovl_Demo_Go/z_demo_go.c | 4 +- .../overlays/actors/ovl_Demo_Gt/z_demo_gt.c | 6 +- .../overlays/actors/ovl_Demo_Ik/z_demo_ik.c | 12 +- .../overlays/actors/ovl_Demo_Im/z_demo_im.c | 4 +- .../actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 46 +++--- .../actors/ovl_Demo_Kekkai/z_demo_kekkai.c | 16 +-- .../overlays/actors/ovl_Demo_Sa/z_demo_sa.c | 4 +- .../overlays/actors/ovl_Demo_Shd/z_demo_shd.c | 6 +- .../actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c | 10 +- .../overlays/actors/ovl_Door_Ana/z_door_ana.c | 6 +- .../actors/ovl_Door_Gerudo/z_door_gerudo.c | 6 +- .../actors/ovl_Door_Killer/z_door_killer.c | 4 +- .../actors/ovl_Door_Shutter/z_door_shutter.c | 12 +- .../actors/ovl_Door_Warp1/z_door_warp1.c | 18 +-- .../actors/ovl_Efc_Erupc/z_efc_erupc.c | 14 +- .../overlays/actors/ovl_Eff_Dust/z_eff_dust.c | 14 +- .../overlays/actors/ovl_Elf_Msg/z_elf_msg.c | 10 +- .../overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c | 12 +- 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 | 6 +- .../ovl_En_Anubice_Fire/z_en_anubice_fire.c | 6 +- .../overlays/actors/ovl_En_Arrow/z_en_arrow.c | 8 +- soh/src/overlays/actors/ovl_En_Ba/z_en_ba.c | 10 +- soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c | 6 +- .../actors/ovl_En_Bdfire/z_en_bdfire.c | 6 +- .../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 | 10 +- soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c | 8 +- .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 4 +- .../actors/ovl_En_Bom_Chu/z_en_bom_chu.c | 6 +- .../overlays/actors/ovl_En_Bombf/z_en_bombf.c | 10 +- .../overlays/actors/ovl_En_Boom/z_en_boom.c | 6 +- soh/src/overlays/actors/ovl_En_Box/z_en_box.c | 14 +- .../actors/ovl_En_Bubble/z_en_bubble.c | 6 +- .../overlays/actors/ovl_En_Butte/z_en_butte.c | 6 +- soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c | 8 +- soh/src/overlays/actors/ovl_En_Bx/z_en_bx.c | 8 +- .../actors/ovl_En_Clear_Tag/z_en_clear_tag.c | 28 ++-- soh/src/overlays/actors/ovl_En_Cs/z_en_cs.c | 6 +- .../overlays/actors/ovl_En_Daiku/z_en_daiku.c | 8 +- .../z_en_daiku_kakariko.c | 8 +- .../actors/ovl_En_Dekubaba/z_en_dekubaba.c | 32 ++--- soh/src/overlays/actors/ovl_En_Dh/z_en_dh.c | 6 +- .../ovl_En_Diving_Game/z_en_diving_game.c | 4 +- .../actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c | 6 +- .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c | 16 +-- 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 | 6 +- .../overlays/actors/ovl_En_Eiyer/z_en_eiyer.c | 4 +- soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c | 10 +- .../actors/ovl_En_Encount2/z_en_encount2.c | 6 +- .../actors/ovl_En_Ex_Item/z_en_ex_item.c | 6 +- .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 6 +- soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c | 16 +-- .../actors/ovl_En_Fd_Fire/z_en_fd_fire.c | 6 +- .../actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c | 12 +- .../actors/ovl_En_Fire_Rock/z_en_fire_rock.c | 6 +- .../actors/ovl_En_Firefly/z_en_firefly.c | 8 +- .../overlays/actors/ovl_En_Fish/z_en_fish.c | 8 +- .../actors/ovl_En_Floormas/z_en_floormas.c | 10 +- soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c | 22 +-- soh/src/overlays/actors/ovl_En_Fu/z_en_fu.c | 4 +- soh/src/overlays/actors/ovl_En_Fw/z_en_fw.c | 6 +- soh/src/overlays/actors/ovl_En_Fz/z_en_fz.c | 12 +- .../actors/ovl_En_G_Switch/z_en_g_switch.c | 18 +-- .../ovl_En_Ganon_Mant/z_en_ganon_mant.c | 6 +- .../ovl_En_Ganon_Organ/z_en_ganon_organ.c | 6 +- soh/src/overlays/actors/ovl_En_Gb/z_en_gb.c | 10 +- soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 12 +- soh/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 6 +- soh/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c | 8 +- .../overlays/actors/ovl_En_GeldB/z_en_geldb.c | 8 +- .../overlays/actors/ovl_En_GirlA/z_en_girla.c | 4 +- soh/src/overlays/actors/ovl_En_Gm/z_en_gm.c | 8 +- soh/src/overlays/actors/ovl_En_Go/z_en_go.c | 22 +-- soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c | 16 +-- .../overlays/actors/ovl_En_Goma/z_en_goma.c | 14 +- .../actors/ovl_En_Goroiwa/z_en_goroiwa.c | 6 +- soh/src/overlays/actors/ovl_En_Gs/z_en_gs.c | 8 +- .../overlays/actors/ovl_En_Guest/z_en_guest.c | 12 +- .../actors/ovl_En_Heishi2/z_en_heishi2.c | 12 +- .../overlays/actors/ovl_En_Holl/z_en_holl.c | 6 +- .../actors/ovl_En_Honotrap/z_en_honotrap.c | 14 +- .../overlays/actors/ovl_En_Horse/z_en_horse.c | 6 +- .../z_en_horse_game_check.c | 2 +- .../z_en_horse_link_child.c | 4 +- .../ovl_En_Horse_Normal/z_en_horse_normal.c | 6 +- soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c | 12 +- .../actors/ovl_En_Ice_Hono/z_en_ice_hono.c | 6 +- soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c | 18 +-- soh/src/overlays/actors/ovl_En_In/z_en_in.c | 8 +- .../actors/ovl_En_Insect/z_en_insect.c | 4 +- .../overlays/actors/ovl_En_Ishi/z_en_ishi.c | 8 +- soh/src/overlays/actors/ovl_En_Jj/z_en_jj.c | 4 +- .../actors/ovl_En_Jsjutan/z_en_jsjutan.c | 8 +- .../actors/ovl_En_Kanban/z_en_kanban.c | 12 +- .../actors/ovl_En_Karebaba/z_en_karebaba.c | 18 +-- soh/src/overlays/actors/ovl_En_Ko/z_en_ko.c | 4 +- .../overlays/actors/ovl_En_Kusa/z_en_kusa.c | 4 +- soh/src/overlays/actors/ovl_En_Kz/z_en_kz.c | 4 +- .../overlays/actors/ovl_En_Light/z_en_light.c | 6 +- .../actors/ovl_En_M_Thunder/z_en_m_thunder.c | 8 +- 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 | 10 +- soh/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c | 6 +- soh/src/overlays/actors/ovl_En_Mu/z_en_mu.c | 4 +- soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c | 4 +- soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c | 6 +- .../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 | 8 +- soh/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c | 8 +- soh/src/overlays/actors/ovl_En_Ny/z_en_ny.c | 14 +- .../overlays/actors/ovl_En_Okuta/z_en_okuta.c | 8 +- .../overlays/actors/ovl_En_Ossan/z_en_ossan.c | 70 +++++----- soh/src/overlays/actors/ovl_En_Owl/z_en_owl.c | 6 +- .../overlays/actors/ovl_En_Part/z_en_part.c | 6 +- .../actors/ovl_En_Peehat/z_en_peehat.c | 12 +- .../actors/ovl_En_Po_Desert/z_en_po_desert.c | 6 +- .../actors/ovl_En_Po_Field/z_en_po_field.c | 22 +-- .../actors/ovl_En_Po_Relay/z_en_po_relay.c | 14 +- .../ovl_En_Po_Sisters/z_en_po_sisters.c | 10 +- soh/src/overlays/actors/ovl_En_Poh/z_en_poh.c | 22 +-- 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 | 4 +- soh/src/overlays/actors/ovl_En_Rr/z_en_rr.c | 12 +- soh/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 8 +- soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 4 +- 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 | 8 +- .../actors/ovl_En_Shopnuts/z_en_shopnuts.c | 6 +- .../actors/ovl_En_Siofuki/z_en_siofuki.c | 6 +- soh/src/overlays/actors/ovl_En_Skb/z_en_skb.c | 4 +- soh/src/overlays/actors/ovl_En_Skj/z_en_skj.c | 10 +- .../actors/ovl_En_Skjneedle/z_en_skjneedle.c | 6 +- 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 | 10 +- .../actors/ovl_En_Stream/z_en_stream.c | 6 +- soh/src/overlays/actors/ovl_En_Sw/z_en_sw.c | 12 +- .../ovl_En_Syateki_Niw/z_en_syateki_niw.c | 6 +- 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 | 12 +- .../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 | 8 +- .../actors/ovl_En_Torch2/z_en_torch2.c | 4 +- soh/src/overlays/actors/ovl_En_Tp/z_en_tp.c | 8 +- soh/src/overlays/actors/ovl_En_Tr/z_en_tr.c | 6 +- .../overlays/actors/ovl_En_Vali/z_en_vali.c | 18 +-- .../actors/ovl_En_Vb_Ball/z_en_vb_ball.c | 8 +- .../actors/ovl_En_Viewer/z_en_viewer.c | 36 ++--- soh/src/overlays/actors/ovl_En_Vm/z_en_vm.c | 10 +- .../actors/ovl_En_Wallmas/z_en_wallmas.c | 12 +- .../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 | 8 +- soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c | 4 +- .../actors/ovl_En_Yukabyun/z_en_yukabyun.c | 6 +- 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 | 24 ++-- soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 22 +-- soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c | 4 +- soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c | 4 +- soh/src/overlays/actors/ovl_En_fHG/z_en_fhg.c | 4 +- .../actors/ovl_End_Title/z_end_title.c | 14 +- .../overlays/actors/ovl_Fishing/z_fishing.c | 92 ++++++------ .../actors/ovl_Item_B_Heart/z_item_b_heart.c | 8 +- .../ovl_Item_Etcetera/z_item_etcetera.c | 4 +- .../actors/ovl_Item_Ocarina/z_item_ocarina.c | 2 +- .../actors/ovl_Item_Shield/z_item_shield.c | 6 +- .../actors/ovl_Magic_Dark/z_magic_dark.c | 14 +- .../actors/ovl_Magic_Fire/z_magic_fire.c | 6 +- .../actors/ovl_Magic_Wind/z_magic_wind.c | 14 +- .../overlays/actors/ovl_Mir_Ray/z_mir_ray.c | 12 +- .../overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 6 +- .../overlays/actors/ovl_Obj_Comb/z_obj_comb.c | 6 +- .../actors/ovl_Obj_Dekujr/z_obj_dekujr.c | 8 +- .../actors/ovl_Obj_Elevator/z_obj_elevator.c | 2 +- .../actors/ovl_Obj_Hamishi/z_obj_hamishi.c | 6 +- .../actors/ovl_Obj_Hsblock/z_obj_hsblock.c | 8 +- .../actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c | 6 +- .../overlays/actors/ovl_Obj_Lift/z_obj_lift.c | 2 +- .../ovl_Obj_Lightswitch/z_obj_lightswitch.c | 22 +-- .../ovl_Obj_Makekinsuta/z_obj_makekinsuta.c | 2 +- .../ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c | 4 +- .../overlays/actors/ovl_Obj_Mure/z_obj_mure.c | 20 +-- .../actors/ovl_Obj_Mure2/z_obj_mure2.c | 2 +- .../actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c | 14 +- .../actors/ovl_Obj_Switch/z_obj_switch.c | 22 +-- .../actors/ovl_Obj_Syokudai/z_obj_syokudai.c | 8 +- .../ovl_Obj_Timeblock/z_obj_timeblock.c | 6 +- .../actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 2 +- .../ovl_Obj_Warp2block/z_obj_warp2block.c | 8 +- .../ovl_Object_Kankyo/z_object_kankyo.c | 34 ++--- .../actors/ovl_Oceff_Spot/z_oceff_spot.c | 6 +- .../actors/ovl_Oceff_Storm/z_oceff_storm.c | 10 +- .../actors/ovl_Oceff_Wipe/z_oceff_wipe.c | 6 +- .../actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c | 6 +- 252 files changed, 1424 insertions(+), 1424 deletions(-) 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 4970e4775..d952deb11 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,11 +70,11 @@ void BgSpot07Taki_Draw(Actor* thisx, GlobalContext* globalCtx) { BgSpot07Taki* this = (BgSpot07Taki*)thisx; u32 frames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot07_taki.c", 169); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); frames = globalCtx->gameplayFrames; if (LINK_IS_ADULT) { func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot07_taki.c", 177), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->dyna.actor.params == 0) { gSPDisplayList(POLY_OPA_DISP++, object_spot07_object_DL_001CF0); @@ -84,7 +84,7 @@ void BgSpot07Taki_Draw(Actor* thisx, GlobalContext* globalCtx) { } func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot07_taki.c", 191), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, @@ -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, "../z_bg_spot07_taki.c", 272); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/soh/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c index eeb778f53..1f352c4a9 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c @@ -50,7 +50,7 @@ void BgSpot08Iceblock_InitDynaPoly(BgSpot08Iceblock* this, GlobalContext* global this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { // "Warning: move BG registration failed" - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot08_iceblock.c", 0xD9, + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->dyna.actor.id, this->dyna.actor.params); } } @@ -63,7 +63,7 @@ void BgSpot08Iceblock_CheckParams(BgSpot08Iceblock* this) { break; default: // "Error: arg_data setting error" - osSyncPrintf("Error : arg_data 設定ミスです。(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot08_iceblock.c", 0xF6, + osSyncPrintf("Error : arg_data 設定ミスです。(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->dyna.actor.params); this->dyna.actor.params = 0x10; break; 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 0347d4f66..e96733569 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 @@ -143,7 +143,7 @@ void BgSpot09Obj_Init(Actor* thisx, GlobalContext* globalCtx) { this->dyna.actor.params &= 0xFF; if ((this->dyna.actor.params < 0) || (this->dyna.actor.params >= 5)) { osSyncPrintf("Error : Spot 09 object の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n", - "../z_bg_spot09_obj.c", 322, this->dyna.actor.params); + __FILE__, __LINE__, this->dyna.actor.params); } if (!func_808B1C70(this, globalCtx)) { @@ -169,14 +169,14 @@ void BgSpot09Obj_Draw(Actor* thisx, GlobalContext* globalCtx) { Gfx_DrawDListOpa(globalCtx, sDLists[thisx->params]); if (thisx->params == 3) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 388); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 391), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gCarpentersTentEntranceDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 396); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } 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 90627853d..285be3d2b 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,13 +151,13 @@ void BgSpot11Oasis_Update(Actor* thisx, GlobalContext* globalCtx) { void BgSpot11Oasis_Draw(Actor* thisx, GlobalContext* globalCtx) { u32 gameplayFrames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot11_oasis.c", 327); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot11_oasis.c", 331), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, 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, "../z_bg_spot11_oasis.c", 346); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/soh/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index f553f755c..0977b187a 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -52,7 +52,7 @@ void BgSpot12Gate_InitDynaPoly(BgSpot12Gate* this, GlobalContext* globalCtx, Col CollisionHeader_GetVirtual(collision, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot12_gate.c", 145, + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->dyna.actor.id, this->dyna.actor.params); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index d5f0105ee..771049931 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -50,7 +50,7 @@ void func_808B3420(BgSpot12Saku* this, GlobalContext* globalCtx, CollisionHeader CollisionHeader_GetVirtual(collision, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot12_saku.c", 140, + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->dyna.actor.id, this->dyna.actor.params); } } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/soh/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index 684336e17..3bce9a3a4 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -66,7 +66,7 @@ void func_808B3960(BgSpot15Rrbox* this, GlobalContext* globalCtx, CollisionHeade this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot15_rrbox.c", 171, + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->dyna.actor.id, this->dyna.actor.params); } } @@ -323,7 +323,7 @@ void func_808B43D0(BgSpot15Rrbox* this, GlobalContext* globalCtx) { if (actor->world.pos.y <= BGCHECK_Y_MIN + 10.0f) { // "Lon Lon wooden crate fell too much" - osSyncPrintf("Warning : ロンロン木箱落ちすぎた(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot15_rrbox.c", 599, + osSyncPrintf("Warning : ロンロン木箱落ちすぎた(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, actor->params); Actor_Kill(actor); 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 9f0e33bee..22bced110 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,13 +95,13 @@ void BgSpot15Saku_Update(Actor* thisx, GlobalContext* globalCtx) { } void BgSpot15Saku_Draw(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 259); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 263), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gLonLonCorralFenceDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 268); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 94f4a1546..bc2394bb6 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 @@ -223,8 +223,8 @@ s32 func_808B4E58(BgSpot16Bombstone* this, GlobalContext* globalctx) { this->bombiwaBankIndex = Object_GetIndex(&globalctx->objectCtx, OBJECT_BOMBIWA); if (this->bombiwaBankIndex < 0) { - osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", actor->params, "../z_bg_spot16_bombstone.c", - 589); + osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", actor->params, __FILE__, + __LINE__); return false; } @@ -253,7 +253,7 @@ void BgSpot16Bombstone_Init(Actor* thisx, GlobalContext* globalCtx) { shouldLive = func_808B4E58(this, globalCtx); break; default: - osSyncPrintf("Error : arg_data おかしいな(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot16_bombstone.c", 668, + osSyncPrintf("Error : arg_data おかしいな(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->actor.params); shouldLive = false; break; @@ -387,7 +387,7 @@ void func_808B56BC(BgSpot16Bombstone* this, GlobalContext* globalCtx) { player->actor.world.pos.z += sinValue * this->cosRotation; } else { osSyncPrintf("Error 補正出来ない(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n", - "../z_bg_spot16_bombstone.c", 935, this->actor.params, adjustedYawDiff); + __FILE__, __LINE__, this->actor.params, adjustedYawDiff); } } } @@ -535,11 +535,11 @@ void BgSpot16Bombstone_Draw(Actor* thisx, GlobalContext* globalCtx) { BgSpot16Bombstone* this = (BgSpot16Bombstone*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_bombstone.c", 1253); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot16_bombstone.c", 1257), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->actor.params == 0xFF) { @@ -551,7 +551,7 @@ void BgSpot16Bombstone_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, this->dList); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_bombstone.c", 1274); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 4ccef9840..1ae16f9b5 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,13 +122,13 @@ void BgSpot16Doughnut_Draw(Actor* thisx, GlobalContext* globalCtx) { u32 scroll = globalCtx->gameplayFrames & 0xFFFF; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 210); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); if (1) {} - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 213), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->fireFlag & 1) { gSPSegment( @@ -142,22 +142,22 @@ void BgSpot16Doughnut_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gDeathMountainCloudCircleNormalDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 238); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } // Draw function for outwardly expanding and dissipating void BgSpot16Doughnut_DrawExpanding(Actor* thisx, GlobalContext* globalCtx) { BgSpot16Doughnut* this = (BgSpot16Doughnut*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 245); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 248), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, this->envColorAlpha); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); gSPDisplayList(POLY_XLU_DISP++, gDeathMountainCloudCircleNormalDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 256); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 dbcb1cdcc..241ce711a 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,11 +128,11 @@ 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, "../z_bg_spot17_bakudankabe.c", 269); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 273), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); r = (r >> 1) + 0xC0; @@ -142,15 +142,15 @@ void BgSpot17Bakudankabe_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gCraterBombableWallDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 283); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 286); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 290), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gCraterBombableWallCracksDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 295); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 cba00884f..a143aef81 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,14 +55,14 @@ void func_808B746C(Actor* thisx, GlobalContext* globalCtx) { void func_808B7478(Actor* thisx, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot17_funen.c", 153); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); Matrix_RotateY((s16)(Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)) - thisx->shape.rot.y + 0x8000) * 9.58738019108e-05f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot17_funen.c", 161), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (0 - globalCtx->gameplayFrames) & 0x7F, 0x20, 0x20, 1, 0, @@ -71,5 +71,5 @@ void func_808B7478(Actor* thisx, GlobalContext* globalCtx) { if (1) {} - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot17_funen.c", 176); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index caa727c69..c08503351 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -159,7 +159,7 @@ void BgSpot18Basket_Init(Actor* thisx, GlobalContext* globalCtx) { if (this->dyna.actor.child == NULL) { osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("Ｅｒｒｏｒ : 変化壷蓋発生失敗(%s %d)\n", "../z_bg_spot18_basket.c", 351); + osSyncPrintf("Ｅｒｒｏｒ : 変化壷蓋発生失敗(%s %d)\n", __FILE__, __LINE__); osSyncPrintf(VT_RST); Actor_Kill(&this->dyna.actor); } diff --git a/soh/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/soh/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index 5833196d1..6ab3ce954 100644 --- a/soh/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/soh/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -97,7 +97,7 @@ s32 func_808B8910(BgSpot18Obj* this, GlobalContext* globalCtx) { } else if (LINK_AGE_IN_YEARS == YEARS_CHILD) { age = 0; } else { - osSyncPrintf("Error : リンク年齢不詳 (%s %d)(arg_data 0x%04x)\n", "../z_bg_spot18_obj.c", 182, + osSyncPrintf("Error : リンク年齢不詳 (%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->dyna.actor.params); return 0; } @@ -110,11 +110,11 @@ s32 func_808B8910(BgSpot18Obj* this, GlobalContext* globalCtx) { } return D_808B90F0[this->dyna.actor.params & 0xF][age]; case 2: - osSyncPrintf("Error : Obj出現判定が設定されていない(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot18_obj.c", 202, + osSyncPrintf("Error : Obj出現判定が設定されていない(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->dyna.actor.params); break; default: - osSyncPrintf("Error : Obj出現判定失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot18_obj.c", 210, + osSyncPrintf("Error : Obj出現判定失敗(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->dyna.actor.params); } return 0; 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 d3438d21a..cbdc2024c 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,14 +126,14 @@ void BgSstFloor_Update(BgSstFloor* thisx, GlobalContext* globalCtx) { void BgSstFloor_Draw(BgSstFloor* thisx, GlobalContext* globalCtx) { BgSstFloor* this = (BgSstFloor*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_sst_floor.c", 277); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); Matrix_Scale(1.0f, this->drumHeight * -0.0025f, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_sst_floor.c", 283), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gBongoDrumDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_sst_floor.c", 287); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 290126bbf..e1fdf29f3 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,9 +85,9 @@ void BgTokiHikari_Draw(Actor* thisx, GlobalContext* globalCtx) { void func_808BA018(BgTokiHikari* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 246); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 252), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (LINK_IS_ADULT) { @@ -101,12 +101,12 @@ void func_808BA018(BgTokiHikari* this, GlobalContext* globalCtx) { gSPSegment(POLY_XLU_DISP++, 9, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, globalCtx->gameplayFrames % 128, 64, 32)); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 278), + 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_toki_objects_DL_007EE0); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 284); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_bg_toki_hikari.c", 350); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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); @@ -148,7 +148,7 @@ void func_808BA2CC(BgTokiHikari* this, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->unk_14C * 155.0f) + 100, (u8)(255.0f * this->unk_14C), 0, 128); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 382), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, @@ -164,7 +164,7 @@ void func_808BA2CC(BgTokiHikari* this, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->unk_14C * 255.0f), (u8)(this->unk_14C * 255.0f), (u8)(this->unk_14C * 255.0f), (u8)(200.0f * this->unk_14C)); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 415), + 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_toki_objects_DL_0009C0); @@ -176,10 +176,10 @@ void func_808BA2CC(BgTokiHikari* this, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->unk_14C * 255.0f), (u8)(this->unk_14C * 255.0f), (u8)(this->unk_14C * 255.0f), (u8)(200.0f * this->unk_14C)); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 437), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayListOffset(POLY_XLU_DISP++, object_toki_objects_DL_0009C0, 10); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 443); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 dd0b111a6..dd4eb7ca2 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, "../z_bg_toki_swd.c", 727); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); @@ -172,9 +172,9 @@ void BgTokiSwd_Draw(Actor* thisx, GlobalContext* globalCtx2) { gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, -(globalCtx->gameplayFrames % 0x80), 32, 32)); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 742), + 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_toki_objects_DL_001BD0); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 776); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 090f21cc6..92be10875 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, "../z_bg_treemouth.c", 893); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); @@ -244,9 +244,9 @@ void BgTreemouth_Draw(Actor* thisx, GlobalContext* globalCtx) { } gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, alpha * 0.1f); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_treemouth.c", 932), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gDekuTreeMouthDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_treemouth.c", 937); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 80dc259b9..452671b47 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, "../z_bg_vb_sima.c", 285); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_vb_sima.c", 291), + 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, "../z_bg_vb_sima.c", 296); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 895762377..80d0a9897 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,17 +177,17 @@ 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, "../z_bg_ydan_hasi.c", 577); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -globalCtx->gameplayFrames % 128, globalCtx->gameplayFrames % 128, 0x20, 0x20, 1, globalCtx->gameplayFrames % 128, globalCtx->gameplayFrames % 128, 0x20, 0x20)); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ydan_hasi.c", 592), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDTWaterPlaneDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_ydan_hasi.c", 597); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } 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 79e5cb849..27fef7c4a 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,10 +424,10 @@ void BgYdanSp_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 i; MtxF mtxF; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 781); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); if (thisx->params == WEB_WALL) { - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 787), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDTWebWallDL); } else if (this->actionFunc == BgYdanSp_FloorWebBroken) { @@ -435,7 +435,7 @@ void BgYdanSp_Draw(Actor* thisx, GlobalContext* globalCtx) { if (this->timer == 40) { Matrix_Translate(0.0f, (thisx->home.pos.y - thisx->world.pos.y) * 10.0f, 0.0f, MTXMODE_APPLY); Matrix_Scale(1.0f, ((thisx->home.pos.y - thisx->world.pos.y) + 10.0f) * 0.1f, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 808), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDTWebFloorDL); } @@ -444,17 +444,17 @@ void BgYdanSp_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateZYX(-0x5A0, i * 0x2000, 0, MTXMODE_APPLY); Matrix_Translate(0.0f, 700.0f, -900.0f, MTXMODE_APPLY); Matrix_Scale(3.5f, 5.0f, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 830), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDTUnknownWebDL); } } else { Matrix_Translate(0.0f, (thisx->home.pos.y - thisx->world.pos.y) * 10.0f, 0.0f, MTXMODE_APPLY); Matrix_Scale(1.0f, ((thisx->home.pos.y - thisx->world.pos.y) + 10.0f) * 0.1f, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 849), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDTWebFloorDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 856); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 1f85ce34a..0359ee880 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, "../z_bg_zg.c", 311); + OPEN_DISPS(localGfxCtx, __FILE__, __LINE__); func_80093D18(localGfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(localGfxCtx, "../z_bg_zg.c", 315), + 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, "../z_bg_zg.c", 320); + CLOSE_DISPS(localGfxCtx, __FILE__, __LINE__); } 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 fa4d06b05..1eb35d38a 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, "../z_boss_dodongo.c", 3787); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); mtxScaleZ = 1.0f; mtxScaleY = 1.0f; @@ -1096,12 +1096,12 @@ block_1: Matrix_RotateX(-(this->unk_25C[limbIndex] * 0.115f), MTXMODE_APPLY); } - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_dodongo.c", 3822), + 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, "../z_boss_dodongo.c", 3826); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } { 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, "../z_boss_dodongo.c", 3922); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_dodongo.c", 3981); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); BossDodongo_DrawEffects(globalCtx); } @@ -1691,7 +1691,7 @@ void BossDodongo_DrawEffects(GlobalContext* globalCtx) { eff = (BossDodongoEffect*)globalCtx->specialEffects; - OPEN_DISPS(gfxCtx, "../z_boss_dodongo.c", 5228); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); unkMtx = &globalCtx->billboardMtxF; @@ -1711,11 +1711,11 @@ void BossDodongo_DrawEffects(GlobalContext* globalCtx) { Matrix_Translate(eff->unk_00.x, eff->unk_00.y, eff->unk_00.z, MTXMODE_NEW); Matrix_ReplaceRotation(unkMtx); Matrix_Scale(eff->unk_2C, eff->unk_2C, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_dodongo.c", 5253), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_kingdodongo_DL_009DD0); } } - CLOSE_DISPS(gfxCtx, "../z_boss_dodongo.c", 5258); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 5b468c7d3..09be78e50 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, "../z_boss_fd.c", 4023); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); for (i = 0; i < 180; i++, effect++) { if (effect->type == BFD_FX_EMBER) { @@ -1540,7 +1540,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4046), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gVolvagiaEmberModelDL); FrameInterpolation_RecordCloseChild(); @@ -1563,7 +1563,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) { Matrix_RotateX(effect->vFdFxRotX, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4068), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gVolvagiaDebrisModelDL); FrameInterpolation_RecordCloseChild(); @@ -1587,7 +1587,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) { Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4104), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[effect->timer2])); gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustModelDL); @@ -1612,7 +1612,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) { Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4154), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[effect->timer2])); gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustModelDL); @@ -1636,14 +1636,14 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) { Matrix_RotateX(effect->vFdFxRotX, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4192), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gVolvagiaSkullPieceModelDL); FrameInterpolation_RecordCloseChild(); } } - CLOSE_DISPS(gfxCtx, "../z_boss_fd.c", 4198); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_fd.c", 4217); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_fd.c", 4243); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_fd.c", 4419); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); maneLength = this->skinSegments; maneLength = CLAMP_MAX(maneLength, 10); @@ -1774,12 +1774,12 @@ void BossFd_DrawMane(GlobalContext* globalCtx, BossFd* this, Vec3f* manePos, Vec Matrix_Scale(maneScale[maneIndex] * (0.01f - (i * 0.0008f)), maneScale[maneIndex] * (0.01f - (i * 0.0008f)), 0.01f, MTXMODE_APPLY); Matrix_RotateX(-M_PI / 2.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_fd.c", 4480), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gVolvagiaManeModelDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd.c", 4483); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_fd.c", 4589); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->skinSegments != 0) { gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeState])); } @@ -1893,7 +1893,7 @@ void BossFd_DrawBody(GlobalContext* globalCtx, BossFd* this) { this->fwork[BFD_BODY_PULSE]), 1.0f, MTXMODE_APPLY); Matrix_RotateY(M_PI / 2.0f, MTXMODE_APPLY); - Matrix_ToMtx(tempMat, "../z_boss_fd.c", 4719); + Matrix_ToMtx(tempMat, __FILE__, __LINE__); gSPMatrix(POLY_OPA_DISP++, tempMat, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, sBodyDLists[i]); } else { @@ -1917,7 +1917,7 @@ void BossFd_DrawBody(GlobalContext* globalCtx, BossFd* this) { temp_float = 0.1f * sp84; } Matrix_Scale(0.1f, 0.1f, 0.1f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_fd.c", 4768), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gVolvagiaRibsDL); @@ -1993,5 +1993,5 @@ void BossFd_DrawBody(GlobalContext* globalCtx, BossFd* this) { Matrix_Pop(); osSyncPrintf("END\n"); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd.c", 4987); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 779584e32..dd61fa0fb 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, "../z_boss_fd2.c", 2165); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, (s8)bossFd->fwork[BFD_HEAD_TEX2_ALPHA]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2172); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } else { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2174); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, (s8)bossFd->fwork[BFD_BODY_TEX2_ALPHA]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2181); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_fd2.c", 2389); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); gDPPipeSync(POLY_OPA_DISP++); @@ -1152,12 +1152,12 @@ void BossFd2_UpdateMane(BossFd2* this, GlobalContext* globalCtx, Vec3f* head, Ve xyScale = (0.01f - (i * 0.0009f)) * spE8[i] * scale[i]; Matrix_Scale(xyScale, xyScale, 0.01f * spE8[i], MTXMODE_APPLY); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2498), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gHoleVolvagiaManeModelDL); } Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2503); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_fd2.c", 2515); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_fd2.c", 2601); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_fd2.c", 2617); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_fd2.c", 2688); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 d42e29f4c..acca17ca6 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, "../z_boss_ganon.c", 7191); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_MultVec3f(&D_808E4DB8, &this->unk_208); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 7196), + 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, "../z_boss_ganon.c", 7198); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_ganon.c", 7350); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); if ((this->unk_2E8 != 0) || (this->unk_2E6 != 0)) { func_80093D84(globalCtx->state.gfxCtx); @@ -3367,7 +3367,7 @@ void BossGanon_DrawShock(BossGanon* this, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(this->unk_49C[i], this->unk_49C[i], this->unk_49C[i], MTXMODE_APPLY); Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 7384), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); } @@ -3381,7 +3381,7 @@ void BossGanon_DrawShock(BossGanon* this, GlobalContext* globalCtx) { Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY); } - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 7401), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->shockGlow) { @@ -3398,7 +3398,7 @@ void BossGanon_DrawShock(BossGanon* this, GlobalContext* globalCtx) { } } - CLOSE_DISPS(gfxCtx, "../z_boss_ganon.c", 7465); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_ganon.c", 7476); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); if (this->handLightBallScale > 0.0f) { func_80093D84(globalCtx->state.gfxCtx); @@ -3424,7 +3424,7 @@ void BossGanon_DrawHandLightBall(BossGanon* this, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(this->handLightBallScale, this->handLightBallScale, this->handLightBallScale, MTXMODE_APPLY); Matrix_RotateZ(this->unk_258, 1); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 7510), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); @@ -3433,11 +3433,11 @@ void BossGanon_DrawHandLightBall(BossGanon* this, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 155, alpha); Matrix_Translate(this->unk_260.x, 0.0f, this->unk_260.z, MTXMODE_NEW); Matrix_Scale(this->handLightBallScale * 0.75f, 1.0f, this->handLightBallScale * 0.75f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 7531), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfLightCoreDL); - CLOSE_DISPS(gfxCtx, "../z_boss_ganon.c", 7534); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } } @@ -3447,7 +3447,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; s16 i; - OPEN_DISPS(gfxCtx, "../z_boss_ganon.c", 7548); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); if (this->unk_284 > 0.0f) { func_80093D84(globalCtx->state.gfxCtx); @@ -3461,7 +3461,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, GlobalContext* globalCtx) { Matrix_Translate(this->unk_278.x, this->unk_278.y, this->unk_278.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(this->unk_28C, this->unk_28C, this->unk_28C, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 7588), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfLightFlecksDL); @@ -3469,7 +3469,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, GlobalContext* globalCtx) { Matrix_Translate(this->unk_278.x, this->unk_278.y, this->unk_278.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(this->unk_284, this->unk_284, this->unk_284, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 7601), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 0, 100, (s8)this->unk_288); gSPSegment( @@ -3494,7 +3494,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(this->unk_2D0, this->unk_2D0, this->unk_2D0, MTXMODE_APPLY); Matrix_RotateZ((this->unk_1A2 * 10.0f) / 1000.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 7673), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); @@ -3515,14 +3515,14 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, GlobalContext* globalCtx) { Matrix_RotateZ(xzRot, MTXMODE_APPLY); Matrix_Translate(0.0f, 0.0f, 50.0f, MTXMODE_APPLY); Matrix_Scale(4.0f, 4.0f, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 7713), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfLightRayTriDL); Matrix_Pop(); } - CLOSE_DISPS(gfxCtx, "../z_boss_ganon.c", 7721); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } } @@ -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, "../z_boss_ganon.c", 7732); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); @@ -3568,13 +3568,13 @@ void BossGanon_DrawTriforce(BossGanon* this, GlobalContext* globalCtx) { } Matrix_Scale(this->fwork[GDF_TRIFORCE_SCALE], this->fwork[GDF_TRIFORCE_SCALE], 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 7779), + 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(gDorfTriforceDL)); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 7782); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } @@ -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, "../z_boss_ganon.c", 7792); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); gDPPipeSync(POLY_XLU_DISP++); @@ -3603,13 +3603,13 @@ void BossGanon_DrawDarkVortex(BossGanon* this, GlobalContext* globalCtx) { Matrix_Scale(this->fwork[GDF_VORTEX_SCALE], this->fwork[GDF_VORTEX_SCALE], this->fwork[GDF_VORTEX_SCALE], MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 7841), + 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(gDorfVortexDL)); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 7844); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } @@ -3763,7 +3763,7 @@ void BossGanon_DrawShadowTexture(void* tex, BossGanon* this, GlobalContext* glob f32 zOffset; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, "../z_boss_ganon.c", 8372); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 0, 50); @@ -3777,14 +3777,14 @@ void BossGanon_DrawShadowTexture(void* tex, BossGanon* this, GlobalContext* glob } Matrix_Scale(0.95000005f, 1.0f, 0.95000005f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 8396), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gDorfShadowSetupDL); gDPLoadTextureBlock(POLY_OPA_DISP++, tex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD); gSPDisplayList(POLY_OPA_DISP++, gDorfShadowModelDL); - CLOSE_DISPS(gfxCtx, "../z_boss_ganon.c", 8426); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_ganon.c", 9138); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_ganon.c", 9393); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_ganon.c", 9849); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); @@ -4146,7 +4146,7 @@ void BossGanon_LightBall_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Push(); Matrix_Translate(this->actor.world.pos.x, this->actor.floorHeight, this->actor.world.pos.z, MTXMODE_NEW); Matrix_Scale(this->actor.scale.x * 0.75f, 1.0f, this->actor.scale.z * 0.75f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 9875), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfLightCoreDL); @@ -4162,7 +4162,7 @@ void BossGanon_LightBall_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Push(); Matrix_RotateY(i * (M_PI / 8), MTXMODE_APPLY); Matrix_RotateZ(this->fwork[GDF_FWORK_0], MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 9899), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); @@ -4171,12 +4171,12 @@ void BossGanon_LightBall_Draw(Actor* thisx, GlobalContext* globalCtx) { } else if (this->unk_1A8 == 0) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_RotateZ((this->actor.shape.rot.z / 32768.0f) * 3.1416f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 9907), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 9911); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_ganon.c", 10081); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 0); @@ -4296,12 +4296,12 @@ void func_808E229C(Actor* thisx, GlobalContext* globalCtx2) { this->actor.scale.z * (1.0f - (i * 0.07000001f)), MTXMODE_APPLY); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_RotateZ(((2.0f * (i * M_PI)) / 10.0f) + BINANG_TO_RAD(this->actor.shape.rot.z), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 10109), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 10113); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_ganon.c", 10489); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 255, (s8)this->fwork[GDF_FWORK_1]); @@ -4579,7 +4579,7 @@ void func_808E324C(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateX(-this->unk_3C4[temp].x, MTXMODE_APPLY); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); Matrix_RotateY(M_PI / 2, MTXMODE_APPLY); - Matrix_ToMtx(mtx, "../z_boss_ganon.c", 10520); + Matrix_ToMtx(mtx, __FILE__, __LINE__); gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, sBigMagicLightStreakDLists[i]); mtx++; @@ -4589,13 +4589,13 @@ void func_808E324C(Actor* thisx, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(10.0f, 10.0f, 10.0f, MTXMODE_APPLY); Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 10534), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfLightBallMaterialDL); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 10541); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void BossGanon_UpdateEffects(GlobalContext* globalCtx) { @@ -4822,7 +4822,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { GanondorfEffect* eff = globalCtx->specialEffects; GanondorfEffect* effFirst = eff; - OPEN_DISPS(gfxCtx, "../z_boss_ganon.c", 10865); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); for (i = 0; i < 200; i++, eff++) { @@ -4842,7 +4842,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { Matrix_Scale(eff->scale, eff->scale, eff->scale, MTXMODE_APPLY); Matrix_RotateY(eff->unk_48, MTXMODE_APPLY); Matrix_RotateX(eff->unk_44, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 10898), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gDorfWindowShardModelDL); FrameInterpolation_RecordCloseChild(); @@ -4866,7 +4866,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY); Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 10932), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); FrameInterpolation_RecordCloseChild(); @@ -4892,7 +4892,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY); Matrix_Scale(eff->scale, eff->scale, eff->unk_38 * eff->scale, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 10971), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); FrameInterpolation_RecordCloseChild(); @@ -4920,7 +4920,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY); Matrix_RotateX(eff->unk_3C * 1.3f, MTXMODE_APPLY); Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 11023), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfShockDL); FrameInterpolation_RecordCloseChild(); @@ -4943,7 +4943,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY); Matrix_Scale(eff->scale, eff->scale, eff->scale, MTXMODE_APPLY); Matrix_RotateY(eff->unk_44, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 11074), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLightningTextures[eff->timer])); gSPDisplayList(POLY_XLU_DISP++, gDorfLightningDL); @@ -4964,7 +4964,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { eff->timer * -20, 32, 32)); Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); Matrix_Scale(eff->scale, eff->unk_40 * eff->scale, eff->scale, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 11121), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfImpactDarkDL); FrameInterpolation_RecordCloseChild(); @@ -4984,7 +4984,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { eff->timer * -20, 32, 32)); Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); Matrix_Scale(eff->scale, eff->unk_40 * eff->scale, eff->scale, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 11165), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfImpactLightDL); FrameInterpolation_RecordCloseChild(); @@ -5005,7 +5005,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); Matrix_Scale((eff->scale * 200.0f) / 1500.0f, (eff->unk_40 * 200.0f) / 1500.0f, (eff->scale * 200.0f) / 1500.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 11209), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfShockwaveDL); FrameInterpolation_RecordCloseChild(); @@ -5026,14 +5026,14 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) { Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 11250), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gDorfDotDL); FrameInterpolation_RecordCloseChild(); } } - CLOSE_DISPS(gfxCtx, "../z_boss_ganon.c", 11255); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } #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 667871de1..34ebfc057 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, "../z_boss_ganon2.c", 790); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_ganon2.c", 799); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } @@ -2411,7 +2411,7 @@ void func_809034E4(Vec3f* arg0, Vec3f* arg1) { } void func_80903F38(BossGanon2* this, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5083); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->unk_312 != 0) { func_809034E4(&this->unk_200, &this->unk_20C); @@ -2425,19 +2425,19 @@ void func_80903F38(BossGanon2* this, GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, D_80907080); Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_NEW); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5117), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00BB80); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5122); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void func_80904108(BossGanon2* this, GlobalContext* globalCtx) { s32 pad; if (this->unk_324 > 0.0f) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5131); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); gDPPipeSync(POLY_XLU_DISP++); @@ -2448,12 +2448,12 @@ void func_80904108(BossGanon2* this, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 128); Matrix_Translate(-200.0f, 1086.0f, -200.0f, MTXMODE_NEW); Matrix_Scale(0.098000005f, 0.1f, 0.098000005f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5183), + 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(ovl_Boss_Ganon2_DL_00E1C0)); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5186); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } @@ -2464,7 +2464,7 @@ void func_80904340(BossGanon2* this, GlobalContext* globalCtx) { f32 sin; f32 cos; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5196); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); if ((this->unk_330 != 0) || (this->unk_328 != 0)) { @@ -2498,21 +2498,21 @@ void func_80904340(BossGanon2* this, GlobalContext* globalCtx) { Matrix_RotateY(M_PI, MTXMODE_APPLY); } - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5250), + 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(ovl_Boss_Ganon2_DL_00D798)); } } Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5255); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void func_8090464C(BossGanon2* this, GlobalContext* globalCtx) { s32 pad; if (this->unk_1B4 > 0.0f) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5264); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); gDPPipeSync(POLY_XLU_DISP++); @@ -2522,12 +2522,12 @@ void func_8090464C(BossGanon2* this, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_RotateZ(-0.2f, MTXMODE_APPLY); Matrix_Scale(0.6f, 0.6f, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5290), + 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(ovl_Boss_Ganon2_DL_00CCD8)); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5293); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } @@ -2536,7 +2536,7 @@ s32 BossGanon2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d s32 pad; BossGanon2* this = (BossGanon2*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5355); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_ganon2.c", 5431); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_ganon2.c", 5459); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); D_80907120.z = 17000.0f; D_8090712C.z = 3000.0f; @@ -2600,14 +2600,14 @@ void BossGanon2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis if ((limbIndex == 7) || (limbIndex == 13)) { Matrix_Push(); Matrix_Scale(this->unk_224, this->unk_224, this->unk_224, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5522), + 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(); } else if ((limbIndex == 33) || (limbIndex == 34)) { Matrix_Push(); Matrix_Scale(this->unk_228, this->unk_228, this->unk_228, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5533), + 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(); @@ -2627,14 +2627,14 @@ void BossGanon2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5566); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void func_80904D88(BossGanon2* this, GlobalContext* globalCtx) { s32 pad; s16 i; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5575); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->unk_30C > 0.0f) { func_80093D84(globalCtx->state.gfxCtx); @@ -2652,19 +2652,19 @@ void func_80904D88(BossGanon2* this, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(this->unk_30C, this->unk_30C, this->unk_30C, MTXMODE_APPLY); Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5618), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00B378); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5622); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void func_80904FC8(BossGanon2* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5632); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->unk_384 > 0.0f) { func_80093D84(globalCtx->state.gfxCtx); @@ -2676,23 +2676,23 @@ void func_80904FC8(BossGanon2* this, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(this->unk_384, this->unk_384, this->unk_384, MTXMODE_APPLY); Matrix_RotateZ(this->unk_388, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5661), + 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(ovl_Boss_Ganon2_DL_00B378)); Matrix_RotateZ(this->unk_388 * -2.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5664), + 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(ovl_Boss_Ganon2_DL_00B378)); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5667); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void func_8090523C(BossGanon2* this, GlobalContext* globalCtx) { Player* player; f32 phi_f20; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5675); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->unk_38C > 0.0f) { s8 i; @@ -2716,13 +2716,13 @@ void func_8090523C(BossGanon2* this, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(200.0f * phi_f20, 200.0f * phi_f20, 1.0f, MTXMODE_APPLY); Matrix_RotateZ(Rand_ZeroFloat(2.0f * M_PI), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5721), + 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(ovl_Boss_Ganon2_DL_00B378)); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5725); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_ganon2.c", 5749); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5752), + 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, "../z_boss_ganon2.c", 5754); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_ganon2.c", 5772); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); gDPPipeSync(POLY_XLU_DISP++); @@ -2763,12 +2763,12 @@ void func_80905674(BossGanon2* this, GlobalContext* globalCtx) { Matrix_RotateY(-M_PI / 4.0f, MTXMODE_APPLY); Matrix_Scale(0.040000003f, 0.040000003f, this->unk_380, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5814), + 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(ovl_Boss_Ganon2_DL_00EC40)); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5817); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } @@ -2777,7 +2777,7 @@ void BossGanon2_Draw(Actor* thisx, GlobalContext* globalCtx) { BossGanon2* this = (BossGanon2*)thisx; s16 i; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5840); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -2803,7 +2803,7 @@ void BossGanon2_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(0.0f, -4000.0f, 4000.0f, MTXMODE_APPLY); Matrix_RotateX(this->unk_394, MTXMODE_APPLY); Matrix_Translate(0.0f, 4000.0f, -4000.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5910), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, BossGanon2_OverrideLimbDraw, BossGanon2_PostLimbDraw, @@ -2844,7 +2844,7 @@ void BossGanon2_Draw(Actor* thisx, GlobalContext* globalCtx) { D_80910638 = 0; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5983); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_809060E8(globalCtx); } @@ -2920,7 +2920,7 @@ void func_809060E8(GlobalContext* globalCtx) { effects = effect = globalCtx->specialEffects; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 6086); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); @@ -2939,7 +2939,7 @@ void func_809060E8(GlobalContext* globalCtx) { Matrix_Scale(0.03f, 0.03f, 0.03f, MTXMODE_APPLY); Matrix_RotateY(effect->unk_38.z, MTXMODE_APPLY); Matrix_RotateX(effect->unk_38.y, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 6116), + 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, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, 0 - (globalCtx->gameplayFrames & 0x7F), 32, 32)); @@ -2956,7 +2956,7 @@ void func_809060E8(GlobalContext* globalCtx) { Matrix_Translate(effect->position.x + temp_f0, 1086.0f, (effect->position.z - 1.0f) + temp_f0, MTXMODE_NEW); Matrix_RotateY(angle, MTXMODE_APPLY); Matrix_Scale(1.0f, 0.0f, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 6155), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00F188); } @@ -2975,13 +2975,13 @@ void func_809060E8(GlobalContext* globalCtx) { Matrix_RotateY(effect->unk_38.z, MTXMODE_APPLY); Matrix_RotateX(effect->unk_38.y, MTXMODE_APPLY); Matrix_RotateZ(effect->unk_38.x, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 6179), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gGanonRubbleDL); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 6185); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_ganon2.c", 6430); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); @@ -3095,14 +3095,14 @@ void BossGanon2_DrawShadowTexture(void* shadowTexture, BossGanon2* this, GlobalC gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0); Matrix_Translate(this->actor.world.pos.x, this->actor.floorHeight, this->actor.world.pos.z - 20.0f, MTXMODE_NEW); Matrix_Scale(1.65f, 1.0f, 1.65f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 6457), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, ovl_Boss_Ganon2_DL_00B3D0); gDPLoadTextureBlock(POLY_OPA_DISP++, shadowTexture, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, 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, "../z_boss_ganon2.c", 6479); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 227e0d6f0..b82c41f71 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, "../z_boss_ganondrof.c", 3716); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_ganondrof.c", 3814); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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 84584c6d8..e17fe6144 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, "../z_boss_goma.c", 4685); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, (s16)this->mainEnvColor[0], (s16)this->mainEnvColor[1], (s16)this->mainEnvColor[2], @@ -2012,7 +2012,7 @@ s32 BossGoma_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi if (*dList != NULL) { Matrix_Push(); Matrix_Scale(this->eyeIrisScaleX, this->eyeIrisScaleY, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_goma.c", 4815), + 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(); @@ -2033,7 +2033,7 @@ s32 BossGoma_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi Matrix_Scale(this->tailLimbsScale[limbIndex - BOSSGOMA_LIMB_TAIL4], this->tailLimbsScale[limbIndex - BOSSGOMA_LIMB_TAIL4], this->tailLimbsScale[limbIndex - BOSSGOMA_LIMB_TAIL4], MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_goma.c", 4836), + 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(); @@ -2043,7 +2043,7 @@ s32 BossGoma_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi break; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_goma.c", 4858); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_goma.c", 4991); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_goma.c", 5012); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 ae436ca2d..ab170c4e6 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, "../z_boss_mo.c", 6366); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); sp110.x = globalCtx->envCtx.dirLight1.params.dir.x; sp110.y = globalCtx->envCtx.dirLight1.params.dir.y; @@ -2494,7 +2494,7 @@ void BossMo_DrawTentacle(BossMo* this, GlobalContext* globalCtx) { MTXMODE_APPLY); } Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); - Matrix_ToMtx(matrix, "../z_boss_mo.c", 6452); + Matrix_ToMtx(matrix, __FILE__, __LINE__); gSPMatrix(POLY_XLU_DISP++, matrix, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -2527,7 +2527,7 @@ void BossMo_DrawTentacle(BossMo* this, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(phi_f22, phi_f22, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6511), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gMorphaBubbleDL); @@ -2563,13 +2563,13 @@ void BossMo_DrawTentacle(BossMo* this, GlobalContext* globalCtx) { } Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6571); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void BossMo_DrawWater(BossMo* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6582); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (1) {} Matrix_Push(); @@ -2587,20 +2587,20 @@ void BossMo_DrawWater(BossMo* this, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 80); Matrix_Scale(0.5f, 1.0f, 0.5f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6675), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gMorphaWaterDL); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6680); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void BossMo_DrawCore(Actor* thisx, GlobalContext* globalCtx) { s32 pad; BossMo* this = (BossMo*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6688); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->actor.world.pos.y > MO_WATER_LEVEL(globalCtx)) { BossMo_DrawWater(this, globalCtx); } @@ -2618,7 +2618,7 @@ void BossMo_DrawCore(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateX(this->work[MO_TENT_MOVE_TIMER] * 0.5f, MTXMODE_APPLY); Matrix_RotateZ(this->work[MO_TENT_MOVE_TIMER] * 0.8f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6735), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 255, (s8)this->baseAlpha); @@ -2656,7 +2656,7 @@ void BossMo_DrawCore(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(this->actor.world.pos.x, groundLevel, this->actor.world.pos.z, MTXMODE_NEW); Matrix_Scale(0.23f, 1.0f, 0.23f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6820), + 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(gCircleShadowDL)); @@ -2714,12 +2714,12 @@ void BossMo_DrawCore(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); Matrix_Scale(0.05f, 1.0f, 0.05f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6941), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gMorphaWaterDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6945); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_mo.c", 6958); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_mo.c", 7023); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_mo.c", 7264); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); Matrix_Push(); for (i = 0; i < ARRAY_COUNT(sEffects); i++, effect++) { @@ -2929,7 +2929,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) { Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_mo.c", 7294), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffWaterRippleDL); @@ -2954,7 +2954,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) { Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_mo.c", 7330), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffShockwaveDL); @@ -2985,7 +2985,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(effect->scale / effect->fwork[MO_FX_STRETCH], effect->fwork[MO_FX_STRETCH] * effect->scale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_mo.c", 7373), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gMorphaDropletModelDL); @@ -3013,7 +3013,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) { Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_mo.c", 7441), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gMorphaWetSpotModelDL); @@ -3039,7 +3039,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) { Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_mo.c", 7476), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gMorphaBubbleDL); @@ -3048,7 +3048,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) { } Matrix_Pop(); - CLOSE_DISPS(gfxCtx, "../z_boss_mo.c", 7482); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 eeae20698..336d0e108 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, "../z_boss_sst.c", 6563); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); @@ -2757,7 +2757,7 @@ void BossSst_DrawHand(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_sst.c", 6654); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_sst.c", 6810); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_7)) { func_80093D18(globalCtx->state.gfxCtx); @@ -2919,12 +2919,12 @@ void BossSst_DrawHead(Actor* thisx, GlobalContext* globalCtx) { this->actor.world.pos.z + vanishMaskOffset.z, MTXMODE_NEW); Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_sst.c", 6934), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, sIntroVanishDList); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_sst.c", 6941); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_sst.c", 7302); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); if (this->effectMode == BONGO_ICE) { @@ -3179,7 +3179,7 @@ void BossSst_DrawEffect(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateZYX(effect->rot.x, effect->rot.y, effect->rot.z, MTXMODE_APPLY); Matrix_Scale(effect->scale * 0.001f, effect->scale * 0.001f, effect->scale * 0.001f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_sst.c", 7350), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBongoIceShardDL); } @@ -3202,7 +3202,7 @@ void BossSst_DrawEffect(Actor* thisx, GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 30, 0, 30, effect->alpha * effect->move); gDPSetEnvColor(POLY_XLU_DISP++, 30, 0, 30, 0); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_sst.c", 7396), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffFireCircleDL); } @@ -3216,14 +3216,14 @@ void BossSst_DrawEffect(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); Matrix_Scale(effect->scale * 0.001f, 1.0f, effect->scale * 0.001f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_sst.c", 7423), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, sShadowDList); effect++; } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_sst.c", 7433); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } 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 3c8fa9d91..6786d030a 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, "../z_boss_tw.c", 6168); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); switch (limbIndex) { case 21: @@ -3185,7 +3185,7 @@ void BossTw_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V Matrix_MultVec3f(&D_8094A950, &this->crownPos); if (this->unk_5F8 != 0) { - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6190), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); if (this->actor.params == 0) { gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_013AE8)); @@ -3202,7 +3202,7 @@ void BossTw_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V Matrix_MultVec3f(&D_8094A95C[4], &this->scepterFlamePos[4]); if (this->scepterAlpha > 0.0f) { - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6221), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); if (this->actor.params == 0) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 225, 255, (s16)this->scepterAlpha); @@ -3219,19 +3219,19 @@ void BossTw_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V break; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6236); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void func_80941BC0(BossTw* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6341); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); func_80093D84(globalCtx->state.gfxCtx); Matrix_Translate(this->groundBlastPos2.x, this->groundBlastPos2.y, this->groundBlastPos2.z, MTXMODE_NEW); Matrix_Scale(this->workf[UNK_F12], this->workf[UNK_F12], this->workf[UNK_F12], MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6358), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s16)this->workf[UNK_F11]); gDPSetEnvColor(POLY_XLU_DISP++, 0, 40, 30, 80); @@ -3243,11 +3243,11 @@ void func_80941BC0(BossTw* this, GlobalContext* globalCtx) { (this->work[CS_TIMER_2] * 4) & 0x3F, 0x10, 0x10)); Matrix_Push(); Matrix_RotateY(this->workf[UNK_F15], MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6423), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01C1C0)); Matrix_Pop(); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6427), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); gSPSegment(POLY_XLU_DISP++, 0xD, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, this->work[CS_TIMER_2] & 0x7F, @@ -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, "../z_boss_tw.c", 6461); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void func_80942180(BossTw* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6468); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); @@ -3279,7 +3279,7 @@ void func_80942180(BossTw* this, GlobalContext* globalCtx) { gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (-this->work[CS_TIMER_1]) & 0x7F, 0, 0x20, 0x20, 1, (this->work[CS_TIMER_1] * 2) & 0x7F, 0, 0x20, 0x20)); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6497), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 100, 40, 00, (s16)this->workf[KM_GRND_CRTR_A]); gDPPipeSync(POLY_XLU_DISP++); @@ -3287,7 +3287,7 @@ void func_80942180(BossTw* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_019D40)); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6514), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, this->work[CS_TIMER_1] & 0x7F, @@ -3305,20 +3305,20 @@ void func_80942180(BossTw* this, GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 200, 235, 240, 128); Matrix_Scale(this->workf[KM_GD_FLM_SCL], this->workf[KM_GD_FLM_SCL], this->workf[KM_GD_FLM_SCL], MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6575), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_019938)); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6579); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void func_809426F0(BossTw* this, GlobalContext* globalCtx) { s32 pad; s16 i; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6587); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (u8)(-this->work[CS_TIMER_2] * 15), 0x20, 0x40, 1, 0, 0, @@ -3328,7 +3328,7 @@ void func_809426F0(BossTw* this, GlobalContext* globalCtx) { Matrix_Scale(this->spawnPortalScale / 2000.0f, this->spawnPortalScale / 2000.0f, this->spawnPortalScale / 2000.0f, MTXMODE_APPLY); Matrix_RotateZ(this->portalRotation, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6614), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); if (this->actor.params == 0) { @@ -3359,20 +3359,20 @@ void func_809426F0(BossTw* this, GlobalContext* globalCtx) { (u8)((-this->work[CS_TIMER_2] * 15) + (i * 50)), 0x20, 0x40, 1, 0, 0, 0x20, 0x20)); Matrix_Scale(0.4f, 0.4f, 0.4f, MTXMODE_APPLY); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6751), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430)); Matrix_Pop(); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6756); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void func_80942C70(Actor* thisx, GlobalContext* globalCtx) { BossTw* this = (BossTw*)thisx; s16 alpha; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6765); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->beamDist != 0.0f) { Matrix_Push(); @@ -3393,7 +3393,7 @@ void func_80942C70(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateX(this->beamPitch, MTXMODE_APPLY); Matrix_RotateZ(this->beamRoll, MTXMODE_APPLY); Matrix_Scale(this->beamScale, this->beamScale, (this->beamDist * 0.01f * 98.0f) / 20000.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6846), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01DDF0)); @@ -3405,7 +3405,7 @@ void func_80942C70(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateZ(this->beamRoll, MTXMODE_APPLY); Matrix_Scale(this->beamScale, this->beamScale, (this->beamReflectionDist * 0.01f * 100.0f) / 20000.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6870), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01DDF0)); } @@ -3413,19 +3413,19 @@ void func_80942C70(Actor* thisx, GlobalContext* globalCtx) { Matrix_Pop(); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6878); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void func_80943028(Actor* thisx, GlobalContext* globalCtx) { BossTw* this = (BossTw*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6885); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y + 57.0f, this->actor.world.pos.z, MTXMODE_NEW); Matrix_Scale(this->workf[UNK_F17], this->workf[UNK_F17], this->workf[UNK_F17], MTXMODE_APPLY); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6908), + 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_tw_DL_01F608)); func_80094044(globalCtx->state.gfxCtx); @@ -3433,12 +3433,12 @@ void func_80943028(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(this->actor.world.pos.x, 240.0f, this->actor.world.pos.z, MTXMODE_NEW); Matrix_Scale((this->actor.scale.x * 4000.0f) / 100.0f, 1.0f, (this->actor.scale.x * 4000.0f) / 100.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6926), + 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(gCircleShadowDL)); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6933); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_tw.c", 6947); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_tw.c", 7123); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_tw.c", 7139); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); switch (limbIndex) { case 21: @@ -3592,7 +3592,7 @@ s32 BossTw_TwinrovaOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx *dList = NULL; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7251); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); return false; } @@ -3605,7 +3605,7 @@ void BossTw_TwinrovaPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** BossTw* this = (BossTw*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7262); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); switch (limbIndex) { case 34: @@ -3628,14 +3628,14 @@ void BossTw_TwinrovaPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** case 42: Matrix_Push(); Matrix_Scale(this->workf[UNK_F12], this->workf[UNK_F12], this->workf[UNK_F12], MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7295), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); Matrix_Pop(); gSPDisplayList(POLY_XLU_DISP++, *dList); break; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7301); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_tw.c", 7311); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); @@ -3679,7 +3679,7 @@ void BossTw_ShieldChargeDraw(BossTw* this, GlobalContext* globalCtx) { if (temp_t0 != 0) { Matrix_Mult(&player->shieldMf, MTXMODE_NEW); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7362), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); temp_a0 = (Math_SinS(this->work[CS_TIMER_1] * 2730 * temp_t0) * D_8094C854 * 0.5f) + (D_8094C854 * 0.5f); if (sShieldFireCharge != 0) { @@ -3719,7 +3719,7 @@ void BossTw_ShieldChargeDraw(BossTw* this, GlobalContext* globalCtx) { Matrix_Mult(&player->shieldMf, MTXMODE_NEW); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7486), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); if (sShieldFireCharge != 0) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 220, 20, (s16)D_8094C858); @@ -3737,13 +3737,13 @@ void BossTw_ShieldChargeDraw(BossTw* this, GlobalContext* globalCtx) { Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7531); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void BossTw_SpawnPortalDraw(BossTw* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7546); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); gSPSegment( @@ -3755,48 +3755,48 @@ void BossTw_SpawnPortalDraw(BossTw* this, GlobalContext* globalCtx) { Matrix_Translate(0.0f, 232.0f, -600.0f, MTXMODE_NEW); Matrix_Scale(this->spawnPortalScale, this->spawnPortalScale, this->spawnPortalScale, MTXMODE_APPLY); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (s16)this->spawnPortalAlpha); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7582), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01EC68)); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 135, 175, 165, (s16)this->spawnPortalAlpha); Matrix_Translate(0.0f, 2.0f, 0.0f, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7596), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01CEE0)); Matrix_Translate(0.0f, 232.0f, 600.0f, MTXMODE_NEW); Matrix_Scale(this->spawnPortalScale, this->spawnPortalScale, this->spawnPortalScale, MTXMODE_APPLY); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (s16)this->spawnPortalAlpha); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7617), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01EC68)); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 0, (s16)this->spawnPortalAlpha); Matrix_Translate(0.0f, 2.0f, 0.0f, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7631), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01DBE8)); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7635); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void func_80944C50(BossTw* this, GlobalContext* globalCtx) { s32 pad; f32 scale; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7645); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); Matrix_Translate(0.0f, 750.0f, 0.0f, MTXMODE_NEW); Matrix_Scale(0.35f, 0.35f, 0.35f, MTXMODE_APPLY); Matrix_Push(); Matrix_Scale(this->workf[UNK_F19], this->workf[UNK_F19], this->workf[UNK_F19], MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7671), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01F390)); @@ -3805,7 +3805,7 @@ void func_80944C50(BossTw* this, GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -sKoumePtr->work[CS_TIMER_1] * 2, 0, 0x20, 0x20, 1, -sKoumePtr->work[CS_TIMER_1] * 2, 0, 0x20, 0x40)); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s16)this->workf[UNK_F18] / 2); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7694), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01F238)); @@ -3819,12 +3819,12 @@ void func_80944C50(BossTw* this, GlobalContext* globalCtx) { scale = CLAMP_MAX(scale, 1.0f); Matrix_Scale(scale, 1.0f, scale, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7728), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01EEB0)); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7732); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_tw.c", 7748); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_tw.c", 7804); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_tw.c", 8818); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); @@ -4424,7 +4424,7 @@ void BossTw_BlastDraw(Actor* thisx, GlobalContext* globalCtx2) { Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor, this->actor.scale.z * scaleFactor, MTXMODE_APPLY); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 8865), + 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_tw_DL_01A430)); } @@ -4448,7 +4448,7 @@ void BossTw_BlastDraw(Actor* thisx, GlobalContext* globalCtx2) { Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor, this->actor.scale.z * scaleFactor, MTXMODE_APPLY); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 9004), + 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_tw_DL_01AB00)); } @@ -4458,7 +4458,7 @@ void BossTw_BlastDraw(Actor* thisx, GlobalContext* globalCtx2) { break; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 9013); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_tw.c", 9028); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); @@ -4488,7 +4488,7 @@ void BossTw_DrawDeathBall(Actor* thisx, GlobalContext* globalCtx2) { Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor, this->actor.scale.z * scaleFactor, MTXMODE_APPLY); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 9071), + 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_tw_DL_01A430)); } @@ -4508,13 +4508,13 @@ void BossTw_DrawDeathBall(Actor* thisx, GlobalContext* globalCtx2) { Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor, this->actor.scale.z * scaleFactor, MTXMODE_APPLY); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 9107), + 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_tw_DL_01AB00)); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 9111); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void BossTw_UpdateEffects(GlobalContext* globalCtx) { @@ -4870,7 +4870,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { effectHead = currentEffect; - OPEN_DISPS(gfxCtx, "../z_boss_tw.c", 9592); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); @@ -4886,7 +4886,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { Matrix_Translate(currentEffect->pos.x, currentEffect->pos.y, currentEffect->pos.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_tw.c", 9617), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_tw_DL_01A5A8); } @@ -4911,7 +4911,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { Matrix_Translate(currentEffect->pos.x, currentEffect->pos.y, currentEffect->pos.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_tw.c", 9660), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00)); } @@ -4936,7 +4936,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { Matrix_Translate(currentEffect->pos.x, currentEffect->pos.y, currentEffect->pos.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_tw.c", 9709), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430)); } @@ -4979,7 +4979,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { Matrix_RotateZ(currentEffect->workf[EFF_ROLL], MTXMODE_APPLY); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); Matrix_Scale(currentEffect->workf[EFF_SCALE], 1.0f, currentEffect->workf[EFF_SCALE], MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_tw.c", 9775), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2); gSPClearGeometryMode(POLY_XLU_DISP++, G_CULL_BACK | G_FOG); @@ -5026,7 +5026,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { currentEffect->workf[EFF_SCALE], MTXMODE_APPLY); Matrix_RotateY(BossTw_RandZeroOne() * M_PI, MTXMODE_APPLY); Matrix_RotateX((BossTw_RandZeroOne() - 0.5f) * M_PI * 0.5f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_tw.c", 9855), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00)); } @@ -5055,7 +5055,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { Matrix_Translate(currentEffect->pos.x, currentEffect->pos.y, currentEffect->pos.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_tw.c", 9911), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (currentEffect->work[EFF_ARGS] == 0) { @@ -5068,7 +5068,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) { currentEffect++; } - CLOSE_DISPS(gfxCtx, "../z_boss_tw.c", 9920); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 3d6865e24..612da3fd7 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, "../z_boss_va.c", 4156); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_va.c", 4183); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_va.c", 4192); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (limbIndex == 6) { if (sFightPhase < PHASE_3) { @@ -2914,11 +2914,11 @@ void BossVa_BodyPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis Matrix_MultVec3f(&sp78, &this->unk_1D8); } else if ((limbIndex >= 10) && (limbIndex < 20) && (sBodyBari[limbIndex - 10] != 0)) { if (((limbIndex >= 16) || (limbIndex == 10)) && (sFightPhase <= PHASE_3)) { - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_va.c", 4208), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_008BB8); } else if ((limbIndex >= 11) && (sFightPhase <= PHASE_2)) { - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_va.c", 4212), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_008BB8); } @@ -2933,11 +2933,11 @@ void BossVa_BodyPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (globalCtx->gameplayFrames * 10) % 128, 16, 32, 1, 0, (globalCtx->gameplayFrames * 5) % 128, 16, 32)); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_va.c", 4232), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_008D70); } else if ((*dList != NULL) && (limbIndex >= 29) && (limbIndex < 56)) { - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_va.c", 4236), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, *dList); } else if ((limbIndex == 24) && (sCsState < DEATH_START)) { @@ -2966,7 +2966,7 @@ void BossVa_BodyPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis Matrix_MultVec3f(&sp78, &this->unk_274); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_va.c", 4264); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } s32 BossVa_SupportOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, @@ -3157,22 +3157,22 @@ 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, "../z_boss_va.c", 4494); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (limbIndex == 2) { gSPSegment(POLY_XLU_DISP++, 0x0A, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (globalCtx->gameplayFrames * 10) % 32, 16, 32, 1, 0, (globalCtx->gameplayFrames * -5) % 32, 16, 32)); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_va.c", 4508), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_000FA0); } else if ((limbIndex == 3) || (limbIndex == 4)) { - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_va.c", 4512), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, *dList); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_va.c", 4517); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_va.c", 4542); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_boss_va.c", 4673); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_va.c", 4953); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); for (i = 0; i < ARRAY_COUNT(sVaEffects); i++, effect++) { if (effect->type == VA_LARGE_SPARK) { @@ -3535,7 +3535,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_RotateZ((effect->rot.z / (f32)0x8000) * 3.1416f, MTXMODE_APPLY); Matrix_Scale(effect->scale * 0.0185f, effect->scale * 0.0185f, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 4976), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_015710); FrameInterpolation_RecordCloseChild(); @@ -3556,7 +3556,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) { Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY); Matrix_RotateZ((effect->rot.z / (f32)0x8000) * 3.1416f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5002), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPPipeSync(POLY_XLU_DISP++); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sSparkBallTex[effect->mode])); @@ -3595,7 +3595,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) { Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); gDPPipeSync(POLY_XLU_DISP++); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5052), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_009468); FrameInterpolation_RecordCloseChild(); @@ -3620,7 +3620,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) { Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5080), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gBarinadeDL_012948); } @@ -3654,7 +3654,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) { Matrix_RotateY(-(effect->offset.x * 0.13f), MTXMODE_APPLY); Matrix_RotateX(-(effect->offset.x * 0.115f), MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5124), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gBarinadeDL_012C50); FrameInterpolation_RecordCloseChild(); @@ -3679,7 +3679,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) { Matrix_RotateZYX(effect->rot.x, effect->rot.y, 0, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5152), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_013638); FrameInterpolation_RecordCloseChild(); @@ -3703,7 +3703,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) { Matrix_RotateZ((effect->rot.z / (f32)0x8000) * 3.1416f, MTXMODE_APPLY); Matrix_Scale(effect->scale * 0.02f, effect->scale * 0.02f, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5180), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_015710); FrameInterpolation_RecordCloseChild(); @@ -3727,14 +3727,14 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) { Matrix_RotateY((effect->rot.y / (f32)0x8000) * 3.1416f, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5208), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_008F70); FrameInterpolation_RecordCloseChild(); } } - CLOSE_DISPS(gfxCtx, "../z_boss_va.c", 5215); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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, "../z_boss_va.c", 5600); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Translate(0.0f, 80.0f, 400.0f, MTXMODE_NEW); Matrix_RotateY(M_PI, MTXMODE_APPLY); @@ -4026,12 +4026,12 @@ void BossVa_DrawDoor(GlobalContext* globalCtx, s16 scale) { Matrix_RotateZ(segAngle, MTXMODE_APPLY); Matrix_Translate(0.0f, doorPieceLength[i] * yScale, 0.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_va.c", 5621), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, doorPieceDispList[i]); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_va.c", 5629); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 acff25c75..b4603bea3 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 @@ -86,7 +86,7 @@ void Demo6K_Init(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf("bank_ID = %d\n", objBankIndex); if (objBankIndex < 0) { - ASSERT(0, "0", "../z_demo_6k.c", 334); + ASSERT(0, "0", __FILE__, __LINE__); } else { this->objBankIndex = objBankIndex; } @@ -173,7 +173,7 @@ void Demo6K_Init(Actor* thisx, GlobalContext* globalCtx) { this->unk_293 = params - 14; break; default: - ASSERT(0, "0", "../z_demo_6k.c", 435); + ASSERT(0, "0", __FILE__, __LINE__); break; } @@ -564,7 +564,7 @@ void func_80967FFC(Actor* thisx, GlobalContext* globalCtx) { s32 pad; u16 timer1 = this->timer1; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1070); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); Matrix_RotateX(-M_PI / 2, MTXMODE_APPLY); @@ -585,7 +585,7 @@ void func_80967FFC(Actor* thisx, GlobalContext* globalCtx) { for (i = 0; i < 6; i++) { Matrix_RotateZ(M_PI / 3, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1115), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPPipeSync(POLY_XLU_DISP++); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, colors[i][0].r, colors[i][0].g, colors[i][0].b, 255); @@ -597,7 +597,7 @@ void func_80967FFC(Actor* thisx, GlobalContext* globalCtx) { if ((s16)i) {} } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1127); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_demo_6k.c", 1145); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); alpha = (s32)(this->unk_170 * 255.0f); POLY_XLU_DISP = func_800937C0(POLY_XLU_DISP); @@ -631,7 +631,7 @@ void func_80968298(Actor* thisx, GlobalContext* globalCtx) { } Matrix_RotateX(-M_PI / 2, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1170), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 210, 210, 210, 255); gDPSetEnvColor(POLY_XLU_DISP++, 100, 100, 100, 255); @@ -640,14 +640,14 @@ void func_80968298(Actor* thisx, GlobalContext* globalCtx) { 64, 1, (0xFFF - (timer1 * 6)) & 0xFFF, (timer1 * 12) & 0xFFF, 64, 32)); gSPDisplayList(POLY_XLU_DISP++, object_demo_6k_DL_0039D0); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1189), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); gDPSetEnvColor(POLY_XLU_DISP++, 50, 50, 50, 255); gSPDisplayList(POLY_XLU_DISP++, object_demo_6k_DL_001040); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1198); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_demo_6k.c", 1208); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (!(this->flags & 1)) { if (this->actor.params > 8) { @@ -671,17 +671,17 @@ void func_8096865C(Actor* thisx, GlobalContext* globalCtx) { Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_Push(); Matrix_RotateZ((f32)(this->timer2 * 6) * (M_PI / 180.0f), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1230), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, displayList); Matrix_Pop(); Matrix_RotateZ(-(f32)(this->timer2 * 6) * (M_PI / 180.0f), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1236), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, displayList); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1242); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_demo_6k.c", 1277); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 255, 255); @@ -708,7 +708,7 @@ void func_809688C4(Actor* thisx, GlobalContext* globalCtx2) { this->unk_234[i] * D_8096931C[(frames + i) & 3], this->unk_234[i] * D_8096931C[(frames + i) & 3], MTXMODE_APPLY); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1297), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); Matrix_Pop(); @@ -716,7 +716,7 @@ void func_809688C4(Actor* thisx, GlobalContext* globalCtx2) { gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1305); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } @@ -729,12 +729,12 @@ void func_80968B70(Actor* thisx, GlobalContext* globalCtx) { if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1316); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1322), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0xFF - ((timer2 * 2) & 0xFF), 0, 32, 32, 1, @@ -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, "../z_demo_6k.c", 1368); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void func_80968FB0(Actor* thisx, GlobalContext* globalCtx) { @@ -779,13 +779,13 @@ void func_80968FB0(Actor* thisx, GlobalContext* globalCtx) { if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1386); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); scaleFactor = ((s16)D_809693CC[(frames * 4) & 0xF] * 0.01f) + 1.0f; Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor, this->actor.scale.z * scaleFactor, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1394), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, displayList); gDPPipeSync(displayList++); @@ -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, "../z_demo_6k.c", 1411); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 16f3daec0..253b564d5 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 @@ -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, "../z_demo_du.c", 615); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_demo_du.c", 638); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 1bd572366..5d2ce1f44 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, "../z_demo_ec.c", 565); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); 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, "../z_demo_ec.c", 595); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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, "../z_demo_ec.c", 609); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); 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, "../z_demo_ec.c", 646); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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, "../z_demo_ec.c", 662); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); 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, "../z_demo_ec.c", 670); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 d06eb2ce0..836cfc6ab 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 @@ -196,7 +196,7 @@ void DemoEffect_Init(Actor* thisx, GlobalContext* globalCtx2) { osSyncPrintf(VT_FGCOL(CYAN) " bank_ID = %d\n" VT_RST, objectIndex); if (objectIndex < 0) { - ASSERT(0, "0", "../z_demo_effect.c", 723); + ASSERT(0, "0", __FILE__, __LINE__); } else { this->initObjectBankIndex = objectIndex; } @@ -506,7 +506,7 @@ void DemoEffect_Init(Actor* thisx, GlobalContext* globalCtx2) { break; default: - ASSERT(0, "0", "../z_demo_effect.c", 1062); + ASSERT(0, "0", __FILE__, __LINE__); break; } @@ -683,7 +683,7 @@ void DemoEffect_InitTimeWarp(DemoEffect* this, GlobalContext* globalCtx) { s32 effectType = (this->actor.params & 0x00FF); if (!SkelCurve_Init(globalCtx, &this->skelCurve, &gTimeWarpSkel, &gTimeWarpAnim)) { - ASSERT(0, "0", "../z_demo_effect.c", 1283); + ASSERT(0, "0", __FILE__, __LINE__); } if (effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_LARGE || effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_SMALL) { @@ -1669,7 +1669,7 @@ void DemoEffect_DrawJewel(Actor* thisx, GlobalContext* globalCtx2) { GlobalContext* globalCtx = globalCtx2; u32 frames = this->jewel.timer; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2543); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (!DemoEffect_CheckCsAction(this, globalCtx, 1)) { if (1) {} @@ -1701,9 +1701,9 @@ void DemoEffect_DrawJewel(Actor* thisx, GlobalContext* globalCtx2) { if (!frames) {} gSPSegment(POLY_OPA_DISP++, 8, Gfx_TexScroll(globalCtx->state.gfxCtx, (u8)frames, (u8)frames, 16, 16)); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2597), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2599), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093D84(globalCtx->state.gfxCtx); func_8002ED80(&this->actor, globalCtx, 0); @@ -1720,7 +1720,7 @@ void DemoEffect_DrawJewel(Actor* thisx, GlobalContext* globalCtx2) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2620); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } /** @@ -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, "../z_demo_effect.c", 2634); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (parent != NULL) { gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 255, 255, 170, parent->triforceSpot.crystalLightOpacity); @@ -1748,7 +1748,7 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateY(0.0f, MTXMODE_APPLY); Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY); Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2661), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gCrystalLightDL); Matrix_Pop(); @@ -1756,7 +1756,7 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateY((2.0f * M_PI) / 3.0f, MTXMODE_APPLY); Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY); Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2672), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gCrystalLightDL); Matrix_Pop(); @@ -1764,11 +1764,11 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateY((4.0f * M_PI) / 3.0f, MTXMODE_APPLY); Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY); Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2683), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gCrystalLightDL); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2688); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } /** @@ -1778,18 +1778,18 @@ void DemoEffect_DrawFireBall(Actor* thisx, GlobalContext* globalCtx) { DemoEffect* this = (DemoEffect*)thisx; u32 frames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2701); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); gDPSetPrimColor(POLY_XLU_DISP++, 64, 64, 255, 200, 0, 255); gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 255); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2709), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, globalCtx->billboardMtx, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPSegment( 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, "../z_demo_effect.c", 2723); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } /** @@ -1801,7 +1801,7 @@ void DemoEffect_DrawGodLgt(Actor* thisx, GlobalContext* globalCtx) { s32 pad; u32 frames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2737); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (!DemoEffect_CheckCsAction(this, globalCtx, 2)) { if (gSaveContext.entranceIndex == 0x00A0) { @@ -1827,7 +1827,7 @@ void DemoEffect_DrawGodLgt(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, this->envXluColor[0], this->envXluColor[1], this->envXluColor[2], 255); func_80093D84(globalCtx->state.gfxCtx); Matrix_Push(); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2801), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gGoldenGoddessAuraDL); func_80093D18(globalCtx->state.gfxCtx); @@ -1844,12 +1844,12 @@ void DemoEffect_DrawGodLgt(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, -140.0f, 0.0f, MTXMODE_APPLY); Matrix_Scale(0.03f, 0.03f, 0.03f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2824), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gGoldenGoddessBodyDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2829); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } /** @@ -1860,7 +1860,7 @@ void DemoEffect_DrawLightEffect(Actor* thisx, GlobalContext* globalCtx) { u8* alpha; Gfx* disp; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2842); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (!DemoEffect_CheckCsAction(this, globalCtx, 1)) { @@ -1878,20 +1878,20 @@ void DemoEffect_DrawLightEffect(Actor* thisx, GlobalContext* globalCtx) { Matrix_Push(); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_RotateZ(this->light.rotation * (M_PI / 180.0f), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2866), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH); if (disp) {}; gSPDisplayList(POLY_XLU_DISP++, disp); Matrix_Pop(); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_RotateZ(-(f32)this->light.rotation * (M_PI / 180.0f), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2874), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, disp); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2881); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } /** @@ -1901,17 +1901,17 @@ void DemoEffect_DrawBlueOrb(Actor* thisx, GlobalContext* globalCtx) { DemoEffect* this = (DemoEffect*)thisx; s32 pad2; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2892); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_RotateZ(this->blueOrb.rotation * (M_PI / 0x8000), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2901), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); this->blueOrb.rotation += 0x01F4; gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2907); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } /** @@ -1922,17 +1922,17 @@ void DemoEffect_DrawLgtShower(Actor* thisx, GlobalContext* globalCtx) { s32 pad; u32 frames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2921); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2927), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 8, 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, "../z_demo_effect.c", 2942); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } /** @@ -1943,19 +1943,19 @@ void DemoEffect_DrawLightRing(Actor* thisx, GlobalContext* globalCtx2) { GlobalContext* globalCtx = globalCtx2; u32 frames = this->lightRing.timer; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2956); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 170, 255, 255, this->lightRing.alpha); gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 255); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2963), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (frames * 5) % 64, 512 - ((frames * 2) % 512) - 1, 16, 128, 1, 0, 0, 8, 1024)); gSPDisplayList(POLY_XLU_DISP++, gGoldenGoddessLightRingDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2978); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } /** @@ -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, "../z_demo_effect.c", 2994); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (gSaveContext.entranceIndex != 0x0400 || globalCtx->csCtx.frames < 885) { func_80093D84(globalCtx->state.gfxCtx); @@ -1975,7 +1975,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_EV_AURORA - SFX_FLAG); Matrix_Push(); Matrix_Scale(1.0f, 2.4f, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3011), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 9, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 256 - ((frames * 4) % 256) - 1, 64, 64, 1, 0, @@ -1990,7 +1990,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) { if (this->triforceSpot.triforceSpotOpacity != 0) { Audio_PlayActorSound2(&this->actor, NA_SE_EV_TRIFORCE - SFX_FLAG); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3042), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->triforceSpot.triforceSpotOpacity < 250) { @@ -1998,7 +1998,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2); Matrix_RotateY(this->triforceSpot.rotation * (M_PI / 0x8000), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3053), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 8, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 16, 1, 0, 0, 16, 8)); @@ -2010,7 +2010,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); gDPSetRenderMode(POLY_OPA_DISP++, G_RM_PASS, G_RM_AA_ZB_OPA_SURF2); Matrix_RotateY(this->triforceSpot.rotation * (M_PI / 0x8000), MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3085), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_OPA_DISP++, 8, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 16, 1, 0, 0, 16, 8)); @@ -2020,7 +2020,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) { } } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3112); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } /** @@ -2048,14 +2048,14 @@ s32 DemoEffect_DrawTimewarpLimbs(GlobalContext* globalCtx, SkelAnimeCurve* skelC DemoEffect* this = (DemoEffect*)thisx; u32 frames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3154); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_demo_effect.c", 3172); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_demo_effect.c", 3201); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); 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, "../z_demo_effect.c", 3216); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } } 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 d5c514dda..8652f728c 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,12 +192,12 @@ void DemoExt_DrawVortex(Actor* thisx, GlobalContext* globalCtx) { gfxCtx = globalCtx->state.gfxCtx; mtx = Graph_Alloc(gfxCtx, sizeof(Mtx)); - OPEN_DISPS(gfxCtx, "../z_demo_ext.c", 460); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); Matrix_Push(); Matrix_Scale(scale->x, scale->y, scale->z, MTXMODE_APPLY); Matrix_RotateZYX((s16)(kREG(16) + 0x4000), this->rotationPitch, kREG(18), MTXMODE_APPLY); Matrix_Translate(kREG(22), kREG(23), kREG(24), MTXMODE_APPLY); - Matrix_ToMtx(mtx, "../z_demo_ext.c", 476); + Matrix_ToMtx(mtx, __FILE__, __LINE__); Matrix_Pop(); func_80093D84(gfxCtx); @@ -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, "../z_demo_ext.c", 512); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 b19bf92f7..fdc87721f 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,16 +73,16 @@ void DemoGeff_Init(Actor* thisx, GlobalContext* globalCtx) { void func_80977EA8(GlobalContext* globalCtx, Gfx* dlist) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, "../z_demo_geff.c", 181); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D18(gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_geff.c", 183), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, dlist); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); - CLOSE_DISPS(gfxCtx, "../z_demo_geff.c", 188); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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, "../z_demo_geff.c", 204); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); 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, "../z_demo_geff.c", 212); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 66413e661..4b8cc14e6 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,17 +270,17 @@ void DemoGj_DrawCommon(DemoGj* this, GlobalContext* globalCtx, Gfx* displayList) if (kREG(0) == 0) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, "../z_demo_gj.c", 1163); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D18(gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_gj.c", 1165), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, displayList); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); - CLOSE_DISPS(gfxCtx, "../z_demo_gj.c", 1169); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } } @@ -296,11 +296,11 @@ void DemoGj_DrawRotated(DemoGj* this, GlobalContext* globalCtx, Gfx* displayList gfxCtx = globalCtx->state.gfxCtx; matrix = Graph_Alloc(gfxCtx, sizeof(Mtx)); - OPEN_DISPS(gfxCtx, "../z_demo_gj.c", 1187); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); Matrix_Push(); Matrix_RotateZYX(x, y, z, MTXMODE_APPLY); - Matrix_ToMtx(matrix, "../z_demo_gj.c", 1193); + Matrix_ToMtx(matrix, __FILE__, __LINE__); Matrix_Pop(); func_80093D18(gfxCtx); @@ -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, "../z_demo_gj.c", 1201); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 9b64c994b..cdb6cc862 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, "../z_demo_go.c", 732); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_demo_go.c", 746); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 764493b3b..f23c7e651 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, "../z_demo_gt_part1.c", 458); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); spA8.x = Math_CosS(spB8); spA8.y = 0.0f; @@ -663,7 +663,7 @@ void DemoGt_Draw1(DemoGt* this, GlobalContext* globalCtx) { Matrix_RotateAxis(spC0, &spA8, MTXMODE_APPLY); Matrix_Translate(sp9C.x, sp9C.y, sp9C.z, MTXMODE_APPLY); - Matrix_ToMtx(spB4, "../z_demo_gt_part1.c", 474); + Matrix_ToMtx(spB4, __FILE__, __LINE__); unk198 = this->unk_198; unk188 = this->unk_188; unk178 = this->unk_178; @@ -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, "../z_demo_gt_part1.c", 557); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } void func_8097F904_Init1(DemoGt* this, GlobalContext* globalCtx) { 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 28f1f455f..bca933385 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,22 +259,22 @@ void DemoIk_Type1PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi DemoIk* this = (DemoIk*)thisx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, "../z_demo_ik_inArmer.c", 385); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); if (limbIndex == 1) { switch (this->actor.params) { case 0: - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inArmer.c", 390), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0); break; case 2: - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inArmer.c", 396), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016F88); break; } } - CLOSE_DISPS(gfxCtx, "../z_demo_ik_inArmer.c", 404); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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, "../z_demo_ik_inArmer.c", 422); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); 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, "../z_demo_ik_inArmer.c", 444); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } void DemoIk_Type2Init(DemoIk* this, GlobalContext* globalCtx) { 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 7570cc0e0..b0cfad494 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, "../z_demo_im_inKenjyanomaDemo02.c", 281); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_demo_im_inKenjyanomaDemo02.c", 308); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void func_80985E60(DemoIm* this, 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 a9efbe4fc..9122c3aee 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 @@ -186,7 +186,7 @@ void DemoKankyo_Init(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf("bank_ID = %d\n", objBankIndex); if (objBankIndex < 0) { - ASSERT(0, "0", "../z_demo_kankyo.c", 521); + ASSERT(0, "0", __FILE__, __LINE__); } else { this->objBankIndex = objBankIndex; } @@ -522,7 +522,7 @@ void DemoKankyo_DrawRain(Actor* thisx, GlobalContext* globalCtx) { f32 translateZ; s16 j; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1186); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); for (i = 0; i < 30; i++) { s32 pad[2]; @@ -619,20 +619,20 @@ void DemoKankyo_DrawRain(Actor* thisx, GlobalContext* globalCtx) { } Matrix_Translate(translateX, translateY, translateZ, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1344), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x14); gSPDisplayList(POLY_XLU_DISP++, object_efc_star_field_DL_000080); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1358); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void DemoKankyo_DrawRock(Actor* thisx, GlobalContext* globalCtx) { DemoKankyo* this = (DemoKankyo*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1376); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW); @@ -642,11 +642,11 @@ void DemoKankyo_DrawRock(Actor* thisx, GlobalContext* globalCtx) { Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 155, 55, 255); gDPSetEnvColor(POLY_OPA_DISP++, 155, 255, 55, 255); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1404), + 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, "../z_demo_kankyo.c", 1409); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_demo_kankyo.c", 1425); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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); @@ -673,7 +673,7 @@ void DemoKankyo_DrawClouds(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 255); gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE); gDPSetColorDither(POLY_XLU_DISP++, G_AD_NOTPATTERN | G_CD_MAGICSQ); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1461), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gDust5Tex)); @@ -683,45 +683,45 @@ void DemoKankyo_DrawClouds(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gEffDustDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1474); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void DemoKankyo_DrawDoorOfTime(Actor* thisx, GlobalContext* globalCtx) { DemoKankyo* this = (DemoKankyo*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1487); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); Matrix_Translate(-this->unk_150[0].unk_18, 0.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1492), + 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_toki_objects_DL_007440); Matrix_Translate(this->unk_150[0].unk_18 + this->unk_150[0].unk_18, 0.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1497), + 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_toki_objects_DL_007578); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1501); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void DemoKankyo_DrawLightPlane(Actor* thisx, GlobalContext* globalCtx) { DemoKankyo* this = (DemoKankyo*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1514); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (globalCtx->csCtx.state == CS_STATE_IDLE || gSaveContext.sceneSetupIndex >= 4) { func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, globalCtx->state.frames & 0x7F, 64, 32)); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1529), + 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_toki_objects_DL_008390); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1534); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_demo_kankyo.c", 1824); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->sparkleCounter < 30) { this->sparkleCounter += 2; @@ -879,14 +879,14 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_RotateZ(DEG_TO_RAD(this->unk_150[i].unk_24), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2011), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, disp); this->unk_150[i].unk_24 += 0x190; } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2019); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_demo_kankyo.c", 2434); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->sparkleCounter < 20) { this->sparkleCounter++; @@ -981,12 +981,12 @@ void DemoKankyo_DrawSparkles(Actor* thisx, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_RotateZ(DEG_TO_RAD(this->unk_150[i].unk_24), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2572), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); this->unk_150[i].unk_24 += 0x190; } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2579); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 53044464c..0531821d5 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 @@ -253,7 +253,7 @@ void DemoKekkai_TrialBarrierIdle(Actor* thisx, GlobalContext* globalCtx) { if (this->collider2.base.acFlags & AC_HIT) { func_80078884(NA_SE_SY_CORRECT_CHIME); // "I got it" - LOG_STRING("当ったよ", "../z_demo_kekkai.c", 572); + LOG_STRING("当ったよ", __FILE__, __LINE__); this->actor.update = DemoKekkai_TrialBarrierDispel; this->timer = 0; globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(sSageCutscenes[this->actor.params]); @@ -286,20 +286,20 @@ 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, "../z_demo_kekkai.c", 632); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); Matrix_Push(); Matrix_Translate(0.0f, 1200.0f, 0.0f, MTXMODE_APPLY); Matrix_Scale(this->orbScale, this->orbScale, this->orbScale, MTXMODE_APPLY); Matrix_Translate(0.0f, -1200.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kekkai.c", 639), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frames * 5, frames * -10, 0x20, 0x20, 1, frames * 5, frames * -10, 0x20, 0x20)); gSPDisplayList(POLY_XLU_DISP++, gTrialBarrierOrbDL); Matrix_Pop(); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kekkai.c", 656), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPPipeSync(POLY_XLU_DISP++); gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x80, 50, 0, 100, 255); @@ -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, "../z_demo_kekkai.c", 696); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } @@ -325,16 +325,16 @@ void DemoKekkai_DrawTowerBarrier(Actor* thisx, GlobalContext* globalCtx) { s32 scroll; scroll = (s32)this->barrierScroll & 0xFFFF; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kekkai.c", 705); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kekkai.c", 707), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x80, 255, 170, 255, 255); gSPSegment(POLY_XLU_DISP++, 0x08, 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, "../z_demo_kekkai.c", 722); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 ecd20ac7f..8fe2e5cd3 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, "../z_demo_sa_inKenjyanomaDemo02.c", 296); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_demo_sa_inKenjyanomaDemo02.c", 325); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void func_8098F390(DemoSa* this, 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 ff0770cb0..43c991964 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,11 +104,11 @@ void DemoShd_Draw(Actor* thisx, GlobalContext* globalCtx) { if (1) {} // Necessary to match, can be anywhere in the function - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_shd.c", 726); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_shd.c", 729), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, D_809932D0); @@ -122,5 +122,5 @@ void DemoShd_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, D_809934B8); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_shd.c", 762); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 205eaffa7..3e79f4f2d 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 @@ -54,7 +54,7 @@ void DemoTreLgt_Init(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf("Demo_Tre_Lgt_Actor_ct();コンストラクト失敗\n"); } - ASSERT(true, "1", "../z_demo_tre_lgt.c", UNK_LINE); + ASSERT(true, "1", __FILE__, UNK_LINE); this->unk_170 = 255; this->unk_174 = 255; @@ -136,7 +136,7 @@ s32 DemoTreLgt_PostLimbDraw(GlobalContext* globalCtx, SkelAnimeCurve* skelCurve, s32 pad; DemoTreLgt* this = (DemoTreLgt*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_tre_lgt.c", 423); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_demo_tre_lgt.c", 448); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void DemoTreLgt_Draw(Actor* thisx, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; DemoTreLgt* this = (DemoTreLgt*)thisx; - OPEN_DISPS(gfxCtx, "../z_demo_tre_lgt.c", 461); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); 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, "../z_demo_tre_lgt.c", 476); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 e0c2f8b35..381cd6c07 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, "../z_door_ana.c", 440); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_ana.c", 446), + 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, "../z_door_ana.c", 449); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 fa7e84b80..67c1b6568 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,11 +144,11 @@ void DoorGerudo_Update(Actor* thisx, GlobalContext* globalCtx) { void DoorGerudo_Draw(Actor* thisx, GlobalContext* globalCtx) { DoorGerudo* this = (DoorGerudo*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_door_gerudo.c", 361); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_gerudo.c", 365), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gGerudoCellDoorDL); @@ -157,5 +157,5 @@ void DoorGerudo_Draw(Actor* thisx, GlobalContext* globalCtx) { Actor_DrawDoorLock(globalCtx, this->unk_166, DOORLOCK_NORMAL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_door_gerudo.c", 377); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 e028731fb..3066cc5b9 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, "../z_door_killer.c", 883); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); gSPSegment(POLY_OPA_DISP++, 0x08, doorTexture); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_door_killer.c", 885); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 9ada2795c..631098139 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 @@ -661,7 +661,7 @@ Gfx* func_80997838(GlobalContext* globalCtx, DoorShutter* this, Gfx* p) { if (this->unk_166 != 100) { Matrix_Scale(1.0f, yScale, 1.0f, MTXMODE_APPLY); } - gSPMatrix(p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_shutter.c", 1991), + gSPMatrix(p++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(p++, sJabuDoorDLists[i]); angle -= M_PI / 4; @@ -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, "../z_door_shutter.c", 2048); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); @@ -720,7 +720,7 @@ void DoorShutter_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255.0f * sp58); Matrix_Translate(0, 0, sp70->translateZ, MTXMODE_APPLY); Matrix_Scale(sp58, sp58, sp58, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_shutter.c", 2069), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, sp70->b); } @@ -742,12 +742,12 @@ void DoorShutter_Draw(Actor* thisx, GlobalContext* globalCtx) { } else if (this->doorType == SHUTTER_BOSS) { gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_809982D4[this->unk_168])); } - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_shutter.c", 2109), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, sp70->a); if (this->unk_170 != 0.0f && sp70->b != NULL) { Matrix_Translate(0, sp70->c * (1.0f - this->unk_170), sp70->translateZ, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_shutter.c", 2119), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, sp70->b); } @@ -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, "../z_door_shutter.c", 2135); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } 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 ee503dd43..cda22f73c 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, "../z_door_warp1.c", 2078); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_door_warp1.c", 2098); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_door_warp1.c", 2122); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_door_warp1.c", 2152); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_door_warp1.c", 2173); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); temp_f0 = 1.0f - (2.0f - this->unk_194) / 1.7f; if (this->actor.params != WARP_YELLOW && this->actor.params != WARP_DESTINATION && @@ -967,7 +967,7 @@ void DoorWarp1_DrawWarp(DoorWarp1* this, GlobalContext* globalCtx) { gDPSetColorDither(POLY_XLU_DISP++, G_AD_NOTPATTERN | G_CD_MAGICSQ); Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y + 1.0f, this->actor.world.pos.z, MTXMODE_NEW); - gSPSegment(POLY_XLU_DISP++, 0x0A, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_warp1.c", 2247)); + gSPSegment(POLY_XLU_DISP++, 0x0A, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__)); Matrix_Push(); gSPSegment(POLY_XLU_DISP++, 0x08, @@ -978,7 +978,7 @@ void DoorWarp1_DrawWarp(DoorWarp1* this, GlobalContext* globalCtx) { Matrix_Translate(0.0f, this->unk_194 * 230.0f, 0.0f, MTXMODE_APPLY); xzScale = (((f32)this->unk_1AE * spE8) / 100.0f) + 1.0f; Matrix_Scale(xzScale, 1.0f, xzScale, MTXMODE_APPLY); - gSPSegment(POLY_XLU_DISP++, 0x09, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_warp1.c", 2267)); + gSPSegment(POLY_XLU_DISP++, 0x09, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__)); gSPDisplayList(POLY_XLU_DISP++, gWarpPortalDL); Matrix_Pop(); @@ -1016,11 +1016,11 @@ void DoorWarp1_DrawWarp(DoorWarp1* this, GlobalContext* globalCtx) { xzScale = (((f32)this->unk_1B0 * spE4) / 100.0f) + 1.0f; Matrix_Scale(xzScale, 1.0f, xzScale, MTXMODE_APPLY); - gSPSegment(POLY_XLU_DISP++, 0x09, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_warp1.c", 2336)); + gSPSegment(POLY_XLU_DISP++, 0x09, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__)); gSPDisplayList(POLY_XLU_DISP++, gWarpPortalDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_door_warp1.c", 2340); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 50ddabcd1..020295120 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, "../z_efc_erupc.c", 282); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); @@ -133,7 +133,7 @@ void EfcErupc_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Push(); Matrix_Scale(0.8f, 0.8f, 0.8f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_efc_erupc.c", 321), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (globalCtx->csCtx.state != 0) { @@ -143,7 +143,7 @@ void EfcErupc_Draw(Actor* thisx, GlobalContext* globalCtx) { } Matrix_Pop(); Matrix_Scale(3.4f, 3.4f, 3.4f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_efc_erupc.c", 333), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (globalCtx->csCtx.state != 0) { CsCmdActorAction* csActorAction = globalCtx->csCtx.npcActions[2]; @@ -156,7 +156,7 @@ void EfcErupc_Draw(Actor* thisx, GlobalContext* globalCtx) { } } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_efc_erupc.c", 356); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); EfcErupc_DrawParticles(this->particles, globalCtx); } @@ -165,7 +165,7 @@ void EfcErupc_DrawParticles(EfcErupcParticles* particles, GlobalContext* globalC s16 i; s32 pad; - OPEN_DISPS(gfxCtx, "../z_efc_erupc.c", 368); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); for (i = 0; i < EFC_ERUPC_NUM_PARTICLES; i++, particles++) { if (particles->isActive) { func_80093D84(globalCtx->state.gfxCtx); @@ -177,12 +177,12 @@ void EfcErupc_DrawParticles(EfcErupcParticles* particles, GlobalContext* globalC Matrix_Translate(particles->pos.x, particles->pos.y, particles->pos.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(particles->scale, particles->scale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_efc_erupc.c", 393), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_efc_erupc_DL_0027D8); } } - CLOSE_DISPS(gfxCtx, "../z_efc_erupc.c", 399); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 1c52a6764..d6e75821b 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 @@ -103,7 +103,7 @@ void EffDust_Init(Actor* thisx, GlobalContext* globalCtx) { this->scalingFactor = 20.0f; break; default: - SystemArena_FreeDebug(this, "../z_eff_dust.c", 202); + SystemArena_FreeDebug(this, __FILE__, __LINE__); break; } @@ -269,7 +269,7 @@ void EffDust_DrawFunc_8099E4F4(Actor* thisx, GlobalContext* globalCtx2) { s32 i; f32 aux; - OPEN_DISPS(gfxCtx, "../z_eff_dust.c", 425); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D18(gfxCtx); @@ -293,7 +293,7 @@ void EffDust_DrawFunc_8099E4F4(Actor* thisx, GlobalContext* globalCtx2) { Matrix_Scale(this->scalingFactor, this->scalingFactor, this->scalingFactor, MTXMODE_APPLY); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_dust.c", 449), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffSparklesDL)); } @@ -304,7 +304,7 @@ void EffDust_DrawFunc_8099E4F4(Actor* thisx, GlobalContext* globalCtx2) { if (0) {} } - CLOSE_DISPS(gfxCtx, "../z_eff_dust.c", 458); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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, "../z_eff_dust.c", 472); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D18(gfxCtx); @@ -354,7 +354,7 @@ void EffDust_DrawFunc_8099E784(Actor* thisx, GlobalContext* globalCtx2) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_dust.c", 506), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffSparklesDL)); } @@ -363,7 +363,7 @@ void EffDust_DrawFunc_8099E784(Actor* thisx, GlobalContext* globalCtx2) { distanceTraveled++; } - CLOSE_DISPS(gfxCtx, "../z_eff_dust.c", 515); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 f995179f1..69efd9d1c 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 @@ -47,14 +47,14 @@ void ElfMsg_SetupAction(ElfMsg* this, ElfMsgActionFunc actionFunc) { s32 ElfMsg_KillCheck(ElfMsg* this, GlobalContext* globalCtx) { if ((this->actor.world.rot.y > 0) && (this->actor.world.rot.y < 0x41) && Flags_GetSwitch(globalCtx, this->actor.world.rot.y - 1)) { - LOG_STRING("共倒れ", "../z_elf_msg.c", 161); // "Mutual destruction" + LOG_STRING("共倒れ", __FILE__, __LINE__); // "Mutual destruction" if (((this->actor.params >> 8) & 0x3F) != 0x3F) { Flags_SetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F); } Actor_Kill(&this->actor); return 1; } else if ((this->actor.world.rot.y == -1) && Flags_GetClear(globalCtx, this->actor.room)) { - LOG_STRING("共倒れ", "../z_elf_msg.c", 172); // "Mutual destruction" + LOG_STRING("共倒れ", __FILE__, __LINE__); // "Mutual destruction" if (((this->actor.params >> 8) & 0x3F) != 0x3F) { Flags_SetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F); } @@ -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, "../z_elf_msg.c", 436); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (R_NAVI_MSG_REGION_ALPHA == 0) { return; @@ -188,7 +188,7 @@ void ElfMsg_Draw(Actor* thisx, GlobalContext* globalCtx) gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, R_NAVI_MSG_REGION_ALPHA); } - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_elf_msg.c", 448), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, D_809AD278); @@ -198,6 +198,6 @@ void ElfMsg_Draw(Actor* thisx, GlobalContext* globalCtx) gSPDisplayList(POLY_XLU_DISP++, sCylinderDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg.c", 457); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); #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 73b6785c8..ee080b149 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 @@ -47,14 +47,14 @@ void ElfMsg2_SetupAction(ElfMsg2* this, ElfMsg2ActionFunc actionFunc) { s32 ElfMsg2_KillCheck(ElfMsg2* this, GlobalContext* globalCtx) { if ((this->actor.world.rot.y > 0) && (this->actor.world.rot.y < 0x41) && Flags_GetSwitch(globalCtx, this->actor.world.rot.y - 1)) { - LOG_STRING("共倒れ", "../z_elf_msg2.c", 171); // "Mutual destruction" + LOG_STRING("共倒れ", __FILE__, __LINE__); // "Mutual destruction" if (((this->actor.params >> 8) & 0x3F) != 0x3F) { Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F)); } Actor_Kill(&this->actor); return 1; } else if ((this->actor.world.rot.y == -1) && Flags_GetClear(globalCtx, this->actor.room)) { - LOG_STRING("共倒れ２", "../z_elf_msg2.c", 182); // "Mutual destruction 2" + LOG_STRING("共倒れ２", __FILE__, __LINE__); // "Mutual destruction 2" if (((this->actor.params >> 8) & 0x3F) != 0x3F) { Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F)); } @@ -63,7 +63,7 @@ s32 ElfMsg2_KillCheck(ElfMsg2* this, GlobalContext* globalCtx) { } else if (((this->actor.params >> 8) & 0x3F) == 0x3F) { return 0; } else if (Flags_GetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F))) { - LOG_STRING("共倒れ", "../z_elf_msg2.c", 192); // "Mutual destruction" + LOG_STRING("共倒れ", __FILE__, __LINE__); // "Mutual destruction" Actor_Kill(&this->actor); return 1; } @@ -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, "../z_elf_msg2.c", 355); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (R_NAVI_MSG_REGION_ALPHA == 0) { return; @@ -162,11 +162,11 @@ void ElfMsg2_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 100, 100, 255, R_NAVI_MSG_REGION_ALPHA); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_elf_msg2.c", 362), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, D_809ADC38); gSPDisplayList(POLY_XLU_DISP++, sCubeDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg2.c", 367); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); #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 32ea5d706..dc7b6b142 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, "../z_en_am.c", 1580); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_am.c", 1605); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 40b26c790..c40eec780 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, "../z_en_ani.c", 719); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ani.c", 736); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 45f7117ec..016add9b7 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, "../z_en_anubice.c", 853); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_anubice.c", 856), + 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, "../z_en_anubice.c", 868); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } 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 9d635a3ba..1f07e8a6b 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, "../z_en_anubice_fire.c", 503); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 0, 255); @@ -244,7 +244,7 @@ void EnAnubiceFire_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_RotateZ(this->actor.world.rot.z + i * 1000.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_anubice_fire.c", 546), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gAnubiceFireAttackDL); @@ -256,5 +256,5 @@ void EnAnubiceFire_Draw(Actor* thisx, GlobalContext* globalCtx) { } Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_anubice_fire.c", 556); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 504293094..4b7ead079 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 @@ -131,7 +131,7 @@ void EnArrow_Init(Actor* thisx, GlobalContext* globalCtx) { } else if (this->actor.params <= ARROW_SEED) { this->collider.info.toucher.dmgFlags = dmgFlags[this->actor.params]; LOG_HEX("this->at_info.cl_elem.at_btl_info.at_type", this->collider.info.toucher.dmgFlags, - "../z_en_arrow.c", 707); + __FILE__, __LINE__); } } @@ -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, "../z_en_arrow.c", 1346); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093C14(globalCtx->state.gfxCtx); @@ -483,13 +483,13 @@ void EnArrow_Draw(Actor* thisx, GlobalContext* globalCtx) { : ((globalCtx->gameplayFrames & 0xFF) * 4000) * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_arrow.c", 1374), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffSparklesDL); Matrix_Pop(); Matrix_RotateY(this->actor.world.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_arrow.c", 1381); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 9ec3b9065..676e32b26 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, "../z_en_ba.c", 933); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); if (this->actor.params < EN_BA_DEAD_BLOB) { Matrix_Push(); @@ -503,10 +503,10 @@ void EnBa_Draw(Actor* thisx, GlobalContext* globalCtx) { break; } } - Matrix_ToMtx(mtx, "../z_en_ba.c", 970); + Matrix_ToMtx(mtx, __FILE__, __LINE__); } Matrix_Pop(); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ba.c", 973), + 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_bxa_DL_000890); } else { @@ -516,9 +516,9 @@ void EnBa_Draw(Actor* thisx, GlobalContext* globalCtx) { (globalCtx->gameplayFrames * -5) % 128, (globalCtx->gameplayFrames * -5) % 128, 32, 32)); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 125, 100, 255); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ba.c", 991), + 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_bxa_DL_001D80); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ba.c", 995); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 f29263898..a004b064c 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, "../z_en_bb.c", 2044); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); blureBase1.z = this->maxSpeed * 80.0f; blureBase2.z = this->maxSpeed * 80.0f; @@ -1334,7 +1334,7 @@ void EnBb_Draw(Actor* thisx, GlobalContext* globalCtx) { (M_PI / 0x8000), MTXMODE_APPLY); Matrix_Scale(this->flameScaleX * 0.01f, this->flameScaleY * 0.01f, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bb.c", 2106), + 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); } else { @@ -1348,5 +1348,5 @@ void EnBb_Draw(Actor* thisx, GlobalContext* globalCtx) { } } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bb.c", 2127); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 f88ec0917..6c9f70dec 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, "../z_en_bdfire.c", 612); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); temp = this->unk_156 & 7; Matrix_ReplaceRotation(&globalCtx->billboardMtxF); func_80094BC4(globalCtx->state.gfxCtx); @@ -217,10 +217,10 @@ void EnBdfire_DrawFire(EnBdfire* this, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, 200, 0, 0, 0); gSPSegment(POLY_XLU_DISP++, 8, SEGMENTED_TO_VIRTUAL(D_809BCB10[temp])); Matrix_Translate(0.0f, 11.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bdfire.c", 647), + 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, "../z_en_bdfire.c", 651); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 3e825d06f..d785a5039 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, "../z_en_bigokuta.c", 1914); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_bigokuta.c", 1945); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } else if (limbIndex == 10) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bigokuta.c", 1950); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_bigokuta.c", 1972); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_bigokuta.c", 2017); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_bigokuta.c", 2076); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 6c6b70fd4..71c272a3b 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, "../z_en_bili.c", 1521); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_bili.c", 1552); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 fa650bb21..f51909e8b 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, "../z_en_blkobj.c", 322); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_blkobj.c", 330); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_blkobj.c", 349); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); @@ -160,7 +160,7 @@ void EnBlkobj_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPSegment(POLY_XLU_DISP++, 0x0D, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames, 0, 32, 32, 1, gameplayFrames, 0, 32, 32)); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_blkobj.c", 363), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->alpha != 0) { @@ -171,5 +171,5 @@ void EnBlkobj_Draw(Actor* thisx, GlobalContext* globalCtx) { EnBlkobj_DrawAlpha(globalCtx, gIllusionRoomIllusionDL, illusionAlpha); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_blkobj.c", 375); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 b5ee3290c..143d6c260 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,18 +362,18 @@ void EnBom_Draw(Actor* thisx, GlobalContext* globalCtx) { if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bom.c", 913); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (thisx->params == BOMB_BODY) { func_80093D18(globalCtx->state.gfxCtx); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); func_8002EBCC(thisx, globalCtx, 0); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bom.c", 928), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gBombCapDL); Matrix_RotateZYX(0x4000, 0, 0, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bom.c", 934), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, (s16)this->flashIntensity, 0, 40, 255); @@ -382,5 +382,5 @@ void EnBom_Draw(Actor* thisx, GlobalContext* globalCtx) { Collider_UpdateSpheres(0, &this->explosionCollider); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bom.c", 951); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 59f328a77..601ad1aa2 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, "../z_en_bom_bowl_man.c", 907); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_bom_bowl_man.c", 923); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 715ca552e..ca37286e5 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, "../z_en_bom_chu.c", 921); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); @@ -509,9 +509,9 @@ void EnBomChu_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_OPA_DISP++, 9.0f + (colorIntensity * 209.0f), 9.0f + (colorIntensity * 34.0f), 35.0f + (colorIntensity * -35.0f), 255); Matrix_Translate(this->visualJitter * (1.0f / BOMBCHU_SCALE), 0.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bom_chu.c", 956), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gBombchuDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bom_chu.c", 961); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 5ec38a3fb..7bef0e0a0 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 @@ -472,7 +472,7 @@ Gfx* EnBombf_NewMtxDList(GraphicsContext* gfxCtx, GlobalContext* globalCtx) { displayList = Graph_Alloc(gfxCtx, 5 * sizeof(Gfx)); displayListHead = displayList; Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(displayListHead++, Matrix_NewMtx(gfxCtx, "../z_en_bombf.c", 1021), + gSPMatrix(displayListHead++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPEndDisplayList(displayListHead); return displayList; @@ -484,13 +484,13 @@ void EnBombf_Draw(Actor* thisx, GlobalContext* globalCtx) { if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bombf.c", 1034); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (thisx->params <= BOMBFLOWER_BODY) { func_80093D18(globalCtx->state.gfxCtx); if (thisx->params != BOMBFLOWER_BODY) { - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bombf.c", 1041), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gBombFlowerLeavesDL); gSPDisplayList(POLY_OPA_DISP++, gBombFlowerBaseLeavesDL); @@ -502,7 +502,7 @@ void EnBombf_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 200, 255, 200, 255); gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, (s16)this->flashIntensity, 20, 10, 0); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bombf.c", 1054), + 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(EnBombf_NewMtxDList(globalCtx->state.gfxCtx, globalCtx))); @@ -511,5 +511,5 @@ void EnBombf_Draw(Actor* thisx, GlobalContext* globalCtx) { Collider_UpdateSpheres(0, &this->explosionCollider); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bombf.c", 1063); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 f06ba43f4..f656875ad 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, "../z_en_boom.c", 567); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_RotateY(this->actor.world.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_RotateZ(0x1F40 * (M_PI / 0x8000), MTXMODE_APPLY); @@ -270,9 +270,9 @@ void EnBoom_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); Matrix_RotateY((this->activeTimer * 12000) * (M_PI / 0x8000), MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_boom.c", 601), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gBoomerangRefDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_boom.c", 604); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 7d8886953..14ae611e2 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 @@ -546,7 +546,7 @@ void EnBox_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve s32 pad; if (limbIndex == 1) { - gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_box.c", 1492), + gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->type != ENBOX_TYPE_DECORATED_BIG) { gSPDisplayList((*gfx)++, gTreasureChestChestFrontDL); @@ -554,7 +554,7 @@ void EnBox_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve gSPDisplayList((*gfx)++, gTreasureChestBossKeyChestFrontDL); } } else if (limbIndex == 3) { - gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_box.c", 1502), + gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->type != ENBOX_TYPE_DECORATED_BIG) { gSPDisplayList((*gfx)++, gTreasureChestChestSideAndLidDL); @@ -569,7 +569,7 @@ Gfx* EnBox_EmptyDList(GraphicsContext* gfxCtx) { Gfx* dList; dList = Graph_Alloc(gfxCtx, sizeof(Gfx)); - ASSERT(dList != NULL, "gfxp != NULL", "../z_en_box.c", 1528); + ASSERT(dList != NULL, "gfxp != NULL", __FILE__, __LINE__); dListHead = dList; gSPEndDisplayList(dListHead++); @@ -583,7 +583,7 @@ Gfx* func_809CA4A0(GraphicsContext* gfxCtx) { Gfx* dListHead; dListHead = Graph_Alloc(gfxCtx, 2 * sizeof(Gfx)); - ASSERT(dListHead != NULL, "gfxp != NULL", "../z_en_box.c", 1546); + ASSERT(dListHead != NULL, "gfxp != NULL", __FILE__, __LINE__); dList = dListHead; gDPSetRenderMode(dListHead++, @@ -601,7 +601,7 @@ Gfx* func_809CA518(GraphicsContext* gfxCtx) { Gfx* dListHead; dListHead = Graph_Alloc(gfxCtx, 2 * sizeof(Gfx)); - ASSERT(dListHead != NULL, "gfxp != NULL", "../z_en_box.c", 1564); + ASSERT(dListHead != NULL, "gfxp != NULL", __FILE__, __LINE__); dList = dListHead; gDPSetRenderMode(dListHead++, @@ -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, "../z_en_box.c", 1581); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); /* 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, "../z_en_box.c", 1639); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 9b36b859e..b82e6a164 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, "../z_en_bubble.c", 1175); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->actionFunc != EnBubble_Disappear) { func_80093D84(globalCtx->state.gfxCtx); @@ -422,12 +422,12 @@ void EnBubble_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Scale(this->graphicEccentricity + 1.0f, 1.0f, 1.0f, MTXMODE_APPLY); Matrix_RotateZ((-(f32)globalCtx->state.frames * (M_PI / 180.0f)) * this->graphicRotSpeed, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bubble.c", 1220), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBubbleDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bubble.c", 1226); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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 27b8b5228..a7fb40569 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, "../z_en_choo.c", 295); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093C14(globalCtx->state.gfxCtx); @@ -130,13 +130,13 @@ void EnButte_DrawTransformationEffect(EnButte* this, GlobalContext* globalCtx) { Matrix_SetTranslateRotateYXZ(this->actor.focus.pos.x + sp5C.x, this->actor.focus.pos.y + sp5C.y, this->actor.focus.pos.z + sp5C.z, &camDir); Matrix_Scale(sTransformationEffectScale, sTransformationEffectScale, sTransformationEffectScale, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_choo.c", 317), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 200, 200, 180, alpha); gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 210, 255); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffFlash1DL)); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_choo.c", 326); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 6eaa2f777..a1b0eecbb 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 @@ -824,7 +824,7 @@ s32 EnBw_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Matrix_RotateZ(-(this->unk_258 * 0.1f), MTXMODE_APPLY); Matrix_RotateY(-(this->unk_258 * 0.13f), MTXMODE_APPLY); Matrix_RotateX(-(this->unk_258 * 0.115f), MTXMODE_APPLY); - gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bw.c", 1388), + gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList((*gfx)++, *dList); Matrix_Pop(); @@ -846,7 +846,7 @@ void EnBw_Draw(Actor* thisx, GlobalContext* globalCtx2) { Vec3f icePos; s32 iceIndex; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bw.c", 1423); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->color1.a == 0xFF) { func_80093D18(globalCtx->state.gfxCtx); @@ -886,7 +886,7 @@ void EnBw_Draw(Actor* thisx, GlobalContext* globalCtx2) { gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 0, 255); Matrix_Scale(this->unk_248 * 0.01f, this->unk_248 * 0.01f, this->unk_248 * 0.01f, MTXMODE_APPLY); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bw.c", 1500), + 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); @@ -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, "../z_en_bw.c", 1521); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 2767ed6ab..50b48a44b 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, "../z_en_bx.c", 464); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); @@ -215,7 +215,7 @@ void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 16, 16, 1, 0, (globalCtx->gameplayFrames * -10) % 128, 32, 32)); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bx.c", 478), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->actor.params & 0x80) { @@ -238,10 +238,10 @@ void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(this->unk_154[i].x, this->unk_154[i].y, this->unk_154[i].z, MTXMODE_NEW); Matrix_RotateZYX(this->unk_1B4[i].x, this->unk_1B4[i].y, this->unk_1B4[i].z, MTXMODE_APPLY); Matrix_Scale(this->unk_184[i].x, this->unk_184[i].y, this->unk_184[i].z, MTXMODE_APPLY); - Matrix_ToMtx(mtx, "../z_en_bx.c", 507); + Matrix_ToMtx(mtx, __FILE__, __LINE__); } gSPDisplayList(POLY_OPA_DISP++, object_bxa_DL_0022F0); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bx.c", 511); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 274505978..0ba39bfc6 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, "../z_en_clear_tag.c", 983); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->drawMode != CLEAR_TAG_DRAW_MODE_EFFECT) { func_80093D84(globalCtx->state.gfxCtx); @@ -695,12 +695,12 @@ void EnClearTag_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 255, 0, 255); Matrix_Translate(25.0f, 0.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_clear_tag.c", 1004), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gArwingLaserDL); Matrix_Translate(-50.0f, 0.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_clear_tag.c", 1011), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gArwingLaserDL); } else { @@ -718,7 +718,7 @@ void EnClearTag_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateY(yRotation, MTXMODE_APPLY); } Matrix_RotateZ(this->roll, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_clear_tag.c", 1030), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gArwingDL); @@ -732,7 +732,7 @@ void EnClearTag_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 200, 155); gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 255, 50, 0, 0); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_clear_tag.c", 1067), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gArwingBackfireDL); @@ -756,7 +756,7 @@ void EnClearTag_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateY(yRotation, MTXMODE_APPLY); } Matrix_RotateZ(this->roll, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_clear_tag.c", 1104), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gArwingShadowDL); } @@ -766,7 +766,7 @@ void EnClearTag_Draw(Actor* thisx, GlobalContext* globalCtx) { EnClearTag_DrawEffects(globalCtx); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_clear_tag.c", 1119); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } /** @@ -896,7 +896,7 @@ void EnClearTag_DrawEffects(GlobalContext* globalCtx) { EnClearTagEffect* effect = (EnClearTagEffect*)globalCtx->specialEffects; EnClearTagEffect* firstEffect = effect; - OPEN_DISPS(gfxCtx, "../z_en_clear_tag.c", 1288); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -914,7 +914,7 @@ void EnClearTag_DrawEffects(GlobalContext* globalCtx) { Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY); Matrix_RotateY(effect->rotationY, MTXMODE_APPLY); Matrix_RotateX(effect->rotationX, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_clear_tag.c", 1307), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gArwingDebrisEffectDL); } @@ -938,7 +938,7 @@ void EnClearTag_DrawEffects(GlobalContext* globalCtx) { Matrix_RotateX(effect->floorTangent.x, MTXMODE_APPLY); Matrix_RotateZ(effect->floorTangent.z, MTXMODE_APPLY); Matrix_Scale(effect->scale + effect->scale, 1.0f, effect->scale * 2.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_clear_tag.c", 1342), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gArwingFlashEffectGroundDL); } @@ -967,7 +967,7 @@ void EnClearTag_DrawEffects(GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, 20.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_clear_tag.c", 1392), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gArwingFireEffectDL); } @@ -993,7 +993,7 @@ void EnClearTag_DrawEffects(GlobalContext* globalCtx) { Matrix_Translate(effect->position.x, effect->position.y, effect->position.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_clear_tag.c", 1439), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gArwingFireEffectDL); } @@ -1016,13 +1016,13 @@ void EnClearTag_DrawEffects(GlobalContext* globalCtx) { Matrix_Translate(effect->position.x, effect->position.y, effect->position.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_clear_tag.c", 1470), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gArwingFlashEffectDL); } } - CLOSE_DISPS(gfxCtx, "../z_en_clear_tag.c", 1477); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 cace48e3f..7f422cc0b 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, "../z_en_cs.c", 968); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeIndex])); @@ -478,7 +478,7 @@ void EnCs_Draw(Actor* thisx, GlobalContext* globalCtx) { Mtx* mtx; Matrix_Put(&this->spookyMaskMtx); - mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_cs.c", 1000); + mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__); gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[childLinkObjectIndex].segment); gSPSegment(POLY_OPA_DISP++, 0x0D, mtx - 7); gSPDisplayList(POLY_OPA_DISP++, gLinkChildSpookyMaskDL); @@ -486,7 +486,7 @@ void EnCs_Draw(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_cs.c", 1015); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 d576e5153..5548742e4 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, "../z_en_daiku.c", 1227); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_daiku.c", 1255); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_daiku.c", 1323); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_daiku.c", 1330); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 6c121b3e9..88094570a 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, "../z_en_daiku_kakariko.c", 1104); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (limbIndex == 15) { Matrix_MultVec3f(&unkVec, &this->actor.focus.pos); gSPDisplayList(POLY_OPA_DISP++, carpenterHeadDLists[this->actor.params & 3]); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_daiku_kakariko.c", 1113); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnDaikuKakariko_Draw(Actor* thisx, GlobalContext* globalCtx) { EnDaikuKakariko* this = (EnDaikuKakariko*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_daiku_kakariko.c", 1124); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_daiku_kakariko.c", 1151); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 b858298d8..9c3333e95 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, "../z_en_dekubaba.c", 2445); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); horizontalScale = this->size * 0.01f; @@ -1157,13 +1157,13 @@ void EnDekubaba_DrawStemRetracted(EnDekubaba* this, GlobalContext* globalCtx) { MTXMODE_NEW); Matrix_RotateZYX(this->stemSectionAngle[0], this->actor.shape.rot.y, 0, MTXMODE_APPLY); Matrix_Scale(horizontalScale, horizontalScale, horizontalScale, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2461), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gDekuBabaStemTopDL); Actor_SetFocus(&this->actor, 0.0f); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2468); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_dekubaba.c", 2487); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->actionFunc == EnDekubaba_PrunedSomersault) { stemSections = 2; @@ -1202,7 +1202,7 @@ void EnDekubaba_DrawStemExtended(EnDekubaba* this, GlobalContext* globalCtx) { Matrix_Put(&mtx); Matrix_RotateZYX(this->stemSectionAngle[i], this->actor.shape.rot.y, 0, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2533), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, stemDLists[i]); @@ -1230,27 +1230,27 @@ void EnDekubaba_DrawStemExtended(EnDekubaba* this, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2569); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnDekubaba_DrawStemBasePruned(EnDekubaba* this, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2579); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_RotateZYX(this->stemSectionAngle[2], this->actor.shape.rot.y, 0, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2586), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gDekuBabaStemBaseDL); Collider_UpdateSpheres(55, &this->collider); Collider_UpdateSpheres(56, &this->collider); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2596); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnDekubaba_DrawBaseShadow(EnDekubaba* this, GlobalContext* globalCtx) { MtxF mtx; f32 horizontalScale; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2692); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80094044(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, 255); @@ -1260,10 +1260,10 @@ void EnDekubaba_DrawBaseShadow(EnDekubaba* this, GlobalContext* globalCtx) { horizontalScale = this->size * 0.15f; Matrix_Scale(horizontalScale, 1.0f, horizontalScale, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2710), + 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, "../z_en_dekubaba.c", 2715); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_dekubaba.c", 2752); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); if (this->actionFunc != EnDekubaba_DeadStickDrop) { @@ -1296,7 +1296,7 @@ void EnDekubaba_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(this->actor.home.pos.x, this->actor.home.pos.y, this->actor.home.pos.z, MTXMODE_NEW); Matrix_RotateY(this->actor.home.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2780), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gDekuBabaBaseLeavesDL); @@ -1311,12 +1311,12 @@ void EnDekubaba_Draw(Actor* thisx, GlobalContext* globalCtx) { // Display solid until 40 frames left, then blink until killed. } else if ((this->timer > 40) || ((this->timer % 2) != 0)) { Matrix_Translate(0.0f, 0.0f, 200.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2797), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gDekuBabaStickDropDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2804); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } //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 53a5fdfab..ca428a474 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, "../z_en_dh.c", 1099); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->alpha == 255) { func_80093D18(globalCtx->state.gfxCtx); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, this->alpha); @@ -574,9 +574,9 @@ void EnDh_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(0.0f, -this->actor.shape.yOffset, 0.0f, MTXMODE_APPLY); Matrix_Scale(this->dirtWaveSpread * 0.01f, this->dirtWaveHeight * 0.01f, this->dirtWaveSpread * 0.01f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dh.c", 1160), + 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_dh_DL_007FC0); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dh.c", 1166); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 8475b4196..9677da18f 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, "../z_en_diving_game.c", 1212); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_diving_game.c", 1232); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 7627efeec..f0f2c0192 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, "../z_en_dnt_jiji.c", 1019); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); Matrix_Push(); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(blinkTex[this->eyeState])); @@ -439,8 +439,8 @@ void EnDntJiji_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Pop(); Matrix_Translate(this->flowerPos.x, this->flowerPos.y, this->flowerPos.z, MTXMODE_NEW); Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dnt_jiji.c", 1040), + 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, "../z_en_dnt_jiji.c", 1043); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 9ac0d2912..3044d9c7a 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, "../z_en_dnt_nomal.c", 1733); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_dnt_nomal.c", 1743); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_dnt_nomal.c", 1790); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, @@ -863,10 +863,10 @@ void EnDntNomal_DrawStageScrub(Actor* thisx, GlobalContext* globalCtx) { 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); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1814), + 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, "../z_en_dnt_nomal.c", 1817); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->actionFunc == EnDntNomal_StageCelebrate) { func_80033C30(&this->actor.world.pos, &dustScale, 255, globalCtx); } @@ -875,14 +875,14 @@ void EnDntNomal_DrawStageScrub(Actor* thisx, GlobalContext* globalCtx) { void EnDntNomal_DrawTargetScrub(Actor* thisx, GlobalContext* globalCtx) { EnDntNomal* this = (EnDntNomal*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1833); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, EnDntNomal_PostLimbDraw, this); Matrix_Translate(this->flowerPos.x, this->flowerPos.y, this->flowerPos.z, MTXMODE_NEW); Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1848), + 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, "../z_en_dnt_nomal.c", 1851); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 eb23224a4..2d805d39e 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, "../z_en_dog.c", 972); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_dog.c", 994); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 a3fc60b7c..24f7b6ab4 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, "../z_en_door.c", 910); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_door.c", 941); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } 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 878f4a3ef..12c126ca3 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, "../z_en_du.c", 1470); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_du.c", 1487); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 e803656c4..a6d8156bc 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,19 +110,19 @@ void EnDyExtra_Draw(Actor* thisx, GlobalContext* globalCtx) { } } - OPEN_DISPS(gfxCtx, "../z_en_dy_extra.c", 294); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, globalCtx->state.frames * 2, 0, 0x20, 0x40, 1, globalCtx->state.frames, globalCtx->state.frames * -8, 0x10, 0x10)); gDPPipeSync(POLY_XLU_DISP++); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dy_extra.c", 307), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, primColors[this->type].r, primColors[this->type].g, primColors[this->type].b, 255); 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, "../z_en_dy_extra.c", 325); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 564d499b5..b28ae2c65 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, "../z_en_eiyer.c", 1494); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_eiyer.c", 1541); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 d7530014d..7209a7381 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 @@ -404,7 +404,7 @@ void EnElf_Init(Actor* thisx, GlobalContext* globalCtx) { } break; default: - ASSERT(0, "0", "../z_en_elf.c", 1103); + ASSERT(0, "0", __FILE__, 1103); break; } @@ -798,7 +798,7 @@ void func_80A03AB0(EnElf* this, GlobalContext* globalCtx) { SkelAnime_Update(&this->skelAnime); if (this->func_2C8 == NULL) { - ASSERT(0, "0", "../z_en_elf.c", 1725); + ASSERT(0, "0", __FILE__, 1725); } this->func_2C8(this, globalCtx); @@ -1410,7 +1410,7 @@ void func_80A053F0(Actor* thisx, GlobalContext* globalCtx) { if (nREG(81) != 0) { if (gSaveContext.sceneFlags[127].chest) { LOG_NUM("z_common_data.memory.information.room_inf[127][ 0 ]", gSaveContext.sceneFlags[127].chest, - "../z_en_elf.c", 2595); + __FILE__, __LINE__); } } @@ -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, "../z_en_elf.c", 2730); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_elf.c", 2793); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } } 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 4d946508e..e293a8e01 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, "../z_en_encount2.c", 642); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_EFC_STAR_FIELD); @@ -362,12 +362,12 @@ void EnEncount2_ParticleDraw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Scale(particle->scale, particle->scale, particle->scale, MTXMODE_APPLY); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 155, 55, 255); gDPSetEnvColor(POLY_OPA_DISP++, 155, 255, 55, 255); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_encount2.c", 669), + 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(gfxCtx, "../z_en_encount2.c", 678); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 54b93277c..e9894d9cb 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,15 +498,15 @@ 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, "../z_en_ex_item.c", 880); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_8009460C(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ex_item.c", 887), + 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(keySegments[index])); gSPDisplayList(POLY_OPA_DISP++, gItemDropDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ex_item.c", 893); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 2e936bcbe..2850052f2 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,15 +383,15 @@ void EnExRuppy_Draw(Actor* thisx, GlobalContext* globalCtx) { EnExRuppy* this = (EnExRuppy*)thisx; if (!this->invisible) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ex_ruppy.c", 774); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); func_8002EBCC(thisx, globalCtx, 0); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ex_ruppy.c", 780), + 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(rupeeTextures[this->colorIdx])); gSPDisplayList(POLY_OPA_DISP++, gRupeeDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ex_ruppy.c", 784); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } 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 3d6a8420a..dee476cbd 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, "../z_en_fd.c", 1751); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_fd.c", 1822); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_fd.c", 1969); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); firstDone = false; if (1) {} func_80093D84(globalCtx->state.gfxCtx); @@ -899,14 +899,14 @@ void EnFd_DrawFlames(EnFd* this, GlobalContext* globalCtx) { Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fd.c", 2006), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); idx = eff->timer * (8.0f / eff->initialTimer); gSPSegment(POLY_XLU_DISP++, 0x8, SEGMENTED_TO_VIRTUAL(dustTextures[idx])); gSPDisplayList(POLY_XLU_DISP++, gFlareDancerSquareParticleDL); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fd.c", 2020); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_fd.c", 2034); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); firstDone = false; func_80093D84(globalCtx->state.gfxCtx); @@ -933,11 +933,11 @@ void EnFd_DrawDots(EnFd* this, GlobalContext* globalCtx) { Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fd.c", 2064), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gFlareDancerTriangleParticleDL); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fd.c", 2071); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 442e1ef28..629c5a486 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, "../z_en_fd_fire.c", 572); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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)); @@ -266,7 +266,7 @@ void EnFdFire_Draw(Actor* thisx, GlobalContext* globalCtx) { sp84 = 0.1f; } Matrix_Scale(1.0f, sp84, 1.0f / sp84, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fd_fire.c", 623), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x8, @@ -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, "../z_en_fd_fire.c", 672); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 a94a141b6..6619a86d0 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,14 +700,14 @@ void EnFhgFire_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnFhgFire* this = (EnFhgFire*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1723); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->actor.params == FHGFIRE_LIGHTNING_BURST) { func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s8)this->fwork[FHGFIRE_ALPHA]); gDPSetEnvColor(POLY_XLU_DISP++, 165, 255, 75, 0); gDPPipeSync(POLY_XLU_DISP++); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1745), + 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(gPhantomLightningBlastDL)); } else if ((this->actor.params == FHGFIRE_SPEAR_LIGHT) || (this->actor.params == FHGFIRE_ENERGY_BALL)) { @@ -723,7 +723,7 @@ void EnFhgFire_Draw(Actor* thisx, GlobalContext* globalCtx) { } gDPPipeSync(POLY_XLU_DISP++); Matrix_RotateZ((this->actor.shape.rot.z / (f32)0x8000) * 3.1416f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1801), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gPhantomEnergyBallDL); } else if ((this->actor.params == FHGFIRE_WARP_EMERGE) || (this->actor.params == FHGFIRE_WARP_RETREAT) || @@ -732,7 +732,7 @@ void EnFhgFire_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (u8)this->fwork[FHGFIRE_WARP_ALPHA]); gDPSetEnvColor(POLY_XLU_DISP++, 90, 50, 95, (s8)(this->fwork[FHGFIRE_WARP_ALPHA] * 0.5f)); gDPPipeSync(POLY_XLU_DISP++); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1833), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (s16)this->fwork[FHGFIRE_WARP_TEX_1_X], @@ -747,11 +747,11 @@ void EnFhgFire_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s8)this->fwork[FHGFIRE_ALPHA]); gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 30, 0); gDPPipeSync(POLY_XLU_DISP++); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1892), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gPhantomLightningDL); osSyncPrintf("FF DRAW 2\n"); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1900); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 63a8025e2..463e6a09c 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, "../z_en_fire_rock.c", 747); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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); @@ -392,8 +392,8 @@ void EnFireRock_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 155, 55, 255); gDPSetEnvColor(POLY_OPA_DISP++, 155, 255, 55, 255); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fire_rock.c", 768), + 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, "../z_en_fire_rock.c", 773); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 2761bd38d..00db25e6e 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, "../z_en_firefly.c", 1733); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_firefly.c", 1763); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnFirefly_DrawInvisible(Actor* thisx, GlobalContext* globalCtx) { EnFirefly* this = (EnFirefly*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_firefly.c", 1775); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_firefly.c", 1805); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } diff --git a/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c index 01700682c..42b069b49 100644 --- a/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/soh/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -387,7 +387,7 @@ void EnFish_Dropped_Fall(EnFish* this, GlobalContext* globalCtx) { (this->actor.floorHeight < BGCHECK_Y_MIN + 10.0f)) { osSyncPrintf(VT_COL(YELLOW, BLACK)); // "BG missing? Running Actor_delete" - osSyncPrintf("BG 抜け？ Actor_delete します(%s %d)\n", "../z_en_sakana.c", 822); + osSyncPrintf("BG 抜け？ Actor_delete します(%s %d)\n", __FILE__, __LINE__); osSyncPrintf(VT_RST); Actor_Kill(&this->actor); } @@ -628,8 +628,8 @@ void EnFish_UpdateCutscene(EnFish* this, GlobalContext* globalCtx) { if (csAction == NULL) { // "Warning : DEMO ended without dousa (action) 3 termination being called" - osSyncPrintf("Warning : dousa 3 消滅 が呼ばれずにデモが終了した(%s %d)(arg_data 0x%04x)\n", "../z_en_sakana.c", - 1169, this->actor.params); + osSyncPrintf("Warning : dousa 3 消滅 が呼ばれずにデモが終了した(%s %d)(arg_data 0x%04x)\n", __FILE__, + __LINE__, this->actor.params); EnFish_ClearCutsceneData(this); Actor_Kill(&this->actor); return; @@ -653,7 +653,7 @@ void EnFish_UpdateCutscene(EnFish* this, GlobalContext* globalCtx) { return; default: // "Improper DEMO action" - osSyncPrintf("不正なデモ動作(%s %d)(arg_data 0x%04x)\n", "../z_en_sakana.c", 1200, this->actor.params); + osSyncPrintf("不正なデモ動作(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->actor.params); break; } 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 bc059daad..e4d246ecc 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 @@ -1098,7 +1098,7 @@ void EnFloormas_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis Matrix_RotateY(DEGTORAD(60.0f), MTXMODE_APPLY); Matrix_RotateZ(DEGTORAD(15.0f), MTXMODE_APPLY); Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY); - gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_floormas.c", 2299), G_MTX_LOAD); + gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD); gSPDisplayList((*gfx)++, gWallmasterFingerDL); Matrix_Pop(); } @@ -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, "../z_en_floormas.c", 2318); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_floormas.c", 2340); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnFloormas_DrawHighlighted(Actor* thisx, GlobalContext* globalCtx) { EnFloormas* this = (EnFloormas*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_floormas.c", 2352); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_floormas.c", 2374); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 c84a22fb8..e47034f7c 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 @@ -224,9 +224,9 @@ void EnFr_Init(Actor* thisx, GlobalContext* globalCtx) { if ((this->actor.params >= 6) || (this->actor.params < 0)) { osSyncPrintf(VT_COL(RED, WHITE)); // "The argument is wrong!!" - osSyncPrintf("%s[%d] : 引数が間違っている！！(%d)\n", "../z_en_fr.c", 370, this->actor.params); + osSyncPrintf("%s[%d] : 引数が間違っている！！(%d)\n", __FILE__, __LINE__, this->actor.params); osSyncPrintf(VT_RST); - ASSERT(0, "0", "../z_en_fr.c", 372); + ASSERT(0, "0", __FILE__, __LINE__); } this->objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_GAMEPLAY_FIELD_KEEP); @@ -234,9 +234,9 @@ void EnFr_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_Kill(&this->actor); osSyncPrintf(VT_COL(RED, WHITE)); // "There is no bank!!" - osSyncPrintf("%s[%d] : バンクが無いよ！！\n", "../z_en_fr.c", 380); + osSyncPrintf("%s[%d] : バンクが無いよ！！\n", __FILE__, __LINE__); osSyncPrintf(VT_RST); - ASSERT(0, "0", "../z_en_fr.c", 382); + ASSERT(0, "0", __FILE__, __LINE__); } } } @@ -969,7 +969,7 @@ void EnFr_Deactivate(EnFr* this, GlobalContext* globalCtx) { if (frogLoop1 == NULL) { osSyncPrintf(VT_COL(RED, WHITE)); // "There are no frogs!?" - osSyncPrintf("%s[%d]カエルがいない！？\n", "../z_en_fr.c", 1604); + osSyncPrintf("%s[%d]カエルがいない！？\n", __FILE__, __LINE__); osSyncPrintf(VT_RST); return; } else if (frogLoop1->isDeactivating != true) { @@ -982,7 +982,7 @@ void EnFr_Deactivate(EnFr* this, GlobalContext* globalCtx) { if (frogLoop2 == NULL) { osSyncPrintf(VT_COL(RED, WHITE)); // "There are no frogs!?" - osSyncPrintf("%s[%d]カエルがいない！？\n", "../z_en_fr.c", 1618); + osSyncPrintf("%s[%d]カエルがいない！？\n", __FILE__, __LINE__); osSyncPrintf(VT_RST); return; } @@ -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, "../z_en_fr.c", 1735); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fr.c", 1738), + 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, "../z_en_fr.c", 1741); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } @@ -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, "../z_en_fr.c", 1754); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_fr.c", 1816); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 5bf834c0c..d38cfa144 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, "../z_en_fu.c", 773); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_fu.c", 791); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 605f8931b..550614bca 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, "../z_en_fw.c", 1191); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); firstDone = false; func_80093D84(globalCtx->state.gfxCtx); @@ -479,7 +479,7 @@ void EnFw_DrawDust(EnFw* this, GlobalContext* globalCtx) { Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fw.c", 1229), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); idx = eff->timer * (8.0f / eff->initialTimer); gSPSegment(POLY_XLU_DISP++, 0x8, SEGMENTED_TO_VIRTUAL(dustTextures[idx])); @@ -487,5 +487,5 @@ void EnFw_DrawDust(EnFw* this, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fw.c", 1243); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 3ae77c12f..2c25262e5 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, "../z_en_fz.c", 1167); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (1) {} @@ -731,7 +731,7 @@ void EnFz_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, globalCtx->state.frames & 0x7F, 32, 32, 1, 0, (2 * globalCtx->state.frames) & 0x7F, 32, 32)); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fz.c", 1183), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetCombineLERP(POLY_XLU_DISP++, TEXEL1, PRIMITIVE, PRIM_LOD_FRAC, TEXEL0, TEXEL1, TEXEL0, PRIMITIVE, TEXEL0, PRIMITIVE, ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, ENVIRONMENT, 0); @@ -740,7 +740,7 @@ void EnFz_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, displayLists[index]); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fz.c", 1200); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_fz.c", 1384); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); @@ -881,7 +881,7 @@ void EnFz_DrawIceSmoke(EnFz* this, GlobalContext* globalCtx) { Matrix_Translate(iceSmoke->pos.x, iceSmoke->pos.y, iceSmoke->pos.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(iceSmoke->xyScale, iceSmoke->xyScale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_fz.c", 1424), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gFreezardSteamDL)); } @@ -889,5 +889,5 @@ void EnFz_DrawIceSmoke(EnFz* this, GlobalContext* globalCtx) { iceSmoke++; } - CLOSE_DISPS(gfxCtx, "../z_en_fz.c", 1430); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 2da9368c5..9ffdea8f8 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, "../z_en_g_switch.c", 918); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_g_switch.c", 925), + 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, "../z_en_g_switch.c", 928); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } @@ -474,14 +474,14 @@ void EnGSwitch_DrawRupee(Actor* thisx, GlobalContext* globalCtx) { if (1) {} if (!this->broken) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_g_switch.c", 951); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_g_switch.c", 957), + 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, "../z_en_g_switch.c", 961); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_g_switch.c", 1073); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); for (i = 0; i < this->numEffects; i++, effect++) { if (effect->flag) { @@ -561,11 +561,11 @@ void EnGSwitch_DrawEffects(EnGSwitch* this, GlobalContext* globalCtx) { Matrix_RotateX(effect->rot.x, MTXMODE_APPLY); Matrix_RotateY(effect->rot.y, MTXMODE_APPLY); Matrix_RotateZ(effect->rot.z, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_g_switch.c", 1088), + 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[effect->colorIdx])); gSPDisplayList(POLY_OPA_DISP++, gRupeeDL); } } - CLOSE_DISPS(gfxCtx, "../z_en_g_switch.c", 1095); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 5159b5ebb..5a3fc383c 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,11 +364,11 @@ void EnGanonMant_Update(Actor* thisx, GlobalContext* globalCtx) { void EnGanonMant_DrawCloak(GlobalContext* globalCtx, EnGanonMant* this) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ganon_mant.c", 564); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_NEW); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ganon_mant.c", 572), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); // set texture @@ -385,7 +385,7 @@ void EnGanonMant_DrawCloak(GlobalContext* globalCtx, EnGanonMant* this) { // draw cloak gSPDisplayList(POLY_OPA_DISP++, gMantDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ganon_mant.c", 584); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 fa5ae3ece..b525d651f 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, "../z_en_ganon_organ.c", 205); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); osSyncPrintf("ORGAN DRAW 1\n"); func_80093D18(globalCtx->state.gfxCtx); @@ -105,7 +105,7 @@ void EnGanonOrgan_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x09, EnGanonOrgan_EmptyDList(globalCtx->state.gfxCtx)); } Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_NEW); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 221), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, sRoomOrganAndFloorDL); @@ -113,5 +113,5 @@ void EnGanonOrgan_Draw(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf("ORGAN DRAW 2\n"); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 230); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 d1ef4e9a8..3c0a5b483 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, "../z_en_gb.c", 763); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_gb.c", 796); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_gb.c", 914); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); @@ -543,12 +543,12 @@ void EnGb_DrawCagedSouls(EnGb* this, GlobalContext* globalCtx) { } Matrix_Scale(0.007f, 0.007f, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_gb.c", 955), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gPoeSellerCagedSoulDL); Matrix_Pop(); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_gb.c", 962); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 01ea8e3e0..fd51bdd47 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 @@ -628,8 +628,8 @@ void EnGe1_TalkNoPrize_Archery(EnGe1* this, GlobalContext* globalCtx) { void EnGe1_TalkAfterGame_Archery(EnGe1* this, GlobalContext* globalCtx) { gSaveContext.eventInf[0] &= ~0x100; - LOG_NUM("z_common_data.yabusame_total", gSaveContext.minigameScore, "../z_en_ge1.c", 1110); - LOG_NUM("z_common_data.memory.information.room_inf[127][ 0 ]", HIGH_SCORE(HS_HBA), "../z_en_ge1.c", 1111); + LOG_NUM("z_common_data.yabusame_total", gSaveContext.minigameScore, __FILE__, __LINE__); + LOG_NUM("z_common_data.memory.information.room_inf[127][ 0 ]", HIGH_SCORE(HS_HBA), __FILE__, __LINE__); this->actor.flags |= ACTOR_FLAG_16; if (HIGH_SCORE(HS_HBA) < gSaveContext.minigameScore) { @@ -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, "../z_en_ge1.c", 1419); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ge1.c", 1427); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnGe1_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnGe1* this = (EnGe1*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ge1.c", 1442); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ge1.c", 1459); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 708f4ed27..91e74777b 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 @@ -156,7 +156,7 @@ void EnGe2_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.targetMode = 6; break; default: - ASSERT(0, "0", "../z_en_ge2.c", 418); + ASSERT(0, "0", __FILE__, __LINE__); } this->stateFlags = 0; @@ -646,7 +646,7 @@ void EnGe2_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnGe2* this = (EnGe2*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ge2.c", 1274); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ge2.c", 1291); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 697800559..eca5ad6c8 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, "../z_en_ge3.c", 547); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ge3.c", 566); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ge3.c", 614); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ge3.c", 631); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 61298756a..2b132202d 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, "../z_en_geldB.c", 2507); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_geldB.c", 2529); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); return false; } @@ -1551,7 +1551,7 @@ void EnGeldB_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnGeldB* this = (EnGeldB*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_geldB.c", 2672); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_geldB.c", 2744); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } s32 EnGeldB_DodgeRanged(GlobalContext* globalCtx, EnGeldB* this) { diff --git a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index d3167210a..c6fec0cb2 100644 --- a/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/soh/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -384,7 +384,7 @@ void EnGirlA_InitItem(EnGirlA* this, GlobalContext* globalCtx) { osSyncPrintf(VT_COL(RED, WHITE)); osSyncPrintf("引数がおかしいよ(arg_data=%d)！！\n", this->actor.params); osSyncPrintf(VT_RST); - ASSERT(0, "0", "../z_en_girlA.c", 1421); + ASSERT(0, "0", __FILE__, __LINE__); return; } @@ -395,7 +395,7 @@ void EnGirlA_InitItem(EnGirlA* this, GlobalContext* globalCtx) { osSyncPrintf(VT_COL(RED, WHITE)); osSyncPrintf("バンクが無いよ！！(%s)\n", sShopItemDescriptions[params]); osSyncPrintf(VT_RST); - ASSERT(0, "0", "../z_en_girlA.c", 1434); + ASSERT(0, "0", __FILE__, __LINE__); return; } 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 e211b8d24..2f10f88f4 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 @@ -69,7 +69,7 @@ void EnGm_Init(Actor* thisx, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, sInitChain); // "Medi Goron" - osSyncPrintf(VT_FGCOL(GREEN) "%s[%d] : 中ゴロン[%d]" VT_RST "\n", "../z_en_gm.c", 133, this->actor.params); + osSyncPrintf(VT_FGCOL(GREEN) "%s[%d] : 中ゴロン[%d]" VT_RST "\n", __FILE__, __LINE__, this->actor.params); this->objGmBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_GM); @@ -78,7 +78,7 @@ void EnGm_Init(Actor* thisx, GlobalContext* globalCtx) { // "There is no model bank! !! (Medi Goron)" osSyncPrintf("モデル バンクが無いよ！！（中ゴロン）\n"); osSyncPrintf(VT_RST); - ASSERT(0, "0", "../z_en_gm.c", 145); + ASSERT(0, "0", __FILE__, __LINE__); } this->updateFunc = func_80A3D838; @@ -320,7 +320,7 @@ void EnGm_Draw(Actor* thisx, GlobalContext* globalCtx) { EnGm* this = (EnGm*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_gm.c", 613); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_gm.c", 629); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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 4fa91c495..ec0c7cdc2 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,12 +1044,12 @@ 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, "../z_en_go.c", 2320); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_go.c", 2326), + 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); @@ -1057,25 +1057,25 @@ void EnGo_DrawCurledUp(EnGo* this, GlobalContext* globalCtx) { Matrix_MultVec3f(&D_80A41BB4, &this->actor.focus.pos); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2341); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnGo_DrawRolling(EnGo* this, GlobalContext* globalCtx) { Vec3f D_80A41BC0 = { 0.0f, 0.0f, 0.0f }; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2355); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); func_80093D18(globalCtx->state.gfxCtx); Matrix_RotateZYX((s16)(globalCtx->state.frames * ((s16)this->actor.speedXZ * 1400)), 0, this->actor.shape.rot.z, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_go.c", 2368), + 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); Matrix_MultVec3f(&D_80A41BC0, &this->actor.focus.pos); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2383); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_go.c", 2479); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_go.c", 2525); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); EnGo_DrawDust(this, globalCtx); } } @@ -1206,7 +1206,7 @@ void EnGo_DrawDust(EnGo* this, GlobalContext* globalCtx) { s16 index; s16 i; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2626); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); firstDone = false; func_80093D84(globalCtx->state.gfxCtx); if (1) {} @@ -1225,7 +1225,7 @@ void EnGo_DrawDust(EnGo* this, GlobalContext* globalCtx) { Matrix_Translate(dustEffect->pos.x, dustEffect->pos.y, dustEffect->pos.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(dustEffect->scale, dustEffect->scale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_go.c", 2664), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); index = dustEffect->timer * (8.0f / dustEffect->initialTimer); @@ -1233,5 +1233,5 @@ void EnGo_DrawDust(EnGo* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gGoronDL_00FD50); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2678); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 5c58292c0..ba8c005a7 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 @@ -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, "../z_en_go2.c", 2881); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_go2.c", 2884), + 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, "../z_en_go2.c", 2889); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_go2.c", 2914); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_go2.c", 2926), + 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, "../z_en_go2.c", 2930); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_go2.c", 3063); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_go2.c", 3081); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } 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 a9997c383..021d42ca2 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, "../z_en_goma.c", 1976); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_goma.c", 2011); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); return 0; } @@ -783,7 +783,7 @@ void EnGoma_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 y; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_goma.c", 2040); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); switch (this->gomaType) { @@ -818,14 +818,14 @@ void EnGoma_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateY(-(this->eggSquishAngle * 0.15f), MTXMODE_APPLY); Matrix_Translate(0.0f, this->eggYOffset, 0.0f, MTXMODE_APPLY); Matrix_RotateX(this->eggPitch, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_goma.c", 2101), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gObjectGolEggDL); Matrix_Pop(); break; case ENGOMA_HATCH_DEBRIS: - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_goma.c", 2107), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gBrownFragmentDL); break; @@ -833,13 +833,13 @@ void EnGoma_Draw(Actor* thisx, GlobalContext* globalCtx) { case ENGOMA_BOSSLIMB: if (this->bossLimbDl != NULL) { gSPSegment(POLY_OPA_DISP++, 0x08, EnGoma_NoBackfaceCullingDlist(globalCtx->state.gfxCtx)); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_goma.c", 2114), + 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->bossLimbDl); } break; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_goma.c", 2119); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnGoma_Debris(EnGoma* this, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index 08db6d91f..18d1ada24 100644 --- a/soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/soh/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -245,7 +245,7 @@ s32 EnGoroiwa_GetAscendDirection(EnGoroiwa* this, GlobalContext* globalCtx) { if (nextPointPos->y == currentPointPos->y) { // "Error: Invalid path data (points overlap)" osSyncPrintf("Error : レールデータ不正(点が重なっている)"); - osSyncPrintf("(%s %d)(arg_data 0x%04x)\n", "../z_en_gr.c", 559, this->actor.params); + osSyncPrintf("(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->actor.params); } if (nextPointPos->y > currentPointPos->y) { @@ -538,14 +538,14 @@ void EnGoroiwa_Init(Actor* thisx, GlobalContext* globalCtx) { pathIdx = this->actor.params & 0xFF; if (pathIdx == 0xFF) { // "Error: Invalid arg_data" - osSyncPrintf("Ｅｒｒｏｒ : arg_data が不正(%s %d)(arg_data 0x%04x)\n", "../z_en_gr.c", 1033, + osSyncPrintf("Ｅｒｒｏｒ : arg_data が不正(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->actor.params); Actor_Kill(&this->actor); return; } if (globalCtx->setupPathList[pathIdx].count < 2) { // "Error: Invalid Path Data" - osSyncPrintf("Ｅｒｒｏｒ : レールデータ が不正(%s %d)\n", "../z_en_gr.c", 1043); + osSyncPrintf("Ｅｒｒｏｒ : レールデータ が不正(%s %d)\n", __FILE__, __LINE__); Actor_Kill(&this->actor); return; } 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 36486722c..edb4e559a 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, "../z_en_gs.c", 1046); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); frames = globalCtx->gameplayFrames; func_80093D18(globalCtx->state.gfxCtx); @@ -581,7 +581,7 @@ void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateZ(this->unk_1A0[1].z * (M_PI / 0x8000), MTXMODE_APPLY); } - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_gs.c", 1064), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gGossipStoneMaterialDL); @@ -601,7 +601,7 @@ void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(0.05f, -0.05f, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_gs.c", 1087), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment( POLY_XLU_DISP++, 0x08, @@ -611,6 +611,6 @@ void EnGs_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_gs.c", 1101); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } 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 cc85b8c53..2374c913d 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 @@ -60,9 +60,9 @@ void EnGuest_Init(Actor* thisx, GlobalContext* globalCtx) { if (this->osAnimeBankIndex < 0) { osSyncPrintf(VT_COL(RED, WHITE)); // "No such bank!!" - osSyncPrintf("%s[%d] : バンクが無いよ！！\n", "../z_en_guest.c", 129); + osSyncPrintf("%s[%d] : バンクが無いよ！！\n", "../z_en_guest.c", __LINE__); osSyncPrintf(VT_RST); - ASSERT(0, "0", "../z_en_guest.c", 132); + ASSERT(0, "0", "../z_en_guest.c", __LINE__); } } } @@ -184,7 +184,7 @@ s32 EnGuest_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis EnGuest* this = (EnGuest*)thisx; Vec3s sp3C; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_guest.c", 352); + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_guest.c", __LINE__); 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, "../z_en_guest.c", 388); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_guest.c", __LINE__); return false; } @@ -220,7 +220,7 @@ void EnGuest_Draw(Actor* thisx, GlobalContext* globalCtx) { EnGuest* this = (EnGuest*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_guest.c", 404); + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_guest.c", __LINE__); 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, "../z_en_guest.c", 421); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_guest.c", __LINE__); } 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 86fbab0f6..66b0e5f32 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, "../z_en_heishi2.c", 1772); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_heishi2.c", 1774), + 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, "../z_en_heishi2.c", 1777); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_heishi2.c", 1792); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); @@ -852,7 +852,7 @@ void EnHeishi2_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Put(&this->mtxf_330); Matrix_Translate(-570.0f, 0.0f, 0.0f, MTXMODE_APPLY); Matrix_RotateZ(DEGTORAD(70.0), MTXMODE_APPLY); - mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_heishi2.c", 1820) - 7; + mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__) - 7; gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[linkObjBankIndex].segment); gSPSegment(POLY_OPA_DISP++, 0x0D, mtx); @@ -861,5 +861,5 @@ void EnHeishi2_Draw(Actor* thisx, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_heishi2.c", 1834); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 07223a5df..0e99ac9a2 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, "../z_en_holl.c", 805); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->planeAlpha == 255) { gfxP = POLY_OPA_DISP; @@ -343,7 +343,7 @@ void EnHoll_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateY(M_PI, MTXMODE_APPLY); } - gSPMatrix(gfxP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_holl.c", 824), + gSPMatrix(gfxP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(gfxP++, 0, 0, 0, 0, 0, (u8)this->planeAlpha); gSPDisplayList(gfxP++, sPlaneDL); @@ -354,6 +354,6 @@ void EnHoll_Draw(Actor* thisx, GlobalContext* globalCtx) { POLY_XLU_DISP = gfxP; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_holl.c", 831); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } 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 9d452425f..95625f661 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 @@ -142,7 +142,7 @@ void EnHonotrap_GetNormal(Vec3f* normal, Vec3f* vec) { f32 mag = Math3D_Vec3fMagnitude(vec); if (mag < 0.001f) { - osSyncPrintf("Warning : vector size zero (%s %d)\n", "../z_en_honotrap.c", 328, normal); + osSyncPrintf("Warning : vector size zero (%s %d)\n", __FILE__, __LINE__, normal); normal->x = normal->y = 0.0f; normal->z = 1.0f; @@ -495,22 +495,22 @@ void EnHonotrap_DrawEye(Actor* thisx, GlobalContext* globalCtx) { }; EnHonotrap* this = (EnHonotrap*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_honotrap.c", 982); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeState])); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_honotrap.c", 987), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gEyeSwitch2DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_honotrap.c", 991); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnHonotrap_DrawFlame(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnHonotrap* this = (EnHonotrap*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_honotrap.c", 1000); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); this->flameScroll -= 20; @@ -522,11 +522,11 @@ void EnHonotrap_DrawFlame(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateY((s16)(Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)) - this->actor.shape.rot.y + 0x8000) * (M_PI / 0x8000), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_honotrap.c", 1024), + 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, "../z_en_honotrap.c", 1028); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 3b9cebc25..3f30a411b 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 @@ -869,7 +869,7 @@ void EnHorse_Init(Actor* thisx, GlobalContext* globalCtx2) { Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_IN, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, this->actor.shape.rot.x, this->actor.shape.rot.y, 1, 1); if (this->rider == NULL) { - __assert("this->race.rider != NULL", "../z_en_horse.c", 3077); + __assert("this->race.rider != NULL", __FILE__, __LINE__); } if (!(gSaveContext.eventInf[0] & 0x40)) { this->ingoHorseMaxSpeed = 12.07f; @@ -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, "../z_en_horse.c", 8582); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_horse.c", 8601); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); return drawOriginalLimb; } diff --git a/soh/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/soh/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index 1705b2a9c..d8b84d2ae 100644 --- a/soh/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/soh/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -92,7 +92,7 @@ s32 EnHorseGameCheck_InitIngoRace(EnHorseGameCheckBase* base, GlobalContext* glo Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, -250.0f, 1.0f, -1650.0f, 0, 0x4000, 0, 0x8003); if (this->ingoHorse == NULL) { - LogUtils_HungupThread("../z_en_horse_game_check.c", 385); + LogUtils_HungupThread(__FILE__, __LINE__); } this->startTimer = 0; this->finishTimer = 0; 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 6ea9a8b1d..54da97e8e 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, "../z_en_horse_link_child.c", 1467); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_horse_link_child.c", 1479); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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 6af4cb8a2..3da247105 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, "../z_en_horse_normal.c", 2224); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (globalCtx->sceneNum != SCENE_SPOT20 || globalCtx->sceneNum != SCENE_MALON_STABLE) { func_80A6C8E0(this, globalCtx); @@ -705,12 +705,12 @@ void EnHorseNormal_Draw(Actor* thisx, GlobalContext* globalCtx) { temp_f0_4 = (1.0f - (distFromGround * 0.01f)) * this->actor.shape.shadowScale; Matrix_Scale(this->actor.scale.x * temp_f0_4, 1.0f, this->actor.scale.z * temp_f0_4, MTXMODE_APPLY); Matrix_RotateY(cloneRotY * (2.0f * M_PI / 0x10000), MTXMODE_APPLY); - mtx2 = Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_horse_normal.c", 2329); + mtx2 = Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (mtx2 != NULL) { gSPMatrix(POLY_XLU_DISP++, mtx2, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gHorseShadowDL); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_horse_normal.c", 2339); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 bc47e7b6a..152df83da 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, "../z_en_hy.c", 2170); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_hy.c", 2228); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_hy.c", 2255); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_hy.c", 2281); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_hy.c", 2318); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_hy.c", 2388); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 2bd5a53d1..e5c7e30b4 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, "../z_en_ice_hono.c", 695); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, @@ -390,9 +390,9 @@ void EnIceHono_Draw(Actor* thisx, GlobalContext* globalCtx) { (M_PI / 0x8000), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ice_hono.c", 718), + 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, "../z_en_ice_hono.c", 722); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 120bfae41..57d0bf580 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 @@ -1326,37 +1326,37 @@ 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, "../z_en_ik_inConfrontion.c", 571); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); switch (limbIndex) { case 12: - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inConfrontion.c", 575), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016D88); break; case 22: - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inConfrontion.c", 581), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016F88); break; case 24: - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inConfrontion.c", 587), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016EE8); break; case 26: - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inConfrontion.c", 593), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0); break; case 27: - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inConfrontion.c", 599), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016CD8); break; } - CLOSE_DISPS(gfxCtx, "../z_en_ik_inConfrontion.c", 604); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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, "../z_en_ik_inConfrontion.c", 630); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); 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, "../z_en_ik_inConfrontion.c", 653); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 41c773cdc..92258e85c 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, "../z_en_in.c", 2335); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_in.c", 2365); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_in.c", 2384); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_in.c", 2416); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnIn_Reset(void) { diff --git a/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c index bd529ea55..5f9c4acc0 100644 --- a/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -581,7 +581,7 @@ void func_80A7D460(EnInsect* this, GlobalContext* globalCtx) { if (this->unk_314 & 0x10) { osSyncPrintf(VT_COL(YELLOW, BLACK)); // "warning: target Actor is NULL" - osSyncPrintf("warning:目標 Actor が NULL (%s %d)\n", "../z_en_mushi.c", 1046); + osSyncPrintf("warning:目標 Actor が NULL (%s %d)\n", __FILE__, __LINE__); osSyncPrintf(VT_RST); } sp40 = 40.0f; @@ -706,7 +706,7 @@ void func_80A7D460(EnInsect* this, GlobalContext* globalCtx) { this->actor.floorHeight < BGCHECK_Y_MIN + 10.0f) { osSyncPrintf(VT_COL(YELLOW, BLACK)); // "BG missing? To do Actor_delete" - osSyncPrintf("BG 抜け？ Actor_delete します(%s %d)\n", "../z_en_mushi.c", 1197); + osSyncPrintf("BG 抜け？ Actor_delete します(%s %d)\n", __FILE__, __LINE__); osSyncPrintf(VT_RST); Actor_Kill(&this->actor); } 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 11573dba0..aaf8355b7 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 @@ -128,7 +128,7 @@ s32 EnIshi_SnapToFloor(EnIshi* this, GlobalContext* globalCtx, f32 arg2) { } else { osSyncPrintf(VT_COL(YELLOW, BLACK)); // "Failure attaching to ground" - osSyncPrintf("地面に付着失敗(%s %d)\n", "../z_en_ishi.c", 388); + osSyncPrintf("地面に付着失敗(%s %d)\n", __FILE__, __LINE__); osSyncPrintf(VT_RST); return false; } @@ -482,15 +482,15 @@ void EnIshi_DrawSmall(EnIshi* this, GlobalContext* globalCtx) { } void EnIshi_DrawLarge(EnIshi* this, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ishi.c", 1050); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ishi.c", 1055), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255); gSPDisplayList(POLY_OPA_DISP++, gSilverRockDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ishi.c", 1062); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 362f344fa..a5c2bd271 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, "../z_en_jj.c", 879); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_jj.c", 898); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 8b3d008fe..814e1dba1 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, "../z_en_jsjutan.c", 701); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (thisx->params == ENJSJUTAN_TYPE_01) { thisx->world.pos.x = parent->world.pos.x; @@ -417,7 +417,7 @@ void EnJsjutan_Draw(Actor* thisx, GlobalContext* globalCtx2) { Matrix_Translate(thisx->world.pos.x, 3.0f, thisx->world.pos.z, MTXMODE_NEW); Matrix_Scale(thisx->scale.x, 1.0f, thisx->scale.z, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_jsjutan.c", 782), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); // Draws the carpet's shadow texture. @@ -436,7 +436,7 @@ void EnJsjutan_Draw(Actor* thisx, GlobalContext* globalCtx2) { Matrix_Translate(thisx->world.pos.x, this->unk_168 + 3.0f, thisx->world.pos.z, MTXMODE_NEW); Matrix_Scale(thisx->scale.x, thisx->scale.y, thisx->scale.z, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_jsjutan.c", 805), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); // Draws the carpet's texture. gSPDisplayList(POLY_OPA_DISP++, sCarpetMaterialDL); @@ -451,5 +451,5 @@ void EnJsjutan_Draw(Actor* thisx, GlobalContext* globalCtx2) { } gSPDisplayList(POLY_OPA_DISP++, sModelDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_jsjutan.c", 823); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 4c3ab4afb..285e1cc86 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, "../z_en_kanban.c", 1659); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPDisplayList(POLY_OPA_DISP++, object_kanban_DL_000C30); @@ -810,7 +810,7 @@ void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateX((this->spinRot.x / (f32)0x8000) * M_PI, MTXMODE_APPLY); Matrix_RotateY((this->spinRot.z / (f32)0x8000) * M_PI, MTXMODE_APPLY); Matrix_Translate(this->offset.x, this->offset.y, this->offset.z - 100.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_kanban.c", 1715), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); for (i = 0; i < ARRAY_COUNT(sPartFlags); i++) { if (sPartFlags[i] & this->partFlags) { @@ -819,7 +819,7 @@ void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx) { } } else { Matrix_Translate(0.0f, 0.0f, -100.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_kanban.c", 1725), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->partFlags == 0xFFFF) { gSPDisplayList(POLY_OPA_DISP++, gSignRectangularDL); @@ -839,7 +839,7 @@ void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x00, 255, 255, 255, this->cutMarkAlpha); gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 150, 0); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_kanban.c", 1773), + 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_kanban_DL_001630); } @@ -878,7 +878,7 @@ void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateX((this->spinRot.x / (f32)0x8000) * M_PI, MTXMODE_APPLY); Matrix_RotateY((this->spinRot.z / (f32)0x8000) * M_PI, MTXMODE_APPLY); Matrix_Translate(this->offset.x, this->offset.y, this->offset.z, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_kanban.c", 1833), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); for (i = 0; i < 0x400; i++) { @@ -892,5 +892,5 @@ void EnKanban_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, sShadowDL); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_kanban.c", 1857); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 ca55672cc..f4ac6f6ea 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, "../z_en_karebaba.c", 1013); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80094044(globalCtx->state.gfxCtx); @@ -451,11 +451,11 @@ void EnKarebaba_DrawBaseShadow(EnKarebaba* this, GlobalContext* globalCtx) { func_80038A28(this->boundFloor, this->actor.home.pos.x, this->actor.home.pos.y, this->actor.home.pos.z, &mf); Matrix_Mult(&mf, MTXMODE_NEW); Matrix_Scale(0.15f, 1.0f, 0.15f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_karebaba.c", 1029), + 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, "../z_en_karebaba.c", 1034); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnKarebaba_Draw(Actor* thisx, GlobalContext* globalCtx) { @@ -467,14 +467,14 @@ void EnKarebaba_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 stemSections; f32 scale; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_karebaba.c", 1056); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); if (this->actionFunc == EnKarebaba_DeadItemDrop) { if (this->actor.params > 40 || (this->actor.params & 1)) { Matrix_Translate(0.0f, 0.0f, 200.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_karebaba.c", 1066), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gDekuBabaStickDropDL); } @@ -500,7 +500,7 @@ void EnKarebaba_Draw(Actor* thisx, GlobalContext* globalCtx) { for (i = 0; i < stemSections; i++) { Matrix_Translate(0.0f, 0.0f, -2000.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_karebaba.c", 1116), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_NOPUSH | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, stemDLists[i]); @@ -521,20 +521,20 @@ void EnKarebaba_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); Matrix_RotateY(this->actor.home.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_karebaba.c", 1144), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_NOPUSH | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gDekuBabaBaseLeavesDL); if (this->actionFunc == EnKarebaba_Dying) { Matrix_RotateZYX(-0x4000, (s16)(this->actor.shape.rot.y - this->actor.home.rot.y), 0, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_karebaba.c", 1155), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD | G_MTX_NOPUSH | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gDekuBabaStemBaseDL); } func_80026608(globalCtx); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_karebaba.c", 1163); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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 c5e862c69..56d4bb287 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, "../z_en_ko.c", 2095); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ko.c", 2136); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } diff --git a/soh/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/soh/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index 620463b04..21de03ba3 100644 --- a/soh/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/soh/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -117,7 +117,7 @@ s32 EnKusa_SnapToFloor(EnKusa* this, GlobalContext* globalCtx, f32 yOffset) { } else { osSyncPrintf(VT_COL(YELLOW, BLACK)); // "Failure attaching to ground" - osSyncPrintf("地面に付着失敗(%s %d)\n", "../z_en_kusa.c", 323); + osSyncPrintf("地面に付着失敗(%s %d)\n", __FILE__, __LINE__); osSyncPrintf(VT_RST); return false; } @@ -256,7 +256,7 @@ void EnKusa_Init(Actor* thisx, GlobalContext* globalCtx) { if (this->objBankIndex < 0) { // "Bank danger!" - osSyncPrintf("Error : バンク危険！ (arg_data 0x%04x)(%s %d)\n", thisx->params, "../z_en_kusa.c", 561); + osSyncPrintf("Error : バンク危険！ (arg_data 0x%04x)(%s %d)\n", thisx->params, __FILE__, __LINE__); Actor_Kill(&this->actor); return; } 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 502f2c056..9b3ef1d5e 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, "../z_en_kz.c", 1259); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_kz.c", 1281); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 ee3699dcd..9925cdf29 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, "../z_en_light.c", 441); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); @@ -192,9 +192,9 @@ void EnLight_Draw(Actor* thisx, GlobalContext* globalCtx) { } Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_light.c", 488), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, dList); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_light.c", 491); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 3fb412dea..c143bdc25 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,10 +323,10 @@ void EnMThunder_Draw(Actor* thisx, GlobalContext* globalCtx2) { f32 phi_f14; s32 phi_t1; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_m_thunder.c", 844); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); Matrix_Scale(0.02f, 0.02f, 0.02f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_m_thunder.c", 853), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); switch (this->unk_1C6) { @@ -383,7 +383,7 @@ void EnMThunder_Draw(Actor* thisx, GlobalContext* globalCtx2) { phi_t1 = 0x14; } Matrix_Scale(1.0f, phi_f14, phi_f14, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_m_thunder.c", 960), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x09, @@ -393,5 +393,5 @@ void EnMThunder_Draw(Actor* thisx, GlobalContext* globalCtx2) { gSPDisplayList(POLY_XLU_DISP++, gSpinAttackChargingDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_m_thunder.c", 1031); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 282a899dd..ae266b534 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, "../z_en_ma1.c", 1226); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ma1.c", 1261); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 5da5e5766..70555ef31 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, "../z_en_ma2.c", 904); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ma2.c", 927); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_ma2.c", 955); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ma2.c", 990); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 b314bcf0b..812af5202 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, "../z_en_ma3.c", 927); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ma3.c", 950); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_ma3.c", 978); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ma3.c", 1013); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 a7392e14c..90035b301 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, "../z_en_mag.c", 1151); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_mag.c", 1161); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 54103ba59..e2fb07247 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, "../z_en_md.c", 1280); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_md.c", 1317); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 4c61ae18e..99883ebf6 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, "../z_en_mm.c", 1065); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(mouthTextures[this->mouthTexIndex])); @@ -535,7 +535,7 @@ void EnMm_Draw(Actor* thisx, GlobalContext* globalCtx) { mtx = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx) * 2); Matrix_Put(&this->unk_208); - mtx2 = Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_mm.c", 1111); + mtx2 = Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__); gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[linkChildObjBankIndex].segment); gSPSegment(POLY_OPA_DISP++, 0x0B, mtx); @@ -546,21 +546,21 @@ void EnMm_Draw(Actor* thisx, GlobalContext* globalCtx) { sp50.z = -13450; Matrix_SetTranslateRotateYXZ(97.0f, -1203.0f, -240.0f, &sp50); - Matrix_ToMtx(mtx++, "../z_en_mm.c", 1124); + Matrix_ToMtx(mtx++, __FILE__, __LINE__); sp50.x = -994; sp50.y = -3518; sp50.z = -13450; Matrix_SetTranslateRotateYXZ(97.0f, -1203.0f, 240.0f, &sp50); - Matrix_ToMtx(mtx, "../z_en_mm.c", 1131); + Matrix_ToMtx(mtx, __FILE__, __LINE__); gSPDisplayList(POLY_OPA_DISP++, gLinkChildBunnyHoodDL); gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->actor.objBankIndex].segment); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_mm.c", 1141); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 9ac0d06a2..0c6929250 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 @@ -278,7 +278,7 @@ void func_80AAF668(EnMm2* this, GlobalContext* globalCtx) { HIGH_SCORE(HS_MARATHON) = gSaveContext.timer2Value; } } else { - LOG_HEX("((z_common_data.event_inf[1]) & (0x0001))", gSaveContext.eventInf[1] & 1, "../z_en_mm2.c", 541); + LOG_HEX("((z_common_data.event_inf[1]) & (0x0001))", gSaveContext.eventInf[1] & 1, __FILE__, __LINE__); if (!(gSaveContext.eventInf[1] & 1)) { this->unk_1F4 |= 2; this->unk_1F4 &= ~1; @@ -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, "../z_en_mm2.c", 634); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_mm2.c", 654); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 0259d20fb..99f8241e1 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, "../z_en_mu.c", 514); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_mu.c", 534); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 bea6994a5..291e4c26b 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 @@ -1500,7 +1500,7 @@ void EnNb_DrawDefault(EnNb* this, GlobalContext* globalCtx) { void* eyeTexture = sEyeTextures[eyeIdx]; s32 pad1; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_nb.c", 992); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_nb.c", 1013); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 5cf7abc25..48e91f143 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, "../z_en_niw.c", 1897); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); @@ -1219,13 +1219,13 @@ void EnNiw_FeatherDraw(EnNiw* this, GlobalContext* globalCtx) { Matrix_Scale(feather->scale, feather->scale, 1.0f, MTXMODE_APPLY); Matrix_RotateZ(feather->unk_30, MTXMODE_APPLY); Matrix_Translate(0.0f, -1000.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_niw.c", 1913), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gCuccoParticleAliveDL); } } - CLOSE_DISPS(gfxCtx, "../z_en_niw.c", 1919); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 fae45335b..ba11cbbf4 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, "../z_en_niw_girl.c", 573); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_niw_girl.c", 592); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 272e7c693..4ab12a833 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, "../z_en_niw_lady.c", 1347); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_niw_lady.c", 1370); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 28050b494..d5b3a27cc 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, "../z_en_nutsball.c", 327); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (CVar_GetS32("gNewDrops", 0) != 0) { func_80093D18(globalCtx->state.gfxCtx); @@ -180,7 +180,7 @@ void EnNutsball_Draw(Actor* thisx, GlobalContext* globalCtx) { 1 * (globalCtx->state.frames * 6), 32, 32)); Matrix_Scale(25.0f,25.0f,25.0f,MTXMODE_APPLY); Matrix_RotateX(thisx->home.rot.z * 9.58738e-05f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_nutsball.c", 901), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDListsNew[thisx->params]); } else { @@ -188,10 +188,10 @@ void EnNutsball_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_RotateZ(thisx->home.rot.z * 9.58738e-05f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_nutsball.c", 333), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDLists[thisx->params]); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_nutsball.c", 337); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 3d5f42cb2..15739ff9d 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, "../z_en_nwc.c", 316); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093C80(globalCtx); dList1 = POLY_XLU_DISP; @@ -172,7 +172,7 @@ void EnNwc_DrawChicks(EnNwc* this, GlobalContext* globalCtx) { Matrix_SetTranslateRotateYXZ(chick->pos.x, chick->pos.y + chick->height, chick->pos.z, &chick->rot); Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY); - mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_nwc.c", 346); + mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__); gDPSetEnvColor(dList1++, 0, 100, 255, 255); gSPMatrix(dList1++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(dList1++, gCuccoChickBodyDL); @@ -194,12 +194,12 @@ void EnNwc_DrawChicks(EnNwc* this, GlobalContext* globalCtx) { Matrix_Put(&floorMat); Matrix_RotateY(chick->rot.y * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_nwc.c", 388), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gCuccoChickShadowDL); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_nwc.c", 395); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 150bb728d..5274867b3 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,11 +524,11 @@ void EnNy_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnNy* this = (EnNy*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ny.c", 837); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Collider_UpdateSpheres(0, &this->collider); func_8002ED80(&this->actor, globalCtx, 1); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ny.c", 845), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPPipeSync(POLY_XLU_DISP++); gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2); @@ -542,11 +542,11 @@ void EnNy_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Scale(this->unk_1E0, this->unk_1E0, this->unk_1E0, MTXMODE_APPLY); func_8002EBCC(&this->actor, globalCtx, 1); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ny.c", 868), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gEnNySpikeDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ny.c", 872); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ny.c", 900); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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); @@ -581,12 +581,12 @@ void EnNy_DrawDeathEffect(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(temp->x, temp->y, temp->z, MTXMODE_NEW); scale = this->actor.scale.x * 0.4f * (1.0f + (i * 0.04f)); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ny.c", 912), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gEnNyRockBodyDL); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ny.c", 919); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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 7824739a8..325c50592 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, "../z_en_okuta.c", 1653); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (CVar_GetS32("gNewDrops", 0) != 0) { func_80093D18(globalCtx->state.gfxCtx); @@ -765,17 +765,17 @@ void EnOkuta_Draw(Actor* thisx, GlobalContext* globalCtx) { 1 * (globalCtx->state.frames * 6), 32, 32)); Matrix_Scale(7.0f,7.0f,7.0f,MTXMODE_APPLY); Matrix_RotateX(thisx->home.rot.z * (M_PI / 0x8000), MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_nutsball.c", 901), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, gSilverRockDL); } else { Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_RotateZ(this->actor.home.rot.z * (M_PI / 0x8000), MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_okuta.c", 1657), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gOctorokProjectileDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_okuta.c", 1662); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } 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 62704b516..1b8130658 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 @@ -584,7 +584,7 @@ void EnOssan_Init(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf(VT_COL(RED, WHITE)); osSyncPrintf("引数がおかしいよ(arg_data=%d)！！\n", this->actor.params); osSyncPrintf(VT_RST); - ASSERT(0, "0", "../z_en_oB1.c", 1246); + ASSERT(0, "0", __FILE__, __LINE__); return; } @@ -613,7 +613,7 @@ void EnOssan_Init(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf(VT_COL(RED, WHITE)); osSyncPrintf("バンクが無いよ！！(%s)\n", sShopkeeperPrintName[this->actor.params]); osSyncPrintf(VT_RST); - ASSERT(0, "0", "../z_en_oB1.c", 1284); + ASSERT(0, "0", __FILE__, __LINE__); return; } @@ -622,7 +622,7 @@ void EnOssan_Init(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf(VT_COL(RED, WHITE)); osSyncPrintf("予備バンクが無いよ！！(%s)\n", sShopkeeperPrintName[this->actor.params]); osSyncPrintf(VT_RST); - ASSERT(0, "0", "../z_en_oB1.c", 1295); + ASSERT(0, "0", __FILE__, __LINE__); return; } @@ -649,7 +649,7 @@ void EnOssan_EndInteraction(GlobalContext* globalCtx, EnOssan* this) { Player* player = GET_PLAYER(globalCtx); // "End of conversation!" - osSyncPrintf(VT_FGCOL(YELLOW) "%s[%d]:★★★ 会話終了！！ ★★★" VT_RST "\n", "../z_en_oB1.c", 1337); + osSyncPrintf(VT_FGCOL(YELLOW) "%s[%d]:★★★ 会話終了！！ ★★★" VT_RST "\n", __FILE__, __LINE__); YREG(31) = 0; Actor_ProcessTalkRequest(&this->actor, globalCtx); globalCtx->msgCtx.msgMode = MSGMODE_TEXT_CLOSING; @@ -1185,7 +1185,7 @@ void EnOssan_State_BrowseLeftShelf(EnOssan* this, GlobalContext* globalCtx, Play bool dpad = CVar_GetS32("gDpadShop", 0); if (!EnOssan_ReturnItemToShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2152); + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", __FILE__, __LINE__); this->delayTimer = 3; return; } @@ -1246,7 +1246,7 @@ void EnOssan_State_BrowseRightShelf(EnOssan* this, GlobalContext* globalCtx, Pla prevIndex = this->cursorIndex; if (!EnOssan_ReturnItemToShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2244); + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", __FILE__, __LINE__); this->delayTimer = 3; return; } @@ -1311,7 +1311,7 @@ void EnOssan_State_LookFromShelfToShopkeeper(EnOssan* this, GlobalContext* globa void EnOssan_State_DisplayOnlyBombDialog(EnOssan* this, GlobalContext* globalCtx, Player* player) { if (!EnOssan_ReturnItemToShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2355); + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", __FILE__, __LINE__); return; } Math_ApproachF(&this->cameraFaceAngle, 0.0f, 0.5f, 10.0f); @@ -1490,7 +1490,7 @@ void EnOssan_State_ItemSelected(EnOssan* this, GlobalContext* globalCtx2, Player GlobalContext* globalCtx = globalCtx2; // Necessary for OKs if (!EnOssan_TakeItemOffShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2654); + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", __FILE__, __LINE__); return; } if (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_CHOICE && @@ -1511,7 +1511,7 @@ void EnOssan_State_SelectMilkBottle(EnOssan* this, GlobalContext* globalCtx2, Pl GlobalContext* globalCtx = globalCtx2; // Need for OK if (!EnOssan_TakeItemOffShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2693); + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", __FILE__, __LINE__); return; } if (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_CHOICE && @@ -1532,7 +1532,7 @@ void EnOssan_State_SelectWeirdEgg(EnOssan* this, GlobalContext* globalCtx2, Play GlobalContext* globalCtx = globalCtx2; // Needed for OK if (!EnOssan_TakeItemOffShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2732); + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", __FILE__, __LINE__); return; } if (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_CHOICE && @@ -1551,7 +1551,7 @@ void EnOssan_State_SelectWeirdEgg(EnOssan* this, GlobalContext* globalCtx2, Play void EnOssan_State_SelectUnimplementedItem(EnOssan* this, GlobalContext* globalCtx, Player* player) { if (!EnOssan_TakeItemOffShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2771); + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", __FILE__, __LINE__); return; } if (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_EVENT && Message_ShouldAdvance(globalCtx)) { @@ -1562,7 +1562,7 @@ void EnOssan_State_SelectUnimplementedItem(EnOssan* this, GlobalContext* globalC void EnOssan_State_SelectBombs(EnOssan* this, GlobalContext* globalCtx, Player* player) { if (!EnOssan_TakeItemOffShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2798); + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", __FILE__, __LINE__); return; } osSyncPrintf("店主の依頼 ( %d )\n", gSaveContext.infTable[15] & 0x1000); @@ -1589,7 +1589,7 @@ void EnOssan_State_SelectMaskItem(EnOssan* this, GlobalContext* globalCtx, Playe EnGirlA* item = this->shelfSlots[this->cursorIndex]; if (!EnOssan_TakeItemOffShelf(this)) { - osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", "../z_en_oB1.c", 2845); + osSyncPrintf("%s[%d]:" VT_FGCOL(GREEN) "ズーム中！！" VT_RST "\n", __FILE__, __LINE__); return; } if (talkState == TEXT_STATE_EVENT) { @@ -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, "../z_en_oB1.c", 4192); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_oB1.c", 4215); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_oB1.c", 4228); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_oB1.c", 4242); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnOssan_DrawStickDirectionPrompts(GlobalContext* globalCtx, EnOssan* this) { s32 drawStickLeftPrompt = this->stickLeftPrompt.isEnabled; s32 drawStickRightPrompt = this->stickRightPrompt.isEnabled; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4252); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_oB1.c", 4300); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_oB1.c", 4320); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_oB1.c", 4340); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_oB1.c", 4354); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_oB1.c", 4374); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); return 0; } @@ -2411,7 +2411,7 @@ void EnOssan_DrawKokiriShopkeeper(Actor* thisx, GlobalContext* globalCtx) { EnOssan* this = (EnOssan*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_oB1.c", 4409); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_oB1.c", 4434); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_oB1.c", 4455); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_oB1.c", 4476); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_oB1.c", 4506); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_oB1.c", 4531); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_oB1.c", 4544); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_oB1.c", 4564); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_oB1.c", 4578); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_oB1.c", 4598); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_oB1.c", 4611); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_oB1.c", 4631); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 aef838499..d03f376e8 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 @@ -964,7 +964,7 @@ void func_80ACC00C(EnOwl* this, GlobalContext* globalCtx) { this->actor.draw = NULL; break; default: - ASSERT(0, "0", "../z_en_owl.c", 1693); + ASSERT(0, "0", __FILE__, __LINE__); break; } @@ -1333,14 +1333,14 @@ void EnOwl_Draw(Actor* thisx, GlobalContext* globalCtx) { EnOwl* this = (EnOwl*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_owl.c", 2247); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_owl.c", 2264); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 bdf29aa52..b7c35bcd6 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, "../z_en_part.c", 647); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (thisx->params > 0) { Matrix_RotateZ(this->rotZ, MTXMODE_APPLY); @@ -308,10 +308,10 @@ void EnPart_Draw(Actor* thisx, GlobalContext* globalCtx) { } if (this->displayList != NULL) { - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_part.c", 696), + 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->displayList); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_part.c", 700); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 b4d8cb23a..b3873ce94 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, "../z_en_peehat.c", 1946); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); Matrix_RotateX(this->jiggleRot * 0.115f, MTXMODE_APPLY); @@ -1022,11 +1022,11 @@ s32 EnPeehat_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi Matrix_RotateZ(-(this->jiggleRot * 0.1f), MTXMODE_APPLY); Matrix_RotateY(-(this->jiggleRot * 0.13f), MTXMODE_APPLY); Matrix_RotateX(-(this->jiggleRot * 0.115f), MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_peehat.c", 1959), + 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, "../z_en_peehat.c", 1963); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_peehat.c", 1981); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); Matrix_Translate(-1000.0f, 0.0f, 0.0f, MTXMODE_APPLY); Collider_UpdateSpheres(0, &this->colJntSph); @@ -1056,11 +1056,11 @@ void EnPeehat_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, } Matrix_RotateY(3.2f + damageYRot, MTXMODE_APPLY); Matrix_Scale(0.3f, 0.2f, 0.2f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_peehat.c", 1990), + 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, "../z_en_peehat.c", 1994); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } 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 551321011..0747ac9a8 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 @@ -240,7 +240,7 @@ void EnPoDesert_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_7)) { gDPPipeSync((*gfxP)++); gDPSetEnvColor((*gfxP)++, color.r, color.g, color.b, 255); - gSPMatrix((*gfxP)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_desert.c", 523), + gSPMatrix((*gfxP)++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList((*gfxP)++, gPoeFieldLanternDL); gSPDisplayList((*gfxP)++, gPoeFieldLanternTopDL); @@ -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, "../z_en_po_desert.c", 559); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_po_desert.c", 597); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 63b386238..158e2c52f 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, "../z_en_po_field.c", 1669); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, @@ -800,10 +800,10 @@ void EnPoField_DrawFlame(EnPoField* this, GlobalContext* globalCtx) { Matrix_Scale((this->flameScale * 0.7f) + 0.00090000004f, (0.003f - this->flameScale) + 0.003f, 0.003f, MTXMODE_APPLY); } - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_field.c", 1709), + 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, "../z_en_po_field.c", 1712); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } @@ -902,7 +902,7 @@ void EnPoField_PostLimDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList EnPoField* this = (EnPoField*)thisx; if (this->actionFunc == EnPoField_Death && this->actionTimer >= 2 && limbIndex == 8) { - gSPMatrix((*gfxP)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_field.c", 1916), + gSPMatrix((*gfxP)++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList((*gfxP)++, gPoeFieldBurnDL); } @@ -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, "../z_en_po_field.c", 1976); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x0A, @@ -954,11 +954,11 @@ void EnPoField_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, this->soulColor.r, this->soulColor.g, this->soulColor.b, 255); Matrix_Put(&sLimb7Mtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_field.c", 2033), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gPoeFieldLanternDL); gSPDisplayList(POLY_OPA_DISP++, gPoeFieldLanternTopDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_po_field.c", 2039); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_po_field.c", 2077); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->actionFunc == EnPoField_SoulIdle) { func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x0A, @@ -986,7 +986,7 @@ void EnPoField_DrawSoul(Actor* thisx, GlobalContext* globalCtx) { Lights_PointGlowSetInfo(&this->lightInfo, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, this->soulColor.r, this->soulColor.g, this->soulColor.b, 200); gDPSetEnvColor(POLY_OPA_DISP++, this->soulColor.r, this->soulColor.g, this->soulColor.b, 255); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_field.c", 2104), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gPoeFieldLanternDL); gSPDisplayList(POLY_OPA_DISP++, gPoeFieldLanternTopDL); @@ -1000,11 +1000,11 @@ void EnPoField_DrawSoul(Actor* thisx, GlobalContext* globalCtx) { this->lightColor.a); gDPSetEnvColor(POLY_XLU_DISP++, this->lightColor.r, this->lightColor.g, this->lightColor.b, 255); Matrix_RotateY((s16)(Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)) + 0x8000) * 9.58738e-05f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_field.c", 2143), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gPoeFieldSoulDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_po_field.c", 2149); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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 a2e3e31bd..889bece58 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, "../z_en_po_relay.c", 885); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_po_relay.c", 901); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_po_relay.c", 916); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_relay.c", 918), + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); + 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, "../z_en_po_relay.c", 922); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } void EnPoRelay_Draw(Actor* thisx, GlobalContext* globalCtx) { EnPoRelay* this = (EnPoRelay*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_po_relay.c", 940); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_po_relay.c", 954); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 ec5528ef0..68ee86728 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 @@ -1303,7 +1303,7 @@ void EnPoSisters_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi s32 pad; if (this->actionFunc == func_80ADAFC0 && this->unk_19A >= 8 && limbIndex == 9) { - gSPMatrix((*gfxP)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_sisters.c", 2876), + gSPMatrix((*gfxP)++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList((*gfxP)++, gPoSistersBurnDL); } @@ -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, "../z_en_po_sisters.c", 2989); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80ADC55C(this); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -1368,7 +1368,7 @@ void EnPoSisters_Draw(Actor* thisx, GlobalContext* globalCtx) { } if (!(this->unk_199 & 0x80)) { Matrix_Put(&this->unk_2F8); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_sisters.c", 3034), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gPoSistersTorchDL); } @@ -1412,11 +1412,11 @@ void EnPoSisters_Draw(Actor* thisx, GlobalContext* globalCtx) { phi_f20 = CLAMP(phi_f20, 0.5f, 0.8f) * 0.007f; } Matrix_Scale(phi_f20, phi_f20, phi_f20, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_po_sisters.c", 3132), + 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, "../z_en_po_sisters.c", 3139); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 a0bc13128..97853f826 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 @@ -1049,7 +1049,7 @@ void EnPoh_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve Collider_UpdateSpheres(limbIndex, &this->colliderSph); if (this->actionFunc == func_80ADF15C && this->unk_198 >= 2 && limbIndex == this->info->unk_7) { - gSPMatrix((*gfxP)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_poh.c", 2460), + gSPMatrix((*gfxP)++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList((*gfxP)++, this->info->burnDisplayList); } @@ -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, "../z_en_poh.c", 2629); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80AE067C(this); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -1092,10 +1092,10 @@ void EnPoh_DrawRegular(Actor* thisx, GlobalContext* globalCtx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, this->envColor.r, this->envColor.g, this->envColor.b, 255); Matrix_Put(&this->unk_368); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_poh.c", 2676), + 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, "../z_en_poh.c", 2681); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_poh.c", 2694); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80AE067C(this); if (this->actor.params == EN_POH_SHARP) { sp90 = &D_80AE1B4C; @@ -1143,14 +1143,14 @@ void EnPoh_DrawComposer(Actor* thisx, GlobalContext* globalCtx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, this->envColor.r, this->envColor.g, this->envColor.b, 255); Matrix_Put(&this->unk_368); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_poh.c", 2787), + 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); gSPDisplayList(POLY_OPA_DISP++, gPoeComposerLanternBottomDL); 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, "../z_en_poh.c", 2802); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnPoh_UpdateDead(Actor* thisx, GlobalContext* globalCtx) { @@ -1166,14 +1166,14 @@ void EnPoh_UpdateDead(Actor* thisx, GlobalContext* globalCtx) { void EnPoh_DrawSoul(Actor* thisx, GlobalContext* globalCtx) { EnPoh* this = (EnPoh*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_poh.c", 2833); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->actionFunc == EnPoh_Death) { func_80093D18(globalCtx->state.gfxCtx); gDPSetEnvColor(POLY_OPA_DISP++, this->envColor.r, this->envColor.g, this->envColor.b, 255); Lights_PointGlowSetInfo(&this->lightInfo, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, this->envColor.r, this->envColor.g, this->envColor.b, 200); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_poh.c", 2854), + 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); if (this->infoIdx == EN_POH_INFO_COMPOSER) { @@ -1194,9 +1194,9 @@ void EnPoh_DrawSoul(Actor* thisx, GlobalContext* globalCtx) { this->info->primColor.b, this->lightColor.a); gDPSetEnvColor(POLY_XLU_DISP++, this->lightColor.r, this->lightColor.g, this->lightColor.b, 255); Matrix_RotateY((s16)(Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)) + 0x8000) * 9.58738e-05f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_poh.c", 2910), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, this->info->soulDisplayList); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_poh.c", 2916); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 7003d4cde..4629eda60 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, "../z_en_rd.c", 1679); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_rd.c", 1735); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 2c5149646..52451082a 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, "../z_en_reeba.c", 1062); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_reeba.c", 1088); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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 96129766c..7c1be749e 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 @@ -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, "../z_en_rl.c", 416); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_rl.c", 437); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 db1e70009..d825630e3 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 @@ -322,7 +322,7 @@ void EnRr_SetupReleasePlayer(EnRr* this, GlobalContext* globalCtx) { Message_StartTextbox(globalCtx, 0x3061, NULL); break; } - osSyncPrintf(VT_FGCOL(YELLOW) "%s[%d] : Rr_Catch_Cancel" VT_RST "\n", "../z_en_rr.c", 650); + osSyncPrintf(VT_FGCOL(YELLOW) "%s[%d] : Rr_Catch_Cancel" VT_RST "\n", __FILE__, __LINE__); func_8002F6D4(globalCtx, &this->actor, 4.0f, this->actor.shape.rot.y, 12.0f, 8); if (this->actor.colorFilterTimer == 0) { this->actionFunc = EnRr_Approach; @@ -788,7 +788,7 @@ void EnRr_Update(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); if (this->hasPlayer == 0x3F80) { // checks if 1.0f has been stored to hasPlayer's address - ASSERT(0, "0", "../z_en_rr.c", 1355); + ASSERT(0, "0", __FILE__, __LINE__); } Math_StepToF(&this->actor.speedXZ, 0.0f, 0.1f); @@ -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, "../z_en_rr.c", 1478); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (1) {} func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x0C, segMtx); @@ -858,7 +858,7 @@ void EnRr_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Scale((1.0f + this->bodySegs[RR_BASE].scaleMod.x) * this->bodySegs[RR_BASE].scale.x, (1.0f + this->bodySegs[RR_BASE].scaleMod.y) * this->bodySegs[RR_BASE].scale.y, (1.0f + this->bodySegs[RR_BASE].scaleMod.z) * this->bodySegs[RR_BASE].scale.z, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_rr.c", 1501), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); Matrix_Pop(); zeroVec.x = 0.0f; @@ -872,7 +872,7 @@ void EnRr_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Scale((1.0f + this->bodySegs[i].scaleMod.x) * this->bodySegs[i].scale.x, (1.0f + this->bodySegs[i].scaleMod.y) * this->bodySegs[i].scale.y, (1.0f + this->bodySegs[i].scaleMod.z) * this->bodySegs[i].scale.z, MTXMODE_APPLY); - Matrix_ToMtx(segMtx, "../z_en_rr.c", 1527); + Matrix_ToMtx(segMtx, __FILE__, __LINE__); Matrix_Pop(); segMtx++; Matrix_MultVec3f(&zeroVec, &this->effectPos[i]); @@ -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, "../z_en_rr.c", 1551); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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 733d98d9b..3b608df20 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, "../z_en_ru1.c", 1282); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ru1.c", 1309); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_ru1.c", 1324); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ru1.c", 1353); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 54cc44531..e2e03d9a1 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 @@ -800,7 +800,7 @@ void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) { void* tex = sEyeTextures[temp]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ru2.c", 642); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ru2.c", 663); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 99f668aa4..d044248d9 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, "../z_en_sa.c", 1444); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_sa.c", 1497); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 e09c0a8b2..09d44ca1c 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, "../z_en_scene_change.c", 290); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); displayListHead = displayList; gSPSegment(POLY_OPA_DISP++, 0x0C, displayListHead); func_80093D18(globalCtx->state.gfxCtx); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_scene_change.c", 386); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 033903e91..1b662dddb 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, "../z_en_sda.c", 826); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); osSyncPrintf("SDA D 1\n"); func_80094044(globalCtx->state.gfxCtx); @@ -354,7 +354,7 @@ void func_80AF9C70(u8* shadowTexture, Player* player, GlobalContext* globalCtx) 20.0f; Matrix_Translate(tempx, 0.0f, tempz, MTXMODE_APPLY); Matrix_Scale(((BREG(56) - 250) / 1000.0f) + 0.6f, 1.0f, ((BREG(59) - 250) / 1000.0f) + 0.6f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_sda.c", 860), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, D_80AFA3D8); gDPLoadTextureBlock(POLY_XLU_DISP++, shadowTexture, G_IM_FMT_I, G_IM_SIZ_8b, 0x40, 0x40, 0, @@ -363,10 +363,10 @@ void func_80AF9C70(u8* shadowTexture, Player* player, GlobalContext* globalCtx) for (phi_s1 = 0; phi_s1 < KREG(78); phi_s1++) { Matrix_Scale((KREG(79) / 100.0f) + 1.0f, 1.0f, (KREG(79) / 100.0f) + 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_sda.c", 877), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, D_80AFA3F8); } osSyncPrintf("SDA D 2\n"); - CLOSE_DISPS(gfxCtx, "../z_en_sda.c", 882); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 bcac2641f..c69da48ac 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, "../z_en_shopnuts.c", 682); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); curFrame = this->skelAnime.curFrame; if (curFrame <= 6.0f) { y = 1.0f - (curFrame * 0.0833f); @@ -293,10 +293,10 @@ void EnShopnuts_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis Matrix_Scale(x, y, z, MTXMODE_APPLY); if (1) {} - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_shopnuts.c", 714), + 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, "../z_en_shopnuts.c", 717); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } 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 060f40c3c..229f3f933 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,17 +282,17 @@ void EnSiofuki_Draw(Actor* thisx, GlobalContext* globalCtx) { u32 y; u32 gameplayFrames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_siofuki.c", 654); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_siofuki.c", 662), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); x = gameplayFrames * 15; 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, "../z_en_siofuki.c", 674); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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 efecd1601..70936b64e 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, "../z_en_skb.c", 972); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_skb.c", 978); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 f2775c2ca..79254dd1f 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,19 +1602,19 @@ 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, "../z_en_skj.c", 2417); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if ((limbIndex == 11) && (gSaveContext.itemGetInf[3] & 0x200)) { func_80093D18(globalCtx->state.gfxCtx); Matrix_Push(); Matrix_RotateZYX(-0x4000, 0, 0, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_skj.c", 2430), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gSKJskullMaskDL); Matrix_Pop(); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_skj.c", 2437); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_skj.c", 2475); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_skj.c", 2495); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 767e088a1..483584d89 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, "../z_en_skj_needle.c", 200); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_skj_needle.c", 205), + 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, "../z_en_skj_needle.c", 210); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 d88bff535..dd16e2a1b 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, "../z_en_ssh.c", 2333); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(blinkTex[this->blinkState])); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ssh.c", 2336); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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 57009428c..e5b84dd47 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, "../z_en_st.c", 2260); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_st.c", 2295); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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 73866b8d2..e3b8f5e36 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 @@ -128,7 +128,7 @@ void EnSth_Init(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf("bank_ID = %d\n", objectBankIdx); if (objectBankIdx < 0) { - ASSERT(0, "0", "../z_en_sth.c", 1564); + ASSERT(0, "0", __FILE__, __LINE__); } this->objectBankIdx = objectBankIdx; this->drawFunc = EnSth_Draw; @@ -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, "../z_en_sth.c", 2079); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); gSPDisplayList(POLY_OPA_DISP++, D_80B0A3C0); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_sth.c", 2081); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } } @@ -392,7 +392,7 @@ void EnSth_Draw(Actor* thisx, GlobalContext* globalCtx) { EnSth* this = (EnSth*)thisx; Color_RGB8* envColor1; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_sth.c", 2133); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_sth.c", 2176); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 82c03b211..e5a656db2 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,14 +132,14 @@ void EnStream_Draw(Actor* thisx, GlobalContext* globalCtx) { u32 multipliedFrames; u32 frames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_stream.c", 295); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_stream.c", 299), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); multipliedFrames = frames * 20; gSPSegment(POLY_XLU_DISP++, 0x08, 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, "../z_en_stream.c", 310); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 bd2792f11..0f282079e 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, "../z_en_sw.c", 2084); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_sw.c", 2145); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_sw.c", 2181); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_sw.c", 2197); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void func_80B0EEA4(GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_sw.c", 2205); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_sw.c", 2207); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 b8beb1341..f992a802f 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, "../z_en_syateki_niw.c", 1234); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); @@ -783,11 +783,11 @@ void func_80B13464(EnSyatekiNiw* this, GlobalContext* globalCtx) { Matrix_RotateZ(ptr->unk_30, MTXMODE_APPLY); Matrix_Translate(0.0f, -1000.0f, 0.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_syateki_niw.c", 1251), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gCuccoParticleAliveDL); } } - CLOSE_DISPS(gfxCtx, "../z_en_syateki_niw.c", 1257); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 17d86e3de..cd09e945b 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, "../z_en_ta.c", 2381); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_ta.c", 2400); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 c1d169dfe..23c642782 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, "../z_en_takara_man.c", 528); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_takara_man.c", 544); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 5b8c660a9..cbe92e18d 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,26 +73,26 @@ void EnTana_Update(Actor* thisx, GlobalContext* globalCtx) { void EnTana_DrawWoodenShelves(Actor* thisx, GlobalContext* globalCtx) { EnTana* this = (EnTana*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tana.c", 148); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 152), + 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, "../z_en_tana.c", 157); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnTana_DrawStoneShelves(Actor* thisx, GlobalContext* globalCtx) { EnTana* this = (EnTana*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tana.c", 163); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sStoneTextures[thisx->params])); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 169), + 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, "../z_en_tana.c", 174); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 3d6026b25..117d3ea96 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, "../z_en_test.c", 3582); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_test.c", 3587); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 73f17668b..be396c1d5 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, "../z_en_tg.c", 462); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_tg.c", 480); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 092a23cc5..67be0b186 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, "../z_en_tite.c", 1704); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_tite.c", 1735); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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 8319c2bc9..1b4131da2 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 @@ -688,11 +688,11 @@ void EnTk_Update(Actor* thisx, GlobalContext* globalCtx) { } void func_80B1D200(GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tk.c", 1188); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); gSPDisplayList(POLY_OPA_DISP++, gDampeShovelDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_tk.c", 1190); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_tk.c", 1294); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_tk.c", 1312); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 8601b8823..396d7733f 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, "../z_en_torch2.c", 1050); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_torch2.c", 1114); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 8981524fe..93af6a7ac 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,13 +730,13 @@ void EnTp_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnTp* this = (EnTp*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tp.c", 1451); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->unk_150 != 2) { if ((thisx->params <= TAILPASARAN_HEAD) || (thisx->params == TAILPASARAN_HEAD_DYING)) { func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tp.c", 1459), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gTailpasaranHeadDL); @@ -753,13 +753,13 @@ void EnTp_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gTailpasaranTailSegmentTex)); gDPPipeSync(POLY_XLU_DISP++); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tp.c", 1480), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gTailpasaranTailSegmentDL); } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_tp.c", 1495); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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 73c73f7c5..0460c4b46 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 @@ -114,7 +114,7 @@ void EnTr_Init(Actor* thisx, GlobalContext* globalCtx) { break; default: - ASSERT(0, "0", "../z_en_tr.c", 277); + ASSERT(0, "0", __FILE__, __LINE__); break; } } @@ -437,13 +437,13 @@ void EnTr_Draw(Actor* thisx, GlobalContext* globalCtx) { } else { this->actor.shape.shadowDraw = ActorShadow_DrawCircle; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tr.c", 840); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_tr.c", 854); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } 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 17a3d392f..d70f937cc 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,14 +723,14 @@ void EnVali_DrawBody(EnVali* this, GlobalContext* globalCtx) { f32 curFrame; Vec3f scale = { 1.0f, 1.0f, 1.0f }; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_vali.c", 1428); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Get(&mtx); curFrame = this->skelAnime.curFrame; EnVali_PulseInsides(this, curFrame, &scale); Matrix_Scale(scale.x, scale.y, scale.z, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_vali.c", 1436), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBariInnerHoodDL); @@ -740,19 +740,19 @@ void EnVali_DrawBody(EnVali* this, GlobalContext* globalCtx) { cos = Math_CosS(this->actor.shape.rot.y); sin = Math_SinS(this->actor.shape.rot.y); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_vali.c", 1446), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBariNucleusDL); Matrix_Translate((506.0f * cos) + (372.0f * sin), 1114.0f, (372.0f * cos) - (506.0f * sin), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_vali.c", 1455), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBariNucleusDL); Matrix_Translate((-964.0f * cos) - (804.0f * sin), -108.0f, (-804.0f * cos) + (964.0f * sin), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_vali.c", 1463), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBariNucleusDL); @@ -763,13 +763,13 @@ void EnVali_DrawBody(EnVali* this, GlobalContext* globalCtx) { EnVali_PulseOutside(this, curFrame, &scale); Matrix_Scale(scale.x, scale.y, scale.z, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_vali.c", 1471), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gBariOuterHoodDL); Matrix_Put(&mtx); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_vali.c", 1477); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_vali.c", 1505); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_vali.c", 1538); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 0b7964854..a71d752bd 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,10 +302,10 @@ void EnVbBall_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; EnVbBall* this = (EnVbBall*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_vb_ball.c", 604); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (1) {} // needed for match func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_vb_ball.c", 607), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->actor.params >= 200) { @@ -317,10 +317,10 @@ void EnVbBall_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (s8)this->shadowOpacity); Matrix_Translate(this->actor.world.pos.x, 100.0f, this->actor.world.pos.z, MTXMODE_NEW); Matrix_Scale(this->shadowSize, 1.0f, this->shadowSize, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_vb_ball.c", 626), + 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(gCircleShadowDL)); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_vb_ball.c", 632); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 789d15f72..5a59b5bbd 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 @@ -169,10 +169,10 @@ void EnViewer_InitImpl(EnViewer* this, GlobalContext* globalCtx) { EnViewerInitData* initData = &sInitData[this->actor.params >> 8]; s32 skelObjBankIndex = Object_GetIndex(&globalCtx->objectCtx, initData->skeletonObject); - ASSERT(skelObjBankIndex >= 0, "bank_ID >= 0", "../z_en_viewer.c", 576); + ASSERT(skelObjBankIndex >= 0, "bank_ID >= 0", __FILE__, __LINE__); this->animObjBankIndex = Object_GetIndex(&globalCtx->objectCtx, initData->animObject); - ASSERT(this->animObjBankIndex >= 0, "this->anime_bank_ID >= 0", "../z_en_viewer.c", 579); + ASSERT(this->animObjBankIndex >= 0, "this->anime_bank_ID >= 0", __FILE__, __LINE__); if (!Object_IsLoaded(&globalCtx->objectCtx, skelObjBankIndex) || !Object_IsLoaded(&globalCtx->objectCtx, this->animObjBankIndex)) { @@ -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, "../z_en_viewer.c", 1365); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_viewer.c", 1370), + 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, "../z_en_viewer.c", 1372); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } @@ -526,7 +526,7 @@ void EnViewer_DrawGanondorf(EnViewer* this, GlobalContext* globalCtx) { s16 frames = 0; s16 type; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_viewer.c", 1405); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_viewer.c", 1511); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_viewer.c", 1568); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); gSPDisplayList(POLY_OPA_DISP++, gChildZeldaOcarinaOfTimeDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_viewer.c", 1570); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } } void EnViewer_DrawZelda(EnViewer* this, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_viewer.c", 1583); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_viewer.c", 1690); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_viewer.c", 1717); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_viewer.c", 1740); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } static EnViewerDrawFunc sDrawFuncs[] = { @@ -696,7 +696,7 @@ void EnViewer_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; s16 type; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_viewer.c", 1760); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_viewer.c", 1784); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_viewer.c", 1941); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); for (i = 0; i < ARRAY_COUNT(this->fireEffects); i++) { switch (this->fireEffects[i].state) { case 0: @@ -852,12 +852,12 @@ void EnViewer_DrawFireEffects(EnViewer* this2, GlobalContext* globalCtx) { (10 * i - 20 * globalCtx->state.frames) % 512, 32, 128)); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 170, 255); gDPSetEnvColor(POLY_XLU_DISP++, 255, 50, 00, 255); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_viewer.c", 2027), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); 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, "../z_en_viewer.c", 2034); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 f222b4c1a..94690680c 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, "../z_en_vm.c", 1014); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -532,7 +532,7 @@ void EnVm_Draw(Actor* thisx, GlobalContext* globalCtx2) { if (this->unk_260 >= 3) { Matrix_Translate(this->beamPos3.x, this->beamPos3.y + 10.0f, this->beamPos3.z, MTXMODE_NEW); Matrix_Scale(0.8f, 0.8f, 0.8f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_vm.c", 1033), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 168); func_80094BC4(globalCtx->state.gfxCtx); @@ -540,7 +540,7 @@ void EnVm_Draw(Actor* thisx, GlobalContext* globalCtx2) { gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80B2EB88[globalCtx->gameplayFrames % 8])); gSPDisplayList(POLY_XLU_DISP++, gEffEnemyDeathFlameDL); Matrix_RotateY(32767.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_vm.c", 1044), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80B2EB88[(globalCtx->gameplayFrames + 4) % 8])); gSPDisplayList(POLY_XLU_DISP++, gEffEnemyDeathFlameDL); @@ -549,9 +549,9 @@ void EnVm_Draw(Actor* thisx, GlobalContext* globalCtx2) { Matrix_Translate(this->beamPos1.x, this->beamPos1.y, this->beamPos1.z, MTXMODE_NEW); Matrix_RotateZYX(this->beamRot.x, this->beamRot.y, this->beamRot.z, MTXMODE_APPLY); Matrix_Scale(this->beamScale.x * 0.1f, this->beamScale.x * 0.1f, this->beamScale.z * 0.0015f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_vm.c", 1063), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gBeamosLaserDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_vm.c", 1068); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 a10b80b37..4b2ef0508 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, "../z_en_wallmas.c", 1386); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80094044(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, 255); @@ -602,10 +602,10 @@ void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) { } Matrix_Scale(xzScale, 1.0f, xzScale, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1421), G_MTX_LOAD); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, gCircleShadowDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1426); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_wallmas.c", 1478); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); Matrix_Translate(1600.0f, -700.0f, -1700.0f, MTXMODE_APPLY); @@ -632,12 +632,12 @@ void EnWallMas_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList Matrix_RotateZ(DEGREE_15_RAD, MTXMODE_APPLY); Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1489), G_MTX_LOAD); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, gWallmasterFingerDL); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1495); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } 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 3906f0449..f46f7070f 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, "../z_en_weiyer.c", 1193); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_weiyer.c", 1240); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 0da5d87bd..b2a7acd6c 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, "../z_en_wf.c", 2157); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); // 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, "../z_en_wf.c", 2190); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 36c0ceb9c..f06bdbd8a 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, "../z_en_wood02.c", 775); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); type = this->actor.params; if ((type == WOOD_TREE_OVAL_GREEN_SPAWNER) || (type == WOOD_TREE_OVAL_GREEN_SPAWNED) || @@ -450,15 +450,15 @@ void EnWood02_Draw(Actor* thisx, GlobalContext* globalCtx) { } else if (D_80B3BF70[this->drawType & 0xF] != NULL) { Gfx_DrawDListOpa(globalCtx, D_80B3BF54[this->drawType & 0xF]); gDPSetEnvColor(POLY_XLU_DISP++, red, green, blue, 0); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_wood02.c", 808), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, D_80B3BF70[this->drawType & 0xF]); } else { func_80093D84(gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_wood02.c", 814), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, D_80B3BF54[this->drawType & 0xF]); } - CLOSE_DISPS(gfxCtx, "../z_en_wood02.c", 840); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 92497bf3e..af6180ddd 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 @@ -2389,14 +2389,14 @@ void EnXc_DrawDefault(Actor* thisx, GlobalContext* globalCtx) { GraphicsContext* localGfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = localGfxCtx; - OPEN_DISPS(gfxCtx, "../z_en_oA2.c", 1164); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); 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, "../z_en_oA2.c", 1207); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 dc0b72b94..d8931c3fd 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,13 +147,13 @@ void EnYukabyun_Update(Actor* thisx, GlobalContext* globalCtx) { void EnYukabyun_Draw(Actor* thisx, GlobalContext* globalCtx) { EnYukabyun* this = (EnYukabyun*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_yukabyun.c", 366); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80B43F64[this->unk_152])); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_yukabyun.c", 373), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gFloorTileEnemyDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_yukabyun.c", 378); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 a6b0f5809..fcb1af22d 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, "../z_en_zf.c", 3533); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_zf.c", 3601); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 0698c119d..2b253ea6d 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, "../z_en_girlB.c", 2011); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_girlB.c", 2046); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 d51d72e86..402ebf50d 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 @@ -461,7 +461,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p } Matrix_RotateZYX(unk_1DC[0] + kREG(31), unk_1DC[1] + kREG(32), unk_1DC[2] + kREG(33), MTXMODE_APPLY); Matrix_Translate(-188.0f, -184.0f, 0.0f, MTXMODE_APPLY); - Matrix_ToMtx(&sp74[0], "../z_en_zl2.c", 1056); + Matrix_ToMtx(&sp74[0], __FILE__, __LINE__); Matrix_Get(&sp34); Matrix_MtxFToYXZRotS(&sp34, &sp2C, 0); if (!FrameAdvance_IsEnabled(globalCtx)) { @@ -470,7 +470,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p } Matrix_RotateZYX(unk_1DC[3] + kREG(34), unk_1DC[4] + kREG(35), unk_1DC[5] + kREG(36), MTXMODE_APPLY); Matrix_Translate(-410.0f, -184.0f, 0.0f, MTXMODE_APPLY); - Matrix_ToMtx(&sp74[1], "../z_en_zl2.c", 1100); + Matrix_ToMtx(&sp74[1], __FILE__, __LINE__); Matrix_Get(&sp34); Matrix_MtxFToYXZRotS(&sp34, &sp2C, 0); if (!FrameAdvance_IsEnabled(globalCtx)) { @@ -479,7 +479,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p } Matrix_RotateZYX(unk_1DC[6] + kREG(37), unk_1DC[7] + kREG(38), unk_1DC[8] + kREG(39), MTXMODE_APPLY); Matrix_Translate(-1019.0f, -26.0f, 0.0f, MTXMODE_APPLY); - Matrix_ToMtx(&sp74[2], "../z_en_zl2.c", 1120); + Matrix_ToMtx(&sp74[2], __FILE__, __LINE__); Matrix_Pop(); Matrix_Push(); Matrix_Translate(467.0f, 265.0f, 389.0f, MTXMODE_APPLY); @@ -492,7 +492,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p } Matrix_RotateZYX(unk_1DC[9] + kREG(40), unk_1DC[10] + kREG(41), unk_1DC[11] + kREG(42), MTXMODE_APPLY); Matrix_Translate(-427.0f, -1.0f, -3.0f, MTXMODE_APPLY); - Matrix_ToMtx(&sp74[3], "../z_en_zl2.c", 1145); + Matrix_ToMtx(&sp74[3], __FILE__, __LINE__); Matrix_Get(&sp34); Matrix_MtxFToYXZRotS(&sp34, &sp2C, 0); if (!FrameAdvance_IsEnabled(globalCtx)) { @@ -502,7 +502,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p } Matrix_RotateZYX(unk_1DC[12] + kREG(43), unk_1DC[13] + kREG(44), unk_1DC[14] + kREG(45), MTXMODE_APPLY); Matrix_Translate(-446.0f, -52.0f, 84.0f, MTXMODE_APPLY); - Matrix_ToMtx(&sp74[4], "../z_en_zl2.c", 1164); + Matrix_ToMtx(&sp74[4], __FILE__, __LINE__); Matrix_Pop(); Matrix_Push(); Matrix_Translate(467.0f, 265.0f, -389.0f, MTXMODE_APPLY); @@ -515,7 +515,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p } Matrix_RotateZYX(unk_1DC[15] + kREG(46), unk_1DC[16] + kREG(47), unk_1DC[17] + kREG(48), MTXMODE_APPLY); Matrix_Translate(-427.0f, -1.0f, 3.0f, MTXMODE_APPLY); - Matrix_ToMtx(&sp74[5], "../z_en_zl2.c", 1189); + Matrix_ToMtx(&sp74[5], __FILE__, __LINE__); Matrix_Get(&sp34); Matrix_MtxFToYXZRotS(&sp34, &sp2C, 0); if (!FrameAdvance_IsEnabled(globalCtx)) { @@ -525,7 +525,7 @@ s32 func_80B4F45C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p } Matrix_RotateZYX(unk_1DC[18] + kREG(49), unk_1DC[19] + kREG(50), unk_1DC[20] + kREG(51), MTXMODE_APPLY); Matrix_Translate(-446.0f, -52.0f, -84.0f, MTXMODE_APPLY); - Matrix_ToMtx(&sp74[6], "../z_en_zl2.c", 1208); + Matrix_ToMtx(&sp74[6], __FILE__, __LINE__); Matrix_Pop(); Matrix_Pop(); this->unk_24C = 1; @@ -550,7 +550,7 @@ void EnZl2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve Matrix_Translate(180.0f, 979.0f, -375.0f, MTXMODE_APPLY); Matrix_RotateZYX(-0x5DE7, -0x53E9, 0x3333, MTXMODE_APPLY); Matrix_Scale(1.2f, 1.2f, 1.2f, MTXMODE_APPLY); - gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_zl2.c", 1253), + gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList((*gfx)++, gZelda2OcarinaDL); } @@ -1641,7 +1641,7 @@ void func_80B523C8(EnZl2* this, GlobalContext* globalCtx) { void* mouthTex = sMouthTextures[mouthTexIndex]; s32 pad1; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_zl2.c", 1623); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_zl2.c", 1648); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_zl2.c", 1663); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_zl2.c", 1692); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 6ea271bf4..bd402b18e 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 @@ -627,7 +627,7 @@ s32 func_80B5458C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p } Matrix_RotateZYX(unk_28C[0] + kREG(31), unk_28C[1] + kREG(32), unk_28C[2] + kREG(33), MTXMODE_APPLY); Matrix_Translate(-188.0f, -184.0f, 0.0f, MTXMODE_APPLY); - Matrix_ToMtx(&sp78[0], "../z_en_zl3.c", 1490); + Matrix_ToMtx(&sp78[0], __FILE__, __LINE__); Matrix_Get(&sp38); Matrix_MtxFToYXZRotS(&sp38, &sp30, 0); if (!FrameAdvance_IsEnabled(globalCtx)) { @@ -635,7 +635,7 @@ s32 func_80B5458C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p } Matrix_RotateZYX(unk_28C[3] + kREG(34), unk_28C[4] + kREG(35), unk_28C[5] + kREG(36), MTXMODE_APPLY); Matrix_Translate(-410.0f, -184.0f, 0.0f, MTXMODE_APPLY); - Matrix_ToMtx(&sp78[1], "../z_en_zl3.c", 1534); + Matrix_ToMtx(&sp78[1], __FILE__, __LINE__); Matrix_Get(&sp38); Matrix_MtxFToYXZRotS(&sp38, &sp30, 0); if (!FrameAdvance_IsEnabled(globalCtx)) { @@ -643,7 +643,7 @@ s32 func_80B5458C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p } Matrix_RotateZYX(unk_28C[6] + kREG(37), unk_28C[7] + kREG(38), unk_28C[8] + kREG(39), MTXMODE_APPLY); Matrix_Translate(-1019.0f, -26.0f, 0.0f, MTXMODE_APPLY); - Matrix_ToMtx(&sp78[2], "../z_en_zl3.c", 1554); + Matrix_ToMtx(&sp78[2], __FILE__, __LINE__); Matrix_Pop(); Matrix_Push(); Matrix_Translate(467.0f, 265.0f, 389.0f, MTXMODE_APPLY); @@ -656,7 +656,7 @@ s32 func_80B5458C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p } Matrix_RotateZYX(unk_28C[9] + kREG(40), unk_28C[10] + kREG(41), unk_28C[11] + kREG(42), MTXMODE_APPLY); Matrix_Translate(-427.0f, -1.0f, -3.0f, MTXMODE_APPLY); - Matrix_ToMtx(&sp78[3], "../z_en_zl3.c", 1579); + Matrix_ToMtx(&sp78[3], __FILE__, __LINE__); Matrix_Get(&sp38); Matrix_MtxFToYXZRotS(&sp38, &sp30, 0); if (!FrameAdvance_IsEnabled(globalCtx)) { @@ -666,7 +666,7 @@ s32 func_80B5458C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p } Matrix_RotateZYX(unk_28C[12] + kREG(43), unk_28C[13] + kREG(44), unk_28C[14] + kREG(45), MTXMODE_APPLY); Matrix_Translate(-446.0f, -52.0f, 84.0f, MTXMODE_APPLY); - Matrix_ToMtx(&sp78[4], "../z_en_zl3.c", 1598); + Matrix_ToMtx(&sp78[4], __FILE__, __LINE__); Matrix_Pop(); Matrix_Push(); Matrix_Translate(467.0f, 265.0f, -389.0f, MTXMODE_APPLY); @@ -679,7 +679,7 @@ s32 func_80B5458C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p } Matrix_RotateZYX(unk_28C[15] + kREG(46), unk_28C[16] + kREG(47), unk_28C[17] + kREG(48), MTXMODE_APPLY); Matrix_Translate(-427.0f, -1.0f, 3.0f, MTXMODE_APPLY); - Matrix_ToMtx(&sp78[5], "../z_en_zl3.c", 1623); + Matrix_ToMtx(&sp78[5], __FILE__, __LINE__); Matrix_Get(&sp38); Matrix_MtxFToYXZRotS(&sp38, &sp30, 0); if (!FrameAdvance_IsEnabled(globalCtx)) { @@ -689,7 +689,7 @@ s32 func_80B5458C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* p } Matrix_RotateZYX(unk_28C[18] + kREG(49), unk_28C[19] + kREG(50), unk_28C[20] + kREG(51), MTXMODE_APPLY); Matrix_Translate(-446.0f, -52.0f, -84.0f, MTXMODE_APPLY); - Matrix_ToMtx(&sp78[6], "../z_en_zl3.c", 1642); + Matrix_ToMtx(&sp78[6], __FILE__, __LINE__); Matrix_Pop(); Matrix_Pop(); this->unk_2FC = 1; @@ -2705,7 +2705,7 @@ void func_80B59FF4(EnZl3* this, GlobalContext* globalCtx) { void* mouthTex = sMouthTextures[mouthTexIndex]; s32 pad2; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_zl3.c", 2165); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_zl3.c", 2190); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_en_zl3.c", 2205); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_zl3.c", 2234); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 06442186d..ef6e82116 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, "../z_en_zl4.c", 2012); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_zl4.c", 2043); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 ac50f226a..159a343cf 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 @@ -808,7 +808,7 @@ void EnZo_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Pop(); if ((s32)this->alpha != 0) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_zo.c", 1008); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_zo.c", 1025); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } 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 82f37b801..a38e69ae0 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, "../z_en_fhg.c", 2439); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_en_fhg.c", 2480); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 0c903bb80..c81636f82 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, "../z_end_title.c", 403); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); // Draw the Triforce on Link's left hand func_80093D84(globalCtx->state.gfxCtx); @@ -65,12 +65,12 @@ void EndTitle_DrawFull(Actor* thisx, GlobalContext* globalCtx) { Matrix_RotateX(0xBB8 * M_PI / 0x8000, MTXMODE_APPLY); Matrix_RotateY(0.0f, MTXMODE_APPLY); Matrix_RotateZ(0.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_end_title.c", 412), G_MTX_LOAD); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sTriforceDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_end_title.c", 417); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_end_title.c", 419); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); // 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, "../z_end_title.c", 515); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } // 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, "../z_end_title.c", 594); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_end_title.c", 600); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c index 0798145db..4dcaf4a89 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, "../z_fishing.c", 2271); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); @@ -1203,7 +1203,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); Matrix_Scale(effect->unk_30, 1.0f, effect->unk_30, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 2305), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gFishingRippleModelDL); @@ -1229,7 +1229,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(effect->unk_30, effect->unk_30, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 2346), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gFishingDustSplashModelDL); @@ -1259,7 +1259,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(effect->unk_30, effect->unk_30, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 2394), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gFishingWaterDustModelDL); @@ -1284,7 +1284,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(effect->unk_30, effect->unk_30, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 2423), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gFishingBubbleModelDL); @@ -1311,7 +1311,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { Matrix_RotateZ(effect->unk_3C, MTXMODE_APPLY); Matrix_Scale(0.002f, 1.0f, 0.1f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 2467), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gFishingRainDropModelDL); @@ -1337,7 +1337,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); Matrix_Scale(effect->unk_30, 1.0f, effect->unk_30, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 2504), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gFishingRippleModelDL); @@ -1368,7 +1368,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { Matrix_RotateY(rotY, MTXMODE_APPLY); Matrix_Scale(effect->unk_30, effect->unk_30, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 2541), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gFishingRainSplashModelDL); @@ -1387,7 +1387,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { Matrix_Scale(effect->unk_30, effect->unk_30, effect->unk_30, MTXMODE_APPLY); Matrix_Translate(-1250.0f, 0.0f, 0.0f, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 2560), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gFishingOwnerHatDL); @@ -1396,13 +1396,13 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) { Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_fishing.c", 2565); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void Fishing_DrawStreamSplash(GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_fishing.c", 2572); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, globalCtx->gameplayFrames * 1, @@ -1413,11 +1413,11 @@ void Fishing_DrawStreamSplash(GlobalContext* globalCtx) { Matrix_Translate(670.0f, -24.0f, -600.0f, MTXMODE_NEW); Matrix_Scale(0.02f, 1.0f, 0.02f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 2598), + 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(gFishingStreamSplashDL)); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_fishing.c", 2613); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_fishing.c", 2963); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); @@ -1641,13 +1641,13 @@ void Fishing_DrawLureHook(GlobalContext* globalCtx, Vec3f* pos, Vec3f* refPos, u Matrix_Scale(0.0039999997f, 0.0039999997f, 0.005f, MTXMODE_APPLY); Matrix_RotateY(M_PI, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 3029), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gFishingLureHookDL); Matrix_RotateZ(M_PI / 2, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 3034), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gFishingLureHookDL); @@ -1677,14 +1677,14 @@ void Fishing_DrawLureHook(GlobalContext* globalCtx, Vec3f* pos, Vec3f* refPos, u Matrix_Translate(-1250.0f, 0.0f, 0.0f, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 3085), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gFishingOwnerHatDL); } Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_fishing.c", 3098); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void Fishing_UpdateSinkingLure(GlobalContext* globalCtx) { @@ -1761,7 +1761,7 @@ void Fishing_DrawSinkingLure(GlobalContext* globalCtx) { s16 i; f32 scale; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_fishing.c", 3209); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Fishing_UpdateSinkingLure(globalCtx); @@ -1777,7 +1777,7 @@ void Fishing_DrawSinkingLure(GlobalContext* globalCtx) { Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 3239), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gFishingSinkingLureSegmentModelDL); } @@ -1794,14 +1794,14 @@ void Fishing_DrawSinkingLure(GlobalContext* globalCtx) { Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 3265), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gFishingSinkingLureSegmentModelDL); } } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_fishing.c", 3271); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_fishing.c", 3287); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); Matrix_Push(); @@ -1859,7 +1859,7 @@ void Fishing_DrawLureAndLine(GlobalContext* globalCtx, Vec3f* linePos, Vec3f* li func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 3369), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gFishingLureFloatDL); @@ -1907,7 +1907,7 @@ void Fishing_DrawLureAndLine(GlobalContext* globalCtx, Vec3f* linePos, Vec3f* li Matrix_RotateX(rx, MTXMODE_APPLY); Matrix_Scale(D_80B7E14C, 1.0f, dist, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 3444), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gFishingLineModelDL); } else { @@ -1935,7 +1935,7 @@ void Fishing_DrawLureAndLine(GlobalContext* globalCtx, Vec3f* linePos, Vec3f* li Matrix_RotateX(rx, MTXMODE_APPLY); Matrix_Scale(D_80B7E14C, 1.0f, dist, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 3475), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gFishingLineModelDL); break; @@ -1946,7 +1946,7 @@ void Fishing_DrawLureAndLine(GlobalContext* globalCtx, Vec3f* linePos, Vec3f* li Matrix_RotateX((lineRot + i)->x, MTXMODE_APPLY); Matrix_Scale(D_80B7E14C, 1.0f, 0.005f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 3492), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gFishingLineModelDL); } @@ -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, "../z_fishing.c", 3500); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_fishing.c", 3600); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (D_80B7FDA8 != 0) { D_80B7FDA8--; @@ -2084,7 +2084,7 @@ void Fishing_DrawRod(GlobalContext* globalCtx) { Matrix_Push(); Matrix_Scale(sRodScales[i], sRodScales[i], 0.52f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 3809), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (i < 5) { @@ -2108,7 +2108,7 @@ void Fishing_DrawRod(GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_fishing.c", 3838); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_fishing.c", 7704); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); Matrix_Push(); @@ -4430,7 +4430,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) { Matrix_RotateX(prop->rotX, MTXMODE_APPLY); Matrix_RotateY(prop->reedAngle, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 7726), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gFishingReedModelDL); FrameInterpolation_RecordCloseChild(); @@ -4454,7 +4454,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) { Matrix_Translate(prop->pos.x, prop->pos.y, prop->pos.z, MTXMODE_NEW); Matrix_Scale(prop->scale, prop->scale, prop->scale, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 7748), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gFishingWoodPostModelDL); FrameInterpolation_RecordCloseChild(); @@ -4481,7 +4481,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) { Matrix_Translate(0.0f, 0.0f, 20.0f, MTXMODE_APPLY); Matrix_RotateY(prop->rotY, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 7774), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gFishingLilyPadModelDL); FrameInterpolation_RecordCloseChild(); @@ -4506,7 +4506,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) { Matrix_Scale(prop->scale, prop->scale, prop->scale, MTXMODE_APPLY); Matrix_RotateY(prop->rotY, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 7798), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gFishingRockModelDL); FrameInterpolation_RecordCloseChild(); @@ -4518,7 +4518,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) { Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_fishing.c", 7805); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void Fishing_UpdateGroupFishes(GlobalContext* globalCtx) { @@ -4722,7 +4722,7 @@ void Fishing_DrawGroupFishes(GlobalContext* globalCtx) { if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_fishing.c", 8048); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); for (i = 0; i < GROUP_FISH_COUNT; i++) { if (fish->type != FS_GROUP_FISH_NONE) { @@ -4738,7 +4738,7 @@ void Fishing_DrawGroupFishes(GlobalContext* globalCtx) { Matrix_RotateX((-(f32)fish->unk_3C * M_PI) / 32768.0f, MTXMODE_APPLY); Matrix_Scale(fish->unk_2C * scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 8093), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gFishingGroupFishModelDL); } @@ -4746,7 +4746,7 @@ void Fishing_DrawGroupFishes(GlobalContext* globalCtx) { fish++; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_fishing.c", 8099); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_fishing.c", 9134); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_fishing.c", 9142); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } @@ -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, "../z_fishing.c", 9156); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -5806,9 +5806,9 @@ void Fishing_DrawOwner(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(130.0f, 40.0f, 1300.0f, MTXMODE_NEW); Matrix_Scale(0.08f, 0.12f, 0.14f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 9297), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 9298), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gFishingAquariumBottomDL); @@ -5818,5 +5818,5 @@ void Fishing_DrawOwner(Actor* thisx, GlobalContext* globalCtx) { Fishing_DrawSinkingLure(globalCtx); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_fishing.c", 9305); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 e9a5e9181..c83d3984d 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, "../z_item_b_heart.c", 506); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); actorIt = globalCtx->actorCtx.actorLists[ACTORCAT_ITEMACTION].head; @@ -95,17 +95,17 @@ void ItemBHeart_Draw(Actor* thisx, GlobalContext* globalCtx) { if (flag) { func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_item_b_heart.c", 551), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gGiHeartBorderDL); gSPDisplayList(POLY_XLU_DISP++, gGiHeartContainerDL); } else { func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_item_b_heart.c", 557), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gGiHeartBorderDL); gSPDisplayList(POLY_OPA_DISP++, gGiHeartContainerDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_item_b_heart.c", 561); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } diff --git a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index e66d38632..6c7588bef 100644 --- a/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/soh/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -68,7 +68,7 @@ void ItemEtcetera_Init(Actor* thisx, GlobalContext* globalCtx) { objBankIndex = Object_GetIndex(&globalCtx->objectCtx, sObjectIds[type]); osSyncPrintf("bank_ID = %d\n", objBankIndex); if (objBankIndex < 0) { - ASSERT(0, "0", "../z_item_etcetera.c", 241); + ASSERT(0, "0", __FILE__, __LINE__); } else { this->objBankIndex = objBankIndex; } @@ -181,7 +181,7 @@ void func_80B85B28(ItemEtcetera* this, GlobalContext* globalCtx) { void ItemEtcetera_UpdateFireArrow(ItemEtcetera* this, GlobalContext* globalCtx) { if ((globalCtx->csCtx.state != CS_STATE_IDLE) && (globalCtx->csCtx.npcActions[0] != NULL)) { LOG_NUM("(game_play->demo_play.npcdemopnt[0]->dousa)", globalCtx->csCtx.npcActions[0]->action, - "../z_item_etcetera.c", 441); + __FILE__, __LINE__); if (globalCtx->csCtx.npcActions[0]->action == 2) { this->actor.draw = ItemEtcetera_Draw; this->actor.gravity = -0.1f; diff --git a/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c index c44ea58e7..02b6eec92 100644 --- a/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/soh/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -70,7 +70,7 @@ void ItemOcarina_Init(Actor* thisx, GlobalContext* globalCtx) { return; } - LOG_NUM("no", params, "../z_item_ocarina.c", 210); + LOG_NUM("no", params, __FILE__, __LINE__); this->spinRotOffset = 0x400; } 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 ed0d23bcb..20850456f 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, "../z_item_shield.c", 457); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_item_shield.c", 460), + 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, "../z_item_shield.c", 465); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } 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 7d173f10b..1c89444f4 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, "../z_magic_dark.c", 525); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); @@ -220,7 +220,7 @@ void MagicDark_DiamondDraw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); Matrix_RotateY(this->actor.shape.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_magic_dark.c", 553), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 170, 255, 255, (s32)(this->primAlpha * 0.6f) & 0xFF); gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 128); @@ -231,7 +231,7 @@ void MagicDark_DiamondDraw(Actor* thisx, GlobalContext* globalCtx) { gSPDisplayList(POLY_XLU_DISP++, sDiamondModelDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_magic_dark.c", 570); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_magic_dark.c", 619); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 170, 255, 255, 255); @@ -270,15 +270,15 @@ void MagicDark_OrbDraw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_Push(); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_magic_dark.c", 632), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); Matrix_RotateZ(sp6C * (M_PI / 32), MTXMODE_APPLY); gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); Matrix_Pop(); Matrix_RotateZ(-sp6C * (M_PI / 32), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_magic_dark.c", 639), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_magic_dark.c", 643); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 21ed9f585..191b2153e 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, "../z_magic_fire.c", 682); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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), @@ -231,7 +231,7 @@ void MagicFire_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, 255, 200, 0, (u8)(this->alphaMultiplier * 255)); gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, (u8)(this->alphaMultiplier * 255)); Matrix_Scale(0.15f, 0.15f, 0.15f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_magic_fire.c", 715), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPPipeSync(POLY_XLU_DISP++); gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); @@ -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, "../z_magic_fire.c", 750); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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 c14397c3e..97112df76 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 @@ -61,7 +61,7 @@ void MagicWind_Init(Actor* thisx, GlobalContext* globalCtx) { SkelCurve_SetAnim(&this->skelCurve, &sAnim, 60.0f, 0.0f, 60.0f, -1.0f); MagicWind_SetupAction(this, MagicWind_Shrink); // "Means start" - LOG_STRING("表示開始", "../z_magic_wind.c", 486); + LOG_STRING("表示開始", __FILE__, __LINE__); func_8002F7DC(&player->actor, NA_SE_PL_MAGIC_WIND_WARP); break; } @@ -72,7 +72,7 @@ void MagicWind_Destroy(Actor* thisx, GlobalContext* globalCtx) { SkelCurve_Destroy(globalCtx, &this->skelCurve); func_800876C8(globalCtx); // "wipe out" - LOG_STRING("消滅", "../z_magic_wind.c", 505); + LOG_STRING("消滅", __FILE__, __LINE__); } void MagicWind_UpdateAlpha(f32 alpha) { @@ -94,7 +94,7 @@ void MagicWind_WaitForTimer(MagicWind* this, GlobalContext* globalCtx) { } // "Means start" - LOG_STRING("表示開始", "../z_magic_wind.c", 539); + LOG_STRING("表示開始", __FILE__, __LINE__); func_8002F7DC(&player->actor, NA_SE_PL_MAGIC_WIND_NORMAL); MagicWind_UpdateAlpha(1.0f); MagicWind_SetupAction(this, MagicWind_Grow); @@ -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, "../z_magic_wind.c", 615); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_magic_wind.c", 646); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_magic_wind.c", 661); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); 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, "../z_magic_wind.c", 673); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } 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 d0f59a259..f0880d205 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 @@ -168,11 +168,11 @@ void MirRay_Init(Actor* thisx, GlobalContext* globalCtx) { ActorShape_Init(&this->actor.shape, 0.0f, NULL, 0.0f); // "Generation of reflectable light!" osSyncPrintf("反射用 光の発生!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); - LOG_NUM("this->actor.arg_data", this->actor.params, "../z_mir_ray.c", 518); + LOG_NUM("this->actor.arg_data", this->actor.params, __FILE__, __LINE__); if (this->actor.params >= 0xA) { // "Reflected light generation failure" - LOG_STRING("反射光 発生失敗", "../z_mir_ray.c", 521); + LOG_STRING("反射光 発生失敗", __FILE__, __LINE__); Actor_Kill(&this->actor); } @@ -492,11 +492,11 @@ 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, "../z_mir_ray.c", 966); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); Matrix_Scale(1.0f, 1.0f, this->reflectIntensity * 5.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_mir_ray.c", 972), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 150, (s16)(temp = this->reflectIntensity * 100.0f)); gSPDisplayList(POLY_XLU_DISP++, gShieldBeamGlowDL); @@ -519,7 +519,7 @@ void MirRay_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(reflection[i].pos.x, reflection[i].pos.y, reflection[i].pos.z, MTXMODE_NEW); Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY); Matrix_Mult(&reflection[i].mtx, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_mir_ray.c", 1006), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetRenderMode(POLY_XLU_DISP++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_DECAL2); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 150, reflection[0].opacity); @@ -529,7 +529,7 @@ void MirRay_Draw(Actor* thisx, GlobalContext* globalCtx) { D_80B8E670 = 1; - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_mir_ray.c", 1027); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } } diff --git a/soh/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/soh/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index 53b0a1565..35fcb751e 100644 --- a/soh/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/soh/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -146,7 +146,7 @@ void ObjBean_InitDynaPoly(ObjBean* this, GlobalContext* globalCtx, CollisionHead this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_bean.c", 374, + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->dyna.actor.id, this->dyna.actor.params); } } @@ -476,7 +476,7 @@ void ObjBean_Init(Actor* thisx, GlobalContext* globalCtx) { if (path == 0x1F) { osSyncPrintf(VT_COL(RED, WHITE)); // "No path data?" - osSyncPrintf("パスデータが無い？(%s %d)(arg_data %xH)\n", "../z_obj_bean.c", 909, + osSyncPrintf("パスデータが無い？(%s %d)(arg_data %xH)\n", __FILE__, __LINE__, this->dyna.actor.params); osSyncPrintf(VT_RST); Actor_Kill(&this->dyna.actor); @@ -485,7 +485,7 @@ void ObjBean_Init(Actor* thisx, GlobalContext* globalCtx) { if (globalCtx->setupPathList[path].count < 3) { osSyncPrintf(VT_COL(RED, WHITE)); // "Incorrect number of path data" - osSyncPrintf("パスデータ数が不正(%s %d)(arg_data %xH)\n", "../z_obj_bean.c", 921, + osSyncPrintf("パスデータ数が不正(%s %d)(arg_data %xH)\n", __FILE__, __LINE__, this->dyna.actor.params); osSyncPrintf(VT_RST); Actor_Kill(&this->dyna.actor); 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 039fa6ef5..1fed0125d 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, "../z_obj_comb.c", 369); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); @@ -217,12 +217,12 @@ void ObjComb_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(0, -(this->actor.scale.y * 118.0f), 0, MTXMODE_APPLY); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_comb.c", 394), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gFieldBeehiveDL); Collider_UpdateSpheres(0, &this->collider); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_comb.c", 402); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 ba1bdf87d..f68302547 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,12 +150,12 @@ void ObjDekujr_Update(Actor* thisx, GlobalContext* globalCtx) { void ObjDekujr_Draw(Actor* thisx, GlobalContext* globalCtx) { u32 frameCount; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 370); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 379), + 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_dekujr_DL_0030D0); @@ -163,9 +163,9 @@ void ObjDekujr_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPSegment( POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frameCount % 128, 0, 32, 32, 1, frameCount % 128, 0, 32, 32)); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 399), + 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_dekujr_DL_0032D8); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_dekujr.c", 409); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } diff --git a/soh/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/soh/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index b7b9cbdc1..f1b9da0d4 100644 --- a/soh/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/soh/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -54,7 +54,7 @@ void func_80B92B08(ObjElevator* this, GlobalContext* globalCtx, CollisionHeader* CollisionHeader_GetVirtual(collision, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_elevator.c", 136, + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, thisx->id, thisx->params); } } 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 547c5a1f2..bc9948289 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,14 +195,14 @@ void ObjHamishi_Update(Actor* thisx, GlobalContext* globalCtx) { } void ObjHamishi_Draw(Actor* thisx, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_hamishi.c", 399); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_hamishi.c", 404), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 170, 130, 255); gSPDisplayList(POLY_OPA_DISP++, gSilverRockDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_hamishi.c", 411); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 38330bcd6..a78a26440 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 @@ -62,7 +62,7 @@ void func_80B93B68(ObjHsblock* this, GlobalContext* globalCtx, CollisionHeader* CollisionHeader_GetVirtual(collision, &colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_hsblock.c", 163, + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->dyna.actor.id, this->dyna.actor.params); } } @@ -149,11 +149,11 @@ void ObjHsblock_Draw(Actor* thisx, GlobalContext* globalCtx) { Color_RGB8* color; Color_RGB8 defaultColor; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_hsblock.c", 365); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_hsblock.c", 369), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (globalCtx->sceneNum == SCENE_HIDAN) { @@ -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, "../z_obj_hsblock.c", 399); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 c725baf00..5cc99509f 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,12 +193,12 @@ void ObjIcePoly_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; ObjIcePoly* this = (ObjIcePoly*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_ice_poly.c", 421); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); func_8002ED80(&this->actor, globalCtx, 0); Matrix_RotateZYX(0x500, 0, -0x500, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_ice_poly.c", 428), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, globalCtx->gameplayFrames % 0x100, 0x20, 0x10, 1, 0, @@ -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, "../z_obj_ice_poly.c", 444); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } diff --git a/soh/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/soh/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c index 3c6aaaf52..04a3d960a 100644 --- a/soh/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/soh/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -71,7 +71,7 @@ void ObjLift_InitDynaPoly(ObjLift* this, GlobalContext* globalCtx, CollisionHead this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); if (this->dyna.bgId == BG_ACTOR_MAX) { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_lift.c", 188, + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->dyna.actor.id, this->dyna.actor.params); } } 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 6561103de..9bc58b306 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 @@ -192,7 +192,7 @@ void ObjLightswitch_Init(Actor* thisx, GlobalContext* globalCtx) { this->actor.home.rot.y, 0, (0xFF << 8) | PUSHBLOCK_SMALL_START_ON) == NULL) { osSyncPrintf(VT_COL(RED, WHITE)); // "Push-pull block occurrence failure" - osSyncPrintf("押引ブロック発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_obj_lightswitch.c", 452, + osSyncPrintf("押引ブロック発生失敗(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->actor.params); osSyncPrintf(VT_RST); removeSelf = true; @@ -400,7 +400,7 @@ void ObjLightswitch_DrawOpa(ObjLightswitch* this, GlobalContext* globalCtx) { Vec3f pos; Vec3s rot; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 809); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); gDPSetEnvColor(POLY_OPA_DISP++, (u8)(this->color[0] >> 6), (u8)(this->color[1] >> 6), (u8)(this->color[2] >> 6), @@ -421,7 +421,7 @@ void ObjLightswitch_DrawOpa(ObjLightswitch* this, GlobalContext* globalCtx) { pos.z = this->actor.world.pos.z; } - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 841), + 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(sFaceTextures[this->faceTextureIndex])); gSPDisplayList(POLY_OPA_DISP++, object_lightswitch_DL_000260); @@ -431,18 +431,18 @@ void ObjLightswitch_DrawOpa(ObjLightswitch* this, GlobalContext* globalCtx) { rot.z = this->actor.shape.rot.z + this->flameRingRot; Matrix_SetTranslateRotateYXZ(pos.x, pos.y, pos.z, &rot); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 859), + 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_lightswitch_DL_000398); rot.z = this->actor.shape.rot.z - this->flameRingRot; Matrix_SetTranslateRotateYXZ(pos.x, pos.y, pos.z, &rot); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 873), + 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_lightswitch_DL_000408); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 878); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_obj_lightswitch.c", 890); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->color[0] >> 6), (u8)(this->color[1] >> 6), (u8)(this->color[2] >> 6), @@ -461,7 +461,7 @@ void ObjLightswitch_DrawXlu(ObjLightswitch* this, GlobalContext* globalCtx) { sp68.y = this->actor.world.pos.y + (this->actor.shape.yOffset * this->actor.scale.y); sp68.z = this->actor.world.pos.z; - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 912), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sFaceTextures[this->faceTextureIndex])); gSPDisplayList(POLY_XLU_DISP++, object_lightswitch_DL_000260); @@ -472,18 +472,18 @@ void ObjLightswitch_DrawXlu(ObjLightswitch* this, GlobalContext* globalCtx) { Matrix_SetTranslateRotateYXZ(sp68.x, sp68.y, sp68.z, &sp60); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 930), + 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_lightswitch_DL_000398); sp60.z = this->actor.shape.rot.z - this->flameRingRot; Matrix_SetTranslateRotateYXZ(sp68.x, sp68.y, sp68.z, &sp60); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 944), + 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_lightswitch_DL_000408); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_lightswitch.c", 949); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void ObjLightswitch_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/soh/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index fb1c1e140..033d07f2c 100644 --- a/soh/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/soh/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -39,7 +39,7 @@ void ObjMakekinsuta_Init(Actor* thisx, GlobalContext* globalCtx) { } else { osSyncPrintf(VT_COL(YELLOW, BLACK)); // "Invalid Argument (arg_data %x)(%s %d)" - osSyncPrintf("引数不正 (arg_data %x)(%s %d)\n", this->actor.params, "../z_obj_makekinsuta.c", 119); + osSyncPrintf("引数不正 (arg_data %x)(%s %d)\n", this->actor.params, __FILE__, __LINE__); osSyncPrintf(VT_RST); } this->actionFunc = func_80B98320; diff --git a/soh/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c b/soh/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c index 50704ed41..1c8f851b2 100644 --- a/soh/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c +++ b/soh/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.c @@ -68,7 +68,7 @@ void ObjMakeoshihiki_Init(Actor* thisx, GlobalContext* globalCtx) { ((block->color << 6) & 0xC0) | (block->type & 0xF) | 0xFF00) == NULL) { // "Push-pull block failure" osSyncPrintf(VT_COL(RED, WHITE)); - osSyncPrintf("Ｅｒｒｏｒ : 押し引きブロック発生失敗(%s %d)\n", "../z_obj_makeoshihiki.c", 194); + osSyncPrintf("Ｅｒｒｏｒ : 押し引きブロック発生失敗(%s %d)\n", __FILE__, __LINE__); osSyncPrintf(VT_RST); Actor_Kill(thisx); return; @@ -77,7 +77,7 @@ void ObjMakeoshihiki_Init(Actor* thisx, GlobalContext* globalCtx) { ((ObjOshihiki*)thisx->child)->cantMove = true; } thisx->world.rot.z = thisx->shape.rot.z = 0; - osSyncPrintf("(%s)(arg_data %04xF)(angleZ %d)\n", "../z_obj_makeoshihiki.c", thisx->params, thisx->home.rot.z); + osSyncPrintf("(%s)(arg_data %04xF)(angleZ %d)\n", __FILE__, thisx->params, thisx->home.rot.z); } void ObjMakeoshihiki_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/soh/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c index 86883f08e..efb3b5fd0 100644 --- a/soh/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/soh/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -72,7 +72,7 @@ s32 ObjMure_SetCullingImpl(Actor* thisx, GlobalContext* globalCtx) { break; default: // "Error : Culling is not set.(%s %d)(arg_data 0x%04x)" - osSyncPrintf("Error : カリングの設定がされていません。(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 204, + osSyncPrintf("Error : カリングの設定がされていません。(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->actor.params); return false; } @@ -95,11 +95,11 @@ void ObjMure_Init(Actor* thisx, GlobalContext* globalCtx) { this->type = thisx->params & 0x1F; if (this->ptn >= 4) { - osSyncPrintf("Error 群れな敵 (%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 237, thisx->params); + osSyncPrintf("Error 群れな敵 (%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, thisx->params); Actor_Kill(&this->actor); return; } else if (this->type >= 5) { - osSyncPrintf("Error 群れな敵 (%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 245, thisx->params); + osSyncPrintf("Error 群れな敵 (%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, thisx->params); Actor_Kill(&this->actor); return; } else if (!ObjMure_SetCulling(thisx, globalCtx)) { @@ -110,7 +110,7 @@ void ObjMure_Init(Actor* thisx, GlobalContext* globalCtx) { osSyncPrintf("群れな敵 (arg_data 0x%04x)(chNum(%d) ptn(%d) svNum(%d) type(%d))\n", thisx->params, this->chNum, this->ptn, this->svNum, this->type); if (ObjMure_GetMaxChildSpawns(this) <= 0) { - osSyncPrintf("Warning : 個体数が設定されていません(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 268, + osSyncPrintf("Warning : 個体数が設定されていません(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, thisx->params); } } @@ -127,7 +127,7 @@ s32 ObjMure_GetMaxChildSpawns(ObjMure* this) { void ObjMure_GetSpawnPos(Vec3f* outPos, Vec3f* inPos, s32 ptn, s32 idx) { if (ptn >= 4) { - osSyncPrintf("おかしなの (%s %d)\n", "../z_obj_mure.c", 307); + osSyncPrintf("おかしなの (%s %d)\n", __FILE__, __LINE__); } *outPos = *inPos; } @@ -142,7 +142,7 @@ void ObjMure_SpawnActors0(ObjMure* this, GlobalContext* globalCtx) { for (i = 0; i < maxChildren; i++) { if (this->children[i] != NULL) { // "Error: I already have a child(%s %d)(arg_data 0x%04x)" - osSyncPrintf("Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 333, + osSyncPrintf("Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->actor.params); } switch (this->childrenStates[i]) { @@ -158,7 +158,7 @@ void ObjMure_SpawnActors0(ObjMure* this, GlobalContext* globalCtx) { this->children[i]->flags |= ACTOR_FLAG_ENKUSA_CUT; this->children[i]->room = this->actor.room; } else { - osSyncPrintf("warning 発生失敗 (%s %d)\n", "../z_obj_mure.c", 359); + osSyncPrintf("warning 発生失敗 (%s %d)\n", __FILE__, __LINE__); } break; default: @@ -170,7 +170,7 @@ void ObjMure_SpawnActors0(ObjMure* this, GlobalContext* globalCtx) { if (this->children[i] != NULL) { this->children[i]->room = this->actor.room; } else { - osSyncPrintf("warning 発生失敗 (%s %d)\n", "../z_obj_mure.c", 382); + osSyncPrintf("warning 発生失敗 (%s %d)\n", __FILE__, __LINE__); } break; } @@ -186,7 +186,7 @@ void ObjMure_SpawnActors1(ObjMure* this, GlobalContext* globalCtx) { for (i = 0; i < maxChildren; i++) { if (this->children[i] != NULL) { - osSyncPrintf("Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure.c", 407, actor->params); + osSyncPrintf("Error : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, actor->params); } ac = &globalCtx->actorCtx; ObjMure_GetSpawnPos(&spawnPos, &actor->world.pos, this->ptn, i); @@ -198,7 +198,7 @@ void ObjMure_SpawnActors1(ObjMure* this, GlobalContext* globalCtx) { this->children[i]->room = actor->room; } else { this->childrenStates[i] = OBJMURE_CHILD_STATE_1; - osSyncPrintf("warning 発生失敗 (%s %d)\n", "../z_obj_mure.c", 438); + osSyncPrintf("warning 発生失敗 (%s %d)\n", __FILE__, __LINE__); } } } diff --git a/soh/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/soh/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index 27c597b3a..1f04bcea3 100644 --- a/soh/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/soh/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -113,7 +113,7 @@ void ObjMure2_SpawnActors(ObjMure2* this, GlobalContext* globalCtx) { for (i = 0; i < D_80B9A818[actorNum]; i++) { if (this->actorSpawnPtrList[i] != NULL) { // "Warning : I already have a child (%s %d)(arg_data 0x%04x)" - osSyncPrintf("Warning : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", "../z_obj_mure2.c", 269, + osSyncPrintf("Warning : 既に子供がいる(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->actor.params); continue; } 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 70e4f4d7f..74bca2968 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 @@ -95,7 +95,7 @@ void ObjOshihiki_InitDynapoly(ObjOshihiki* this, GlobalContext* globalCtx, Colli if (this->dyna.bgId == BG_ACTOR_MAX) { // "Warning : move BG registration failure" - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 280, + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->dyna.actor.id, this->dyna.actor.params); } } @@ -213,7 +213,7 @@ void ObjOshihiki_CheckType(ObjOshihiki* this, GlobalContext* globalCtx) { break; default: // "Error : type cannot be determined" - osSyncPrintf("Error : タイプが判別できない(%s %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 444, + osSyncPrintf("Error : タイプが判別できない(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->dyna.actor.params); break; } @@ -258,7 +258,7 @@ void ObjOshihiki_SetColor(ObjOshihiki* this, GlobalContext* globalCtx) { if (i >= ARRAY_COUNT(sColors)) { // "Error : scene_data_ID cannot be determined" - osSyncPrintf("Error : scene_data_ID が判別できない。(%s %d)\n", "../z_obj_oshihiki.c", 579); + osSyncPrintf("Error : scene_data_ID が判別できない。(%s %d)\n", __FILE__, __LINE__); color->r = color->g = color->b = 255; } else { src = &sColors[i][paramsColorIdx]; @@ -390,7 +390,7 @@ s32 ObjOshihiki_CheckFloor(ObjOshihiki* this, GlobalContext* globalCtx) { s32 ObjOshihiki_CheckGround(ObjOshihiki* this, GlobalContext* globalCtx) { if (this->dyna.actor.world.pos.y <= BGCHECK_Y_MIN + 10.0f) { // "Warning : Push-pull block fell too much" - osSyncPrintf("Warning : 押し引きブロック落ちすぎた(%s %d)(arg_data 0x%04x)\n", "../z_obj_oshihiki.c", 809, + osSyncPrintf("Warning : 押し引きブロック落ちすぎた(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->dyna.actor.params); Actor_Kill(&this->dyna.actor); return 0; @@ -654,7 +654,7 @@ void ObjOshihiki_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; ObjOshihiki* this = (ObjOshihiki*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_oshihiki.c", 1289); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (ObjOshihiki_MoveWithBlockUnder(this, globalCtx)) { Matrix_Translate(this->underDistX * 10.0f, 0.0f, this->underDistZ * 10.0f, MTXMODE_APPLY); } @@ -662,7 +662,7 @@ void ObjOshihiki_Draw(Actor* thisx, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(this->texture)); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_oshihiki.c", 1308), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); switch (globalCtx->sceneNum) { @@ -682,5 +682,5 @@ void ObjOshihiki_Draw(Actor* thisx, GlobalContext* globalCtx) { } gSPDisplayList(POLY_OPA_DISP++, gPushBlockDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_oshihiki.c", 1334); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 1adc45d72..e9e79cce0 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 @@ -194,7 +194,7 @@ void ObjSwitch_InitDynapoly(ObjSwitch* this, GlobalContext* globalCtx, Collision if (this->dyna.bgId == BG_ACTOR_MAX) { // "Warning : move BG registration failure" - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_switch.c", 531, + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__, this->dyna.actor.id, this->dyna.actor.params); } } @@ -316,7 +316,7 @@ void ObjSwitch_Init(Actor* thisx, GlobalContext* globalCtx) { if ((this->dyna.actor.params >> 7 & 1) && (ObjSwitch_SpawnIce(this, globalCtx) == NULL)) { osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("Error : 氷発生失敗 (%s %d)\n", "../z_obj_switch.c", 732); + osSyncPrintf("Error : 氷発生失敗 (%s %d)\n", __FILE__, __LINE__); osSyncPrintf(VT_RST); this->dyna.actor.params &= ~0x80; } @@ -731,15 +731,15 @@ void ObjSwitch_DrawEye(ObjSwitch* this, GlobalContext* globalCtx) { s32 pad; s32 subType = (this->dyna.actor.params >> 4 & 7); - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_switch.c", 1459); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_switch.c", 1462), + 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(eyeTextures[subType][this->eyeTexIndex])); gSPDisplayList(POLY_OPA_DISP++, eyeDlists[subType]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_switch.c", 1471); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void ObjSwitch_DrawCrystal(ObjSwitch* this, GlobalContext* globalCtx) { @@ -756,19 +756,19 @@ void ObjSwitch_DrawCrystal(ObjSwitch* this, GlobalContext* globalCtx) { if (1) {} - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_switch.c", 1494); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_switch.c", 1497), + 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, "../z_obj_switch.c", 1502); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_switch.c", 1507); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_switch.c", 1511), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (subType == OBJSWITCH_SUBTYPE_CRYSTAL_1) { @@ -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, "../z_obj_switch.c", 1533); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 f2e252f90..fa1acf100 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,10 +265,10 @@ void ObjSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) { timerMax = (((this->actor.params >> 6) & 0xF) * 50) + 100; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 707); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 714), + 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[(u16)this->actor.params >> 0xC]); @@ -299,10 +299,10 @@ void ObjSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) { MTXMODE_APPLY); Matrix_Scale(flameScale, flameScale, flameScale, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_syokudai.c", 745), + 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, "../z_obj_syokudai.c", 749); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 37cdb3fb4..7259b4aae 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,14 +335,14 @@ 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, "../z_obj_timeblock.c", 762); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_timeblock.c", 766), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, primColor->r, primColor->g, primColor->b, 255); gSPDisplayList(POLY_OPA_DISP++, gSongOfTimeBlockDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_timeblock.c", 772); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } diff --git a/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index aaecfec6d..460074f81 100644 --- a/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/soh/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -139,7 +139,7 @@ void ObjTsubo_Init(Actor* thisx, GlobalContext* globalCtx) { } this->objTsuboBankIndex = Object_GetIndex(&globalCtx->objectCtx, sObjectIds[(this->actor.params >> 8) & 1]); if (this->objTsuboBankIndex < 0) { - osSyncPrintf("Error : バンク危険！ (arg_data 0x%04x)(%s %d)\n", this->actor.params, "../z_obj_tsubo.c", 410); + osSyncPrintf("Error : バンク危険！ (arg_data 0x%04x)(%s %d)\n", this->actor.params, __FILE__, __LINE__); Actor_Kill(&this->actor); } else { ObjTsubo_SetupWaitForObject(this); 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 97e1aede2..02999ac5b 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 @@ -265,7 +265,7 @@ void func_80BA24F8(ObjWarp2block* this, GlobalContext* globalCtx) { this->unk_174++; if (this->unk_174 > 60) { osSyncPrintf(VT_COL(RED, WHITE)); - osSyncPrintf("Error : 時のブロック(ワープ２)が対でセットされていません(%s %d)\n", "../z_obj_warp2block.c", 505); + osSyncPrintf("Error : 時のブロック(ワープ２)が対でセットされていません(%s %d)\n", "../z_obj_warp2block.c", __LINE__); osSyncPrintf(VT_RST); Actor_Kill(&this->dyna.actor); } @@ -308,13 +308,13 @@ void ObjWarp2block_Draw(Actor* thisx, GlobalContext* globalCtx) { sp44 = &sColors[thisx->home.rot.z & 7]; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_warp2block.c", 584); + OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_warp2block.c", __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_warp2block.c", 588), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_warp2block.c", __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sp44->r, sp44->g, sp44->b, 255); gSPDisplayList(POLY_OPA_DISP++, gSongOfTimeBlockDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_warp2block.c", 594); + CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_warp2block.c", __LINE__); } 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 d4282b91b..b692cba12 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, "../z_object_kankyo.c", 807); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x14); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gSunTex)); gSPDisplayList(POLY_XLU_DISP++, gKokiriDustMoteTextureLoadDL); @@ -569,11 +569,11 @@ void ObjectKankyo_DrawFairies(ObjectKankyo* this2, GlobalContext* globalCtx2) { Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_RotateZ(DEG_TO_RAD(globalCtx->state.frames * 20.0f), MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_object_kankyo.c", 913), G_MTX_LOAD); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, gKokiriDustMoteDL); FrameInterpolation_RecordCloseChild(); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_object_kankyo.c", 922); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } @@ -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, "../z_object_kankyo.c", 958); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (globalCtx->envCtx.unk_EE[2] < globalCtx->envCtx.unk_EE[3]) { if (globalCtx->state.frames % 16 == 0) { globalCtx->envCtx.unk_EE[2] += 2; @@ -699,7 +699,7 @@ void ObjectKankyo_DrawSnow(ObjectKankyo* this2, GlobalContext* globalCtx2) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 200, 200, 200, 180); gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 200, 180); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_object_kankyo.c", 1107), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gDust5Tex)); @@ -714,7 +714,7 @@ void ObjectKankyo_DrawSnow(ObjectKankyo* this2, GlobalContext* globalCtx2) { gDPPipeSync(POLY_XLU_DISP++); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_object_kankyo.c", 1127); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } } @@ -747,7 +747,7 @@ void ObjectKankyo_DrawLightning(ObjectKankyo* this, GlobalContext* globalCtx) { s32 pad; s32 pad2; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_object_kankyo.c", 1182); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->effects[0].state == 1) { Matrix_Translate(globalCtx->csCtx.npcActions[0]->startPos.x, globalCtx->csCtx.npcActions[0]->startPos.y, @@ -757,7 +757,7 @@ void ObjectKankyo_DrawLightning(ObjectKankyo* this, GlobalContext* globalCtx) { Matrix_Scale(2.0f, 5.0f, 2.0f, MTXMODE_APPLY); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 128); gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 255, 128); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_object_kankyo.c", 1213), G_MTX_LOAD); + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sEffLightningTextures[this->effects[0].timer])); func_80094C50(globalCtx->state.gfxCtx); gSPMatrix(POLY_XLU_DISP++, SEG_ADDR(1, 0), G_MTX_MODELVIEW | G_MTX_NOPUSH | G_MTX_MUL); @@ -766,14 +766,14 @@ void ObjectKankyo_DrawLightning(ObjectKankyo* this, GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_object_kankyo.c", 1233); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void ObjectKankyo_SunGraveSparkInit(ObjectKankyo* this, GlobalContext* globalCtx) { s32 objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_SPOT02_OBJECTS); if (objBankIndex < 0) { - ASSERT(0, "0", "../z_object_kankyo.c", 1251); + ASSERT(0, "0", __FILE__, __LINE__); } else { this->requiredObjBankIndex = objBankIndex; } @@ -811,7 +811,7 @@ void ObjectKankyo_DrawSunGraveSpark(ObjectKankyo* this2, GlobalContext* globalCt Vec3f end; f32 weight; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_object_kankyo.c", 1324); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (globalCtx->csCtx.state != 0) { if (globalCtx->csCtx.npcActions[1] != NULL && globalCtx->csCtx.npcActions[1]->action == 2 && this->requiredObjectLoaded) { @@ -856,7 +856,7 @@ void ObjectKankyo_DrawSunGraveSpark(ObjectKankyo* this2, GlobalContext* globalCt this->effects[0].alpha); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_object_kankyo.c", 1416), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_80BA5900[this->effects[0].timer])); @@ -867,14 +867,14 @@ void ObjectKankyo_DrawSunGraveSpark(ObjectKankyo* this2, GlobalContext* globalCt } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_object_kankyo.c", 1432); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void ObjectKankyo_InitBeams(ObjectKankyo* this, GlobalContext* globalCtx) { s32 objectIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_DEMO_KEKKAI); if (objectIndex < 0) { - ASSERT(0, "0", "../z_object_kankyo.c", 1449); + ASSERT(0, "0", __FILE__, __LINE__); } else { this->requiredObjBankIndex = objectIndex; } @@ -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, "../z_object_kankyo.c", 1539); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->requiredObjectLoaded) { for (i = 0; i < 6; i++) { @@ -935,7 +935,7 @@ void ObjectKankyo_DrawBeams(ObjectKankyo* this2, GlobalContext* globalCtx2) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, sBeamPrimColors[i].r, sBeamPrimColors[i].g, sBeamPrimColors[i].b, 128); gDPSetEnvColor(POLY_XLU_DISP++, sBeamEnvColors[i].r, sBeamEnvColors[i].g, sBeamEnvColors[i].b, 128); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_object_kankyo.c", 1586), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, globalCtx->state.frames * 5, @@ -946,7 +946,7 @@ void ObjectKankyo_DrawBeams(ObjectKankyo* this2, GlobalContext* globalCtx2) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_object_kankyo.c", 1607); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 9f588f190..00b341c0c 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,16 +150,16 @@ void OceffSpot_Draw(Actor* thisx, GlobalContext* globalCtx) { OceffSpot* this = (OceffSpot*)thisx; u32 scroll = globalCtx->state.frames & 0xFFFF; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_oceff_spot.c", 466); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_spot.c", 469), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, sCylinderMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 2, scroll * (-2), 32, 32, 1, 0, scroll * (-8), 32, 32)); gSPDisplayList(POLY_XLU_DISP++, sCylinderModelDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_spot.c", 485); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 b5dee5019..b2da0377d 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, "../z_oceff_storm.c", 449); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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, "../z_oceff_storm.c", 477); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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, "../z_oceff_storm.c", 486); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); @@ -164,7 +164,7 @@ void OceffStorm_Draw(Actor* thisx, GlobalContext* globalCtx) { vtxPtr[0].v.cn[3] = vtxPtr[6].v.cn[3] = vtxPtr[16].v.cn[3] = vtxPtr[25].v.cn[3] = this->vtxAlpha >> 1; vtxPtr[10].v.cn[3] = vtxPtr[22].v.cn[3] = this->vtxAlpha; - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_storm.c", 498), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, sCylinderMaterialDL); @@ -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, "../z_oceff_storm.c", 512); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); 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 2dae0149b..418e6ca4c 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, "../z_oceff_wipe.c", 346); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->timer < 32) { z = Math_SinS(this->timer << 9) * 1400; @@ -109,7 +109,7 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Translate(0.0f, 0.0f, -z, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe.c", 375), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->actor.params != OCEFF_WIPE_ZL) { @@ -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, "../z_oceff_wipe.c", 398); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } 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 4f80b4b8c..dc9bdb7f8 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, "../z_oceff_wipe2.c", 390); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); @@ -97,7 +97,7 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Translate(0.0f, 0.0f, -z, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe2.c", 400), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, 255); @@ -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, "../z_oceff_wipe2.c", 417); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); }