From f5ffe8687d1add25f9884b7f90999d3db92cf5f2 Mon Sep 17 00:00:00 2001 From: Roman971 Date: Sun, 29 Mar 2020 18:43:45 +0200 Subject: [PATCH 1/2] Decompile z_rcp.c (1 non matching left) --- asm/code_800B29D0.s | 2 +- asm/code_800B2E30.s | 2 +- .../z_actor/ActorShadow_DrawFunc_Teardrop.s | 2 +- .../code/z_actor/func_8002C124.s | 4 +- .../code/z_actor/func_8002FBAC.s | 2 +- .../code/z_eff_blure/func_80021F00.s | 4 +- .../z_eff_shield_particle/func_800245BC.s | 2 +- .../code/z_eff_spark/func_80025000.s | 2 +- .../code/z_elf_message/func_8006BBC0.s | 16 +- .../code/z_kankyo/func_80074704.s | 2 +- .../code/z_kankyo/func_80076934.s | 2 +- .../code/z_parameter/Interface_Draw.s | 16 +- .../z_parameter/Interface_DrawItemButtons.s | 4 +- .../code/z_parameter/Item_Give.s | 36 +- .../code/z_player_lib/func_80090AFC.s | 2 +- .../code/z_player_lib/func_80091A24.s | 2 +- ...{func_80094DB8.s => Gfx_BranchTexScroll.s} | 2 +- asm/non_matchings/code/z_rcp/func_80093370.s | 132 -- asm/non_matchings/code/z_rcp/func_8009352C.s | 140 -- asm/non_matchings/code/z_rcp/func_80093708.s | 15 - asm/non_matchings/code/z_rcp/func_8009373C.s | 16 - asm/non_matchings/code/z_rcp/func_80093774.s | 10 - asm/non_matchings/code/z_rcp/func_80093794.s | 13 - asm/non_matchings/code/z_rcp/func_800937C0.s | 11 - asm/non_matchings/code/z_rcp/func_800937E4.s | 11 - asm/non_matchings/code/z_rcp/func_80093808.s | 18 - asm/non_matchings/code/z_rcp/func_80093848.s | 39 - asm/non_matchings/code/z_rcp/func_800938B4.s | 39 - asm/non_matchings/code/z_rcp/func_80093920.s | 39 - asm/non_matchings/code/z_rcp/func_8009398C.s | 38 - asm/non_matchings/code/z_rcp/func_800939F8.s | 39 - asm/non_matchings/code/z_rcp/func_80093A64.s | 39 - asm/non_matchings/code/z_rcp/func_80093AD0.s | 39 - asm/non_matchings/code/z_rcp/func_80093B3C.s | 39 - asm/non_matchings/code/z_rcp/func_80093BA8.s | 39 - asm/non_matchings/code/z_rcp/func_80093C14.s | 39 - asm/non_matchings/code/z_rcp/func_80093C80.s | 51 - asm/non_matchings/code/z_rcp/func_80093D18.s | 39 - asm/non_matchings/code/z_rcp/func_80093D84.s | 39 - asm/non_matchings/code/z_rcp/func_80093DF0.s | 39 - asm/non_matchings/code/z_rcp/func_80093E5C.s | 39 - asm/non_matchings/code/z_rcp/func_80093EC8.s | 39 - asm/non_matchings/code/z_rcp/func_80093F34.s | 11 - asm/non_matchings/code/z_rcp/func_80093F58.s | 11 - asm/non_matchings/code/z_rcp/func_80093F7C.s | 35 - asm/non_matchings/code/z_rcp/func_80093FD8.s | 39 - asm/non_matchings/code/z_rcp/func_80094044.s | 39 - asm/non_matchings/code/z_rcp/func_800940B0.s | 39 - asm/non_matchings/code/z_rcp/func_8009411C.s | 11 - asm/non_matchings/code/z_rcp/func_80094140.s | 39 - asm/non_matchings/code/z_rcp/func_800941AC.s | 39 - asm/non_matchings/code/z_rcp/func_80094218.s | 39 - asm/non_matchings/code/z_rcp/func_80094284.s | 39 - asm/non_matchings/code/z_rcp/func_800942F0.s | 39 - asm/non_matchings/code/z_rcp/func_8009435C.s | 39 - asm/non_matchings/code/z_rcp/func_800943C8.s | 39 - asm/non_matchings/code/z_rcp/func_80094434.s | 39 - asm/non_matchings/code/z_rcp/func_800944A0.s | 11 - asm/non_matchings/code/z_rcp/func_800944C4.s | 35 - asm/non_matchings/code/z_rcp/func_80094520.s | 35 - asm/non_matchings/code/z_rcp/func_8009457C.s | 11 - asm/non_matchings/code/z_rcp/func_800945A0.s | 39 - asm/non_matchings/code/z_rcp/func_8009460C.s | 39 - asm/non_matchings/code/z_rcp/func_80094678.s | 39 - asm/non_matchings/code/z_rcp/func_800946E4.s | 11 - asm/non_matchings/code/z_rcp/func_80094708.s | 11 - asm/non_matchings/code/z_rcp/func_8009472C.s | 18 - asm/non_matchings/code/z_rcp/func_8009476C.s | 18 - asm/non_matchings/code/z_rcp/func_800947AC.s | 114 -- asm/non_matchings/code/z_rcp/func_80094944.s | 11 - asm/non_matchings/code/z_rcp/func_80094968.s | 18 - asm/non_matchings/code/z_rcp/func_800949A8.s | 39 - asm/non_matchings/code/z_rcp/func_80094A14.s | 39 - asm/non_matchings/code/z_rcp/func_80094A80.s | 39 - asm/non_matchings/code/z_rcp/func_80094AEC.s | 39 - asm/non_matchings/code/z_rcp/func_80094B58.s | 39 - asm/non_matchings/code/z_rcp/func_80094BC4.s | 47 - asm/non_matchings/code/z_rcp/func_80094C50.s | 39 - asm/non_matchings/code/z_rcp/func_80094CBC.s | 39 - asm/non_matchings/code/z_rcp/func_80094D28.s | 11 - asm/non_matchings/code/z_rcp/func_80094D4C.s | 39 - asm/non_matchings/code/z_rcp/func_80094E54.s | 11 - asm/non_matchings/code/z_rcp/func_800951D0.s | 32 - asm/non_matchings/code/z_rcp/func_80095248.s | 478 ----- asm/non_matchings/code/z_rcp/func_80095974.s | 84 - asm/non_matchings/code/z_sample/Sample_Draw.s | 2 +- .../code/z_scene_table/func_8009FE58.s | 6 +- .../actors/ovl_Arrow_Fire/ArrowFire_Draw.s | 2 +- .../actors/ovl_Arrow_Ice/ArrowIce_Draw.s | 2 +- .../actors/ovl_Arrow_Light/ArrowLight_Draw.s | 2 +- .../ovl_Bg_Bdan_Objects/BgBdanObjects_Draw.s | 4 +- .../actors/ovl_Bg_Bombwall/BgBombwall_Draw.s | 2 +- .../actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s | 2 +- .../actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s | 2 +- .../actors/ovl_Bg_Ddan_Kd/BgDdanKd_Draw.s | 2 +- .../ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s | 2 +- .../ovl_Bg_Gnd_Darkmeiro/func_808791BC.s | 2 +- .../ovl_Bg_Gnd_Darkmeiro/func_808791E8.s | 2 +- .../ovl_Bg_Gnd_Darkmeiro/func_80879334.s | 2 +- .../ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s | 2 +- .../BgGndSoulmeiro_Draw.s | 4 +- .../actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s | 4 +- .../actors/ovl_Bg_Haka_Gate/func_8087C85C.s | 2 +- .../actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s | 2 +- .../BgHakaMeganeBG_Draw.s | 4 +- .../actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s | 6 +- .../actors/ovl_Bg_Haka_Trap/BgHakaTrap_Draw.s | 2 +- .../actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Draw.s | 2 +- .../actors/ovl_Bg_Haka_Tubo/func_80881904.s | 2 +- .../ovl_Bg_Haka_Water/BgHakaWater_Draw.s | 2 +- .../actors/ovl_Bg_Haka_Zou/func_808835B8.s | 2 +- .../actors/ovl_Bg_Heavy_Block/func_80884DB4.s | 4 +- .../BgHidanCurtain_Draw.s | 2 +- .../ovl_Bg_Hidan_Dalm/BgHidanDalm_Draw.s | 4 +- .../ovl_Bg_Hidan_Firewall/func_80886B34.s | 2 +- .../ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s | 2 +- .../ovl_Bg_Hidan_Hrock/BgHidanHrock_Draw.s | 2 +- .../ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s | 4 +- .../actors/ovl_Bg_Hidan_Rock/func_8088BC40.s | 2 +- .../BgHidanRsekizou_Draw.s | 2 +- .../BgHidanSekizou_Draw.s | 2 +- .../ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s | 2 +- .../ovl_Bg_Ice_Objects/BgIceObjects_Draw.s | 2 +- .../ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s | 6 +- .../ovl_Bg_Ice_Shutter/BgIceShutter_Draw.s | 2 +- .../ovl_Bg_Ice_Turara/BgIceTurara_Draw.s | 2 +- .../ovl_Bg_Jya_1flift/BgJya1flift_Draw.s | 2 +- .../BgJyaBigmirror_Draw.s | 4 +- .../BgJyaBombchuiwa_Draw.s | 2 +- .../ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Draw.s | 2 +- .../actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s | 2 +- .../ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Draw.s | 2 +- .../BgJyaHaheniron_Draw.s | 2 +- .../ovl_Bg_Jya_Ironobj/BgJyaIronobj_Draw.s | 2 +- .../actors/ovl_Bg_Jya_Lift/BgJyaLift_Draw.s | 2 +- .../BgJyaZurerukabe_Draw.s | 2 +- .../BgMenkuriNisekabe_Draw.s | 4 +- .../ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s | 8 +- .../ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s | 8 +- .../ovl_Bg_Mizu_Water/BgMizuWater_Draw.s | 2 +- .../ovl_Bg_Mori_Idomizu/func_808A4A64.s | 2 +- .../ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s | 2 +- .../BgRelayObjects_Draw.s | 4 +- .../ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s | 2 +- .../BgSpot01Idomizu_Draw.s | 2 +- .../ovl_Bg_Spot01_Objects2/func_808AC4A4.s | 2 +- .../BgSpot02Objects_Draw.s | 2 +- .../ovl_Bg_Spot02_Objects/func_808AD450.s | 2 +- .../ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s | 4 +- .../ovl_Bg_Spot05_Soko/BgSpot05Soko_Draw.s | 2 +- .../BgSpot06Objects_Draw.s | 6 +- .../ovl_Bg_Spot06_Objects/func_808AF524.s | 4 +- .../ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s | 10 +- .../BgSpot08Bakudankabe_Draw.s | 2 +- .../BgSpot08Iceblock_Draw.s | 2 +- .../BgSpot11Bakudankabe_Draw.s | 2 +- .../ovl_Bg_Spot11_Oasis/func_808B2CA8.s | 2 +- .../ovl_Bg_Spot12_Saku/BgSpot12Saku_Draw.s | 2 +- .../ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s | 2 +- .../BgSpot16Doughnut_Draw.s | 2 +- .../ovl_Bg_Spot17_Funen/func_808B7478.s | 2 +- .../BgSpot18Basket_Draw.s | 2 +- .../ovl_Bg_Spot18_Obj/BgSpot18Obj_Draw.s | 2 +- .../BgSpot18Shutter_Draw.s | 2 +- .../actors/ovl_Bg_Toki_Hikari/func_808BA018.s | 4 +- .../actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s | 2 +- .../actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s | 4 +- .../ovl_Bg_Ydan_Maruta/BgYdanMaruta_Draw.s | 4 +- .../ovl_Boss_Dodongo/BossDodongo_Draw.s | 4 +- .../overlays/actors/ovl_Boss_Fd/BossFd_Draw.s | 2 +- .../actors/ovl_Boss_Fd/func_808CF898.s | 4 +- .../actors/ovl_Boss_Fd/func_808D08F8.s | 2 +- .../actors/ovl_Boss_Fd2/BossFd2_Draw.s | 4 +- .../actors/ovl_Boss_Ganon/BossGanon_Draw.s | 2 +- .../actors/ovl_Boss_Ganon/func_808DEE70.s | 2 +- .../actors/ovl_Boss_Ganon/func_808DF4F0.s | 6 +- .../actors/ovl_Boss_Ganon/func_808DFFC8.s | 2 +- .../actors/ovl_Boss_Ganon/func_808E3D84.s | 8 +- .../actors/ovl_Boss_Ganon2/BossGanon2_Draw.s | 2 +- .../actors/ovl_Boss_Ganon2/func_80903F38.s | 2 +- .../actors/ovl_Boss_Ganon2/func_80904108.s | 2 +- .../actors/ovl_Boss_Ganon2/func_80905674.s | 2 +- .../actors/ovl_Boss_Ganon2/func_809060E8.s | 2 +- .../ovl_Boss_Ganondrof/BossGanondrof_Draw.s | 4 +- .../overlays/actors/ovl_Boss_Mo/BossMo_Draw.s | 2 +- .../actors/ovl_Boss_Mo/func_80923FDC.s | 2 +- .../actors/ovl_Boss_Mo/func_80924228.s | 6 +- .../actors/ovl_Boss_Mo/func_80925480.s | 2 +- .../actors/ovl_Boss_Sst/func_8093639C.s | 4 +- .../overlays/actors/ovl_Boss_Tw/BossTw_Draw.s | 10 +- .../actors/ovl_Boss_Tw/func_80941BC0.s | 4 +- .../actors/ovl_Boss_Tw/func_80942180.s | 6 +- .../actors/ovl_Boss_Tw/func_809426F0.s | 4 +- .../actors/ovl_Boss_Tw/func_80942C70.s | 2 +- .../actors/ovl_Boss_Tw/func_80943950.s | 10 +- .../actors/ovl_Boss_Tw/func_80943F08.s | 6 +- .../actors/ovl_Boss_Tw/func_809447BC.s | 2 +- .../actors/ovl_Boss_Tw/func_80944C50.s | 4 +- .../actors/ovl_Boss_Tw/func_80945084.s | 6 +- .../actors/ovl_Boss_Tw/func_80946C7C.s | 4 +- .../actors/ovl_Boss_Tw/func_80947240.s | 4 +- .../actors/ovl_Boss_Tw/func_80948668.s | 10 +- .../overlays/actors/ovl_Boss_Va/BossVa_Draw.s | 4 +- .../actors/ovl_Boss_Va/func_80957F60.s | 2 +- .../actors/ovl_Boss_Va/func_80958150.s | 2 +- .../actors/ovl_Boss_Va/func_80958FFC.s | 2 +- .../actors/ovl_Demo_6K/func_80967FFC.s | 2 +- .../actors/ovl_Demo_6K/func_80968298.s | 2 +- .../actors/ovl_Demo_6K/func_80968B70.s | 2 +- .../actors/ovl_Demo_Effect/func_809746F8.s | 8 +- .../actors/ovl_Demo_Effect/func_80974B80.s | 2 +- .../actors/ovl_Demo_Effect/func_80974EB4.s | 2 +- .../actors/ovl_Demo_Effect/func_80975074.s | 4 +- .../actors/ovl_Demo_Effect/func_8097587C.s | 2 +- .../actors/ovl_Demo_Effect/func_80975A3C.s | 2 +- .../actors/ovl_Demo_Effect/func_80975BD4.s | 6 +- .../actors/ovl_Demo_Effect/func_80976254.s | 2 +- .../actors/ovl_Demo_Effect/func_80976404.s | 2 +- .../actors/ovl_Demo_Ext/func_80977950.s | 2 +- .../actors/ovl_Demo_Gt/func_8097F508.s | 6 +- .../actors/ovl_Demo_Gt/func_8097FF9C.s | 2 +- .../actors/ovl_Demo_Kankyo/func_80989D24.s | 2 +- .../actors/ovl_Demo_Kankyo/func_8098A9A4.s | 2 +- .../actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s | 2 +- .../actors/ovl_Demo_Kekkai/func_8098D9C0.s | 6 +- .../actors/ovl_Demo_Shd/DemoShd_Draw.s | 4 +- .../actors/ovl_Demo_Tre_Lgt/func_80993B2C.s | 2 +- .../actors/ovl_Door_Killer/func_80995F1C.s | 2 +- .../actors/ovl_Door_Warp1/func_8099B5EC.s | 4 +- .../actors/ovl_Efc_Erupc/EfcErupc_Draw.s | 6 +- .../overlays/actors/ovl_En_Ba/EnBa_Draw.s | 4 +- .../overlays/actors/ovl_En_Bb/EnBb_Draw.s | 2 +- .../actors/ovl_En_Blkobj/EnBlkobj_Draw.s | 2 +- .../overlays/actors/ovl_En_Bw/EnBw_Draw.s | 2 +- .../overlays/actors/ovl_En_Bw/func_809D0D18.s | 2 +- .../overlays/actors/ovl_En_Bx/EnBx_Draw.s | 2 +- .../actors/ovl_En_Clear_Tag/func_809D53CC.s | 4 +- .../actors/ovl_En_Dekunuts/EnDekunuts_Draw.s | 2 +- .../overlays/actors/ovl_En_Dh/EnDh_Draw.s | 2 +- .../actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s | 2 +- .../overlays/actors/ovl_En_Fd/EnFd_Draw.s | 2 +- .../overlays/actors/ovl_En_Fd/func_80A0D730.s | 2 +- .../actors/ovl_En_Fd_Fire/EnFdFire_Draw.s | 2 +- .../actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s | 2 +- .../overlays/actors/ovl_En_Fw/func_80A1F814.s | 2 +- .../overlays/actors/ovl_En_Fz/EnFz_Draw.s | 2 +- .../overlays/actors/ovl_En_Fz/func_80A218A8.s | 2 +- .../overlays/actors/ovl_En_Gb/func_80A30350.s | 2 +- .../overlays/actors/ovl_En_Go/func_80A417B4.s | 2 +- .../actors/ovl_En_Go2/func_80A42EE0.s | 2 +- .../actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s | 2 +- .../overlays/actors/ovl_En_Gs/EnGs_Draw.s | 2 +- .../actors/ovl_En_Hintnuts/EnHintnuts_Draw.s | 2 +- .../overlays/actors/ovl_En_Holl/EnHoll_Draw.s | 2 +- .../actors/ovl_En_Honotrap/func_80A5AD28.s | 2 +- .../actors/ovl_En_Ice_Hono/EnIceHono_Draw.s | 2 +- .../actors/ovl_En_Ishi/func_80A7F8A0.s | 2 +- .../actors/ovl_En_Kusa/func_80A9C164.s | 4 +- .../actors/ovl_En_Light/EnLight_Draw.s | 4 +- .../actors/ovl_En_M_Thunder/EnMThunder_Draw.s | 4 +- .../actors/ovl_En_Po_Desert/EnPoDesert_Draw.s | 4 +- .../actors/ovl_En_Po_Field/EnPoField_Draw.s | 6 +- .../actors/ovl_En_Po_Field/func_80AD5E8C.s | 2 +- .../actors/ovl_En_Po_Field/func_80AD6C4C.s | 4 +- .../ovl_En_Po_Sisters/EnPoSisters_Draw.s | 2 +- .../actors/ovl_En_Poh/func_80AE1148.s | 12 +- .../actors/ovl_En_Poh/func_80AE1654.s | 2 +- .../overlays/actors/ovl_En_Rr/EnRr_Draw.s | 2 +- .../actors/ovl_En_Siofuki/EnSiofuki_Draw.s | 2 +- .../actors/ovl_En_Stream/EnStream_Draw.s | 2 +- .../overlays/actors/ovl_En_Sw/func_80B0EDB8.s | 2 +- .../overlays/actors/ovl_En_Trap/EnTrap_Draw.s | 2 +- .../overlays/actors/ovl_En_Vali/EnVali_Draw.s | 2 +- .../actors/ovl_En_Viewer/func_80B2C8AC.s | 2 +- .../actors/ovl_En_Wood02/EnWood02_Draw.s | 4 +- .../overlays/actors/ovl_En_fHG/EnfHG_Draw.s | 4 +- .../actors/ovl_Fishing/func_80B6B674.s | 4 +- .../actors/ovl_Fishing/func_80B6C134.s | 2 +- .../actors/ovl_Fishing/func_80B6D688.s | 2 +- .../actors/ovl_Magic_Dark/func_80B87A18.s | 2 +- .../actors/ovl_Magic_Fire/MagicFire_Draw.s | 2 +- .../actors/ovl_Magic_Wind/MagicWind_Draw.s | 2 +- .../actors/ovl_Magic_Wind/func_80B8B5F4.s | 4 +- .../actors/ovl_Obj_Bean/ObjBean_Draw.s | 4 +- .../actors/ovl_Obj_Bean/func_80B90C7C.s | 2 +- .../actors/ovl_Obj_Bean/func_80B90D04.s | 2 +- .../actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s | 2 +- .../actors/ovl_Obj_Hana/ObjHana_Draw.s | 2 +- .../actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s | 2 +- .../actors/ovl_Obj_Kibako/ObjKibako_Draw.s | 2 +- .../actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s | 2 +- .../actors/ovl_Obj_Lift/ObjLift_Draw.s | 2 +- .../actors/ovl_Obj_Switch/func_80B9E748.s | 2 +- .../actors/ovl_Obj_Switch/func_80B9E788.s | 2 +- .../actors/ovl_Obj_Switch/func_80B9E904.s | 2 +- .../ovl_Obj_Syokudai/ObjSyokudai_Draw.s | 2 +- .../actors/ovl_Obj_Tsubo/func_80BA1B0C.s | 2 +- .../actors/ovl_Object_Kankyo/func_80BA3C94.s | 2 +- .../actors/ovl_Object_Kankyo/func_80BA54AC.s | 2 +- .../actors/ovl_Oceff_Spot/OceffSpot_Draw.s | 2 +- .../actors/ovl_Oceff_Storm/OceffStorm_Draw.s | 2 +- .../actors/ovl_Oceff_Storm/func_80BA7450.s | 2 +- .../actors/ovl_Oceff_Wipe/OceffWipe_Draw.s | 2 +- .../actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s | 2 +- .../actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s | 2 +- .../actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s | 2 +- .../actors/ovl_player_actor/func_8084A0E8.s | 2 +- .../actors/ovl_player_actor/func_8084A5C4.s | 4 +- .../ovl_Effect_Ss_Dust/func_809A2480.s | 2 +- .../ovl_Effect_Ss_En_Fire/func_809A2D28.s | 2 +- .../ovl_Effect_Ss_En_Ice/func_809A35DC.s | 2 +- .../ovl_Effect_Ss_Fcircle/func_809A41DC.s | 2 +- .../ovl_Effect_Ss_Fire_Tail/func_809A5858.s | 2 +- .../ovl_Effect_Ss_G_Magma2/func_809A6568.s | 4 +- .../ovl_Effect_Ss_Ice_Piece/func_809A8850.s | 2 +- .../ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s | 2 +- .../ovl_Effect_Ss_K_Fire/func_809A9280.s | 2 +- data/z_rcp.data.s | 173 -- include/functions.h | 69 +- include/ultra64/gbi.h | 4 +- include/variables.h | 51 +- include/z64.h | 2 + spec | 1 - src/code/z_actor.c | 12 +- src/code/z_cheap_proc.c | 4 +- src/code/z_draw.c | 78 +- src/code/z_eff_blure.c | 2 +- src/code/z_parameter.c | 62 +- src/code/z_play.c | 4 +- src/code/z_prenmi.c | 5 +- src/code/z_rcp.c | 1687 +++++++++++++++-- src/code/z_room.c | 2 +- src/code/z_sample.c | 2 +- src/code/z_scene_table.c | 387 ++-- .../ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c | 2 +- .../ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c | 8 +- .../ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c | 4 +- .../ovl_Bg_Haka_Megane/z_bg_haka_megane.c | 6 +- .../ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c | 2 +- .../ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c | 2 +- .../z_bg_jya_amishutter.c | 2 +- .../ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c | 2 +- .../z_bg_menkuri_kaiten.c | 2 +- .../z_bg_menkuri_nisekabe.c | 4 +- .../ovl_Bg_Spot00_Break/z_bg_spot00_break.c | 4 +- .../ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c | 2 +- .../ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c | 2 +- .../ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c | 2 +- .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c | 2 +- .../actors/ovl_Bg_Umajump/z_bg_umajump.c | 2 +- src/overlays/actors/ovl_En_Dog/z_en_dog.c | 3 +- .../actors/ovl_En_Lightbox/z_en_lightbox.c | 2 +- .../actors/ovl_En_Pu_box/z_en_pu_box.c | 2 +- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 2 +- .../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 2 +- src/overlays/actors/ovl_En_Vase/z_en_vase.c | 2 +- .../actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c | 2 +- .../actors/ovl_Obj_Elevator/z_obj_elevator.c | 2 +- tools/overlayhelpers/batchdisasm/symbols.txt | 4 +- 359 files changed, 2285 insertions(+), 3986 deletions(-) rename asm/non_matchings/code/z_rcp/{func_80094DB8.s => Gfx_BranchTexScroll.s} (98%) delete mode 100644 asm/non_matchings/code/z_rcp/func_80093370.s delete mode 100644 asm/non_matchings/code/z_rcp/func_8009352C.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093708.s delete mode 100644 asm/non_matchings/code/z_rcp/func_8009373C.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093774.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093794.s delete mode 100644 asm/non_matchings/code/z_rcp/func_800937C0.s delete mode 100644 asm/non_matchings/code/z_rcp/func_800937E4.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093808.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093848.s delete mode 100644 asm/non_matchings/code/z_rcp/func_800938B4.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093920.s delete mode 100644 asm/non_matchings/code/z_rcp/func_8009398C.s delete mode 100644 asm/non_matchings/code/z_rcp/func_800939F8.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093A64.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093AD0.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093B3C.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093BA8.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093C14.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093C80.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093D18.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093D84.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093DF0.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093E5C.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093EC8.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093F34.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093F58.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093F7C.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80093FD8.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094044.s delete mode 100644 asm/non_matchings/code/z_rcp/func_800940B0.s delete mode 100644 asm/non_matchings/code/z_rcp/func_8009411C.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094140.s delete mode 100644 asm/non_matchings/code/z_rcp/func_800941AC.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094218.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094284.s delete mode 100644 asm/non_matchings/code/z_rcp/func_800942F0.s delete mode 100644 asm/non_matchings/code/z_rcp/func_8009435C.s delete mode 100644 asm/non_matchings/code/z_rcp/func_800943C8.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094434.s delete mode 100644 asm/non_matchings/code/z_rcp/func_800944A0.s delete mode 100644 asm/non_matchings/code/z_rcp/func_800944C4.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094520.s delete mode 100644 asm/non_matchings/code/z_rcp/func_8009457C.s delete mode 100644 asm/non_matchings/code/z_rcp/func_800945A0.s delete mode 100644 asm/non_matchings/code/z_rcp/func_8009460C.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094678.s delete mode 100644 asm/non_matchings/code/z_rcp/func_800946E4.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094708.s delete mode 100644 asm/non_matchings/code/z_rcp/func_8009472C.s delete mode 100644 asm/non_matchings/code/z_rcp/func_8009476C.s delete mode 100644 asm/non_matchings/code/z_rcp/func_800947AC.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094944.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094968.s delete mode 100644 asm/non_matchings/code/z_rcp/func_800949A8.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094A14.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094A80.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094AEC.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094B58.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094BC4.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094C50.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094CBC.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094D28.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094D4C.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80094E54.s delete mode 100644 asm/non_matchings/code/z_rcp/func_800951D0.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80095248.s delete mode 100644 asm/non_matchings/code/z_rcp/func_80095974.s delete mode 100644 data/z_rcp.data.s diff --git a/asm/code_800B29D0.s b/asm/code_800B29D0.s index 242f8b07db..e060dbc26a 100644 --- a/asm/code_800B29D0.s +++ b/asm/code_800B29D0.s @@ -191,7 +191,7 @@ glabel func_800B2B98 /* B29DF8 800B2C58 9606000E */ lhu $a2, 0xe($s0) /* B29DFC 800B2C5C 9605000C */ lhu $a1, 0xc($s0) /* B29E00 800B2C60 AFA00010 */ sw $zero, 0x10($sp) -/* B29E04 800B2C64 0C02536E */ jal func_80094DB8 +/* B29E04 800B2C64 0C02536E */ jal Gfx_BranchTexScroll /* B29E08 800B2C68 00003825 */ move $a3, $zero /* B29E0C 800B2C6C 8FAB007C */ lw $t3, 0x7c($sp) /* B29E10 800B2C70 3C0DDB06 */ lui $t5, (0xDB060020 >> 16) # lui $t5, 0xdb06 diff --git a/asm/code_800B2E30.s b/asm/code_800B2E30.s index 48fb942bfe..450bc3ebb8 100644 --- a/asm/code_800B2E30.s +++ b/asm/code_800B2E30.s @@ -299,7 +299,7 @@ glabel func_800B31D0 /* B2A3D0 800B3230 AD4C0000 */ sw $t4, ($t2) /* B2A3D4 800B3234 8E06000C */ lw $a2, 0xc($s0) /* B2A3D8 800B3238 8E050008 */ lw $a1, 8($s0) -/* B2A3DC 800B323C 0C02536E */ jal func_80094DB8 +/* B2A3DC 800B323C 0C02536E */ jal Gfx_BranchTexScroll /* B2A3E0 800B3240 AFAD0010 */ sw $t5, 0x10($sp) /* B2A3E4 800B3244 8FAE007C */ lw $t6, 0x7c($sp) /* B2A3E8 800B3248 3C18DB06 */ lui $t8, (0xDB060024 >> 16) # lui $t8, 0xdb06 diff --git a/asm/non_matchings/code/z_actor/ActorShadow_DrawFunc_Teardrop.s b/asm/non_matchings/code/z_actor/ActorShadow_DrawFunc_Teardrop.s index 034a5e4c36..6f22eb5b34 100644 --- a/asm/non_matchings/code/z_actor/ActorShadow_DrawFunc_Teardrop.s +++ b/asm/non_matchings/code/z_actor/ActorShadow_DrawFunc_Teardrop.s @@ -144,7 +144,7 @@ glabel ActorShadow_DrawFunc_Teardrop /* AA2C28 8002BA88 0C031AB1 */ jal func_800C6AC4 /* AA2C2C 8002BA8C 00A08025 */ move $s0, $a1 /* AA2C30 8002BA90 8E0402C0 */ lw $a0, 0x2c0($s0) -/* AA2C34 8002BA94 0C024DDD */ jal func_80093774 +/* AA2C34 8002BA94 0C024DDD */ jal Gfx_CallSetupDL /* AA2C38 8002BA98 2405002C */ li $a1, 44 /* AA2C3C 8002BA9C 3C014248 */ li $at, 0x42480000 # 0.000000 /* AA2C40 8002BAA0 4481E000 */ mtc1 $at, $f28 diff --git a/asm/non_matchings/code/z_actor/func_8002C124.s b/asm/non_matchings/code/z_actor/func_8002C124.s index 11197ef43f..6d92e637eb 100644 --- a/asm/non_matchings/code/z_actor/func_8002C124.s +++ b/asm/non_matchings/code/z_actor/func_8002C124.s @@ -195,7 +195,7 @@ glabel func_8002C124 /* AA3514 8002C374 52280089 */ beql $s1, $t0, .L8002C59C /* AA3518 8002C378 8FA300F0 */ lw $v1, 0xf0($sp) .L8002C37C: -/* AA351C 8002C37C 0C024DDD */ jal func_80093774 +/* AA351C 8002C37C 0C024DDD */ jal Gfx_CallSetupDL /* AA3520 8002C380 8E6402B0 */ lw $a0, 0x2b0($s3) /* AA3524 8002C384 AE6202B0 */ sw $v0, 0x2b0($s3) /* AA3528 8002C388 8FAA00B8 */ lw $t2, 0xb8($sp) @@ -355,7 +355,7 @@ glabel func_8002C124 /* AA3770 8002C5D0 8E6402D0 */ lw $a0, 0x2d0($s3) /* AA3774 8002C5D4 24050007 */ li $a1, 7 /* AA3778 8002C5D8 0009C8C0 */ sll $t9, $t1, 3 -/* AA377C 8002C5DC 0C024DDD */ jal func_80093774 +/* AA377C 8002C5DC 0C024DDD */ jal Gfx_CallSetupDL /* AA3780 8002C5E0 032A8021 */ addu $s0, $t9, $t2 /* AA3784 8002C5E4 AE6202D0 */ sw $v0, 0x2d0($s3) /* AA3788 8002C5E8 C6300054 */ lwc1 $f16, 0x54($s1) diff --git a/asm/non_matchings/code/z_actor/func_8002FBAC.s b/asm/non_matchings/code/z_actor/func_8002FBAC.s index 58645043aa..4f7f0fb034 100644 --- a/asm/non_matchings/code/z_actor/func_8002FBAC.s +++ b/asm/non_matchings/code/z_actor/func_8002FBAC.s @@ -432,7 +432,7 @@ glabel func_8002FBAC /* AA72EC 8003014C 572A00A3 */ bnel $t9, $t2, .L800303DC /* AA72F0 80030150 C50213A4 */ lwc1 $f2, 0x13a4($t0) /* AA72F4 80030154 8D6402D0 */ lw $a0, 0x2d0($t3) -/* AA72F8 80030158 0C024DDD */ jal func_80093774 +/* AA72F8 80030158 0C024DDD */ jal Gfx_CallSetupDL /* AA72FC 8003015C AFA20034 */ sw $v0, 0x34($sp) /* AA7300 80030160 8FAD00EC */ lw $t5, 0xec($sp) /* AA7304 80030164 3C038016 */ lui $v1, %hi(gSaveContext) # $v1, 0x8016 diff --git a/asm/non_matchings/code/z_eff_blure/func_80021F00.s b/asm/non_matchings/code/z_eff_blure/func_80021F00.s index f2296ce4bf..e6ab79b812 100644 --- a/asm/non_matchings/code/z_eff_blure/func_80021F00.s +++ b/asm/non_matchings/code/z_eff_blure/func_80021F00.s @@ -250,7 +250,7 @@ glabel func_80021F00 /* A993C4 80022224 24070500 */ li $a3, 1280 /* A993C8 80022228 8FAE0030 */ lw $t6, 0x30($sp) /* A993CC 8002222C 24050026 */ li $a1, 38 -/* A993D0 80022230 0C024DDD */ jal func_80093774 +/* A993D0 80022230 0C024DDD */ jal Gfx_CallSetupDL /* A993D4 80022234 8DC402D0 */ lw $a0, 0x2d0($t6) /* A993D8 80022238 8FA50030 */ lw $a1, 0x30($sp) /* A993DC 8002223C 3C068013 */ lui $a2, %hi(D_80135308) # $a2, 0x8013 @@ -283,7 +283,7 @@ glabel func_80021F00 /* A99444 800222A4 AE0E02D0 */ sw $t6, 0x2d0($s0) /* A99448 800222A8 AC400004 */ sw $zero, 4($v0) /* A9944C 800222AC AC470000 */ sw $a3, ($v0) -/* A99450 800222B0 0C024DDD */ jal func_80093774 +/* A99450 800222B0 0C024DDD */ jal Gfx_CallSetupDL /* A99454 800222B4 8E0402D0 */ lw $a0, 0x2d0($s0) /* A99458 800222B8 8FA60084 */ lw $a2, 0x84($sp) /* A9945C 800222BC AE0202D0 */ sw $v0, 0x2d0($s0) diff --git a/asm/non_matchings/code/z_eff_shield_particle/func_800245BC.s b/asm/non_matchings/code/z_eff_shield_particle/func_800245BC.s index 042d7346ff..7bc9434b55 100644 --- a/asm/non_matchings/code/z_eff_shield_particle/func_800245BC.s +++ b/asm/non_matchings/code/z_eff_shield_particle/func_800245BC.s @@ -37,7 +37,7 @@ glabel func_800245BC /* A9B7B0 80024610 24070110 */ li $a3, 272 /* A9B7B4 80024614 12A00124 */ beqz $s5, .L80024AA8 /* A9B7B8 80024618 24050026 */ li $a1, 38 -/* A9B7BC 8002461C 0C024DDD */ jal func_80093774 +/* A9B7BC 8002461C 0C024DDD */ jal Gfx_CallSetupDL /* A9B7C0 80024620 8E8402D0 */ lw $a0, 0x2d0($s4) /* A9B7C4 80024624 00402025 */ move $a0, $v0 /* A9B7C8 80024628 AE8202D0 */ sw $v0, 0x2d0($s4) diff --git a/asm/non_matchings/code/z_eff_spark/func_80025000.s b/asm/non_matchings/code/z_eff_spark/func_80025000.s index a85b3b608c..044a876521 100644 --- a/asm/non_matchings/code/z_eff_spark/func_80025000.s +++ b/asm/non_matchings/code/z_eff_spark/func_80025000.s @@ -46,7 +46,7 @@ glabel func_80025000 /* A9C214 80025074 AC8F0000 */ sw $t7, ($a0) /* A9C218 80025078 AC980004 */ sw $t8, 4($a0) /* A9C21C 8002507C 8EC402D0 */ lw $a0, 0x2d0($s6) -/* A9C220 80025080 0C024DDD */ jal func_80093774 +/* A9C220 80025080 0C024DDD */ jal Gfx_CallSetupDL /* A9C224 80025084 24050026 */ li $a1, 38 /* A9C228 80025088 00402025 */ move $a0, $v0 /* A9C22C 8002508C AEC202D0 */ sw $v0, 0x2d0($s6) diff --git a/asm/non_matchings/code/z_elf_message/func_8006BBC0.s b/asm/non_matchings/code/z_elf_message/func_8006BBC0.s index 56f71e7c88..7759b7b1e3 100644 --- a/asm/non_matchings/code/z_elf_message/func_8006BBC0.s +++ b/asm/non_matchings/code/z_elf_message/func_8006BBC0.s @@ -133,12 +133,12 @@ glabel func_8006BBC0 /* AE2DF0 8006BC50 908E0001 */ lbu $t6, 1($a0) /* AE2DF4 8006BC54 24E7E660 */ addiu $a3, %lo(gSaveContext) # addiu $a3, $a3, -0x19a0 /* AE2DF8 8006BC58 94E91402 */ lhu $t1, 0x1402($a3) -/* AE2DFC 8006BC5C 3C088012 */ lui $t0, %hi(D_80126F50) +/* AE2DFC 8006BC5C 3C088012 */ lui $t0, %hi(gBitFlags-0x1d0) /* AE2E00 8006BC60 000EC080 */ sll $t8, $t6, 2 /* AE2E04 8006BC64 01184021 */ addu $t0, $t0, $t8 /* AE2E08 8006BC68 00E95021 */ addu $t2, $a3, $t1 /* AE2E0C 8006BC6C 914B00A8 */ lbu $t3, 0xa8($t2) -/* AE2E10 8006BC70 8D086F50 */ lw $t0, %lo(D_80126F50)($t0) +/* AE2E10 8006BC70 8D086F50 */ lw $t0, %lo(gBitFlags-0x1d0)($t0) /* AE2E14 8006BC74 30B90001 */ andi $t9, $a1, 1 /* AE2E18 8006BC78 3B2F0001 */ xori $t7, $t9, 1 /* AE2E1C 8006BC7C 010B6024 */ and $t4, $t0, $t3 @@ -196,13 +196,13 @@ glabel L8006BCFC /* AE2EE0 8006BD40 2C420001 */ sltiu $v0, $v0, 1 glabel L8006BD44 /* AE2EE4 8006BD44 908F0003 */ lbu $t7, 3($a0) -/* AE2EE8 8006BD48 3C188012 */ lui $t8, %hi(D_80127010) +/* AE2EE8 8006BD48 3C188012 */ lui $t8, %hi(gBitFlags-0x110) /* AE2EEC 8006BD4C 3C078016 */ lui $a3, %hi(gSaveContext) # $a3, 0x8016 /* AE2EF0 8006BD50 000F6880 */ sll $t5, $t7, 2 /* AE2EF4 8006BD54 030DC021 */ addu $t8, $t8, $t5 /* AE2EF8 8006BD58 3C098012 */ lui $t1, %hi(gEquipShifts+3) # $t1, 0x8012 /* AE2EFC 8006BD5C 912971F3 */ lbu $t1, %lo(gEquipShifts+3)($t1) -/* AE2F00 8006BD60 8F187010 */ lw $t8, %lo(D_80127010)($t8) +/* AE2F00 8006BD60 8F187010 */ lw $t8, %lo(gBitFlags-0x110)($t8) /* AE2F04 8006BD64 24E7E660 */ addiu $a3, %lo(gSaveContext) # addiu $a3, $a3, -0x19a0 /* AE2F08 8006BD68 94E8009C */ lhu $t0, 0x9c($a3) /* AE2F0C 8006BD6C 30AB0001 */ andi $t3, $a1, 1 @@ -217,11 +217,11 @@ glabel L8006BD44 glabel L8006BD90 /* AE2F30 8006BD90 908F0003 */ lbu $t7, 3($a0) /* AE2F34 8006BD94 3C078016 */ lui $a3, %hi(gSaveContext) # $a3, 0x8016 -/* AE2F38 8006BD98 3C188012 */ lui $t8, %hi(D_80126FD0) +/* AE2F38 8006BD98 3C188012 */ lui $t8, %hi(gBitFlags-0x150) /* AE2F3C 8006BD9C 000F6880 */ sll $t5, $t7, 2 /* AE2F40 8006BDA0 24E7E660 */ addiu $a3, %lo(gSaveContext) # addiu $a3, $a3, -0x19a0 /* AE2F44 8006BDA4 030DC021 */ addu $t8, $t8, $t5 -/* AE2F48 8006BDA8 8F186FD0 */ lw $t8, %lo(D_80126FD0)($t8) +/* AE2F48 8006BDA8 8F186FD0 */ lw $t8, %lo(gBitFlags-0x150)($t8) /* AE2F4C 8006BDAC 8CE900A4 */ lw $t1, 0xa4($a3) /* AE2F50 8006BDB0 30AE0001 */ andi $t6, $a1, 1 /* AE2F54 8006BDB4 39CB0001 */ xori $t3, $t6, 1 @@ -234,11 +234,11 @@ glabel L8006BD90 glabel L8006BDD0 /* AE2F70 8006BDD0 908C0003 */ lbu $t4, 3($a0) /* AE2F74 8006BDD4 3C078016 */ lui $a3, %hi(gSaveContext) # $a3, 0x8016 -/* AE2F78 8006BDD8 3C0F8012 */ lui $t7, %hi(D_80126F88) +/* AE2F78 8006BDD8 3C0F8012 */ lui $t7, %hi(gBitFlags-0x198) /* AE2F7C 8006BDDC 000CC880 */ sll $t9, $t4, 2 /* AE2F80 8006BDE0 24E7E660 */ addiu $a3, %lo(gSaveContext) # addiu $a3, $a3, -0x19a0 /* AE2F84 8006BDE4 01F97821 */ addu $t7, $t7, $t9 -/* AE2F88 8006BDE8 8DEF6F88 */ lw $t7, %lo(D_80126F88)($t7) +/* AE2F88 8006BDE8 8DEF6F88 */ lw $t7, %lo(gBitFlags-0x198)($t7) /* AE2F8C 8006BDEC 8CED00A4 */ lw $t5, 0xa4($a3) /* AE2F90 8006BDF0 30AA0001 */ andi $t2, $a1, 1 /* AE2F94 8006BDF4 394E0001 */ xori $t6, $t2, 1 diff --git a/asm/non_matchings/code/z_kankyo/func_80074704.s b/asm/non_matchings/code/z_kankyo/func_80074704.s index fad4e823c3..db4ca97035 100644 --- a/asm/non_matchings/code/z_kankyo/func_80074704.s +++ b/asm/non_matchings/code/z_kankyo/func_80074704.s @@ -108,7 +108,7 @@ glabel func_80074704 /* AEBA4C 800748AC AE2802D0 */ sw $t0, 0x2d0($s1) /* AEBA50 800748B0 AC4A0004 */ sw $t2, 4($v0) /* AEBA54 800748B4 AC490000 */ sw $t1, ($v0) -/* AEBA58 800748B8 0C024DDD */ jal func_80093774 +/* AEBA58 800748B8 0C024DDD */ jal Gfx_CallSetupDL /* AEBA5C 800748BC 8E2402D0 */ lw $a0, 0x2d0($s1) /* AEBA60 800748C0 AE2202D0 */ sw $v0, 0x2d0($s1) /* AEBA64 800748C4 92830B13 */ lbu $v1, 0xb13($s4) diff --git a/asm/non_matchings/code/z_kankyo/func_80076934.s b/asm/non_matchings/code/z_kankyo/func_80076934.s index 16584a720a..e63fc83245 100644 --- a/asm/non_matchings/code/z_kankyo/func_80076934.s +++ b/asm/non_matchings/code/z_kankyo/func_80076934.s @@ -681,7 +681,7 @@ glabel func_80076934 /* AEE498 800772F8 AFA3008C */ sw $v1, 0x8c($sp) /* AEE49C 800772FC E7AE0098 */ swc1 $f14, 0x98($sp) /* AEE4A0 80077300 AFA20068 */ sw $v0, 0x68($sp) -/* AEE4A4 80077304 0C0253D0 */ jal Draw_TwoTexScroll +/* AEE4A4 80077304 0C0253D0 */ jal Gfx_TwoTexScroll /* AEE4A8 80077308 30C60FFF */ andi $a2, $a2, 0xfff /* AEE4AC 8007730C 8FA80068 */ lw $t0, 0x68($sp) /* AEE4B0 80077310 8FA3008C */ lw $v1, 0x8c($sp) diff --git a/asm/non_matchings/code/z_parameter/Interface_Draw.s b/asm/non_matchings/code/z_parameter/Interface_Draw.s index dd4c1be0a3..8f1ca439b0 100644 --- a/asm/non_matchings/code/z_parameter/Interface_Draw.s +++ b/asm/non_matchings/code/z_parameter/Interface_Draw.s @@ -179,7 +179,7 @@ glabel Interface_Draw /* B01D10 8008AB70 AFAA0020 */ sw $t2, 0x20($sp) /* B01D14 8008AB74 AFAB0024 */ sw $t3, 0x24($sp) /* B01D18 8008AB78 24070010 */ li $a3, 16 -/* B01D1C 8008AB7C 0C0210A6 */ jal Draw_TextureIA8 +/* B01D1C 8008AB7C 0C0210A6 */ jal Gfx_TextureIA8 /* B01D20 8008AB80 24060010 */ li $a2, 16 /* B01D24 8008AB84 AE8202B0 */ sw $v0, 0x2b0($s4) /* B01D28 8008AB88 86EC00A4 */ lh $t4, 0xa4($s7) @@ -239,7 +239,7 @@ glabel L8008ABB0 /* B01DFC 8008AC5C AFAE001C */ sw $t6, 0x1c($sp) /* B01E00 8008AC60 AFAC0014 */ sw $t4, 0x14($sp) /* B01E04 8008AC64 AFAB0010 */ sw $t3, 0x10($sp) -/* B01E08 8008AC68 0C0210A6 */ jal Draw_TextureIA8 +/* B01E08 8008AC68 0C0210A6 */ jal Gfx_TextureIA8 /* B01E0C 8008AC6C 24070010 */ li $a3, 16 /* B01E10 8008AC70 AE8202B0 */ sw $v0, 0x2b0($s4) /* B01E14 8008AC74 24590008 */ addiu $t9, $v0, 8 @@ -305,7 +305,7 @@ glabel L8008ABB0 /* B01EFC 8008AD5C AFAD0018 */ sw $t5, 0x18($sp) /* B01F00 8008AD60 AFAC0014 */ sw $t4, 0x14($sp) /* B01F04 8008AD64 AFAB0010 */ sw $t3, 0x10($sp) -/* B01F08 8008AD68 0C02112F */ jal Draw_TextureI8 +/* B01F08 8008AD68 0C02112F */ jal Gfx_TextureI8 /* B01F0C 8008AD6C 032A2821 */ addu $a1, $t9, $t2 /* B01F10 8008AD70 AE8202B0 */ sw $v0, 0x2b0($s4) /* B01F14 8008AD74 86C30238 */ lh $v1, 0x238($s6) @@ -328,7 +328,7 @@ glabel L8008ABB0 /* B01F54 8008ADB4 032A2821 */ addu $a1, $t9, $t2 /* B01F58 8008ADB8 AFB20010 */ sw $s2, 0x10($sp) /* B01F5C 8008ADBC 24060008 */ li $a2, 8 -/* B01F60 8008ADC0 0C02112F */ jal Draw_TextureI8 +/* B01F60 8008ADC0 0C02112F */ jal Gfx_TextureI8 /* B01F64 8008ADC4 24070010 */ li $a3, 16 /* B01F68 8008ADC8 AE8202B0 */ sw $v0, 0x2b0($s4) .L8008ADCC: @@ -482,7 +482,7 @@ glabel L8008ABB0 /* B02188 8008AFE8 AFB90024 */ sw $t9, 0x24($sp) /* B0218C 8008AFEC AFB20010 */ sw $s2, 0x10($sp) /* B02190 8008AFF0 24060008 */ li $a2, 8 -/* B02194 8008AFF4 0C02112F */ jal Draw_TextureI8 +/* B02194 8008AFF4 0C02112F */ jal Gfx_TextureI8 /* B02198 8008AFF8 24070010 */ li $a3, 16 /* B0219C 8008AFFC 26730001 */ addiu $s3, $s3, 1 /* B021A0 8008B000 00139C00 */ sll $s3, $s3, 0x10 @@ -1743,7 +1743,7 @@ glabel L8008ABB0 /* B034B4 8008C314 00021040 */ sll $v0, $v0, 1 /* B034B8 8008C318 3042FFFF */ andi $v0, $v0, 0xffff /* B034BC 8008C31C AFA20020 */ sw $v0, 0x20($sp) -/* B034C0 8008C320 0C02112F */ jal Draw_TextureI8 +/* B034C0 8008C320 0C02112F */ jal Gfx_TextureI8 /* B034C4 8008C324 AFA20024 */ sw $v0, 0x24($sp) /* B034C8 8008C328 26310009 */ addiu $s1, $s1, 9 /* B034CC 8008C32C 26100001 */ addiu $s0, $s0, 1 @@ -2897,7 +2897,7 @@ glabel L8008D1EC /* B044F8 8008D358 AFAC0020 */ sw $t4, 0x20($sp) /* B044FC 8008D35C AFAB001C */ sw $t3, 0x1c($sp) /* B04500 8008D360 24070010 */ li $a3, 16 -/* B04504 8008D364 0C0210A6 */ jal Draw_TextureIA8 +/* B04504 8008D364 0C0210A6 */ jal Gfx_TextureIA8 /* B04508 8008D368 AFB10010 */ sw $s1, 0x10($sp) /* B0450C 8008D36C 8FA90064 */ lw $t1, 0x64($sp) /* B04510 8008D370 AE8202B0 */ sw $v0, 0x2b0($s4) @@ -3000,7 +3000,7 @@ glabel L8008D1EC /* B04684 8008D4E4 AFA20024 */ sw $v0, 0x24($sp) /* B04688 8008D4E8 AFA90064 */ sw $t1, 0x64($sp) /* B0468C 8008D4EC 24060008 */ li $a2, 8 -/* B04690 8008D4F0 0C02112F */ jal Draw_TextureI8 +/* B04690 8008D4F0 0C02112F */ jal Gfx_TextureI8 /* B04694 8008D4F4 24070010 */ li $a3, 16 /* B04698 8008D4F8 26730001 */ addiu $s3, $s3, 1 /* B0469C 8008D4FC 00139C00 */ sll $s3, $s3, 0x10 diff --git a/asm/non_matchings/code/z_parameter/Interface_DrawItemButtons.s b/asm/non_matchings/code/z_parameter/Interface_DrawItemButtons.s index 213bd0fa3c..da9c006fc2 100644 --- a/asm/non_matchings/code/z_parameter/Interface_DrawItemButtons.s +++ b/asm/non_matchings/code/z_parameter/Interface_DrawItemButtons.s @@ -89,7 +89,7 @@ glabel Interface_DrawItemButtons /* AFFF90 80088DF0 00084040 */ sll $t0, $t0, 1 /* AFFF94 80088DF4 3108FFFF */ andi $t0, $t0, 0xffff /* AFFF98 80088DF8 AFA80020 */ sw $t0, 0x20($sp) -/* AFFF9C 80088DFC 0C0210A6 */ jal Draw_TextureIA8 +/* AFFF9C 80088DFC 0C0210A6 */ jal Gfx_TextureIA8 /* AFFFA0 80088E00 AFA80024 */ sw $t0, 0x24($sp) /* AFFFA4 80088E04 8FAA0140 */ lw $t2, 0x140($sp) /* AFFFA8 80088E08 8FAC003C */ lw $t4, 0x3c($sp) @@ -908,7 +908,7 @@ glabel Interface_DrawItemButtons /* B00C24 80089A84 3108FFFF */ andi $t0, $t0, 0xffff /* B00C28 80089A88 AFA80020 */ sw $t0, 0x20($sp) /* B00C2C 80089A8C AFA80024 */ sw $t0, 0x24($sp) -/* B00C30 80089A90 0C0210A6 */ jal Draw_TextureIA8 +/* B00C30 80089A90 0C0210A6 */ jal Gfx_TextureIA8 /* B00C34 80089A94 A7A9014A */ sh $t1, 0x14a($sp) /* B00C38 80089A98 8FAA0140 */ lw $t2, 0x140($sp) /* B00C3C 80089A9C 87A9014A */ lh $t1, 0x14a($sp) diff --git a/asm/non_matchings/code/z_parameter/Item_Give.s b/asm/non_matchings/code/z_parameter/Item_Give.s index cdc94b57d0..e70cd5b905 100644 --- a/asm/non_matchings/code/z_parameter/Item_Give.s +++ b/asm/non_matchings/code/z_parameter/Item_Give.s @@ -160,9 +160,9 @@ glabel Item_Give /* AFBF64 80084DC4 2A01006C */ slti $at, $s0, 0x6c /* AFBF68 80084DC8 10200018 */ beqz $at, .L80084E2C /* AFBF6C 80084DCC 00106080 */ sll $t4, $s0, 2 -/* AFBF70 80084DD0 3C0D8012 */ lui $t5, %hi(D_80126F88) +/* AFBF70 80084DD0 3C0D8012 */ lui $t5, %hi(gBitFlags-0x198) /* AFBF74 80084DD4 01AC6821 */ addu $t5, $t5, $t4 -/* AFBF78 80084DD8 8DAD6F88 */ lw $t5, %lo(D_80126F88)($t5) +/* AFBF78 80084DD8 8DAD6F88 */ lw $t5, %lo(gBitFlags-0x198)($t5) /* AFBF7C 80084DDC 8E3900A4 */ lw $t9, 0xa4($s1) /* AFBF80 80084DE0 3C048014 */ lui $a0, %hi(D_8013DF58) # $a0, 0x8014 /* AFBF84 80084DE4 2484DF58 */ addiu $a0, %lo(D_8013DF58) # addiu $a0, $a0, -0x20a8 @@ -223,9 +223,9 @@ glabel Item_Give /* AFC054 80084EB4 2A01006F */ slti $at, $s0, 0x6f /* AFC058 80084EB8 10200013 */ beqz $at, .L80084F08 /* AFC05C 80084EBC 00107880 */ sll $t7, $s0, 2 -/* AFC060 80084EC0 3C188012 */ lui $t8, %hi(D_80126FB8) +/* AFC060 80084EC0 3C188012 */ lui $t8, %hi(gBitFlags-0x168) /* AFC064 80084EC4 030FC021 */ addu $t8, $t8, $t7 -/* AFC068 80084EC8 8F186FB8 */ lw $t8, %lo(D_80126FB8)($t8) +/* AFC068 80084EC8 8F186FB8 */ lw $t8, %lo(gBitFlags-0x168)($t8) /* AFC06C 80084ECC 8E2E00A4 */ lw $t6, 0xa4($s1) /* AFC070 80084ED0 3C048014 */ lui $a0, %hi(D_8013DFA0) # $a0, 0x8014 /* AFC074 80084ED4 2484DFA0 */ addiu $a0, %lo(D_8013DFA0) # addiu $a0, $a0, -0x2060 @@ -248,9 +248,9 @@ glabel Item_Give /* AFC0B4 80084F14 24010070 */ li $at, 112 /* AFC0B8 80084F18 16010012 */ bne $s0, $at, .L80084F64 .L80084F1C: -/* AFC0BC 80084F1C 3C0F8012 */ lui $t7, %hi(D_80126FB8) +/* AFC0BC 80084F1C 3C0F8012 */ lui $t7, %hi(gBitFlags-0x168) /* AFC0C0 80084F20 01ED7821 */ addu $t7, $t7, $t5 -/* AFC0C4 80084F24 8DEF6FB8 */ lw $t7, %lo(D_80126FB8)($t7) +/* AFC0C4 80084F24 8DEF6FB8 */ lw $t7, %lo(gBitFlags-0x168)($t7) /* AFC0C8 80084F28 8E3900A4 */ lw $t9, 0xa4($s1) /* AFC0CC 80084F2C 3C048014 */ lui $a0, %hi(D_8013DFBC) # $a0, 0x8014 /* AFC0D0 80084F30 2484DFBC */ addiu $a0, %lo(D_8013DFBC) # addiu $a0, $a0, -0x2044 @@ -270,9 +270,9 @@ glabel Item_Give /* AFC104 80084F64 24010071 */ li $at, 113 /* AFC108 80084F68 16010017 */ bne $s0, $at, .L80084FC8 /* AFC10C 80084F6C 00106080 */ sll $t4, $s0, 2 -/* AFC110 80084F70 3C0D8012 */ lui $t5, %hi(D_80126FB8) +/* AFC110 80084F70 3C0D8012 */ lui $t5, %hi(gBitFlags-0x168) /* AFC114 80084F74 01AC6821 */ addu $t5, $t5, $t4 -/* AFC118 80084F78 8DAD6FB8 */ lw $t5, %lo(D_80126FB8)($t5) +/* AFC118 80084F78 8DAD6FB8 */ lw $t5, %lo(gBitFlags-0x168)($t5) /* AFC11C 80084F7C 8E3800A4 */ lw $t8, 0xa4($s1) /* AFC120 80084F80 862F00D0 */ lh $t7, 0xd0($s1) /* AFC124 80084F84 3C048014 */ lui $a0, %hi(D_8013DFD8) # $a0, 0x8014 @@ -299,9 +299,9 @@ glabel Item_Give /* AFC174 80084FD4 10200031 */ beqz $at, .L8008509C /* AFC178 80084FD8 3C028012 */ lui $v0, %hi(gEquipShifts) # $v0, 0x8012 /* AFC17C 80084FDC 0010C080 */ sll $t8, $s0, 2 -/* AFC180 80084FE0 3C0D8012 */ lui $t5, %hi(D_80127034) +/* AFC180 80084FE0 3C0D8012 */ lui $t5, %hi(gBitFlags-0xec) /* AFC184 80084FE4 01B86821 */ addu $t5, $t5, $t8 -/* AFC188 80084FE8 8DAD7034 */ lw $t5, %lo(D_80127034)($t5) +/* AFC188 80084FE8 8DAD7034 */ lw $t5, %lo(gBitFlags-0xec)($t5) /* AFC18C 80084FEC 904271F0 */ lbu $v0, %lo(gEquipShifts)($v0) /* AFC190 80084FF0 962C009C */ lhu $t4, 0x9c($s1) /* AFC194 80084FF4 2401003D */ li $at, 61 @@ -354,11 +354,11 @@ glabel Item_Give /* AFC244 800850A4 2A010041 */ slti $at, $s0, 0x41 /* AFC248 800850A8 1020000C */ beqz $at, .L800850DC /* AFC24C 800850AC 00106880 */ sll $t5, $s0, 2 -/* AFC250 800850B0 3C0C8012 */ lui $t4, %hi(D_80127028) +/* AFC250 800850B0 3C0C8012 */ lui $t4, %hi(gBitFlags-0xf8) /* AFC254 800850B4 018D6021 */ addu $t4, $t4, $t5 /* AFC258 800850B8 3C198012 */ lui $t9, %hi(gEquipShifts+1) # $t9, 0x8012 /* AFC25C 800850BC 933971F1 */ lbu $t9, %lo(gEquipShifts+1)($t9) -/* AFC260 800850C0 8D8C7028 */ lw $t4, %lo(D_80127028)($t4) +/* AFC260 800850C0 8D8C7028 */ lw $t4, %lo(gBitFlags-0xf8)($t4) /* AFC264 800850C4 962E009C */ lhu $t6, 0x9c($s1) /* AFC268 800850C8 240200FF */ li $v0, 255 /* AFC26C 800850CC 032C7804 */ sllv $t7, $t4, $t9 @@ -371,11 +371,11 @@ glabel Item_Give /* AFC284 800850E4 2A010044 */ slti $at, $s0, 0x44 /* AFC288 800850E8 1020000C */ beqz $at, .L8008511C /* AFC28C 800850EC 00106880 */ sll $t5, $s0, 2 -/* AFC290 800850F0 3C0C8012 */ lui $t4, %hi(D_8012701C) +/* AFC290 800850F0 3C0C8012 */ lui $t4, %hi(gBitFlags-0x104) /* AFC294 800850F4 018D6021 */ addu $t4, $t4, $t5 /* AFC298 800850F8 3C198012 */ lui $t9, %hi(gEquipShifts+2) # $t9, 0x8012 /* AFC29C 800850FC 933971F2 */ lbu $t9, %lo(gEquipShifts+2)($t9) -/* AFC2A0 80085100 8D8C701C */ lw $t4, %lo(D_8012701C)($t4) +/* AFC2A0 80085100 8D8C701C */ lw $t4, %lo(gBitFlags-0x104)($t4) /* AFC2A4 80085104 962F009C */ lhu $t7, 0x9c($s1) /* AFC2A8 80085108 240200FF */ li $v0, 255 /* AFC2AC 8008510C 032C7004 */ sllv $t6, $t4, $t9 @@ -388,11 +388,11 @@ glabel Item_Give /* AFC2C4 80085124 2A010047 */ slti $at, $s0, 0x47 /* AFC2C8 80085128 1020000C */ beqz $at, .L8008515C /* AFC2CC 8008512C 00106880 */ sll $t5, $s0, 2 -/* AFC2D0 80085130 3C0C8012 */ lui $t4, %hi(D_80127010) +/* AFC2D0 80085130 3C0C8012 */ lui $t4, %hi(gBitFlags-0x110) /* AFC2D4 80085134 018D6021 */ addu $t4, $t4, $t5 /* AFC2D8 80085138 3C198012 */ lui $t9, %hi(gEquipShifts+3) # $t9, 0x8012 /* AFC2DC 8008513C 933971F3 */ lbu $t9, %lo(gEquipShifts+3)($t9) -/* AFC2E0 80085140 8D8C7010 */ lw $t4, %lo(D_80127010)($t4) +/* AFC2E0 80085140 8D8C7010 */ lw $t4, %lo(gBitFlags-0x110)($t4) /* AFC2E4 80085144 962E009C */ lhu $t6, 0x9c($s1) /* AFC2E8 80085148 240200FF */ li $v0, 255 /* AFC2EC 8008514C 032C7804 */ sllv $t7, $t4, $t9 @@ -410,11 +410,11 @@ glabel Item_Give /* AFC318 80085178 24010077 */ li $at, 119 .L8008517C: /* AFC31C 8008517C 962D1402 */ lhu $t5, 0x1402($s1) -/* AFC320 80085180 3C0E8012 */ lui $t6, %hi(D_80126F50) +/* AFC320 80085180 3C0E8012 */ lui $t6, %hi(gBitFlags-0x1d0) /* AFC324 80085184 01D97021 */ addu $t6, $t6, $t9 /* AFC328 80085188 022D1821 */ addu $v1, $s1, $t5 /* AFC32C 8008518C 906C00A8 */ lbu $t4, 0xa8($v1) -/* AFC330 80085190 8DCE6F50 */ lw $t6, %lo(D_80126F50)($t6) +/* AFC330 80085190 8DCE6F50 */ lw $t6, %lo(gBitFlags-0x1d0)($t6) /* AFC334 80085194 240200FF */ li $v0, 255 /* AFC338 80085198 018E7825 */ or $t7, $t4, $t6 /* AFC33C 8008519C 10000475 */ b .L80086374 diff --git a/asm/non_matchings/code/z_player_lib/func_80090AFC.s b/asm/non_matchings/code/z_player_lib/func_80090AFC.s index dee7dd7b14..c2f1b107b3 100644 --- a/asm/non_matchings/code/z_player_lib/func_80090AFC.s +++ b/asm/non_matchings/code/z_player_lib/func_80090AFC.s @@ -68,7 +68,7 @@ glabel func_80090AFC /* B07D50 80090BB0 0C031AB1 */ jal func_800C6AC4 /* B07D54 80090BB4 00A08025 */ move $s0, $a1 /* B07D58 80090BB8 8E0402B0 */ lw $a0, 0x2b0($s0) -/* B07D5C 80090BBC 0C024DDD */ jal func_80093774 +/* B07D5C 80090BBC 0C024DDD */ jal Gfx_CallSetupDL /* B07D60 80090BC0 24050007 */ li $a1, 7 /* B07D64 80090BC4 AE0202B0 */ sw $v0, 0x2b0($s0) /* B07D68 80090BC8 8FA400A0 */ lw $a0, 0xa0($sp) diff --git a/asm/non_matchings/code/z_player_lib/func_80091A24.s b/asm/non_matchings/code/z_player_lib/func_80091A24.s index b39f0ac269..3a32f0a6ba 100644 --- a/asm/non_matchings/code/z_player_lib/func_80091A24.s +++ b/asm/non_matchings/code/z_player_lib/func_80091A24.s @@ -395,7 +395,7 @@ glabel func_80091A24 /* B091C0 80092020 00002825 */ move $a1, $zero /* B091C4 80092024 00003025 */ move $a2, $zero /* B091C8 80092028 00003825 */ move $a3, $zero -/* B091CC 8009202C 0C024DC2 */ jal func_80093708 +/* B091CC 8009202C 0C024DC2 */ jal Gfx_SetFog2 /* B091D0 80092030 AC6E02C0 */ sw $t6, 0x2c0($v1) /* B091D4 80092034 8FA30114 */ lw $v1, 0x114($sp) /* B091D8 80092038 8FA80130 */ lw $t0, 0x130($sp) diff --git a/asm/non_matchings/code/z_rcp/func_80094DB8.s b/asm/non_matchings/code/z_rcp/Gfx_BranchTexScroll.s similarity index 98% rename from asm/non_matchings/code/z_rcp/func_80094DB8.s rename to asm/non_matchings/code/z_rcp/Gfx_BranchTexScroll.s index 4b8d5fa002..a793df5f00 100644 --- a/asm/non_matchings/code/z_rcp/func_80094DB8.s +++ b/asm/non_matchings/code/z_rcp/Gfx_BranchTexScroll.s @@ -1,4 +1,4 @@ -glabel func_80094DB8 +glabel Gfx_BranchTexScroll /* B0BF58 80094DB8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B0BF5C 80094DBC AFBF0014 */ sw $ra, 0x14($sp) /* B0BF60 80094DC0 AFA5001C */ sw $a1, 0x1c($sp) diff --git a/asm/non_matchings/code/z_rcp/func_80093370.s b/asm/non_matchings/code/z_rcp/func_80093370.s deleted file mode 100644 index 43f7648f86..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093370.s +++ /dev/null @@ -1,132 +0,0 @@ -.rdata -glabel D_8013EAE0 - .asciz "n != f" - .balign 4 - -glabel D_8013EAE8 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093370 -/* B0A510 80093370 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B0A514 80093374 AFB10018 */ sw $s1, 0x18($sp) -/* B0A518 80093378 8FB10034 */ lw $s1, 0x34($sp) -/* B0A51C 8009337C 8FAE0038 */ lw $t6, 0x38($sp) -/* B0A520 80093380 AFB00014 */ sw $s0, 0x14($sp) -/* B0A524 80093384 00808025 */ move $s0, $a0 -/* B0A528 80093388 AFBF001C */ sw $ra, 0x1c($sp) -/* B0A52C 8009338C AFA50024 */ sw $a1, 0x24($sp) -/* B0A530 80093390 AFA60028 */ sw $a2, 0x28($sp) -/* B0A534 80093394 15D10003 */ bne $t6, $s1, .L800933A4 -/* B0A538 80093398 AFA7002C */ sw $a3, 0x2c($sp) -/* B0A53C 8009339C 25CF0001 */ addiu $t7, $t6, 1 -/* B0A540 800933A0 AFAF0038 */ sw $t7, 0x38($sp) -.L800933A4: -/* B0A544 800933A4 8FB80038 */ lw $t8, 0x38($sp) -/* B0A548 800933A8 56380008 */ bnel $s1, $t8, .L800933CC -/* B0A54C 800933AC 02001025 */ move $v0, $s0 -/* B0A550 800933B0 3C048014 */ lui $a0, %hi(D_8013EAE0) # $a0, 0x8014 -/* B0A554 800933B4 3C058014 */ lui $a1, %hi(D_8013EAE8) # $a1, 0x8014 -/* B0A558 800933B8 24A5EAE8 */ addiu $a1, %lo(D_8013EAE8) # addiu $a1, $a1, -0x1518 -/* B0A55C 800933BC 2484EAE0 */ addiu $a0, %lo(D_8013EAE0) # addiu $a0, $a0, -0x1520 -/* B0A560 800933C0 0C0007FC */ jal __assert -/* B0A564 800933C4 24060483 */ li $a2, 1155 -/* B0A568 800933C8 02001025 */ move $v0, $s0 -.L800933CC: -/* B0A56C 800933CC 3C19F800 */ lui $t9, 0xf800 -/* B0A570 800933D0 AC590000 */ sw $t9, ($v0) -/* B0A574 800933D4 8FA90024 */ lw $t1, 0x24($sp) -/* B0A578 800933D8 8FAB0028 */ lw $t3, 0x28($sp) -/* B0A57C 800933DC 8FAF002C */ lw $t7, 0x2c($sp) -/* B0A580 800933E0 00095600 */ sll $t2, $t1, 0x18 -/* B0A584 800933E4 8FA90030 */ lw $t1, 0x30($sp) -/* B0A588 800933E8 316C00FF */ andi $t4, $t3, 0xff -/* B0A58C 800933EC 000C6C00 */ sll $t5, $t4, 0x10 -/* B0A590 800933F0 31F800FF */ andi $t8, $t7, 0xff -/* B0A594 800933F4 0018CA00 */ sll $t9, $t8, 8 -/* B0A598 800933F8 014D7025 */ or $t6, $t2, $t5 -/* B0A59C 800933FC 01D94025 */ or $t0, $t6, $t9 -/* B0A5A0 80093400 312B00FF */ andi $t3, $t1, 0xff -/* B0A5A4 80093404 010B6025 */ or $t4, $t0, $t3 -/* B0A5A8 80093408 2A2103E8 */ slti $at, $s1, 0x3e8 -/* B0A5AC 8009340C AC4C0004 */ sw $t4, 4($v0) -/* B0A5B0 80093410 14200007 */ bnez $at, .L80093430 -/* B0A5B4 80093414 26100008 */ addiu $s0, $s0, 8 -/* B0A5B8 80093418 02001025 */ move $v0, $s0 -/* B0A5BC 8009341C 3C0ADB08 */ lui $t2, 0xdb08 -/* B0A5C0 80093420 AC4A0000 */ sw $t2, ($v0) -/* B0A5C4 80093424 AC400004 */ sw $zero, 4($v0) -/* B0A5C8 80093428 1000003A */ b .L80093514 -/* B0A5CC 8009342C 26100008 */ addiu $s0, $s0, 8 -.L80093430: -/* B0A5D0 80093430 2A2103E5 */ slti $at, $s1, 0x3e5 -/* B0A5D4 80093434 14200008 */ bnez $at, .L80093458 -/* B0A5D8 80093438 02001025 */ move $v0, $s0 -/* B0A5DC 8009343C 3C0F7FFF */ lui $t7, (0x7FFF8100 >> 16) # lui $t7, 0x7fff -/* B0A5E0 80093440 35EF8100 */ ori $t7, (0x7FFF8100 & 0xFFFF) # ori $t7, $t7, 0x8100 -/* B0A5E4 80093444 3C0DDB08 */ lui $t5, 0xdb08 -/* B0A5E8 80093448 AC4D0000 */ sw $t5, ($v0) -/* B0A5EC 8009344C AC4F0004 */ sw $t7, 4($v0) -/* B0A5F0 80093450 10000030 */ b .L80093514 -/* B0A5F4 80093454 26100008 */ addiu $s0, $s0, 8 -.L80093458: -/* B0A5F8 80093458 06210008 */ bgez $s1, .L8009347C -/* B0A5FC 8009345C 02001025 */ move $v0, $s0 -/* B0A600 80093460 02001025 */ move $v0, $s0 -/* B0A604 80093464 3C18DB08 */ lui $t8, 0xdb08 -/* B0A608 80093468 240E00FF */ li $t6, 255 -/* B0A60C 8009346C AC4E0004 */ sw $t6, 4($v0) -/* B0A610 80093470 AC580000 */ sw $t8, ($v0) -/* B0A614 80093474 10000027 */ b .L80093514 -/* B0A618 80093478 26100008 */ addiu $s0, $s0, 8 -.L8009347C: -/* B0A61C 8009347C 3C19DB08 */ lui $t9, 0xdb08 -/* B0A620 80093480 AC590000 */ sw $t9, ($v0) -/* B0A624 80093484 8FA90038 */ lw $t1, 0x38($sp) -/* B0A628 80093488 3C080001 */ lui $t0, (0x0001F400 >> 16) # lui $t0, 1 -/* B0A62C 8009348C 3508F400 */ ori $t0, (0x0001F400 & 0xFFFF) # ori $t0, $t0, 0xf400 -/* B0A630 80093490 01311823 */ subu $v1, $t1, $s1 -/* B0A634 80093494 0103001A */ div $zero, $t0, $v1 -/* B0A638 80093498 00116823 */ negu $t5, $s1 -/* B0A63C 8009349C 000D7A00 */ sll $t7, $t5, 8 -/* B0A640 800934A0 01E8C021 */ addu $t8, $t7, $t0 -/* B0A644 800934A4 00005812 */ mflo $t3 -/* B0A648 800934A8 316CFFFF */ andi $t4, $t3, 0xffff -/* B0A64C 800934AC 000C5400 */ sll $t2, $t4, 0x10 -/* B0A650 800934B0 0303001A */ div $zero, $t8, $v1 -/* B0A654 800934B4 00007012 */ mflo $t6 -/* B0A658 800934B8 31D9FFFF */ andi $t9, $t6, 0xffff -/* B0A65C 800934BC 01594825 */ or $t1, $t2, $t9 -/* B0A660 800934C0 AC490004 */ sw $t1, 4($v0) -/* B0A664 800934C4 26100008 */ addiu $s0, $s0, 8 -/* B0A668 800934C8 14600002 */ bnez $v1, .L800934D4 -/* B0A66C 800934CC 00000000 */ nop -/* B0A670 800934D0 0007000D */ break 7 -.L800934D4: -/* B0A674 800934D4 2401FFFF */ li $at, -1 -/* B0A678 800934D8 14610004 */ bne $v1, $at, .L800934EC -/* B0A67C 800934DC 3C018000 */ lui $at, 0x8000 -/* B0A680 800934E0 15010002 */ bne $t0, $at, .L800934EC -/* B0A684 800934E4 00000000 */ nop -/* B0A688 800934E8 0006000D */ break 6 -.L800934EC: -/* B0A68C 800934EC 01000821 */ addu $at, $t0, $zero -/* B0A690 800934F0 14600002 */ bnez $v1, .L800934FC -/* B0A694 800934F4 00000000 */ nop -/* B0A698 800934F8 0007000D */ break 7 -.L800934FC: -/* B0A69C 800934FC 2401FFFF */ li $at, -1 -/* B0A6A0 80093500 14610004 */ bne $v1, $at, .L80093514 -/* B0A6A4 80093504 3C018000 */ lui $at, 0x8000 -/* B0A6A8 80093508 17010002 */ bne $t8, $at, .L80093514 -/* B0A6AC 8009350C 00000000 */ nop -/* B0A6B0 80093510 0006000D */ break 6 -.L80093514: -/* B0A6B4 80093514 8FBF001C */ lw $ra, 0x1c($sp) -/* B0A6B8 80093518 02001025 */ move $v0, $s0 -/* B0A6BC 8009351C 8FB00014 */ lw $s0, 0x14($sp) -/* B0A6C0 80093520 8FB10018 */ lw $s1, 0x18($sp) -/* B0A6C4 80093524 03E00008 */ jr $ra -/* B0A6C8 80093528 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/non_matchings/code/z_rcp/func_8009352C.s b/asm/non_matchings/code/z_rcp/func_8009352C.s deleted file mode 100644 index 272dbeb6c3..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009352C.s +++ /dev/null @@ -1,140 +0,0 @@ -.rdata -glabel D_8013EAF4 - .asciz "n != f" - .balign 4 - -glabel D_8013EAFC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_8009352C -/* B0A6CC 8009352C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B0A6D0 80093530 8FAE0038 */ lw $t6, 0x38($sp) -/* B0A6D4 80093534 8FAF0034 */ lw $t7, 0x34($sp) -/* B0A6D8 80093538 AFB00018 */ sw $s0, 0x18($sp) -/* B0A6DC 8009353C 00808025 */ move $s0, $a0 -/* B0A6E0 80093540 AFBF001C */ sw $ra, 0x1c($sp) -/* B0A6E4 80093544 AFA50024 */ sw $a1, 0x24($sp) -/* B0A6E8 80093548 AFA60028 */ sw $a2, 0x28($sp) -/* B0A6EC 8009354C 15CF0003 */ bne $t6, $t7, .L8009355C -/* B0A6F0 80093550 AFA7002C */ sw $a3, 0x2c($sp) -/* B0A6F4 80093554 25D80001 */ addiu $t8, $t6, 1 -/* B0A6F8 80093558 AFB80038 */ sw $t8, 0x38($sp) -.L8009355C: -/* B0A6FC 8009355C 8FB90034 */ lw $t9, 0x34($sp) -/* B0A700 80093560 8FA80038 */ lw $t0, 0x38($sp) -/* B0A704 80093564 57280008 */ bnel $t9, $t0, .L80093588 -/* B0A708 80093568 02001025 */ move $v0, $s0 -/* B0A70C 8009356C 3C048014 */ lui $a0, %hi(D_8013EAF4) # $a0, 0x8014 -/* B0A710 80093570 3C058014 */ lui $a1, %hi(D_8013EAFC) # $a1, 0x8014 -/* B0A714 80093574 24A5EAFC */ addiu $a1, %lo(D_8013EAFC) # addiu $a1, $a1, -0x1504 -/* B0A718 80093578 2484EAF4 */ addiu $a0, %lo(D_8013EAF4) # addiu $a0, $a0, -0x150c -/* B0A71C 8009357C 0C0007FC */ jal __assert -/* B0A720 80093580 240604A3 */ li $a2, 1187 -/* B0A724 80093584 02001025 */ move $v0, $s0 -.L80093588: -/* B0A728 80093588 3C09E700 */ lui $t1, 0xe700 -/* B0A72C 8009358C AC490000 */ sw $t1, ($v0) -/* B0A730 80093590 AC400004 */ sw $zero, 4($v0) -/* B0A734 80093594 26100008 */ addiu $s0, $s0, 8 -/* B0A738 80093598 02001025 */ move $v0, $s0 -/* B0A73C 8009359C 3C0AF800 */ lui $t2, 0xf800 -/* B0A740 800935A0 AC4A0000 */ sw $t2, ($v0) -/* B0A744 800935A4 8FAC0024 */ lw $t4, 0x24($sp) -/* B0A748 800935A8 8FAF0028 */ lw $t7, 0x28($sp) -/* B0A74C 800935AC 8FA8002C */ lw $t0, 0x2c($sp) -/* B0A750 800935B0 000C6E00 */ sll $t5, $t4, 0x18 -/* B0A754 800935B4 8FAC0030 */ lw $t4, 0x30($sp) -/* B0A758 800935B8 31EE00FF */ andi $t6, $t7, 0xff -/* B0A75C 800935BC 000EC400 */ sll $t8, $t6, 0x10 -/* B0A760 800935C0 310900FF */ andi $t1, $t0, 0xff -/* B0A764 800935C4 00095200 */ sll $t2, $t1, 8 -/* B0A768 800935C8 01B8C825 */ or $t9, $t5, $t8 -/* B0A76C 800935CC 032A5825 */ or $t3, $t9, $t2 -/* B0A770 800935D0 318F00FF */ andi $t7, $t4, 0xff -/* B0A774 800935D4 016F7025 */ or $t6, $t3, $t7 -/* B0A778 800935D8 AC4E0004 */ sw $t6, 4($v0) -/* B0A77C 800935DC 8FAD0034 */ lw $t5, 0x34($sp) -/* B0A780 800935E0 26100008 */ addiu $s0, $s0, 8 -/* B0A784 800935E4 02001025 */ move $v0, $s0 -/* B0A788 800935E8 29A103E8 */ slti $at, $t5, 0x3e8 -/* B0A78C 800935EC 14200006 */ bnez $at, .L80093608 -/* B0A790 800935F0 8FA80034 */ lw $t0, 0x34($sp) -/* B0A794 800935F4 3C18DB08 */ lui $t8, 0xdb08 -/* B0A798 800935F8 AC580000 */ sw $t8, ($v0) -/* B0A79C 800935FC 26100008 */ addiu $s0, $s0, 8 -/* B0A7A0 80093600 1000003C */ b .L800936F4 -/* B0A7A4 80093604 AC400004 */ sw $zero, 4($v0) -.L80093608: -/* B0A7A8 80093608 290103E5 */ slti $at, $t0, 0x3e5 -/* B0A7AC 8009360C 14200009 */ bnez $at, .L80093634 -/* B0A7B0 80093610 8FAA0034 */ lw $t2, 0x34($sp) -/* B0A7B4 80093614 02001025 */ move $v0, $s0 -/* B0A7B8 80093618 3C197FFF */ lui $t9, (0x7FFF8100 >> 16) # lui $t9, 0x7fff -/* B0A7BC 8009361C 37398100 */ ori $t9, (0x7FFF8100 & 0xFFFF) # ori $t9, $t9, 0x8100 -/* B0A7C0 80093620 3C09DB08 */ lui $t1, 0xdb08 -/* B0A7C4 80093624 AC490000 */ sw $t1, ($v0) -/* B0A7C8 80093628 AC590004 */ sw $t9, 4($v0) -/* B0A7CC 8009362C 10000031 */ b .L800936F4 -/* B0A7D0 80093630 26100008 */ addiu $s0, $s0, 8 -.L80093634: -/* B0A7D4 80093634 05410008 */ bgez $t2, .L80093658 -/* B0A7D8 80093638 02001025 */ move $v0, $s0 -/* B0A7DC 8009363C 02001025 */ move $v0, $s0 -/* B0A7E0 80093640 3C0CDB08 */ lui $t4, 0xdb08 -/* B0A7E4 80093644 240B00FF */ li $t3, 255 -/* B0A7E8 80093648 AC4B0004 */ sw $t3, 4($v0) -/* B0A7EC 8009364C AC4C0000 */ sw $t4, ($v0) -/* B0A7F0 80093650 10000028 */ b .L800936F4 -/* B0A7F4 80093654 26100008 */ addiu $s0, $s0, 8 -.L80093658: -/* B0A7F8 80093658 3C0FDB08 */ lui $t7, 0xdb08 -/* B0A7FC 8009365C AC4F0000 */ sw $t7, ($v0) -/* B0A800 80093660 8FAD0034 */ lw $t5, 0x34($sp) -/* B0A804 80093664 8FAE0038 */ lw $t6, 0x38($sp) -/* B0A808 80093668 3C180001 */ lui $t8, (0x0001F400 >> 16) # lui $t8, 1 -/* B0A80C 8009366C 3718F400 */ ori $t8, (0x0001F400 & 0xFFFF) # ori $t8, $t8, 0xf400 -/* B0A810 80093670 01CD1823 */ subu $v1, $t6, $t5 -/* B0A814 80093674 0303001A */ div $zero, $t8, $v1 -/* B0A818 80093678 000D5023 */ negu $t2, $t5 -/* B0A81C 8009367C 000A6200 */ sll $t4, $t2, 8 -/* B0A820 80093680 01985821 */ addu $t3, $t4, $t8 -/* B0A824 80093684 00004012 */ mflo $t0 -/* B0A828 80093688 3109FFFF */ andi $t1, $t0, 0xffff -/* B0A82C 8009368C 0009CC00 */ sll $t9, $t1, 0x10 -/* B0A830 80093690 0163001A */ div $zero, $t3, $v1 -/* B0A834 80093694 00007812 */ mflo $t7 -/* B0A838 80093698 31EEFFFF */ andi $t6, $t7, 0xffff -/* B0A83C 8009369C 26100008 */ addiu $s0, $s0, 8 -/* B0A840 800936A0 14600002 */ bnez $v1, .L800936AC -/* B0A844 800936A4 00000000 */ nop -/* B0A848 800936A8 0007000D */ break 7 -.L800936AC: -/* B0A84C 800936AC 2401FFFF */ li $at, -1 -/* B0A850 800936B0 14610004 */ bne $v1, $at, .L800936C4 -/* B0A854 800936B4 3C018000 */ lui $at, 0x8000 -/* B0A858 800936B8 17010002 */ bne $t8, $at, .L800936C4 -/* B0A85C 800936BC 00000000 */ nop -/* B0A860 800936C0 0006000D */ break 6 -.L800936C4: -/* B0A864 800936C4 03000821 */ addu $at, $t8, $zero -/* B0A868 800936C8 032EC025 */ or $t8, $t9, $t6 -/* B0A86C 800936CC AC580004 */ sw $t8, 4($v0) -/* B0A870 800936D0 14600002 */ bnez $v1, .L800936DC -/* B0A874 800936D4 00000000 */ nop -/* B0A878 800936D8 0007000D */ break 7 -.L800936DC: -/* B0A87C 800936DC 2401FFFF */ li $at, -1 -/* B0A880 800936E0 14610004 */ bne $v1, $at, .L800936F4 -/* B0A884 800936E4 3C018000 */ lui $at, 0x8000 -/* B0A888 800936E8 15610002 */ bne $t3, $at, .L800936F4 -/* B0A88C 800936EC 00000000 */ nop -/* B0A890 800936F0 0006000D */ break 6 -.L800936F4: -/* B0A894 800936F4 8FBF001C */ lw $ra, 0x1c($sp) -/* B0A898 800936F8 02001025 */ move $v0, $s0 -/* B0A89C 800936FC 8FB00018 */ lw $s0, 0x18($sp) -/* B0A8A0 80093700 03E00008 */ jr $ra -/* B0A8A4 80093704 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/non_matchings/code/z_rcp/func_80093708.s b/asm/non_matchings/code/z_rcp/func_80093708.s deleted file mode 100644 index 5f26bf8cae..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093708.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80093708 -/* B0A8A8 80093708 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B0A8AC 8009370C 8FAE0038 */ lw $t6, 0x38($sp) -/* B0A8B0 80093710 8FAF003C */ lw $t7, 0x3c($sp) -/* B0A8B4 80093714 8FB80040 */ lw $t8, 0x40($sp) -/* B0A8B8 80093718 AFBF0024 */ sw $ra, 0x24($sp) -/* B0A8BC 8009371C AFAE0010 */ sw $t6, 0x10($sp) -/* B0A8C0 80093720 AFAF0014 */ sw $t7, 0x14($sp) -/* B0A8C4 80093724 0C024CDC */ jal func_80093370 -/* B0A8C8 80093728 AFB80018 */ sw $t8, 0x18($sp) -/* B0A8CC 8009372C 8FBF0024 */ lw $ra, 0x24($sp) -/* B0A8D0 80093730 27BD0028 */ addiu $sp, $sp, 0x28 -/* B0A8D4 80093734 03E00008 */ jr $ra -/* B0A8D8 80093738 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_8009373C.s b/asm/non_matchings/code/z_rcp/func_8009373C.s deleted file mode 100644 index 58ae18c744..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009373C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8009373C -/* B0A8DC 8009373C 00057880 */ sll $t7, $a1, 2 -/* B0A8E0 80093740 01E57823 */ subu $t7, $t7, $a1 -/* B0A8E4 80093744 000F7840 */ sll $t7, $t7, 1 -/* B0A8E8 80093748 00801025 */ move $v0, $a0 -/* B0A8EC 8009374C 3C198012 */ lui $t9, %hi(D_80126280) # $t9, 0x8012 -/* B0A8F0 80093750 27396280 */ addiu $t9, %lo(D_80126280) # addiu $t9, $t9, 0x6280 -/* B0A8F4 80093754 000FC0C0 */ sll $t8, $t7, 3 -/* B0A8F8 80093758 03194021 */ addu $t0, $t8, $t9 -/* B0A8FC 8009375C 3C0EDE00 */ lui $t6, 0xde00 -/* B0A900 80093760 AC4E0000 */ sw $t6, ($v0) -/* B0A904 80093764 AC480004 */ sw $t0, 4($v0) -/* B0A908 80093768 24840008 */ addiu $a0, $a0, 8 -/* B0A90C 8009376C 03E00008 */ jr $ra -/* B0A910 80093770 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80093774.s b/asm/non_matchings/code/z_rcp/func_80093774.s deleted file mode 100644 index d666dc72b6..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093774.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80093774 -/* B0A914 80093774 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B0A918 80093778 AFBF0014 */ sw $ra, 0x14($sp) -/* B0A91C 8009377C 0C024DCF */ jal func_8009373C -/* B0A920 80093780 00000000 */ nop -/* B0A924 80093784 8FBF0014 */ lw $ra, 0x14($sp) -/* B0A928 80093788 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0A92C 8009378C 03E00008 */ jr $ra -/* B0A930 80093790 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093794.s b/asm/non_matchings/code/z_rcp/func_80093794.s deleted file mode 100644 index 94831e6524..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093794.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80093794 -/* B0A934 80093794 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B0A938 80093798 AFBF0014 */ sw $ra, 0x14($sp) -/* B0A93C 8009379C AFA40018 */ sw $a0, 0x18($sp) -/* B0A940 800937A0 0C024DDD */ jal func_80093774 -/* B0A944 800937A4 8C840000 */ lw $a0, ($a0) -/* B0A948 800937A8 8FAF0018 */ lw $t7, 0x18($sp) -/* B0A94C 800937AC ADE20000 */ sw $v0, ($t7) -/* B0A950 800937B0 8FBF0014 */ lw $ra, 0x14($sp) -/* B0A954 800937B4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0A958 800937B8 03E00008 */ jr $ra -/* B0A95C 800937BC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800937C0.s b/asm/non_matchings/code/z_rcp/func_800937C0.s deleted file mode 100644 index fad49c6e47..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800937C0.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800937C0 -/* B0A960 800937C0 00801025 */ move $v0, $a0 -/* B0A964 800937C4 3C0F8012 */ lui $t7, %hi(D_80126D30) # $t7, 0x8012 -/* B0A968 800937C8 25EF6D30 */ addiu $t7, %lo(D_80126D30) # addiu $t7, $t7, 0x6d30 -/* B0A96C 800937CC 3C0EDE00 */ lui $t6, 0xde00 -/* B0A970 800937D0 AC4E0000 */ sw $t6, ($v0) -/* B0A974 800937D4 AC4F0004 */ sw $t7, 4($v0) -/* B0A978 800937D8 24840008 */ addiu $a0, $a0, 8 -/* B0A97C 800937DC 03E00008 */ jr $ra -/* B0A980 800937E0 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_800937E4.s b/asm/non_matchings/code/z_rcp/func_800937E4.s deleted file mode 100644 index 0b98e93fd3..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800937E4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800937E4 -/* B0A984 800937E4 00801025 */ move $v0, $a0 -/* B0A988 800937E8 3C0F8012 */ lui $t7, %hi(D_80126D30) # $t7, 0x8012 -/* B0A98C 800937EC 25EF6D30 */ addiu $t7, %lo(D_80126D30) # addiu $t7, $t7, 0x6d30 -/* B0A990 800937F0 3C0EDE00 */ lui $t6, 0xde00 -/* B0A994 800937F4 AC4E0000 */ sw $t6, ($v0) -/* B0A998 800937F8 AC4F0004 */ sw $t7, 4($v0) -/* B0A99C 800937FC 24840008 */ addiu $a0, $a0, 8 -/* B0A9A0 80093800 03E00008 */ jr $ra -/* B0A9A4 80093804 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80093808.s b/asm/non_matchings/code/z_rcp/func_80093808.s deleted file mode 100644 index ce90bf1867..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093808.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80093808 -/* B0A9A8 80093808 00801025 */ move $v0, $a0 -/* B0A9AC 8009380C 3C0F8012 */ lui $t7, %hi(D_80126C40) # $t7, 0x8012 -/* B0A9B0 80093810 25EF6C40 */ addiu $t7, %lo(D_80126C40) # addiu $t7, $t7, 0x6c40 -/* B0A9B4 80093814 3C0EDE00 */ lui $t6, 0xde00 -/* B0A9B8 80093818 AC4E0000 */ sw $t6, ($v0) -/* B0A9BC 8009381C AC4F0004 */ sw $t7, 4($v0) -/* B0A9C0 80093820 24840008 */ addiu $a0, $a0, 8 -/* B0A9C4 80093824 00801025 */ move $v0, $a0 -/* B0A9C8 80093828 3C18E300 */ lui $t8, (0xE3001801 >> 16) # lui $t8, 0xe300 -/* B0A9CC 8009382C 37181801 */ ori $t8, (0xE3001801 & 0xFFFF) # ori $t8, $t8, 0x1801 -/* B0A9D0 80093830 241900C0 */ li $t9, 192 -/* B0A9D4 80093834 AC590004 */ sw $t9, 4($v0) -/* B0A9D8 80093838 AC580000 */ sw $t8, ($v0) -/* B0A9DC 8009383C 24840008 */ addiu $a0, $a0, 8 -/* B0A9E0 80093840 03E00008 */ jr $ra -/* B0A9E4 80093844 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80093848.s b/asm/non_matchings/code/z_rcp/func_80093848.s deleted file mode 100644 index c29915ecfd..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093848.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EB08 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EB14 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093848 -/* B0A9E8 80093848 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0A9EC 8009384C AFBF0014 */ sw $ra, 0x14($sp) -/* B0A9F0 80093850 00802825 */ move $a1, $a0 -/* B0A9F4 80093854 3C068014 */ lui $a2, %hi(D_8013EB08) # $a2, 0x8014 -/* B0A9F8 80093858 24C6EB08 */ addiu $a2, %lo(D_8013EB08) # addiu $a2, $a2, -0x14f8 -/* B0A9FC 8009385C AFA50038 */ sw $a1, 0x38($sp) -/* B0AA00 80093860 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AA04 80093864 0C031AB1 */ jal func_800C6AC4 -/* B0AA08 80093868 2407050D */ li $a3, 1293 -/* B0AA0C 8009386C 8FA50038 */ lw $a1, 0x38($sp) -/* B0AA10 80093870 3C188012 */ lui $t8, %hi(D_80126D60) # $t8, 0x8012 -/* B0AA14 80093874 27186D60 */ addiu $t8, %lo(D_80126D60) # addiu $t8, $t8, 0x6d60 -/* B0AA18 80093878 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AA1C 8009387C 3C0FDE00 */ lui $t7, 0xde00 -/* B0AA20 80093880 3C068014 */ lui $a2, %hi(D_8013EB14) # $a2, 0x8014 -/* B0AA24 80093884 246E0008 */ addiu $t6, $v1, 8 -/* B0AA28 80093888 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0AA2C 8009388C 24C6EB14 */ addiu $a2, %lo(D_8013EB14) # addiu $a2, $a2, -0x14ec -/* B0AA30 80093890 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AA34 80093894 24070511 */ li $a3, 1297 -/* B0AA38 80093898 AC780004 */ sw $t8, 4($v1) -/* B0AA3C 8009389C 0C031AD5 */ jal func_800C6B54 -/* B0AA40 800938A0 AC6F0000 */ sw $t7, ($v1) -/* B0AA44 800938A4 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AA48 800938A8 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AA4C 800938AC 03E00008 */ jr $ra -/* B0AA50 800938B0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800938B4.s b/asm/non_matchings/code/z_rcp/func_800938B4.s deleted file mode 100644 index 86694ed28e..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800938B4.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EB20 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EB2C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800938B4 -/* B0AA54 800938B4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AA58 800938B8 AFBF0014 */ sw $ra, 0x14($sp) -/* B0AA5C 800938BC 00802825 */ move $a1, $a0 -/* B0AA60 800938C0 3C068014 */ lui $a2, %hi(D_8013EB20) # $a2, 0x8014 -/* B0AA64 800938C4 24C6EB20 */ addiu $a2, %lo(D_8013EB20) # addiu $a2, $a2, -0x14e0 -/* B0AA68 800938C8 AFA50038 */ sw $a1, 0x38($sp) -/* B0AA6C 800938CC 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AA70 800938D0 0C031AB1 */ jal func_800C6AC4 -/* B0AA74 800938D4 2407051D */ li $a3, 1309 -/* B0AA78 800938D8 8FA50038 */ lw $a1, 0x38($sp) -/* B0AA7C 800938DC 3C188012 */ lui $t8, %hi(D_80126D30) # $t8, 0x8012 -/* B0AA80 800938E0 27186D30 */ addiu $t8, %lo(D_80126D30) # addiu $t8, $t8, 0x6d30 -/* B0AA84 800938E4 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AA88 800938E8 3C0FDE00 */ lui $t7, 0xde00 -/* B0AA8C 800938EC 3C068014 */ lui $a2, %hi(D_8013EB2C) # $a2, 0x8014 -/* B0AA90 800938F0 246E0008 */ addiu $t6, $v1, 8 -/* B0AA94 800938F4 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0AA98 800938F8 24C6EB2C */ addiu $a2, %lo(D_8013EB2C) # addiu $a2, $a2, -0x14d4 -/* B0AA9C 800938FC 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AAA0 80093900 24070521 */ li $a3, 1313 -/* B0AAA4 80093904 AC780004 */ sw $t8, 4($v1) -/* B0AAA8 80093908 0C031AD5 */ jal func_800C6B54 -/* B0AAAC 8009390C AC6F0000 */ sw $t7, ($v1) -/* B0AAB0 80093910 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AAB4 80093914 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AAB8 80093918 03E00008 */ jr $ra -/* B0AABC 8009391C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093920.s b/asm/non_matchings/code/z_rcp/func_80093920.s deleted file mode 100644 index 5809b8fb9c..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093920.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EB38 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EB44 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093920 -/* B0AAC0 80093920 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AAC4 80093924 AFBF0014 */ sw $ra, 0x14($sp) -/* B0AAC8 80093928 00802825 */ move $a1, $a0 -/* B0AACC 8009392C 3C068014 */ lui $a2, %hi(D_8013EB38) # $a2, 0x8014 -/* B0AAD0 80093930 24C6EB38 */ addiu $a2, %lo(D_8013EB38) # addiu $a2, $a2, -0x14c8 -/* B0AAD4 80093934 AFA50038 */ sw $a1, 0x38($sp) -/* B0AAD8 80093938 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AADC 8009393C 0C031AB1 */ jal func_800C6AC4 -/* B0AAE0 80093940 2407052D */ li $a3, 1325 -/* B0AAE4 80093944 8FA50038 */ lw $a1, 0x38($sp) -/* B0AAE8 80093948 3C188012 */ lui $t8, %hi(D_80126BE0) # $t8, 0x8012 -/* B0AAEC 8009394C 27186BE0 */ addiu $t8, %lo(D_80126BE0) # addiu $t8, $t8, 0x6be0 -/* B0AAF0 80093950 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AAF4 80093954 3C0FDE00 */ lui $t7, 0xde00 -/* B0AAF8 80093958 3C068014 */ lui $a2, %hi(D_8013EB44) # $a2, 0x8014 -/* B0AAFC 8009395C 246E0008 */ addiu $t6, $v1, 8 -/* B0AB00 80093960 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0AB04 80093964 24C6EB44 */ addiu $a2, %lo(D_8013EB44) # addiu $a2, $a2, -0x14bc -/* B0AB08 80093968 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AB0C 8009396C 24070531 */ li $a3, 1329 -/* B0AB10 80093970 AC780004 */ sw $t8, 4($v1) -/* B0AB14 80093974 0C031AD5 */ jal func_800C6B54 -/* B0AB18 80093978 AC6F0000 */ sw $t7, ($v1) -/* B0AB1C 8009397C 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AB20 80093980 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AB24 80093984 03E00008 */ jr $ra -/* B0AB28 80093988 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_8009398C.s b/asm/non_matchings/code/z_rcp/func_8009398C.s deleted file mode 100644 index a4055ad148..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009398C.s +++ /dev/null @@ -1,38 +0,0 @@ -.rdata -glabel D_8013EB50 - .asciz "../z_rcp.c" - .balign 4 -glabel D_8013EB5C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_8009398C -/* B0AB2C 8009398C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AB30 80093990 AFBF0014 */ sw $ra, 0x14($sp) -/* B0AB34 80093994 00802825 */ move $a1, $a0 -/* B0AB38 80093998 3C068014 */ lui $a2, %hi(D_8013EB50) # $a2, 0x8014 -/* B0AB3C 8009399C 24C6EB50 */ addiu $a2, %lo(D_8013EB50) # addiu $a2, $a2, -0x14b0 -/* B0AB40 800939A0 AFA50038 */ sw $a1, 0x38($sp) -/* B0AB44 800939A4 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AB48 800939A8 0C031AB1 */ jal func_800C6AC4 -/* B0AB4C 800939AC 2407053D */ li $a3, 1341 -/* B0AB50 800939B0 8FA50038 */ lw $a1, 0x38($sp) -/* B0AB54 800939B4 3C188012 */ lui $t8, %hi(D_80126C10) # $t8, 0x8012 -/* B0AB58 800939B8 27186C10 */ addiu $t8, %lo(D_80126C10) # addiu $t8, $t8, 0x6c10 -/* B0AB5C 800939BC 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AB60 800939C0 3C0FDE00 */ lui $t7, 0xde00 -/* B0AB64 800939C4 3C068014 */ lui $a2, %hi(D_8013EB5C) # $a2, 0x8014 -/* B0AB68 800939C8 246E0008 */ addiu $t6, $v1, 8 -/* B0AB6C 800939CC ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0AB70 800939D0 24C6EB5C */ addiu $a2, %lo(D_8013EB5C) # addiu $a2, $a2, -0x14a4 -/* B0AB74 800939D4 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AB78 800939D8 24070541 */ li $a3, 1345 -/* B0AB7C 800939DC AC780004 */ sw $t8, 4($v1) -/* B0AB80 800939E0 0C031AD5 */ jal func_800C6B54 -/* B0AB84 800939E4 AC6F0000 */ sw $t7, ($v1) -/* B0AB88 800939E8 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AB8C 800939EC 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AB90 800939F0 03E00008 */ jr $ra -/* B0AB94 800939F4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800939F8.s b/asm/non_matchings/code/z_rcp/func_800939F8.s deleted file mode 100644 index 15c888775d..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800939F8.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EB68 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EB74 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800939F8 -/* B0AB98 800939F8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AB9C 800939FC AFBF0014 */ sw $ra, 0x14($sp) -/* B0ABA0 80093A00 00802825 */ move $a1, $a0 -/* B0ABA4 80093A04 3C068014 */ lui $a2, %hi(D_8013EB68) # $a2, 0x8014 -/* B0ABA8 80093A08 24C6EB68 */ addiu $a2, %lo(D_8013EB68) # addiu $a2, $a2, -0x1498 -/* B0ABAC 80093A0C AFA50038 */ sw $a1, 0x38($sp) -/* B0ABB0 80093A10 27A40024 */ addiu $a0, $sp, 0x24 -/* B0ABB4 80093A14 0C031AB1 */ jal func_800C6AC4 -/* B0ABB8 80093A18 2407054D */ li $a3, 1357 -/* B0ABBC 80093A1C 8FA50038 */ lw $a1, 0x38($sp) -/* B0ABC0 80093A20 3C188012 */ lui $t8, %hi(D_80126C40) # $t8, 0x8012 -/* B0ABC4 80093A24 27186C40 */ addiu $t8, %lo(D_80126C40) # addiu $t8, $t8, 0x6c40 -/* B0ABC8 80093A28 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0ABCC 80093A2C 3C0FDE00 */ lui $t7, 0xde00 -/* B0ABD0 80093A30 3C068014 */ lui $a2, %hi(D_8013EB74) # $a2, 0x8014 -/* B0ABD4 80093A34 246E0008 */ addiu $t6, $v1, 8 -/* B0ABD8 80093A38 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0ABDC 80093A3C 24C6EB74 */ addiu $a2, %lo(D_8013EB74) # addiu $a2, $a2, -0x148c -/* B0ABE0 80093A40 27A40024 */ addiu $a0, $sp, 0x24 -/* B0ABE4 80093A44 24070551 */ li $a3, 1361 -/* B0ABE8 80093A48 AC780004 */ sw $t8, 4($v1) -/* B0ABEC 80093A4C 0C031AD5 */ jal func_800C6B54 -/* B0ABF0 80093A50 AC6F0000 */ sw $t7, ($v1) -/* B0ABF4 80093A54 8FBF0014 */ lw $ra, 0x14($sp) -/* B0ABF8 80093A58 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0ABFC 80093A5C 03E00008 */ jr $ra -/* B0AC00 80093A60 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093A64.s b/asm/non_matchings/code/z_rcp/func_80093A64.s deleted file mode 100644 index f982335099..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093A64.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EB80 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EB8C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093A64 -/* B0AC04 80093A64 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AC08 80093A68 AFBF0014 */ sw $ra, 0x14($sp) -/* B0AC0C 80093A6C 00802825 */ move $a1, $a0 -/* B0AC10 80093A70 3C068014 */ lui $a2, %hi(D_8013EB80) # $a2, 0x8014 -/* B0AC14 80093A74 24C6EB80 */ addiu $a2, %lo(D_8013EB80) # addiu $a2, $a2, -0x1480 -/* B0AC18 80093A78 AFA50038 */ sw $a1, 0x38($sp) -/* B0AC1C 80093A7C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AC20 80093A80 0C031AB1 */ jal func_800C6AC4 -/* B0AC24 80093A84 2407055D */ li $a3, 1373 -/* B0AC28 80093A88 8FA50038 */ lw $a1, 0x38($sp) -/* B0AC2C 80093A8C 3C188012 */ lui $t8, %hi(D_80126C70) # $t8, 0x8012 -/* B0AC30 80093A90 27186C70 */ addiu $t8, %lo(D_80126C70) # addiu $t8, $t8, 0x6c70 -/* B0AC34 80093A94 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AC38 80093A98 3C0FDE00 */ lui $t7, 0xde00 -/* B0AC3C 80093A9C 3C068014 */ lui $a2, %hi(D_8013EB8C) # $a2, 0x8014 -/* B0AC40 80093AA0 246E0008 */ addiu $t6, $v1, 8 -/* B0AC44 80093AA4 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0AC48 80093AA8 24C6EB8C */ addiu $a2, %lo(D_8013EB8C) # addiu $a2, $a2, -0x1474 -/* B0AC4C 80093AAC 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AC50 80093AB0 24070561 */ li $a3, 1377 -/* B0AC54 80093AB4 AC780004 */ sw $t8, 4($v1) -/* B0AC58 80093AB8 0C031AD5 */ jal func_800C6B54 -/* B0AC5C 80093ABC AC6F0000 */ sw $t7, ($v1) -/* B0AC60 80093AC0 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AC64 80093AC4 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AC68 80093AC8 03E00008 */ jr $ra -/* B0AC6C 80093ACC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093AD0.s b/asm/non_matchings/code/z_rcp/func_80093AD0.s deleted file mode 100644 index 4c3873cfba..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093AD0.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EB98 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EBA4 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093AD0 -/* B0AC70 80093AD0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AC74 80093AD4 AFBF0014 */ sw $ra, 0x14($sp) -/* B0AC78 80093AD8 00802825 */ move $a1, $a0 -/* B0AC7C 80093ADC 3C068014 */ lui $a2, %hi(D_8013EB98) # $a2, 0x8014 -/* B0AC80 80093AE0 24C6EB98 */ addiu $a2, %lo(D_8013EB98) # addiu $a2, $a2, -0x1468 -/* B0AC84 80093AE4 AFA50038 */ sw $a1, 0x38($sp) -/* B0AC88 80093AE8 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AC8C 80093AEC 0C031AB1 */ jal func_800C6AC4 -/* B0AC90 80093AF0 2407056D */ li $a3, 1389 -/* B0AC94 80093AF4 8FA50038 */ lw $a1, 0x38($sp) -/* B0AC98 80093AF8 3C188012 */ lui $t8, %hi(D_80126CA0) # $t8, 0x8012 -/* B0AC9C 80093AFC 27186CA0 */ addiu $t8, %lo(D_80126CA0) # addiu $t8, $t8, 0x6ca0 -/* B0ACA0 80093B00 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0ACA4 80093B04 3C0FDE00 */ lui $t7, 0xde00 -/* B0ACA8 80093B08 3C068014 */ lui $a2, %hi(D_8013EBA4) # $a2, 0x8014 -/* B0ACAC 80093B0C 246E0008 */ addiu $t6, $v1, 8 -/* B0ACB0 80093B10 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0ACB4 80093B14 24C6EBA4 */ addiu $a2, %lo(D_8013EBA4) # addiu $a2, $a2, -0x145c -/* B0ACB8 80093B18 27A40024 */ addiu $a0, $sp, 0x24 -/* B0ACBC 80093B1C 24070571 */ li $a3, 1393 -/* B0ACC0 80093B20 AC780004 */ sw $t8, 4($v1) -/* B0ACC4 80093B24 0C031AD5 */ jal func_800C6B54 -/* B0ACC8 80093B28 AC6F0000 */ sw $t7, ($v1) -/* B0ACCC 80093B2C 8FBF0014 */ lw $ra, 0x14($sp) -/* B0ACD0 80093B30 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0ACD4 80093B34 03E00008 */ jr $ra -/* B0ACD8 80093B38 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093B3C.s b/asm/non_matchings/code/z_rcp/func_80093B3C.s deleted file mode 100644 index bed762b1c9..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093B3C.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EBB0 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EBBC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093B3C -/* B0ACDC 80093B3C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0ACE0 80093B40 AFBF0014 */ sw $ra, 0x14($sp) -/* B0ACE4 80093B44 00802825 */ move $a1, $a0 -/* B0ACE8 80093B48 3C068014 */ lui $a2, %hi(D_8013EBB0) # $a2, 0x8014 -/* B0ACEC 80093B4C 24C6EBB0 */ addiu $a2, %lo(D_8013EBB0) # addiu $a2, $a2, -0x1450 -/* B0ACF0 80093B50 AFA50038 */ sw $a1, 0x38($sp) -/* B0ACF4 80093B54 27A40024 */ addiu $a0, $sp, 0x24 -/* B0ACF8 80093B58 0C031AB1 */ jal func_800C6AC4 -/* B0ACFC 80093B5C 2407057D */ li $a3, 1405 -/* B0AD00 80093B60 8FA50038 */ lw $a1, 0x38($sp) -/* B0AD04 80093B64 3C188012 */ lui $t8, %hi(D_80126CD0) # $t8, 0x8012 -/* B0AD08 80093B68 27186CD0 */ addiu $t8, %lo(D_80126CD0) # addiu $t8, $t8, 0x6cd0 -/* B0AD0C 80093B6C 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0AD10 80093B70 3C0FDE00 */ lui $t7, 0xde00 -/* B0AD14 80093B74 3C068014 */ lui $a2, %hi(D_8013EBBC) # $a2, 0x8014 -/* B0AD18 80093B78 246E0008 */ addiu $t6, $v1, 8 -/* B0AD1C 80093B7C ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0AD20 80093B80 24C6EBBC */ addiu $a2, %lo(D_8013EBBC) # addiu $a2, $a2, -0x1444 -/* B0AD24 80093B84 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AD28 80093B88 24070581 */ li $a3, 1409 -/* B0AD2C 80093B8C AC780004 */ sw $t8, 4($v1) -/* B0AD30 80093B90 0C031AD5 */ jal func_800C6B54 -/* B0AD34 80093B94 AC6F0000 */ sw $t7, ($v1) -/* B0AD38 80093B98 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AD3C 80093B9C 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AD40 80093BA0 03E00008 */ jr $ra -/* B0AD44 80093BA4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093BA8.s b/asm/non_matchings/code/z_rcp/func_80093BA8.s deleted file mode 100644 index 6f63f9fa73..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093BA8.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EBC8 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EBD4 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093BA8 -/* B0AD48 80093BA8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AD4C 80093BAC AFBF0014 */ sw $ra, 0x14($sp) -/* B0AD50 80093BB0 00802825 */ move $a1, $a0 -/* B0AD54 80093BB4 3C068014 */ lui $a2, %hi(D_8013EBC8) # $a2, 0x8014 -/* B0AD58 80093BB8 24C6EBC8 */ addiu $a2, %lo(D_8013EBC8) # addiu $a2, $a2, -0x1438 -/* B0AD5C 80093BBC AFA50038 */ sw $a1, 0x38($sp) -/* B0AD60 80093BC0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AD64 80093BC4 0C031AB1 */ jal func_800C6AC4 -/* B0AD68 80093BC8 2407058D */ li $a3, 1421 -/* B0AD6C 80093BCC 8FA50038 */ lw $a1, 0x38($sp) -/* B0AD70 80093BD0 3C188012 */ lui $t8, %hi(D_80126760) # $t8, 0x8012 -/* B0AD74 80093BD4 27186760 */ addiu $t8, %lo(D_80126760) # addiu $t8, $t8, 0x6760 -/* B0AD78 80093BD8 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AD7C 80093BDC 3C0FDE00 */ lui $t7, 0xde00 -/* B0AD80 80093BE0 3C068014 */ lui $a2, %hi(D_8013EBD4) # $a2, 0x8014 -/* B0AD84 80093BE4 246E0008 */ addiu $t6, $v1, 8 -/* B0AD88 80093BE8 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0AD8C 80093BEC 24C6EBD4 */ addiu $a2, %lo(D_8013EBD4) # addiu $a2, $a2, -0x142c -/* B0AD90 80093BF0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AD94 80093BF4 24070591 */ li $a3, 1425 -/* B0AD98 80093BF8 AC780004 */ sw $t8, 4($v1) -/* B0AD9C 80093BFC 0C031AD5 */ jal func_800C6B54 -/* B0ADA0 80093C00 AC6F0000 */ sw $t7, ($v1) -/* B0ADA4 80093C04 8FBF0014 */ lw $ra, 0x14($sp) -/* B0ADA8 80093C08 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0ADAC 80093C0C 03E00008 */ jr $ra -/* B0ADB0 80093C10 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093C14.s b/asm/non_matchings/code/z_rcp/func_80093C14.s deleted file mode 100644 index c39dcea04f..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093C14.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EBE0 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EBEC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093C14 -/* B0ADB4 80093C14 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0ADB8 80093C18 AFBF0014 */ sw $ra, 0x14($sp) -/* B0ADBC 80093C1C 00802825 */ move $a1, $a0 -/* B0ADC0 80093C20 3C068014 */ lui $a2, %hi(D_8013EBE0) # $a2, 0x8014 -/* B0ADC4 80093C24 24C6EBE0 */ addiu $a2, %lo(D_8013EBE0) # addiu $a2, $a2, -0x1420 -/* B0ADC8 80093C28 AFA50038 */ sw $a1, 0x38($sp) -/* B0ADCC 80093C2C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0ADD0 80093C30 0C031AB1 */ jal func_800C6AC4 -/* B0ADD4 80093C34 2407059F */ li $a3, 1439 -/* B0ADD8 80093C38 8FA50038 */ lw $a1, 0x38($sp) -/* B0ADDC 80093C3C 3C188012 */ lui $t8, %hi(D_80126730) # $t8, 0x8012 -/* B0ADE0 80093C40 27186730 */ addiu $t8, %lo(D_80126730) # addiu $t8, $t8, 0x6730 -/* B0ADE4 80093C44 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0ADE8 80093C48 3C0FDE00 */ lui $t7, 0xde00 -/* B0ADEC 80093C4C 3C068014 */ lui $a2, %hi(D_8013EBEC) # $a2, 0x8014 -/* B0ADF0 80093C50 246E0008 */ addiu $t6, $v1, 8 -/* B0ADF4 80093C54 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0ADF8 80093C58 24C6EBEC */ addiu $a2, %lo(D_8013EBEC) # addiu $a2, $a2, -0x1414 -/* B0ADFC 80093C5C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AE00 80093C60 240705A3 */ li $a3, 1443 -/* B0AE04 80093C64 AC780004 */ sw $t8, 4($v1) -/* B0AE08 80093C68 0C031AD5 */ jal func_800C6B54 -/* B0AE0C 80093C6C AC6F0000 */ sw $t7, ($v1) -/* B0AE10 80093C70 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AE14 80093C74 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AE18 80093C78 03E00008 */ jr $ra -/* B0AE1C 80093C7C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093C80.s b/asm/non_matchings/code/z_rcp/func_80093C80.s deleted file mode 100644 index dcf76adf35..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093C80.s +++ /dev/null @@ -1,51 +0,0 @@ -.rdata -glabel D_8013EBF8 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EC04 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093C80 -/* B0AE20 80093C80 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AE24 80093C84 AFBF0014 */ sw $ra, 0x14($sp) -/* B0AE28 80093C88 AFA40038 */ sw $a0, 0x38($sp) -/* B0AE2C 80093C8C 8C850000 */ lw $a1, ($a0) -/* B0AE30 80093C90 00A02025 */ move $a0, $a1 -/* B0AE34 80093C94 0C024F46 */ jal func_80093D18 -/* B0AE38 80093C98 AFA50034 */ sw $a1, 0x34($sp) -/* B0AE3C 80093C9C 8FAF0038 */ lw $t7, 0x38($sp) -/* B0AE40 80093CA0 3C180001 */ lui $t8, 1 -/* B0AE44 80093CA4 24010003 */ li $at, 3 -/* B0AE48 80093CA8 030FC021 */ addu $t8, $t8, $t7 -/* B0AE4C 80093CAC 93181CBF */ lbu $t8, 0x1cbf($t8) -/* B0AE50 80093CB0 8FA50034 */ lw $a1, 0x34($sp) -/* B0AE54 80093CB4 27A40020 */ addiu $a0, $sp, 0x20 -/* B0AE58 80093CB8 17010013 */ bne $t8, $at, .L80093D08 -/* B0AE5C 80093CBC 3C068014 */ lui $a2, %hi(D_8013EBF8) # $a2, 0x8014 -/* B0AE60 80093CC0 24C6EBF8 */ addiu $a2, %lo(D_8013EBF8) # addiu $a2, $a2, -0x1408 -/* B0AE64 80093CC4 240705B4 */ li $a3, 1460 -/* B0AE68 80093CC8 0C031AB1 */ jal func_800C6AC4 -/* B0AE6C 80093CCC AFA50034 */ sw $a1, 0x34($sp) -/* B0AE70 80093CD0 8FA50034 */ lw $a1, 0x34($sp) -/* B0AE74 80093CD4 3C08E300 */ lui $t0, (0xE3001801 >> 16) # lui $t0, 0xe300 -/* B0AE78 80093CD8 35081801 */ ori $t0, (0xE3001801 & 0xFFFF) # ori $t0, $t0, 0x1801 -/* B0AE7C 80093CDC 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AE80 80093CE0 240900C0 */ li $t1, 192 -/* B0AE84 80093CE4 3C068014 */ lui $a2, %hi(D_8013EC04) # $a2, 0x8014 -/* B0AE88 80093CE8 24790008 */ addiu $t9, $v1, 8 -/* B0AE8C 80093CEC ACB902C0 */ sw $t9, 0x2c0($a1) -/* B0AE90 80093CF0 24C6EC04 */ addiu $a2, %lo(D_8013EC04) # addiu $a2, $a2, -0x13fc -/* B0AE94 80093CF4 27A40020 */ addiu $a0, $sp, 0x20 -/* B0AE98 80093CF8 240705B6 */ li $a3, 1462 -/* B0AE9C 80093CFC AC690004 */ sw $t1, 4($v1) -/* B0AEA0 80093D00 0C031AD5 */ jal func_800C6B54 -/* B0AEA4 80093D04 AC680000 */ sw $t0, ($v1) -.L80093D08: -/* B0AEA8 80093D08 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AEAC 80093D0C 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AEB0 80093D10 03E00008 */ jr $ra -/* B0AEB4 80093D14 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093D18.s b/asm/non_matchings/code/z_rcp/func_80093D18.s deleted file mode 100644 index 0e62052dce..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093D18.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EC10 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EC1C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093D18 -/* B0AEB8 80093D18 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AEBC 80093D1C AFBF0014 */ sw $ra, 0x14($sp) -/* B0AEC0 80093D20 00802825 */ move $a1, $a0 -/* B0AEC4 80093D24 3C068014 */ lui $a2, %hi(D_8013EC10) # $a2, 0x8014 -/* B0AEC8 80093D28 24C6EC10 */ addiu $a2, %lo(D_8013EC10) # addiu $a2, $a2, -0x13f0 -/* B0AECC 80093D2C AFA50038 */ sw $a1, 0x38($sp) -/* B0AED0 80093D30 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AED4 80093D34 0C031AB1 */ jal func_800C6AC4 -/* B0AED8 80093D38 240705C3 */ li $a3, 1475 -/* B0AEDC 80093D3C 8FA50038 */ lw $a1, 0x38($sp) -/* B0AEE0 80093D40 3C188012 */ lui $t8, %hi(D_80126730) # $t8, 0x8012 -/* B0AEE4 80093D44 27186730 */ addiu $t8, %lo(D_80126730) # addiu $t8, $t8, 0x6730 -/* B0AEE8 80093D48 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AEEC 80093D4C 3C0FDE00 */ lui $t7, 0xde00 -/* B0AEF0 80093D50 3C068014 */ lui $a2, %hi(D_8013EC1C) # $a2, 0x8014 -/* B0AEF4 80093D54 246E0008 */ addiu $t6, $v1, 8 -/* B0AEF8 80093D58 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0AEFC 80093D5C 24C6EC1C */ addiu $a2, %lo(D_8013EC1C) # addiu $a2, $a2, -0x13e4 -/* B0AF00 80093D60 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AF04 80093D64 240705C7 */ li $a3, 1479 -/* B0AF08 80093D68 AC780004 */ sw $t8, 4($v1) -/* B0AF0C 80093D6C 0C031AD5 */ jal func_800C6B54 -/* B0AF10 80093D70 AC6F0000 */ sw $t7, ($v1) -/* B0AF14 80093D74 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AF18 80093D78 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AF1C 80093D7C 03E00008 */ jr $ra -/* B0AF20 80093D80 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093D84.s b/asm/non_matchings/code/z_rcp/func_80093D84.s deleted file mode 100644 index 5565551883..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093D84.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EC28 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EC34 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093D84 -/* B0AF24 80093D84 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AF28 80093D88 AFBF0014 */ sw $ra, 0x14($sp) -/* B0AF2C 80093D8C 00802825 */ move $a1, $a0 -/* B0AF30 80093D90 3C068014 */ lui $a2, %hi(D_8013EC28) # $a2, 0x8014 -/* B0AF34 80093D94 24C6EC28 */ addiu $a2, %lo(D_8013EC28) # addiu $a2, $a2, -0x13d8 -/* B0AF38 80093D98 AFA50038 */ sw $a1, 0x38($sp) -/* B0AF3C 80093D9C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AF40 80093DA0 0C031AB1 */ jal func_800C6AC4 -/* B0AF44 80093DA4 240705D3 */ li $a3, 1491 -/* B0AF48 80093DA8 8FA50038 */ lw $a1, 0x38($sp) -/* B0AF4C 80093DAC 3C188012 */ lui $t8, %hi(D_80126730) # $t8, 0x8012 -/* B0AF50 80093DB0 27186730 */ addiu $t8, %lo(D_80126730) # addiu $t8, $t8, 0x6730 -/* B0AF54 80093DB4 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0AF58 80093DB8 3C0FDE00 */ lui $t7, 0xde00 -/* B0AF5C 80093DBC 3C068014 */ lui $a2, %hi(D_8013EC34) # $a2, 0x8014 -/* B0AF60 80093DC0 246E0008 */ addiu $t6, $v1, 8 -/* B0AF64 80093DC4 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0AF68 80093DC8 24C6EC34 */ addiu $a2, %lo(D_8013EC34) # addiu $a2, $a2, -0x13cc -/* B0AF6C 80093DCC 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AF70 80093DD0 240705D7 */ li $a3, 1495 -/* B0AF74 80093DD4 AC780004 */ sw $t8, 4($v1) -/* B0AF78 80093DD8 0C031AD5 */ jal func_800C6B54 -/* B0AF7C 80093DDC AC6F0000 */ sw $t7, ($v1) -/* B0AF80 80093DE0 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AF84 80093DE4 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AF88 80093DE8 03E00008 */ jr $ra -/* B0AF8C 80093DEC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093DF0.s b/asm/non_matchings/code/z_rcp/func_80093DF0.s deleted file mode 100644 index 7a5a3b1d1e..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093DF0.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EC40 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EC4C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093DF0 -/* B0AF90 80093DF0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AF94 80093DF4 AFBF0014 */ sw $ra, 0x14($sp) -/* B0AF98 80093DF8 00802825 */ move $a1, $a0 -/* B0AF9C 80093DFC 3C068014 */ lui $a2, %hi(D_8013EC40) # $a2, 0x8014 -/* B0AFA0 80093E00 24C6EC40 */ addiu $a2, %lo(D_8013EC40) # addiu $a2, $a2, -0x13c0 -/* B0AFA4 80093E04 AFA50038 */ sw $a1, 0x38($sp) -/* B0AFA8 80093E08 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AFAC 80093E0C 0C031AB1 */ jal func_800C6AC4 -/* B0AFB0 80093E10 240705E3 */ li $a3, 1507 -/* B0AFB4 80093E14 8FA50038 */ lw $a1, 0x38($sp) -/* B0AFB8 80093E18 3C188012 */ lui $t8, %hi(D_80126850) # $t8, 0x8012 -/* B0AFBC 80093E1C 27186850 */ addiu $t8, %lo(D_80126850) # addiu $t8, $t8, 0x6850 -/* B0AFC0 80093E20 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AFC4 80093E24 3C0FDE00 */ lui $t7, 0xde00 -/* B0AFC8 80093E28 3C068014 */ lui $a2, %hi(D_8013EC4C) # $a2, 0x8014 -/* B0AFCC 80093E2C 246E0008 */ addiu $t6, $v1, 8 -/* B0AFD0 80093E30 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0AFD4 80093E34 24C6EC4C */ addiu $a2, %lo(D_8013EC4C) # addiu $a2, $a2, -0x13b4 -/* B0AFD8 80093E38 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AFDC 80093E3C 240705E7 */ li $a3, 1511 -/* B0AFE0 80093E40 AC780004 */ sw $t8, 4($v1) -/* B0AFE4 80093E44 0C031AD5 */ jal func_800C6B54 -/* B0AFE8 80093E48 AC6F0000 */ sw $t7, ($v1) -/* B0AFEC 80093E4C 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AFF0 80093E50 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AFF4 80093E54 03E00008 */ jr $ra -/* B0AFF8 80093E58 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093E5C.s b/asm/non_matchings/code/z_rcp/func_80093E5C.s deleted file mode 100644 index 5cc52b222c..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093E5C.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EC58 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EC64 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093E5C -/* B0AFFC 80093E5C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B000 80093E60 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B004 80093E64 00802825 */ move $a1, $a0 -/* B0B008 80093E68 3C068014 */ lui $a2, %hi(D_8013EC58) # $a2, 0x8014 -/* B0B00C 80093E6C 24C6EC58 */ addiu $a2, %lo(D_8013EC58) # addiu $a2, $a2, -0x13a8 -/* B0B010 80093E70 AFA50038 */ sw $a1, 0x38($sp) -/* B0B014 80093E74 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B018 80093E78 0C031AB1 */ jal func_800C6AC4 -/* B0B01C 80093E7C 240705F3 */ li $a3, 1523 -/* B0B020 80093E80 8FA50038 */ lw $a1, 0x38($sp) -/* B0B024 80093E84 3C188012 */ lui $t8, %hi(D_80126880) # $t8, 0x8012 -/* B0B028 80093E88 27186880 */ addiu $t8, %lo(D_80126880) # addiu $t8, $t8, 0x6880 -/* B0B02C 80093E8C 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B030 80093E90 3C0FDE00 */ lui $t7, 0xde00 -/* B0B034 80093E94 3C068014 */ lui $a2, %hi(D_8013EC64) # $a2, 0x8014 -/* B0B038 80093E98 246E0008 */ addiu $t6, $v1, 8 -/* B0B03C 80093E9C ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B040 80093EA0 24C6EC64 */ addiu $a2, %lo(D_8013EC64) # addiu $a2, $a2, -0x139c -/* B0B044 80093EA4 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B048 80093EA8 240705F7 */ li $a3, 1527 -/* B0B04C 80093EAC AC780004 */ sw $t8, 4($v1) -/* B0B050 80093EB0 0C031AD5 */ jal func_800C6B54 -/* B0B054 80093EB4 AC6F0000 */ sw $t7, ($v1) -/* B0B058 80093EB8 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B05C 80093EBC 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B060 80093EC0 03E00008 */ jr $ra -/* B0B064 80093EC4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093EC8.s b/asm/non_matchings/code/z_rcp/func_80093EC8.s deleted file mode 100644 index 201a8b3a3a..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093EC8.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EC70 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EC7C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093EC8 -/* B0B068 80093EC8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B06C 80093ECC AFBF0014 */ sw $ra, 0x14($sp) -/* B0B070 80093ED0 00802825 */ move $a1, $a0 -/* B0B074 80093ED4 3C068014 */ lui $a2, %hi(D_8013EC70) # $a2, 0x8014 -/* B0B078 80093ED8 24C6EC70 */ addiu $a2, %lo(D_8013EC70) # addiu $a2, $a2, -0x1390 -/* B0B07C 80093EDC AFA50038 */ sw $a1, 0x38($sp) -/* B0B080 80093EE0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B084 80093EE4 0C031AB1 */ jal func_800C6AC4 -/* B0B088 80093EE8 24070603 */ li $a3, 1539 -/* B0B08C 80093EEC 8FA50038 */ lw $a1, 0x38($sp) -/* B0B090 80093EF0 3C188012 */ lui $t8, %hi(D_801268B0) # $t8, 0x8012 -/* B0B094 80093EF4 271868B0 */ addiu $t8, %lo(D_801268B0) # addiu $t8, $t8, 0x68b0 -/* B0B098 80093EF8 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B09C 80093EFC 3C0FDE00 */ lui $t7, 0xde00 -/* B0B0A0 80093F00 3C068014 */ lui $a2, %hi(D_8013EC7C) # $a2, 0x8014 -/* B0B0A4 80093F04 246E0008 */ addiu $t6, $v1, 8 -/* B0B0A8 80093F08 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B0AC 80093F0C 24C6EC7C */ addiu $a2, %lo(D_8013EC7C) # addiu $a2, $a2, -0x1384 -/* B0B0B0 80093F10 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B0B4 80093F14 24070607 */ li $a3, 1543 -/* B0B0B8 80093F18 AC780004 */ sw $t8, 4($v1) -/* B0B0BC 80093F1C 0C031AD5 */ jal func_800C6B54 -/* B0B0C0 80093F20 AC6F0000 */ sw $t7, ($v1) -/* B0B0C4 80093F24 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B0C8 80093F28 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B0CC 80093F2C 03E00008 */ jr $ra -/* B0B0D0 80093F30 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093F34.s b/asm/non_matchings/code/z_rcp/func_80093F34.s deleted file mode 100644 index 3ad4891cea..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093F34.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80093F34 -/* B0B0D4 80093F34 00801025 */ move $v0, $a0 -/* B0B0D8 80093F38 3C0F8012 */ lui $t7, %hi(D_80126E80) # $t7, 0x8012 -/* B0B0DC 80093F3C 25EF6E80 */ addiu $t7, %lo(D_80126E80) # addiu $t7, $t7, 0x6e80 -/* B0B0E0 80093F40 3C0EDE00 */ lui $t6, 0xde00 -/* B0B0E4 80093F44 AC4E0000 */ sw $t6, ($v0) -/* B0B0E8 80093F48 AC4F0004 */ sw $t7, 4($v0) -/* B0B0EC 80093F4C 24840008 */ addiu $a0, $a0, 8 -/* B0B0F0 80093F50 03E00008 */ jr $ra -/* B0B0F4 80093F54 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80093F58.s b/asm/non_matchings/code/z_rcp/func_80093F58.s deleted file mode 100644 index 0d59421f08..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093F58.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80093F58 -/* B0B0F8 80093F58 00801025 */ move $v0, $a0 -/* B0B0FC 80093F5C 3C0F8012 */ lui $t7, %hi(D_801268E0) # $t7, 0x8012 -/* B0B100 80093F60 25EF68E0 */ addiu $t7, %lo(D_801268E0) # addiu $t7, $t7, 0x68e0 -/* B0B104 80093F64 3C0EDE00 */ lui $t6, 0xde00 -/* B0B108 80093F68 AC4E0000 */ sw $t6, ($v0) -/* B0B10C 80093F6C AC4F0004 */ sw $t7, 4($v0) -/* B0B110 80093F70 24840008 */ addiu $a0, $a0, 8 -/* B0B114 80093F74 03E00008 */ jr $ra -/* B0B118 80093F78 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80093F7C.s b/asm/non_matchings/code/z_rcp/func_80093F7C.s deleted file mode 100644 index 5dcd31bc40..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093F7C.s +++ /dev/null @@ -1,35 +0,0 @@ -.rdata -glabel D_8013EC88 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EC94 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093F7C -/* B0B11C 80093F7C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B0B120 80093F80 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B124 80093F84 AFA40030 */ sw $a0, 0x30($sp) -/* B0B128 80093F88 3C068014 */ lui $a2, %hi(D_8013EC88) # $a2, 0x8014 -/* B0B12C 80093F8C 24C6EC88 */ addiu $a2, %lo(D_8013EC88) # addiu $a2, $a2, -0x1378 -/* B0B130 80093F90 8FA50030 */ lw $a1, 0x30($sp) -/* B0B134 80093F94 27A4001C */ addiu $a0, $sp, 0x1c -/* B0B138 80093F98 0C031AB1 */ jal func_800C6AC4 -/* B0B13C 80093F9C 24070621 */ li $a3, 1569 -/* B0B140 80093FA0 8FAE0030 */ lw $t6, 0x30($sp) -/* B0B144 80093FA4 0C024FD6 */ jal func_80093F58 -/* B0B148 80093FA8 8DC402C0 */ lw $a0, 0x2c0($t6) -/* B0B14C 80093FAC 8FA50030 */ lw $a1, 0x30($sp) -/* B0B150 80093FB0 3C068014 */ lui $a2, %hi(D_8013EC94) # $a2, 0x8014 -/* B0B154 80093FB4 24C6EC94 */ addiu $a2, %lo(D_8013EC94) # addiu $a2, $a2, -0x136c -/* B0B158 80093FB8 27A4001C */ addiu $a0, $sp, 0x1c -/* B0B15C 80093FBC 24070625 */ li $a3, 1573 -/* B0B160 80093FC0 0C031AD5 */ jal func_800C6B54 -/* B0B164 80093FC4 ACA202C0 */ sw $v0, 0x2c0($a1) -/* B0B168 80093FC8 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B16C 80093FCC 27BD0030 */ addiu $sp, $sp, 0x30 -/* B0B170 80093FD0 03E00008 */ jr $ra -/* B0B174 80093FD4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093FD8.s b/asm/non_matchings/code/z_rcp/func_80093FD8.s deleted file mode 100644 index 25c5ccdd2b..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093FD8.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ECA0 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ECAC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093FD8 -/* B0B178 80093FD8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B17C 80093FDC AFBF0014 */ sw $ra, 0x14($sp) -/* B0B180 80093FE0 00802825 */ move $a1, $a0 -/* B0B184 80093FE4 3C068014 */ lui $a2, %hi(D_8013ECA0) # $a2, 0x8014 -/* B0B188 80093FE8 24C6ECA0 */ addiu $a2, %lo(D_8013ECA0) # addiu $a2, $a2, -0x1360 -/* B0B18C 80093FEC AFA50038 */ sw $a1, 0x38($sp) -/* B0B190 80093FF0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B194 80093FF4 0C031AB1 */ jal func_800C6AC4 -/* B0B198 80093FF8 24070631 */ li $a3, 1585 -/* B0B19C 80093FFC 8FA50038 */ lw $a1, 0x38($sp) -/* B0B1A0 80094000 3C188012 */ lui $t8, %hi(D_80126910) # $t8, 0x8012 -/* B0B1A4 80094004 27186910 */ addiu $t8, %lo(D_80126910) # addiu $t8, $t8, 0x6910 -/* B0B1A8 80094008 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B1AC 8009400C 3C0FDE00 */ lui $t7, 0xde00 -/* B0B1B0 80094010 3C068014 */ lui $a2, %hi(D_8013ECAC) # $a2, 0x8014 -/* B0B1B4 80094014 246E0008 */ addiu $t6, $v1, 8 -/* B0B1B8 80094018 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B1BC 8009401C 24C6ECAC */ addiu $a2, %lo(D_8013ECAC) # addiu $a2, $a2, -0x1354 -/* B0B1C0 80094020 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B1C4 80094024 24070635 */ li $a3, 1589 -/* B0B1C8 80094028 AC780004 */ sw $t8, 4($v1) -/* B0B1CC 8009402C 0C031AD5 */ jal func_800C6B54 -/* B0B1D0 80094030 AC6F0000 */ sw $t7, ($v1) -/* B0B1D4 80094034 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B1D8 80094038 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B1DC 8009403C 03E00008 */ jr $ra -/* B0B1E0 80094040 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094044.s b/asm/non_matchings/code/z_rcp/func_80094044.s deleted file mode 100644 index 6a10642c2b..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094044.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ECB8 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ECC4 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094044 -/* B0B1E4 80094044 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B1E8 80094048 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B1EC 8009404C 00802825 */ move $a1, $a0 -/* B0B1F0 80094050 3C068014 */ lui $a2, %hi(D_8013ECB8) # $a2, 0x8014 -/* B0B1F4 80094054 24C6ECB8 */ addiu $a2, %lo(D_8013ECB8) # addiu $a2, $a2, -0x1348 -/* B0B1F8 80094058 AFA50038 */ sw $a1, 0x38($sp) -/* B0B1FC 8009405C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B200 80094060 0C031AB1 */ jal func_800C6AC4 -/* B0B204 80094064 24070641 */ li $a3, 1601 -/* B0B208 80094068 8FA50038 */ lw $a1, 0x38($sp) -/* B0B20C 8009406C 3C188012 */ lui $t8, %hi(D_80126AC0) # $t8, 0x8012 -/* B0B210 80094070 27186AC0 */ addiu $t8, %lo(D_80126AC0) # addiu $t8, $t8, 0x6ac0 -/* B0B214 80094074 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0B218 80094078 3C0FDE00 */ lui $t7, 0xde00 -/* B0B21C 8009407C 3C068014 */ lui $a2, %hi(D_8013ECC4) # $a2, 0x8014 -/* B0B220 80094080 246E0008 */ addiu $t6, $v1, 8 -/* B0B224 80094084 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0B228 80094088 24C6ECC4 */ addiu $a2, %lo(D_8013ECC4) # addiu $a2, $a2, -0x133c -/* B0B22C 8009408C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B230 80094090 24070645 */ li $a3, 1605 -/* B0B234 80094094 AC780004 */ sw $t8, 4($v1) -/* B0B238 80094098 0C031AD5 */ jal func_800C6B54 -/* B0B23C 8009409C AC6F0000 */ sw $t7, ($v1) -/* B0B240 800940A0 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B244 800940A4 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B248 800940A8 03E00008 */ jr $ra -/* B0B24C 800940AC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800940B0.s b/asm/non_matchings/code/z_rcp/func_800940B0.s deleted file mode 100644 index 7acf428572..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800940B0.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ECD0 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ECDC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800940B0 -/* B0B250 800940B0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B254 800940B4 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B258 800940B8 00802825 */ move $a1, $a0 -/* B0B25C 800940BC 3C068014 */ lui $a2, %hi(D_8013ECD0) # $a2, 0x8014 -/* B0B260 800940C0 24C6ECD0 */ addiu $a2, %lo(D_8013ECD0) # addiu $a2, $a2, -0x1330 -/* B0B264 800940C4 AFA50038 */ sw $a1, 0x38($sp) -/* B0B268 800940C8 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B26C 800940CC 0C031AB1 */ jal func_800C6AC4 -/* B0B270 800940D0 24070651 */ li $a3, 1617 -/* B0B274 800940D4 8FA50038 */ lw $a1, 0x38($sp) -/* B0B278 800940D8 3C188012 */ lui $t8, %hi(D_80126940) # $t8, 0x8012 -/* B0B27C 800940DC 27186940 */ addiu $t8, %lo(D_80126940) # addiu $t8, $t8, 0x6940 -/* B0B280 800940E0 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B284 800940E4 3C0FDE00 */ lui $t7, 0xde00 -/* B0B288 800940E8 3C068014 */ lui $a2, %hi(D_8013ECDC) # $a2, 0x8014 -/* B0B28C 800940EC 246E0008 */ addiu $t6, $v1, 8 -/* B0B290 800940F0 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B294 800940F4 24C6ECDC */ addiu $a2, %lo(D_8013ECDC) # addiu $a2, $a2, -0x1324 -/* B0B298 800940F8 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B29C 800940FC 24070655 */ li $a3, 1621 -/* B0B2A0 80094100 AC780004 */ sw $t8, 4($v1) -/* B0B2A4 80094104 0C031AD5 */ jal func_800C6B54 -/* B0B2A8 80094108 AC6F0000 */ sw $t7, ($v1) -/* B0B2AC 8009410C 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B2B0 80094110 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B2B4 80094114 03E00008 */ jr $ra -/* B0B2B8 80094118 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_8009411C.s b/asm/non_matchings/code/z_rcp/func_8009411C.s deleted file mode 100644 index 6a45eeb4f5..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009411C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8009411C -/* B0B2BC 8009411C 00801025 */ move $v0, $a0 -/* B0B2C0 80094120 3C0F8012 */ lui $t7, %hi(D_801267C0) # $t7, 0x8012 -/* B0B2C4 80094124 25EF67C0 */ addiu $t7, %lo(D_801267C0) # addiu $t7, $t7, 0x67c0 -/* B0B2C8 80094128 3C0EDE00 */ lui $t6, 0xde00 -/* B0B2CC 8009412C AC4E0000 */ sw $t6, ($v0) -/* B0B2D0 80094130 AC4F0004 */ sw $t7, 4($v0) -/* B0B2D4 80094134 24840008 */ addiu $a0, $a0, 8 -/* B0B2D8 80094138 03E00008 */ jr $ra -/* B0B2DC 8009413C 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80094140.s b/asm/non_matchings/code/z_rcp/func_80094140.s deleted file mode 100644 index 79f0f4a1ed..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094140.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ECE8 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ECF4 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094140 -/* B0B2E0 80094140 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B2E4 80094144 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B2E8 80094148 00802825 */ move $a1, $a0 -/* B0B2EC 8009414C 3C068014 */ lui $a2, %hi(D_8013ECE8) # $a2, 0x8014 -/* B0B2F0 80094150 24C6ECE8 */ addiu $a2, %lo(D_8013ECE8) # addiu $a2, $a2, -0x1318 -/* B0B2F4 80094154 AFA50038 */ sw $a1, 0x38($sp) -/* B0B2F8 80094158 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B2FC 8009415C 0C031AB1 */ jal func_800C6AC4 -/* B0B300 80094160 24070668 */ li $a3, 1640 -/* B0B304 80094164 8FA50038 */ lw $a1, 0x38($sp) -/* B0B308 80094168 3C188012 */ lui $t8, %hi(D_801267C0) # $t8, 0x8012 -/* B0B30C 8009416C 271867C0 */ addiu $t8, %lo(D_801267C0) # addiu $t8, $t8, 0x67c0 -/* B0B310 80094170 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B314 80094174 3C0FDE00 */ lui $t7, 0xde00 -/* B0B318 80094178 3C068014 */ lui $a2, %hi(D_8013ECF4) # $a2, 0x8014 -/* B0B31C 8009417C 246E0008 */ addiu $t6, $v1, 8 -/* B0B320 80094180 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B324 80094184 24C6ECF4 */ addiu $a2, %lo(D_8013ECF4) # addiu $a2, $a2, -0x130c -/* B0B328 80094188 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B32C 8009418C 2407066C */ li $a3, 1644 -/* B0B330 80094190 AC780004 */ sw $t8, 4($v1) -/* B0B334 80094194 0C031AD5 */ jal func_800C6B54 -/* B0B338 80094198 AC6F0000 */ sw $t7, ($v1) -/* B0B33C 8009419C 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B340 800941A0 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B344 800941A4 03E00008 */ jr $ra -/* B0B348 800941A8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800941AC.s b/asm/non_matchings/code/z_rcp/func_800941AC.s deleted file mode 100644 index f0838ab4f8..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800941AC.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ED00 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ED0C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800941AC -/* B0B34C 800941AC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B350 800941B0 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B354 800941B4 00802825 */ move $a1, $a0 -/* B0B358 800941B8 3C068014 */ lui $a2, %hi(D_8013ED00) # $a2, 0x8014 -/* B0B35C 800941BC 24C6ED00 */ addiu $a2, %lo(D_8013ED00) # addiu $a2, $a2, -0x1300 -/* B0B360 800941C0 AFA50038 */ sw $a1, 0x38($sp) -/* B0B364 800941C4 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B368 800941C8 0C031AB1 */ jal func_800C6AC4 -/* B0B36C 800941CC 24070673 */ li $a3, 1651 -/* B0B370 800941D0 8FA50038 */ lw $a1, 0x38($sp) -/* B0B374 800941D4 3C188012 */ lui $t8, %hi(D_80126A90) # $t8, 0x8012 -/* B0B378 800941D8 27186A90 */ addiu $t8, %lo(D_80126A90) # addiu $t8, $t8, 0x6a90 -/* B0B37C 800941DC 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B380 800941E0 3C0FDE00 */ lui $t7, 0xde00 -/* B0B384 800941E4 3C068014 */ lui $a2, %hi(D_8013ED0C) # $a2, 0x8014 -/* B0B388 800941E8 246E0008 */ addiu $t6, $v1, 8 -/* B0B38C 800941EC ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B390 800941F0 24C6ED0C */ addiu $a2, %lo(D_8013ED0C) # addiu $a2, $a2, -0x12f4 -/* B0B394 800941F4 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B398 800941F8 24070677 */ li $a3, 1655 -/* B0B39C 800941FC AC780004 */ sw $t8, 4($v1) -/* B0B3A0 80094200 0C031AD5 */ jal func_800C6B54 -/* B0B3A4 80094204 AC6F0000 */ sw $t7, ($v1) -/* B0B3A8 80094208 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B3AC 8009420C 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B3B0 80094210 03E00008 */ jr $ra -/* B0B3B4 80094214 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094218.s b/asm/non_matchings/code/z_rcp/func_80094218.s deleted file mode 100644 index 049cee4597..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094218.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ED18 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ED24 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094218 -/* B0B3B8 80094218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B3BC 8009421C AFBF0014 */ sw $ra, 0x14($sp) -/* B0B3C0 80094220 00802825 */ move $a1, $a0 -/* B0B3C4 80094224 3C068014 */ lui $a2, %hi(D_8013ED18) # $a2, 0x8014 -/* B0B3C8 80094228 24C6ED18 */ addiu $a2, %lo(D_8013ED18) # addiu $a2, $a2, -0x12e8 -/* B0B3CC 8009422C AFA50038 */ sw $a1, 0x38($sp) -/* B0B3D0 80094230 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B3D4 80094234 0C031AB1 */ jal func_800C6AC4 -/* B0B3D8 80094238 24070686 */ li $a3, 1670 -/* B0B3DC 8009423C 8FA50038 */ lw $a1, 0x38($sp) -/* B0B3E0 80094240 3C188012 */ lui $t8, %hi(D_80126AF0) # $t8, 0x8012 -/* B0B3E4 80094244 27186AF0 */ addiu $t8, %lo(D_80126AF0) # addiu $t8, $t8, 0x6af0 -/* B0B3E8 80094248 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B3EC 8009424C 3C0FDE00 */ lui $t7, 0xde00 -/* B0B3F0 80094250 3C068014 */ lui $a2, %hi(D_8013ED24) # $a2, 0x8014 -/* B0B3F4 80094254 246E0008 */ addiu $t6, $v1, 8 -/* B0B3F8 80094258 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B3FC 8009425C 24C6ED24 */ addiu $a2, %lo(D_8013ED24) # addiu $a2, $a2, -0x12dc -/* B0B400 80094260 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B404 80094264 2407068A */ li $a3, 1674 -/* B0B408 80094268 AC780004 */ sw $t8, 4($v1) -/* B0B40C 8009426C 0C031AD5 */ jal func_800C6B54 -/* B0B410 80094270 AC6F0000 */ sw $t7, ($v1) -/* B0B414 80094274 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B418 80094278 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B41C 8009427C 03E00008 */ jr $ra -/* B0B420 80094280 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094284.s b/asm/non_matchings/code/z_rcp/func_80094284.s deleted file mode 100644 index 6b6ae5f1c0..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094284.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ED30 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ED3C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094284 -/* B0B424 80094284 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B428 80094288 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B42C 8009428C 00802825 */ move $a1, $a0 -/* B0B430 80094290 3C068014 */ lui $a2, %hi(D_8013ED30) # $a2, 0x8014 -/* B0B434 80094294 24C6ED30 */ addiu $a2, %lo(D_8013ED30) # addiu $a2, $a2, -0x12d0 -/* B0B438 80094298 AFA50038 */ sw $a1, 0x38($sp) -/* B0B43C 8009429C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B440 800942A0 0C031AB1 */ jal func_800C6AC4 -/* B0B444 800942A4 24070691 */ li $a3, 1681 -/* B0B448 800942A8 8FA50038 */ lw $a1, 0x38($sp) -/* B0B44C 800942AC 3C188012 */ lui $t8, %hi(D_80126B20) # $t8, 0x8012 -/* B0B450 800942B0 27186B20 */ addiu $t8, %lo(D_80126B20) # addiu $t8, $t8, 0x6b20 -/* B0B454 800942B4 8CA302B0 */ lw $v1, 0x2b0($a1) -/* B0B458 800942B8 3C0FDE00 */ lui $t7, 0xde00 -/* B0B45C 800942BC 3C068014 */ lui $a2, %hi(D_8013ED3C) # $a2, 0x8014 -/* B0B460 800942C0 246E0008 */ addiu $t6, $v1, 8 -/* B0B464 800942C4 ACAE02B0 */ sw $t6, 0x2b0($a1) -/* B0B468 800942C8 24C6ED3C */ addiu $a2, %lo(D_8013ED3C) # addiu $a2, $a2, -0x12c4 -/* B0B46C 800942CC 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B470 800942D0 24070695 */ li $a3, 1685 -/* B0B474 800942D4 AC780004 */ sw $t8, 4($v1) -/* B0B478 800942D8 0C031AD5 */ jal func_800C6B54 -/* B0B47C 800942DC AC6F0000 */ sw $t7, ($v1) -/* B0B480 800942E0 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B484 800942E4 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B488 800942E8 03E00008 */ jr $ra -/* B0B48C 800942EC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800942F0.s b/asm/non_matchings/code/z_rcp/func_800942F0.s deleted file mode 100644 index cf54d7bb4a..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800942F0.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ED48 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ED54 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800942F0 -/* B0B490 800942F0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B494 800942F4 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B498 800942F8 00802825 */ move $a1, $a0 -/* B0B49C 800942FC 3C068014 */ lui $a2, %hi(D_8013ED48) # $a2, 0x8014 -/* B0B4A0 80094300 24C6ED48 */ addiu $a2, %lo(D_8013ED48) # addiu $a2, $a2, -0x12b8 -/* B0B4A4 80094304 AFA50038 */ sw $a1, 0x38($sp) -/* B0B4A8 80094308 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B4AC 8009430C 0C031AB1 */ jal func_800C6AC4 -/* B0B4B0 80094310 240706A4 */ li $a3, 1700 -/* B0B4B4 80094314 8FA50038 */ lw $a1, 0x38($sp) -/* B0B4B8 80094318 3C188012 */ lui $t8, %hi(D_801269A0) # $t8, 0x8012 -/* B0B4BC 8009431C 271869A0 */ addiu $t8, %lo(D_801269A0) # addiu $t8, $t8, 0x69a0 -/* B0B4C0 80094320 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0B4C4 80094324 3C0FDE00 */ lui $t7, 0xde00 -/* B0B4C8 80094328 3C068014 */ lui $a2, %hi(D_8013ED54) # $a2, 0x8014 -/* B0B4CC 8009432C 246E0008 */ addiu $t6, $v1, 8 -/* B0B4D0 80094330 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0B4D4 80094334 24C6ED54 */ addiu $a2, %lo(D_8013ED54) # addiu $a2, $a2, -0x12ac -/* B0B4D8 80094338 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B4DC 8009433C 240706A8 */ li $a3, 1704 -/* B0B4E0 80094340 AC780004 */ sw $t8, 4($v1) -/* B0B4E4 80094344 0C031AD5 */ jal func_800C6B54 -/* B0B4E8 80094348 AC6F0000 */ sw $t7, ($v1) -/* B0B4EC 8009434C 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B4F0 80094350 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B4F4 80094354 03E00008 */ jr $ra -/* B0B4F8 80094358 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_8009435C.s b/asm/non_matchings/code/z_rcp/func_8009435C.s deleted file mode 100644 index 00cfe15595..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009435C.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ED60 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ED6C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_8009435C -/* B0B4FC 8009435C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B500 80094360 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B504 80094364 00802825 */ move $a1, $a0 -/* B0B508 80094368 3C068014 */ lui $a2, %hi(D_8013ED60) # $a2, 0x8014 -/* B0B50C 8009436C 24C6ED60 */ addiu $a2, %lo(D_8013ED60) # addiu $a2, $a2, -0x12a0 -/* B0B510 80094370 AFA50038 */ sw $a1, 0x38($sp) -/* B0B514 80094374 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B518 80094378 0C031AB1 */ jal func_800C6AC4 -/* B0B51C 8009437C 240706BA */ li $a3, 1722 -/* B0B520 80094380 8FA50038 */ lw $a1, 0x38($sp) -/* B0B524 80094384 3C188012 */ lui $t8, %hi(D_80126340) # $t8, 0x8012 -/* B0B528 80094388 27186340 */ addiu $t8, %lo(D_80126340) # addiu $t8, $t8, 0x6340 -/* B0B52C 8009438C 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0B530 80094390 3C0FDE00 */ lui $t7, 0xde00 -/* B0B534 80094394 3C068014 */ lui $a2, %hi(D_8013ED6C) # $a2, 0x8014 -/* B0B538 80094398 246E0008 */ addiu $t6, $v1, 8 -/* B0B53C 8009439C ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0B540 800943A0 24C6ED6C */ addiu $a2, %lo(D_8013ED6C) # addiu $a2, $a2, -0x1294 -/* B0B544 800943A4 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B548 800943A8 240706BE */ li $a3, 1726 -/* B0B54C 800943AC AC780004 */ sw $t8, 4($v1) -/* B0B550 800943B0 0C031AD5 */ jal func_800C6B54 -/* B0B554 800943B4 AC6F0000 */ sw $t7, ($v1) -/* B0B558 800943B8 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B55C 800943BC 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B560 800943C0 03E00008 */ jr $ra -/* B0B564 800943C4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800943C8.s b/asm/non_matchings/code/z_rcp/func_800943C8.s deleted file mode 100644 index 28416bfab2..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800943C8.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ED78 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ED84 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800943C8 -/* B0B568 800943C8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B56C 800943CC AFBF0014 */ sw $ra, 0x14($sp) -/* B0B570 800943D0 00802825 */ move $a1, $a0 -/* B0B574 800943D4 3C068014 */ lui $a2, %hi(D_8013ED78) # $a2, 0x8014 -/* B0B578 800943D8 24C6ED78 */ addiu $a2, %lo(D_8013ED78) # addiu $a2, $a2, -0x1288 -/* B0B57C 800943DC AFA50038 */ sw $a1, 0x38($sp) -/* B0B580 800943E0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B584 800943E4 0C031AB1 */ jal func_800C6AC4 -/* B0B588 800943E8 240706DE */ li $a3, 1758 -/* B0B58C 800943EC 8FA50038 */ lw $a1, 0x38($sp) -/* B0B590 800943F0 3C188012 */ lui $t8, %hi(D_80126970) # $t8, 0x8012 -/* B0B594 800943F4 27186970 */ addiu $t8, %lo(D_80126970) # addiu $t8, $t8, 0x6970 -/* B0B598 800943F8 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B59C 800943FC 3C0FDE00 */ lui $t7, 0xde00 -/* B0B5A0 80094400 3C068014 */ lui $a2, %hi(D_8013ED84) # $a2, 0x8014 -/* B0B5A4 80094404 246E0008 */ addiu $t6, $v1, 8 -/* B0B5A8 80094408 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B5AC 8009440C 24C6ED84 */ addiu $a2, %lo(D_8013ED84) # addiu $a2, $a2, -0x127c -/* B0B5B0 80094410 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B5B4 80094414 240706E2 */ li $a3, 1762 -/* B0B5B8 80094418 AC780004 */ sw $t8, 4($v1) -/* B0B5BC 8009441C 0C031AD5 */ jal func_800C6B54 -/* B0B5C0 80094420 AC6F0000 */ sw $t7, ($v1) -/* B0B5C4 80094424 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B5C8 80094428 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B5CC 8009442C 03E00008 */ jr $ra -/* B0B5D0 80094430 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094434.s b/asm/non_matchings/code/z_rcp/func_80094434.s deleted file mode 100644 index 1f5d872296..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094434.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ED90 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ED9C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094434 -/* B0B5D4 80094434 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B5D8 80094438 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B5DC 8009443C 00802825 */ move $a1, $a0 -/* B0B5E0 80094440 3C068014 */ lui $a2, %hi(D_8013ED90) # $a2, 0x8014 -/* B0B5E4 80094444 24C6ED90 */ addiu $a2, %lo(D_8013ED90) # addiu $a2, $a2, -0x1270 -/* B0B5E8 80094448 AFA50038 */ sw $a1, 0x38($sp) -/* B0B5EC 8009444C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B5F0 80094450 0C031AB1 */ jal func_800C6AC4 -/* B0B5F4 80094454 240706EF */ li $a3, 1775 -/* B0B5F8 80094458 8FA50038 */ lw $a1, 0x38($sp) -/* B0B5FC 8009445C 3C188012 */ lui $t8, %hi(D_801262E0) # $t8, 0x8012 -/* B0B600 80094460 271862E0 */ addiu $t8, %lo(D_801262E0) # addiu $t8, $t8, 0x62e0 -/* B0B604 80094464 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B608 80094468 3C0FDE00 */ lui $t7, 0xde00 -/* B0B60C 8009446C 3C068014 */ lui $a2, %hi(D_8013ED9C) # $a2, 0x8014 -/* B0B610 80094470 246E0008 */ addiu $t6, $v1, 8 -/* B0B614 80094474 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B618 80094478 24C6ED9C */ addiu $a2, %lo(D_8013ED9C) # addiu $a2, $a2, -0x1264 -/* B0B61C 8009447C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B620 80094480 240706F3 */ li $a3, 1779 -/* B0B624 80094484 AC780004 */ sw $t8, 4($v1) -/* B0B628 80094488 0C031AD5 */ jal func_800C6B54 -/* B0B62C 8009448C AC6F0000 */ sw $t7, ($v1) -/* B0B630 80094490 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B634 80094494 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B638 80094498 03E00008 */ jr $ra -/* B0B63C 8009449C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800944A0.s b/asm/non_matchings/code/z_rcp/func_800944A0.s deleted file mode 100644 index 130aab7e3d..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800944A0.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800944A0 -/* B0B640 800944A0 00801025 */ move $v0, $a0 -/* B0B644 800944A4 3C0F8012 */ lui $t7, %hi(D_801269D0) # $t7, 0x8012 -/* B0B648 800944A8 25EF69D0 */ addiu $t7, %lo(D_801269D0) # addiu $t7, $t7, 0x69d0 -/* B0B64C 800944AC 3C0EDE00 */ lui $t6, 0xde00 -/* B0B650 800944B0 AC4E0000 */ sw $t6, ($v0) -/* B0B654 800944B4 AC4F0004 */ sw $t7, 4($v0) -/* B0B658 800944B8 24840008 */ addiu $a0, $a0, 8 -/* B0B65C 800944BC 03E00008 */ jr $ra -/* B0B660 800944C0 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_800944C4.s b/asm/non_matchings/code/z_rcp/func_800944C4.s deleted file mode 100644 index 6b56d24455..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800944C4.s +++ /dev/null @@ -1,35 +0,0 @@ -.rdata -glabel D_8013EDA8 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EDB4 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800944C4 -/* B0B664 800944C4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B0B668 800944C8 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B66C 800944CC AFA40030 */ sw $a0, 0x30($sp) -/* B0B670 800944D0 3C068014 */ lui $a2, %hi(D_8013EDA8) # $a2, 0x8014 -/* B0B674 800944D4 24C6EDA8 */ addiu $a2, %lo(D_8013EDA8) # addiu $a2, $a2, -0x1258 -/* B0B678 800944D8 8FA50030 */ lw $a1, 0x30($sp) -/* B0B67C 800944DC 27A4001C */ addiu $a0, $sp, 0x1c -/* B0B680 800944E0 0C031AB1 */ jal func_800C6AC4 -/* B0B684 800944E4 24070707 */ li $a3, 1799 -/* B0B688 800944E8 8FAE0030 */ lw $t6, 0x30($sp) -/* B0B68C 800944EC 0C025128 */ jal func_800944A0 -/* B0B690 800944F0 8DC402C0 */ lw $a0, 0x2c0($t6) -/* B0B694 800944F4 8FA50030 */ lw $a1, 0x30($sp) -/* B0B698 800944F8 3C068014 */ lui $a2, %hi(D_8013EDB4) # $a2, 0x8014 -/* B0B69C 800944FC 24C6EDB4 */ addiu $a2, %lo(D_8013EDB4) # addiu $a2, $a2, -0x124c -/* B0B6A0 80094500 27A4001C */ addiu $a0, $sp, 0x1c -/* B0B6A4 80094504 24070709 */ li $a3, 1801 -/* B0B6A8 80094508 0C031AD5 */ jal func_800C6B54 -/* B0B6AC 8009450C ACA202C0 */ sw $v0, 0x2c0($a1) -/* B0B6B0 80094510 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B6B4 80094514 27BD0030 */ addiu $sp, $sp, 0x30 -/* B0B6B8 80094518 03E00008 */ jr $ra -/* B0B6BC 8009451C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094520.s b/asm/non_matchings/code/z_rcp/func_80094520.s deleted file mode 100644 index 342557d0a3..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094520.s +++ /dev/null @@ -1,35 +0,0 @@ -.rdata -glabel D_8013EDC0 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EDCC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094520 -/* B0B6C0 80094520 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B0B6C4 80094524 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B6C8 80094528 AFA40030 */ sw $a0, 0x30($sp) -/* B0B6CC 8009452C 3C068014 */ lui $a2, %hi(D_8013EDC0) # $a2, 0x8014 -/* B0B6D0 80094530 24C6EDC0 */ addiu $a2, %lo(D_8013EDC0) # addiu $a2, $a2, -0x1240 -/* B0B6D4 80094534 8FA50030 */ lw $a1, 0x30($sp) -/* B0B6D8 80094538 27A4001C */ addiu $a0, $sp, 0x1c -/* B0B6DC 8009453C 0C031AB1 */ jal func_800C6AC4 -/* B0B6E0 80094540 24070711 */ li $a3, 1809 -/* B0B6E4 80094544 8FAE0030 */ lw $t6, 0x30($sp) -/* B0B6E8 80094548 0C025128 */ jal func_800944A0 -/* B0B6EC 8009454C 8DC402B0 */ lw $a0, 0x2b0($t6) -/* B0B6F0 80094550 8FA50030 */ lw $a1, 0x30($sp) -/* B0B6F4 80094554 3C068014 */ lui $a2, %hi(D_8013EDCC) # $a2, 0x8014 -/* B0B6F8 80094558 24C6EDCC */ addiu $a2, %lo(D_8013EDCC) # addiu $a2, $a2, -0x1234 -/* B0B6FC 8009455C 27A4001C */ addiu $a0, $sp, 0x1c -/* B0B700 80094560 24070713 */ li $a3, 1811 -/* B0B704 80094564 0C031AD5 */ jal func_800C6B54 -/* B0B708 80094568 ACA202B0 */ sw $v0, 0x2b0($a1) -/* B0B70C 8009456C 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B710 80094570 27BD0030 */ addiu $sp, $sp, 0x30 -/* B0B714 80094574 03E00008 */ jr $ra -/* B0B718 80094578 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_8009457C.s b/asm/non_matchings/code/z_rcp/func_8009457C.s deleted file mode 100644 index 8dbcbb8108..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009457C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8009457C -/* B0B71C 8009457C 8C830000 */ lw $v1, ($a0) -/* B0B720 80094580 3C0F8012 */ lui $t7, %hi(D_801269D0) # $t7, 0x8012 -/* B0B724 80094584 25EF69D0 */ addiu $t7, %lo(D_801269D0) # addiu $t7, $t7, 0x69d0 -/* B0B728 80094588 3C0EDE00 */ lui $t6, 0xde00 -/* B0B72C 8009458C AC6E0000 */ sw $t6, ($v1) -/* B0B730 80094590 AC6F0004 */ sw $t7, 4($v1) -/* B0B734 80094594 24620008 */ addiu $v0, $v1, 8 -/* B0B738 80094598 03E00008 */ jr $ra -/* B0B73C 8009459C AC820000 */ sw $v0, ($a0) - diff --git a/asm/non_matchings/code/z_rcp/func_800945A0.s b/asm/non_matchings/code/z_rcp/func_800945A0.s deleted file mode 100644 index 800516749c..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800945A0.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EDD8 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EDE4 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800945A0 -/* B0B740 800945A0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B744 800945A4 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B748 800945A8 00802825 */ move $a1, $a0 -/* B0B74C 800945AC 3C068014 */ lui $a2, %hi(D_8013EDD8) # $a2, 0x8014 -/* B0B750 800945B0 24C6EDD8 */ addiu $a2, %lo(D_8013EDD8) # addiu $a2, $a2, -0x1228 -/* B0B754 800945B4 AFA50038 */ sw $a1, 0x38($sp) -/* B0B758 800945B8 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B75C 800945BC 0C031AB1 */ jal func_800C6AC4 -/* B0B760 800945C0 2407072D */ li $a3, 1837 -/* B0B764 800945C4 8FA50038 */ lw $a1, 0x38($sp) -/* B0B768 800945C8 3C188012 */ lui $t8, %hi(D_80126A00) # $t8, 0x8012 -/* B0B76C 800945CC 27186A00 */ addiu $t8, %lo(D_80126A00) # addiu $t8, $t8, 0x6a00 -/* B0B770 800945D0 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B774 800945D4 3C0FDE00 */ lui $t7, 0xde00 -/* B0B778 800945D8 3C068014 */ lui $a2, %hi(D_8013EDE4) # $a2, 0x8014 -/* B0B77C 800945DC 246E0008 */ addiu $t6, $v1, 8 -/* B0B780 800945E0 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B784 800945E4 24C6EDE4 */ addiu $a2, %lo(D_8013EDE4) # addiu $a2, $a2, -0x121c -/* B0B788 800945E8 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B78C 800945EC 24070731 */ li $a3, 1841 -/* B0B790 800945F0 AC780004 */ sw $t8, 4($v1) -/* B0B794 800945F4 0C031AD5 */ jal func_800C6B54 -/* B0B798 800945F8 AC6F0000 */ sw $t7, ($v1) -/* B0B79C 800945FC 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B7A0 80094600 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B7A4 80094604 03E00008 */ jr $ra -/* B0B7A8 80094608 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_8009460C.s b/asm/non_matchings/code/z_rcp/func_8009460C.s deleted file mode 100644 index f1c9192439..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009460C.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EDF0 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EDFC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_8009460C -/* B0B7AC 8009460C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B7B0 80094610 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B7B4 80094614 00802825 */ move $a1, $a0 -/* B0B7B8 80094618 3C068014 */ lui $a2, %hi(D_8013EDF0) # $a2, 0x8014 -/* B0B7BC 8009461C 24C6EDF0 */ addiu $a2, %lo(D_8013EDF0) # addiu $a2, $a2, -0x1210 -/* B0B7C0 80094620 AFA50038 */ sw $a1, 0x38($sp) -/* B0B7C4 80094624 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B7C8 80094628 0C031AB1 */ jal func_800C6AC4 -/* B0B7CC 8009462C 2407073D */ li $a3, 1853 -/* B0B7D0 80094630 8FA50038 */ lw $a1, 0x38($sp) -/* B0B7D4 80094634 3C188012 */ lui $t8, %hi(D_80126A30) # $t8, 0x8012 -/* B0B7D8 80094638 27186A30 */ addiu $t8, %lo(D_80126A30) # addiu $t8, $t8, 0x6a30 -/* B0B7DC 8009463C 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B7E0 80094640 3C0FDE00 */ lui $t7, 0xde00 -/* B0B7E4 80094644 3C068014 */ lui $a2, %hi(D_8013EDFC) # $a2, 0x8014 -/* B0B7E8 80094648 246E0008 */ addiu $t6, $v1, 8 -/* B0B7EC 8009464C ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B7F0 80094650 24C6EDFC */ addiu $a2, %lo(D_8013EDFC) # addiu $a2, $a2, -0x1204 -/* B0B7F4 80094654 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B7F8 80094658 24070741 */ li $a3, 1857 -/* B0B7FC 8009465C AC780004 */ sw $t8, 4($v1) -/* B0B800 80094660 0C031AD5 */ jal func_800C6B54 -/* B0B804 80094664 AC6F0000 */ sw $t7, ($v1) -/* B0B808 80094668 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B80C 8009466C 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B810 80094670 03E00008 */ jr $ra -/* B0B814 80094674 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094678.s b/asm/non_matchings/code/z_rcp/func_80094678.s deleted file mode 100644 index 9881241d06..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094678.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EE08 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EE14 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094678 -/* B0B818 80094678 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B81C 8009467C AFBF0014 */ sw $ra, 0x14($sp) -/* B0B820 80094680 00802825 */ move $a1, $a0 -/* B0B824 80094684 3C068014 */ lui $a2, %hi(D_8013EE08) # $a2, 0x8014 -/* B0B828 80094688 24C6EE08 */ addiu $a2, %lo(D_8013EE08) # addiu $a2, $a2, -0x11f8 -/* B0B82C 8009468C AFA50038 */ sw $a1, 0x38($sp) -/* B0B830 80094690 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B834 80094694 0C031AB1 */ jal func_800C6AC4 -/* B0B838 80094698 2407074D */ li $a3, 1869 -/* B0B83C 8009469C 8FA50038 */ lw $a1, 0x38($sp) -/* B0B840 800946A0 3C188012 */ lui $t8, %hi(D_80126B50) # $t8, 0x8012 -/* B0B844 800946A4 27186B50 */ addiu $t8, %lo(D_80126B50) # addiu $t8, $t8, 0x6b50 -/* B0B848 800946A8 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0B84C 800946AC 3C0FDE00 */ lui $t7, 0xde00 -/* B0B850 800946B0 3C068014 */ lui $a2, %hi(D_8013EE14) # $a2, 0x8014 -/* B0B854 800946B4 246E0008 */ addiu $t6, $v1, 8 -/* B0B858 800946B8 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0B85C 800946BC 24C6EE14 */ addiu $a2, %lo(D_8013EE14) # addiu $a2, $a2, -0x11ec -/* B0B860 800946C0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B864 800946C4 24070751 */ li $a3, 1873 -/* B0B868 800946C8 AC780004 */ sw $t8, 4($v1) -/* B0B86C 800946CC 0C031AD5 */ jal func_800C6B54 -/* B0B870 800946D0 AC6F0000 */ sw $t7, ($v1) -/* B0B874 800946D4 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B878 800946D8 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B87C 800946DC 03E00008 */ jr $ra -/* B0B880 800946E0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800946E4.s b/asm/non_matchings/code/z_rcp/func_800946E4.s deleted file mode 100644 index d3e4ce20c3..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800946E4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800946E4 -/* B0B884 800946E4 00801025 */ move $v0, $a0 -/* B0B888 800946E8 3C0F8012 */ lui $t7, %hi(D_80126EE0) # $t7, 0x8012 -/* B0B88C 800946EC 25EF6EE0 */ addiu $t7, %lo(D_80126EE0) # addiu $t7, $t7, 0x6ee0 -/* B0B890 800946F0 3C0EDE00 */ lui $t6, 0xde00 -/* B0B894 800946F4 AC4E0000 */ sw $t6, ($v0) -/* B0B898 800946F8 AC4F0004 */ sw $t7, 4($v0) -/* B0B89C 800946FC 24840008 */ addiu $a0, $a0, 8 -/* B0B8A0 80094700 03E00008 */ jr $ra -/* B0B8A4 80094704 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80094708.s b/asm/non_matchings/code/z_rcp/func_80094708.s deleted file mode 100644 index 25c68a8b4f..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094708.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80094708 -/* B0B8A8 80094708 00801025 */ move $v0, $a0 -/* B0B8AC 8009470C 3C0F8012 */ lui $t7, %hi(D_80126F10) # $t7, 0x8012 -/* B0B8B0 80094710 25EF6F10 */ addiu $t7, %lo(D_80126F10) # addiu $t7, $t7, 0x6f10 -/* B0B8B4 80094714 3C0EDE00 */ lui $t6, 0xde00 -/* B0B8B8 80094718 AC4E0000 */ sw $t6, ($v0) -/* B0B8BC 8009471C AC4F0004 */ sw $t7, 4($v0) -/* B0B8C0 80094720 24840008 */ addiu $a0, $a0, 8 -/* B0B8C4 80094724 03E00008 */ jr $ra -/* B0B8C8 80094728 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_8009472C.s b/asm/non_matchings/code/z_rcp/func_8009472C.s deleted file mode 100644 index f5d42a0699..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009472C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8009472C -/* B0B8CC 8009472C 00801025 */ move $v0, $a0 -/* B0B8D0 80094730 3C0F8012 */ lui $t7, %hi(D_80126F40) # $t7, 0x8012 -/* B0B8D4 80094734 25EF6F40 */ addiu $t7, %lo(D_80126F40) # addiu $t7, $t7, 0x6f40 -/* B0B8D8 80094738 3C0EDE00 */ lui $t6, 0xde00 -/* B0B8DC 8009473C AC4E0000 */ sw $t6, ($v0) -/* B0B8E0 80094740 AC4F0004 */ sw $t7, 4($v0) -/* B0B8E4 80094744 24840008 */ addiu $a0, $a0, 8 -/* B0B8E8 80094748 00801025 */ move $v0, $a0 -/* B0B8EC 8009474C 3C18E300 */ lui $t8, (0xE3001801 >> 16) # lui $t8, 0xe300 -/* B0B8F0 80094750 37181801 */ ori $t8, (0xE3001801 & 0xFFFF) # ori $t8, $t8, 0x1801 -/* B0B8F4 80094754 241900C0 */ li $t9, 192 -/* B0B8F8 80094758 AC590004 */ sw $t9, 4($v0) -/* B0B8FC 8009475C AC580000 */ sw $t8, ($v0) -/* B0B900 80094760 24840008 */ addiu $a0, $a0, 8 -/* B0B904 80094764 03E00008 */ jr $ra -/* B0B908 80094768 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_8009476C.s b/asm/non_matchings/code/z_rcp/func_8009476C.s deleted file mode 100644 index 33c42266fc..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009476C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8009476C -/* B0B90C 8009476C 00801025 */ move $v0, $a0 -/* B0B910 80094770 3C0F8012 */ lui $t7, %hi(D_80126F70) # $t7, 0x8012 -/* B0B914 80094774 25EF6F70 */ addiu $t7, %lo(D_80126F70) # addiu $t7, $t7, 0x6f70 -/* B0B918 80094778 3C0EDE00 */ lui $t6, 0xde00 -/* B0B91C 8009477C AC4E0000 */ sw $t6, ($v0) -/* B0B920 80094780 AC4F0004 */ sw $t7, 4($v0) -/* B0B924 80094784 24840008 */ addiu $a0, $a0, 8 -/* B0B928 80094788 00801025 */ move $v0, $a0 -/* B0B92C 8009478C 3C18E300 */ lui $t8, (0xE3001801 >> 16) # lui $t8, 0xe300 -/* B0B930 80094790 37181801 */ ori $t8, (0xE3001801 & 0xFFFF) # ori $t8, $t8, 0x1801 -/* B0B934 80094794 241900C0 */ li $t9, 192 -/* B0B938 80094798 AC590004 */ sw $t9, 4($v0) -/* B0B93C 8009479C AC580000 */ sw $t8, ($v0) -/* B0B940 800947A0 24840008 */ addiu $a0, $a0, 8 -/* B0B944 800947A4 03E00008 */ jr $ra -/* B0B948 800947A8 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_800947AC.s b/asm/non_matchings/code/z_rcp/func_800947AC.s deleted file mode 100644 index 33c334f76a..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800947AC.s +++ /dev/null @@ -1,114 +0,0 @@ -glabel func_800947AC -/* B0B94C 800947AC 00801025 */ move $v0, $a0 -/* B0B950 800947B0 3C0F8012 */ lui $t7, %hi(D_80126EB0) # $t7, 0x8012 -/* B0B954 800947B4 25EF6EB0 */ addiu $t7, %lo(D_80126EB0) # addiu $t7, $t7, 0x6eb0 -/* B0B958 800947B8 3C0EDE00 */ lui $t6, 0xde00 -/* B0B95C 800947BC AC4E0000 */ sw $t6, ($v0) -/* B0B960 800947C0 AC4F0004 */ sw $t7, 4($v0) -/* B0B964 800947C4 24840008 */ addiu $a0, $a0, 8 -/* B0B968 800947C8 00801825 */ move $v1, $a0 -/* B0B96C 800947CC 3C02E300 */ lui $v0, (0xE3001801 >> 16) # lui $v0, 0xe300 -/* B0B970 800947D0 34421801 */ ori $v0, (0xE3001801 & 0xFFFF) # ori $v0, $v0, 0x1801 -/* B0B974 800947D4 240600C0 */ li $a2, 192 -/* B0B978 800947D8 AC660004 */ sw $a2, 4($v1) -/* B0B97C 800947DC AC620000 */ sw $v0, ($v1) -/* B0B980 800947E0 3C058016 */ lui $a1, %hi(gGameInfo) # $a1, 0x8016 -/* B0B984 800947E4 8CA5FA90 */ lw $a1, %lo(gGameInfo)($a1) -/* B0B988 800947E8 24070001 */ li $a3, 1 -/* B0B98C 800947EC 3C18E300 */ lui $t8, (0xE3001A01 >> 16) # lui $t8, 0xe300 -/* B0B990 800947F0 84A30FFE */ lh $v1, 0xffe($a1) -/* B0B994 800947F4 24840008 */ addiu $a0, $a0, 8 -/* B0B998 800947F8 37181A01 */ ori $t8, (0xE3001A01 & 0xFFFF) # ori $t8, $t8, 0x1a01 -/* B0B99C 800947FC 1067000C */ beq $v1, $a3, .L80094830 -/* B0B9A0 80094800 24190030 */ li $t9, 48 -/* B0B9A4 80094804 24010002 */ li $at, 2 -/* B0B9A8 80094808 10610010 */ beq $v1, $at, .L8009484C -/* B0B9AC 8009480C 3C08E300 */ lui $t0, (0xE3001A01 >> 16) # lui $t0, 0xe300 -/* B0B9B0 80094810 24010003 */ li $at, 3 -/* B0B9B4 80094814 10610015 */ beq $v1, $at, .L8009486C -/* B0B9B8 80094818 3C09E300 */ lui $t1, (0xE3001A01 >> 16) # lui $t1, 0xe300 -/* B0B9BC 8009481C 24010004 */ li $at, 4 -/* B0B9C0 80094820 1061001B */ beq $v1, $at, .L80094890 -/* B0B9C4 80094824 3C0BE300 */ lui $t3, (0xE3001A01 >> 16) # lui $t3, 0xe300 -/* B0B9C8 80094828 10000022 */ b .L800948B4 -/* B0B9CC 8009482C 84A31000 */ lh $v1, 0x1000($a1) -.L80094830: -/* B0B9D0 80094830 00801825 */ move $v1, $a0 -/* B0B9D4 80094834 AC780000 */ sw $t8, ($v1) -/* B0B9D8 80094838 AC790004 */ sw $t9, 4($v1) -/* B0B9DC 8009483C 3C058016 */ lui $a1, %hi(gGameInfo) # $a1, 0x8016 -/* B0B9E0 80094840 8CA5FA90 */ lw $a1, %lo(gGameInfo)($a1) -/* B0B9E4 80094844 1000001A */ b .L800948B0 -/* B0B9E8 80094848 24840008 */ addiu $a0, $a0, 8 -.L8009484C: -/* B0B9EC 8009484C 00801825 */ move $v1, $a0 -/* B0B9F0 80094850 35081A01 */ ori $t0, (0xE3001A01 & 0xFFFF) # ori $t0, $t0, 0x1a01 -/* B0B9F4 80094854 AC680000 */ sw $t0, ($v1) -/* B0B9F8 80094858 AC600004 */ sw $zero, 4($v1) -/* B0B9FC 8009485C 3C058016 */ lui $a1, %hi(gGameInfo) # $a1, 0x8016 -/* B0BA00 80094860 8CA5FA90 */ lw $a1, %lo(gGameInfo)($a1) -/* B0BA04 80094864 10000012 */ b .L800948B0 -/* B0BA08 80094868 24840008 */ addiu $a0, $a0, 8 -.L8009486C: -/* B0BA0C 8009486C 00801825 */ move $v1, $a0 -/* B0BA10 80094870 35291A01 */ ori $t1, (0xE3001A01 & 0xFFFF) # ori $t1, $t1, 0x1a01 -/* B0BA14 80094874 240A0010 */ li $t2, 16 -/* B0BA18 80094878 AC6A0004 */ sw $t2, 4($v1) -/* B0BA1C 8009487C AC690000 */ sw $t1, ($v1) -/* B0BA20 80094880 3C058016 */ lui $a1, %hi(gGameInfo) # $a1, 0x8016 -/* B0BA24 80094884 8CA5FA90 */ lw $a1, %lo(gGameInfo)($a1) -/* B0BA28 80094888 10000009 */ b .L800948B0 -/* B0BA2C 8009488C 24840008 */ addiu $a0, $a0, 8 -.L80094890: -/* B0BA30 80094890 00801825 */ move $v1, $a0 -/* B0BA34 80094894 356B1A01 */ ori $t3, (0xE3001A01 & 0xFFFF) # ori $t3, $t3, 0x1a01 -/* B0BA38 80094898 240C0020 */ li $t4, 32 -/* B0BA3C 8009489C AC6C0004 */ sw $t4, 4($v1) -/* B0BA40 800948A0 AC6B0000 */ sw $t3, ($v1) -/* B0BA44 800948A4 3C058016 */ lui $a1, %hi(gGameInfo) # $a1, 0x8016 -/* B0BA48 800948A8 8CA5FA90 */ lw $a1, %lo(gGameInfo)($a1) -/* B0BA4C 800948AC 24840008 */ addiu $a0, $a0, 8 -.L800948B0: -/* B0BA50 800948B0 84A31000 */ lh $v1, 0x1000($a1) -.L800948B4: -/* B0BA54 800948B4 24010002 */ li $at, 2 -/* B0BA58 800948B8 5067000B */ beql $v1, $a3, .L800948E8 -/* B0BA5C 800948BC 00801825 */ move $v1, $a0 -/* B0BA60 800948C0 1061000E */ beq $v1, $at, .L800948FC -/* B0BA64 800948C4 24010003 */ li $at, 3 -/* B0BA68 800948C8 10610012 */ beq $v1, $at, .L80094914 -/* B0BA6C 800948CC 240D0040 */ li $t5, 64 -/* B0BA70 800948D0 24010004 */ li $at, 4 -/* B0BA74 800948D4 10610015 */ beq $v1, $at, .L8009492C -/* B0BA78 800948D8 240E0080 */ li $t6, 128 -/* B0BA7C 800948DC 03E00008 */ jr $ra -/* B0BA80 800948E0 00801025 */ move $v0, $a0 -/* B0BA84 800948E4 00801825 */ move $v1, $a0 -.L800948E8: -/* B0BA88 800948E8 AC620000 */ sw $v0, ($v1) -/* B0BA8C 800948EC 24840008 */ addiu $a0, $a0, 8 -/* B0BA90 800948F0 AC660004 */ sw $a2, 4($v1) -/* B0BA94 800948F4 03E00008 */ jr $ra -/* B0BA98 800948F8 00801025 */ move $v0, $a0 -.L800948FC: -/* B0BA9C 800948FC 00801825 */ move $v1, $a0 -/* B0BAA0 80094900 AC620000 */ sw $v0, ($v1) -/* B0BAA4 80094904 24840008 */ addiu $a0, $a0, 8 -/* B0BAA8 80094908 AC600004 */ sw $zero, 4($v1) -/* B0BAAC 8009490C 03E00008 */ jr $ra -/* B0BAB0 80094910 00801025 */ move $v0, $a0 -.L80094914: -/* B0BAB4 80094914 00801825 */ move $v1, $a0 -/* B0BAB8 80094918 AC620000 */ sw $v0, ($v1) -/* B0BABC 8009491C 24840008 */ addiu $a0, $a0, 8 -/* B0BAC0 80094920 AC6D0004 */ sw $t5, 4($v1) -/* B0BAC4 80094924 03E00008 */ jr $ra -/* B0BAC8 80094928 00801025 */ move $v0, $a0 -.L8009492C: -/* B0BACC 8009492C 00801825 */ move $v1, $a0 -/* B0BAD0 80094930 AC620000 */ sw $v0, ($v1) -/* B0BAD4 80094934 AC6E0004 */ sw $t6, 4($v1) -/* B0BAD8 80094938 24840008 */ addiu $a0, $a0, 8 -/* B0BADC 8009493C 03E00008 */ jr $ra -/* B0BAE0 80094940 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80094944.s b/asm/non_matchings/code/z_rcp/func_80094944.s deleted file mode 100644 index 1fbdccf94a..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094944.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80094944 -/* B0BAE4 80094944 00801025 */ move $v0, $a0 -/* B0BAE8 80094948 3C0F8012 */ lui $t7, %hi(D_80126FA0) # $t7, 0x8012 -/* B0BAEC 8009494C 25EF6FA0 */ addiu $t7, %lo(D_80126FA0) # addiu $t7, $t7, 0x6fa0 -/* B0BAF0 80094950 3C0EDE00 */ lui $t6, 0xde00 -/* B0BAF4 80094954 AC4E0000 */ sw $t6, ($v0) -/* B0BAF8 80094958 AC4F0004 */ sw $t7, 4($v0) -/* B0BAFC 8009495C 24840008 */ addiu $a0, $a0, 8 -/* B0BB00 80094960 03E00008 */ jr $ra -/* B0BB04 80094964 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80094968.s b/asm/non_matchings/code/z_rcp/func_80094968.s deleted file mode 100644 index 5455fb708e..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094968.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80094968 -/* B0BB08 80094968 00801025 */ move $v0, $a0 -/* B0BB0C 8009496C 3C0F8012 */ lui $t7, %hi(D_80126640) # $t7, 0x8012 -/* B0BB10 80094970 25EF6640 */ addiu $t7, %lo(D_80126640) # addiu $t7, $t7, 0x6640 -/* B0BB14 80094974 3C0EDE00 */ lui $t6, 0xde00 -/* B0BB18 80094978 AC4E0000 */ sw $t6, ($v0) -/* B0BB1C 8009497C AC4F0004 */ sw $t7, 4($v0) -/* B0BB20 80094980 24840008 */ addiu $a0, $a0, 8 -/* B0BB24 80094984 00801025 */ move $v0, $a0 -/* B0BB28 80094988 3C18E300 */ lui $t8, (0xE3001801 >> 16) # lui $t8, 0xe300 -/* B0BB2C 8009498C 37181801 */ ori $t8, (0xE3001801 & 0xFFFF) # ori $t8, $t8, 0x1801 -/* B0BB30 80094990 241900C0 */ li $t9, 192 -/* B0BB34 80094994 AC590004 */ sw $t9, 4($v0) -/* B0BB38 80094998 AC580000 */ sw $t8, ($v0) -/* B0BB3C 8009499C 24840008 */ addiu $a0, $a0, 8 -/* B0BB40 800949A0 03E00008 */ jr $ra -/* B0BB44 800949A4 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_800949A8.s b/asm/non_matchings/code/z_rcp/func_800949A8.s deleted file mode 100644 index 63f74ccb1c..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800949A8.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EE20 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EE2C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800949A8 -/* B0BB48 800949A8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BB4C 800949AC AFBF0014 */ sw $ra, 0x14($sp) -/* B0BB50 800949B0 00802825 */ move $a1, $a0 -/* B0BB54 800949B4 3C068014 */ lui $a2, %hi(D_8013EE20) # $a2, 0x8014 -/* B0BB58 800949B8 24C6EE20 */ addiu $a2, %lo(D_8013EE20) # addiu $a2, $a2, -0x11e0 -/* B0BB5C 800949BC AFA50038 */ sw $a1, 0x38($sp) -/* B0BB60 800949C0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BB64 800949C4 0C031AB1 */ jal func_800C6AC4 -/* B0BB68 800949C8 240707A1 */ li $a3, 1953 -/* B0BB6C 800949CC 8FA50038 */ lw $a1, 0x38($sp) -/* B0BB70 800949D0 3C188012 */ lui $t8, %hi(D_80126A60) # $t8, 0x8012 -/* B0BB74 800949D4 27186A60 */ addiu $t8, %lo(D_80126A60) # addiu $t8, $t8, 0x6a60 -/* B0BB78 800949D8 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0BB7C 800949DC 3C0FDE00 */ lui $t7, 0xde00 -/* B0BB80 800949E0 3C068014 */ lui $a2, %hi(D_8013EE2C) # $a2, 0x8014 -/* B0BB84 800949E4 246E0008 */ addiu $t6, $v1, 8 -/* B0BB88 800949E8 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0BB8C 800949EC 24C6EE2C */ addiu $a2, %lo(D_8013EE2C) # addiu $a2, $a2, -0x11d4 -/* B0BB90 800949F0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BB94 800949F4 240707A5 */ li $a3, 1957 -/* B0BB98 800949F8 AC780004 */ sw $t8, 4($v1) -/* B0BB9C 800949FC 0C031AD5 */ jal func_800C6B54 -/* B0BBA0 80094A00 AC6F0000 */ sw $t7, ($v1) -/* B0BBA4 80094A04 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BBA8 80094A08 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BBAC 80094A0C 03E00008 */ jr $ra -/* B0BBB0 80094A10 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094A14.s b/asm/non_matchings/code/z_rcp/func_80094A14.s deleted file mode 100644 index 1f811ea2cd..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094A14.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EE38 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EE44 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094A14 -/* B0BBB4 80094A14 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BBB8 80094A18 AFBF0014 */ sw $ra, 0x14($sp) -/* B0BBBC 80094A1C 00802825 */ move $a1, $a0 -/* B0BBC0 80094A20 3C068014 */ lui $a2, %hi(D_8013EE38) # $a2, 0x8014 -/* B0BBC4 80094A24 24C6EE38 */ addiu $a2, %lo(D_8013EE38) # addiu $a2, $a2, -0x11c8 -/* B0BBC8 80094A28 AFA50038 */ sw $a1, 0x38($sp) -/* B0BBCC 80094A2C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BBD0 80094A30 0C031AB1 */ jal func_800C6AC4 -/* B0BBD4 80094A34 240707AC */ li $a3, 1964 -/* B0BBD8 80094A38 8FA50038 */ lw $a1, 0x38($sp) -/* B0BBDC 80094A3C 3C188012 */ lui $t8, %hi(D_80126A60) # $t8, 0x8012 -/* B0BBE0 80094A40 27186A60 */ addiu $t8, %lo(D_80126A60) # addiu $t8, $t8, 0x6a60 -/* B0BBE4 80094A44 8CA302B0 */ lw $v1, 0x2b0($a1) -/* B0BBE8 80094A48 3C0FDE00 */ lui $t7, 0xde00 -/* B0BBEC 80094A4C 3C068014 */ lui $a2, %hi(D_8013EE44) # $a2, 0x8014 -/* B0BBF0 80094A50 246E0008 */ addiu $t6, $v1, 8 -/* B0BBF4 80094A54 ACAE02B0 */ sw $t6, 0x2b0($a1) -/* B0BBF8 80094A58 24C6EE44 */ addiu $a2, %lo(D_8013EE44) # addiu $a2, $a2, -0x11bc -/* B0BBFC 80094A5C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BC00 80094A60 240707B0 */ li $a3, 1968 -/* B0BC04 80094A64 AC780004 */ sw $t8, 4($v1) -/* B0BC08 80094A68 0C031AD5 */ jal func_800C6B54 -/* B0BC0C 80094A6C AC6F0000 */ sw $t7, ($v1) -/* B0BC10 80094A70 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BC14 80094A74 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BC18 80094A78 03E00008 */ jr $ra -/* B0BC1C 80094A7C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094A80.s b/asm/non_matchings/code/z_rcp/func_80094A80.s deleted file mode 100644 index b6387134f9..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094A80.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EE50 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EE5C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094A80 -/* B0BC20 80094A80 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BC24 80094A84 AFBF0014 */ sw $ra, 0x14($sp) -/* B0BC28 80094A88 00802825 */ move $a1, $a0 -/* B0BC2C 80094A8C 3C068014 */ lui $a2, %hi(D_8013EE50) # $a2, 0x8014 -/* B0BC30 80094A90 24C6EE50 */ addiu $a2, %lo(D_8013EE50) # addiu $a2, $a2, -0x11b0 -/* B0BC34 80094A94 AFA50038 */ sw $a1, 0x38($sp) -/* B0BC38 80094A98 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BC3C 80094A9C 0C031AB1 */ jal func_800C6AC4 -/* B0BC40 80094AA0 240707C8 */ li $a3, 1992 -/* B0BC44 80094AA4 8FA50038 */ lw $a1, 0x38($sp) -/* B0BC48 80094AA8 3C188012 */ lui $t8, %hi(D_80126B80) # $t8, 0x8012 -/* B0BC4C 80094AAC 27186B80 */ addiu $t8, %lo(D_80126B80) # addiu $t8, $t8, 0x6b80 -/* B0BC50 80094AB0 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0BC54 80094AB4 3C0FDE00 */ lui $t7, 0xde00 -/* B0BC58 80094AB8 3C068014 */ lui $a2, %hi(D_8013EE5C) # $a2, 0x8014 -/* B0BC5C 80094ABC 246E0008 */ addiu $t6, $v1, 8 -/* B0BC60 80094AC0 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0BC64 80094AC4 24C6EE5C */ addiu $a2, %lo(D_8013EE5C) # addiu $a2, $a2, -0x11a4 -/* B0BC68 80094AC8 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BC6C 80094ACC 240707CC */ li $a3, 1996 -/* B0BC70 80094AD0 AC780004 */ sw $t8, 4($v1) -/* B0BC74 80094AD4 0C031AD5 */ jal func_800C6B54 -/* B0BC78 80094AD8 AC6F0000 */ sw $t7, ($v1) -/* B0BC7C 80094ADC 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BC80 80094AE0 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BC84 80094AE4 03E00008 */ jr $ra -/* B0BC88 80094AE8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094AEC.s b/asm/non_matchings/code/z_rcp/func_80094AEC.s deleted file mode 100644 index e9204734f1..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094AEC.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EE68 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EE74 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094AEC -/* B0BC8C 80094AEC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BC90 80094AF0 AFBF0014 */ sw $ra, 0x14($sp) -/* B0BC94 80094AF4 00802825 */ move $a1, $a0 -/* B0BC98 80094AF8 3C068014 */ lui $a2, %hi(D_8013EE68) # $a2, 0x8014 -/* B0BC9C 80094AFC 24C6EE68 */ addiu $a2, %lo(D_8013EE68) # addiu $a2, $a2, -0x1198 -/* B0BCA0 80094B00 AFA50038 */ sw $a1, 0x38($sp) -/* B0BCA4 80094B04 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BCA8 80094B08 0C031AB1 */ jal func_800C6AC4 -/* B0BCAC 80094B0C 240707D8 */ li $a3, 2008 -/* B0BCB0 80094B10 8FA50038 */ lw $a1, 0x38($sp) -/* B0BCB4 80094B14 3C188012 */ lui $t8, %hi(D_80126BB0) # $t8, 0x8012 -/* B0BCB8 80094B18 27186BB0 */ addiu $t8, %lo(D_80126BB0) # addiu $t8, $t8, 0x6bb0 -/* B0BCBC 80094B1C 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0BCC0 80094B20 3C0FDE00 */ lui $t7, 0xde00 -/* B0BCC4 80094B24 3C068014 */ lui $a2, %hi(D_8013EE74) # $a2, 0x8014 -/* B0BCC8 80094B28 246E0008 */ addiu $t6, $v1, 8 -/* B0BCCC 80094B2C ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0BCD0 80094B30 24C6EE74 */ addiu $a2, %lo(D_8013EE74) # addiu $a2, $a2, -0x118c -/* B0BCD4 80094B34 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BCD8 80094B38 240707DC */ li $a3, 2012 -/* B0BCDC 80094B3C AC780004 */ sw $t8, 4($v1) -/* B0BCE0 80094B40 0C031AD5 */ jal func_800C6B54 -/* B0BCE4 80094B44 AC6F0000 */ sw $t7, ($v1) -/* B0BCE8 80094B48 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BCEC 80094B4C 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BCF0 80094B50 03E00008 */ jr $ra -/* B0BCF4 80094B54 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094B58.s b/asm/non_matchings/code/z_rcp/func_80094B58.s deleted file mode 100644 index 58fc08afeb..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094B58.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EE80 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EE8C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094B58 -/* B0BCF8 80094B58 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BCFC 80094B5C AFBF0014 */ sw $ra, 0x14($sp) -/* B0BD00 80094B60 00802825 */ move $a1, $a0 -/* B0BD04 80094B64 3C068014 */ lui $a2, %hi(D_8013EE80) # $a2, 0x8014 -/* B0BD08 80094B68 24C6EE80 */ addiu $a2, %lo(D_8013EE80) # addiu $a2, $a2, -0x1180 -/* B0BD0C 80094B6C AFA50038 */ sw $a1, 0x38($sp) -/* B0BD10 80094B70 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BD14 80094B74 0C031AB1 */ jal func_800C6AC4 -/* B0BD18 80094B78 240707E8 */ li $a3, 2024 -/* B0BD1C 80094B7C 8FA50038 */ lw $a1, 0x38($sp) -/* B0BD20 80094B80 3C188012 */ lui $t8, %hi(D_80126790) # $t8, 0x8012 -/* B0BD24 80094B84 27186790 */ addiu $t8, %lo(D_80126790) # addiu $t8, $t8, 0x6790 -/* B0BD28 80094B88 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0BD2C 80094B8C 3C0FDE00 */ lui $t7, 0xde00 -/* B0BD30 80094B90 3C068014 */ lui $a2, %hi(D_8013EE8C) # $a2, 0x8014 -/* B0BD34 80094B94 246E0008 */ addiu $t6, $v1, 8 -/* B0BD38 80094B98 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0BD3C 80094B9C 24C6EE8C */ addiu $a2, %lo(D_8013EE8C) # addiu $a2, $a2, -0x1174 -/* B0BD40 80094BA0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BD44 80094BA4 240707EC */ li $a3, 2028 -/* B0BD48 80094BA8 AC780004 */ sw $t8, 4($v1) -/* B0BD4C 80094BAC 0C031AD5 */ jal func_800C6B54 -/* B0BD50 80094BB0 AC6F0000 */ sw $t7, ($v1) -/* B0BD54 80094BB4 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BD58 80094BB8 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BD5C 80094BBC 03E00008 */ jr $ra -/* B0BD60 80094BC0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094BC4.s b/asm/non_matchings/code/z_rcp/func_80094BC4.s deleted file mode 100644 index a355789898..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094BC4.s +++ /dev/null @@ -1,47 +0,0 @@ -.rdata -glabel D_8013EE98 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EEA4 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094BC4 -/* B0BD64 80094BC4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BD68 80094BC8 AFBF0014 */ sw $ra, 0x14($sp) -/* B0BD6C 80094BCC 00802825 */ move $a1, $a0 -/* B0BD70 80094BD0 3C068014 */ lui $a2, %hi(D_8013EE98) # $a2, 0x8014 -/* B0BD74 80094BD4 24C6EE98 */ addiu $a2, %lo(D_8013EE98) # addiu $a2, $a2, -0x1168 -/* B0BD78 80094BD8 AFA50038 */ sw $a1, 0x38($sp) -/* B0BD7C 80094BDC 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BD80 80094BE0 0C031AB1 */ jal func_800C6AC4 -/* B0BD84 80094BE4 240707F8 */ li $a3, 2040 -/* B0BD88 80094BE8 8FA50038 */ lw $a1, 0x38($sp) -/* B0BD8C 80094BEC 3C188012 */ lui $t8, %hi(D_80126DC0) # $t8, 0x8012 -/* B0BD90 80094BF0 27186DC0 */ addiu $t8, %lo(D_80126DC0) # addiu $t8, $t8, 0x6dc0 -/* B0BD94 80094BF4 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0BD98 80094BF8 3C0FDE00 */ lui $t7, 0xde00 -/* B0BD9C 80094BFC 3C08E300 */ lui $t0, (0xE3001801 >> 16) # lui $t0, 0xe300 -/* B0BDA0 80094C00 246E0008 */ addiu $t6, $v1, 8 -/* B0BDA4 80094C04 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0BDA8 80094C08 AC780004 */ sw $t8, 4($v1) -/* B0BDAC 80094C0C AC6F0000 */ sw $t7, ($v1) -/* B0BDB0 80094C10 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0BDB4 80094C14 35081801 */ ori $t0, (0xE3001801 & 0xFFFF) # ori $t0, $t0, 0x1801 -/* B0BDB8 80094C18 240900C0 */ li $t1, 192 -/* B0BDBC 80094C1C 24790008 */ addiu $t9, $v1, 8 -/* B0BDC0 80094C20 3C068014 */ lui $a2, %hi(D_8013EEA4) # $a2, 0x8014 -/* B0BDC4 80094C24 ACB902D0 */ sw $t9, 0x2d0($a1) -/* B0BDC8 80094C28 24C6EEA4 */ addiu $a2, %lo(D_8013EEA4) # addiu $a2, $a2, -0x115c -/* B0BDCC 80094C2C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BDD0 80094C30 240707FB */ li $a3, 2043 -/* B0BDD4 80094C34 AC690004 */ sw $t1, 4($v1) -/* B0BDD8 80094C38 0C031AD5 */ jal func_800C6B54 -/* B0BDDC 80094C3C AC680000 */ sw $t0, ($v1) -/* B0BDE0 80094C40 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BDE4 80094C44 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BDE8 80094C48 03E00008 */ jr $ra -/* B0BDEC 80094C4C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094C50.s b/asm/non_matchings/code/z_rcp/func_80094C50.s deleted file mode 100644 index a86ddaf37d..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094C50.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EEB0 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EEBC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094C50 -/* B0BDF0 80094C50 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BDF4 80094C54 AFBF0014 */ sw $ra, 0x14($sp) -/* B0BDF8 80094C58 00802825 */ move $a1, $a0 -/* B0BDFC 80094C5C 3C068014 */ lui $a2, %hi(D_8013EEB0) # $a2, 0x8014 -/* B0BE00 80094C60 24C6EEB0 */ addiu $a2, %lo(D_8013EEB0) # addiu $a2, $a2, -0x1150 -/* B0BE04 80094C64 AFA50038 */ sw $a1, 0x38($sp) -/* B0BE08 80094C68 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BE0C 80094C6C 0C031AB1 */ jal func_800C6AC4 -/* B0BE10 80094C70 24070808 */ li $a3, 2056 -/* B0BE14 80094C74 8FA50038 */ lw $a1, 0x38($sp) -/* B0BE18 80094C78 3C188012 */ lui $t8, %hi(D_80126DF0) # $t8, 0x8012 -/* B0BE1C 80094C7C 27186DF0 */ addiu $t8, %lo(D_80126DF0) # addiu $t8, $t8, 0x6df0 -/* B0BE20 80094C80 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0BE24 80094C84 3C0FDE00 */ lui $t7, 0xde00 -/* B0BE28 80094C88 3C068014 */ lui $a2, %hi(D_8013EEBC) # $a2, 0x8014 -/* B0BE2C 80094C8C 246E0008 */ addiu $t6, $v1, 8 -/* B0BE30 80094C90 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0BE34 80094C94 24C6EEBC */ addiu $a2, %lo(D_8013EEBC) # addiu $a2, $a2, -0x1144 -/* B0BE38 80094C98 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BE3C 80094C9C 2407080A */ li $a3, 2058 -/* B0BE40 80094CA0 AC780004 */ sw $t8, 4($v1) -/* B0BE44 80094CA4 0C031AD5 */ jal func_800C6B54 -/* B0BE48 80094CA8 AC6F0000 */ sw $t7, ($v1) -/* B0BE4C 80094CAC 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BE50 80094CB0 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BE54 80094CB4 03E00008 */ jr $ra -/* B0BE58 80094CB8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094CBC.s b/asm/non_matchings/code/z_rcp/func_80094CBC.s deleted file mode 100644 index 598d5e75bf..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094CBC.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EEC8 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EED4 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094CBC -/* B0BE5C 80094CBC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BE60 80094CC0 AFBF0014 */ sw $ra, 0x14($sp) -/* B0BE64 80094CC4 00802825 */ move $a1, $a0 -/* B0BE68 80094CC8 3C068014 */ lui $a2, %hi(D_8013EEC8) # $a2, 0x8014 -/* B0BE6C 80094CCC 24C6EEC8 */ addiu $a2, %lo(D_8013EEC8) # addiu $a2, $a2, -0x1138 -/* B0BE70 80094CD0 AFA50038 */ sw $a1, 0x38($sp) -/* B0BE74 80094CD4 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BE78 80094CD8 0C031AB1 */ jal func_800C6AC4 -/* B0BE7C 80094CDC 24070826 */ li $a3, 2086 -/* B0BE80 80094CE0 8FA50038 */ lw $a1, 0x38($sp) -/* B0BE84 80094CE4 3C188012 */ lui $t8, %hi(D_80126D00) # $t8, 0x8012 -/* B0BE88 80094CE8 27186D00 */ addiu $t8, %lo(D_80126D00) # addiu $t8, $t8, 0x6d00 -/* B0BE8C 80094CEC 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0BE90 80094CF0 3C0FDE00 */ lui $t7, 0xde00 -/* B0BE94 80094CF4 3C068014 */ lui $a2, %hi(D_8013EED4) # $a2, 0x8014 -/* B0BE98 80094CF8 246E0008 */ addiu $t6, $v1, 8 -/* B0BE9C 80094CFC ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0BEA0 80094D00 24C6EED4 */ addiu $a2, %lo(D_8013EED4) # addiu $a2, $a2, -0x112c -/* B0BEA4 80094D04 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BEA8 80094D08 2407082A */ li $a3, 2090 -/* B0BEAC 80094D0C AC780004 */ sw $t8, 4($v1) -/* B0BEB0 80094D10 0C031AD5 */ jal func_800C6B54 -/* B0BEB4 80094D14 AC6F0000 */ sw $t7, ($v1) -/* B0BEB8 80094D18 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BEBC 80094D1C 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BEC0 80094D20 03E00008 */ jr $ra -/* B0BEC4 80094D24 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094D28.s b/asm/non_matchings/code/z_rcp/func_80094D28.s deleted file mode 100644 index 7de47190d1..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094D28.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80094D28 -/* B0BEC8 80094D28 8C830000 */ lw $v1, ($a0) -/* B0BECC 80094D2C 3C0F8012 */ lui $t7, %hi(D_80126D00) # $t7, 0x8012 -/* B0BED0 80094D30 25EF6D00 */ addiu $t7, %lo(D_80126D00) # addiu $t7, $t7, 0x6d00 -/* B0BED4 80094D34 3C0EDE00 */ lui $t6, 0xde00 -/* B0BED8 80094D38 AC6E0000 */ sw $t6, ($v1) -/* B0BEDC 80094D3C AC6F0004 */ sw $t7, 4($v1) -/* B0BEE0 80094D40 24620008 */ addiu $v0, $v1, 8 -/* B0BEE4 80094D44 03E00008 */ jr $ra -/* B0BEE8 80094D48 AC820000 */ sw $v0, ($a0) - diff --git a/asm/non_matchings/code/z_rcp/func_80094D4C.s b/asm/non_matchings/code/z_rcp/func_80094D4C.s deleted file mode 100644 index d2e8b7af2d..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094D4C.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EEE0 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EEEC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094D4C -/* B0BEEC 80094D4C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BEF0 80094D50 AFBF0014 */ sw $ra, 0x14($sp) -/* B0BEF4 80094D54 00802825 */ move $a1, $a0 -/* B0BEF8 80094D58 3C068014 */ lui $a2, %hi(D_8013EEE0) # $a2, 0x8014 -/* B0BEFC 80094D5C 24C6EEE0 */ addiu $a2, %lo(D_8013EEE0) # addiu $a2, $a2, -0x1120 -/* B0BF00 80094D60 AFA50038 */ sw $a1, 0x38($sp) -/* B0BF04 80094D64 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BF08 80094D68 0C031AB1 */ jal func_800C6AC4 -/* B0BF0C 80094D6C 24070840 */ li $a3, 2112 -/* B0BF10 80094D70 8FA50038 */ lw $a1, 0x38($sp) -/* B0BF14 80094D74 3C188012 */ lui $t8, %hi(D_80126D90) # $t8, 0x8012 -/* B0BF18 80094D78 27186D90 */ addiu $t8, %lo(D_80126D90) # addiu $t8, $t8, 0x6d90 -/* B0BF1C 80094D7C 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0BF20 80094D80 3C0FDE00 */ lui $t7, 0xde00 -/* B0BF24 80094D84 3C068014 */ lui $a2, %hi(D_8013EEEC) # $a2, 0x8014 -/* B0BF28 80094D88 246E0008 */ addiu $t6, $v1, 8 -/* B0BF2C 80094D8C ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0BF30 80094D90 24C6EEEC */ addiu $a2, %lo(D_8013EEEC) # addiu $a2, $a2, -0x1114 -/* B0BF34 80094D94 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BF38 80094D98 24070844 */ li $a3, 2116 -/* B0BF3C 80094D9C AC780004 */ sw $t8, 4($v1) -/* B0BF40 80094DA0 0C031AD5 */ jal func_800C6B54 -/* B0BF44 80094DA4 AC6F0000 */ sw $t7, ($v1) -/* B0BF48 80094DA8 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BF4C 80094DAC 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BF50 80094DB0 03E00008 */ jr $ra -/* B0BF54 80094DB4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094E54.s b/asm/non_matchings/code/z_rcp/func_80094E54.s deleted file mode 100644 index ffd19a5e76..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094E54.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80094E54 -/* B0BFF4 80094E54 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B0BFF8 80094E58 AFBF001C */ sw $ra, 0x1c($sp) -/* B0BFFC 80094E5C AFA00010 */ sw $zero, 0x10($sp) -/* B0C000 80094E60 0C02536E */ jal func_80094DB8 -/* B0C004 80094E64 00003825 */ move $a3, $zero -/* B0C008 80094E68 8FBF001C */ lw $ra, 0x1c($sp) -/* B0C00C 80094E6C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B0C010 80094E70 03E00008 */ jr $ra -/* B0C014 80094E74 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800951D0.s b/asm/non_matchings/code/z_rcp/func_800951D0.s deleted file mode 100644 index 2837d18a34..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800951D0.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_800951D0 -/* B0C370 800951D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B0C374 800951D4 AFBF0014 */ sw $ra, 0x14($sp) -/* B0C378 800951D8 AFA5001C */ sw $a1, 0x1c($sp) -/* B0C37C 800951DC AFA60020 */ sw $a2, 0x20($sp) -/* B0C380 800951E0 AFA70024 */ sw $a3, 0x24($sp) -/* B0C384 800951E4 0C031A73 */ jal Graph_Alloc -/* B0C388 800951E8 24050010 */ li $a1, 16 -/* B0C38C 800951EC 3C0EFB00 */ lui $t6, 0xfb00 -/* B0C390 800951F0 AC4E0000 */ sw $t6, ($v0) -/* B0C394 800951F4 8FB8001C */ lw $t8, 0x1c($sp) -/* B0C398 800951F8 8FA80020 */ lw $t0, 0x20($sp) -/* B0C39C 800951FC 8FAC0024 */ lw $t4, 0x24($sp) -/* B0C3A0 80095200 0018CE00 */ sll $t9, $t8, 0x18 -/* B0C3A4 80095204 8FB80028 */ lw $t8, 0x28($sp) -/* B0C3A8 80095208 310900FF */ andi $t1, $t0, 0xff -/* B0C3AC 8009520C 00095400 */ sll $t2, $t1, 0x10 -/* B0C3B0 80095210 318D00FF */ andi $t5, $t4, 0xff -/* B0C3B4 80095214 000D7200 */ sll $t6, $t5, 8 -/* B0C3B8 80095218 032A5825 */ or $t3, $t9, $t2 -/* B0C3BC 8009521C 016E7825 */ or $t7, $t3, $t6 -/* B0C3C0 80095220 330800FF */ andi $t0, $t8, 0xff -/* B0C3C4 80095224 01E84825 */ or $t1, $t7, $t0 -/* B0C3C8 80095228 3C19DF00 */ lui $t9, 0xdf00 -/* B0C3CC 8009522C AC490004 */ sw $t1, 4($v0) -/* B0C3D0 80095230 AC590008 */ sw $t9, 8($v0) -/* B0C3D4 80095234 AC40000C */ sw $zero, 0xc($v0) -/* B0C3D8 80095238 8FBF0014 */ lw $ra, 0x14($sp) -/* B0C3DC 8009523C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0C3E0 80095240 03E00008 */ jr $ra -/* B0C3E4 80095244 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80095248.s b/asm/non_matchings/code/z_rcp/func_80095248.s deleted file mode 100644 index 9476ef88df..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80095248.s +++ /dev/null @@ -1,478 +0,0 @@ -.rdata -glabel D_8013EEF8 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EF04 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80095248 -/* B0C3E8 80095248 27BDFF38 */ addiu $sp, $sp, -0xc8 -/* B0C3EC 8009524C AFA500CC */ sw $a1, 0xcc($sp) -/* B0C3F0 80095250 AFA600D0 */ sw $a2, 0xd0($sp) -/* B0C3F4 80095254 00802825 */ move $a1, $a0 -/* B0C3F8 80095258 AFBF0014 */ sw $ra, 0x14($sp) -/* B0C3FC 8009525C AFA400C8 */ sw $a0, 0xc8($sp) -/* B0C400 80095260 AFA700D4 */ sw $a3, 0xd4($sp) -/* B0C404 80095264 3C068014 */ lui $a2, %hi(D_8013EEF8) # $a2, 0x8014 -/* B0C408 80095268 24C6EEF8 */ addiu $a2, %lo(D_8013EEF8) # addiu $a2, $a2, -0x1108 -/* B0C40C 8009526C 24070952 */ li $a3, 2386 -/* B0C410 80095270 AFA500C8 */ sw $a1, 0xc8($sp) -/* B0C414 80095274 0C031AB1 */ jal func_800C6AC4 -/* B0C418 80095278 27A400B4 */ addiu $a0, $sp, 0xb4 -/* B0C41C 8009527C 8FA500C8 */ lw $a1, 0xc8($sp) -/* B0C420 80095280 93AC00CF */ lbu $t4, 0xcf($sp) -/* B0C424 80095284 3C048012 */ lui $a0, %hi(D_80126FD0) # $a0, 0x8012 -/* B0C428 80095288 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C42C 8009528C 24846FD0 */ addiu $a0, %lo(D_80126FD0) # addiu $a0, $a0, 0x6fd0 -/* B0C430 80095290 3C06DE00 */ lui $a2, 0xde00 -/* B0C434 80095294 244E0008 */ addiu $t6, $v0, 8 -/* B0C438 80095298 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0C43C 8009529C AC440004 */ sw $a0, 4($v0) -/* B0C440 800952A0 AC460000 */ sw $a2, ($v0) -/* B0C444 800952A4 8CA202D0 */ lw $v0, 0x2d0($a1) -/* B0C448 800952A8 3C098013 */ lui $t1, %hi(gScreenWidth) # $t1, 0x8013 -/* B0C44C 800952AC 2529D270 */ addiu $t1, %lo(gScreenWidth) # addiu $t1, $t1, -0x2d90 -/* B0C450 800952B0 244F0008 */ addiu $t7, $v0, 8 -/* B0C454 800952B4 ACAF02D0 */ sw $t7, 0x2d0($a1) -/* B0C458 800952B8 AC440004 */ sw $a0, 4($v0) -/* B0C45C 800952BC AC460000 */ sw $a2, ($v0) -/* B0C460 800952C0 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0C464 800952C4 3C014080 */ li $at, 0x40800000 # 0.000000 -/* B0C468 800952C8 44810000 */ mtc1 $at, $f0 -/* B0C46C 800952CC 24580008 */ addiu $t8, $v0, 8 -/* B0C470 800952D0 ACB802B0 */ sw $t8, 0x2b0($a1) -/* B0C474 800952D4 AC440004 */ sw $a0, 4($v0) -/* B0C478 800952D8 AC460000 */ sw $a2, ($v0) -/* B0C47C 800952DC 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C480 800952E0 3C04ED00 */ lui $a0, 0xed00 -/* B0C484 800952E4 3C068013 */ lui $a2, %hi(gScreenHeight) # $a2, 0x8013 -/* B0C488 800952E8 24590008 */ addiu $t9, $v0, 8 -/* B0C48C 800952EC ACB902C0 */ sw $t9, 0x2c0($a1) -/* B0C490 800952F0 AC440000 */ sw $a0, ($v0) -/* B0C494 800952F4 8D2E0000 */ lw $t6, ($t1) -/* B0C498 800952F8 24C6D274 */ addiu $a2, %lo(gScreenHeight) # addiu $a2, $a2, -0x2d8c -/* B0C49C 800952FC 8CCF0000 */ lw $t7, ($a2) -/* B0C4A0 80095300 448E2000 */ mtc1 $t6, $f4 -/* B0C4A4 80095304 3C0BFF10 */ li $t3, 0xFF100000 # 0.000000 -/* B0C4A8 80095308 448F8000 */ mtc1 $t7, $f16 -/* B0C4AC 8009530C 468021A0 */ cvt.s.w $f6, $f4 -/* B0C4B0 80095310 3C088017 */ lui $t0, %hi(D_801759C0) # $t0, 0x8017 -/* B0C4B4 80095314 250859C0 */ addiu $t0, %lo(D_801759C0) # addiu $t0, $t0, 0x59c0 -/* B0C4B8 80095318 3C038016 */ lui $v1, %hi(gGameInfo) # $v1, 0x8016 -/* B0C4BC 8009531C 2463FA90 */ addiu $v1, %lo(gGameInfo) # addiu $v1, $v1, -0x570 -/* B0C4C0 80095320 468084A0 */ cvt.s.w $f18, $f16 -/* B0C4C4 80095324 46003202 */ mul.s $f8, $f6, $f0 -/* B0C4C8 80095328 4600428D */ trunc.w.s $f10, $f8 -/* B0C4CC 8009532C 46009102 */ mul.s $f4, $f18, $f0 -/* B0C4D0 80095330 44185000 */ mfc1 $t8, $f10 -/* B0C4D4 80095334 00000000 */ nop -/* B0C4D8 80095338 33190FFF */ andi $t9, $t8, 0xfff -/* B0C4DC 8009533C 4600218D */ trunc.w.s $f6, $f4 -/* B0C4E0 80095340 00197300 */ sll $t6, $t9, 0xc -/* B0C4E4 80095344 44193000 */ mfc1 $t9, $f6 -/* B0C4E8 80095348 00000000 */ nop -/* B0C4EC 8009534C 332F0FFF */ andi $t7, $t9, 0xfff -/* B0C4F0 80095350 01CFC025 */ or $t8, $t6, $t7 -/* B0C4F4 80095354 AC580004 */ sw $t8, 4($v0) -/* B0C4F8 80095358 8CA202D0 */ lw $v0, 0x2d0($a1) -/* B0C4FC 8009535C 24590008 */ addiu $t9, $v0, 8 -/* B0C500 80095360 ACB902D0 */ sw $t9, 0x2d0($a1) -/* B0C504 80095364 AC440000 */ sw $a0, ($v0) -/* B0C508 80095368 8D2E0000 */ lw $t6, ($t1) -/* B0C50C 8009536C 8CCF0000 */ lw $t7, ($a2) -/* B0C510 80095370 448E4000 */ mtc1 $t6, $f8 -/* B0C514 80095374 448F2000 */ mtc1 $t7, $f4 -/* B0C518 80095378 468042A0 */ cvt.s.w $f10, $f8 -/* B0C51C 8009537C 468021A0 */ cvt.s.w $f6, $f4 -/* B0C520 80095380 46005402 */ mul.s $f16, $f10, $f0 -/* B0C524 80095384 4600848D */ trunc.w.s $f18, $f16 -/* B0C528 80095388 46003202 */ mul.s $f8, $f6, $f0 -/* B0C52C 8009538C 44189000 */ mfc1 $t8, $f18 -/* B0C530 80095390 00000000 */ nop -/* B0C534 80095394 33190FFF */ andi $t9, $t8, 0xfff -/* B0C538 80095398 4600428D */ trunc.w.s $f10, $f8 -/* B0C53C 8009539C 00197300 */ sll $t6, $t9, 0xc -/* B0C540 800953A0 44195000 */ mfc1 $t9, $f10 -/* B0C544 800953A4 00000000 */ nop -/* B0C548 800953A8 332F0FFF */ andi $t7, $t9, 0xfff -/* B0C54C 800953AC 01CFC025 */ or $t8, $t6, $t7 -/* B0C550 800953B0 AC580004 */ sw $t8, 4($v0) -/* B0C554 800953B4 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0C558 800953B8 24590008 */ addiu $t9, $v0, 8 -/* B0C55C 800953BC ACB902B0 */ sw $t9, 0x2b0($a1) -/* B0C560 800953C0 AC440000 */ sw $a0, ($v0) -/* B0C564 800953C4 8D2E0000 */ lw $t6, ($t1) -/* B0C568 800953C8 8CCF0000 */ lw $t7, ($a2) -/* B0C56C 800953CC 3C04FE00 */ li $a0, 0xFE000000 # 0.000000 -/* B0C570 800953D0 448E8000 */ mtc1 $t6, $f16 -/* B0C574 800953D4 448F4000 */ mtc1 $t7, $f8 -/* B0C578 800953D8 468084A0 */ cvt.s.w $f18, $f16 -/* B0C57C 800953DC 468042A0 */ cvt.s.w $f10, $f8 -/* B0C580 800953E0 46009102 */ mul.s $f4, $f18, $f0 -/* B0C584 800953E4 4600218D */ trunc.w.s $f6, $f4 -/* B0C588 800953E8 46005402 */ mul.s $f16, $f10, $f0 -/* B0C58C 800953EC 44183000 */ mfc1 $t8, $f6 -/* B0C590 800953F0 00000000 */ nop -/* B0C594 800953F4 33190FFF */ andi $t9, $t8, 0xfff -/* B0C598 800953F8 4600848D */ trunc.w.s $f18, $f16 -/* B0C59C 800953FC 00197300 */ sll $t6, $t9, 0xc -/* B0C5A0 80095400 44199000 */ mfc1 $t9, $f18 -/* B0C5A4 80095404 00000000 */ nop -/* B0C5A8 80095408 332F0FFF */ andi $t7, $t9, 0xfff -/* B0C5AC 8009540C 01CFC025 */ or $t8, $t6, $t7 -/* B0C5B0 80095410 AC580004 */ sw $t8, 4($v0) -/* B0C5B4 80095414 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C5B8 80095418 24590008 */ addiu $t9, $v0, 8 -/* B0C5BC 8009541C ACB902C0 */ sw $t9, 0x2c0($a1) -/* B0C5C0 80095420 8D2E0000 */ lw $t6, ($t1) -/* B0C5C4 80095424 25CFFFFF */ addiu $t7, $t6, -1 -/* B0C5C8 80095428 31F80FFF */ andi $t8, $t7, 0xfff -/* B0C5CC 8009542C 030BC825 */ or $t9, $t8, $t3 -/* B0C5D0 80095430 AC590000 */ sw $t9, ($v0) -/* B0C5D4 80095434 8CAE02DC */ lw $t6, 0x2dc($a1) -/* B0C5D8 80095438 AC4E0004 */ sw $t6, 4($v0) -/* B0C5DC 8009543C 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C5E0 80095440 244F0008 */ addiu $t7, $v0, 8 -/* B0C5E4 80095444 ACAF02C0 */ sw $t7, 0x2c0($a1) -/* B0C5E8 80095448 8D380000 */ lw $t8, ($t1) -/* B0C5EC 8009544C 2719FFFF */ addiu $t9, $t8, -1 -/* B0C5F0 80095450 332E0FFF */ andi $t6, $t9, 0xfff -/* B0C5F4 80095454 01CB7825 */ or $t7, $t6, $t3 -/* B0C5F8 80095458 AC4F0000 */ sw $t7, ($v0) -/* B0C5FC 8009545C 8CB802DC */ lw $t8, 0x2dc($a1) -/* B0C600 80095460 AC580004 */ sw $t8, 4($v0) -/* B0C604 80095464 8CA202D0 */ lw $v0, 0x2d0($a1) -/* B0C608 80095468 24590008 */ addiu $t9, $v0, 8 -/* B0C60C 8009546C ACB902D0 */ sw $t9, 0x2d0($a1) -/* B0C610 80095470 8D2E0000 */ lw $t6, ($t1) -/* B0C614 80095474 25CFFFFF */ addiu $t7, $t6, -1 -/* B0C618 80095478 31F80FFF */ andi $t8, $t7, 0xfff -/* B0C61C 8009547C 030BC825 */ or $t9, $t8, $t3 -/* B0C620 80095480 AC590000 */ sw $t9, ($v0) -/* B0C624 80095484 8CAE02DC */ lw $t6, 0x2dc($a1) -/* B0C628 80095488 AC4E0004 */ sw $t6, 4($v0) -/* B0C62C 8009548C 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0C630 80095490 244F0008 */ addiu $t7, $v0, 8 -/* B0C634 80095494 ACAF02B0 */ sw $t7, 0x2b0($a1) -/* B0C638 80095498 8D380000 */ lw $t8, ($t1) -/* B0C63C 8009549C 2719FFFF */ addiu $t9, $t8, -1 -/* B0C640 800954A0 332E0FFF */ andi $t6, $t9, 0xfff -/* B0C644 800954A4 01CB7825 */ or $t7, $t6, $t3 -/* B0C648 800954A8 AC4F0000 */ sw $t7, ($v0) -/* B0C64C 800954AC 8CB802DC */ lw $t8, 0x2dc($a1) -/* B0C650 800954B0 AC580004 */ sw $t8, 4($v0) -/* B0C654 800954B4 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C658 800954B8 24590008 */ addiu $t9, $v0, 8 -/* B0C65C 800954BC ACB902C0 */ sw $t9, 0x2c0($a1) -/* B0C660 800954C0 AC480004 */ sw $t0, 4($v0) -/* B0C664 800954C4 AC440000 */ sw $a0, ($v0) -/* B0C668 800954C8 8CA202D0 */ lw $v0, 0x2d0($a1) -/* B0C66C 800954CC 244E0008 */ addiu $t6, $v0, 8 -/* B0C670 800954D0 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0C674 800954D4 AC480004 */ sw $t0, 4($v0) -/* B0C678 800954D8 AC440000 */ sw $a0, ($v0) -/* B0C67C 800954DC 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0C680 800954E0 3C0E8016 */ lui $t6, %hi(D_80161490) # $t6, 0x8016 -/* B0C684 800954E4 244F0008 */ addiu $t7, $v0, 8 -/* B0C688 800954E8 ACAF02B0 */ sw $t7, 0x2b0($a1) -/* B0C68C 800954EC AC480004 */ sw $t0, 4($v0) -/* B0C690 800954F0 AC440000 */ sw $a0, ($v0) -/* B0C694 800954F4 8C780000 */ lw $t8, ($v1) -/* B0C698 800954F8 87190190 */ lh $t9, 0x190($t8) -/* B0C69C 800954FC 2B210002 */ slti $at, $t9, 2 -/* B0C6A0 80095500 10200113 */ beqz $at, .L80095950 -/* B0C6A4 80095504 00000000 */ nop -/* B0C6A8 80095508 8DCE1490 */ lw $t6, %lo(D_80161490)($t6) -/* B0C6AC 8009550C 29C10002 */ slti $at, $t6, 2 -/* B0C6B0 80095510 1020010F */ beqz $at, .L80095950 -/* B0C6B4 80095514 00000000 */ nop -/* B0C6B8 80095518 AFA500C8 */ sw $a1, 0xc8($sp) -/* B0C6BC 8009551C AFA8002C */ sw $t0, 0x2c($sp) -/* B0C6C0 80095520 0C02CE3F */ jal func_800B38FC -/* B0C6C4 80095524 A3AC00CF */ sb $t4, 0xcf($sp) -/* B0C6C8 80095528 3C038016 */ lui $v1, %hi(gGameInfo) # $v1, 0x8016 -/* B0C6CC 8009552C 2463FA90 */ addiu $v1, %lo(gGameInfo) # addiu $v1, $v1, -0x570 -/* B0C6D0 80095530 8C640000 */ lw $a0, ($v1) -/* B0C6D4 80095534 24060010 */ li $a2, 16 -/* B0C6D8 80095538 3C098013 */ lui $t1, %hi(gScreenWidth) # $t1, 0x8013 -/* B0C6DC 8009553C 848F1074 */ lh $t7, 0x1074($a0) -/* B0C6E0 80095540 2529D270 */ addiu $t1, %lo(gScreenWidth) # addiu $t1, $t1, -0x2d90 -/* B0C6E4 80095544 8FA500C8 */ lw $a1, 0xc8($sp) -/* B0C6E8 80095548 8FA8002C */ lw $t0, 0x2c($sp) -/* B0C6EC 8009554C 3C0BFF10 */ lui $t3, 0xff10 -/* B0C6F0 80095550 93AC00CF */ lbu $t4, 0xcf($sp) -/* B0C6F4 80095554 14CF0041 */ bne $a2, $t7, .L8009565C -/* B0C6F8 80095558 00405025 */ move $t2, $v0 -/* B0C6FC 8009555C 84981092 */ lh $t8, 0x1092($a0) -/* B0C700 80095560 24070003 */ li $a3, 3 -/* B0C704 80095564 50D80020 */ beql $a2, $t8, .L800955E8 -/* B0C708 80095568 84861076 */ lh $a2, 0x1076($a0) -/* B0C70C 8009556C A4871076 */ sh $a3, 0x1076($a0) -/* B0C710 80095570 8C790000 */ lw $t9, ($v1) -/* B0C714 80095574 A7271078 */ sh $a3, 0x1078($t9) -/* B0C718 80095578 8C6E0000 */ lw $t6, ($v1) -/* B0C71C 8009557C A5C0107A */ sh $zero, 0x107a($t6) -/* B0C720 80095580 8C6F0000 */ lw $t7, ($v1) -/* B0C724 80095584 A5E0107C */ sh $zero, 0x107c($t7) -/* B0C728 80095588 8C780000 */ lw $t8, ($v1) -/* B0C72C 8009558C A700107E */ sh $zero, 0x107e($t8) -/* B0C730 80095590 8C790000 */ lw $t9, ($v1) -/* B0C734 80095594 A7201080 */ sh $zero, 0x1080($t9) -/* B0C738 80095598 8C6E0000 */ lw $t6, ($v1) -/* B0C73C 8009559C A5C01082 */ sh $zero, 0x1082($t6) -/* B0C740 800955A0 8C6F0000 */ lw $t7, ($v1) -/* B0C744 800955A4 A5E01084 */ sh $zero, 0x1084($t7) -/* B0C748 800955A8 8C780000 */ lw $t8, ($v1) -/* B0C74C 800955AC A7001086 */ sh $zero, 0x1086($t8) -/* B0C750 800955B0 8C790000 */ lw $t9, ($v1) -/* B0C754 800955B4 A7201088 */ sh $zero, 0x1088($t9) -/* B0C758 800955B8 8C6E0000 */ lw $t6, ($v1) -/* B0C75C 800955BC A5C0108A */ sh $zero, 0x108a($t6) -/* B0C760 800955C0 8C6F0000 */ lw $t7, ($v1) -/* B0C764 800955C4 A5E0108C */ sh $zero, 0x108c($t7) -/* B0C768 800955C8 8C780000 */ lw $t8, ($v1) -/* B0C76C 800955CC A700108E */ sh $zero, 0x108e($t8) -/* B0C770 800955D0 8C790000 */ lw $t9, ($v1) -/* B0C774 800955D4 A7201090 */ sh $zero, 0x1090($t9) -/* B0C778 800955D8 8C6E0000 */ lw $t6, ($v1) -/* B0C77C 800955DC A5C61092 */ sh $a2, 0x1092($t6) -/* B0C780 800955E0 8C640000 */ lw $a0, ($v1) -/* B0C784 800955E4 84861076 */ lh $a2, 0x1076($a0) -.L800955E8: -/* B0C788 800955E8 30CF0001 */ andi $t7, $a2, 1 -/* B0C78C 800955EC 51E00005 */ beql $t7, $zero, .L80095604 -/* B0C790 800955F0 30D80002 */ andi $t8, $a2, 2 -/* B0C794 800955F4 A482107A */ sh $v0, 0x107a($a0) -/* B0C798 800955F8 8C640000 */ lw $a0, ($v1) -/* B0C79C 800955FC 84861076 */ lh $a2, 0x1076($a0) -/* B0C7A0 80095600 30D80002 */ andi $t8, $a2, 2 -.L80095604: -/* B0C7A4 80095604 5300000A */ beql $t8, $zero, .L80095630 -/* B0C7A8 80095608 84821078 */ lh $v0, 0x1078($a0) -/* B0C7AC 8009560C A48C107C */ sh $t4, 0x107c($a0) -/* B0C7B0 80095610 8C6E0000 */ lw $t6, ($v1) -/* B0C7B4 80095614 93B900D3 */ lbu $t9, 0xd3($sp) -/* B0C7B8 80095618 A5D9107E */ sh $t9, 0x107e($t6) -/* B0C7BC 8009561C 8C780000 */ lw $t8, ($v1) -/* B0C7C0 80095620 93AF00D7 */ lbu $t7, 0xd7($sp) -/* B0C7C4 80095624 A70F1080 */ sh $t7, 0x1080($t8) -/* B0C7C8 80095628 8C640000 */ lw $a0, ($v1) -/* B0C7CC 8009562C 84821078 */ lh $v0, 0x1078($a0) -.L80095630: -/* B0C7D0 80095630 30590001 */ andi $t9, $v0, 1 -/* B0C7D4 80095634 13200002 */ beqz $t9, .L80095640 -/* B0C7D8 80095638 304E0002 */ andi $t6, $v0, 2 -/* B0C7DC 8009563C 848A107A */ lh $t2, 0x107a($a0) -.L80095640: -/* B0C7E0 80095640 51C00007 */ beql $t6, $zero, .L80095660 -/* B0C7E4 80095644 93B900D7 */ lbu $t9, 0xd7($sp) -/* B0C7E8 80095648 848F107E */ lh $t7, 0x107e($a0) -/* B0C7EC 8009564C 908C107D */ lbu $t4, 0x107d($a0) -/* B0C7F0 80095650 A3AF00D3 */ sb $t7, 0xd3($sp) -/* B0C7F4 80095654 84981080 */ lh $t8, 0x1080($a0) -/* B0C7F8 80095658 A3B800D7 */ sb $t8, 0xd7($sp) -.L8009565C: -/* B0C7FC 8009565C 93B900D7 */ lbu $t9, 0xd7($sp) -.L80095660: -/* B0C800 80095660 93BF00D3 */ lbu $ra, 0xd3($sp) -/* B0C804 80095664 3C04E300 */ lui $a0, (0xE3000001 >> 16) # lui $a0, 0xe300 -/* B0C808 80095668 AFB90020 */ sw $t9, 0x20($sp) -/* B0C80C 8009566C 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C810 80095670 34840A01 */ ori $a0, (0xE3000A01 & 0xFFFF) # ori $a0, $a0, 0xa01 -/* B0C814 80095674 3C070030 */ lui $a3, 0x30 -/* B0C818 80095678 244E0008 */ addiu $t6, $v0, 8 -/* B0C81C 8009567C ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0C820 80095680 8D2F0000 */ lw $t7, ($t1) -/* B0C824 80095684 AC480004 */ sw $t0, 4($v0) -/* B0C828 80095688 3C08F600 */ lui $t0, 0xf600 -/* B0C82C 8009568C 25F8FFFF */ addiu $t8, $t7, -1 -/* B0C830 80095690 33190FFF */ andi $t9, $t8, 0xfff -/* B0C834 80095694 032B7025 */ or $t6, $t9, $t3 -/* B0C838 80095698 AC4E0000 */ sw $t6, ($v0) -/* B0C83C 8009569C 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C840 800956A0 3C19E200 */ lui $t9, (0xE200001C >> 16) # lui $t9, 0xe200 -/* B0C844 800956A4 3739001C */ ori $t9, (0xE200001C & 0xFFFF) # ori $t9, $t9, 0x1c -/* B0C848 800956A8 244F0008 */ addiu $t7, $v0, 8 -/* B0C84C 800956AC ACAF02C0 */ sw $t7, 0x2c0($a1) -/* B0C850 800956B0 AC470004 */ sw $a3, 4($v0) -/* B0C854 800956B4 AC440000 */ sw $a0, ($v0) -/* B0C858 800956B8 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C85C 800956BC 3C0FF700 */ lui $t7, 0xf700 -/* B0C860 800956C0 314603FF */ andi $a2, $t2, 0x3ff -/* B0C864 800956C4 24580008 */ addiu $t8, $v0, 8 -/* B0C868 800956C8 ACB802C0 */ sw $t8, 0x2c0($a1) -/* B0C86C 800956CC AC400004 */ sw $zero, 4($v0) -/* B0C870 800956D0 AC590000 */ sw $t9, ($v0) -/* B0C874 800956D4 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C878 800956D8 3C18FFFC */ lui $t8, (0xFFFCFFFC >> 16) # lui $t8, 0xfffc -/* B0C87C 800956DC 3718FFFC */ ori $t8, (0xFFFCFFFC & 0xFFFF) # ori $t8, $t8, 0xfffc -/* B0C880 800956E0 244E0008 */ addiu $t6, $v0, 8 -/* B0C884 800956E4 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0C888 800956E8 AC580004 */ sw $t8, 4($v0) -/* B0C88C 800956EC AC4F0000 */ sw $t7, ($v0) -/* B0C890 800956F0 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C894 800956F4 00063080 */ sll $a2, $a2, 2 -/* B0C898 800956F8 01806825 */ move $t5, $t4 -/* B0C89C 800956FC 24590008 */ addiu $t9, $v0, 8 -/* B0C8A0 80095700 ACB902C0 */ sw $t9, 0x2c0($a1) -/* B0C8A4 80095704 8D2E0000 */ lw $t6, ($t1) -/* B0C8A8 80095708 3C0CE700 */ lui $t4, 0xe700 -/* B0C8AC 8009570C 25CFFFFF */ addiu $t7, $t6, -1 -/* B0C8B0 80095710 31F803FF */ andi $t8, $t7, 0x3ff -/* B0C8B4 80095714 3C0F8013 */ lui $t7, %hi(gScreenHeight) # $t7, 0x8013 -/* B0C8B8 80095718 8DEFD274 */ lw $t7, %lo(gScreenHeight)($t7) -/* B0C8BC 8009571C 0018CB80 */ sll $t9, $t8, 0xe -/* B0C8C0 80095720 03287025 */ or $t6, $t9, $t0 -/* B0C8C4 80095724 01EAC023 */ subu $t8, $t7, $t2 -/* B0C8C8 80095728 2719FFFF */ addiu $t9, $t8, -1 -/* B0C8CC 8009572C 332F03FF */ andi $t7, $t9, 0x3ff -/* B0C8D0 80095730 000FC080 */ sll $t8, $t7, 2 -/* B0C8D4 80095734 01D8C825 */ or $t9, $t6, $t8 -/* B0C8D8 80095738 AC590000 */ sw $t9, ($v0) -/* B0C8DC 8009573C AC460004 */ sw $a2, 4($v0) -/* B0C8E0 80095740 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C8E4 80095744 244F0008 */ addiu $t7, $v0, 8 -/* B0C8E8 80095748 ACAF02C0 */ sw $t7, 0x2c0($a1) -/* B0C8EC 8009574C AC400004 */ sw $zero, 4($v0) -/* B0C8F0 80095750 AC4C0000 */ sw $t4, ($v0) -/* B0C8F4 80095754 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C8F8 80095758 244E0008 */ addiu $t6, $v0, 8 -/* B0C8FC 8009575C ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0C900 80095760 8D380000 */ lw $t8, ($t1) -/* B0C904 80095764 2719FFFF */ addiu $t9, $t8, -1 -/* B0C908 80095768 332F0FFF */ andi $t7, $t9, 0xfff -/* B0C90C 8009576C 01EB7025 */ or $t6, $t7, $t3 -/* B0C910 80095770 AC4E0000 */ sw $t6, ($v0) -/* B0C914 80095774 8CB802DC */ lw $t8, 0x2dc($a1) -/* B0C918 80095778 3C0EE200 */ lui $t6, (0xE200001C >> 16) # lui $t6, 0xe200 -/* B0C91C 8009577C 35CE001C */ ori $t6, (0xE200001C & 0xFFFF) # ori $t6, $t6, 0x1c -/* B0C920 80095780 AC580004 */ sw $t8, 4($v0) -/* B0C924 80095784 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C928 80095788 3C0BF700 */ lui $t3, 0xf700 -/* B0C92C 8009578C 24590008 */ addiu $t9, $v0, 8 -/* B0C930 80095790 ACB902C0 */ sw $t9, 0x2c0($a1) -/* B0C934 80095794 AC470004 */ sw $a3, 4($v0) -/* B0C938 80095798 AC440000 */ sw $a0, ($v0) -/* B0C93C 8009579C 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C940 800957A0 000DCA00 */ sll $t9, $t5, 8 -/* B0C944 800957A4 244F0008 */ addiu $t7, $v0, 8 -/* B0C948 800957A8 ACAF02C0 */ sw $t7, 0x2c0($a1) -/* B0C94C 800957AC AC400004 */ sw $zero, 4($v0) -/* B0C950 800957B0 AC4E0000 */ sw $t6, ($v0) -/* B0C954 800957B4 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C958 800957B8 001F70C0 */ sll $t6, $ra, 3 -/* B0C95C 800957BC 332FF800 */ andi $t7, $t9, 0xf800 -/* B0C960 800957C0 24580008 */ addiu $t8, $v0, 8 -/* B0C964 800957C4 ACB802C0 */ sw $t8, 0x2c0($a1) -/* B0C968 800957C8 31D807C0 */ andi $t8, $t6, 0x7c0 -/* B0C96C 800957CC AC4B0000 */ sw $t3, ($v0) -/* B0C970 800957D0 8FAE0020 */ lw $t6, 0x20($sp) -/* B0C974 800957D4 01F8C825 */ or $t9, $t7, $t8 -/* B0C978 800957D8 000E7883 */ sra $t7, $t6, 2 -/* B0C97C 800957DC 31F8003E */ andi $t8, $t7, 0x3e -/* B0C980 800957E0 03382025 */ or $a0, $t9, $t8 -/* B0C984 800957E4 34840001 */ ori $a0, (0xE3000001 & 0xFFFF) # ori $a0, $a0, 1 -/* B0C988 800957E8 00047400 */ sll $t6, $a0, 0x10 -/* B0C98C 800957EC 01C43825 */ or $a3, $t6, $a0 -/* B0C990 800957F0 AC470004 */ sw $a3, 4($v0) -/* B0C994 800957F4 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C998 800957F8 3C048013 */ lui $a0, %hi(gScreenHeight) # $a0, 0x8013 -/* B0C99C 800957FC 2484D274 */ addiu $a0, %lo(gScreenHeight) # addiu $a0, $a0, -0x2d8c -/* B0C9A0 80095800 244F0008 */ addiu $t7, $v0, 8 -/* B0C9A4 80095804 ACAF02C0 */ sw $t7, 0x2c0($a1) -/* B0C9A8 80095808 8D390000 */ lw $t9, ($t1) -/* B0C9AC 8009580C 2738FFFF */ addiu $t8, $t9, -1 -/* B0C9B0 80095810 330E03FF */ andi $t6, $t8, 0x3ff -/* B0C9B4 80095814 8C980000 */ lw $t8, ($a0) -/* B0C9B8 80095818 000E7B80 */ sll $t7, $t6, 0xe -/* B0C9BC 8009581C 01E8C825 */ or $t9, $t7, $t0 -/* B0C9C0 80095820 030A7023 */ subu $t6, $t8, $t2 -/* B0C9C4 80095824 25CFFFFF */ addiu $t7, $t6, -1 -/* B0C9C8 80095828 31F803FF */ andi $t8, $t7, 0x3ff -/* B0C9CC 8009582C 00187080 */ sll $t6, $t8, 2 -/* B0C9D0 80095830 032E7825 */ or $t7, $t9, $t6 -/* B0C9D4 80095834 AC4F0000 */ sw $t7, ($v0) -/* B0C9D8 80095838 AC460004 */ sw $a2, 4($v0) -/* B0C9DC 8009583C 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C9E0 80095840 24580008 */ addiu $t8, $v0, 8 -/* B0C9E4 80095844 ACB802C0 */ sw $t8, 0x2c0($a1) -/* B0C9E8 80095848 AC400004 */ sw $zero, 4($v0) -/* B0C9EC 8009584C 19400040 */ blez $t2, .L80095950 -/* B0C9F0 80095850 AC4C0000 */ sw $t4, ($v0) -/* B0C9F4 80095854 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0C9F8 80095858 3C0FE300 */ lui $t7, (0xE3000A01 >> 16) # lui $t7, 0xe300 -/* B0C9FC 8009585C 35EF0A01 */ ori $t7, (0xE3000A01 & 0xFFFF) # ori $t7, $t7, 0xa01 -/* B0CA00 80095860 24590008 */ addiu $t9, $v0, 8 -/* B0CA04 80095864 ACB902B0 */ sw $t9, 0x2b0($a1) -/* B0CA08 80095868 AC400004 */ sw $zero, 4($v0) -/* B0CA0C 8009586C AC4C0000 */ sw $t4, ($v0) -/* B0CA10 80095870 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0CA14 80095874 3C180030 */ lui $t8, 0x30 -/* B0CA18 80095878 244E0008 */ addiu $t6, $v0, 8 -/* B0CA1C 8009587C ACAE02B0 */ sw $t6, 0x2b0($a1) -/* B0CA20 80095880 AC580004 */ sw $t8, 4($v0) -/* B0CA24 80095884 AC4F0000 */ sw $t7, ($v0) -/* B0CA28 80095888 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0CA2C 8009588C 3C0EE200 */ lui $t6, (0xE200001C >> 16) # lui $t6, 0xe200 -/* B0CA30 80095890 35CE001C */ ori $t6, (0xE200001C & 0xFFFF) # ori $t6, $t6, 0x1c -/* B0CA34 80095894 24590008 */ addiu $t9, $v0, 8 -/* B0CA38 80095898 ACB902B0 */ sw $t9, 0x2b0($a1) -/* B0CA3C 8009589C AC400004 */ sw $zero, 4($v0) -/* B0CA40 800958A0 AC4E0000 */ sw $t6, ($v0) -/* B0CA44 800958A4 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0CA48 800958A8 244F0008 */ addiu $t7, $v0, 8 -/* B0CA4C 800958AC ACAF02B0 */ sw $t7, 0x2b0($a1) -/* B0CA50 800958B0 AC470004 */ sw $a3, 4($v0) -/* B0CA54 800958B4 AC4B0000 */ sw $t3, ($v0) -/* B0CA58 800958B8 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0CA5C 800958BC 24580008 */ addiu $t8, $v0, 8 -/* B0CA60 800958C0 ACB802B0 */ sw $t8, 0x2b0($a1) -/* B0CA64 800958C4 8D390000 */ lw $t9, ($t1) -/* B0CA68 800958C8 AC400004 */ sw $zero, 4($v0) -/* B0CA6C 800958CC 272EFFFF */ addiu $t6, $t9, -1 -/* B0CA70 800958D0 31CF03FF */ andi $t7, $t6, 0x3ff -/* B0CA74 800958D4 000FC380 */ sll $t8, $t7, 0xe -/* B0CA78 800958D8 254EFFFF */ addiu $t6, $t2, -1 -/* B0CA7C 800958DC 31CF03FF */ andi $t7, $t6, 0x3ff -/* B0CA80 800958E0 0308C825 */ or $t9, $t8, $t0 -/* B0CA84 800958E4 000FC080 */ sll $t8, $t7, 2 -/* B0CA88 800958E8 03387025 */ or $t6, $t9, $t8 -/* B0CA8C 800958EC AC4E0000 */ sw $t6, ($v0) -/* B0CA90 800958F0 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0CA94 800958F4 244F0008 */ addiu $t7, $v0, 8 -/* B0CA98 800958F8 ACAF02B0 */ sw $t7, 0x2b0($a1) -/* B0CA9C 800958FC 8D390000 */ lw $t9, ($t1) -/* B0CAA0 80095900 2738FFFF */ addiu $t8, $t9, -1 -/* B0CAA4 80095904 330E03FF */ andi $t6, $t8, 0x3ff -/* B0CAA8 80095908 8C980000 */ lw $t8, ($a0) -/* B0CAAC 8009590C 000E7B80 */ sll $t7, $t6, 0xe -/* B0CAB0 80095910 01E8C825 */ or $t9, $t7, $t0 -/* B0CAB4 80095914 270EFFFF */ addiu $t6, $t8, -1 -/* B0CAB8 80095918 31CF03FF */ andi $t7, $t6, 0x3ff -/* B0CABC 8009591C 000FC080 */ sll $t8, $t7, 2 -/* B0CAC0 80095920 03387025 */ or $t6, $t9, $t8 -/* B0CAC4 80095924 AC4E0000 */ sw $t6, ($v0) -/* B0CAC8 80095928 8C8F0000 */ lw $t7, ($a0) -/* B0CACC 8009592C 01EAC823 */ subu $t9, $t7, $t2 -/* B0CAD0 80095930 333803FF */ andi $t8, $t9, 0x3ff -/* B0CAD4 80095934 00187080 */ sll $t6, $t8, 2 -/* B0CAD8 80095938 AC4E0004 */ sw $t6, 4($v0) -/* B0CADC 8009593C 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0CAE0 80095940 244F0008 */ addiu $t7, $v0, 8 -/* B0CAE4 80095944 ACAF02B0 */ sw $t7, 0x2b0($a1) -/* B0CAE8 80095948 AC400004 */ sw $zero, 4($v0) -/* B0CAEC 8009594C AC4C0000 */ sw $t4, ($v0) -.L80095950: -/* B0CAF0 80095950 3C068014 */ lui $a2, %hi(D_8013EF04) # $a2, 0x8014 -/* B0CAF4 80095954 24C6EF04 */ addiu $a2, %lo(D_8013EF04) # addiu $a2, $a2, -0x10fc -/* B0CAF8 80095958 27A400B4 */ addiu $a0, $sp, 0xb4 -/* B0CAFC 8009595C 0C031AD5 */ jal func_800C6B54 -/* B0CB00 80095960 240709C1 */ li $a3, 2497 -/* B0CB04 80095964 8FBF0014 */ lw $ra, 0x14($sp) -/* B0CB08 80095968 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* B0CB0C 8009596C 03E00008 */ jr $ra -/* B0CB10 80095970 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80095974.s b/asm/non_matchings/code/z_rcp/func_80095974.s deleted file mode 100644 index 97b6d642ef..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80095974.s +++ /dev/null @@ -1,84 +0,0 @@ -.rdata -glabel D_8013EF10 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EF1C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80095974 -/* B0CB14 80095974 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B0CB18 80095978 AFBF0014 */ sw $ra, 0x14($sp) -/* B0CB1C 8009597C 00802825 */ move $a1, $a0 -/* B0CB20 80095980 3C068014 */ lui $a2, %hi(D_8013EF10) # $a2, 0x8014 -/* B0CB24 80095984 24C6EF10 */ addiu $a2, %lo(D_8013EF10) # addiu $a2, $a2, -0x10f0 -/* B0CB28 80095988 AFA50040 */ sw $a1, 0x40($sp) -/* B0CB2C 8009598C 27A4002C */ addiu $a0, $sp, 0x2c -/* B0CB30 80095990 0C031AB1 */ jal func_800C6AC4 -/* B0CB34 80095994 240709C7 */ li $a3, 2503 -/* B0CB38 80095998 8FA50040 */ lw $a1, 0x40($sp) -/* B0CB3C 8009599C 3C188012 */ lui $t8, %hi(D_80126FD0) # $t8, 0x8012 -/* B0CB40 800959A0 27186FD0 */ addiu $t8, %lo(D_80126FD0) # addiu $t8, $t8, 0x6fd0 -/* B0CB44 800959A4 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0CB48 800959A8 3C0FDE00 */ lui $t7, 0xde00 -/* B0CB4C 800959AC 3C048013 */ lui $a0, %hi(gScreenWidth) # $a0, 0x8013 -/* B0CB50 800959B0 244E0008 */ addiu $t6, $v0, 8 -/* B0CB54 800959B4 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0CB58 800959B8 AC580004 */ sw $t8, 4($v0) -/* B0CB5C 800959BC AC4F0000 */ sw $t7, ($v0) -/* B0CB60 800959C0 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0CB64 800959C4 3C08ED00 */ li $t0, 0xED000000 # 0.000000 -/* B0CB68 800959C8 2484D270 */ addiu $a0, %lo(gScreenWidth) # addiu $a0, $a0, -0x2d90 -/* B0CB6C 800959CC 24590008 */ addiu $t9, $v0, 8 -/* B0CB70 800959D0 ACB902C0 */ sw $t9, 0x2c0($a1) -/* B0CB74 800959D4 AC480000 */ sw $t0, ($v0) -/* B0CB78 800959D8 8C890000 */ lw $t1, ($a0) -/* B0CB7C 800959DC 3C0E8013 */ lui $t6, %hi(gScreenHeight) -/* B0CB80 800959E0 8DCED274 */ lw $t6, %lo(gScreenHeight)($t6) -/* B0CB84 800959E4 44892000 */ mtc1 $t1, $f4 -/* B0CB88 800959E8 3C014080 */ li $at, 0x40800000 # 0.000000 -/* B0CB8C 800959EC 448E8000 */ mtc1 $t6, $f16 -/* B0CB90 800959F0 468021A0 */ cvt.s.w $f6, $f4 -/* B0CB94 800959F4 44810000 */ mtc1 $at, $f0 -/* B0CB98 800959F8 3C0AFE00 */ lui $t2, 0xfe00 -/* B0CB9C 800959FC 3C01FF10 */ lui $at, 0xff10 -/* B0CBA0 80095A00 3C068014 */ lui $a2, %hi(D_8013EF1C) # $a2, 0x8014 -/* B0CBA4 80095A04 468084A0 */ cvt.s.w $f18, $f16 -/* B0CBA8 80095A08 46003202 */ mul.s $f8, $f6, $f0 -/* B0CBAC 80095A0C 24C6EF1C */ addiu $a2, %lo(D_8013EF1C) # addiu $a2, $a2, -0x10e4 -/* B0CBB0 80095A10 240709D1 */ li $a3, 2513 -/* B0CBB4 80095A14 46009102 */ mul.s $f4, $f18, $f0 -/* B0CBB8 80095A18 4600428D */ trunc.w.s $f10, $f8 -/* B0CBBC 80095A1C 4600218D */ trunc.w.s $f6, $f4 -/* B0CBC0 80095A20 440B5000 */ mfc1 $t3, $f10 -/* B0CBC4 80095A24 44183000 */ mfc1 $t8, $f6 -/* B0CBC8 80095A28 316C0FFF */ andi $t4, $t3, 0xfff -/* B0CBCC 80095A2C 000C6B00 */ sll $t5, $t4, 0xc -/* B0CBD0 80095A30 33190FFF */ andi $t9, $t8, 0xfff -/* B0CBD4 80095A34 01B94025 */ or $t0, $t5, $t9 -/* B0CBD8 80095A38 AC480004 */ sw $t0, 4($v0) -/* B0CBDC 80095A3C 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0CBE0 80095A40 3C0B8017 */ lui $t3, %hi(D_801759C0) # $t3, 0x8017 -/* B0CBE4 80095A44 256B59C0 */ addiu $t3, %lo(D_801759C0) # addiu $t3, $t3, 0x59c0 -/* B0CBE8 80095A48 24490008 */ addiu $t1, $v0, 8 -/* B0CBEC 80095A4C ACA902C0 */ sw $t1, 0x2c0($a1) -/* B0CBF0 80095A50 AC4B0004 */ sw $t3, 4($v0) -/* B0CBF4 80095A54 AC4A0000 */ sw $t2, ($v0) -/* B0CBF8 80095A58 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0CBFC 80095A5C 244C0008 */ addiu $t4, $v0, 8 -/* B0CC00 80095A60 ACAC02C0 */ sw $t4, 0x2c0($a1) -/* B0CC04 80095A64 8C8E0000 */ lw $t6, ($a0) -/* B0CC08 80095A68 27A4002C */ addiu $a0, $sp, 0x2c -/* B0CC0C 80095A6C 25CFFFFF */ addiu $t7, $t6, -1 -/* B0CC10 80095A70 31F80FFF */ andi $t8, $t7, 0xfff -/* B0CC14 80095A74 03016825 */ or $t5, $t8, $at -/* B0CC18 80095A78 AC4D0000 */ sw $t5, ($v0) -/* B0CC1C 80095A7C 8CB902DC */ lw $t9, 0x2dc($a1) -/* B0CC20 80095A80 0C031AD5 */ jal func_800C6B54 -/* B0CC24 80095A84 AC590004 */ sw $t9, 4($v0) -/* B0CC28 80095A88 8FBF0014 */ lw $ra, 0x14($sp) -/* B0CC2C 80095A8C 27BD0040 */ addiu $sp, $sp, 0x40 -/* B0CC30 80095A90 03E00008 */ jr $ra -/* B0CC34 80095A94 00000000 */ nop diff --git a/asm/non_matchings/code/z_sample/Sample_Draw.s b/asm/non_matchings/code/z_sample/Sample_Draw.s index 6a3a8fc58c..304b7b5228 100644 --- a/asm/non_matchings/code/z_sample/Sample_Draw.s +++ b/asm/non_matchings/code/z_sample/Sample_Draw.s @@ -96,7 +96,7 @@ glabel Sample_Draw /* B0E8F4 80097754 AFA00018 */ sw $zero, 0x18($sp) /* B0E8F8 80097758 AFA00014 */ sw $zero, 0x14($sp) /* B0E8FC 8009775C AFA00010 */ sw $zero, 0x10($sp) -/* B0E900 80097760 0C024DC2 */ jal func_80093708 +/* B0E900 80097760 0C024DC2 */ jal Gfx_SetFog2 /* B0E904 80097764 240700FF */ li $a3, 255 /* B0E908 80097768 AE0202C0 */ sw $v0, 0x2c0($s0) /* B0E90C 8009776C 0C024F46 */ jal func_80093D18 diff --git a/asm/non_matchings/code/z_scene_table/func_8009FE58.s b/asm/non_matchings/code/z_scene_table/func_8009FE58.s index 71aef940f9..045b22b4cf 100644 --- a/asm/non_matchings/code/z_scene_table/func_8009FE58.s +++ b/asm/non_matchings/code/z_scene_table/func_8009FE58.s @@ -91,7 +91,7 @@ glabel func_8009FE58 /* B170A8 8009FF08 AFB9001C */ sw $t9, 0x1c($sp) /* B170AC 8009FF0C AFA80094 */ sw $t0, 0x94($sp) /* B170B0 8009FF10 00002825 */ move $a1, $zero -/* B170B4 8009FF14 0C0253D0 */ jal Draw_TwoTexScroll +/* B170B4 8009FF14 0C0253D0 */ jal Gfx_TwoTexScroll /* B170B8 8009FF18 AFA20078 */ sw $v0, 0x78($sp) /* B170BC 8009FF1C 8FA30078 */ lw $v1, 0x78($sp) /* B170C0 8009FF20 8FA80094 */ lw $t0, 0x94($sp) @@ -122,7 +122,7 @@ glabel func_8009FE58 /* B17124 8009FF84 AFA0001C */ sw $zero, 0x1c($sp) /* B17128 8009FF88 00002825 */ move $a1, $zero /* B1712C 8009FF8C 00003025 */ move $a2, $zero -/* B17130 8009FF90 0C0253D0 */ jal Draw_TwoTexScroll +/* B17130 8009FF90 0C0253D0 */ jal Gfx_TwoTexScroll /* B17134 8009FF94 AFA20074 */ sw $v0, 0x74($sp) /* B17138 8009FF98 8FA30074 */ lw $v1, 0x74($sp) /* B1713C 8009FF9C 10000012 */ b .L8009FFE8 @@ -141,7 +141,7 @@ glabel func_8009FE58 /* B1716C 8009FFCC 30A5007F */ andi $a1, $a1, 0x7f /* B17170 8009FFD0 3106007F */ andi $a2, $t0, 0x7f /* B17174 8009FFD4 24070020 */ li $a3, 32 -/* B17178 8009FFD8 0C0253A7 */ jal Draw_TexScroll +/* B17178 8009FFD8 0C0253A7 */ jal Gfx_TexScroll /* B1717C 8009FFDC AFA20070 */ sw $v0, 0x70($sp) /* B17180 8009FFE0 8FA90070 */ lw $t1, 0x70($sp) /* B17184 8009FFE4 AD220004 */ sw $v0, 4($t1) diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s index bd4ed9df1b..b8ad045859 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s @@ -254,7 +254,7 @@ glabel ArrowFire_Draw /* 00960 80866670 AFAB001C */ sw $t3, 0x001C($sp) /* 00964 80866674 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00968 80866678 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0096C 8086667C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0096C 8086667C 0C0253D0 */ jal Gfx_TwoTexScroll /* 00970 80866680 AFA2004C */ sw $v0, 0x004C($sp) /* 00974 80866684 8FA3004C */ lw $v1, 0x004C($sp) /* 00978 80866688 3C188086 */ lui $t8, %hi(D_80867A40) ## $t8 = 80860000 diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s index ca4c44aad0..d291189e7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s @@ -262,7 +262,7 @@ glabel ArrowIce_Draw /* 00980 80868650 AFAD0028 */ sw $t5, 0x0028($sp) /* 00984 80868654 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00988 80868658 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0098C 8086865C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0098C 8086865C 0C0253D0 */ jal Gfx_TwoTexScroll /* 00990 80868660 AFA2004C */ sw $v0, 0x004C($sp) /* 00994 80868664 8FA8004C */ lw $t0, 0x004C($sp) /* 00998 80868668 3C188087 */ lui $t8, %hi(D_80869A20) ## $t8 = 80870000 diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s index d17143562b..ef55bb9273 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s @@ -266,7 +266,7 @@ glabel ArrowLight_Draw /* 00990 8086A640 AFAC0020 */ sw $t4, 0x0020($sp) /* 00994 8086A644 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00998 8086A648 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0099C 8086A64C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0099C 8086A64C 0C0253D0 */ jal Gfx_TwoTexScroll /* 009A0 8086A650 AFA2004C */ sw $v0, 0x004C($sp) /* 009A4 8086A654 8FA8004C */ lw $t0, 0x004C($sp) /* 009A8 8086A658 3C0F8087 */ lui $t7, %hi(D_8086BA10) ## $t7 = 80870000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bdan_Objects/BgBdanObjects_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bdan_Objects/BgBdanObjects_Draw.s index bfc490c637..b8a177b8ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bdan_Objects/BgBdanObjects_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bdan_Objects/BgBdanObjects_Draw.s @@ -37,7 +37,7 @@ glabel BgBdanObjects_Draw /* 01068 8086CD08 8FA4001C */ lw $a0, 0x001C($sp) /* 0106C 8086CD0C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01070 8086CD10 24A538E8 */ addiu $a1, $a1, 0x38E8 ## $a1 = 060038E8 -/* 01074 8086CD14 0C00D4C9 */ jal Draw_DListXlu +/* 01074 8086CD14 0C00D4C9 */ jal Gfx_DrawDListXlu /* 01078 8086CD18 8FA4001C */ lw $a0, 0x001C($sp) /* 0107C 8086CD1C 10000007 */ beq $zero, $zero, .L8086CD3C @@ -46,7 +46,7 @@ glabel BgBdanObjects_Draw /* 01084 8086CD24 0002C080 */ sll $t8, $v0, 2 /* 01088 8086CD28 3C058087 */ lui $a1, %hi(D_8086CDA0) ## $a1 = 80870000 /* 0108C 8086CD2C 00B82821 */ addu $a1, $a1, $t8 -/* 01090 8086CD30 0C00D498 */ jal Draw_DListOpa +/* 01090 8086CD30 0C00D498 */ jal Gfx_DrawDListOpa /* 01094 8086CD34 8CA5CDA0 */ lw $a1, %lo(D_8086CDA0)($a1) /* 01098 8086CD38 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Draw.s index 27946a0c9a..359ce2a803 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Draw.s @@ -3,7 +3,7 @@ glabel BgBombwall_Draw /* 00728 8086EEF8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0072C 8086EEFC AFBF0014 */ sw $ra, 0x0014($sp) /* 00730 8086EF00 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00734 8086EF04 0C00D498 */ jal Draw_DListOpa +/* 00734 8086EF04 0C00D498 */ jal Gfx_DrawDListOpa /* 00738 8086EF08 8CC5029C */ lw $a1, 0x029C($a2) ## 0000029C /* 0073C 8086EF0C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s index 24c32ea6d8..c88e8de3a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s @@ -28,7 +28,7 @@ glabel BgBowlWall_Draw /* 007CC 8086F92C AFB80010 */ sw $t8, 0x0010($sp) /* 007D0 8086F930 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 007D4 8086F934 24070010 */ addiu $a3, $zero, 0x0010 ## $a3 = 00000010 -/* 007D8 8086F938 0C0253A7 */ jal Draw_TexScroll +/* 007D8 8086F938 0C0253A7 */ jal Gfx_TexScroll /* 007DC 8086F93C AFA2003C */ sw $v0, 0x003C($sp) /* 007E0 8086F940 8FA8003C */ lw $t0, 0x003C($sp) /* 007E4 8086F944 3C09E700 */ lui $t1, 0xE700 ## $t1 = E7000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s index 479b1524ae..85f336795e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s @@ -4,7 +4,7 @@ glabel BgDdanJd_Draw /* 00580 80871030 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00584 80871034 AFBF0014 */ sw $ra, 0x0014($sp) /* 00588 80871038 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0058C 8087103C 0C00D498 */ jal Draw_DListOpa +/* 0058C 8087103C 0C00D498 */ jal Gfx_DrawDListOpa /* 00590 80871040 24A537B8 */ addiu $a1, $a1, 0x37B8 ## $a1 = 060037B8 /* 00594 80871044 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Draw.s index 4410b90b01..cbee6f2623 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Draw.s @@ -4,7 +4,7 @@ glabel BgDdanKd_Draw /* 00780 80871870 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00784 80871874 AFBF0014 */ sw $ra, 0x0014($sp) /* 00788 80871878 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0078C 8087187C 0C00D498 */ jal Draw_DListOpa +/* 0078C 8087187C 0C00D498 */ jal Gfx_DrawDListOpa /* 00790 80871880 24A548A8 */ addiu $a1, $a1, 0x48A8 ## $a1 = 060048A8 /* 00794 80871884 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s index f0f39c3839..6bb5d86eea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s @@ -271,7 +271,7 @@ glabel BgGanonOtyuka_Draw /* 00C10 80876530 AFAA0018 */ sw $t2, 0x0018($sp) /* 00C14 80876534 AFA90014 */ sw $t1, 0x0014($sp) /* 00C18 80876538 AFA80010 */ sw $t0, 0x0010($sp) -/* 00C1C 8087653C 0C0253D0 */ jal Draw_TwoTexScroll +/* 00C1C 8087653C 0C0253D0 */ jal Gfx_TwoTexScroll /* 00C20 80876540 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00C24 80876544 AE020004 */ sw $v0, 0x0004($s0) ## 00000006 /* 00C28 80876548 8E6302D0 */ lw $v1, 0x02D0($s3) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791BC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791BC.s index 1f1cc96d69..6a690dc1e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791BC.s @@ -4,7 +4,7 @@ glabel func_808791BC /* 00594 808791C4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00598 808791C8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0059C 808791CC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 005A0 808791D0 0C00D4C9 */ jal Draw_DListXlu +/* 005A0 808791D0 0C00D4C9 */ jal Gfx_DrawDListXlu /* 005A4 808791D4 24A588B0 */ addiu $a1, $a1, 0x88B0 ## $a1 = 060088B0 /* 005A8 808791D8 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791E8.s index 796f9b7a75..e37157a044 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791E8.s @@ -81,7 +81,7 @@ glabel func_808791E8 /* 006DC 8087930C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 006E0 80879310 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 006E4 80879314 24A5BEC0 */ addiu $a1, $a1, 0xBEC0 ## $a1 = 0600BEC0 -/* 006E8 80879318 0C00D4C9 */ jal Draw_DListXlu +/* 006E8 80879318 0C00D4C9 */ jal Gfx_DrawDListXlu /* 006EC 8087931C 8FA4004C */ lw $a0, 0x004C($sp) .L80879320: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879334.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879334.s index 4f01c99cee..021ad0d2ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879334.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879334.s @@ -28,7 +28,7 @@ glabel func_80879334 /* 0076C 8087939C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 00770 808793A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00774 808793A4 24A5BEC0 */ addiu $a1, $a1, 0xBEC0 ## $a1 = 0600BEC0 -/* 00778 808793A8 0C00D4C9 */ jal Draw_DListXlu +/* 00778 808793A8 0C00D4C9 */ jal Gfx_DrawDListXlu /* 0077C 808793AC 8FA4003C */ lw $a0, 0x003C($sp) /* 00780 808793B0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s index c9d6c8895d..cacf36f81b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s @@ -4,7 +4,7 @@ glabel BgGndIceblock_Draw /* 00C58 8087A6F8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00C5C 8087A6FC AFBF0014 */ sw $ra, 0x0014($sp) /* 00C60 8087A700 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00C64 8087A704 0C00D498 */ jal Draw_DListOpa +/* 00C64 8087A704 0C00D498 */ jal Gfx_DrawDListOpa /* 00C68 8087A708 24A54420 */ addiu $a1, $a1, 0x4420 ## $a1 = 06004420 /* 00C6C 8087A70C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Draw.s index 877b54e23b..2b42b497fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Draw.s @@ -66,7 +66,7 @@ glabel BgGndSoulmeiro_Draw /* 00704 8087B4C4 00086080 */ sll $t4, $t0, 2 /* 00708 8087B4C8 3C058088 */ lui $a1, %hi(D_8087B578) ## $a1 = 80880000 /* 0070C 8087B4CC 00AC2821 */ addu $a1, $a1, $t4 -/* 00710 8087B4D0 0C00D4C9 */ jal Draw_DListXlu +/* 00710 8087B4D0 0C00D4C9 */ jal Gfx_DrawDListXlu /* 00714 8087B4D4 8CA5B578 */ lw $a1, %lo(D_8087B578)($a1) /* 00718 8087B4D8 10000007 */ beq $zero, $zero, .L8087B4F8 @@ -75,7 +75,7 @@ glabel BgGndSoulmeiro_Draw /* 00720 8087B4E0 00086880 */ sll $t5, $t0, 2 /* 00724 8087B4E4 3C058088 */ lui $a1, %hi(D_8087B578) ## $a1 = 80880000 /* 00728 8087B4E8 00AD2821 */ addu $a1, $a1, $t5 -/* 0072C 8087B4EC 0C00D498 */ jal Draw_DListOpa +/* 0072C 8087B4EC 0C00D498 */ jal Gfx_DrawDListOpa /* 00730 8087B4F0 8CA5B578 */ lw $a1, %lo(D_8087B578)($a1) /* 00734 8087B4F4 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s index c3c92547c5..9aa0fbd8b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s @@ -11,7 +11,7 @@ glabel BgHakaGate_Draw /* 00CA4 8087CA94 17010006 */ bne $t8, $at, .L8087CAB0 /* 00CA8 8087CA98 8FB90094 */ lw $t9, 0x0094($sp) /* 00CAC 8087CA9C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00CB0 8087CAA0 0C00D4C9 */ jal Draw_DListXlu +/* 00CB0 8087CAA0 0C00D4C9 */ jal Gfx_DrawDListXlu /* 00CB4 8087CAA4 24A5F1B0 */ addiu $a1, $a1, 0xF1B0 ## $a1 = 0600F1B0 /* 00CB8 8087CAA8 1000007C */ beq $zero, $zero, .L8087CC9C @@ -138,7 +138,7 @@ glabel BgHakaGate_Draw /* 00E98 8087CC88 8FA40090 */ lw $a0, 0x0090($sp) .L8087CC8C: /* 00E9C 8087CC8C 00A82821 */ addu $a1, $a1, $t0 -/* 00EA0 8087CC90 0C00D498 */ jal Draw_DListOpa +/* 00EA0 8087CC90 0C00D498 */ jal Gfx_DrawDListOpa /* 00EA4 8087CC94 8CA5CD00 */ lw $a1, %lo(D_8087CD00)($a1) /* 00EA8 8087CC98 8FA40090 */ lw $a0, 0x0090($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s index 2464bcd6c8..83107208ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s @@ -45,7 +45,7 @@ glabel func_8087C85C /* 00B18 8087C908 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00B1C 8087C90C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00B20 8087C910 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00B24 8087C914 0C0253D0 */ jal Draw_TwoTexScroll +/* 00B24 8087C914 0C0253D0 */ jal Gfx_TwoTexScroll /* 00B28 8087C918 AFA20058 */ sw $v0, 0x0058($sp) /* 00B2C 8087C91C 8FA30058 */ lw $v1, 0x0058($sp) /* 00B30 8087C920 3C08FA00 */ lui $t0, 0xFA00 ## $t0 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s index 165ad3aba2..0120211561 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s @@ -4,7 +4,7 @@ glabel BgHakaHuta_Draw /* 00938 8087D8F8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0093C 8087D8FC AFBF0014 */ sw $ra, 0x0014($sp) /* 00940 8087D900 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00944 8087D904 0C00D498 */ jal Draw_DListOpa +/* 00944 8087D904 0C00D498 */ jal Gfx_DrawDListOpa /* 00948 8087D908 24A506B0 */ addiu $a1, $a1, 0x06B0 ## $a1 = 060006B0 /* 0094C 8087D90C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Draw.s index 84830587f1..4a6121496a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Draw.s @@ -8,7 +8,7 @@ glabel BgHakaMeganeBG_Draw /* 00564 8087E394 00027080 */ sll $t6, $v0, 2 /* 00568 8087E398 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0056C 8087E39C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00570 8087E3A0 0C00D4C9 */ jal Draw_DListXlu +/* 00570 8087E3A0 0C00D4C9 */ jal Gfx_DrawDListXlu /* 00574 8087E3A4 24A58EB0 */ addiu $a1, $a1, 0x8EB0 ## $a1 = 06008EB0 /* 00578 8087E3A8 10000006 */ beq $zero, $zero, .L8087E3C4 @@ -16,7 +16,7 @@ glabel BgHakaMeganeBG_Draw .L8087E3B0: /* 00580 8087E3B0 3C058088 */ lui $a1, %hi(D_8087E410) ## $a1 = 80880000 /* 00584 8087E3B4 00AE2821 */ addu $a1, $a1, $t6 -/* 00588 8087E3B8 0C00D498 */ jal Draw_DListOpa +/* 00588 8087E3B8 0C00D498 */ jal Gfx_DrawDListOpa /* 0058C 8087E3BC 8CA5E410 */ lw $a1, %lo(D_8087E410)($a1) /* 00590 8087E3C0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s index 02f58ad14b..9c99f42c26 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s @@ -7,7 +7,7 @@ glabel func_8087EDC0 /* 008F4 8087EDD4 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 008F8 8087EDD8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 008FC 8087EDDC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00900 8087EDE0 0C00D4C9 */ jal Draw_DListXlu +/* 00900 8087EDE0 0C00D4C9 */ jal Gfx_DrawDListXlu /* 00904 8087EDE4 24A5BF20 */ addiu $a1, $a1, 0xBF20 ## $a1 = 0600BF20 /* 00908 8087EDE8 1000000F */ beq $zero, $zero, .L8087EE28 @@ -20,13 +20,13 @@ glabel func_8087EDC0 /* 00920 8087EE00 00000000 */ nop /* 00924 8087EE04 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00928 8087EE08 24A5BF20 */ addiu $a1, $a1, 0xBF20 ## $a1 = 0600BF20 -/* 0092C 8087EE0C 0C00D498 */ jal Draw_DListOpa +/* 0092C 8087EE0C 0C00D498 */ jal Gfx_DrawDListOpa /* 00930 8087EE10 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 00934 8087EE14 10000004 */ beq $zero, $zero, .L8087EE28 /* 00938 8087EE18 8FBF0014 */ lw $ra, 0x0014($sp) .L8087EE1C: -/* 0093C 8087EE1C 0C00D498 */ jal Draw_DListOpa +/* 0093C 8087EE1C 0C00D498 */ jal Gfx_DrawDListOpa /* 00940 8087EE20 24A521F0 */ addiu $a1, $a1, 0x21F0 ## $a1 = 000021F0 /* 00944 8087EE24 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Draw.s index c26a2783a9..0f8dee9cd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Draw.s @@ -24,7 +24,7 @@ glabel BgHakaTrap_Draw /* 011B8 80880E58 8FA40044 */ lw $a0, 0x0044($sp) /* 011BC 80880E5C 0018C880 */ sll $t9, $t8, 2 /* 011C0 80880E60 00B92821 */ addu $a1, $a1, $t9 -/* 011C4 80880E64 0C00D498 */ jal Draw_DListOpa +/* 011C4 80880E64 0C00D498 */ jal Gfx_DrawDListOpa /* 011C8 80880E68 8CA51028 */ lw $a1, %lo(D_80881028)($a1) /* 011CC 80880E6C 8E020164 */ lw $v0, 0x0164($s0) ## 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Draw.s index 94b5d53645..cb0c09aa18 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Draw.s @@ -5,7 +5,7 @@ glabel BgHakaTubo_Draw /* 008B8 80881B08 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 008BC 80881B0C AFBF0014 */ sw $ra, 0x0014($sp) /* 008C0 80881B10 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 008C4 80881B14 0C00D498 */ jal Draw_DListOpa +/* 008C4 80881B14 0C00D498 */ jal Gfx_DrawDListOpa /* 008C8 80881B18 24A5FE40 */ addiu $a1, $a1, 0xFE40 ## $a1 = 0600FE40 /* 008CC 80881B1C 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881904.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881904.s index d23e408a85..a8dfd34ae1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881904.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881904.s @@ -86,7 +86,7 @@ glabel func_80881904 /* 00804 80881A54 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00808 80881A58 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0080C 80881A5C AFA2004C */ sw $v0, 0x004C($sp) -/* 00810 80881A60 0C0253D0 */ jal Draw_TwoTexScroll +/* 00810 80881A60 0C0253D0 */ jal Gfx_TwoTexScroll /* 00814 80881A64 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 /* 00818 80881A68 8FA8004C */ lw $t0, 0x004C($sp) /* 0081C 80881A6C 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Draw.s index 2d4cc99ce3..aef5184e53 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Draw.s @@ -108,7 +108,7 @@ glabel BgHakaWater_Draw /* 00558 80882258 E7A00084 */ swc1 $f0, 0x0084($sp) /* 0055C 8088225C AFA0001C */ sw $zero, 0x001C($sp) /* 00560 80882260 AFAA0010 */ sw $t2, 0x0010($sp) -/* 00564 80882264 0C0253D0 */ jal Draw_TwoTexScroll +/* 00564 80882264 0C0253D0 */ jal Gfx_TwoTexScroll /* 00568 80882268 AFA20064 */ sw $v0, 0x0064($sp) /* 0056C 8088226C 8FA80064 */ lw $t0, 0x0064($sp) /* 00570 80882270 C7A00084 */ lwc1 $f0, 0x0084($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808835B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808835B8.s index ef64230ad0..65ca9ffaff 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808835B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808835B8.s @@ -7,7 +7,7 @@ glabel func_808835B8 /* 0100C 808835CC 3C058088 */ lui $a1, %hi(D_80883650) ## $a1 = 80880000 /* 01010 808835D0 000E7880 */ sll $t7, $t6, 2 /* 01014 808835D4 00AF2821 */ addu $a1, $a1, $t7 -/* 01018 808835D8 0C00D498 */ jal Draw_DListOpa +/* 01018 808835D8 0C00D498 */ jal Gfx_DrawDListOpa /* 0101C 808835DC 8CA53650 */ lw $a1, %lo(D_80883650)($a1) /* 01020 808835E0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884DB4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884DB4.s index 2946e25cc8..4cf3626390 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884DB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884DB4.s @@ -21,7 +21,7 @@ glabel func_80884DB4 /* 0166C 80884DFC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01670 80884E00 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01674 80884E04 24A518A0 */ addiu $a1, $a1, 0x18A0 ## $a1 = 060018A0 -/* 01678 80884E08 0C00D498 */ jal Draw_DListOpa +/* 01678 80884E08 0C00D498 */ jal Gfx_DrawDListOpa /* 0167C 80884E0C 8FA4001C */ lw $a0, 0x001C($sp) /* 01680 80884E10 1000000C */ beq $zero, $zero, .L80884E44 @@ -35,7 +35,7 @@ glabel func_80884DB4 /* 0169C 80884E2C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 016A0 80884E30 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 016A4 80884E34 24A51A30 */ addiu $a1, $a1, 0x1A30 ## $a1 = 06001A30 -/* 016A8 80884E38 0C00D498 */ jal Draw_DListOpa +/* 016A8 80884E38 0C00D498 */ jal Gfx_DrawDListOpa /* 016AC 80884E3C 8FA4001C */ lw $a0, 0x001C($sp) /* 016B0 80884E40 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s index 5d28a23795..64168ee075 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s @@ -59,7 +59,7 @@ glabel BgHidanCurtain_Draw /* 00930 80885AD0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00934 80885AD4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00938 80885AD8 AFA2004C */ sw $v0, 0x004C($sp) -/* 0093C 80885ADC 0C0253D0 */ jal Draw_TwoTexScroll +/* 0093C 80885ADC 0C0253D0 */ jal Gfx_TwoTexScroll /* 00940 80885AE0 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 /* 00944 80885AE4 8FA8004C */ lw $t0, 0x004C($sp) /* 00948 80885AE8 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Draw.s index 5b01f771ba..e704c14648 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Draw.s @@ -9,7 +9,7 @@ glabel BgHidanDalm_Draw /* 00600 80886420 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00604 80886424 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00608 80886428 24A5BBF0 */ addiu $a1, $a1, 0xBBF0 ## $a1 = 0600BBF0 -/* 0060C 8088642C 0C00D498 */ jal Draw_DListOpa +/* 0060C 8088642C 0C00D498 */ jal Gfx_DrawDListOpa /* 00610 80886430 AFA60018 */ sw $a2, 0x0018($sp) /* 00614 80886434 10000006 */ beq $zero, $zero, .L80886450 @@ -17,7 +17,7 @@ glabel BgHidanDalm_Draw .L8088643C: /* 0061C 8088643C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00620 80886440 24A5BDF0 */ addiu $a1, $a1, 0xBDF0 ## $a1 = 0600BDF0 -/* 00624 80886444 0C00D498 */ jal Draw_DListOpa +/* 00624 80886444 0C00D498 */ jal Gfx_DrawDListOpa /* 00628 80886448 AFA60018 */ sw $a2, 0x0018($sp) /* 0062C 8088644C 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_80886B34.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_80886B34.s index 985a78fed5..14876bc801 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_80886B34.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_80886B34.s @@ -12,7 +12,7 @@ glabel func_80886B34 /* 004FC 80886B5C 0C031AB1 */ jal func_800C6AC4 /* 00500 80886B60 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00504 80886B64 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 00508 80886B68 0C024DDD */ jal func_80093774 +/* 00508 80886B68 0C024DDD */ jal Gfx_CallSetupDL /* 0050C 80886B6C 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 00510 80886B70 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 00514 80886B74 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s index 8c32c764f0..e3fc4a758e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Fwbig/BgHidanFwbig_Draw.s @@ -148,7 +148,7 @@ glabel BgHidanFwbig_Draw /* 00B1C 80887E0C AFA0001C */ sw $zero, 0x001C($sp) /* 00B20 80887E10 AFA90010 */ sw $t1, 0x0010($sp) /* 00B24 80887E14 AFA20050 */ sw $v0, 0x0050($sp) -/* 00B28 80887E18 0C0253D0 */ jal Draw_TwoTexScroll +/* 00B28 80887E18 0C0253D0 */ jal Gfx_TwoTexScroll /* 00B2C 80887E1C 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 /* 00B30 80887E20 8FA80050 */ lw $t0, 0x0050($sp) /* 00B34 80887E24 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Draw.s index d177a0be0d..00a7c45c99 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Draw.s @@ -7,7 +7,7 @@ glabel BgHidanHrock_Draw /* 006A0 808897D0 3C058089 */ lui $a1, %hi(D_808898B0) ## $a1 = 80890000 /* 006A4 808897D4 000E7880 */ sll $t7, $t6, 2 /* 006A8 808897D8 00AF2821 */ addu $a1, $a1, $t7 -/* 006AC 808897DC 0C00D498 */ jal Draw_DListOpa +/* 006AC 808897DC 0C00D498 */ jal Gfx_DrawDListOpa /* 006B0 808897E0 8CA598B0 */ lw $a1, %lo(D_808898B0)($a1) /* 006B4 808897E4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s index 49d57f2afb..9117c0d74c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s @@ -10,14 +10,14 @@ glabel BgHidanRock_Draw /* 00E24 8088BEA4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E28 8088BEA8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00E2C 8088BEAC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00E30 8088BEB0 0C00D498 */ jal Draw_DListOpa +/* 00E30 8088BEB0 0C00D498 */ jal Gfx_DrawDListOpa /* 00E34 8088BEB4 24A5C100 */ addiu $a1, $a1, 0xC100 ## $a1 = 0600C100 /* 00E38 8088BEB8 10000005 */ beq $zero, $zero, .L8088BED0 /* 00E3C 8088BEBC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L8088BEC0: /* 00E40 8088BEC0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00E44 8088BEC4 0C00D498 */ jal Draw_DListOpa +/* 00E44 8088BEC4 0C00D498 */ jal Gfx_DrawDListOpa /* 00E48 8088BEC8 24A5C1F0 */ addiu $a1, $a1, 0xC1F0 ## $a1 = 0600C1F0 /* 00E4C 8088BECC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s index c54f43209e..b33eadf6ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s @@ -12,7 +12,7 @@ glabel func_8088BC40 /* 00BE8 8088BC68 0C031AB1 */ jal func_800C6AC4 /* 00BEC 8088BC6C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00BF0 8088BC70 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 00BF4 8088BC74 0C024DDD */ jal func_80093774 +/* 00BF4 8088BC74 0C024DDD */ jal Gfx_CallSetupDL /* 00BF8 8088BC78 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 00BFC 8088BC7C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 00C00 8088BC80 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s index 36d55848a8..fec03f64bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s @@ -45,7 +45,7 @@ glabel BgHidanRsekizou_Draw /* 008E8 8088CAE8 0C0346EA */ jal Matrix_MtxFCopy /* 008EC 8088CAEC AC480004 */ sw $t0, 0x0004($v0) ## 00000004 /* 008F0 8088CAF0 8E2402D0 */ lw $a0, 0x02D0($s1) ## 000002D0 -/* 008F4 8088CAF4 0C024DDD */ jal func_80093774 +/* 008F4 8088CAF4 0C024DDD */ jal Gfx_CallSetupDL /* 008F8 8088CAF8 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 008FC 8088CAFC AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0 /* 00900 8088CB00 86A907A0 */ lh $t1, 0x07A0($s5) ## 000007A0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s index aad2e9f8be..f0d3981c14 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s @@ -52,7 +52,7 @@ glabel BgHidanSekizou_Draw /* 010EC 8088DFAC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 010F0 8088DFB0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 .L8088DFB4: -/* 010F4 8088DFB4 0C024DDD */ jal func_80093774 +/* 010F4 8088DFB4 0C024DDD */ jal Gfx_CallSetupDL /* 010F8 8088DFB8 8E6402D0 */ lw $a0, 0x02D0($s3) ## 000002D0 /* 010FC 8088DFBC AE6202D0 */ sw $v0, 0x02D0($s3) ## 000002D0 /* 01100 8088DFC0 862D001C */ lh $t5, 0x001C($s1) ## 0000001C diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s index e3238b62e2..3fd372bf77 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s @@ -56,7 +56,7 @@ glabel BgHidanSima_Draw /* 00D0C 8088F0DC 2718E7A8 */ addiu $t8, $t8, %lo(func_8088E7A8) ## $t8 = 8088E7A8 /* 00D10 8088F0E0 17190019 */ bne $t8, $t9, .L8088F148 /* 00D14 8088F0E4 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 -/* 00D18 8088F0E8 0C024DDD */ jal func_80093774 +/* 00D18 8088F0E8 0C024DDD */ jal Gfx_CallSetupDL /* 00D1C 8088F0EC 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 00D20 8088F0F0 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 00D24 8088F0F4 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Draw.s index 30d93e5531..9710891feb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Draw.s @@ -4,7 +4,7 @@ glabel BgIceObjects_Draw /* 00C50 80890460 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00C54 80890464 AFBF0014 */ sw $ra, 0x0014($sp) /* 00C58 80890468 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00C5C 8089046C 0C00D498 */ jal Draw_DListOpa +/* 00C5C 8089046C 0C00D498 */ jal Gfx_DrawDListOpa /* 00C60 80890470 24A50190 */ addiu $a1, $a1, 0x0190 ## $a1 = 06000190 /* 00C64 80890474 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s index 73608e4e97..86b6c314ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s @@ -96,7 +96,7 @@ glabel L808914C8 /* 00DE8 80891528 AFA6001C */ sw $a2, 0x001C($sp) /* 00DEC 8089152C AFAA0010 */ sw $t2, 0x0010($sp) /* 00DF0 80891530 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00DF4 80891534 0C0253D0 */ jal Draw_TwoTexScroll +/* 00DF4 80891534 0C0253D0 */ jal Gfx_TwoTexScroll /* 00DF8 80891538 AFA20060 */ sw $v0, 0x0060($sp) /* 00DFC 8089153C 8FA80060 */ lw $t0, 0x0060($sp) /* 00E00 80891540 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 @@ -138,7 +138,7 @@ glabel L80891568 /* 00E8C 808915CC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00E90 808915D0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00E94 808915D4 AFA20058 */ sw $v0, 0x0058($sp) -/* 00E98 808915D8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00E98 808915D8 0C0253D0 */ jal Gfx_TwoTexScroll /* 00E9C 808915DC 306700FF */ andi $a3, $v1, 0x00FF ## $a3 = 00000000 /* 00EA0 808915E0 8FA80058 */ lw $t0, 0x0058($sp) /* 00EA4 808915E4 8FA90044 */ lw $t1, 0x0044($sp) @@ -167,7 +167,7 @@ glabel L80891568 /* 00F00 80891640 AFAF0014 */ sw $t7, 0x0014($sp) /* 00F04 80891644 AFAE0010 */ sw $t6, 0x0010($sp) /* 00F08 80891648 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00F0C 8089164C 0C0253D0 */ jal Draw_TwoTexScroll +/* 00F0C 8089164C 0C0253D0 */ jal Gfx_TwoTexScroll /* 00F10 80891650 AFA20054 */ sw $v0, 0x0054($sp) /* 00F14 80891654 8FA80054 */ lw $t0, 0x0054($sp) /* 00F18 80891658 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Draw.s index bfcf7a8ee9..69466c570e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Draw.s @@ -4,7 +4,7 @@ glabel BgIceShutter_Draw /* 003A8 80891E68 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 003AC 80891E6C AFBF0014 */ sw $ra, 0x0014($sp) /* 003B0 80891E70 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 003B4 80891E74 0C00D498 */ jal Draw_DListOpa +/* 003B4 80891E74 0C00D498 */ jal Gfx_DrawDListOpa /* 003B8 80891E78 24A52740 */ addiu $a1, $a1, 0x2740 ## $a1 = 06002740 /* 003BC 80891E7C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Draw.s index 0738a9ad08..cddf868fdd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Draw.s @@ -4,7 +4,7 @@ glabel BgIceTurara_Draw /* 006D0 808925F0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 006D4 808925F4 AFBF0014 */ sw $ra, 0x0014($sp) /* 006D8 808925F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 006DC 808925FC 0C00D498 */ jal Draw_DListOpa +/* 006DC 808925FC 0C00D498 */ jal Gfx_DrawDListOpa /* 006E0 80892600 24A523D0 */ addiu $a1, $a1, 0x23D0 ## $a1 = 060023D0 /* 006E4 80892604 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Draw.s index 8f6962179d..4ce00c773c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Draw.s @@ -4,7 +4,7 @@ glabel BgJya1flift_Draw /* 00550 808930B0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00554 808930B4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00558 808930B8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0055C 808930BC 0C00D498 */ jal Draw_DListOpa +/* 0055C 808930BC 0C00D498 */ jal Gfx_DrawDListOpa /* 00560 808930C0 24A501F0 */ addiu $a1, $a1, 0x01F0 ## $a1 = 060001F0 /* 00564 808930C4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Draw.s index 2011f63428..595852404f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Draw.s @@ -9,12 +9,12 @@ glabel BgJyaBigmirror_Draw /* 0078C 80893E6C 11C0000A */ beq $t6, $zero, .L80893E98 /* 00790 80893E70 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00794 80893E74 24A5E1B0 */ addiu $a1, $a1, 0xE1B0 ## $a1 = 0600E1B0 -/* 00798 80893E78 0C00D498 */ jal Draw_DListOpa +/* 00798 80893E78 0C00D498 */ jal Gfx_DrawDListOpa /* 0079C 80893E7C AFA60018 */ sw $a2, 0x0018($sp) /* 007A0 80893E80 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 007A4 80893E84 24A5E2D0 */ addiu $a1, $a1, 0xE2D0 ## $a1 = 0600E2D0 -/* 007A8 80893E88 0C00D4C9 */ jal Draw_DListXlu +/* 007A8 80893E88 0C00D4C9 */ jal Gfx_DrawDListXlu /* 007AC 80893E8C 8FA4001C */ lw $a0, 0x001C($sp) /* 007B0 80893E90 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Draw.s index 7b47a7c9a8..1e589b84ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombchuiwa/BgJyaBombchuiwa_Draw.s @@ -9,7 +9,7 @@ glabel BgJyaBombchuiwa_Draw /* 009D8 80894E78 304E0001 */ andi $t6, $v0, 0x0001 ## $t6 = 00000000 /* 009DC 80894E7C 11C00007 */ beq $t6, $zero, .L80894E9C /* 009E0 80894E80 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 009E4 80894E84 0C00D498 */ jal Draw_DListOpa +/* 009E4 80894E84 0C00D498 */ jal Gfx_DrawDListOpa /* 009E8 80894E88 24A5E8D0 */ addiu $a1, $a1, 0xE8D0 ## $a1 = 0600E8D0 /* 009EC 80894E8C 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Draw.s index 8e5d45fd66..531ae0d54d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Draw.s @@ -4,7 +4,7 @@ glabel BgJyaBombiwa_Draw /* 00524 808956C4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00528 808956C8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0052C 808956CC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00530 808956D0 0C00D498 */ jal Draw_DListOpa +/* 00530 808956D0 0C00D498 */ jal Gfx_DrawDListOpa /* 00534 808956D4 24A5E490 */ addiu $a1, $a1, 0xE490 ## $a1 = 0600E490 /* 00538 808956D8 8FA50018 */ lw $a1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s index b84940406c..78a3c7db6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s @@ -9,7 +9,7 @@ glabel BgJyaCobra_Draw /* 018D4 808971C4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 018D8 808971C8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 018DC 808971CC 24A50790 */ addiu $a1, $a1, 0x0790 ## $a1 = 06010790 -/* 018E0 808971D0 0C00D498 */ jal Draw_DListOpa +/* 018E0 808971D0 0C00D498 */ jal Gfx_DrawDListOpa /* 018E4 808971D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 018E8 808971D8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Draw.s index fc5352ca5a..ba1714de60 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Draw.s @@ -4,7 +4,7 @@ glabel BgJyaGoroiwa_Draw /* 005BC 80897F2C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 005C0 80897F30 AFBF0014 */ sw $ra, 0x0014($sp) /* 005C4 80897F34 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 005C8 80897F38 0C00D498 */ jal Draw_DListOpa +/* 005C8 80897F38 0C00D498 */ jal Gfx_DrawDListOpa /* 005CC 80897F3C 24A506B0 */ addiu $a1, $a1, 0x06B0 ## $a1 = 060006B0 /* 005D0 80897F40 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Draw.s index b5c91ebeda..e6ad39289b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Draw.s @@ -16,7 +16,7 @@ glabel BgJyaHaheniron_Draw /* 00630 808986F0 3C05808A */ lui $a1, %hi(D_808987B8) ## $a1 = 808A0000 /* 00634 808986F4 00AE2821 */ addu $a1, $a1, $t6 /* 00638 808986F8 8CA587B8 */ lw $a1, %lo(D_808987B8)($a1) -/* 0063C 808986FC 0C00D498 */ jal Draw_DListOpa +/* 0063C 808986FC 0C00D498 */ jal Gfx_DrawDListOpa /* 00640 80898700 8FA4001C */ lw $a0, 0x001C($sp) /* 00644 80898704 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Draw.s index afa469e47e..cb173c5c80 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Draw.s @@ -8,7 +8,7 @@ glabel BgJyaIronobj_Draw /* 00BBC 8089945C 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 /* 00BC0 80899460 000FC080 */ sll $t8, $t7, 2 /* 00BC4 80899464 00B82821 */ addu $a1, $a1, $t8 -/* 00BC8 80899468 0C00D498 */ jal Draw_DListOpa +/* 00BC8 80899468 0C00D498 */ jal Gfx_DrawDListOpa /* 00BCC 8089946C 8CA594A4 */ lw $a1, %lo(D_808994A4)($a1) /* 00BD0 80899470 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Draw.s index cfbcc4da06..6daab6fc50 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Draw.s @@ -4,7 +4,7 @@ glabel BgJyaLift_Draw /* 00454 80899FF4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00458 80899FF8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0045C 80899FFC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00460 8089A000 0C00D498 */ jal Draw_DListOpa +/* 00460 8089A000 0C00D498 */ jal Gfx_DrawDListOpa /* 00464 8089A004 24A5CCE0 */ addiu $a1, $a1, 0xCCE0 ## $a1 = 0600CCE0 /* 00468 8089A008 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Draw.s index 53f7ec5256..4d4ec35f0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Draw.s @@ -4,7 +4,7 @@ glabel BgJyaZurerukabe_Draw /* 00558 8089B998 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0055C 8089B99C AFBF0014 */ sw $ra, 0x0014($sp) /* 00560 8089B9A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00564 8089B9A4 0C00D498 */ jal Draw_DListOpa +/* 00564 8089B9A4 0C00D498 */ jal Gfx_DrawDListOpa /* 00568 8089B9A8 24A52340 */ addiu $a1, $a1, 0x2340 ## $a1 = 06012340 /* 0056C 8089B9AC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Draw.s index 5efa0c5b28..67a4e3aef1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Draw.s @@ -12,7 +12,7 @@ glabel BgMenkuriNisekabe_Draw /* 00090 8089C3C0 3C05808A */ lui $a1, %hi(D_8089C430) ## $a1 = 808A0000 /* 00094 8089C3C4 0002C080 */ sll $t8, $v0, 2 /* 00098 8089C3C8 00B82821 */ addu $a1, $a1, $t8 -/* 0009C 8089C3CC 0C00D4C9 */ jal Draw_DListXlu +/* 0009C 8089C3CC 0C00D4C9 */ jal Gfx_DrawDListXlu /* 000A0 8089C3D0 8CA5C430 */ lw $a1, %lo(D_8089C430)($a1) /* 000A4 8089C3D4 10000008 */ beq $zero, $zero, .L8089C3F8 @@ -22,7 +22,7 @@ glabel BgMenkuriNisekabe_Draw /* 000B0 8089C3E0 3C05808A */ lui $a1, %hi(D_8089C430) ## $a1 = 808A0000 /* 000B4 8089C3E4 00B92821 */ addu $a1, $a1, $t9 /* 000B8 8089C3E8 8CA5C430 */ lw $a1, %lo(D_8089C430)($a1) -/* 000BC 8089C3EC 0C00D498 */ jal Draw_DListOpa +/* 000BC 8089C3EC 0C00D498 */ jal Gfx_DrawDListOpa /* 000C0 8089C3F0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 000C4 8089C3F4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s index fc4e5a75ea..30a075ded0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s @@ -47,7 +47,7 @@ glabel BgMizuBwall_Draw /* 00FE0 8089D460 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00FE4 8089D464 AFA2006C */ sw $v0, 0x006C($sp) /* 00FE8 8089D468 AFA60054 */ sw $a2, 0x0054($sp) -/* 00FEC 8089D46C 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 00FEC 8089D46C 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 00FF0 8089D470 AFAD0038 */ sw $t5, 0x0038($sp) /* 00FF4 8089D474 8FA3006C */ lw $v1, 0x006C($sp) /* 00FF8 8089D478 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -79,7 +79,7 @@ glabel BgMizuBwall_Draw /* 01060 8089D4E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01064 8089D4E4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01068 8089D4E8 AFA20068 */ sw $v0, 0x0068($sp) -/* 0106C 8089D4EC 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 0106C 8089D4EC 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 01070 8089D4F0 AFAC0038 */ sw $t4, 0x0038($sp) /* 01074 8089D4F4 8FA30068 */ lw $v1, 0x0068($sp) /* 01078 8089D4F8 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -111,7 +111,7 @@ glabel BgMizuBwall_Draw /* 010E0 8089D560 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 010E4 8089D564 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 010E8 8089D568 AFA20064 */ sw $v0, 0x0064($sp) -/* 010EC 8089D56C 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 010EC 8089D56C 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 010F0 8089D570 AFAB0038 */ sw $t3, 0x0038($sp) /* 010F4 8089D574 8FA30064 */ lw $v1, 0x0064($sp) /* 010F8 8089D578 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -146,7 +146,7 @@ glabel BgMizuBwall_Draw /* 0116C 8089D5EC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01170 8089D5F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01174 8089D5F4 AFA20060 */ sw $v0, 0x0060($sp) -/* 01178 8089D5F8 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 01178 8089D5F8 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 0117C 8089D5FC AFAA0038 */ sw $t2, 0x0038($sp) /* 01180 8089D600 8FA30060 */ lw $v1, 0x0060($sp) /* 01184 8089D604 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s index 566cde9bec..dd4831b4c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s @@ -47,7 +47,7 @@ glabel BgMizuMovebg_Draw /* 00CB4 8089E8E4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00CB8 8089E8E8 AFA2006C */ sw $v0, 0x006C($sp) /* 00CBC 8089E8EC AFA60054 */ sw $a2, 0x0054($sp) -/* 00CC0 8089E8F0 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 00CC0 8089E8F0 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 00CC4 8089E8F4 AFAD0038 */ sw $t5, 0x0038($sp) /* 00CC8 8089E8F8 8FA3006C */ lw $v1, 0x006C($sp) /* 00CCC 8089E8FC 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -79,7 +79,7 @@ glabel BgMizuMovebg_Draw /* 00D34 8089E964 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00D38 8089E968 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00D3C 8089E96C AFA20068 */ sw $v0, 0x0068($sp) -/* 00D40 8089E970 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 00D40 8089E970 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 00D44 8089E974 AFAC0038 */ sw $t4, 0x0038($sp) /* 00D48 8089E978 8FA30068 */ lw $v1, 0x0068($sp) /* 00D4C 8089E97C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -111,7 +111,7 @@ glabel BgMizuMovebg_Draw /* 00DB4 8089E9E4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00DB8 8089E9E8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00DBC 8089E9EC AFA20064 */ sw $v0, 0x0064($sp) -/* 00DC0 8089E9F0 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 00DC0 8089E9F0 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 00DC4 8089E9F4 AFAB0038 */ sw $t3, 0x0038($sp) /* 00DC8 8089E9F8 8FA30064 */ lw $v1, 0x0064($sp) /* 00DCC 8089E9FC 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -146,7 +146,7 @@ glabel BgMizuMovebg_Draw /* 00E40 8089EA70 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00E44 8089EA74 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00E48 8089EA78 AFA20060 */ sw $v0, 0x0060($sp) -/* 00E4C 8089EA7C 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 00E4C 8089EA7C 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 00E50 8089EA80 AFAA0038 */ sw $t2, 0x0038($sp) /* 00E54 8089EA84 8FA30060 */ lw $v1, 0x0060($sp) /* 00E58 8089EA88 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s index c0b1495d7d..d5650caaed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s @@ -40,7 +40,7 @@ glabel BgMizuWater_Draw /* 00B80 808A0430 AFB80010 */ sw $t8, 0x0010($sp) /* 00B84 808A0434 AFA0001C */ sw $zero, 0x001C($sp) /* 00B88 808A0438 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00B8C 808A043C 0C0253D0 */ jal Draw_TwoTexScroll +/* 00B8C 808A043C 0C0253D0 */ jal Gfx_TwoTexScroll /* 00B90 808A0440 AFA20058 */ sw $v0, 0x0058($sp) /* 00B94 808A0444 8FA80058 */ lw $t0, 0x0058($sp) /* 00B98 808A0448 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s index c60e8624d1..3828292705 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s @@ -80,7 +80,7 @@ glabel func_808A4A64 /* 0055C 808A4B9C AFAA0028 */ sw $t2, 0x0028($sp) /* 00560 808A4BA0 AFAF0014 */ sw $t7, 0x0014($sp) /* 00564 808A4BA4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00568 808A4BA8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00568 808A4BA8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0056C 808A4BAC AFA20050 */ sw $v0, 0x0050($sp) /* 00570 808A4BB0 8FA80050 */ lw $t0, 0x0050($sp) /* 00574 808A4BB4 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s index 8ef7e79f14..c58fc822c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s @@ -239,7 +239,7 @@ glabel BgPoSyokudai_Draw /* 0070C 808A87BC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00710 808A87C0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00714 808A87C4 AFA2005C */ sw $v0, 0x005C($sp) -/* 00718 808A87C8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00718 808A87C8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0071C 808A87CC AFA80064 */ sw $t0, 0x0064($sp) /* 00720 808A87D0 8FA3005C */ lw $v1, 0x005C($sp) /* 00724 808A87D4 8FA80064 */ lw $t0, 0x0064($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Draw.s index 55f4ecc24e..e204aaf03a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Draw.s @@ -8,14 +8,14 @@ glabel BgRelayObjects_Draw /* 00658 808A94A8 00000000 */ nop /* 0065C 808A94AC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00660 808A94B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00664 808A94B4 0C00D498 */ jal Draw_DListOpa +/* 00664 808A94B4 0C00D498 */ jal Gfx_DrawDListOpa /* 00668 808A94B8 24A51AB0 */ addiu $a1, $a1, 0x1AB0 ## $a1 = 06001AB0 /* 0066C 808A94BC 10000005 */ beq $zero, $zero, .L808A94D4 /* 00670 808A94C0 8FBF0014 */ lw $ra, 0x0014($sp) .L808A94C4: /* 00674 808A94C4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00678 808A94C8 0C00D498 */ jal Draw_DListOpa +/* 00678 808A94C8 0C00D498 */ jal Gfx_DrawDListOpa /* 0067C 808A94CC 24A501A0 */ addiu $a1, $a1, 0x01A0 ## $a1 = 060001A0 /* 00680 808A94D0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s index 79a814cf33..585387b60c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s @@ -121,7 +121,7 @@ glabel func_808AA2B0 /* 00D00 808AA480 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 00D04 808AA484 0000C012 */ mflo $t8 /* 00D08 808AA488 331901FF */ andi $t9, $t8, 0x01FF ## $t9 = 000000FF -/* 00D0C 808AA48C 0C0253D0 */ jal Draw_TwoTexScroll +/* 00D0C 808AA48C 0C0253D0 */ jal Gfx_TwoTexScroll /* 00D10 808AA490 AFB90020 */ sw $t9, 0x0020($sp) /* 00D14 808AA494 16200003 */ bne $s1, $zero, .L808AA4A4 /* 00D18 808AA498 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Draw.s index ab83b5a04e..b811c85efb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Draw.s @@ -53,7 +53,7 @@ glabel BgSpot01Idomizu_Draw /* 00244 808ABD24 AFAC0014 */ sw $t4, 0x0014($sp) /* 00248 808ABD28 AFAB0010 */ sw $t3, 0x0010($sp) /* 0024C 808ABD2C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00250 808ABD30 0C0253D0 */ jal Draw_TwoTexScroll +/* 00250 808ABD30 0C0253D0 */ jal Gfx_TwoTexScroll /* 00254 808ABD34 AFA20050 */ sw $v0, 0x0050($sp) /* 00258 808ABD38 8FA90050 */ lw $t1, 0x0050($sp) /* 0025C 808ABD3C 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC4A4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC4A4.s index ac2eca6026..ad6a6213d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC4A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC4A4.s @@ -8,7 +8,7 @@ glabel func_808AC4A4 /* 0037C 808AC4BC 31CF0007 */ andi $t7, $t6, 0x0007 ## $t7 = 00000000 /* 00380 808AC4C0 000FC080 */ sll $t8, $t7, 2 /* 00384 808AC4C4 00B82821 */ addu $a1, $a1, $t8 -/* 00388 808AC4C8 0C00D498 */ jal Draw_DListOpa +/* 00388 808AC4C8 0C00D498 */ jal Gfx_DrawDListOpa /* 0038C 808AC4CC 8CA5C510 */ lw $a1, %lo(D_808AC510)($a1) /* 00390 808AC4D0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Draw.s index 5fc41a4abe..e5aa8c7754 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Draw.s @@ -7,7 +7,7 @@ glabel BgSpot02Objects_Draw /* 005B0 808ACC10 3C05808B */ lui $a1, %hi(D_808AD8B0) ## $a1 = 808B0000 /* 005B4 808ACC14 000E7880 */ sll $t7, $t6, 2 /* 005B8 808ACC18 00AF2821 */ addu $a1, $a1, $t7 -/* 005BC 808ACC1C 0C00D498 */ jal Draw_DListOpa +/* 005BC 808ACC1C 0C00D498 */ jal Gfx_DrawDListOpa /* 005C0 808ACC20 8CA5D8B0 */ lw $a1, %lo(D_808AD8B0)($a1) /* 005C4 808ACC24 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s index 1152b8f08c..acb15beece 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s @@ -229,7 +229,7 @@ glabel func_808AD450 /* 01158 808AD7B8 AFAD0010 */ sw $t5, 0x0010($sp) /* 0115C 808AD7BC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01160 808AD7C0 AFA20060 */ sw $v0, 0x0060($sp) -/* 01164 808AD7C4 0C0253D0 */ jal Draw_TwoTexScroll +/* 01164 808AD7C4 0C0253D0 */ jal Gfx_TwoTexScroll /* 01168 808AD7C8 00033040 */ sll $a2, $v1, 1 /* 0116C 808AD7CC 8FA80060 */ lw $t0, 0x0060($sp) /* 01170 808AD7D0 3C04E700 */ lui $a0, 0xE700 ## $a0 = E7000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s index f778b38b09..89c9e784db 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s @@ -61,7 +61,7 @@ glabel BgSpot03Taki_Draw /* 006F0 808AE1D0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 006F4 808AE1D4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 006F8 808AE1D8 AFA20060 */ sw $v0, 0x0060($sp) -/* 006FC 808AE1DC 0C0253D0 */ jal Draw_TwoTexScroll +/* 006FC 808AE1DC 0C0253D0 */ jal Gfx_TwoTexScroll /* 00700 808AE1E0 AFA8007C */ sw $t0, 0x007C($sp) /* 00704 808AE1E4 8FA30060 */ lw $v1, 0x0060($sp) /* 00708 808AE1E8 8FA8007C */ lw $t0, 0x007C($sp) @@ -130,7 +130,7 @@ glabel BgSpot03Taki_Draw /* 007FC 808AE2DC AFAF001C */ sw $t7, 0x001C($sp) /* 00800 808AE2E0 AFB90028 */ sw $t9, 0x0028($sp) /* 00804 808AE2E4 AFB80024 */ sw $t8, 0x0024($sp) -/* 00808 808AE2E8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00808 808AE2E8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0080C 808AE2EC AFA2004C */ sw $v0, 0x004C($sp) /* 00810 808AE2F0 8FA3004C */ lw $v1, 0x004C($sp) /* 00814 808AE2F4 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Draw.s index 3b6bf9d45a..338886aa6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Draw.s @@ -7,7 +7,7 @@ glabel BgSpot05Soko_Draw /* 00264 808AE6D4 3C05808B */ lui $a1, %hi(D_808AE724) ## $a1 = 808B0000 /* 00268 808AE6D8 000E7880 */ sll $t7, $t6, 2 /* 0026C 808AE6DC 00AF2821 */ addu $a1, $a1, $t7 -/* 00270 808AE6E0 0C00D498 */ jal Draw_DListOpa +/* 00270 808AE6E0 0C00D498 */ jal Gfx_DrawDListOpa /* 00274 808AE6E4 8CA5E724 */ lw $a1, %lo(D_808AE724)($a1) /* 00278 808AE6E8 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s index 7d679bbc31..1c97e4e26a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s @@ -19,7 +19,7 @@ glabel BgSpot06Objects_Draw /* 00FFC 808AF77C 8FBF0014 */ lw $ra, 0x0014($sp) .L808AF780: /* 01000 808AF780 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01004 808AF784 0C00D498 */ jal Draw_DListOpa +/* 01004 808AF784 0C00D498 */ jal Gfx_DrawDListOpa /* 01008 808AF788 24A50E10 */ addiu $a1, $a1, 0x0E10 ## $a1 = 06000E10 /* 0100C 808AF78C 10000018 */ beq $zero, $zero, .L808AF7F0 @@ -27,7 +27,7 @@ glabel BgSpot06Objects_Draw .L808AF794: /* 01014 808AF794 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01018 808AF798 24A52490 */ addiu $a1, $a1, 0x2490 ## $a1 = 06002490 -/* 0101C 808AF79C 0C00D498 */ jal Draw_DListOpa +/* 0101C 808AF79C 0C00D498 */ jal Gfx_DrawDListOpa /* 01020 808AF7A0 AFA60018 */ sw $a2, 0x0018($sp) /* 01024 808AF7A4 8FA60018 */ lw $a2, 0x0018($sp) @@ -48,7 +48,7 @@ glabel BgSpot06Objects_Draw /* 0105C 808AF7DC 8FBF0014 */ lw $ra, 0x0014($sp) .L808AF7E0: /* 01060 808AF7E0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01064 808AF7E4 0C00D498 */ jal Draw_DListOpa +/* 01064 808AF7E4 0C00D498 */ jal Gfx_DrawDListOpa /* 01068 808AF7E8 24A51160 */ addiu $a1, $a1, 0x1160 ## $a1 = 06001160 /* 0106C 808AF7EC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s index da199d90d9..3bc8186488 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s @@ -52,7 +52,7 @@ glabel func_808AF524 /* 00E6C 808AF5EC AFA20064 */ sw $v0, 0x0064($sp) /* 00E70 808AF5F0 AFB00020 */ sw $s0, 0x0020($sp) /* 00E74 808AF5F4 AFB0001C */ sw $s0, 0x001C($sp) -/* 00E78 808AF5F8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00E78 808AF5F8 0C0253D0 */ jal Gfx_TwoTexScroll /* 00E7C 808AF5FC 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 /* 00E80 808AF600 8FA30064 */ lw $v1, 0x0064($sp) /* 00E84 808AF604 8FA60050 */ lw $a2, 0x0050($sp) @@ -80,7 +80,7 @@ glabel func_808AF524 /* 00EDC 808AF65C AFA70020 */ sw $a3, 0x0020($sp) /* 00EE0 808AF660 AFB0001C */ sw $s0, 0x001C($sp) /* 00EE4 808AF664 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00EE8 808AF668 0C0253D0 */ jal Draw_TwoTexScroll +/* 00EE8 808AF668 0C0253D0 */ jal Gfx_TwoTexScroll /* 00EEC 808AF66C AFA20060 */ sw $v0, 0x0060($sp) /* 00EF0 808AF670 8FA30060 */ lw $v1, 0x0060($sp) /* 00EF4 808AF674 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s index 062bed49c9..f01ee38aba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s @@ -105,7 +105,7 @@ glabel BgSpot07Taki_Draw /* 0029C 808AFECC AFA7001C */ sw $a3, 0x001C($sp) /* 002A0 808AFED0 AFB80010 */ sw $t8, 0x0010($sp) /* 002A4 808AFED4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 002A8 808AFED8 0C0253D0 */ jal Draw_TwoTexScroll +/* 002A8 808AFED8 0C0253D0 */ jal Gfx_TwoTexScroll /* 002AC 808AFEDC AFA20070 */ sw $v0, 0x0070($sp) /* 002B0 808AFEE0 8FA30070 */ lw $v1, 0x0070($sp) /* 002B4 808AFEE4 8FA70048 */ lw $a3, 0x0048($sp) @@ -157,7 +157,7 @@ glabel BgSpot07Taki_Draw /* 0036C 808AFF9C 8FA60048 */ lw $a2, 0x0048($sp) /* 00370 808AFFA0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00374 808AFFA4 AFA20068 */ sw $v0, 0x0068($sp) -/* 00378 808AFFA8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00378 808AFFA8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0037C 808AFFAC AFAF001C */ sw $t7, 0x001C($sp) /* 00380 808AFFB0 8FA30068 */ lw $v1, 0x0068($sp) /* 00384 808AFFB4 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 @@ -188,7 +188,7 @@ glabel BgSpot07Taki_Draw /* 003E8 808B0018 AFAC0010 */ sw $t4, 0x0010($sp) /* 003EC 808B001C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 003F0 808B0020 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 003F4 808B0024 0C0253D0 */ jal Draw_TwoTexScroll +/* 003F4 808B0024 0C0253D0 */ jal Gfx_TwoTexScroll /* 003F8 808B0028 AFA20064 */ sw $v0, 0x0064($sp) /* 003FC 808B002C 8FA30064 */ lw $v1, 0x0064($sp) /* 00400 808B0030 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 @@ -220,7 +220,7 @@ glabel BgSpot07Taki_Draw /* 00464 808B0094 AFB80018 */ sw $t8, 0x0018($sp) /* 00468 808B0098 AFAF0014 */ sw $t7, 0x0014($sp) /* 0046C 808B009C AFAE0010 */ sw $t6, 0x0010($sp) -/* 00470 808B00A0 0C0253D0 */ jal Draw_TwoTexScroll +/* 00470 808B00A0 0C0253D0 */ jal Gfx_TwoTexScroll /* 00474 808B00A4 AFA2005C */ sw $v0, 0x005C($sp) /* 00478 808B00A8 8FA3005C */ lw $v1, 0x005C($sp) /* 0047C 808B00AC 8FA60044 */ lw $a2, 0x0044($sp) @@ -251,7 +251,7 @@ glabel BgSpot07Taki_Draw /* 004E0 808B0110 AFAD0010 */ sw $t5, 0x0010($sp) /* 004E4 808B0114 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 004E8 808B0118 AFA6001C */ sw $a2, 0x001C($sp) -/* 004EC 808B011C 0C0253D0 */ jal Draw_TwoTexScroll +/* 004EC 808B011C 0C0253D0 */ jal Gfx_TwoTexScroll /* 004F0 808B0120 AFA20058 */ sw $v0, 0x0058($sp) /* 004F4 808B0124 8FA30058 */ lw $v1, 0x0058($sp) /* 004F8 808B0128 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Draw.s index aa2cb88ace..8dad3f3969 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Draw.s @@ -16,7 +16,7 @@ glabel BgSpot08Bakudankabe_Draw /* 00514 808B07E4 8FA50018 */ lw $a1, 0x0018($sp) /* 00518 808B07E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0051C 808B07EC 24A53898 */ addiu $a1, $a1, 0x3898 ## $a1 = 06003898 -/* 00520 808B07F0 0C00D498 */ jal Draw_DListOpa +/* 00520 808B07F0 0C00D498 */ jal Gfx_DrawDListOpa /* 00524 808B07F4 8FA40024 */ lw $a0, 0x0024($sp) /* 00528 808B07F8 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Draw.s index 78371436be..0bbb940ea6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Draw.s @@ -20,7 +20,7 @@ glabel BgSpot08Iceblock_Draw /* 00D0C 808B166C 25EF0DE0 */ addiu $t7, $t7, 0x0DE0 ## $t7 = 06000DE0 /* 00D10 808B1670 AFAF001C */ sw $t7, 0x001C($sp) .L808B1674: -/* 00D14 808B1674 0C00D498 */ jal Draw_DListOpa +/* 00D14 808B1674 0C00D498 */ jal Gfx_DrawDListOpa /* 00D18 808B1678 8FA5001C */ lw $a1, 0x001C($sp) /* 00D1C 808B167C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Draw.s index 8e881749ef..562bac6a11 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Draw.s @@ -4,7 +4,7 @@ glabel BgSpot11Bakudankabe_Draw /* 0053C 808B26BC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00540 808B26C0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00544 808B26C4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00548 808B26C8 0C00D498 */ jal Draw_DListOpa +/* 00548 808B26C8 0C00D498 */ jal Gfx_DrawDListOpa /* 0054C 808B26CC 24A51980 */ addiu $a1, $a1, 0x1980 ## $a1 = 06001980 /* 00550 808B26D0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2CA8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2CA8.s index 4ef91f7329..bf0ab859a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2CA8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Oasis/func_808B2CA8.s @@ -57,7 +57,7 @@ glabel func_808B2CA8 /* 00594 808B2D84 AFAD0014 */ sw $t5, 0x0014($sp) /* 00598 808B2D88 AFAC0010 */ sw $t4, 0x0010($sp) /* 0059C 808B2D8C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 005A0 808B2D90 0C0253D0 */ jal Draw_TwoTexScroll +/* 005A0 808B2D90 0C0253D0 */ jal Gfx_TwoTexScroll /* 005A4 808B2D94 AFA20050 */ sw $v0, 0x0050($sp) /* 005A8 808B2D98 8FA80050 */ lw $t0, 0x0050($sp) /* 005AC 808B2D9C 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Draw.s index b3390cc086..6114059902 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Draw.s @@ -4,7 +4,7 @@ glabel BgSpot12Saku_Draw /* 003D4 808B37F4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 003D8 808B37F8 AFBF0014 */ sw $ra, 0x0014($sp) /* 003DC 808B37FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 003E0 808B3800 0C00D498 */ jal Draw_DListOpa +/* 003E0 808B3800 0C00D498 */ jal Gfx_DrawDListOpa /* 003E4 808B3804 24A52260 */ addiu $a1, $a1, 0x2260 ## $a1 = 06002260 /* 003E8 808B3808 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s index e5227fd9ff..41232d2af0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s @@ -4,7 +4,7 @@ glabel BgSpot15Rrbox_Draw /* 00C00 808B4560 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00C04 808B4564 AFBF0014 */ sw $ra, 0x0014($sp) /* 00C08 808B4568 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00C0C 808B456C 0C00D498 */ jal Draw_DListOpa +/* 00C0C 808B456C 0C00D498 */ jal Gfx_DrawDListOpa /* 00C10 808B4570 24A50180 */ addiu $a1, $a1, 0x0180 ## $a1 = 06000180 /* 00C14 808B4574 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Draw.s index 3f1bfa781b..0197cad22c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Draw.s @@ -64,7 +64,7 @@ glabel BgSpot16Doughnut_Draw /* 003A0 808B67E0 AFA8001C */ sw $t0, 0x001C($sp) /* 003A4 808B67E4 AFAB0014 */ sw $t3, 0x0014($sp) /* 003A8 808B67E8 AFAA0010 */ sw $t2, 0x0010($sp) -/* 003AC 808B67EC 0C0253D0 */ jal Draw_TwoTexScroll +/* 003AC 808B67EC 0C0253D0 */ jal Gfx_TwoTexScroll /* 003B0 808B67F0 AFA20058 */ sw $v0, 0x0058($sp) /* 003B4 808B67F4 8FA30058 */ lw $v1, 0x0058($sp) /* 003B8 808B67F8 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s index b5b5327cce..d77f1e7118 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s @@ -74,7 +74,7 @@ glabel func_808B7478 /* 00198 808B7598 AFA0001C */ sw $zero, 0x001C($sp) /* 0019C 808B759C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 001A0 808B75A0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 001A4 808B75A4 0C0253D0 */ jal Draw_TwoTexScroll +/* 001A4 808B75A4 0C0253D0 */ jal Gfx_TwoTexScroll /* 001A8 808B75A8 AFA20050 */ sw $v0, 0x0050($sp) /* 001AC 808B75AC 8FA30050 */ lw $v1, 0x0050($sp) /* 001B0 808B75B0 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Draw.s index 4a9511749b..b3bcffdea6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Draw.s @@ -13,7 +13,7 @@ glabel BgSpot18Basket_Draw /* 00E10 808B8520 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 /* 00E14 808B8524 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E18 808B8528 24A518B0 */ addiu $a1, $a1, 0x18B0 ## $a1 = 060018B0 -/* 00E1C 808B852C 0C00D498 */ jal Draw_DListOpa +/* 00E1C 808B852C 0C00D498 */ jal Gfx_DrawDListOpa /* 00E20 808B8530 8FA40024 */ lw $a0, 0x0024($sp) /* 00E24 808B8534 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Draw.s index 074d2ae758..5faa4eab86 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Draw.s @@ -8,7 +8,7 @@ glabel BgSpot18Obj_Draw /* 0079C 808B90AC 31CF000F */ andi $t7, $t6, 0x000F ## $t7 = 00000000 /* 007A0 808B90B0 000FC080 */ sll $t8, $t7, 2 /* 007A4 808B90B4 00B82821 */ addu $a1, $a1, $t8 -/* 007A8 808B90B8 0C00D498 */ jal Draw_DListOpa +/* 007A8 808B90B8 0C00D498 */ jal Gfx_DrawDListOpa /* 007AC 808B90BC 8CA59144 */ lw $a1, %lo(D_808B9144)($a1) /* 007B0 808B90C0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Draw.s index 4cb338548a..528049e1f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Draw.s @@ -4,7 +4,7 @@ glabel BgSpot18Shutter_Draw /* 00454 808B9824 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00458 808B9828 AFBF0014 */ sw $ra, 0x0014($sp) /* 0045C 808B982C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00460 808B9830 0C00D498 */ jal Draw_DListOpa +/* 00460 808B9830 0C00D498 */ jal Gfx_DrawDListOpa /* 00464 808B9834 24A50420 */ addiu $a1, $a1, 0x0420 ## $a1 = 06000420 /* 00468 808B9838 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s index a59eb865f7..6f85c90312 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s @@ -68,7 +68,7 @@ glabel func_808BA018 /* 0021C 808BA11C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00220 808BA120 24070040 */ addiu $a3, $zero, 0x0040 ## $a3 = 00000040 /* 00224 808BA124 AFA20040 */ sw $v0, 0x0040($sp) -/* 00228 808BA128 0C0253A7 */ jal Draw_TexScroll +/* 00228 808BA128 0C0253A7 */ jal Gfx_TexScroll /* 0022C 808BA12C 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 /* 00230 808BA130 8FA30040 */ lw $v1, 0x0040($sp) /* 00234 808BA134 8FA80030 */ lw $t0, 0x0030($sp) @@ -86,7 +86,7 @@ glabel func_808BA018 /* 00264 808BA164 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00268 808BA168 24070040 */ addiu $a3, $zero, 0x0040 ## $a3 = 00000040 /* 0026C 808BA16C AFA2003C */ sw $v0, 0x003C($sp) -/* 00270 808BA170 0C0253A7 */ jal Draw_TexScroll +/* 00270 808BA170 0C0253A7 */ jal Gfx_TexScroll /* 00274 808BA174 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 /* 00278 808BA178 8FA3003C */ lw $v1, 0x003C($sp) /* 0027C 808BA17C 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s index b870f5fdd8..4fd76326b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s @@ -270,7 +270,7 @@ glabel func_808BA2CC /* 007CC 808BA6CC AFA00020 */ sw $zero, 0x0020($sp) /* 007D0 808BA6D0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 007D4 808BA6D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 007D8 808BA6D8 0C0253D0 */ jal Draw_TwoTexScroll +/* 007D8 808BA6D8 0C0253D0 */ jal Gfx_TwoTexScroll /* 007DC 808BA6DC AFA20078 */ sw $v0, 0x0078($sp) /* 007E0 808BA6E0 8FA80078 */ lw $t0, 0x0078($sp) /* 007E4 808BA6E4 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s index 2ae88db6ee..d8a3cf19aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s @@ -14,7 +14,7 @@ glabel BgYdanHasi_Draw /* 005BC 808BEABC 00027080 */ sll $t6, $v0, 2 /* 005C0 808BEAC0 3C05808C */ lui $a1, %hi(D_808BEC24) ## $a1 = 808C0000 /* 005C4 808BEAC4 00AE2821 */ addu $a1, $a1, $t6 -/* 005C8 808BEAC8 0C00D498 */ jal Draw_DListOpa +/* 005C8 808BEAC8 0C00D498 */ jal Gfx_DrawDListOpa /* 005CC 808BEACC 8CA5EC24 */ lw $a1, %lo(D_808BEC24)($a1) /* 005D0 808BEAD0 10000044 */ beq $zero, $zero, .L808BEBE4 @@ -54,7 +54,7 @@ glabel BgYdanHasi_Draw /* 00654 808BEB54 AFA90014 */ sw $t1, 0x0014($sp) /* 00658 808BEB58 AFB90010 */ sw $t9, 0x0010($sp) /* 0065C 808BEB5C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00660 808BEB60 0C0253D0 */ jal Draw_TwoTexScroll +/* 00660 808BEB60 0C0253D0 */ jal Gfx_TwoTexScroll /* 00664 808BEB64 AFA2004C */ sw $v0, 0x004C($sp) /* 00668 808BEB68 8FA8004C */ lw $t0, 0x004C($sp) /* 0066C 808BEB6C 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Draw.s index 719ad6ba12..dc96899f1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Draw.s @@ -8,14 +8,14 @@ glabel BgYdanMaruta_Draw /* 00564 808BF2A4 00000000 */ nop /* 00568 808BF2A8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0056C 808BF2AC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00570 808BF2B0 0C00D498 */ jal Draw_DListOpa +/* 00570 808BF2B0 0C00D498 */ jal Gfx_DrawDListOpa /* 00574 808BF2B4 24A58D88 */ addiu $a1, $a1, 0x8D88 ## $a1 = 06008D88 /* 00578 808BF2B8 10000005 */ beq $zero, $zero, .L808BF2D0 /* 0057C 808BF2BC 8FBF0014 */ lw $ra, 0x0014($sp) .L808BF2C0: /* 00580 808BF2C0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00584 808BF2C4 0C00D498 */ jal Draw_DListOpa +/* 00584 808BF2C4 0C00D498 */ jal Gfx_DrawDListOpa /* 00588 808BF2C8 24A56570 */ addiu $a1, $a1, 0x6570 ## $a1 = 06006570 /* 0058C 808BF2CC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Draw.s index 097904281a..71c388ccbb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Draw.s @@ -29,7 +29,7 @@ glabel BossDodongo_Draw /* 03B4C 808C4CDC AFAF0014 */ sw $t7, 0x0014($sp) /* 03B50 808C4CE0 AFA00010 */ sw $zero, 0x0010($sp) /* 03B54 808C4CE4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 03B58 808C4CE8 0C024CDC */ jal func_80093370 +/* 03B58 808C4CE8 0C024CDC */ jal Gfx_SetFog /* 03B5C 808C4CEC 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF /* 03B60 808C4CF0 10000073 */ beq $zero, $zero, .L808C4EC0 /* 03B64 808C4CF4 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 @@ -154,7 +154,7 @@ glabel BossDodongo_Draw /* 03D18 808C4EA8 C6080220 */ lwc1 $f8, 0x0220($s0) ## 00000220 /* 03D1C 808C4EAC 4600428D */ trunc.w.s $f10, $f8 /* 03D20 808C4EB0 440D5000 */ mfc1 $t5, $f10 -/* 03D24 808C4EB4 0C024CDC */ jal func_80093370 +/* 03D24 808C4EB4 0C024CDC */ jal Gfx_SetFog /* 03D28 808C4EB8 AFAD0018 */ sw $t5, 0x0018($sp) /* 03D2C 808C4EBC AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 .L808C4EC0: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Draw.s index edc0534313..5740781405 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Draw.s @@ -35,7 +35,7 @@ glabel BossFd_Draw /* 0525C 808D001C 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 05260 808D0020 AFAB0018 */ sw $t3, 0x0018($sp) /* 05264 808D0024 AFAA0014 */ sw $t2, 0x0014($sp) -/* 05268 808D0028 0C024CDC */ jal func_80093370 +/* 05268 808D0028 0C024CDC */ jal Gfx_SetFog /* 0526C 808D002C AFA00010 */ sw $zero, 0x0010($sp) /* 05270 808D0030 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L808D0034: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s index ac9629ae23..3dfd98afe4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s @@ -186,7 +186,7 @@ glabel func_808CF898 /* 04D9C 808CFB5C 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 /* 04DA0 808CFB60 2652B3A8 */ addiu $s2, $s2, 0xB3A8 ## $s2 = 0600B3A8 /* 04DA4 808CFB64 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 04DA8 808CFB68 0C024DDD */ jal func_80093774 +/* 04DA8 808CFB68 0C024DDD */ jal Gfx_CallSetupDL /* 04DAC 808CFB6C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04DB0 808CFB70 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 04DB4 808CFB74 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 @@ -289,7 +289,7 @@ glabel func_808CF898 /* 04F2C 808CFCEC 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 /* 04F30 808CFCF0 2652B3A8 */ addiu $s2, $s2, 0xB3A8 ## $s2 = 0600B3A8 /* 04F34 808CFCF4 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 04F38 808CFCF8 0C024DDD */ jal func_80093774 +/* 04F38 808CFCF8 0C024DDD */ jal Gfx_CallSetupDL /* 04F3C 808CFCFC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04F40 808CFD00 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 04F44 808CFD04 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s index 939364abda..7156e35179 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s @@ -94,7 +94,7 @@ glabel func_808D08F8 /* 05CA0 808D0A60 00000000 */ nop /* 05CA4 808D0A64 00085400 */ sll $t2, $t0, 16 /* 05CA8 808D0A68 000A5C03 */ sra $t3, $t2, 16 -/* 05CAC 808D0A6C 0C0253D0 */ jal Draw_TwoTexScroll +/* 05CAC 808D0A6C 0C0253D0 */ jal Gfx_TwoTexScroll /* 05CB0 808D0A70 AFAB0020 */ sw $t3, 0x0020($sp) /* 05CB4 808D0A74 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 05CB8 808D0A78 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s index 6cd4a224c4..a951249713 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s @@ -35,7 +35,7 @@ glabel BossFd2_Draw /* 03760 808D5DD0 2409044B */ addiu $t1, $zero, 0x044B ## $t1 = 0000044B /* 03764 808D5DD4 AFA90018 */ sw $t1, 0x0018($sp) /* 03768 808D5DD8 AFA80014 */ sw $t0, 0x0014($sp) -/* 0376C 808D5DDC 0C024CDC */ jal func_80093370 +/* 0376C 808D5DDC 0C024CDC */ jal Gfx_SetFog /* 03770 808D5DE0 AFA00010 */ sw $zero, 0x0010($sp) /* 03774 808D5DE4 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L808D5DE8: @@ -102,7 +102,7 @@ glabel BossFd2_Draw /* 03868 808D5ED8 AFA20054 */ sw $v0, 0x0054($sp) /* 0386C 808D5EDC 000D7C00 */ sll $t7, $t5, 16 /* 03870 808D5EE0 000FC403 */ sra $t8, $t7, 16 -/* 03874 808D5EE4 0C0253D0 */ jal Draw_TwoTexScroll +/* 03874 808D5EE4 0C0253D0 */ jal Gfx_TwoTexScroll /* 03878 808D5EE8 AFB80020 */ sw $t8, 0x0020($sp) /* 0387C 808D5EEC 8FA30054 */ lw $v1, 0x0054($sp) /* 03880 808D5EF0 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s index 1cfae5173d..8713f53b68 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s @@ -34,7 +34,7 @@ glabel BossGanon_Draw /* 0A4E4 808E0D54 AFA00010 */ sw $zero, 0x0010($sp) /* 0A4E8 808E0D58 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 0A4EC 808E0D5C 24060032 */ addiu $a2, $zero, 0x0032 ## $a2 = 00000032 -/* 0A4F0 808E0D60 0C024CDC */ jal func_80093370 +/* 0A4F0 808E0D60 0C024CDC */ jal Gfx_SetFog /* 0A4F4 808E0D64 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0A4F8 808E0D68 AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 /* 0A4FC 808E0D6C 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s index 24a19fcec6..121ff0c452 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s @@ -199,7 +199,7 @@ glabel func_808DEE70 /* 088F8 808DF168 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 088FC 808DF16C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 08900 808DF170 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08904 808DF174 0C0253D0 */ jal Draw_TwoTexScroll +/* 08904 808DF174 0C0253D0 */ jal Gfx_TwoTexScroll /* 08908 808DF178 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 0890C 808DF17C 8FA8006C */ lw $t0, 0x006C($sp) /* 08910 808DF180 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF4F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF4F0.s index e2c479c07d..269c6a839c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF4F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF4F0.s @@ -70,7 +70,7 @@ glabel func_808DF4F0 /* 08D90 808DF600 AFA0001C */ sw $zero, 0x001C($sp) /* 08D94 808DF604 AFAC0018 */ sw $t4, 0x0018($sp) /* 08D98 808DF608 AFAB0014 */ sw $t3, 0x0014($sp) -/* 08D9C 808DF60C 0C0253D0 */ jal Draw_TwoTexScroll +/* 08D9C 808DF60C 0C0253D0 */ jal Gfx_TwoTexScroll /* 08DA0 808DF610 AFAA0010 */ sw $t2, 0x0010($sp) /* 08DA4 808DF614 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 08DA8 808DF618 8E460280 */ lw $a2, 0x0280($s2) ## 00000280 @@ -171,7 +171,7 @@ glabel func_808DF4F0 /* 08F24 808DF794 AFA90024 */ sw $t1, 0x0024($sp) /* 08F28 808DF798 00190823 */ subu $at, $zero, $t9 /* 08F2C 808DF79C 00014080 */ sll $t0, $at, 2 -/* 08F30 808DF7A0 0C0253D0 */ jal Draw_TwoTexScroll +/* 08F30 808DF7A0 0C0253D0 */ jal Gfx_TwoTexScroll /* 08F34 808DF7A4 AFA80020 */ sw $t0, 0x0020($sp) /* 08F38 808DF7A8 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 08F3C 808DF7AC 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 @@ -222,7 +222,7 @@ glabel func_808DF4F0 /* 08FF0 808DF860 00094880 */ sll $t1, $t1, 2 /* 08FF4 808DF864 00024040 */ sll $t0, $v0, 1 /* 08FF8 808DF868 AFA8001C */ sw $t0, 0x001C($sp) -/* 08FFC 808DF86C 0C0253D0 */ jal Draw_TwoTexScroll +/* 08FFC 808DF86C 0C0253D0 */ jal Gfx_TwoTexScroll /* 09000 808DF870 AFA90020 */ sw $t1, 0x0020($sp) /* 09004 808DF874 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 09008 808DF878 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s index 98e9be3bc1..9ae5b4686a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s @@ -51,7 +51,7 @@ glabel func_808DFFC8 /* 0981C 808E008C AFB90024 */ sw $t9, 0x0024($sp) /* 09820 808E0090 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09824 808E0094 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 09828 808E0098 0C0253D0 */ jal Draw_TwoTexScroll +/* 09828 808E0098 0C0253D0 */ jal Gfx_TwoTexScroll /* 0982C 808E009C AFA20058 */ sw $v0, 0x0058($sp) /* 09830 808E00A0 8FA80058 */ lw $t0, 0x0058($sp) /* 09834 808E00A4 3C0BFA00 */ lui $t3, 0xFA00 ## $t3 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s index 60c21de69b..e87116be03 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s @@ -577,7 +577,7 @@ glabel func_808E3D84 /* 0DDC8 808E4638 AFB80014 */ sw $t8, 0x0014($sp) /* 0DDCC 808E463C AFA90010 */ sw $t1, 0x0010($sp) /* 0DDD0 808E4640 AFA200C4 */ sw $v0, 0x00C4($sp) -/* 0DDD4 808E4644 0C0253D0 */ jal Draw_TwoTexScroll +/* 0DDD4 808E4644 0C0253D0 */ jal Gfx_TwoTexScroll /* 0DDD8 808E4648 00033080 */ sll $a2, $v1, 2 /* 0DDDC 808E464C 8FA800C4 */ lw $t0, 0x00C4($sp) /* 0DDE0 808E4650 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -675,7 +675,7 @@ glabel func_808E3D84 /* 0DF48 808E47B8 AFAD0010 */ sw $t5, 0x0010($sp) /* 0DF4C 808E47BC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0DF50 808E47C0 AFA200AC */ sw $v0, 0x00AC($sp) -/* 0DF54 808E47C4 0C0253D0 */ jal Draw_TwoTexScroll +/* 0DF54 808E47C4 0C0253D0 */ jal Gfx_TwoTexScroll /* 0DF58 808E47C8 00033080 */ sll $a2, $v1, 2 /* 0DF5C 808E47CC 8FA800AC */ lw $t0, 0x00AC($sp) /* 0DF60 808E47D0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -773,7 +773,7 @@ glabel func_808E3D84 /* 0E0C8 808E4938 AFAB0014 */ sw $t3, 0x0014($sp) /* 0E0CC 808E493C AFAF0010 */ sw $t7, 0x0010($sp) /* 0E0D0 808E4940 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0E0D4 808E4944 0C0253D0 */ jal Draw_TwoTexScroll +/* 0E0D4 808E4944 0C0253D0 */ jal Gfx_TwoTexScroll /* 0E0D8 808E4948 AFA20094 */ sw $v0, 0x0094($sp) /* 0E0DC 808E494C 8FA30094 */ lw $v1, 0x0094($sp) /* 0E0E0 808E4950 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -882,7 +882,7 @@ glabel func_808E3D84 /* 0E274 808E4AE4 AFA9001C */ sw $t1, 0x001C($sp) /* 0E278 808E4AE8 AFB80020 */ sw $t8, 0x0020($sp) /* 0E27C 808E4AEC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0E280 808E4AF0 0C0253D0 */ jal Draw_TwoTexScroll +/* 0E280 808E4AF0 0C0253D0 */ jal Gfx_TwoTexScroll /* 0E284 808E4AF4 AFA2007C */ sw $v0, 0x007C($sp) /* 0E288 808E4AF8 8FA8007C */ lw $t0, 0x007C($sp) /* 0E28C 808E4AFC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s index ec557c2175..8a0493ce38 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s @@ -146,7 +146,7 @@ glabel BossGanon2_Draw /* 08BE0 80905B20 240F044B */ addiu $t7, $zero, 0x044B ## $t7 = 0000044B /* 08BE4 80905B24 AFAF0018 */ sw $t7, 0x0018($sp) /* 08BE8 80905B28 AFAD0014 */ sw $t5, 0x0014($sp) -/* 08BEC 80905B2C 0C024CDC */ jal func_80093370 +/* 08BEC 80905B2C 0C024CDC */ jal Gfx_SetFog /* 08BF0 80905B30 AFAC0010 */ sw $t4, 0x0010($sp) /* 08BF4 80905B34 8FB80068 */ lw $t8, 0x0068($sp) /* 08BF8 80905B38 AF0202C0 */ sw $v0, 0x02C0($t8) ## 000002C0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80903F38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80903F38.s index 78a50513aa..bb0813352e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80903F38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80903F38.s @@ -55,7 +55,7 @@ glabel func_80903F38 /* 070C8 80904008 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 070CC 8090400C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 070D0 80904010 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 070D4 80904014 0C0253D0 */ jal Draw_TwoTexScroll +/* 070D4 80904014 0C0253D0 */ jal Gfx_TwoTexScroll /* 070D8 80904018 AFA20058 */ sw $v0, 0x0058($sp) /* 070DC 8090401C 8FA30058 */ lw $v1, 0x0058($sp) /* 070E0 80904020 3C0AE700 */ lui $t2, 0xE700 ## $t2 = E7000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s index 9db24bdcff..32ca0b7224 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s @@ -53,7 +53,7 @@ glabel func_80904108 /* 07294 809041D4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 07298 809041D8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0729C 809041DC AFA20058 */ sw $v0, 0x0058($sp) -/* 072A0 809041E0 0C0253D0 */ jal Draw_TwoTexScroll +/* 072A0 809041E0 0C0253D0 */ jal Gfx_TwoTexScroll /* 072A4 809041E4 00603025 */ or $a2, $v1, $zero ## $a2 = 00010000 /* 072A8 809041E8 8FA90058 */ lw $t1, 0x0058($sp) /* 072AC 809041EC 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s index aaf448c567..818319f897 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s @@ -51,7 +51,7 @@ glabel func_80905674 /* 087F8 80905738 AFB90024 */ sw $t9, 0x0024($sp) /* 087FC 8090573C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 08800 80905740 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08804 80905744 0C0253D0 */ jal Draw_TwoTexScroll +/* 08804 80905744 0C0253D0 */ jal Gfx_TwoTexScroll /* 08808 80905748 AFA20058 */ sw $v0, 0x0058($sp) /* 0880C 8090574C 8FA80058 */ lw $t0, 0x0058($sp) /* 08810 80905750 3C0BFA00 */ lui $t3, 0xFA00 ## $t3 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s index ef2c94d314..264499e04f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s @@ -107,7 +107,7 @@ glabel func_809060E8 /* 09348 80906288 AFAC0010 */ sw $t4, 0x0010($sp) /* 0934C 8090628C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09350 80906290 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 09354 80906294 0C0253A7 */ jal Draw_TexScroll +/* 09354 80906294 0C0253A7 */ jal Gfx_TexScroll /* 09358 80906298 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 0935C 8090629C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 09360 809062A0 8E4202C0 */ lw $v0, 0x02C0($s2) ## 000002C0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Draw.s index 14059ec16a..f2705daf86 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Draw.s @@ -67,7 +67,7 @@ glabel BossGanondrof_Draw /* 042F8 80914938 AFA00010 */ sw $zero, 0x0010($sp) /* 042FC 8091493C 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 04300 80914940 24060032 */ addiu $a2, $zero, 0x0032 ## $a2 = 00000032 -/* 04304 80914944 0C024CDC */ jal func_80093370 +/* 04304 80914944 0C024CDC */ jal Gfx_SetFog /* 04308 80914948 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0430C 8091494C 10000076 */ beq $zero, $zero, .L80914B28 /* 04310 80914950 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 @@ -195,7 +195,7 @@ glabel BossGanondrof_Draw /* 044D0 80914B10 44098000 */ mfc1 $t1, $f16 /* 044D4 80914B14 00000000 */ nop /* 044D8 80914B18 252A03E8 */ addiu $t2, $t1, 0x03E8 ## $t2 = 000003E8 -/* 044DC 80914B1C 0C024CDC */ jal func_80093370 +/* 044DC 80914B1C 0C024CDC */ jal Gfx_SetFog /* 044E0 80914B20 AFAA0018 */ sw $t2, 0x0018($sp) /* 044E4 80914B24 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L80914B28: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s index e984097fc3..fcc6d30795 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s @@ -67,7 +67,7 @@ glabel BossMo_Draw /* 0910C 80924C0C AFB80024 */ sw $t8, 0x0024($sp) /* 09110 80924C10 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09114 80924C14 AFA20054 */ sw $v0, 0x0054($sp) -/* 09118 80924C18 0C0253D0 */ jal Draw_TwoTexScroll +/* 09118 80924C18 0C0253D0 */ jal Gfx_TwoTexScroll /* 0911C 80924C1C AFAF0020 */ sw $t7, 0x0020($sp) /* 09120 80924C20 8FA30054 */ lw $v1, 0x0054($sp) /* 09124 80924C24 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923FDC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923FDC.s index cfea2f3c1b..b8f8ce6c12 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923FDC.s @@ -68,7 +68,7 @@ glabel func_80923FDC /* 085E4 809240E4 AFA2005C */ sw $v0, 0x005C($sp) /* 085E8 809240E8 000FC400 */ sll $t8, $t7, 16 /* 085EC 809240EC 0018CC03 */ sra $t9, $t8, 16 -/* 085F0 809240F0 0C0253D0 */ jal Draw_TwoTexScroll +/* 085F0 809240F0 0C0253D0 */ jal Gfx_TwoTexScroll /* 085F4 809240F4 AFB90020 */ sw $t9, 0x0020($sp) /* 085F8 809240F8 8FA3005C */ lw $v1, 0x005C($sp) /* 085FC 809240FC 3C0CE700 */ lui $t4, 0xE700 ## $t4 = E7000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s index 57a454798e..995995c659 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s @@ -64,7 +64,7 @@ glabel func_80924228 /* 0881C 8092431C AFAA0010 */ sw $t2, 0x0010($sp) /* 08820 80924320 AFAD0028 */ sw $t5, 0x0028($sp) /* 08824 80924324 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 08828 80924328 0C0253D0 */ jal Draw_TwoTexScroll +/* 08828 80924328 0C0253D0 */ jal Gfx_TwoTexScroll /* 0882C 8092432C AFA200C8 */ sw $v0, 0x00C8($sp) /* 08830 80924330 8FA900C8 */ lw $t1, 0x00C8($sp) /* 08834 80924334 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -99,7 +99,7 @@ glabel func_80924228 /* 088A8 809243A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 088AC 809243AC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 088B0 809243B0 AFA200C4 */ sw $v0, 0x00C4($sp) -/* 088B4 809243B4 0C0253D0 */ jal Draw_TwoTexScroll +/* 088B4 809243B4 0C0253D0 */ jal Gfx_TwoTexScroll /* 088B8 809243B8 00C33021 */ addu $a2, $a2, $v1 /* 088BC 809243BC 8FA800C4 */ lw $t0, 0x00C4($sp) /* 088C0 809243C0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -429,7 +429,7 @@ glabel func_80924228 /* 08DB0 809248B0 AFA20054 */ sw $v0, 0x0054($sp) /* 08DB4 809248B4 00195400 */ sll $t2, $t9, 16 /* 08DB8 809248B8 000A7C03 */ sra $t7, $t2, 16 -/* 08DBC 809248BC 0C0253D0 */ jal Draw_TwoTexScroll +/* 08DBC 809248BC 0C0253D0 */ jal Gfx_TwoTexScroll /* 08DC0 809248C0 AFAF0020 */ sw $t7, 0x0020($sp) /* 08DC4 809248C4 8FA80054 */ lw $t0, 0x0054($sp) /* 08DC8 809248C8 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s index ba68ec3a76..3ce53f16a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s @@ -203,7 +203,7 @@ glabel func_80925480 /* 09C84 80925784 016C9021 */ addu $s2, $t3, $t4 /* 09C88 80925788 00419824 */ and $s3, $v0, $at /* 09C8C 8092578C 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 09C90 80925790 0C024DDD */ jal func_80093774 +/* 09C90 80925790 0C024DDD */ jal Gfx_CallSetupDL /* 09C94 80925794 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09C98 80925798 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 09C9C 8092579C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s index f203760a77..1b5bded81f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s @@ -57,7 +57,7 @@ glabel func_8093639C /* 09EA8 80936478 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09EAC 8093647C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 09EB0 80936480 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 09EB4 80936484 0C0253D0 */ jal Draw_TwoTexScroll +/* 09EB4 80936484 0C0253D0 */ jal Gfx_TwoTexScroll /* 09EB8 80936488 306700FF */ andi $a3, $v1, 0x00FF ## $a3 = 00000000 /* 09EBC 8093648C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 09EC0 80936490 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 @@ -203,7 +203,7 @@ glabel func_8093639C /* 0A0D8 809366A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0A0DC 809366AC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0A0E0 809366B0 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 0A0E4 809366B4 0C0253D0 */ jal Draw_TwoTexScroll +/* 0A0E4 809366B4 0C0253D0 */ jal Gfx_TwoTexScroll /* 0A0E8 809366B8 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 /* 0A0EC 809366BC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0A0F0 809366C0 3C018093 */ lui $at, %hi(D_80937A74) ## $at = 80930000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s index 3e1d17ef07..83fafa62c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s @@ -101,7 +101,7 @@ glabel BossTw_Draw /* 0A730 80943400 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000008 /* 0A734 80943404 AFB90020 */ sw $t9, 0x0020($sp) /* 0A738 80943408 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000018 -/* 0A73C 8094340C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0A73C 8094340C 0C0253D0 */ jal Gfx_TwoTexScroll /* 0A740 80943410 AFA20064 */ sw $v0, 0x0064($sp) /* 0A744 80943414 8FA30064 */ lw $v1, 0x0064($sp) /* 0A748 80943418 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -133,7 +133,7 @@ glabel BossTw_Draw /* 0A7B0 80943480 00052C00 */ sll $a1, $a1, 16 /* 0A7B4 80943484 00052C03 */ sra $a1, $a1, 16 /* 0A7B8 80943488 30A5007F */ andi $a1, $a1, 0x007F ## $a1 = 00000000 -/* 0A7BC 8094348C 0C0253A7 */ jal Draw_TexScroll +/* 0A7BC 8094348C 0C0253A7 */ jal Gfx_TexScroll /* 0A7C0 80943490 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 00000000 /* 0A7C4 80943494 8FA30060 */ lw $v1, 0x0060($sp) /* 0A7C8 80943498 1000002A */ beq $zero, $zero, .L80943544 @@ -176,7 +176,7 @@ glabel BossTw_Draw /* 0A858 80943528 332A00FF */ andi $t2, $t9, 0x00FF ## $t2 = 00000000 /* 0A85C 8094352C AFAA0020 */ sw $t2, 0x0020($sp) /* 0A860 80943530 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 -/* 0A864 80943534 0C0253D0 */ jal Draw_TwoTexScroll +/* 0A864 80943534 0C0253D0 */ jal Gfx_TwoTexScroll /* 0A868 80943538 AFA2005C */ sw $v0, 0x005C($sp) /* 0A86C 8094353C 8FA3005C */ lw $v1, 0x005C($sp) /* 0A870 80943540 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -197,7 +197,7 @@ glabel BossTw_Draw /* 0A8A8 80943578 AFB80018 */ sw $t8, 0x0018($sp) /* 0A8AC 8094357C AFAF0014 */ sw $t7, 0x0014($sp) /* 0A8B0 80943580 AFA00010 */ sw $zero, 0x0010($sp) -/* 0A8B4 80943584 0C024CDC */ jal func_80093370 +/* 0A8B4 80943584 0C024CDC */ jal Gfx_SetFog /* 0A8B8 80943588 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 0A8BC 8094358C 10000073 */ beq $zero, $zero, .L8094375C /* 0A8C0 80943590 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 @@ -322,7 +322,7 @@ glabel BossTw_Draw /* 0AA74 80943744 C60A01E4 */ lwc1 $f10, 0x01E4($s0) ## 000001E4 /* 0AA78 80943748 4600548D */ trunc.w.s $f18, $f10 /* 0AA7C 8094374C 440F9000 */ mfc1 $t7, $f18 -/* 0AA80 80943750 0C024CDC */ jal func_80093370 +/* 0AA80 80943750 0C024CDC */ jal Gfx_SetFog /* 0AA84 80943754 AFAF0018 */ sw $t7, 0x0018($sp) /* 0AA88 80943758 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 .L8094375C: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s index 0ee7b7c8c1..ad608eeeed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s @@ -207,7 +207,7 @@ glabel func_80941BC0 /* 0920C 80941EDC AFAB0020 */ sw $t3, 0x0020($sp) /* 09210 80941EE0 AFAD0028 */ sw $t5, 0x0028($sp) /* 09214 80941EE4 AFA3006C */ sw $v1, 0x006C($sp) -/* 09218 80941EE8 0C0253D0 */ jal Draw_TwoTexScroll +/* 09218 80941EE8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0921C 80941EEC AFAC0024 */ sw $t4, 0x0024($sp) /* 09220 80941EF0 8FA3006C */ lw $v1, 0x006C($sp) /* 09224 80941EF4 0C034213 */ jal Matrix_Push @@ -296,7 +296,7 @@ glabel func_80941BC0 /* 09370 80942040 AFAE0014 */ sw $t6, 0x0014($sp) /* 09374 80942044 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09378 80942048 AFA2005C */ sw $v0, 0x005C($sp) -/* 0937C 8094204C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0937C 8094204C 0C0253D0 */ jal Gfx_TwoTexScroll /* 09380 80942050 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 /* 09384 80942054 8FA8005C */ lw $t0, 0x005C($sp) /* 09388 80942058 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s index 0a63a93fb3..9df7085713 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s @@ -56,7 +56,7 @@ glabel func_80942180 /* 09588 80942258 AFA00020 */ sw $zero, 0x0020($sp) /* 0958C 8094225C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09590 80942260 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 09594 80942264 0C0253D0 */ jal Draw_TwoTexScroll +/* 09594 80942264 0C0253D0 */ jal Gfx_TwoTexScroll /* 09598 80942268 AFA2008C */ sw $v0, 0x008C($sp) /* 0959C 8094226C 8FA8008C */ lw $t0, 0x008C($sp) /* 095A0 80942270 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 @@ -175,7 +175,7 @@ glabel func_80942180 /* 09764 80942434 AFB80010 */ sw $t8, 0x0010($sp) /* 09768 80942438 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0976C 8094243C AFA20070 */ sw $v0, 0x0070($sp) -/* 09770 80942440 0C0253D0 */ jal Draw_TwoTexScroll +/* 09770 80942440 0C0253D0 */ jal Gfx_TwoTexScroll /* 09774 80942444 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 /* 09778 80942448 8FA80070 */ lw $t0, 0x0070($sp) /* 0977C 8094244C 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 @@ -258,7 +258,7 @@ glabel func_80942180 /* 098B0 80942580 AFAA0024 */ sw $t2, 0x0024($sp) /* 098B4 80942584 AFAB0028 */ sw $t3, 0x0028($sp) /* 098B8 80942588 AFA0001C */ sw $zero, 0x001C($sp) -/* 098BC 8094258C 0C0253D0 */ jal Draw_TwoTexScroll +/* 098BC 8094258C 0C0253D0 */ jal Gfx_TwoTexScroll /* 098C0 80942590 AFA2005C */ sw $v0, 0x005C($sp) /* 098C4 80942594 8FA8005C */ lw $t0, 0x005C($sp) /* 098C8 80942598 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s index a4c3041260..376ab2c8d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s @@ -44,7 +44,7 @@ glabel func_809426F0 /* 09AC8 80942798 AFA0001C */ sw $zero, 0x001C($sp) /* 09ACC 8094279C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09AD0 809427A0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 09AD4 809427A4 0C0253D0 */ jal Draw_TwoTexScroll +/* 09AD4 809427A4 0C0253D0 */ jal Gfx_TwoTexScroll /* 09AD8 809427A8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 09ADC 809427AC 0C034213 */ jal Matrix_Push /* 09AE0 809427B0 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 @@ -298,7 +298,7 @@ glabel func_809426F0 /* 09EAC 80942B7C AFA00020 */ sw $zero, 0x0020($sp) /* 09EB0 80942B80 AFA0001C */ sw $zero, 0x001C($sp) /* 09EB4 80942B84 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 09EB8 80942B88 0C0253D0 */ jal Draw_TwoTexScroll +/* 09EB8 80942B88 0C0253D0 */ jal Gfx_TwoTexScroll /* 09EBC 80942B8C 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 09EC0 80942B90 4406A000 */ mfc1 $a2, $f20 /* 09EC4 80942B94 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s index 1256866dbd..7dd9998b25 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s @@ -37,7 +37,7 @@ glabel func_80942C70 /* 0A02C 80942CFC 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 00000000 /* 0A030 80942D00 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0A034 80942D04 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 0A038 80942D08 0C0253A7 */ jal Draw_TexScroll +/* 0A038 80942D08 0C0253A7 */ jal Gfx_TexScroll /* 0A03C 80942D0C AFA20058 */ sw $v0, 0x0058($sp) /* 0A040 80942D10 8FA30058 */ lw $v1, 0x0058($sp) /* 0A044 80942D14 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s index 4d45565f4c..caf578c73b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s @@ -48,7 +48,7 @@ glabel L809439B8 /* 0AD34 80943A04 44064000 */ mfc1 $a2, $f8 /* 0AD38 80943A08 00000000 */ nop /* 0AD3C 80943A0C 00063400 */ sll $a2, $a2, 16 -/* 0AD40 80943A10 0C0253A7 */ jal Draw_TexScroll +/* 0AD40 80943A10 0C0253A7 */ jal Gfx_TexScroll /* 0AD44 80943A14 00063403 */ sra $a2, $a2, 16 /* 0AD48 80943A18 8FA3005C */ lw $v1, 0x005C($sp) /* 0AD4C 80943A1C 8FA80070 */ lw $t0, 0x0070($sp) @@ -140,7 +140,7 @@ glabel L80943B0C /* 0AEA0 80943B70 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0AEA4 80943B74 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0AEA8 80943B78 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0AEAC 80943B7C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0AEAC 80943B7C 0C0253D0 */ jal Gfx_TwoTexScroll /* 0AEB0 80943B80 AFA2004C */ sw $v0, 0x004C($sp) /* 0AEB4 80943B84 8FA3004C */ lw $v1, 0x004C($sp) /* 0AEB8 80943B88 8FAA0080 */ lw $t2, 0x0080($sp) @@ -176,7 +176,7 @@ glabel L80943B94 /* 0AF2C 80943BFC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0AF30 80943C00 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0AF34 80943C04 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0AF38 80943C08 0C0253D0 */ jal Draw_TwoTexScroll +/* 0AF38 80943C08 0C0253D0 */ jal Gfx_TwoTexScroll /* 0AF3C 80943C0C AFA20048 */ sw $v0, 0x0048($sp) /* 0AF40 80943C10 8FA30048 */ lw $v1, 0x0048($sp) /* 0AF44 80943C14 8FAA0080 */ lw $t2, 0x0080($sp) @@ -211,7 +211,7 @@ glabel L80943C20 /* 0AFB4 80943C84 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0AFB8 80943C88 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0AFBC 80943C8C AFA20044 */ sw $v0, 0x0044($sp) -/* 0AFC0 80943C90 0C0253D0 */ jal Draw_TwoTexScroll +/* 0AFC0 80943C90 0C0253D0 */ jal Gfx_TwoTexScroll /* 0AFC4 80943C94 AFA3001C */ sw $v1, 0x001C($sp) /* 0AFC8 80943C98 8FA90044 */ lw $t1, 0x0044($sp) /* 0AFCC 80943C9C 8FAA0080 */ lw $t2, 0x0080($sp) @@ -233,7 +233,7 @@ glabel L80943CA8 /* 0B008 80943CD8 AFAD0010 */ sw $t5, 0x0010($sp) /* 0B00C 80943CDC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0B010 80943CE0 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 0B014 80943CE4 0C0253A7 */ jal Draw_TexScroll +/* 0B014 80943CE4 0C0253A7 */ jal Gfx_TexScroll /* 0B018 80943CE8 AFA20040 */ sw $v0, 0x0040($sp) /* 0B01C 80943CEC 8FA30040 */ lw $v1, 0x0040($sp) /* 0B020 80943CF0 8FAA0080 */ lw $t2, 0x0080($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s index 6a4c766747..05aed9b25b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s @@ -224,7 +224,7 @@ glabel func_80943F08 /* 0B588 80944258 AFA20088 */ sw $v0, 0x0088($sp) /* 0B58C 8094425C 0000C812 */ mflo $t9 /* 0B590 80944260 AFB9001C */ sw $t9, 0x001C($sp) -/* 0B594 80944264 0C0253D0 */ jal Draw_TwoTexScroll +/* 0B594 80944264 0C0253D0 */ jal Gfx_TwoTexScroll /* 0B598 80944268 00000000 */ nop /* 0B59C 8094426C 8FA90088 */ lw $t1, 0x0088($sp) /* 0B5A0 80944270 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 @@ -323,7 +323,7 @@ glabel func_80943F08 /* 0B710 809443E0 AFA20074 */ sw $v0, 0x0074($sp) /* 0B714 809443E4 00006012 */ mflo $t4 /* 0B718 809443E8 AFAC001C */ sw $t4, 0x001C($sp) -/* 0B71C 809443EC 0C0253D0 */ jal Draw_TwoTexScroll +/* 0B71C 809443EC 0C0253D0 */ jal Gfx_TwoTexScroll /* 0B720 809443F0 00000000 */ nop /* 0B724 809443F4 8FA90074 */ lw $t1, 0x0074($sp) /* 0B728 809443F8 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 @@ -542,7 +542,7 @@ glabel func_80943F08 /* 0BA48 80944718 AFA70020 */ sw $a3, 0x0020($sp) /* 0BA4C 8094471C AFAE0024 */ sw $t6, 0x0024($sp) /* 0BA50 80944720 AFA0001C */ sw $zero, 0x001C($sp) -/* 0BA54 80944724 0C0253D0 */ jal Draw_TwoTexScroll +/* 0BA54 80944724 0C0253D0 */ jal Gfx_TwoTexScroll /* 0BA58 80944728 AFA20048 */ sw $v0, 0x0048($sp) /* 0BA5C 8094472C 8FA30048 */ lw $v1, 0x0048($sp) /* 0BA60 80944730 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s index c217793181..fa90a08a72 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s @@ -42,7 +42,7 @@ glabel func_809447BC /* 0BB8C 8094485C AFAB0010 */ sw $t3, 0x0010($sp) /* 0BB90 80944860 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0BB94 80944864 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0BB98 80944868 0C0253D0 */ jal Draw_TwoTexScroll +/* 0BB98 80944868 0C0253D0 */ jal Gfx_TwoTexScroll /* 0BB9C 8094486C AFA2007C */ sw $v0, 0x007C($sp) /* 0BBA0 80944870 8FA3007C */ lw $v1, 0x007C($sp) /* 0BBA4 80944874 0C034213 */ jal Matrix_Push diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s index 6b5b2a084d..ef5bb37067 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s @@ -96,7 +96,7 @@ glabel func_80944C50 /* 0C0F8 80944DC8 AFAE0010 */ sw $t6, 0x0010($sp) /* 0C0FC 80944DCC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0C100 80944DD0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0C104 80944DD4 0C0253D0 */ jal Draw_TwoTexScroll +/* 0C104 80944DD4 0C0253D0 */ jal Gfx_TwoTexScroll /* 0C108 80944DD8 AFA20060 */ sw $v0, 0x0060($sp) /* 0C10C 80944DDC 8FA30060 */ lw $v1, 0x0060($sp) /* 0C110 80944DE0 3C0BFA00 */ lui $t3, 0xFA00 ## $t3 = FA000000 @@ -185,7 +185,7 @@ glabel func_80944C50 /* 0C258 80944F28 AFAD0028 */ sw $t5, 0x0028($sp) /* 0C25C 80944F2C AFA0001C */ sw $zero, 0x001C($sp) /* 0C260 80944F30 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0C264 80944F34 0C0253D0 */ jal Draw_TwoTexScroll +/* 0C264 80944F34 0C0253D0 */ jal Gfx_TwoTexScroll /* 0C268 80944F38 AFA20050 */ sw $v0, 0x0050($sp) /* 0C26C 80944F3C 8FA80050 */ lw $t0, 0x0050($sp) /* 0C270 80944F40 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s index a5b7faa969..b1a56fae3e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s @@ -33,7 +33,7 @@ glabel func_80945084 /* 0C430 80945100 AFA00010 */ sw $zero, 0x0010($sp) /* 0C434 80945104 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 0C438 80945108 24060032 */ addiu $a2, $zero, 0x0032 ## $a2 = 00000032 -/* 0C43C 8094510C 0C024DC2 */ jal func_80093708 +/* 0C43C 8094510C 0C024DC2 */ jal Gfx_SetFog2 /* 0C440 80945110 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0C444 80945114 10000073 */ beq $zero, $zero, .L809452E4 /* 0C448 80945118 AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 @@ -158,7 +158,7 @@ glabel func_80945084 /* 0C5FC 809452CC C60801E4 */ lwc1 $f8, 0x01E4($s0) ## 000001E4 /* 0C600 809452D0 4600428D */ trunc.w.s $f10, $f8 /* 0C604 809452D4 440F5000 */ mfc1 $t7, $f10 -/* 0C608 809452D8 0C024DC2 */ jal func_80093708 +/* 0C608 809452D8 0C024DC2 */ jal Gfx_SetFog2 /* 0C60C 809452DC AFAF0018 */ sw $t7, 0x0018($sp) /* 0C610 809452E0 AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 .L809452E4: @@ -190,7 +190,7 @@ glabel func_80945084 /* 0C678 80945348 862807B2 */ lh $t0, 0x07B2($s1) ## 000007B2 /* 0C67C 8094534C 240903E8 */ addiu $t1, $zero, 0x03E8 ## $t1 = 000003E8 /* 0C680 80945350 AFA90018 */ sw $t1, 0x0018($sp) -/* 0C684 80945354 0C024DC2 */ jal func_80093708 +/* 0C684 80945354 0C024DC2 */ jal Gfx_SetFog2 /* 0C688 80945358 AFA80014 */ sw $t0, 0x0014($sp) /* 0C68C 8094535C AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 .L80945360: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s index 5579572e37..9613d1dab8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s @@ -120,7 +120,7 @@ glabel func_80946C7C /* 0E17C 80946E4C 01FE0019 */ multu $t7, $s8 /* 0E180 80946E50 0000C012 */ mflo $t8 /* 0E184 80946E54 03193821 */ addu $a3, $t8, $t9 -/* 0E188 80946E58 0C0253D0 */ jal Draw_TwoTexScroll +/* 0E188 80946E58 0C0253D0 */ jal Gfx_TwoTexScroll /* 0E18C 80946E5C 30E700FF */ andi $a3, $a3, 0x00FF ## $a3 = 00000000 /* 0E190 80946E60 AE220004 */ sw $v0, 0x0004($s1) ## 0601A434 /* 0E194 80946E64 866D0156 */ lh $t5, 0x0156($s3) ## 00000156 @@ -285,7 +285,7 @@ glabel func_80946C7C /* 0E408 809470D8 017E0019 */ multu $t3, $s8 /* 0E40C 809470DC 00006012 */ mflo $t4 /* 0E410 809470E0 018D3821 */ addu $a3, $t4, $t5 -/* 0E414 809470E4 0C0253D0 */ jal Draw_TwoTexScroll +/* 0E414 809470E4 0C0253D0 */ jal Gfx_TwoTexScroll /* 0E418 809470E8 30E700FF */ andi $a3, $a3, 0x00FF ## $a3 = 00000000 /* 0E41C 809470EC AE220004 */ sw $v0, 0x0004($s1) ## 0601AB04 /* 0E420 809470F0 86690156 */ lh $t1, 0x0156($s3) ## 00000156 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s index 2cdb436a4a..d095e73fc8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s @@ -111,7 +111,7 @@ glabel func_80947240 /* 0E720 809473F0 031E0019 */ multu $t8, $s8 /* 0E724 809473F4 0000C812 */ mflo $t9 /* 0E728 809473F8 03283821 */ addu $a3, $t9, $t0 -/* 0E72C 809473FC 0C0253D0 */ jal Draw_TwoTexScroll +/* 0E72C 809473FC 0C0253D0 */ jal Gfx_TwoTexScroll /* 0E730 80947400 30E700FF */ andi $a3, $a3, 0x00FF ## $a3 = 00000000 /* 0E734 80947404 AE220004 */ sw $v0, 0x0004($s1) ## 0601A434 /* 0E738 80947408 866E0156 */ lh $t6, 0x0156($s3) ## 00000156 @@ -275,7 +275,7 @@ glabel func_80947240 /* 0E9A8 80947678 019E0019 */ multu $t4, $s8 /* 0E9AC 8094767C 00006812 */ mflo $t5 /* 0E9B0 80947680 01AE3821 */ addu $a3, $t5, $t6 -/* 0E9B4 80947684 0C0253D0 */ jal Draw_TwoTexScroll +/* 0E9B4 80947684 0C0253D0 */ jal Gfx_TwoTexScroll /* 0E9B8 80947688 30E700FF */ andi $a3, $a3, 0x00FF ## $a3 = 00000000 /* 0E9BC 8094768C AE220004 */ sw $v0, 0x0004($s1) ## 0601AB04 /* 0E9C0 80947690 866A0156 */ lh $t2, 0x0156($s3) ## 00000156 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s index d8600d20f3..512e62cfb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s @@ -206,7 +206,7 @@ glabel func_80948668 /* 0FCB4 80948984 AFAB0024 */ sw $t3, 0x0024($sp) /* 0FCB8 80948988 AFA00020 */ sw $zero, 0x0020($sp) /* 0FCBC 8094898C AFA0001C */ sw $zero, 0x001C($sp) -/* 0FCC0 80948990 0C0253D0 */ jal Draw_TwoTexScroll +/* 0FCC0 80948990 0C0253D0 */ jal Gfx_TwoTexScroll /* 0FCC4 80948994 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0FCC8 80948998 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0FCCC 8094899C 8EA6000C */ lw $a2, 0x000C($s5) ## 00010054 @@ -333,7 +333,7 @@ glabel func_80948668 /* 0FEA4 80948B74 AFA00020 */ sw $zero, 0x0020($sp) /* 0FEA8 80948B78 AFA0001C */ sw $zero, 0x001C($sp) /* 0FEAC 80948B7C AFAD0018 */ sw $t5, 0x0018($sp) -/* 0FEB0 80948B80 0C0253D0 */ jal Draw_TwoTexScroll +/* 0FEB0 80948B80 0C0253D0 */ jal Gfx_TwoTexScroll /* 0FEB4 80948B84 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0FEB8 80948B88 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0FEBC 80948B8C 8EA6000C */ lw $a2, 0x000C($s5) ## 0001009C @@ -438,7 +438,7 @@ glabel func_80948668 /* 1003C 80948D0C AFAD0014 */ sw $t5, 0x0014($sp) /* 10040 80948D10 AFAF0010 */ sw $t7, 0x0010($sp) /* 10044 80948D14 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 10048 80948D18 0C0253D0 */ jal Draw_TwoTexScroll +/* 10048 80948D18 0C0253D0 */ jal Gfx_TwoTexScroll /* 1004C 80948D1C 3046007F */ andi $a2, $v0, 0x007F ## $a2 = 00000010 /* 10050 80948D20 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 10054 80948D24 86A9002E */ lh $t1, 0x002E($s5) ## 00010106 @@ -643,7 +643,7 @@ glabel func_80948668 /* 10358 80949028 AFA0001C */ sw $zero, 0x001C($sp) /* 1035C 8094902C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 10360 80949030 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 10364 80949034 0C0253D0 */ jal Draw_TwoTexScroll +/* 10364 80949034 0C0253D0 */ jal Gfx_TwoTexScroll /* 10368 80949038 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 1036C 8094903C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 10370 80949040 93A9018F */ lbu $t1, 0x018F($sp) @@ -869,7 +869,7 @@ glabel func_80948668 /* 106B8 80949388 AFA00020 */ sw $zero, 0x0020($sp) /* 106BC 8094938C AFA0001C */ sw $zero, 0x001C($sp) /* 106C0 80949390 AFAC0010 */ sw $t4, 0x0010($sp) -/* 106C4 80949394 0C0253D0 */ jal Draw_TwoTexScroll +/* 106C4 80949394 0C0253D0 */ jal Gfx_TwoTexScroll /* 106C8 80949398 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 106CC 8094939C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 106D0 809493A0 8EA6000C */ lw $a2, 0x000C($s5) ## 00010174 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s index dba491b448..e1a5bd3b49 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s @@ -146,7 +146,7 @@ glabel L80959318 /* 0A134 809593F4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0A138 809593F8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0A13C 809593FC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0A140 80959400 0C0253D0 */ jal Draw_TwoTexScroll +/* 0A140 80959400 0C0253D0 */ jal Gfx_TwoTexScroll /* 0A144 80959404 AFA20058 */ sw $v0, 0x0058($sp) /* 0A148 80959408 8FA30058 */ lw $v1, 0x0058($sp) /* 0A14C 8095940C 8FA8004C */ lw $t0, 0x004C($sp) @@ -182,7 +182,7 @@ glabel L80959318 /* 0A1C4 80959484 AFAB0010 */ sw $t3, 0x0010($sp) /* 0A1C8 80959488 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0A1CC 8095948C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0A1D0 80959490 0C0253D0 */ jal Draw_TwoTexScroll +/* 0A1D0 80959490 0C0253D0 */ jal Gfx_TwoTexScroll /* 0A1D4 80959494 AFA20054 */ sw $v0, 0x0054($sp) /* 0A1D8 80959498 8FA90054 */ lw $t1, 0x0054($sp) /* 0A1DC 8095949C 3C0A8096 */ lui $t2, %hi(func_80958150) ## $t2 = 80960000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957F60.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957F60.s index a4b0976c30..fcd2fb3db2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957F60.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957F60.s @@ -52,7 +52,7 @@ glabel func_80957F60 /* 08D68 80958028 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 08D6C 8095802C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 08D70 80958030 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08D74 80958034 0C0253D0 */ jal Draw_TwoTexScroll +/* 08D74 80958034 0C0253D0 */ jal Gfx_TwoTexScroll /* 08D78 80958038 AFA20044 */ sw $v0, 0x0044($sp) /* 08D7C 8095803C 8FA30044 */ lw $v1, 0x0044($sp) /* 08D80 80958040 8FA8005C */ lw $t0, 0x005C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s index 13f2556f82..70b1e381d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s @@ -196,7 +196,7 @@ glabel func_80958150 /* 0916C 8095842C AFA0001C */ sw $zero, 0x001C($sp) /* 09170 80958430 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09174 80958434 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 09178 80958438 0C0253D0 */ jal Draw_TwoTexScroll +/* 09178 80958438 0C0253D0 */ jal Gfx_TwoTexScroll /* 0917C 8095843C AFA2004C */ sw $v0, 0x004C($sp) /* 09180 80958440 8FA9004C */ lw $t1, 0x004C($sp) /* 09184 80958444 8FA80070 */ lw $t0, 0x0070($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s index 61de68688b..468f52a489 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s @@ -49,7 +49,7 @@ glabel func_80958FFC /* 09DF8 809590B8 AFA0001C */ sw $zero, 0x001C($sp) /* 09DFC 809590BC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09E00 809590C0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 09E04 809590C4 0C0253D0 */ jal Draw_TwoTexScroll +/* 09E04 809590C4 0C0253D0 */ jal Gfx_TwoTexScroll /* 09E08 809590C8 AFA20054 */ sw $v0, 0x0054($sp) /* 09E0C 809590CC 8FA80054 */ lw $t0, 0x0054($sp) /* 09E10 809590D0 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s index 29f392fca5..e618542659 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s @@ -54,7 +54,7 @@ glabel func_80967FFC /* 0177C 809680CC AFA0001C */ sw $zero, 0x001C($sp) /* 01780 809680D0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01784 809680D4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01788 809680D8 0C0253D0 */ jal Draw_TwoTexScroll +/* 01788 809680D8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0178C 809680DC 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 /* 01790 809680E0 3C088097 */ lui $t0, %hi(D_80969398) ## $t0 = 80970000 /* 01794 809680E4 25089398 */ addiu $t0, $t0, %lo(D_80969398) ## $t0 = 80969398 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s index f306dcb593..c405c7ddc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s @@ -172,7 +172,7 @@ glabel func_80968298 /* 01BE8 80968538 AFA70020 */ sw $a3, 0x0020($sp) /* 01BEC 8096853C AFA6001C */ sw $a2, 0x001C($sp) /* 01BF0 80968540 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01BF4 80968544 0C0253D0 */ jal Draw_TwoTexScroll +/* 01BF4 80968544 0C0253D0 */ jal Gfx_TwoTexScroll /* 01BF8 80968548 AFA2005C */ sw $v0, 0x005C($sp) /* 01BFC 8096854C 8FA3005C */ lw $v1, 0x005C($sp) /* 01C00 80968550 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s index b1a73d78f5..141d5ee8ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s @@ -72,7 +72,7 @@ glabel func_80968B70 /* 02338 80968C88 AFAC0020 */ sw $t4, 0x0020($sp) /* 0233C 80968C8C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02340 80968C90 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02344 80968C94 0C0253D0 */ jal Draw_TwoTexScroll +/* 02344 80968C94 0C0253D0 */ jal Gfx_TwoTexScroll /* 02348 80968C98 AFA20058 */ sw $v0, 0x0058($sp) /* 0234C 80968C9C 8FA30058 */ lw $v1, 0x0058($sp) /* 02350 80968CA0 3C068097 */ lui $a2, %hi(D_80969548) ## $a2 = 80970000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s index 71313cb144..7769564500 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s @@ -66,7 +66,7 @@ glabel func_809746F8 /* 038A4 809747F4 AFA8008C */ sw $t0, 0x008C($sp) /* 038A8 809747F8 AFB90020 */ sw $t9, 0x0020($sp) /* 038AC 809747FC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 038B0 80974800 0C0253D0 */ jal Draw_TwoTexScroll +/* 038B0 80974800 0C0253D0 */ jal Gfx_TwoTexScroll /* 038B4 80974804 AFA20074 */ sw $v0, 0x0074($sp) /* 038B8 80974808 8FA90074 */ lw $t1, 0x0074($sp) /* 038BC 8097480C 8FA8008C */ lw $t0, 0x008C($sp) @@ -102,7 +102,7 @@ glabel func_809746F8 /* 03930 80974880 AFAF0028 */ sw $t7, 0x0028($sp) /* 03934 80974884 AFA8008C */ sw $t0, 0x008C($sp) /* 03938 80974888 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0393C 8097488C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0393C 8097488C 0C0253D0 */ jal Gfx_TwoTexScroll /* 03940 80974890 AFA20070 */ sw $v0, 0x0070($sp) /* 03944 80974894 8FA90070 */ lw $t1, 0x0070($sp) /* 03948 80974898 8FA8008C */ lw $t0, 0x008C($sp) @@ -138,7 +138,7 @@ glabel func_809746F8 /* 039BC 8097490C AFAB0028 */ sw $t3, 0x0028($sp) /* 039C0 80974910 AFA8008C */ sw $t0, 0x008C($sp) /* 039C4 80974914 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 039C8 80974918 0C0253D0 */ jal Draw_TwoTexScroll +/* 039C8 80974918 0C0253D0 */ jal Gfx_TwoTexScroll /* 039CC 8097491C AFA2006C */ sw $v0, 0x006C($sp) /* 039D0 80974920 8FA9006C */ lw $t1, 0x006C($sp) /* 039D4 80974924 8FA8008C */ lw $t0, 0x008C($sp) @@ -158,7 +158,7 @@ glabel func_809746F8 /* 03A04 80974954 AFAF0010 */ sw $t7, 0x0010($sp) /* 03A08 80974958 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 03A0C 8097495C 24070010 */ addiu $a3, $zero, 0x0010 ## $a3 = 00000010 -/* 03A10 80974960 0C0253A7 */ jal Draw_TexScroll +/* 03A10 80974960 0C0253A7 */ jal Gfx_TexScroll /* 03A14 80974964 AFA20068 */ sw $v0, 0x0068($sp) /* 03A18 80974968 8FA30068 */ lw $v1, 0x0068($sp) /* 03A1C 8097496C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s index de82a87dc6..8d423b54b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s @@ -73,7 +73,7 @@ glabel func_80974B80 /* 03D44 80974C94 AFAA001C */ sw $t2, 0x001C($sp) /* 03D48 80974C98 AFA00020 */ sw $zero, 0x0020($sp) /* 03D4C 80974C9C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03D50 80974CA0 0C0253D0 */ jal Draw_TwoTexScroll +/* 03D50 80974CA0 0C0253D0 */ jal Gfx_TwoTexScroll /* 03D54 80974CA4 AFA20064 */ sw $v0, 0x0064($sp) /* 03D58 80974CA8 8FA30064 */ lw $v1, 0x0064($sp) /* 03D5C 80974CAC 0C034213 */ jal Matrix_Push diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s index f15db64382..f6d40648d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s @@ -88,7 +88,7 @@ glabel func_80974EB4 /* 040BC 8097500C AFAA0014 */ sw $t2, 0x0014($sp) /* 040C0 80975010 AFA90010 */ sw $t1, 0x0010($sp) /* 040C4 80975014 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 040C8 80975018 0C0253D0 */ jal Draw_TwoTexScroll +/* 040C8 80975018 0C0253D0 */ jal Gfx_TwoTexScroll /* 040CC 8097501C AFA20050 */ sw $v0, 0x0050($sp) /* 040D0 80975020 8FA30050 */ lw $v1, 0x0050($sp) /* 040D4 80975024 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s index 51eadc3c1f..a670f61be1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s @@ -86,7 +86,7 @@ glabel func_80975074 /* 04268 809751B8 AFA9001C */ sw $t1, 0x001C($sp) /* 0426C 809751BC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04270 809751C0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 04274 809751C4 0C0253D0 */ jal Draw_TwoTexScroll +/* 04274 809751C4 0C0253D0 */ jal Gfx_TwoTexScroll /* 04278 809751C8 AFA20064 */ sw $v0, 0x0064($sp) /* 0427C 809751CC 8FA30064 */ lw $v1, 0x0064($sp) /* 04280 809751D0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -124,7 +124,7 @@ glabel func_80975074 /* 04300 80975250 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04304 80975254 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 04308 80975258 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0430C 8097525C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0430C 8097525C 0C0253D0 */ jal Gfx_TwoTexScroll /* 04310 80975260 AFA20060 */ sw $v0, 0x0060($sp) /* 04314 80975264 8FA30060 */ lw $v1, 0x0060($sp) /* 04318 80975268 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s index 4695e7b4ec..4f682d5dc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s @@ -88,7 +88,7 @@ glabel func_8097587C /* 04A84 809759D4 AFA90020 */ sw $t1, 0x0020($sp) /* 04A88 809759D8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04A8C 809759DC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 04A90 809759E0 0C0253D0 */ jal Draw_TwoTexScroll +/* 04A90 809759E0 0C0253D0 */ jal Gfx_TwoTexScroll /* 04A94 809759E4 AFA20048 */ sw $v0, 0x0048($sp) /* 04A98 809759E8 8FA30048 */ lw $v1, 0x0048($sp) /* 04A9C 809759EC 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s index 08af15e558..91f44678ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s @@ -78,7 +78,7 @@ glabel func_80975A3C /* 04C1C 80975B6C AFA00020 */ sw $zero, 0x0020($sp) /* 04C20 80975B70 AFA0001C */ sw $zero, 0x001C($sp) /* 04C24 80975B74 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04C28 80975B78 0C0253D0 */ jal Draw_TwoTexScroll +/* 04C28 80975B78 0C0253D0 */ jal Gfx_TwoTexScroll /* 04C2C 80975B7C AFA20048 */ sw $v0, 0x0048($sp) /* 04C30 80975B80 8FA30048 */ lw $v1, 0x0048($sp) /* 04C34 80975B84 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s index bd883847fd..0fa3750a8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s @@ -112,7 +112,7 @@ glabel func_80975BD4 /* 04E34 80975D84 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04E38 80975D88 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 04E3C 80975D8C AFA300AC */ sw $v1, 0x00AC($sp) -/* 04E40 80975D90 0C0253D0 */ jal Draw_TwoTexScroll +/* 04E40 80975D90 0C0253D0 */ jal Gfx_TwoTexScroll /* 04E44 80975D94 AFA2008C */ sw $v0, 0x008C($sp) /* 04E48 80975D98 8FA8008C */ lw $t0, 0x008C($sp) /* 04E4C 80975D9C 8FA300AC */ lw $v1, 0x00AC($sp) @@ -248,7 +248,7 @@ glabel func_80975BD4 /* 0504C 80975F9C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 05050 80975FA0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 05054 80975FA4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 05058 80975FA8 0C0253D0 */ jal Draw_TwoTexScroll +/* 05058 80975FA8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0505C 80975FAC AFA20070 */ sw $v0, 0x0070($sp) /* 05060 80975FB0 8FA30070 */ lw $v1, 0x0070($sp) /* 05064 80975FB4 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 @@ -344,7 +344,7 @@ glabel func_80975BD4 /* 051C8 80976118 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 051CC 8097611C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 051D0 80976120 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 051D4 80976124 0C0253D0 */ jal Draw_TwoTexScroll +/* 051D4 80976124 0C0253D0 */ jal Gfx_TwoTexScroll /* 051D8 80976128 AFA20058 */ sw $v0, 0x0058($sp) /* 051DC 8097612C 8FA30058 */ lw $v1, 0x0058($sp) /* 051E0 80976130 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s index 04bc444353..cff7280999 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s @@ -82,7 +82,7 @@ glabel func_80976254 /* 05444 80976394 30C603FF */ andi $a2, $a2, 0x03FF ## $a2 = 00000000 /* 05448 80976398 AFB8001C */ sw $t8, 0x001C($sp) /* 0544C 8097639C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 05450 809763A0 0C0253D0 */ jal Draw_TwoTexScroll +/* 05450 809763A0 0C0253D0 */ jal Gfx_TwoTexScroll /* 05454 809763A4 AFA2004C */ sw $v0, 0x004C($sp) /* 05458 809763A8 8FA3004C */ lw $v1, 0x004C($sp) /* 0545C 809763AC 3C068097 */ lui $a2, %hi(D_80976C1C) ## $a2 = 80970000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s index 1906ae9fb4..ba124ff3b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s @@ -32,7 +32,7 @@ glabel func_80976404 /* 05528 80976478 0C031AB1 */ jal func_800C6AC4 /* 0552C 8097647C 24070C81 */ addiu $a3, $zero, 0x0C81 ## $a3 = 00000C81 /* 05530 80976480 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 05534 80976484 0C024DDD */ jal func_80093774 +/* 05534 80976484 0C024DDD */ jal Gfx_CallSetupDL /* 05538 80976488 24050019 */ addiu $a1, $zero, 0x0019 ## $a1 = 00000019 /* 0553C 8097648C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 05540 80976490 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s index 85ef1378f7..7d16e58de7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s @@ -137,7 +137,7 @@ glabel func_80977950 /* 007D8 80977B68 AFAB0028 */ sw $t3, 0x0028($sp) /* 007DC 80977B6C AFAD0024 */ sw $t5, 0x0024($sp) /* 007E0 80977B70 AFA30054 */ sw $v1, 0x0054($sp) -/* 007E4 80977B74 0C0253D0 */ jal Draw_TwoTexScroll +/* 007E4 80977B74 0C0253D0 */ jal Gfx_TwoTexScroll /* 007E8 80977B78 AFAC0020 */ sw $t4, 0x0020($sp) /* 007EC 80977B7C 8FA80054 */ lw $t0, 0x0054($sp) /* 007F0 80977B80 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s index 147cef1633..cefa66856c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s @@ -134,7 +134,7 @@ glabel func_8097F508 /* 0208C 8097F6FC AFA80054 */ sw $t0, 0x0054($sp) /* 02090 8097F700 AFB90038 */ sw $t9, 0x0038($sp) /* 02094 8097F704 AFA20074 */ sw $v0, 0x0074($sp) -/* 02098 8097F708 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 02098 8097F708 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 0209C 8097F70C AFB80034 */ sw $t8, 0x0034($sp) /* 020A0 8097F710 8FA90074 */ lw $t1, 0x0074($sp) /* 020A4 8097F714 8FA80054 */ lw $t0, 0x0054($sp) @@ -172,7 +172,7 @@ glabel func_8097F508 /* 02124 8097F794 AFAF0038 */ sw $t7, 0x0038($sp) /* 02128 8097F798 AFA20070 */ sw $v0, 0x0070($sp) /* 0212C 8097F79C 24630188 */ addiu $v1, $v1, 0x0188 ## $v1 = 00000188 -/* 02130 8097F7A0 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 02130 8097F7A0 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 02134 8097F7A4 AFAE0034 */ sw $t6, 0x0034($sp) /* 02138 8097F7A8 8FA90070 */ lw $t1, 0x0070($sp) /* 0213C 8097F7AC 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 @@ -230,7 +230,7 @@ glabel func_8097F508 /* 0220C 8097F87C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02210 8097F880 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02214 8097F884 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02218 8097F888 0C0253D0 */ jal Draw_TwoTexScroll +/* 02218 8097F888 0C0253D0 */ jal Gfx_TwoTexScroll /* 0221C 8097F88C AFA20060 */ sw $v0, 0x0060($sp) /* 02220 8097F890 8FA30060 */ lw $v1, 0x0060($sp) /* 02224 8097F894 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s index a04d5cf734..a8c43f28e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s @@ -47,7 +47,7 @@ glabel func_8097FF9C /* 029E0 80980050 8C6B0008 */ lw $t3, 0x0008($v1) ## 00000180 /* 029E4 80980054 AFAC0038 */ sw $t4, 0x0038($sp) /* 029E8 80980058 AFA20060 */ sw $v0, 0x0060($sp) -/* 029EC 8098005C 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 029EC 8098005C 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 029F0 80980060 AFAB0034 */ sw $t3, 0x0034($sp) /* 029F4 80980064 8FA90060 */ lw $t1, 0x0060($sp) /* 029F8 80980068 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s index 870fcbfb0c..91d50a131d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s @@ -382,7 +382,7 @@ glabel func_80989D24 /* 0142C 8098A2AC 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 /* 01430 8098A2B0 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 /* 01434 8098A2B4 8E4402D0 */ lw $a0, 0x02D0($s2) ## 000002D0 -/* 01438 8098A2B8 0C024DDD */ jal func_80093774 +/* 01438 8098A2B8 0C024DDD */ jal Gfx_CallSetupDL /* 0143C 8098A2BC 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 01440 8098A2C0 AE4202D0 */ sw $v0, 0x02D0($s2) ## 000002D0 /* 01444 8098A2C4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s index 0d7745335c..f74046e7b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s @@ -36,7 +36,7 @@ glabel func_8098A9A4 /* 01BA8 8098AA28 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01BAC 8098AA2C 24070040 */ addiu $a3, $zero, 0x0040 ## $a3 = 00000040 /* 01BB0 8098AA30 AFA20038 */ sw $v0, 0x0038($sp) -/* 01BB4 8098AA34 0C0253A7 */ jal Draw_TexScroll +/* 01BB4 8098AA34 0C0253A7 */ jal Gfx_TexScroll /* 01BB8 8098AA38 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 /* 01BBC 8098AA3C 8FA30038 */ lw $v1, 0x0038($sp) /* 01BC0 8098AA40 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s index af04d2746c..9740ca0328 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s @@ -67,7 +67,7 @@ glabel DemoKekkai_Draw /* 01054 8098E024 AFAB0028 */ sw $t3, 0x0028($sp) /* 01058 8098E028 AFA70020 */ sw $a3, 0x0020($sp) /* 0105C 8098E02C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01060 8098E030 0C0253D0 */ jal Draw_TwoTexScroll +/* 01060 8098E030 0C0253D0 */ jal Gfx_TwoTexScroll /* 01064 8098E034 AFA2004C */ sw $v0, 0x004C($sp) /* 01068 8098E038 8FA3004C */ lw $v1, 0x004C($sp) /* 0106C 8098E03C 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s index f349bdb52e..d010d8a8b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s @@ -178,7 +178,7 @@ glabel func_8098D9C0 /* 00CA8 8098DC78 AFA7004C */ sw $a3, 0x004C($sp) /* 00CAC 8098DC7C AFAA0010 */ sw $t2, 0x0010($sp) /* 00CB0 8098DC80 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00CB4 8098DC84 0C0253D0 */ jal Draw_TwoTexScroll +/* 00CB4 8098DC84 0C0253D0 */ jal Gfx_TwoTexScroll /* 00CB8 8098DC88 AFA20080 */ sw $v0, 0x0080($sp) /* 00CBC 8098DC8C 8FA30080 */ lw $v1, 0x0080($sp) /* 00CC0 8098DC90 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 @@ -245,7 +245,7 @@ glabel func_8098D9C0 /* 00DB4 8098DD84 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00DB8 8098DD88 AFA2006C */ sw $v0, 0x006C($sp) /* 00DBC 8098DD8C AFAE0020 */ sw $t6, 0x0020($sp) -/* 00DC0 8098DD90 0C0253D0 */ jal Draw_TwoTexScroll +/* 00DC0 8098DD90 0C0253D0 */ jal Gfx_TwoTexScroll /* 00DC4 8098DD94 AFAE001C */ sw $t6, 0x001C($sp) /* 00DC8 8098DD98 8FA3006C */ lw $v1, 0x006C($sp) /* 00DCC 8098DD9C 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 @@ -321,7 +321,7 @@ glabel func_8098D9C0 /* 00EE4 8098DEB4 AFAD0024 */ sw $t5, 0x0024($sp) /* 00EE8 8098DEB8 AFA20058 */ sw $v0, 0x0058($sp) /* 00EEC 8098DEBC AFA70020 */ sw $a3, 0x0020($sp) -/* 00EF0 8098DEC0 0C0253D0 */ jal Draw_TwoTexScroll +/* 00EF0 8098DEC0 0C0253D0 */ jal Gfx_TwoTexScroll /* 00EF4 8098DEC4 AFA6001C */ sw $a2, 0x001C($sp) /* 00EF8 8098DEC8 8FA30058 */ lw $v1, 0x0058($sp) /* 00EFC 8098DECC 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s index 84d226f102..f0d840f473 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s @@ -74,7 +74,7 @@ glabel DemoShd_Draw /* 00308 80991538 AFAE0018 */ sw $t6, 0x0018($sp) /* 0030C 8099153C AFAD0014 */ sw $t5, 0x0014($sp) /* 00310 80991540 AFAC0010 */ sw $t4, 0x0010($sp) -/* 00314 80991544 0C0253D0 */ jal Draw_TwoTexScroll +/* 00314 80991544 0C0253D0 */ jal Gfx_TwoTexScroll /* 00318 80991548 AFA20054 */ sw $v0, 0x0054($sp) /* 0031C 8099154C 8FA80054 */ lw $t0, 0x0054($sp) /* 00320 80991550 3C0E8099 */ lui $t6, %hi(D_80993390) ## $t6 = 80990000 @@ -119,7 +119,7 @@ glabel DemoShd_Draw /* 003B8 809915E8 AFA0001C */ sw $zero, 0x001C($sp) /* 003BC 809915EC AFAC0010 */ sw $t4, 0x0010($sp) /* 003C0 809915F0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 003C4 809915F4 0C0253D0 */ jal Draw_TwoTexScroll +/* 003C4 809915F4 0C0253D0 */ jal Gfx_TwoTexScroll /* 003C8 809915F8 AFA2004C */ sw $v0, 0x004C($sp) /* 003CC 809915FC 8FA8004C */ lw $t0, 0x004C($sp) /* 003D0 80991600 3C0E8099 */ lui $t6, %hi(D_809934B8) ## $t6 = 80990000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993B2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993B2C.s index f3487dabd6..72feaa45c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993B2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993B2C.s @@ -43,7 +43,7 @@ glabel func_80993B2C /* 00510 80993BD0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00514 80993BD4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00518 80993BD8 AFA90064 */ sw $t1, 0x0064($sp) -/* 0051C 80993BDC 0C0253D0 */ jal Draw_TwoTexScroll +/* 0051C 80993BDC 0C0253D0 */ jal Gfx_TwoTexScroll /* 00520 80993BE0 AFA20050 */ sw $v0, 0x0050($sp) /* 00524 80993BE4 8FA80050 */ lw $t0, 0x0050($sp) /* 00528 80993BE8 8FA90064 */ lw $t1, 0x0064($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995F1C.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995F1C.s index 18d4912877..4c33efc925 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995F1C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995F1C.s @@ -20,7 +20,7 @@ glabel func_80995F1C /* 01310 80995F60 8FA40024 */ lw $a0, 0x0024($sp) /* 01314 80995F64 00037880 */ sll $t7, $v1, 2 /* 01318 80995F68 00AF2821 */ addu $a1, $a1, $t7 -/* 0131C 80995F6C 0C00D498 */ jal Draw_DListOpa +/* 0131C 80995F6C 0C00D498 */ jal Gfx_DrawDListOpa /* 01320 80995F70 8CA56048 */ lw $a1, %lo(D_80996048)($a1) /* 01324 80995F74 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s index 57e1e1e2ae..674c492fa9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s @@ -513,7 +513,7 @@ glabel func_8099B5EC /* 035F0 8099BD70 AFAD0010 */ sw $t5, 0x0010($sp) /* 035F4 8099BD74 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 035F8 8099BD78 AFA800D8 */ sw $t0, 0x00D8($sp) -/* 035FC 8099BD7C 0C0253D0 */ jal Draw_TwoTexScroll +/* 035FC 8099BD7C 0C0253D0 */ jal Gfx_TwoTexScroll /* 03600 8099BD80 AFA20090 */ sw $v0, 0x0090($sp) /* 03604 8099BD84 8FA30090 */ lw $v1, 0x0090($sp) /* 03608 8099BD88 8FA800D8 */ lw $t0, 0x00D8($sp) @@ -947,7 +947,7 @@ glabel func_8099B5EC /* 03C58 8099C3D8 AFA90028 */ sw $t1, 0x0028($sp) /* 03C5C 8099C3DC AFAC0024 */ sw $t4, 0x0024($sp) /* 03C60 8099C3E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03C64 8099C3E4 0C0253D0 */ jal Draw_TwoTexScroll +/* 03C64 8099C3E4 0C0253D0 */ jal Gfx_TwoTexScroll /* 03C68 8099C3E8 AFA2005C */ sw $v0, 0x005C($sp) /* 03C6C 8099C3EC 8FA3005C */ lw $v1, 0x005C($sp) /* 03C70 8099C3F0 8FA800D8 */ lw $t0, 0x00D8($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s index 56609d5cc0..b0ab4d0e9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s @@ -44,7 +44,7 @@ glabel EfcErupc_Draw /* 003A8 8099D058 AFAF0028 */ sw $t7, 0x0028($sp) /* 003AC 8099D05C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 003B0 8099D060 AFA20070 */ sw $v0, 0x0070($sp) -/* 003B4 8099D064 0C0253D0 */ jal Draw_TwoTexScroll +/* 003B4 8099D064 0C0253D0 */ jal Gfx_TwoTexScroll /* 003B8 8099D068 00603025 */ or $a2, $v1, $zero ## $a2 = 00000000 /* 003BC 8099D06C 8FA90070 */ lw $t1, 0x0070($sp) /* 003C0 8099D070 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -76,7 +76,7 @@ glabel EfcErupc_Draw /* 00428 8099D0D8 AFAC0010 */ sw $t4, 0x0010($sp) /* 0042C 8099D0DC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00430 8099D0E0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00434 8099D0E4 0C0253D0 */ jal Draw_TwoTexScroll +/* 00434 8099D0E4 0C0253D0 */ jal Gfx_TwoTexScroll /* 00438 8099D0E8 AFA2006C */ sw $v0, 0x006C($sp) /* 0043C 8099D0EC 8FA8006C */ lw $t0, 0x006C($sp) /* 00440 8099D0F0 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 @@ -108,7 +108,7 @@ glabel EfcErupc_Draw /* 004A8 8099D158 AFAE0010 */ sw $t6, 0x0010($sp) /* 004AC 8099D15C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 004B0 8099D160 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 004B4 8099D164 0C0253D0 */ jal Draw_TwoTexScroll +/* 004B4 8099D164 0C0253D0 */ jal Gfx_TwoTexScroll /* 004B8 8099D168 AFA20068 */ sw $v0, 0x0068($sp) /* 004BC 8099D16C 8FA80068 */ lw $t0, 0x0068($sp) /* 004C0 8099D170 0C034213 */ jal Matrix_Push diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s index 91a058c8be..909896701a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s @@ -106,7 +106,7 @@ glabel EnBa_Draw /* 01A74 809B7DC4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01A78 809B7DC8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01A7C 809B7DCC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01A80 809B7DD0 0C0253D0 */ jal Draw_TwoTexScroll +/* 01A80 809B7DD0 0C0253D0 */ jal Gfx_TwoTexScroll /* 01A84 809B7DD4 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 01A88 809B7DD8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 01A8C 809B7DDC 4481A000 */ mtc1 $at, $f20 ## $f20 = 0.50 @@ -224,7 +224,7 @@ glabel EnBa_Draw /* 01C38 809B7F88 AFAA0018 */ sw $t2, 0x0018($sp) /* 01C3C 809B7F8C AFAD0014 */ sw $t5, 0x0014($sp) /* 01C40 809B7F90 AFAC0010 */ sw $t4, 0x0010($sp) -/* 01C44 809B7F94 0C0253D0 */ jal Draw_TwoTexScroll +/* 01C44 809B7F94 0C0253D0 */ jal Gfx_TwoTexScroll /* 01C48 809B7F98 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 01C4C 809B7F9C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01C50 809B7FA0 8EC202C0 */ lw $v0, 0x02C0($s6) ## 000002C0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s index e2e920efbc..7d4dcf54fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s @@ -198,7 +198,7 @@ glabel EnBb_Draw /* 0355C 809BB83C AFA20068 */ sw $v0, 0x0068($sp) /* 03560 809BB840 00007012 */ mflo $t6 /* 03564 809BB844 31CF01FF */ andi $t7, $t6, 0x01FF ## $t7 = 00000001 -/* 03568 809BB848 0C0253D0 */ jal Draw_TwoTexScroll +/* 03568 809BB848 0C0253D0 */ jal Gfx_TwoTexScroll /* 0356C 809BB84C AFAF0020 */ sw $t7, 0x0020($sp) /* 03570 809BB850 8FA80068 */ lw $t0, 0x0068($sp) /* 03574 809BB854 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s index c19720cdc0..907beadf05 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s @@ -39,7 +39,7 @@ glabel EnBlkobj_Draw /* 0042C 809C248C AFA00020 */ sw $zero, 0x0020($sp) /* 00430 809C2490 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00434 809C2494 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00438 809C2498 0C0253D0 */ jal Draw_TwoTexScroll +/* 00438 809C2498 0C0253D0 */ jal Gfx_TwoTexScroll /* 0043C 809C249C AFA20048 */ sw $v0, 0x0048($sp) /* 00440 809C24A0 8FA30048 */ lw $v1, 0x0048($sp) /* 00444 809C24A4 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s index 261c769cc6..3ad76956a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s @@ -210,7 +210,7 @@ glabel EnBw_Draw /* 02B8C 809D126C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02B90 809D1270 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 02B94 809D1274 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02B98 809D1278 0C0253D0 */ jal Draw_TwoTexScroll +/* 02B98 809D1278 0C0253D0 */ jal Gfx_TwoTexScroll /* 02B9C 809D127C AFA20060 */ sw $v0, 0x0060($sp) /* 02BA0 809D1280 8FA30060 */ lw $v1, 0x0060($sp) /* 02BA4 809D1284 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0D18.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0D18.s index e953ee069e..3d9f5395a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0D18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0D18.s @@ -33,7 +33,7 @@ glabel func_809D0D18 /* 026B4 809D0D94 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 026B8 809D0D98 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 026BC 809D0D9C AFA20040 */ sw $v0, 0x0040($sp) -/* 026C0 809D0DA0 0C0253D0 */ jal Draw_TwoTexScroll +/* 026C0 809D0DA0 0C0253D0 */ jal Gfx_TwoTexScroll /* 026C4 809D0DA4 AFAB0020 */ sw $t3, 0x0020($sp) /* 026C8 809D0DA8 8FA30040 */ lw $v1, 0x0040($sp) /* 026CC 809D0DAC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s index 5dc0073ae6..cefbc78868 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s @@ -92,7 +92,7 @@ glabel EnBx_Draw /* 00780 809D2260 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00784 809D2264 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00788 809D2268 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0078C 809D226C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0078C 809D226C 0C0253D0 */ jal Gfx_TwoTexScroll /* 00790 809D2270 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 00794 809D2274 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 00798 809D2278 8EE202C0 */ lw $v0, 0x02C0($s7) ## 000002C0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D53CC.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D53CC.s index 10a57265fa..83bfab3064 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D53CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D53CC.s @@ -281,7 +281,7 @@ glabel func_809D53CC /* 02258 809D5808 AFA80024 */ sw $t0, 0x0024($sp) /* 0225C 809D580C AFA00020 */ sw $zero, 0x0020($sp) /* 02260 809D5810 AFA0001C */ sw $zero, 0x001C($sp) -/* 02264 809D5814 0C0253D0 */ jal Draw_TwoTexScroll +/* 02264 809D5814 0C0253D0 */ jal Gfx_TwoTexScroll /* 02268 809D5818 AFA200B4 */ sw $v0, 0x00B4($sp) /* 0226C 809D581C 8FA300B4 */ lw $v1, 0x00B4($sp) /* 02270 809D5820 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -397,7 +397,7 @@ glabel func_809D53CC /* 0241C 809D59CC AFAC0018 */ sw $t4, 0x0018($sp) /* 02420 809D59D0 AFA80014 */ sw $t0, 0x0014($sp) /* 02424 809D59D4 AFB80010 */ sw $t8, 0x0010($sp) -/* 02428 809D59D8 0C0253D0 */ jal Draw_TwoTexScroll +/* 02428 809D59D8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0242C 809D59DC AFA2009C */ sw $v0, 0x009C($sp) /* 02430 809D59E0 8FA3009C */ lw $v1, 0x009C($sp) /* 02434 809D59E4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Draw.s index 6fb300ce47..4aa4f45b4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Draw.s @@ -10,7 +10,7 @@ glabel EnDekunuts_Draw /* 01584 809EAAE4 8FB80020 */ lw $t8, 0x0020($sp) /* 01588 809EAAE8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0158C 809EAAEC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01590 809EAAF0 0C00D498 */ jal Draw_DListOpa +/* 01590 809EAAF0 0C00D498 */ jal Gfx_DrawDListOpa /* 01594 809EAAF4 24A52298 */ addiu $a1, $a1, 0x2298 ## $a1 = 06002298 /* 01598 809EAAF8 10000009 */ beq $zero, $zero, .L809EAB20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s index 012294c461..e10a65bec4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s @@ -127,7 +127,7 @@ glabel EnDh_Draw /* 016DC 809EC41C AFAA0028 */ sw $t2, 0x0028($sp) /* 016E0 809EC420 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 016E4 809EC424 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 016E8 809EC428 0C0253D0 */ jal Draw_TwoTexScroll +/* 016E8 809EC428 0C0253D0 */ jal Gfx_TwoTexScroll /* 016EC 809EC42C AFA2005C */ sw $v0, 0x005C($sp) /* 016F0 809EC430 8FA8005C */ lw $t0, 0x005C($sp) /* 016F4 809EC434 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s index 9fa07ae3ff..560c517b4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s @@ -88,7 +88,7 @@ glabel EnDyExtra_Draw /* 003C4 809FFAB4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 003C8 809FFAB8 AFA20060 */ sw $v0, 0x0060($sp) /* 003CC 809FFABC AFA3001C */ sw $v1, 0x001C($sp) -/* 003D0 809FFAC0 0C0253D0 */ jal Draw_TwoTexScroll +/* 003D0 809FFAC0 0C0253D0 */ jal Gfx_TwoTexScroll /* 003D4 809FFAC4 00033040 */ sll $a2, $v1, 1 /* 003D8 809FFAC8 8FA80060 */ lw $t0, 0x0060($sp) /* 003DC 809FFACC 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s index 3863ea3247..21ebf65876 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s @@ -215,7 +215,7 @@ glabel EnFd_Draw /* 01C88 80A0D348 AFA80024 */ sw $t0, 0x0024($sp) /* 01C8C 80A0D34C AFA0001C */ sw $zero, 0x001C($sp) /* 01C90 80A0D350 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01C94 80A0D354 0C0253D0 */ jal Draw_TwoTexScroll +/* 01C94 80A0D354 0C0253D0 */ jal Gfx_TwoTexScroll /* 01C98 80A0D358 AFA20058 */ sw $v0, 0x0058($sp) /* 01C9C 80A0D35C 8FA30058 */ lw $v1, 0x0058($sp) /* 01CA0 80A0D360 3C0BE700 */ lui $t3, 0xE700 ## $t3 = E7000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s index 676a955568..ad8df0459b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s @@ -52,7 +52,7 @@ glabel func_80A0D730 /* 02134 80A0D7F4 26317928 */ addiu $s1, $s1, 0x7928 ## $s1 = 06007928 /* 02138 80A0D7F8 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 0213C 80A0D7FC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02140 80A0D800 0C024DDD */ jal func_80093774 +/* 02140 80A0D800 0C024DDD */ jal Gfx_CallSetupDL /* 02144 80A0D804 241E0001 */ addiu $s8, $zero, 0x0001 ## $s8 = 00000001 /* 02148 80A0D808 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 0214C 80A0D80C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Draw.s index 4e37ba8f1d..8c5a3f5400 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Draw.s @@ -194,7 +194,7 @@ glabel EnFdFire_Draw /* 00A1C 80A0EECC AFA20064 */ sw $v0, 0x0064($sp) /* 00A20 80A0EED0 00005812 */ mflo $t3 /* 00A24 80A0EED4 AFAB0020 */ sw $t3, 0x0020($sp) -/* 00A28 80A0EED8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00A28 80A0EED8 0C0253D0 */ jal Gfx_TwoTexScroll /* 00A2C 80A0EEDC 00000000 */ nop /* 00A30 80A0EEE0 8FA30064 */ lw $v1, 0x0064($sp) /* 00A34 80A0EEE4 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s index e73df81e9d..efa5014689 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s @@ -316,7 +316,7 @@ glabel EnFhgFire_Draw /* 02398 80A115F8 AFA2005C */ sw $v0, 0x005C($sp) /* 0239C 80A115FC 00095400 */ sll $t2, $t1, 16 /* 023A0 80A11600 000A5C03 */ sra $t3, $t2, 16 -/* 023A4 80A11604 0C0253D0 */ jal Draw_TwoTexScroll +/* 023A4 80A11604 0C0253D0 */ jal Gfx_TwoTexScroll /* 023A8 80A11608 AFAB0020 */ sw $t3, 0x0020($sp) /* 023AC 80A1160C 8FA3005C */ lw $v1, 0x005C($sp) /* 023B0 80A11610 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s index e0935c7ffd..a8101143a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s @@ -46,7 +46,7 @@ glabel func_80A1F814 /* 01320 80A1F8C0 26317928 */ addiu $s1, $s1, 0x7928 ## $s1 = 06007928 /* 01324 80A1F8C4 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 01328 80A1F8C8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0132C 80A1F8CC 0C024DDD */ jal func_80093774 +/* 0132C 80A1F8CC 0C024DDD */ jal Gfx_CallSetupDL /* 01330 80A1F8D0 24170001 */ addiu $s7, $zero, 0x0001 ## $s7 = 00000001 /* 01334 80A1F8D4 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 01338 80A1F8D8 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s index 6e075c0c9d..9920bfad8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s @@ -59,7 +59,7 @@ glabel EnFz_Draw /* 0156C 80A2132C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01570 80A21330 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01574 80A21334 AFA2005C */ sw $v0, 0x005C($sp) -/* 01578 80A21338 0C0253D0 */ jal Draw_TwoTexScroll +/* 01578 80A21338 0C0253D0 */ jal Gfx_TwoTexScroll /* 0157C 80A2133C 3067007F */ andi $a3, $v1, 0x007F ## $a3 = 00000000 /* 01580 80A21340 8FA8005C */ lw $t0, 0x005C($sp) /* 01584 80A21344 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s index cac68667eb..e50839e289 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s @@ -117,7 +117,7 @@ glabel func_80A218A8 /* 01CAC 80A21A6C AFA00020 */ sw $zero, 0x0020($sp) /* 01CB0 80A21A70 AFA0001C */ sw $zero, 0x001C($sp) /* 01CB4 80A21A74 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01CB8 80A21A78 0C0253D0 */ jal Draw_TwoTexScroll +/* 01CB8 80A21A78 0C0253D0 */ jal Gfx_TwoTexScroll /* 01CBC 80A21A7C 00408825 */ or $s1, $v0, $zero ## $s1 = 060030A0 /* 01CC0 80A21A80 AE220004 */ sw $v0, 0x0004($s1) ## 060030A4 /* 01CC4 80A21A84 8E46000C */ lw $a2, 0x000C($s2) ## 00000280 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s index 60c1716e87..52333a4a8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s @@ -67,7 +67,7 @@ glabel func_80A30350 /* 012D0 80A30450 00409025 */ or $s2, $v0, $zero ## $s2 = 00000000 /* 012D4 80A30454 00006812 */ mflo $t5 /* 012D8 80A30458 31AE01FF */ andi $t6, $t5, 0x01FF ## $t6 = 00000000 -/* 012DC 80A3045C 0C0253D0 */ jal Draw_TwoTexScroll +/* 012DC 80A3045C 0C0253D0 */ jal Gfx_TwoTexScroll /* 012E0 80A30460 AFAE0020 */ sw $t6, 0x0020($sp) /* 012E4 80A30464 AE420004 */ sw $v0, 0x0004($s2) ## 00000004 /* 012E8 80A30468 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s index 0d9bf2deea..336218ddab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s @@ -46,7 +46,7 @@ glabel func_80A417B4 /* 032F0 80A41860 2631FD40 */ addiu $s1, $s1, 0xFD40 ## $s1 = 0600FD40 /* 032F4 80A41864 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 032F8 80A41868 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 032FC 80A4186C 0C024DDD */ jal func_80093774 +/* 032FC 80A4186C 0C024DDD */ jal Gfx_CallSetupDL /* 03300 80A41870 24170001 */ addiu $s7, $zero, 0x0001 ## $s7 = 00000001 /* 03304 80A41874 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 03308 80A41878 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s index d3d702b6c8..504935f633 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s @@ -46,7 +46,7 @@ glabel func_80A42EE0 /* 0025C 80A42F8C 2631FD40 */ addiu $s1, $s1, 0xFD40 ## $s1 = 0600FD40 /* 00260 80A42F90 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 00264 80A42F94 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00268 80A42F98 0C024DDD */ jal func_80093774 +/* 00268 80A42F98 0C024DDD */ jal Gfx_CallSetupDL /* 0026C 80A42F9C 24170001 */ addiu $s7, $zero, 0x0001 ## $s7 = 00000001 /* 00270 80A42FA0 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 00274 80A42FA4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s index 53264aab0e..0a3bd0142a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s @@ -4,7 +4,7 @@ glabel EnGoroiwa_Draw /* 02190 80A4DE30 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 02194 80A4DE34 AFBF0014 */ sw $ra, 0x0014($sp) /* 02198 80A4DE38 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0219C 80A4DE3C 0C00D498 */ jal Draw_DListOpa +/* 0219C 80A4DE3C 0C00D498 */ jal Gfx_DrawDListOpa /* 021A0 80A4DE40 24A506B0 */ addiu $a1, $a1, 0x06B0 ## $a1 = 060006B0 /* 021A4 80A4DE44 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Draw.s index 603719a358..cb238d3480 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Draw.s @@ -217,7 +217,7 @@ glabel EnGs_Draw /* 019B8 80A4FCD8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 019BC 80A4FCDC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 019C0 80A4FCE0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 019C4 80A4FCE4 0C0253D0 */ jal Draw_TwoTexScroll +/* 019C4 80A4FCE4 0C0253D0 */ jal Gfx_TwoTexScroll /* 019C8 80A4FCE8 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 /* 019CC 80A4FCEC AE220004 */ sw $v0, 0x0004($s1) ## 00000004 /* 019D0 80A4FCF0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Draw.s index b7c66fc64a..7788cab051 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Draw.s @@ -10,7 +10,7 @@ glabel EnHintnuts_Draw /* 01790 80A58990 8FB80020 */ lw $t8, 0x0020($sp) /* 01794 80A58994 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 01798 80A58998 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0179C 80A5899C 0C00D498 */ jal Draw_DListOpa +/* 0179C 80A5899C 0C00D498 */ jal Gfx_DrawDListOpa /* 017A0 80A589A0 24A514E0 */ addiu $a1, $a1, 0x14E0 ## $a1 = 060014E0 /* 017A4 80A589A4 10000009 */ beq $zero, $zero, .L80A589CC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s index 9ea1e334d0..26ab2934b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s @@ -25,7 +25,7 @@ glabel EnHoll_Draw /* 00D0C 80A5991C 24050025 */ addiu $a1, $zero, 0x0025 ## $a1 = 00000025 /* 00D10 80A59920 8D4702D0 */ lw $a3, 0x02D0($t2) ## 000002D0 .L80A59924: -/* 00D14 80A59924 0C024DDD */ jal func_80093774 +/* 00D14 80A59924 0C024DDD */ jal Gfx_CallSetupDL /* 00D18 80A59928 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00D1C 80A5992C 8FAB0048 */ lw $t3, 0x0048($sp) /* 00D20 80A59930 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s index 14146a25ee..50c7239388 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s @@ -44,7 +44,7 @@ glabel func_80A5AD28 /* 011A0 80A5ADD0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 011A4 80A5ADD4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 011A8 80A5ADD8 AFA20060 */ sw $v0, 0x0060($sp) -/* 011AC 80A5ADDC 0C0253D0 */ jal Draw_TwoTexScroll +/* 011AC 80A5ADDC 0C0253D0 */ jal Gfx_TwoTexScroll /* 011B0 80A5ADE0 AFAD0020 */ sw $t5, 0x0020($sp) /* 011B4 80A5ADE4 8FA30060 */ lw $v1, 0x0060($sp) /* 011B8 80A5ADE8 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s index dc210411b1..11b117665a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s @@ -42,7 +42,7 @@ glabel EnIceHono_Draw /* 00EBC 80A73EAC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00EC0 80A73EB0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00EC4 80A73EB4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00EC8 80A73EB8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00EC8 80A73EB8 0C0253D0 */ jal Gfx_TwoTexScroll /* 00ECC 80A73EBC AFA20058 */ sw $v0, 0x0058($sp) /* 00ED0 80A73EC0 8FA30058 */ lw $v1, 0x0058($sp) /* 00ED4 80A73EC4 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8A0.s index 0deb3b2a16..06d303d4d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8A0.s @@ -4,7 +4,7 @@ glabel func_80A7F8A0 /* 01448 80A7F8A8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0144C 80A7F8AC AFBF0014 */ sw $ra, 0x0014($sp) /* 01450 80A7F8B0 3C050501 */ lui $a1, 0x0501 ## $a1 = 05010000 -/* 01454 80A7F8B4 0C00D498 */ jal Draw_DListOpa +/* 01454 80A7F8B4 0C00D498 */ jal Gfx_DrawDListOpa /* 01458 80A7F8B8 24A5A880 */ addiu $a1, $a1, 0xA880 ## $a1 = 0500A880 /* 0145C 80A7F8BC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C164.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C164.s index 8ff943d32c..70394704a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C164.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C164.s @@ -8,7 +8,7 @@ glabel func_80A9C164 /* 011DC 80A9C17C 11E00006 */ beq $t7, $zero, .L80A9C198 /* 011E0 80A9C180 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 011E4 80A9C184 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 011E8 80A9C188 0C00D498 */ jal Draw_DListOpa +/* 011E8 80A9C188 0C00D498 */ jal Gfx_DrawDListOpa /* 011EC 80A9C18C 24A502E0 */ addiu $a1, $a1, 0x02E0 ## $a1 = 060002E0 /* 011F0 80A9C190 1000000A */ beq $zero, $zero, .L80A9C1BC @@ -20,7 +20,7 @@ glabel func_80A9C164 /* 01204 80A9C1A4 33190003 */ andi $t9, $t8, 0x0003 ## $t9 = 00000000 /* 01208 80A9C1A8 00194080 */ sll $t0, $t9, 2 /* 0120C 80A9C1AC 00A82821 */ addu $a1, $a1, $t0 -/* 01210 80A9C1B0 0C00D498 */ jal Draw_DListOpa +/* 01210 80A9C1B0 0C00D498 */ jal Gfx_DrawDListOpa /* 01214 80A9C1B4 8CA5C294 */ lw $a1, %lo(D_80A9C294)($a1) /* 01218 80A9C1B8 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Draw.s index 6d2467d289..5421d9843b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Draw.s @@ -59,7 +59,7 @@ glabel EnLight_Draw /* 00A50 80A9E590 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00A54 80A9E594 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00A58 80A9E598 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00A5C 80A9E59C 0C0253D0 */ jal Draw_TwoTexScroll +/* 00A5C 80A9E59C 0C0253D0 */ jal Gfx_TwoTexScroll /* 00A60 80A9E5A0 AFA20068 */ sw $v0, 0x0068($sp) /* 00A64 80A9E5A4 8FA30068 */ lw $v1, 0x0068($sp) /* 00A68 80A9E5A8 8FA80084 */ lw $t0, 0x0084($sp) @@ -127,7 +127,7 @@ glabel EnLight_Draw /* 00B5C 80A9E69C AFAF001C */ sw $t7, 0x001C($sp) /* 00B60 80A9E6A0 AFB90024 */ sw $t9, 0x0024($sp) /* 00B64 80A9E6A4 AFAC0028 */ sw $t4, 0x0028($sp) -/* 00B68 80A9E6A8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00B68 80A9E6A8 0C0253D0 */ jal Gfx_TwoTexScroll /* 00B6C 80A9E6AC AFA2005C */ sw $v0, 0x005C($sp) /* 00B70 80A9E6B0 8FA8005C */ lw $t0, 0x005C($sp) /* 00B74 80A9E6B4 3C0A0500 */ lui $t2, 0x0500 ## $t2 = 05000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s index 06a285efa1..7d2931c2d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s @@ -82,7 +82,7 @@ glabel EnMThunder_Draw /* 00E44 80A9FE24 AFA20080 */ sw $v0, 0x0080($sp) /* 00E48 80A9FE28 31EE00FF */ andi $t6, $t7, 0x00FF ## $t6 = 00000000 /* 00E4C 80A9FE2C 010EC023 */ subu $t8, $t0, $t6 -/* 00E50 80A9FE30 0C0253D0 */ jal Draw_TwoTexScroll +/* 00E50 80A9FE30 0C0253D0 */ jal Gfx_TwoTexScroll /* 00E54 80A9FE34 AFB8001C */ sw $t8, 0x001C($sp) /* 00E58 80A9FE38 8FA30080 */ lw $v1, 0x0080($sp) /* 00E5C 80A9FE3C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -446,7 +446,7 @@ glabel EnMThunder_Draw /* 013B0 80AA0390 AFAD0020 */ sw $t5, 0x0020($sp) /* 013B4 80AA0394 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 013B8 80AA0398 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 013BC 80AA039C 0C0253D0 */ jal Draw_TwoTexScroll +/* 013BC 80AA039C 0C0253D0 */ jal Gfx_TwoTexScroll /* 013C0 80AA03A0 AFA20050 */ sw $v0, 0x0050($sp) /* 013C4 80AA03A4 8FA80050 */ lw $t0, 0x0050($sp) /* 013C8 80AA03A8 3C0C0401 */ lui $t4, 0x0401 ## $t4 = 04010000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s index ebe54a27a0..1f8ef6cbd8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s @@ -27,7 +27,7 @@ glabel EnPoDesert_Draw /* 00BA8 80AD3858 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 00BAC 80AD385C 24060055 */ addiu $a2, $zero, 0x0055 ## $a2 = 00000055 /* 00BB0 80AD3860 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00BB4 80AD3864 0C025474 */ jal func_800951D0 +/* 00BB4 80AD3864 0C025474 */ jal Gfx_EnvColor /* 00BB8 80AD3868 AFA2004C */ sw $v0, 0x004C($sp) /* 00BBC 80AD386C 8FA3004C */ lw $v1, 0x004C($sp) /* 00BC0 80AD3870 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 @@ -43,7 +43,7 @@ glabel EnPoDesert_Draw /* 00BE8 80AD3898 92250220 */ lbu $a1, 0x0220($s1) ## 00000220 /* 00BEC 80AD389C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 00BF0 80AD38A0 AFA20048 */ sw $v0, 0x0048($sp) -/* 00BF4 80AD38A4 0C025474 */ jal func_800951D0 +/* 00BF4 80AD38A4 0C025474 */ jal Gfx_EnvColor /* 00BF8 80AD38A8 AFA90010 */ sw $t1, 0x0010($sp) /* 00BFC 80AD38AC 8FA30048 */ lw $v1, 0x0048($sp) /* 00C00 80AD38B0 3C0A80AD */ lui $t2, %hi(func_80AD3328) ## $t2 = 80AD0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s index cf00b5a998..ddcfeffbd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s @@ -40,7 +40,7 @@ glabel EnPoField_Draw /* 02E7C 80AD697C 91060007 */ lbu $a2, 0x0007($t0) ## 00000007 /* 02E80 80AD6980 91050006 */ lbu $a1, 0x0006($t0) ## 00000006 /* 02E84 80AD6984 AFAC0010 */ sw $t4, 0x0010($sp) -/* 02E88 80AD6988 0C025474 */ jal func_800951D0 +/* 02E88 80AD6988 0C025474 */ jal Gfx_EnvColor /* 02E8C 80AD698C AFA20060 */ sw $v0, 0x0060($sp) /* 02E90 80AD6990 8FA30060 */ lw $v1, 0x0060($sp) /* 02E94 80AD6994 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF @@ -63,7 +63,7 @@ glabel EnPoField_Draw /* 02ED4 80AD69D4 92250214 */ lbu $a1, 0x0214($s1) ## 00000214 /* 02ED8 80AD69D8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 02EDC 80AD69DC AFA2005C */ sw $v0, 0x005C($sp) -/* 02EE0 80AD69E0 0C025474 */ jal func_800951D0 +/* 02EE0 80AD69E0 0C025474 */ jal Gfx_EnvColor /* 02EE4 80AD69E4 AFAF0010 */ sw $t7, 0x0010($sp) /* 02EE8 80AD69E8 8FA3005C */ lw $v1, 0x005C($sp) /* 02EEC 80AD69EC 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -103,7 +103,7 @@ glabel EnPoField_Draw /* 02F70 80AD6A70 92250214 */ lbu $a1, 0x0214($s1) ## 00000214 /* 02F74 80AD6A74 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 02F78 80AD6A78 AFA20054 */ sw $v0, 0x0054($sp) -/* 02F7C 80AD6A7C 0C025474 */ jal func_800951D0 +/* 02F7C 80AD6A7C 0C025474 */ jal Gfx_EnvColor /* 02F80 80AD6A80 AFAE0010 */ sw $t6, 0x0010($sp) /* 02F84 80AD6A84 8FA30054 */ lw $v1, 0x0054($sp) /* 02F88 80AD6A88 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s index 02a08ef35a..17f04da5d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s @@ -47,7 +47,7 @@ glabel func_80AD5E8C /* 02440 80AD5F40 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02444 80AD5F44 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 02448 80AD5F48 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0244C 80AD5F4C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0244C 80AD5F4C 0C0253D0 */ jal Gfx_TwoTexScroll /* 02450 80AD5F50 AFA20068 */ sw $v0, 0x0068($sp) /* 02454 80AD5F54 8FA30068 */ lw $v1, 0x0068($sp) /* 02458 80AD5F58 3C0180AD */ lui $at, %hi(D_80AD7284) ## $at = 80AD0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s index 1335230382..75057f40c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s @@ -40,7 +40,7 @@ glabel func_80AD6C4C /* 031E4 80AD6CE4 91060007 */ lbu $a2, 0x0007($t0) ## 00000007 /* 031E8 80AD6CE8 91050006 */ lbu $a1, 0x0006($t0) ## 00000006 /* 031EC 80AD6CEC AFAC0010 */ sw $t4, 0x0010($sp) -/* 031F0 80AD6CF0 0C025474 */ jal func_800951D0 +/* 031F0 80AD6CF0 0C025474 */ jal Gfx_EnvColor /* 031F4 80AD6CF4 AFA2007C */ sw $v0, 0x007C($sp) /* 031F8 80AD6CF8 8FA3007C */ lw $v1, 0x007C($sp) /* 031FC 80AD6CFC 240A00C8 */ addiu $t2, $zero, 0x00C8 ## $t2 = 000000C8 @@ -150,7 +150,7 @@ glabel func_80AD6C4C /* 03394 80AD6E94 AFA80094 */ sw $t0, 0x0094($sp) /* 03398 80AD6E98 00006012 */ mflo $t4 /* 0339C 80AD6E9C 318A01FF */ andi $t2, $t4, 0x01FF ## $t2 = 00000000 -/* 033A0 80AD6EA0 0C0253D0 */ jal Draw_TwoTexScroll +/* 033A0 80AD6EA0 0C0253D0 */ jal Gfx_TwoTexScroll /* 033A4 80AD6EA4 AFAA0020 */ sw $t2, 0x0020($sp) /* 033A8 80AD6EA8 8FA30068 */ lw $v1, 0x0068($sp) /* 033AC 80AD6EAC 8FA80094 */ lw $t0, 0x0094($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s index d467c63cec..c5f3175bbe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s @@ -171,7 +171,7 @@ glabel EnPoSisters_Draw /* 04348 80ADD2D8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0434C 80ADD2DC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 04350 80ADD2E0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 04354 80ADD2E4 0C0253D0 */ jal Draw_TwoTexScroll +/* 04354 80ADD2E4 0C0253D0 */ jal Gfx_TwoTexScroll /* 04358 80ADD2E8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 0435C 80ADD2EC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 04360 80ADD2F0 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s index a0839f9535..4de1c68009 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s @@ -56,7 +56,7 @@ glabel func_80AE1148 /* 034C4 80AE1214 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 034C8 80AE1218 AFA20074 */ sw $v0, 0x0074($sp) /* 034CC 80AE121C AFA8008C */ sw $t0, 0x008C($sp) -/* 034D0 80AE1220 0C025474 */ jal func_800951D0 +/* 034D0 80AE1220 0C025474 */ jal Gfx_EnvColor /* 034D4 80AE1224 AFAE0010 */ sw $t6, 0x0010($sp) /* 034D8 80AE1228 8FA30074 */ lw $v1, 0x0074($sp) /* 034DC 80AE122C 8FA8008C */ lw $t0, 0x008C($sp) @@ -76,7 +76,7 @@ glabel func_80AE1148 /* 03514 80AE1264 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 03518 80AE1268 AFA8008C */ sw $t0, 0x008C($sp) /* 0351C 80AE126C AFA20070 */ sw $v0, 0x0070($sp) -/* 03520 80AE1270 0C025474 */ jal func_800951D0 +/* 03520 80AE1270 0C025474 */ jal Gfx_EnvColor /* 03524 80AE1274 AFAA0010 */ sw $t2, 0x0010($sp) /* 03528 80AE1278 8FA30070 */ lw $v1, 0x0070($sp) /* 0352C 80AE127C 8FA8008C */ lw $t0, 0x008C($sp) @@ -94,7 +94,7 @@ glabel func_80AE1148 /* 0355C 80AE12AC 91050000 */ lbu $a1, 0x0000($t0) ## 00000000 /* 03560 80AE12B0 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 03564 80AE12B4 AFA2006C */ sw $v0, 0x006C($sp) -/* 03568 80AE12B8 0C025474 */ jal func_800951D0 +/* 03568 80AE12B8 0C025474 */ jal Gfx_EnvColor /* 0356C 80AE12BC AFAE0010 */ sw $t6, 0x0010($sp) /* 03570 80AE12C0 8FA3006C */ lw $v1, 0x006C($sp) /* 03574 80AE12C4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -145,7 +145,7 @@ glabel func_80AE1148 /* 03624 80AE1374 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 03628 80AE1378 AFA20064 */ sw $v0, 0x0064($sp) /* 0362C 80AE137C AFA8008C */ sw $t0, 0x008C($sp) -/* 03630 80AE1380 0C025474 */ jal func_800951D0 +/* 03630 80AE1380 0C025474 */ jal Gfx_EnvColor /* 03634 80AE1384 AFAA0010 */ sw $t2, 0x0010($sp) /* 03638 80AE1388 8FA30064 */ lw $v1, 0x0064($sp) /* 0363C 80AE138C 8FA8008C */ lw $t0, 0x008C($sp) @@ -165,7 +165,7 @@ glabel func_80AE1148 /* 03674 80AE13C4 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 03678 80AE13C8 AFA8008C */ sw $t0, 0x008C($sp) /* 0367C 80AE13CC AFA20060 */ sw $v0, 0x0060($sp) -/* 03680 80AE13D0 0C025474 */ jal func_800951D0 +/* 03680 80AE13D0 0C025474 */ jal Gfx_EnvColor /* 03684 80AE13D4 AFAF0010 */ sw $t7, 0x0010($sp) /* 03688 80AE13D8 8FA30060 */ lw $v1, 0x0060($sp) /* 0368C 80AE13DC 8FA8008C */ lw $t0, 0x008C($sp) @@ -183,7 +183,7 @@ glabel func_80AE1148 /* 036BC 80AE140C 91050000 */ lbu $a1, 0x0000($t0) ## 00000000 /* 036C0 80AE1410 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 /* 036C4 80AE1414 AFA2005C */ sw $v0, 0x005C($sp) -/* 036C8 80AE1418 0C025474 */ jal func_800951D0 +/* 036C8 80AE1418 0C025474 */ jal Gfx_EnvColor /* 036CC 80AE141C AFAB0010 */ sw $t3, 0x0010($sp) /* 036D0 80AE1420 8FA3005C */ lw $v1, 0x005C($sp) /* 036D4 80AE1424 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s index 70b74e59ea..2efd1ffc41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s @@ -165,7 +165,7 @@ glabel func_80AE1654 /* 03B84 80AE18D4 AFA20058 */ sw $v0, 0x0058($sp) /* 03B88 80AE18D8 00007812 */ mflo $t7 /* 03B8C 80AE18DC 31F801FF */ andi $t8, $t7, 0x01FF ## $t8 = 00000000 -/* 03B90 80AE18E0 0C0253D0 */ jal Draw_TwoTexScroll +/* 03B90 80AE18E0 0C0253D0 */ jal Gfx_TwoTexScroll /* 03B94 80AE18E4 AFB80020 */ sw $t8, 0x0020($sp) /* 03B98 80AE18E8 8FA30058 */ lw $v1, 0x0058($sp) /* 03B9C 80AE18EC 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s index c223ed93c0..46299baf3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s @@ -64,7 +64,7 @@ glabel EnRr_Draw /* 01E88 80AEA2C8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01E8C 80AEA2CC 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 /* 01E90 80AEA2D0 3006007F */ andi $a2, $zero, 0x007F ## $a2 = 00000000 -/* 01E94 80AEA2D4 0C0253D0 */ jal Draw_TwoTexScroll +/* 01E94 80AEA2D4 0C0253D0 */ jal Gfx_TwoTexScroll /* 01E98 80AEA2D8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 01E9C 80AEA2DC 0C034213 */ jal Matrix_Push /* 01EA0 80AEA2E0 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Draw.s index db329c3b3b..8fe29c8986 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Draw.s @@ -73,7 +73,7 @@ glabel EnSiofuki_Draw /* 00B34 80AFC6B4 AFA70020 */ sw $a3, 0x0020($sp) /* 00B38 80AFC6B8 AFAF0010 */ sw $t7, 0x0010($sp) /* 00B3C 80AFC6BC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00B40 80AFC6C0 0C0253D0 */ jal Draw_TwoTexScroll +/* 00B40 80AFC6C0 0C0253D0 */ jal Gfx_TwoTexScroll /* 00B44 80AFC6C4 AFA20054 */ sw $v0, 0x0054($sp) /* 00B48 80AFC6C8 8FA30054 */ lw $v1, 0x0054($sp) /* 00B4C 80AFC6CC 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Draw.s index 370363228b..922fae8bd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Draw.s @@ -60,7 +60,7 @@ glabel EnStream_Draw /* 00494 80B0BC34 AFA3001C */ sw $v1, 0x001C($sp) /* 00498 80B0BC38 AFAB0010 */ sw $t3, 0x0010($sp) /* 0049C 80B0BC3C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 004A0 80B0BC40 0C0253D0 */ jal Draw_TwoTexScroll +/* 004A0 80B0BC40 0C0253D0 */ jal Gfx_TwoTexScroll /* 004A4 80B0BC44 AFA2004C */ sw $v0, 0x004C($sp) /* 004A8 80B0BC48 8FA8004C */ lw $t0, 0x004C($sp) /* 004AC 80B0BC4C 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s index 1b7ac1b25c..05c97a1d25 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s @@ -44,7 +44,7 @@ glabel func_80B0EDB8 /* 030AC 80B0EE5C 000B6403 */ sra $t4, $t3, 16 /* 030B0 80B0EE60 AFAC0018 */ sw $t4, 0x0018($sp) /* 030B4 80B0EE64 AFA00014 */ sw $zero, 0x0014($sp) -/* 030B8 80B0EE68 0C024DC2 */ jal func_80093708 +/* 030B8 80B0EE68 0C024DC2 */ jal Gfx_SetFog2 /* 030BC 80B0EE6C AFA80010 */ sw $t0, 0x0010($sp) /* 030C0 80B0EE70 8FAD0040 */ lw $t5, 0x0040($sp) /* 030C4 80B0EE74 3C0680B1 */ lui $a2, %hi(D_80B0F1D0) ## $a2 = 80B10000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Draw.s index 6019e6e802..0cddd5155b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Draw.s @@ -6,7 +6,7 @@ glabel EnTrap_Draw /* 01180 80B257E0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01184 80B257E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01188 80B257E8 24A51400 */ addiu $a1, $a1, 0x1400 ## $a1 = 06001400 -/* 0118C 80B257EC 0C00D498 */ jal Draw_DListOpa +/* 0118C 80B257EC 0C00D498 */ jal Gfx_DrawDListOpa /* 01190 80B257F0 8FA4001C */ lw $a0, 0x001C($sp) /* 01194 80B257F4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s index 237b379f2b..e05ed983f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s @@ -35,7 +35,7 @@ glabel EnVali_Draw /* 020EC 80B2879C 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 /* 020F0 80B287A0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 020F4 80B287A4 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 020F8 80B287A8 0C0253A7 */ jal Draw_TexScroll +/* 020F8 80B287A8 0C0253A7 */ jal Gfx_TexScroll /* 020FC 80B287AC AFA20048 */ sw $v0, 0x0048($sp) /* 02100 80B287B0 8FA30048 */ lw $v1, 0x0048($sp) /* 02104 80B287B4 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s index c1d0079043..95ee51fb8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s @@ -153,7 +153,7 @@ glabel func_80B2C8AC /* 028F0 80B2CAF0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 028F4 80B2CAF4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 028F8 80B2CAF8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 028FC 80B2CAFC 0C0253D0 */ jal Draw_TwoTexScroll +/* 028FC 80B2CAFC 0C0253D0 */ jal Gfx_TwoTexScroll /* 02900 80B2CB00 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 02904 80B2CB04 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 02908 80B2CB08 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s index a9f7c12b2f..df5d2f393b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s @@ -82,7 +82,7 @@ glabel EnWood02_Draw /* 00DCC 80B3BD3C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00DD0 80B3BD40 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 00DD4 80B3BD44 8FA40064 */ lw $a0, 0x0064($sp) -/* 00DD8 80B3BD48 0C00D498 */ jal Draw_DListOpa +/* 00DD8 80B3BD48 0C00D498 */ jal Gfx_DrawDListOpa /* 00DDC 80B3BD4C 24A50700 */ addiu $a1, $a1, 0x0700 ## $a1 = 06000700 /* 00DE0 80B3BD50 10000058 */ beq $zero, $zero, .L80B3BEB4 @@ -102,7 +102,7 @@ glabel EnWood02_Draw /* 00E14 80B3BD84 8CA5BF54 */ lw $a1, %lo(D_80B3BF54)($a1) /* 00E18 80B3BD88 A3A60053 */ sb $a2, 0x0053($sp) /* 00E1C 80B3BD8C A3A70052 */ sb $a3, 0x0052($sp) -/* 00E20 80B3BD90 0C00D498 */ jal Draw_DListOpa +/* 00E20 80B3BD90 0C00D498 */ jal Gfx_DrawDListOpa /* 00E24 80B3BD94 A3A80051 */ sb $t0, 0x0051($sp) /* 00E28 80B3BD98 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Draw.s index b5467f8c6d..493854cc36 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Draw.s @@ -33,7 +33,7 @@ glabel EnfHG_Draw /* 02560 80B64F20 AFA90018 */ sw $t1, 0x0018($sp) /* 02564 80B64F24 AFA80014 */ sw $t0, 0x0014($sp) /* 02568 80B64F28 AFA00010 */ sw $zero, 0x0010($sp) -/* 0256C 80B64F2C 0C024CDC */ jal func_80093370 +/* 0256C 80B64F2C 0C024CDC */ jal Gfx_SetFog /* 02570 80B64F30 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 02574 80B64F34 10000076 */ beq $zero, $zero, .L80B65110 /* 02578 80B64F38 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 @@ -162,7 +162,7 @@ glabel EnfHG_Draw /* 02738 80B650F8 44195000 */ mfc1 $t9, $f10 /* 0273C 80B650FC 00000000 */ nop /* 02740 80B65100 272803E8 */ addiu $t0, $t9, 0x03E8 ## $t0 = 000003E8 -/* 02744 80B65104 0C024CDC */ jal func_80093370 +/* 02744 80B65104 0C024CDC */ jal Gfx_SetFog /* 02748 80B65108 AFA80018 */ sw $t0, 0x0018($sp) /* 0274C 80B6510C AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 .L80B65110: diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s index 83f0c1687c..d7caa85ec4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s @@ -255,7 +255,7 @@ glabel func_80B6B674 /* 020A8 80B6BA48 AFA00020 */ sw $zero, 0x0020($sp) /* 020AC 80B6BA4C AFA0001C */ sw $zero, 0x001C($sp) /* 020B0 80B6BA50 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 020B4 80B6BA54 0C0253D0 */ jal Draw_TwoTexScroll +/* 020B4 80B6BA54 0C0253D0 */ jal Gfx_TwoTexScroll /* 020B8 80B6BA58 AFA200D4 */ sw $v0, 0x00D4($sp) /* 020BC 80B6BA5C 8FA800D4 */ lw $t0, 0x00D4($sp) /* 020C0 80B6BA60 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -385,7 +385,7 @@ glabel func_80B6B674 /* 0229C 80B6BC3C 16800016 */ bne $s4, $zero, .L80B6BC98 /* 022A0 80B6BC40 26523760 */ addiu $s2, $s2, 0x3760 ## $s2 = 06003760 /* 022A4 80B6BC44 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 022A8 80B6BC48 0C024DDD */ jal func_80093774 +/* 022A8 80B6BC48 0C024DDD */ jal Gfx_CallSetupDL /* 022AC 80B6BC4C 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 022B0 80B6BC50 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 022B4 80B6BC54 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s index 96f13e4397..2562720158 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s @@ -38,7 +38,7 @@ glabel func_80B6C134 /* 02824 80B6C1C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02828 80B6C1C8 AFA20054 */ sw $v0, 0x0054($sp) /* 0282C 80B6C1CC 00603025 */ or $a2, $v1, $zero ## $a2 = 00010000 -/* 02830 80B6C1D0 0C0253D0 */ jal Draw_TwoTexScroll +/* 02830 80B6C1D0 0C0253D0 */ jal Gfx_TwoTexScroll /* 02834 80B6C1D4 000338C0 */ sll $a3, $v1, 3 /* 02838 80B6C1D8 8FA80054 */ lw $t0, 0x0054($sp) /* 0283C 80B6C1DC 3C18C3E1 */ lui $t8, 0xC3E1 ## $t8 = C3E10000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s index e0fcca3c39..1b9ba20820 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s @@ -269,7 +269,7 @@ glabel func_80B6D688 /* 040F8 80B6DA98 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 .L80B6DA9C: /* 040FC 80B6DA9C 8E2402D0 */ lw $a0, 0x02D0($s1) ## 000002D0 -/* 04100 80B6DAA0 0C024DDD */ jal func_80093774 +/* 04100 80B6DAA0 0C024DDD */ jal Gfx_CallSetupDL /* 04104 80B6DAA4 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 04108 80B6DAA8 AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0 /* 0410C 80B6DAAC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B87A18.s b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B87A18.s index 76a3f4a7ec..6122827023 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B87A18.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B87A18.s @@ -149,7 +149,7 @@ glabel func_80B87A18 /* 00884 80B87C54 AFAF0014 */ sw $t7, 0x0014($sp) /* 00888 80B87C58 AFAE0010 */ sw $t6, 0x0010($sp) /* 0088C 80B87C5C 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 00890 80B87C60 0C0253D0 */ jal Draw_TwoTexScroll +/* 00890 80B87C60 0C0253D0 */ jal Gfx_TwoTexScroll /* 00894 80B87C64 00033040 */ sll $a2, $v1, 1 /* 00898 80B87C68 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0089C 80B87C6C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Draw.s index 8e978803e9..c316563034 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Draw.s @@ -338,7 +338,7 @@ glabel MagicFire_Draw /* 00A2C 80B8979C 310601FF */ andi $a2, $t0, 0x01FF ## $a2 = 00000000 /* 00A30 80B897A0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00A34 80B897A4 AFA300A4 */ sw $v1, 0x00A4($sp) -/* 00A38 80B897A8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00A38 80B897A8 0C0253D0 */ jal Gfx_TwoTexScroll /* 00A3C 80B897AC AFA20040 */ sw $v0, 0x0040($sp) /* 00A40 80B897B0 8FA90040 */ lw $t1, 0x0040($sp) /* 00A44 80B897B4 8FA300A4 */ lw $v1, 0x00A4($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s index 6b24aaa568..b50ef7c4fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s @@ -18,7 +18,7 @@ glabel MagicWind_Draw /* 006EC 80B8B7EC 24050019 */ addiu $a1, $zero, 0x0019 ## $a1 = 00000019 /* 006F0 80B8B7F0 11F9000E */ beq $t7, $t9, .L80B8B82C /* 006F4 80B8B7F4 00000000 */ nop -/* 006F8 80B8B7F8 0C024DDD */ jal func_80093774 +/* 006F8 80B8B7F8 0C024DDD */ jal Gfx_CallSetupDL /* 006FC 80B8B7FC 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 00700 80B8B800 8FA40050 */ lw $a0, 0x0050($sp) /* 00704 80B8B804 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s index 726c7ea48a..0226ba8976 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s @@ -49,7 +49,7 @@ glabel func_80B8B5F4 /* 005B0 80B8B6B0 AFB80010 */ sw $t8, 0x0010($sp) /* 005B4 80B8B6B4 AFB80024 */ sw $t8, 0x0024($sp) /* 005B8 80B8B6B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 005BC 80B8B6BC 0C0253D0 */ jal Draw_TwoTexScroll +/* 005BC 80B8B6BC 0C0253D0 */ jal Gfx_TwoTexScroll /* 005C0 80B8B6C0 AFA3004C */ sw $v1, 0x004C($sp) /* 005C4 80B8B6C4 8FAA004C */ lw $t2, 0x004C($sp) /* 005C8 80B8B6C8 1000002D */ beq $zero, $zero, .L80B8B780 @@ -95,7 +95,7 @@ glabel func_80B8B5F4 /* 00664 80B8B764 AFAD0028 */ sw $t5, 0x0028($sp) /* 00668 80B8B768 AFAE001C */ sw $t6, 0x001C($sp) /* 0066C 80B8B76C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00670 80B8B770 0C0253D0 */ jal Draw_TwoTexScroll +/* 00670 80B8B770 0C0253D0 */ jal Gfx_TwoTexScroll /* 00674 80B8B774 AFA30048 */ sw $v1, 0x0048($sp) /* 00678 80B8B778 8FA80048 */ lw $t0, 0x0048($sp) /* 0067C 80B8B77C AD020004 */ sw $v0, 0x0004($t0) ## 00000004 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s index 0f71634c6d..a10b4c80d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s @@ -9,7 +9,7 @@ glabel ObjBean_Draw /* 0232C 80B90DAC 11C00006 */ beq $t6, $zero, .L80B90DC8 /* 02330 80B90DB0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02334 80B90DB4 24A50090 */ addiu $a1, $a1, 0x0090 ## $a1 = 06000090 -/* 02338 80B90DB8 0C00D498 */ jal Draw_DListOpa +/* 02338 80B90DB8 0C00D498 */ jal Gfx_DrawDListOpa /* 0233C 80B90DBC AFA60018 */ sw $a2, 0x0018($sp) /* 02340 80B90DC0 8FA60018 */ lw $a2, 0x0018($sp) @@ -20,7 +20,7 @@ glabel ObjBean_Draw /* 02350 80B90DD0 8FA4001C */ lw $a0, 0x001C($sp) /* 02354 80B90DD4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02358 80B90DD8 24A503F0 */ addiu $a1, $a1, 0x03F0 ## $a1 = 060003F0 -/* 0235C 80B90DDC 0C00D498 */ jal Draw_DListOpa +/* 0235C 80B90DDC 0C00D498 */ jal Gfx_DrawDListOpa /* 02360 80B90DE0 AFA60018 */ sw $a2, 0x0018($sp) /* 02364 80B90DE4 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s index a20f5b7b45..103e3addc7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s @@ -27,7 +27,7 @@ glabel func_80B90C7C /* 02260 80B90CE0 46006386 */ mov.s $f14, $f12 /* 02264 80B90CE4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02268 80B90CE8 24A50650 */ addiu $a1, $a1, 0x0650 ## $a1 = 06000650 -/* 0226C 80B90CEC 0C00D498 */ jal Draw_DListOpa +/* 0226C 80B90CEC 0C00D498 */ jal Gfx_DrawDListOpa /* 02270 80B90CF0 8FA4001C */ lw $a0, 0x001C($sp) /* 02274 80B90CF4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s index df9b47cc88..b95ac3381a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s @@ -28,7 +28,7 @@ glabel func_80B90D04 /* 022EC 80B90D6C C48E01D4 */ lwc1 $f14, 0x01D4($a0) ## 000001D4 /* 022F0 80B90D70 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 022F4 80B90D74 24A501B0 */ addiu $a1, $a1, 0x01B0 ## $a1 = 060001B0 -/* 022F8 80B90D78 0C00D498 */ jal Draw_DListOpa +/* 022F8 80B90D78 0C00D498 */ jal Gfx_DrawDListOpa /* 022FC 80B90D7C 8FA4001C */ lw $a0, 0x001C($sp) /* 02300 80B90D80 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s index 0fa3f4887b..7ad636d6bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s @@ -61,7 +61,7 @@ glabel ObjDekujr_Draw /* 00520 80B92940 AFA00020 */ sw $zero, 0x0020($sp) /* 00524 80B92944 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00528 80B92948 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0052C 80B9294C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0052C 80B9294C 0C0253D0 */ jal Gfx_TwoTexScroll /* 00530 80B92950 AFA2004C */ sw $v0, 0x004C($sp) /* 00534 80B92954 8FA3004C */ lw $v1, 0x004C($sp) /* 00538 80B92958 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Draw.s index aa673af80e..21d50176d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Draw.s @@ -8,7 +8,7 @@ glabel ObjHana_Draw /* 001C8 80B93A28 31CF0003 */ andi $t7, $t6, 0x0003 ## $t7 = 00000000 /* 001CC 80B93A2C 000FC100 */ sll $t8, $t7, 4 /* 001D0 80B93A30 00B82821 */ addu $a1, $a1, $t8 -/* 001D4 80B93A34 0C00D498 */ jal Draw_DListOpa +/* 001D4 80B93A34 0C00D498 */ jal Gfx_DrawDListOpa /* 001D8 80B93A38 8CA53AA4 */ lw $a1, %lo(D_80B93AA4)($a1) /* 001DC 80B93A3C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s index 6b11cee4be..10fb6ffa8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s @@ -64,7 +64,7 @@ glabel ObjIcePoly_Draw /* 00814 80B94A74 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00818 80B94A78 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0081C 80B94A7C AFA2004C */ sw $v0, 0x004C($sp) -/* 00820 80B94A80 0C0253D0 */ jal Draw_TwoTexScroll +/* 00820 80B94A80 0C0253D0 */ jal Gfx_TwoTexScroll /* 00824 80B94A84 306700FF */ andi $a3, $v1, 0x00FF ## $a3 = 00000000 /* 00828 80B94A88 8FA8004C */ lw $t0, 0x004C($sp) /* 0082C 80B94A8C 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Draw.s index 8c9d33f4b6..3ac285bced 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Draw.s @@ -4,7 +4,7 @@ glabel ObjKibako_Draw /* 00B60 80B95800 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00B64 80B95804 AFBF0014 */ sw $ra, 0x0014($sp) /* 00B68 80B95808 3C050500 */ lui $a1, 0x0500 ## $a1 = 05000000 -/* 00B6C 80B9580C 0C00D498 */ jal Draw_DListOpa +/* 00B6C 80B9580C 0C00D498 */ jal Gfx_DrawDListOpa /* 00B70 80B95810 24A55290 */ addiu $a1, $a1, 0x5290 ## $a1 = 05005290 /* 00B74 80B95814 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s index 502d41b750..b9c5c669c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s @@ -4,7 +4,7 @@ glabel ObjKibako2_Draw /* 005B4 80B95F84 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 005B8 80B95F88 AFBF0014 */ sw $ra, 0x0014($sp) /* 005BC 80B95F8C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 005C0 80B95F90 0C00D498 */ jal Draw_DListOpa +/* 005C0 80B95F90 0C00D498 */ jal Gfx_DrawDListOpa /* 005C4 80B95F94 24A50960 */ addiu $a1, $a1, 0x0960 ## $a1 = 06000960 /* 005C8 80B95F98 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s index 3fdadd8603..86f55b6f4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s @@ -4,7 +4,7 @@ glabel ObjLift_Draw /* 008AC 80B9697C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 008B0 80B96980 AFBF0014 */ sw $ra, 0x0014($sp) /* 008B4 80B96984 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 008B8 80B96988 0C00D498 */ jal Draw_DListOpa +/* 008B8 80B96988 0C00D498 */ jal Gfx_DrawDListOpa /* 008BC 80B9698C 24A50140 */ addiu $a1, $a1, 0x0140 ## $a1 = 06000140 /* 008C0 80B96990 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E748.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E748.s index f49d4264cd..fad49d7a6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E748.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E748.s @@ -9,7 +9,7 @@ glabel func_80B9E748 /* 01554 80B9E764 31F80007 */ andi $t8, $t7, 0x0007 ## $t8 = 00000000 /* 01558 80B9E768 0018C880 */ sll $t9, $t8, 2 /* 0155C 80B9E76C 00B92821 */ addu $a1, $a1, $t9 -/* 01560 80B9E770 0C00D498 */ jal Draw_DListOpa +/* 01560 80B9E770 0C00D498 */ jal Gfx_DrawDListOpa /* 01564 80B9E774 8CA5ED88 */ lw $a1, %lo(D_80B9ED88)($a1) /* 01568 80B9E778 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E788.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E788.s index 235e6d4151..f2b867b73a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E788.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E788.s @@ -4,7 +4,7 @@ glabel func_80B9E788 /* 01580 80B9E790 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 01584 80B9E794 AFBF0014 */ sw $ra, 0x0014($sp) /* 01588 80B9E798 3C050500 */ lui $a1, 0x0500 ## $a1 = 05000000 -/* 0158C 80B9E79C 0C00D498 */ jal Draw_DListOpa +/* 0158C 80B9E79C 0C00D498 */ jal Gfx_DrawDListOpa /* 01590 80B9E7A0 24A55AD0 */ addiu $a1, $a1, 0x5AD0 ## $a1 = 05005AD0 /* 01594 80B9E7A4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s index 357f354d68..fafc1e6c5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s @@ -148,7 +148,7 @@ glabel func_80B9E904 /* 01938 80B9EB48 AFB90028 */ sw $t9, 0x0028($sp) /* 0193C 80B9EB4C AFAC0024 */ sw $t4, 0x0024($sp) /* 01940 80B9EB50 AFA20054 */ sw $v0, 0x0054($sp) -/* 01944 80B9EB54 0C0253D0 */ jal Draw_TwoTexScroll +/* 01944 80B9EB54 0C0253D0 */ jal Gfx_TwoTexScroll /* 01948 80B9EB58 AFAA0020 */ sw $t2, 0x0020($sp) /* 0194C 80B9EB5C 8FA30054 */ lw $v1, 0x0054($sp) /* 01950 80B9EB60 8FA80074 */ lw $t0, 0x0074($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s index e385c5fa53..eb6a59c79e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s @@ -112,7 +112,7 @@ glabel ObjSyokudai_Draw /* 009E4 80B9FC94 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 009E8 80B9FC98 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 009EC 80B9FC9C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 009F0 80B9FCA0 0C0253D0 */ jal Draw_TwoTexScroll +/* 009F0 80B9FCA0 0C0253D0 */ jal Gfx_TwoTexScroll /* 009F4 80B9FCA4 AFA20060 */ sw $v0, 0x0060($sp) /* 009F8 80B9FCA8 8FA30060 */ lw $v1, 0x0060($sp) /* 009FC 80B9FCAC 3C0AFA00 */ lui $t2, 0xFA00 ## $t2 = FA000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1B0C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1B0C.s index 43bf345979..b7a4c0825e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1B0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1B0C.s @@ -9,7 +9,7 @@ glabel func_80BA1B0C /* 00DC8 80BA1B28 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 /* 00DCC 80BA1B2C 0018C880 */ sll $t9, $t8, 2 /* 00DD0 80BA1B30 00B92821 */ addu $a1, $a1, $t9 -/* 00DD4 80BA1B34 0C00D498 */ jal Draw_DListOpa +/* 00DD4 80BA1B34 0C00D498 */ jal Gfx_DrawDListOpa /* 00DD8 80BA1B38 8CA51B84 */ lw $a1, %lo(D_80BA1B84)($a1) /* 00DDC 80BA1B3C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s index a104fb7f8a..fd18930c0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s @@ -43,7 +43,7 @@ glabel func_80BA3C94 /* 01298 80BA3D38 0C031AB1 */ jal func_800C6AC4 /* 0129C 80BA3D3C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 012A0 80BA3D40 8E4402D0 */ lw $a0, 0x02D0($s2) ## 000002D0 -/* 012A4 80BA3D44 0C024DDD */ jal func_80093774 +/* 012A4 80BA3D44 0C024DDD */ jal Gfx_CallSetupDL /* 012A8 80BA3D48 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 012AC 80BA3D4C 3C040405 */ lui $a0, 0x0405 ## $a0 = 04050000 /* 012B0 80BA3D50 2484C160 */ addiu $a0, $a0, 0xC160 ## $a0 = 0404C160 diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s index aad33c3197..e3883c6606 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s @@ -231,7 +231,7 @@ glabel func_80BA54AC /* 02D9C 80BA583C AFA70020 */ sw $a3, 0x0020($sp) /* 02DA0 80BA5840 AFA80010 */ sw $t0, 0x0010($sp) /* 02DA4 80BA5844 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02DA8 80BA5848 0C0253D0 */ jal Draw_TwoTexScroll +/* 02DA8 80BA5848 0C0253D0 */ jal Gfx_TwoTexScroll /* 02DAC 80BA584C 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 02DB0 80BA5850 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 02DB4 80BA5854 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Draw.s index 52430db71b..69324745d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Draw.s @@ -62,7 +62,7 @@ glabel OceffSpot_Draw /* 00764 80BA67D4 AFAD0010 */ sw $t5, 0x0010($sp) /* 00768 80BA67D8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0076C 80BA67DC AFA20048 */ sw $v0, 0x0048($sp) -/* 00770 80BA67E0 0C0253D0 */ jal Draw_TwoTexScroll +/* 00770 80BA67E0 0C0253D0 */ jal Gfx_TwoTexScroll /* 00774 80BA67E4 00083040 */ sll $a2, $t0, 1 /* 00778 80BA67E8 8FA30048 */ lw $v1, 0x0048($sp) /* 0077C 80BA67EC 3C0D80BA */ lui $t5, %hi(D_80BA6EA8) ## $t5 = 80BA0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Draw.s index 1747b1fc4f..fc7c51539f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Draw.s @@ -113,7 +113,7 @@ glabel OceffStorm_Draw /* 00710 80BA77F0 AFAC0010 */ sw $t4, 0x0010($sp) /* 00714 80BA77F4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00718 80BA77F8 AFA2004C */ sw $v0, 0x004C($sp) -/* 0071C 80BA77FC 0C0253D0 */ jal Draw_TwoTexScroll +/* 0071C 80BA77FC 0C0253D0 */ jal Gfx_TwoTexScroll /* 00720 80BA7800 000A3080 */ sll $a2, $t2, 2 /* 00724 80BA7804 8FA8004C */ lw $t0, 0x004C($sp) /* 00728 80BA7808 3C0E80BB */ lui $t6, %hi(D_80BA8B90) ## $t6 = 80BB0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7450.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7450.s index 9812c54faa..3e33e2d3c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7450.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7450.s @@ -83,7 +83,7 @@ glabel func_80BA7450 /* 004B4 80BA7594 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 004B8 80BA7598 AFA30074 */ sw $v1, 0x0074($sp) /* 004BC 80BA759C AFA2004C */ sw $v0, 0x004C($sp) -/* 004C0 80BA75A0 0C0253D0 */ jal Draw_TwoTexScroll +/* 004C0 80BA75A0 0C0253D0 */ jal Gfx_TwoTexScroll /* 004C4 80BA75A4 000A30C0 */ sll $a2, $t2, 3 /* 004C8 80BA75A8 8FA8004C */ lw $t0, 0x004C($sp) /* 004CC 80BA75AC 8FA30074 */ lw $v1, 0x0074($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Draw.s index 4e6b4edf40..b03542b2dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Draw.s @@ -242,7 +242,7 @@ glabel OceffWipe_Draw /* 004BC 80BA924C AFB80010 */ sw $t8, 0x0010($sp) /* 004C0 80BA9250 AFA70020 */ sw $a3, 0x0020($sp) /* 004C4 80BA9254 AFB90028 */ sw $t9, 0x0028($sp) -/* 004C8 80BA9258 0C0253D0 */ jal Draw_TwoTexScroll +/* 004C8 80BA9258 0C0253D0 */ jal Gfx_TwoTexScroll /* 004CC 80BA925C AFA20054 */ sw $v0, 0x0054($sp) /* 004D0 80BA9260 8FA30054 */ lw $v1, 0x0054($sp) /* 004D4 80BA9264 3C1880BB */ lui $t8, %hi(D_80BA99E8) ## $t8 = 80BB0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s index c49b405d27..8c62a32046 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s @@ -188,7 +188,7 @@ glabel OceffWipe2_Draw /* 003F0 80BA9FA0 AFAA0028 */ sw $t2, 0x0028($sp) /* 003F4 80BA9FA4 AFA00020 */ sw $zero, 0x0020($sp) /* 003F8 80BA9FA8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003FC 80BA9FAC 0C0253D0 */ jal Draw_TwoTexScroll +/* 003FC 80BA9FAC 0C0253D0 */ jal Gfx_TwoTexScroll /* 00400 80BA9FB0 AFA20054 */ sw $v0, 0x0054($sp) /* 00404 80BA9FB4 8FA30054 */ lw $v1, 0x0054($sp) /* 00408 80BA9FB8 3C0C80BB */ lui $t4, %hi(D_80BAB238) ## $t4 = 80BB0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s index 1745f26ef6..220c46dcc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s @@ -190,7 +190,7 @@ glabel OceffWipe3_Draw /* 003F8 80BAB7E8 00073880 */ sll $a3, $a3, 2 /* 003FC 80BAB7EC AFB80028 */ sw $t8, 0x0028($sp) /* 00400 80BAB7F0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00404 80BAB7F4 0C0253D0 */ jal Draw_TwoTexScroll +/* 00404 80BAB7F4 0C0253D0 */ jal Gfx_TwoTexScroll /* 00408 80BAB7F8 AFA20054 */ sw $v0, 0x0054($sp) /* 0040C 80BAB7FC 8FA30054 */ lw $v1, 0x0054($sp) /* 00410 80BAB800 3C0E80BB */ lui $t6, %hi(D_80BACA58) ## $t6 = 80BB0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s index 83227ee003..35839fb805 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s @@ -191,7 +191,7 @@ glabel OceffWipe4_Draw /* 003CC 80BACFDC AFAE0010 */ sw $t6, 0x0010($sp) /* 003D0 80BACFE0 AFA20054 */ sw $v0, 0x0054($sp) /* 003D4 80BACFE4 AFA90020 */ sw $t1, 0x0020($sp) -/* 003D8 80BACFE8 0C0253D0 */ jal Draw_TwoTexScroll +/* 003D8 80BACFE8 0C0253D0 */ jal Gfx_TwoTexScroll /* 003DC 80BACFEC 00093040 */ sll $a2, $t1, 1 /* 003E0 80BACFF0 8FA30054 */ lw $v1, 0x0054($sp) /* 003E4 80BACFF4 3C0D80BB */ lui $t5, %hi(D_80BADAF8) ## $t5 = 80BB0000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s index 9736fb7dd4..21cfae6b8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s @@ -274,7 +274,7 @@ glabel func_8084A0E8 /* 182FC 8084A50C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 18300 8084A510 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 18304 8084A514 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 18308 8084A518 0C0253D0 */ jal Draw_TwoTexScroll +/* 18308 8084A518 0C0253D0 */ jal Gfx_TwoTexScroll /* 1830C 8084A51C 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 18310 8084A520 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 18314 8084A524 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s index 8d9b1ca762..17f20e88c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s @@ -82,7 +82,7 @@ glabel func_8084A5C4 /* 184DC 8084A6EC 440C8000 */ mfc1 $t4, $f16 /* 184E0 8084A6F0 00000000 */ nop /* 184E4 8084A6F4 01AC7023 */ subu $t6, $t5, $t4 -/* 184E8 8084A6F8 0C024DC2 */ jal func_80093708 +/* 184E8 8084A6F8 0C024DC2 */ jal Gfx_SetFog2 /* 184EC 8084A6FC AFAE0018 */ sw $t6, 0x0018($sp) /* 184F0 8084A700 8FAF00A4 */ lw $t7, 0x00A4($sp) /* 184F4 8084A704 ADE202C0 */ sw $v0, 0x02C0($t7) ## 000002C0 @@ -309,7 +309,7 @@ glabel func_8084A5C4 /* 18844 8084AA54 AFA0001C */ sw $zero, 0x001C($sp) /* 18848 8084AA58 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 1884C 8084AA5C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 18850 8084AA60 0C0253D0 */ jal Draw_TwoTexScroll +/* 18850 8084AA60 0C0253D0 */ jal Gfx_TwoTexScroll /* 18854 8084AA64 AFA20064 */ sw $v0, 0x0064($sp) /* 18858 8084AA68 C7AC0068 */ lwc1 $f12, 0x0068($sp) /* 1885C 8084AA6C 8FA80064 */ lw $t0, 0x0064($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s index 609e3d32ab..ef29bea5f5 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s @@ -95,7 +95,7 @@ glabel func_809A2480 /* 00324 809A25F4 030A5821 */ addu $t3, $t8, $t2 /* 00328 809A25F8 01616021 */ addu $t4, $t3, $at /* 0032C 809A25FC AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 -/* 00330 809A2600 0C024DDD */ jal func_80093774 +/* 00330 809A2600 0C024DDD */ jal Gfx_CallSetupDL /* 00334 809A2604 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 00338 809A2608 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 /* 0033C 809A260C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s index 733bf8b92e..d1bc657dc9 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s @@ -171,7 +171,7 @@ glabel func_809A2D28 /* 00458 809A2FB8 AFAC0020 */ sw $t4, 0x0020($sp) /* 0045C 809A2FBC AFAE0028 */ sw $t6, 0x0028($sp) /* 00460 809A2FC0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00464 809A2FC4 0C0253D0 */ jal Draw_TwoTexScroll +/* 00464 809A2FC4 0C0253D0 */ jal Gfx_TwoTexScroll /* 00468 809A2FC8 AFA20058 */ sw $v0, 0x0058($sp) /* 0046C 809A2FCC 8FA30058 */ lw $v1, 0x0058($sp) /* 00470 809A2FD0 3C06809A */ lui $a2, %hi(D_809A3288) ## $a2 = 809A0000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s index 7a4a269296..65baa834b1 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s @@ -145,7 +145,7 @@ glabel func_809A35DC /* 004DC 809A380C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 004E0 809A3810 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 004E4 809A3814 AFA2005C */ sw $v0, 0x005C($sp) -/* 004E8 809A3818 0C0253D0 */ jal Draw_TwoTexScroll +/* 004E8 809A3818 0C0253D0 */ jal Gfx_TwoTexScroll /* 004EC 809A381C 310700FF */ andi $a3, $t0, 0x00FF ## $a3 = 00000000 /* 004F0 809A3820 8FA3005C */ lw $v1, 0x005C($sp) /* 004F4 809A3824 3C0AFA00 */ lui $t2, 0xFA00 ## $t2 = FA000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s index f67524f562..8cbdb723ab 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s @@ -114,7 +114,7 @@ glabel func_809A41DC /* 0027C 809A439C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00280 809A43A0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00284 809A43A4 AFA20050 */ sw $v0, 0x0050($sp) -/* 00288 809A43A8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00288 809A43A8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0028C 809A43AC 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 /* 00290 809A43B0 8FA80050 */ lw $t0, 0x0050($sp) /* 00294 809A43B4 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s index 42766ecff1..8331efd668 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s @@ -310,7 +310,7 @@ glabel func_809A5858 /* 005C0 809A5D00 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 005C4 809A5D04 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 005C8 809A5D08 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005CC 809A5D0C 0C0253D0 */ jal Draw_TwoTexScroll +/* 005CC 809A5D0C 0C0253D0 */ jal Gfx_TwoTexScroll /* 005D0 809A5D10 AFA20068 */ sw $v0, 0x0068($sp) /* 005D4 809A5D14 8FA30068 */ lw $v1, 0x0068($sp) /* 005D8 809A5D18 3C06809A */ lui $a2, %hi(D_809A5E10) ## $a2 = 809A0000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s index 06461d61ce..7060ac61d0 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s @@ -70,12 +70,12 @@ glabel func_809A6568 /* 002D8 809A6678 17000006 */ bne $t8, $zero, .L809A6694 /* 002DC 809A667C 00000000 */ nop /* 002E0 809A6680 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 002E4 809A6684 0C024DDD */ jal func_80093774 +/* 002E4 809A6684 0C024DDD */ jal Gfx_CallSetupDL /* 002E8 809A6688 2405003D */ addiu $a1, $zero, 0x003D ## $a1 = 0000003D /* 002EC 809A668C 10000004 */ beq $zero, $zero, .L809A66A0 /* 002F0 809A6690 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L809A6694: -/* 002F4 809A6694 0C024DDD */ jal func_80093774 +/* 002F4 809A6694 0C024DDD */ jal Gfx_CallSetupDL /* 002F8 809A6698 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 002FC 809A669C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L809A66A0: diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s index d2979cf187..3b476ec5f6 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s @@ -135,7 +135,7 @@ glabel func_809A8850 /* 0035C 809A8A5C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00360 809A8A60 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00364 809A8A64 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 00368 809A8A68 0C0253D0 */ jal Draw_TwoTexScroll +/* 00368 809A8A68 0C0253D0 */ jal Gfx_TwoTexScroll /* 0036C 809A8A6C 306700FF */ andi $a3, $v1, 0x00FF ## $a3 = 00000000 /* 00370 809A8A70 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 00374 809A8A74 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s index 14ae7d3240..16eb2c686a 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s @@ -122,7 +122,7 @@ glabel func_809A8D18 /* 00300 809A8EF0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00304 809A8EF4 AFA30050 */ sw $v1, 0x0050($sp) /* 00308 809A8EF8 00E23823 */ subu $a3, $a3, $v0 -/* 0030C 809A8EFC 0C0253D0 */ jal Draw_TwoTexScroll +/* 0030C 809A8EFC 0C0253D0 */ jal Gfx_TwoTexScroll /* 00310 809A8F00 00C23023 */ subu $a2, $a2, $v0 /* 00314 809A8F04 8FA80050 */ lw $t0, 0x0050($sp) /* 00318 809A8F08 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s index 48a21a5709..eccec35f7e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s @@ -68,7 +68,7 @@ glabel func_809A9280 /* 001D8 809A9388 AFA20060 */ sw $v0, 0x0060($sp) /* 001DC 809A938C 0000C012 */ mflo $t8 /* 001E0 809A9390 AFB80020 */ sw $t8, 0x0020($sp) -/* 001E4 809A9394 0C0253D0 */ jal Draw_TwoTexScroll +/* 001E4 809A9394 0C0253D0 */ jal Gfx_TwoTexScroll /* 001E8 809A9398 00000000 */ nop /* 001EC 809A939C 8FA30060 */ lw $v1, 0x0060($sp) /* 001F0 809A93A0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 diff --git a/data/z_rcp.data.s b/data/z_rcp.data.s deleted file mode 100644 index 6f209282db..0000000000 --- a/data/z_rcp.data.s +++ /dev/null @@ -1,173 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_80126280 - .incbin "baserom.z64", 0xB9D420, 0x60 - -glabel D_801262E0 - .incbin "baserom.z64", 0xB9D480, 0x60 - -glabel D_80126340 - .incbin "baserom.z64", 0xB9D4E0, 0x300 - -glabel D_80126640 - .incbin "baserom.z64", 0xB9D7E0, 0xF0 - -glabel D_80126730 - .incbin "baserom.z64", 0xB9D8D0, 0x30 - -glabel D_80126760 - .incbin "baserom.z64", 0xB9D900, 0x30 - -glabel D_80126790 - .incbin "baserom.z64", 0xB9D930, 0x30 - -glabel D_801267C0 - .incbin "baserom.z64", 0xB9D960, 0x90 - -glabel D_80126850 - .incbin "baserom.z64", 0xB9D9F0, 0x30 - -glabel D_80126880 - .incbin "baserom.z64", 0xB9DA20, 0x30 - -glabel D_801268B0 - .incbin "baserom.z64", 0xB9DA50, 0x30 - -glabel D_801268E0 - .incbin "baserom.z64", 0xB9DA80, 0x30 - -glabel D_80126910 - .incbin "baserom.z64", 0xB9DAB0, 0x30 - -glabel D_80126940 - .incbin "baserom.z64", 0xB9DAE0, 0x30 - -glabel D_80126970 - .incbin "baserom.z64", 0xB9DB10, 0x30 - -glabel D_801269A0 - .incbin "baserom.z64", 0xB9DB40, 0x30 - -glabel D_801269D0 - .incbin "baserom.z64", 0xB9DB70, 0x30 - -glabel D_80126A00 - .incbin "baserom.z64", 0xB9DBA0, 0x30 - -glabel D_80126A30 - .incbin "baserom.z64", 0xB9DBD0, 0x30 - -glabel D_80126A60 - .incbin "baserom.z64", 0xB9DC00, 0x30 - -glabel D_80126A90 - .incbin "baserom.z64", 0xB9DC30, 0x30 - -glabel D_80126AC0 - .incbin "baserom.z64", 0xB9DC60, 0x30 - -glabel D_80126AF0 - .incbin "baserom.z64", 0xB9DC90, 0x30 - -glabel D_80126B20 - .incbin "baserom.z64", 0xB9DCC0, 0x30 - -glabel D_80126B50 - .incbin "baserom.z64", 0xB9DCF0, 0x30 - -glabel D_80126B80 - .incbin "baserom.z64", 0xB9DD20, 0x30 - -glabel D_80126BB0 - .incbin "baserom.z64", 0xB9DD50, 0x30 - -glabel D_80126BE0 - .incbin "baserom.z64", 0xB9DD80, 0x30 - -glabel D_80126C10 - .incbin "baserom.z64", 0xB9DDB0, 0x30 - -glabel D_80126C40 - .incbin "baserom.z64", 0xB9DDE0, 0x30 - -glabel D_80126C70 - .incbin "baserom.z64", 0xB9DE10, 0x30 - -glabel D_80126CA0 - .incbin "baserom.z64", 0xB9DE40, 0x30 - -glabel D_80126CD0 - .incbin "baserom.z64", 0xB9DE70, 0x30 - -glabel D_80126D00 - .incbin "baserom.z64", 0xB9DEA0, 0x30 - -glabel D_80126D30 - .incbin "baserom.z64", 0xB9DED0, 0x30 - -glabel D_80126D60 - .incbin "baserom.z64", 0xB9DF00, 0x30 - -glabel D_80126D90 - .incbin "baserom.z64", 0xB9DF30, 0x30 - -glabel D_80126DC0 - .incbin "baserom.z64", 0xB9DF60, 0x30 - -glabel D_80126DF0 - .incbin "baserom.z64", 0xB9DF90, 0x90 - -glabel D_80126E80 - .incbin "baserom.z64", 0xB9E020, 0x30 - -glabel D_80126EB0 - .incbin "baserom.z64", 0xB9E050, 0x30 - -glabel D_80126EE0 - .incbin "baserom.z64", 0xB9E080, 0x30 - -glabel D_80126F10 - .incbin "baserom.z64", 0xB9E0B0, 0x30 - -glabel D_80126F40 - .incbin "baserom.z64", 0xB9E0E0, 0x10 - -glabel D_80126F50 - .incbin "baserom.z64", 0xB9E0F0, 0x20 - -glabel D_80126F70 - .incbin "baserom.z64", 0xB9E110, 0x18 - -glabel D_80126F88 - .incbin "baserom.z64", 0xB9E128, 0x18 - -glabel D_80126FA0 - .incbin "baserom.z64", 0xB9E140, 0x18 - -glabel D_80126FB8 - .incbin "baserom.z64", 0xB9E158, 0x18 - -glabel D_80126FD0 - .incbin "baserom.z64", 0xB9E170, 0x40 - -glabel D_80127010 - .incbin "baserom.z64", 0xB9E1B0, 0xC - -glabel D_8012701C - .incbin "baserom.z64", 0xB9E1BC, 0xC - -glabel D_80127028 - .incbin "baserom.z64", 0xB9E1C8, 0xC - -glabel D_80127034 - .incbin "baserom.z64", 0xB9E1D4, 0x64 - -glabel D_80127098 - .incbin "baserom.z64", 0xB9E238, 0x8 diff --git a/include/functions.h b/include/functions.h index b5262044f6..3875c325b1 100644 --- a/include/functions.h +++ b/include/functions.h @@ -403,8 +403,8 @@ void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_Lim SkelAnime_LimbAppendDlist2 unkFunc2, Actor* actor, s16 alpha); void func_80034EC0(SkelAnime* skelAnime, struct_80034EC0_Entry* arg1, s32 arg2); void Actor_Noop(Actor* actor, GlobalContext* globalCtx); -void Draw_DListOpa(GlobalContext* globalCtx, u32 dlist); -void Draw_DListXlu(GlobalContext* globalCtx, u32 dlist); +void Gfx_DrawDListOpa(GlobalContext* globalCtx, u32 dlist); +void Gfx_DrawDListXlu(GlobalContext* globalCtx, u32 dlist); Actor* Actor_FindNearby(GlobalContext* globalCtx, Actor* refActor, s16 actorId, u8 actorType, f32 range); s32 func_800354B4(GlobalContext* globalCtx, Actor* actor, f32 range, s16 arg3, s16 arg4, s16 arg5); void func_8003555C(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3); @@ -1078,42 +1078,43 @@ void Quake_Init(); s16 Quake_Add(Camera* cam, u32 callbackIdx); u32 Quake_RemoveFromIdx(s16 idx); s16 Quake_Calc(Camera* camera, UnkQuakeCalcStruct* camData); -// ? func_80093370(?); -// ? func_80093708(?); -// ? func_8009373C(?); -Gfx* func_80093774(Gfx* a0, u32 a1); -// ? func_800937C0(?); -// ? func_80093808(?); -// ? func_800938B4(?); -// ? func_8009398C(?); -// ? func_80093AD0(?); +Gfx* Gfx_SetFog(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f); +Gfx* Gfx_SetFogWithSync(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f); +Gfx* Gfx_SetFog2(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f); +Gfx* Gfx_CallSetupDL(Gfx* gfx, u32 i); +Gfx* func_800937C0(Gfx* gfx); +Gfx* func_80093808(Gfx* gfx); +void func_800938B4(GraphicsContext* gfxCtx); +void func_8009398C(GraphicsContext* gfxCtx); +void func_80093AD0(GraphicsContext* gfxCtx); void func_80093BA8(GraphicsContext* gfxCtx); -// ? func_80093C80(?); +void func_80093C80(GlobalContext* globalCtx); void func_80093D18(GraphicsContext* gfxCtx); void func_80093D84(GraphicsContext* gfxCtx); -// ? func_80093F34(?); -// ? func_80093F58(?); +Gfx* func_80093F34(Gfx* gfx); +Gfx* func_80093F58(Gfx* gfx); void func_80094044(GraphicsContext* gfxCtx); -// ? func_800940B0(?); -// ? func_800942F0(?); -// ? func_8009435C(?); -// ? func_800944A0(?); -// ? func_80094520(?); -// ? func_8009457C(?); -// ? func_800945A0(?); -// ? func_80094678(?); -Gfx* func_800946E4(Gfx* a0); -// ? func_800947AC(?); -// ? func_80094A14(?); -// ? func_80094C50(?); -// ? func_80094DB8(?); +void func_800940B0(GraphicsContext* gfxCtx); +void func_800942F0(GraphicsContext* gfxCtx); +void func_8009435C(GraphicsContext* gfxCtx); +Gfx* func_800944A0(Gfx* gfx); +void func_80094520(GraphicsContext* gfxCtx); +void func_8009457C(Gfx** gfxp); +void func_800945A0(GraphicsContext* gfxCtx); +void func_80094678(GraphicsContext* gfxCtx); +Gfx* func_800946E4(Gfx* gfx); +Gfx* func_800947AC(Gfx* gfx); +void func_80094A14(GraphicsContext* gfxCtx); +void func_80094C50(GraphicsContext* gfxCtx); +void Gfx_BranchTexScroll(Gfx** gfxp, u32 x, u32 y, s32 width, s32 height); Gfx* func_80094E78(GraphicsContext* gfxCtx, u32 x, u32 y); -Gfx* Draw_TexScroll(GraphicsContext* gfxCtx, u32 x, u32 y, s32 width, s32 height); -Gfx* Draw_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, u32 x2, - u32 y2, s32 width2, s32 height2); -Gfx* Draw_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, - u32 x2, u32 y2, s32 width2, s32 height2, s32 red, s32 green, s32 blue, s32 alpha); -// ? func_80095248(?); +Gfx* Gfx_TexScroll(GraphicsContext* gfxCtx, u32 x, u32 y, s32 width, s32 height); +Gfx* Gfx_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, u32 x2, + u32 y2, s32 width2, s32 height2); +Gfx* Gfx_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, + u32 x2, u32 y2, s32 width2, s32 height2, s32 r, s32 g, s32 b, s32 a); +void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b); +void func_80095974(GraphicsContext* gfxCtx); void func_80095AA0(GlobalContext* globalCtx, Room* room, UNK_TYPE arg2, UNK_TYPE arg3); // ? func_8009638C(?); void func_80096FD4(GlobalContext* globalCtx, Room* room); @@ -1541,7 +1542,7 @@ void func_800C6AC4(Gfx** a0, GraphicsContext* gfxCtx, char* file, s32 line); void func_800C6B54(Gfx** a0, GraphicsContext* gfxCtx, char* file, s32 line); Gfx* func_800C6C20(Gfx* a0); Gfx* func_800C6C28(Gfx* a0, Gfx* dlist); // branch dlist -// ? func_800C6C3C(?); +Gfx* func_800C6C3C(Gfx** a0, u32 size); ListAlloc* ListAlloc_Init(ListAlloc* this); void* ListAlloc_Alloc(ListAlloc* this, u32 size); void ListAlloc_Free(ListAlloc* this, void* data); diff --git a/include/ultra64/gbi.h b/include/ultra64/gbi.h index 9bbb9c63c7..541ad155d1 100644 --- a/include/ultra64/gbi.h +++ b/include/ultra64/gbi.h @@ -4201,7 +4201,7 @@ _DW({ \ #define gDPSetScissorFrac(pkt, mode, ulx, uly, lrx, lry) \ -{ \ +_DW({ \ Gfx *_g = (Gfx *)pkt; \ \ _g->words.w0 = _SHIFTL(G_SETSCISSOR, 24, 8) | \ @@ -4210,7 +4210,7 @@ _DW({ \ _g->words.w1 = _SHIFTL(mode, 24, 2) | \ _SHIFTL((int)((lrx)), 12, 12) | \ _SHIFTL((int)((lry)), 0, 12); \ -} +}) #define gsDPSetScissor(mode, ulx, uly, lrx, lry) \ { \ diff --git a/include/variables.h b/include/variables.h index e44e42f026..bb8fa11b1a 100644 --- a/include/variables.h +++ b/include/variables.h @@ -481,54 +481,7 @@ extern s16 gSpoilingItemReverts[3]; //extern ? D_80126240; //extern ? D_80126250; //extern ? D_80126254; -//extern ? D_80126280; -//extern ? D_801262E0; -//extern ? D_80126340; -//extern ? D_80126640; -//extern ? D_80126730; -//extern ? D_80126760; -//extern ? D_80126790; -//extern ? D_801267C0; -//extern ? D_80126850; -//extern ? D_80126880; -//extern ? D_801268B0; -//extern ? D_801268E0; -//extern ? D_80126910; -//extern ? D_80126940; -//extern ? D_80126970; -//extern ? D_801269A0; -//extern ? D_801269D0; -//extern ? D_80126A00; -//extern ? D_80126A30; -//extern ? D_80126A60; -//extern ? D_80126A90; -//extern ? D_80126AC0; -//extern ? D_80126AF0; -//extern ? D_80126B20; -//extern ? D_80126B50; -//extern ? D_80126B80; -//extern ? D_80126BB0; -//extern ? D_80126BE0; -//extern ? D_80126C10; -//extern ? D_80126C40; -//extern ? D_80126C70; -//extern ? D_80126CA0; -//extern ? D_80126CD0; -//extern ? D_80126D00; -//extern ? D_80126D30; -//extern ? D_80126D60; -//extern ? D_80126D90; -//extern ? D_80126DC0; -//extern ? D_80126DF0; -//extern ? D_80126E80; -//extern ? D_80126EB0; -//extern ? D_80126EE0; -//extern ? D_80126F10; -//extern ? D_80126F40; -//extern ? D_80126F70; -//extern ? D_80126FA0; -//extern ? D_80126FD0; -extern Gfx D_80127098[]; +extern Gfx gEmptyDL[]; extern u32 gBitFlags[32]; extern u16 gEquipMasks[4]; extern u16 gEquipNegMasks[4]; @@ -3545,7 +3498,7 @@ extern u8 D_801610DA; //extern ? D_80161360; //extern ? D_801613B0; //extern ? D_8016148C; -//extern ? D_80161490; +extern s32 D_80161490; //extern ? D_80161498; extern Color_RGBA8 D_801614B0; //extern ? D_801614B3; diff --git a/include/z64.h b/include/z64.h index dfa5d3376f..5129f16a74 100644 --- a/include/z64.h +++ b/include/z64.h @@ -241,6 +241,8 @@ typedef struct { /* 0x02A8 */ TwoHeadGfxArena overlay; /* 0x02B8 */ TwoHeadGfxArena polyOpa; /* 0x02C8 */ TwoHeadGfxArena polyXlu; + /* 0x02D8 */ char unk_2D8[0x0004]; + /* 0x02DC */ UNK_TYPE unk_2DC; } GraphicsContext; typedef struct { diff --git a/spec b/spec index da12c066a4..1a7c0b421a 100644 --- a/spec +++ b/spec @@ -356,7 +356,6 @@ beginseg include "build/src/code/z_prenmi.o" include "build/src/code/z_quake.o" include "build/src/code/z_rcp.o" - include "build/data/z_rcp.data.o" include "build/src/code/z_room.o" include "build/src/code/z_sample.o" include "build/src/code/code_80097A00.o" diff --git a/src/code/z_actor.c b/src/code/z_actor.c index fdea5158a6..2cf5eb0de6 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -23,7 +23,7 @@ void func_8002B200(Actor* actor, LightMapper* lightMapper, GlobalContext* global gfxCtx = globalCtx->state.gfxCtx; func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1553); - gfxCtx->polyOpa.p = func_80093774(gfxCtx->polyOpa.p, 0x2C); + gfxCtx->polyOpa.p = Gfx_CallSetupDL(gfxCtx->polyOpa.p, 0x2C); gDPSetCombineLERP(gfxCtx->polyOpa.p++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); @@ -141,7 +141,7 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, Globa gfxCtx = globalCtx->state.gfxCtx; func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1741); - gfxCtx->polyOpa.p = func_80093774(gfxCtx->polyOpa.p, 0x2C); + gfxCtx->polyOpa.p = Gfx_CallSetupDL(gfxCtx->polyOpa.p, 0x2C); actor->shape.unk_15 = 0; for (i = 0; i < 2; i++) { @@ -374,7 +374,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { func_8002BE64(targetCtx, targetCtx->unk_4C, spBC.x, spBC.y, spBC.z); if ((!(player->stateFlags1 & 0x40)) || (actor != player->unk_664)) { - gfxCtx->overlay.p = func_80093774(gfxCtx->overlay.p, 0x39); + gfxCtx->overlay.p = Gfx_CallSetupDL(gfxCtx->overlay.p, 0x39); for (spB0 = 0, spAC = targetCtx->unk_4C; spB0 < spB8; spB0++) { entry = &targetCtx->arr_50[spAC]; @@ -418,7 +418,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { if ((actor != NULL) && !(actor->flags & 0x8000000)) { NaviColor* naviColor = &sNaviColorList[actor->type]; - gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 0x7); + gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x7); Matrix_Translate(actor->posRot2.pos.x, actor->posRot2.pos.y + (actor->unk_4C * actor->scale.y) + 17.0f, actor->posRot2.pos.z, MTXMODE_NEW); @@ -1926,7 +1926,7 @@ void func_8002FBAC(GlobalContext* globalCtx) { if ((globalCtx->csCtx.state == 0) && (gSaveContext.respawn[RESPAWN_MODE_TOP].entrance_index == gSaveContext.entrance_index) && (globalCtx->roomCtx.curRoom.num == gSaveContext.respawn[RESPAWN_MODE_TOP].room_index)) { - gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 0x19); + gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x19); Matrix_Translate(gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y + spD8, @@ -3489,7 +3489,7 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) if (0) {} // Necessary to match - gfxCtx->polyOpa.p = func_80093774(gfxCtx->polyOpa.p, 0x2C); + gfxCtx->polyOpa.p = Gfx_CallSetupDL(gfxCtx->polyOpa.p, 0x2C); gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 0x00, 0x00, 0x00, alpha); diff --git a/src/code/z_cheap_proc.c b/src/code/z_cheap_proc.c index 4b9abb220f..7e5bbb2758 100644 --- a/src/code/z_cheap_proc.c +++ b/src/code/z_cheap_proc.c @@ -1,7 +1,7 @@ #include #include -void Draw_DListOpa(GlobalContext* globalCtx, u32 dlist) { +void Gfx_DrawDListOpa(GlobalContext* globalCtx, u32 dlist) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; @@ -15,7 +15,7 @@ void Draw_DListOpa(GlobalContext* globalCtx, u32 dlist) { func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 219); } -void Draw_DListXlu(GlobalContext* globalCtx, u32 dlist) { +void Gfx_DrawDListXlu(GlobalContext* globalCtx, u32 dlist) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; Gfx* gfxArr[4]; diff --git a/src/code/z_draw.c b/src/code/z_draw.c index 383ed1b4d8..cb737b55c5 100644 --- a/src/code/z_draw.c +++ b/src/code/z_draw.c @@ -187,7 +187,7 @@ static void func_800695C0(GlobalContext* globalCtx, s16 drawId) { func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 572); - gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 5); + gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 5); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 576), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); @@ -208,9 +208,9 @@ static void func_8006969C(GlobalContext* globalCtx, s16 drawId) { func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0), - 0 * (globalCtx->state.frames * 0), 16, 32, 1, 1 * (globalCtx->state.frames * 1), - 1 * -(globalCtx->state.frames * 8), 16, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0), + 0 * (globalCtx->state.frames * 0), 16, 32, 1, 1 * (globalCtx->state.frames * 1), + 1 * -(globalCtx->state.frames * 8), 16, 32)); Matrix_Push(); Matrix_Translate(-8.0f, -2.0f, 0.0f, MTXMODE_APPLY); func_800D1FD4(&globalCtx->mf_11DA0); @@ -238,9 +238,9 @@ static void func_80069880(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0), - 0 * (globalCtx->state.frames * 0), 16, 32, 1, 1 * (globalCtx->state.frames * 1), - 1 * -(globalCtx->state.frames * 6), 16, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0), + 0 * (globalCtx->state.frames * 0), 16, 32, 1, 1 * (globalCtx->state.frames * 1), + 1 * -(globalCtx->state.frames * 6), 16, 32)); Matrix_Push(); func_800D1FD4(&globalCtx->mf_11DA0); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 656), @@ -268,9 +268,9 @@ static void func_80069AC8(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0), - 0 * (globalCtx->state.frames * 0), 32, 32, 1, 1 * (globalCtx->state.frames * 1), - 1 * -(globalCtx->state.frames * 6), 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0), + 0 * (globalCtx->state.frames * 0), 32, 32, 1, 1 * (globalCtx->state.frames * 1), + 1 * -(globalCtx->state.frames * 6), 32, 32)); Matrix_Push(); func_800D1FD4(&globalCtx->mf_11DA0); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 698), @@ -289,10 +289,10 @@ static void func_80069CF0(GlobalContext* globalCtx, s16 drawId) { func_80093D18(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0) % 256, - 1 * (globalCtx->state.frames * 2) % 256, 64, 64, 1, - 0 * (globalCtx->state.frames * 0) % 128, 1 * (globalCtx->state.frames * 1) % 128, 32, - 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0) % 256, + 1 * (globalCtx->state.frames * 2) % 256, 64, 64, 1, + 0 * (globalCtx->state.frames * 0) % 128, 1 * (globalCtx->state.frames * 1) % 128, 32, + 32)); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 723), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); @@ -318,9 +318,9 @@ static void func_80069EB0(GlobalContext* globalCtx, s16 drawId) { func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0), - 1 * -(globalCtx->state.frames * 5), 32, 32, 1, 0 * (globalCtx->state.frames * 0), - 0 * (globalCtx->state.frames * 0), 32, 64)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0), + 1 * -(globalCtx->state.frames * 5), 32, 32, 1, 0 * (globalCtx->state.frames * 0), + 0 * (globalCtx->state.frames * 0), 32, 64)); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 760), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); @@ -354,7 +354,7 @@ static void func_8006A158(GlobalContext* globalCtx, s16 drawId) { G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); - gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 5); + gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 5); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 822), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); @@ -370,9 +370,9 @@ static void func_8006A2A0(GlobalContext* globalCtx, s16 drawId) { func_80093D18(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, -1 * (globalCtx->state.frames * 1), - 1 * (globalCtx->state.frames * 1), 32, 32, 1, -1 * (globalCtx->state.frames * 1), - 1 * (globalCtx->state.frames * 1), 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -1 * (globalCtx->state.frames * 1), + 1 * (globalCtx->state.frames * 1), 32, 32, 1, -1 * (globalCtx->state.frames * 1), + 1 * (globalCtx->state.frames * 1), 32, 32)); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 845), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); @@ -397,9 +397,9 @@ static void func_8006A4B0(GlobalContext* globalCtx, s16 drawId) { func_80093D18(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 1), - 0 * (globalCtx->state.frames * 1), 32, 32, 1, 0 * (globalCtx->state.frames * 1), - 0 * (globalCtx->state.frames * 1), 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 1), + 0 * (globalCtx->state.frames * 1), 32, 32, 1, 0 * (globalCtx->state.frames * 1), + 0 * (globalCtx->state.frames * 1), 32, 32)); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 878), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); @@ -415,9 +415,9 @@ static void func_8006A5F0(GlobalContext* globalCtx, s16 drawId) { func_80093D18(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 6), - 1 * (globalCtx->state.frames * 6), 32, 32, 1, 1 * (globalCtx->state.frames * 6), - 1 * (globalCtx->state.frames * 6), 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 6), + 1 * (globalCtx->state.frames * 6), 32, 32, 1, 1 * (globalCtx->state.frames * 6), + 1 * (globalCtx->state.frames * 6), 32, 32)); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 901), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); @@ -433,9 +433,9 @@ static void func_8006A73C(GlobalContext* globalCtx, s16 drawId) { func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 1), - 1 * -(globalCtx->state.frames * 3), 32, 32, 1, 0 * (globalCtx->state.frames * 1), - 1 * -(globalCtx->state.frames * 2), 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 1), + 1 * -(globalCtx->state.frames * 3), 32, 32, 1, 0 * (globalCtx->state.frames * 1), + 1 * -(globalCtx->state.frames * 2), 32, 32)); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 924), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); @@ -451,9 +451,9 @@ static void func_8006A88C(GlobalContext* globalCtx, s16 drawId) { func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0), - 1 * (globalCtx->state.frames * 1), 32, 32, 1, 0 * (globalCtx->state.frames * 0), - 1 * (globalCtx->state.frames * 1), 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0), + 1 * (globalCtx->state.frames * 1), 32, 32, 1, 0 * (globalCtx->state.frames * 0), + 1 * (globalCtx->state.frames * 1), 32, 32)); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 947), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); @@ -555,9 +555,9 @@ static void func_8006AF9C(GlobalContext* globalCtx, s16 drawId) { func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 2), - 1 * -(globalCtx->state.frames * 6), 32, 32, 1, 1 * (globalCtx->state.frames * 1), - -1 * (globalCtx->state.frames * 2), 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 2), + 1 * -(globalCtx->state.frames * 6), 32, 32, 1, 1 * (globalCtx->state.frames * 1), + -1 * (globalCtx->state.frames * 2), 32, 32)); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1074), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); @@ -636,9 +636,9 @@ static void func_8006B54C(GlobalContext* globalCtx, s16 drawId) { func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 2), - -1 * (globalCtx->state.frames * 2), 64, 64, 1, 1 * (globalCtx->state.frames * 4), - 1 * -(globalCtx->state.frames * 4), 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 2), + -1 * (globalCtx->state.frames * 2), 64, 64, 1, 1 * (globalCtx->state.frames * 4), + 1 * -(globalCtx->state.frames * 4), 32, 32)); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1173), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index 56fbb6b3e5..8861a309a0 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -14,7 +14,7 @@ void func_80020F60(u32 unused, GraphicsContext* gfxCtx) { func_800C6AC4(gfxArr, gfxCtx, D_80135180, 809); - gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 0x26); + gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x26); func_800C6B54(gfxArr, gfxCtx, D_80135194, 813); } diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 51de6e08c6..73b02a892b 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1109,8 +1109,8 @@ void Interface_SetSceneRestrictions(GlobalContext* globalCtx) { } while (sRestrictionFlags[i].scene != 0xFF); } -Gfx* Draw_TextureIA8(Gfx* displayListHead, void* texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, - s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy) { +Gfx* Gfx_TextureIA8(Gfx* displayListHead, void* texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, + s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy) { gDPLoadTextureBlock(displayListHead++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, textureWidth, textureHeight, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); @@ -1121,8 +1121,8 @@ Gfx* Draw_TextureIA8(Gfx* displayListHead, void* texture, s16 textureWidth, s16 return displayListHead; } -Gfx* Draw_TextureI8(Gfx* displayListHead, void* texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, - s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy) { +Gfx* Gfx_TextureI8(Gfx* displayListHead, void* texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, + s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy) { gDPLoadTextureBlock(displayListHead++, texture, G_IM_FMT_I, G_IM_SIZ_8b, textureWidth, textureHeight, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); @@ -2601,10 +2601,10 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) { gDPSetEnvColor(gfxCtx->overlay.p++, 0x64, 0x32, 0x32, 0xFF); gfxCtx->overlay.p = - Draw_TextureIA8(gfxCtx->overlay.p, D_020038C0, 8, 16, R_MAGIC_BAR_X, magicBarY, 8, 16, 1024, 1024); + Gfx_TextureIA8(gfxCtx->overlay.p, D_020038C0, 8, 16, R_MAGIC_BAR_X, magicBarY, 8, 16, 1024, 1024); - gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, D_02003940, 24, 16, R_MAGIC_BAR_X + 8, magicBarY, - gSaveContext.unk_13F4, 16, 1024, 1024); + gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_02003940, 24, 16, R_MAGIC_BAR_X + 8, magicBarY, + gSaveContext.unk_13F4, 16, 1024, 1024); gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, D_020038C0); gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, @@ -2748,8 +2748,8 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { interfaceCtx->bAlpha); gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0xFF); gfxCtx->overlay.p = - Draw_TextureIA8(gfxCtx->overlay.p, &D_02000A00[0], 32, 32, R_ITEM_BTN_X(0), R_ITEM_BTN_Y(0), - R_ITEM_BTN_WIDTH(0), R_ITEM_BTN_WIDTH(0), R_ITEM_BTN_DD(0) * 2, R_ITEM_BTN_DD(0) * 2); + Gfx_TextureIA8(gfxCtx->overlay.p, &D_02000A00[0], 32, 32, R_ITEM_BTN_X(0), R_ITEM_BTN_Y(0), R_ITEM_BTN_WIDTH(0), + R_ITEM_BTN_WIDTH(0), R_ITEM_BTN_DD(0) * 2, R_ITEM_BTN_DD(0) * 2); // C-Left Button Color & Texture gDPPipeSync(gfxCtx->overlay.p++); @@ -2876,8 +2876,8 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { } gfxCtx->overlay.p = - Draw_TextureIA8(gfxCtx->overlay.p, &D_02000A00[i + 1], 0x20, 0x20, R_ITEM_BTN_X(i), R_ITEM_BTN_Y(i), - R_ITEM_BTN_WIDTH(i), R_ITEM_BTN_WIDTH(i), R_ITEM_BTN_DD(i) * 2, R_ITEM_BTN_DD(i) * 2); + Gfx_TextureIA8(gfxCtx->overlay.p, &D_02000A00[i + 1], 0x20, 0x20, R_ITEM_BTN_X(i), R_ITEM_BTN_Y(i), + R_ITEM_BTN_WIDTH(i), R_ITEM_BTN_WIDTH(i), R_ITEM_BTN_DD(i) * 2, R_ITEM_BTN_DD(i) * 2); } } @@ -2956,12 +2956,12 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) { } if (i != 0) { - gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, &D_020035C0[i], 8, 8, R_ITEM_AMMO_X(button), - R_ITEM_AMMO_Y(button), 8, 8, 1024, 1024); + gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, &D_020035C0[i], 8, 8, R_ITEM_AMMO_X(button), + R_ITEM_AMMO_Y(button), 8, 8, 1024, 1024); } - gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, &D_020035C0[ammo], 8, 8, R_ITEM_AMMO_X(button) + 6, - R_ITEM_AMMO_Y(button), 8, 8, 1024, 1024); + gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, &D_020035C0[ammo], 8, 8, R_ITEM_AMMO_X(button) + 6, + R_ITEM_AMMO_Y(button), 8, 8, 1024, 1024); } func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3158); @@ -3170,7 +3170,7 @@ void Interface_Draw(GlobalContext* globalCtx) { // Rupee Icon gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xC8, 0xFF, 0x64, interfaceCtx->magicAlpha); gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x50, 0x00, 0xFF); - gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, D_02001F00, 16, 16, 26, 206, 16, 16, 1024, 1024); + gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_02001F00, 16, 16, 26, 206, 16, 16, 1024, 1024); switch (globalCtx->sceneNum) { case SCENE_BMORI1: @@ -3193,7 +3193,7 @@ void Interface_Draw(GlobalContext* globalCtx) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xC8, 0xE6, 0xFF, interfaceCtx->magicAlpha); gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x14, 0xFF); gfxCtx->overlay.p = - Draw_TextureIA8(gfxCtx->overlay.p, D_02001E00, 16, 16, 26, 190, 16, 16, 1024, 1024); + Gfx_TextureIA8(gfxCtx->overlay.p, D_02001E00, 16, 16, 26, 190, 16, 16, 1024, 1024); // Small Key Counter gDPPipeSync(gfxCtx->overlay.p++); @@ -3212,13 +3212,13 @@ void Interface_Draw(GlobalContext* globalCtx) { phi_s2 = 42; if (interfaceCtx->counterDigits[2] != 0) { gfxCtx->overlay.p = - Draw_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[2]], 8, 16, - phi_s2, 190, 8, 16, 1024, 1024); + Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[2]], 8, 16, phi_s2, + 190, 8, 16, 1024, 1024); phi_s2 = 50; } - gfxCtx->overlay.p = Draw_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[3]], - 8, 16, phi_s2, 190, 8, 16, 1024, 1024); + gfxCtx->overlay.p = Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[3]], 8, + 16, phi_s2, 190, 8, 16, 1024, 1024); } phi_s2 = 42; @@ -3265,8 +3265,8 @@ void Interface_Draw(GlobalContext* globalCtx) { phi_s1 = sRupeeDigitsCount[CUR_UPG_VALUE(UPG_WALLET)]; for (phi_s3 = 0; phi_s3 < phi_s1; phi_s3++, phi_s0++, phi_s2 += 8) { - gfxCtx->overlay.p = Draw_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[phi_s0]], 8, - 16, phi_s2, 206, 8, 16, 1024, 1024); + gfxCtx->overlay.p = Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[phi_s0]], 8, + 16, phi_s2, 206, 8, 16, 1024, 1024); } Interface_DrawMagicBar(globalCtx); @@ -3532,8 +3532,8 @@ void Interface_Draw(GlobalContext* globalCtx) { for (phi_s3 = 0; phi_s3 < 4; phi_s3++) { if (sHBAScoreDigits[phi_s3] != 0 || (phi_s0 != 0) || (phi_s3 >= 3)) { gfxCtx->overlay.p = - Draw_TextureI8(gfxCtx->overlay.p, &D_02003040[sHBAScoreDigits[phi_s3]], 8, 16, phi_s1, - ZREG(15) - 2, sDigitWidth[0], VREG(42), VREG(43) * 2, VREG(43) * 2); + Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[sHBAScoreDigits[phi_s3]], 8, 16, phi_s1, + ZREG(15) - 2, sDigitWidth[0], VREG(42), VREG(43) * 2, VREG(43) * 2); phi_s1 += 9; phi_s0++; } @@ -3925,8 +3925,8 @@ void Interface_Draw(GlobalContext* globalCtx) { gDPPipeSync(gfxCtx->overlay.p++); gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF); gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0x00); - gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, D_02002000, 16, 16, gSaveContext.timer_x[sp274], - gSaveContext.timer_y[sp274] + 2, 16, 16, 1024, 1024); + gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_02002000, 16, 16, gSaveContext.timer_x[sp274], + gSaveContext.timer_y[sp274] + 2, 16, 16, 1024, 1024); // Timer Counter gDPPipeSync(gfxCtx->overlay.p++); @@ -3948,10 +3948,10 @@ void Interface_Draw(GlobalContext* globalCtx) { } for (phi_s3 = 0; phi_s3 < 5; phi_s3++) { - gfxCtx->overlay.p = Draw_TextureI8(gfxCtx->overlay.p, &D_02003040[sTimerDigits[phi_s3]], 8, 16, - gSaveContext.timer_x[sp274] + sTimerDigitLeftPos[phi_s3], - gSaveContext.timer_y[sp274], sDigitWidth[phi_s3], VREG(42), - VREG(43) * 2, VREG(43) * 2); + gfxCtx->overlay.p = Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[sTimerDigits[phi_s3]], 8, 16, + gSaveContext.timer_x[sp274] + sTimerDigitLeftPos[phi_s3], + gSaveContext.timer_y[sp274], sDigitWidth[phi_s3], VREG(42), + VREG(43) * 2, VREG(43) * 2); } } } diff --git a/src/code/z_play.c b/src/code/z_play.c index 8494f9b99b..cf3ffb0e96 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -26,8 +26,8 @@ void func_800BC88C(GlobalContext* globalCtx) { } Gfx* func_800BC8A0(GlobalContext* globalCtx, Gfx* a1) { - func_80093708(a1, globalCtx->lightCtx.unk_07, globalCtx->lightCtx.unk_08, globalCtx->lightCtx.unk_09, 0, - globalCtx->lightCtx.unk_0A, 1000); + Gfx_SetFog2(a1, globalCtx->lightCtx.unk_07, globalCtx->lightCtx.unk_08, globalCtx->lightCtx.unk_09, 0, + globalCtx->lightCtx.unk_0A, 1000); } #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BC8EC.s") diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c index 26482f38ea..a44fa72140 100644 --- a/src/code/z_prenmi.c +++ b/src/code/z_prenmi.c @@ -35,8 +35,9 @@ void PreNMI_Draw(PreNMIContext* prenmiCtx) { gSPSegment(gfxCtx->polyOpa.p++, 0x00, NULL); func_80095248(gfxCtx, 0, 0, 0); func_800940B0(gfxCtx); - gDPSetFillColor(gfxCtx->polyOpa.p++, -1); - gDPFillRectangle(gfxCtx->polyOpa.p++, 0, prenmiCtx->timer + 100, 319, prenmiCtx->timer + 100); + gDPSetFillColor(gfxCtx->polyOpa.p++, + (GPACK_RGBA5551(0xFF, 0xFF, 0xFF, 1) << 16) | GPACK_RGBA5551(0xFF, 0xFF, 0xFF, 1)); + gDPFillRectangle(gfxCtx->polyOpa.p++, 0, prenmiCtx->timer + 100, SCREEN_WIDTH - 1, prenmiCtx->timer + 100); func_800C6B54(gfxArr, gfxCtx, "../z_prenmi.c", 112); } diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c index 4aa711e00d..9df3b257df 100644 --- a/src/code/z_rcp.c +++ b/src/code/z_rcp.c @@ -1,143 +1,1430 @@ #include #include -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093370.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009352C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093708.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009373C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093774.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093794.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800937C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800937E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093808.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093848.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800938B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093920.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009398C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800939F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093A64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093AD0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093B3C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093BA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093C14.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093C80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093D18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093D84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093DF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093E5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093EC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093F34.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093F58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093F7C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093FD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094044.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800940B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009411C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094140.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800941AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094218.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094284.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800942F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009435C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800943C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094434.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800944A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800944C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094520.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009457C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800945A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009460C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094678.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800946E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094708.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009472C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009476C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800947AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094944.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094968.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800949A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094A14.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094A80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094AEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094B58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094BC4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094C50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094CBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094D28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094D4C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094DB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094E54.s") - -Gfx* func_80094E78(GraphicsContext* gfxCtx, u32 x, u32 y) { - return Draw_TexScroll(gfxCtx, x, y, 0, 0); +Gfx sSetupDL[] = { + /* 0x00 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, COMBINED, 0, 0, 0, + COMBINED), + gsDPSetOtherMode(G_AD_NOISE | G_CD_NOISE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + G_RM_ZB_CLD_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x01 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + G_RM_AA_OPA_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x02 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, SHADE), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_OPA_SURF | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x03 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x04 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, 0, 0, 0, PRIMITIVE, PRIMITIVE, 0, SHADE, 0, 0, 0, 0, PRIMITIVE), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_XLU_SURF | G_RM_AA_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x05 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_XLU_SURF | G_RM_AA_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x06 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + G_RM_AA_TEX_EDGE2), + gsSPLoadGeometryMode(G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x07 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_XLU_SURF | G_RM_AA_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x08 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, SHADE), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_OPA_SURF | G_RM_AA_OPA_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x09 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, SHADE, 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + G_RM_AA_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x0A */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_OPA_SURF | G_RM_AA_OPA_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x0B */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, COMBINED, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE, 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + G_RM_AA_OPA_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x0C */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_OPA_SURF | G_RM_AA_OPA_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x0D */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x0E */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_TEX_EDGE | G_RM_AA_ZB_TEX_EDGE2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x0F */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + G_RM_AA_ZB_TEX_EDGE2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x10 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE, 0, COMBINED, 0, + PRIMITIVE, 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + G_RM_AA_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x11 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_TEX_EDGE | G_RM_AA_ZB_TEX_EDGE2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x12 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + G_RM_AA_ZB_TEX_EDGE2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x13 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | AA_EN | Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) | + GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x14 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_ZB_CLD_SURF | G_RM_ZB_CLD_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x15 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_XLU_SURF | G_RM_AA_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x16 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, COMBINED, 0, SHADE, 0, COMBINED, 0, SHADE, 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + G_RM_AA_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x17 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_OPA_SURF | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x18 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, COMBINED, 0, SHADE, 0, COMBINED, 0, SHADE, 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x19 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, COMBINED, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE, 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x1A */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_OPA_SURF | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x1B */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_XLU_SURF | G_RM_AA_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x1C */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_RGBA16 | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_AA_TEX_EDGE | G_RM_AA_TEX_EDGE2), + gsSPLoadGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x1D */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, NOISE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x1E */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_XLU_LINE | G_RM_AA_ZB_XLU_LINE2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x1F */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_HILITERGBA, G_CC_HILITERGBA), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_OPA_SURF | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_TEXTURE_GEN | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x20 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_HILITERGBA, G_CC_HILITERGBA), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_OPA_SURF | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | + G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x21 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, SHADE, 1, 0, TEXEL0, SHADE, ENVIRONMENT, COMBINED, TEXEL0, COMBINED, + ENVIRONMENT, COMBINED, TEXEL0, COMBINED), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | + G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x22 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, SHADE, 0, 0, 0, TEXEL0, 0, 0, 0, SHADE), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_OPA_SURF | G_RM_OPA_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x23 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_XLU_DECAL | G_RM_AA_ZB_XLU_DECAL2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x24 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, SHADE), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_FILL | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_NOOP | G_RM_NOOP2), + gsSPLoadGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x25 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x26 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, SHADE), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_XLU_SURF | G_RM_AA_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x27 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 0), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x28 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL1, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, TEXEL1, TEXEL0, PRIMITIVE, TEXEL0, 0, 0, 0, COMBINED, 0, + 0, 0, COMBINED), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_OPA_SURF | G_RM_OPA_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_FRONT | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x29 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_ZB_XLU_SURF | G_RM_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x2A */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x2B */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, TEXEL0), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_RGBA16 | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x2C */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + G_RM_ZB_OVL_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x2D */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x2E */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x2F */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_ZB_XLU_SURF | G_RM_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x30 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_XLU_SURF | G_RM_AA_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x31 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, 0, 0, 0, PRIMITIVE, PRIMITIVE, 0, SHADE, 0, 0, 0, 0, PRIMITIVE), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_XLU_SURF | G_RM_AA_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x32 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 0), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_OPA_SURF | G_RM_OPA_SURF2), + gsSPLoadGeometryMode(G_CULL_BACK), + gsSPEndDisplayList(), + + /* 0x33 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_CULL_BACK), + gsSPEndDisplayList(), + + /* 0x34 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 0), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_CULL_BACK), + gsSPEndDisplayList(), + + /* 0x35 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL1, TEXEL0, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT, + COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_OPA_SURF | G_RM_OPA_SURF2), + gsSPLoadGeometryMode(G_CULL_BACK), + gsSPEndDisplayList(), + + /* 0x36 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL1, TEXEL0, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT, + COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_CULL_BACK), + gsSPEndDisplayList(), + + /* 0x37 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL1, TEXEL0, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT, + COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_CULL_BACK), + gsSPEndDisplayList(), + + /* 0x38 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 0), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_POINT | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x39 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_CLD_SURF | G_RM_CLD_SURF2), + gsSPLoadGeometryMode(G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x3A */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_CLD_SURF | G_RM_CLD_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x3B */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, SHADE, 1, 0, TEXEL0, SHADE, ENVIRONMENT, COMBINED, TEXEL0, COMBINED, + ENVIRONMENT, COMBINED, TEXEL0, COMBINED), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | G_RM_AA_OPA_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x3C */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, ENVIRONMENT, + TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_ZB_CLD_SURF | G_RM_ZB_CLD_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x3D */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, ENVIRONMENT, + TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0), + gsDPSetOtherMode(G_AD_NOISE | G_CD_NOISE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_ZB_CLD_SURF | G_RM_ZB_CLD_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x3E */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, 0, 0, 0, TEXEL0, COMBINED, 0, PRIMITIVE, 0, COMBINED, 0, PRIMITIVE, 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA) | + G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x3F */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 0), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | Z_UPD | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | + GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) | + GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x40 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x41 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_CLD_SURF | G_RM_CLD_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x42 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + ALPHA_CVG_SEL | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | + GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x43 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + ALPHA_CVG_SEL | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | + GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x44 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + ALPHA_CVG_SEL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) | + GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x45 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, + 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + ALPHA_CVG_SEL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) | + GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x46 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0, 0, 0, 0, TEXEL0), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + ALPHA_CVG_SEL | GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1) | + GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; + +Gfx sFillSetupDL[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, SHADE), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_FILL | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_NOOP | G_RM_NOOP2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), + gsDPSetBlendColor(0x00, 0x00, 0x00, 0x08), + gsSPClipRatio(FRUSTRATIO_2), + gsSPEndDisplayList(), +}; + +// unused? +Gfx D_80127030[] = { + gsDPPipeSync(), + gsDPSetFillColor((GPACK_RGBA5551(0xFF, 0xFF, 0xF0, 0) << 16) | GPACK_RGBA5551(0xFF, 0xFF, 0xF0, 0)), + gsDPFillRectangle(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1), + gsDPSetDepthSource(G_ZS_PIXEL), + gsDPPipeSync(), + gsSPEndDisplayList(), +}; + +// unused? +Gfx D_80127060[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_FILL), + gsDPSetRenderMode(G_RM_NOOP, G_RM_NOOP2), + gsDPSetFillColor((GPACK_RGBA5551(0x00, 0x00, 0x00, 1) << 16) | GPACK_RGBA5551(0x00, 0x00, 0x00, 1)), + gsDPFillRectangle(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1), + gsDPPipeSync(), + gsSPEndDisplayList(), +}; + +Gfx gEmptyDL[] = { + gsSPEndDisplayList(), +}; + +Gfx* Gfx_SetFog(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f) { + if (f == n) { + f++; + } + + if (n == f) { + __assert("n != f", "../z_rcp.c", 1155); + } + + gDPSetFogColor(gfx++, r, g, b, a); + + if (n >= 1000) { + gSPFogFactor(gfx++, 0, 0); // gSPFogPosition(gfx++, ?, ?) + } else if (n >= 997) { + gSPFogFactor(gfx++, 0x7FFF, 0x8100); // gSPFogPosition(gfx++, ?, ?) + } else if (n < 0) { + gSPFogFactor(gfx++, 0, 255); // gSPFogPosition(gfx++, ?, ?) + } else { + gSPFogPosition(gfx++, n, f); + } + + return gfx; } -Gfx* Draw_TexScroll(GraphicsContext* gfxCtx, u32 x, u32 y, s32 width, s32 height) { +Gfx* Gfx_SetFogWithSync(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f) { + if (f == n) { + f++; + } + + if (n == f) { + __assert("n != f", "../z_rcp.c", 1187); + } + + gDPPipeSync(gfx++); + gDPSetFogColor(gfx++, r, g, b, a); + + if (n >= 1000) { + gSPFogFactor(gfx++, 0, 0); // gSPFogPosition(gfx++, ?, ?) + } else if (n >= 997) { + gSPFogFactor(gfx++, 0x7FFF, 0x8100); // gSPFogPosition(gfx++, ?, ?) + } else if (n < 0) { + gSPFogFactor(gfx++, 0, 255); // gSPFogPosition(gfx++, ?, ?) + } else { + gSPFogPosition(gfx++, n, f); + } + + return gfx; +} + +Gfx* Gfx_SetFog2(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f) { + return Gfx_SetFog(gfx, r, g, b, a, n, f); +} + +Gfx* Gfx_CallSetupDLImpl(Gfx* gfx, u32 i) { + gSPDisplayList(gfx++, &sSetupDL[6 * i]); + return gfx; +} + +Gfx* Gfx_CallSetupDL(Gfx* gfx, u32 i) { + return Gfx_CallSetupDLImpl(gfx, i); +} + +void Gfx_CallSetupDLAtPtr(Gfx** gfxp, u32 i) { + *gfxp = Gfx_CallSetupDL(*gfxp, i); +} + +Gfx* func_800937C0(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x39]); + return gfx; +} + +Gfx* func_800937E4(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x39]); + return gfx; +} + +Gfx* func_80093808(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x34]); + gDPSetColorDither(gfx++, G_CD_DISABLE); + return gfx; +} + +void func_80093848(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1293); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x3A]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1297); +} + +void func_800938B4(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1309); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x39]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1313); +} + +void func_80093920(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1325); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x32]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1329); +} + +void func_8009398C(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1341); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x33]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1345); +} + +void func_800939F8(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1357); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x34]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1361); +} + +void func_80093A64(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1373); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x35]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1377); +} + +void func_80093AD0(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1389); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x36]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1393); +} + +void func_80093B3C(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1405); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x37]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1409); +} + +void func_80093BA8(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1421); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1A]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1425); +} + +void func_80093C14(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1439); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x19]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1443); +} + +void func_80093C80(GlobalContext* globalCtx) { + GraphicsContext* gfxCtx; + Gfx* gfxArr[5]; + + gfxCtx = globalCtx->state.gfxCtx; + func_80093D18(gfxCtx); + + if (globalCtx->roomCtx.curRoom.unk_03 == 3) { + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1460); + + gDPSetColorDither(gfxCtx->polyOpa.p++, G_CD_DISABLE); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1462); + } +} + +void func_80093D18(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1475); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x19]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1479); +} + +void func_80093D84(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1491); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x19]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1495); +} + +void func_80093DF0(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1507); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1F]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1511); +} + +void func_80093E5C(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1523); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x20]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1527); +} + +void func_80093EC8(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1539); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x21]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1543); +} + +Gfx* func_80093F34(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x40]); + return gfx; +} + +Gfx* func_80093F58(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x22]); + return gfx; +} + +void func_80093F7C(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1569); + + gfxCtx->polyOpa.p = func_80093F58(gfxCtx->polyOpa.p); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1573); +} + +void func_80093FD8(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1585); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x23]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1589); +} + +void func_80094044(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1601); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x2C]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1605); +} + +void func_800940B0(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1617); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x24]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1621); +} + +Gfx* func_8009411C(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x1C]); + return gfx; +} + +void func_80094140(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1640); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1C]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1644); +} + +void func_800941AC(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1651); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2B]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1655); +} + +void func_80094218(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1670); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2D]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1674); +} + +void func_80094284(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1681); + + gSPDisplayList(gfxCtx->overlay.p++, &sSetupDL[6 * 0x2E]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1685); +} + +void func_800942F0(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1700); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x26]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1704); +} + +void func_8009435C(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1722); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x04]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1726); +} + +void func_800943C8(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1758); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x25]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1762); +} + +void func_80094434(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1775); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x02]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1779); +} + +Gfx* func_800944A0(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x27]); + return gfx; +} + +void func_800944C4(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1799); + + gfxCtx->polyOpa.p = func_800944A0(gfxCtx->polyOpa.p); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1801); +} + +void func_80094520(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1809); + + gfxCtx->overlay.p = func_800944A0(gfxCtx->overlay.p); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1811); +} + +void func_8009457C(Gfx** gfxp) { + Gfx* gfx = *gfxp; + gSPDisplayList(gfx++, &sSetupDL[6 * 0x27]); + *gfxp = gfx; +} + +void func_800945A0(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1837); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x28]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1841); +} + +void func_8009460C(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1853); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x29]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1857); +} + +void func_80094678(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1869); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x2F]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1873); +} + +Gfx* func_800946E4(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x42]); + return gfx; +} + +Gfx* func_80094708(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x43]); + return gfx; +} + +Gfx* func_8009472C(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x44]); + gDPSetColorDither(gfx++, G_CD_DISABLE); + return gfx; +} + +Gfx* func_8009476C(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x45]); + gDPSetColorDither(gfx++, G_CD_DISABLE); + return gfx; +} + +Gfx* func_800947AC(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x41]); + gDPSetColorDither(gfx++, G_CD_DISABLE); + + // clang-format off + switch (HREG(21)) { + case 1: gDPSetAlphaDither(gfx++, G_AD_DISABLE); break; + case 2: gDPSetAlphaDither(gfx++, G_AD_PATTERN); break; + case 3: gDPSetAlphaDither(gfx++, G_AD_NOTPATTERN); break; + case 4: gDPSetAlphaDither(gfx++, G_AD_NOISE); break; + } + + switch (HREG(22)) { + case 1: gDPSetColorDither(gfx++, G_CD_DISABLE); break; + case 2: gDPSetColorDither(gfx++, G_CD_MAGICSQ); break; + case 3: gDPSetColorDither(gfx++, G_CD_BAYER); break; + case 4: gDPSetColorDither(gfx++, G_CD_NOISE); break; + } + // clang-format on + + return gfx; +} + +Gfx* func_80094944(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x46]); + return gfx; +} + +Gfx* func_80094968(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x14]); + gDPSetColorDither(gfx++, G_CD_DISABLE); + return gfx; +} + +void func_800949A8(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1953); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2A]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1957); +} + +void func_80094A14(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1964); + + gSPDisplayList(gfxCtx->overlay.p++, &sSetupDL[6 * 0x2A]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1968); +} + +void func_80094A80(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 1992); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x30]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 1996); +} + +void func_80094AEC(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 2008); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x31]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 2012); +} + +void func_80094B58(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 2024); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x1B]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 2028); +} + +void func_80094BC4(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 2040); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x3C]); + gDPSetColorDither(gfxCtx->polyXlu.p++, G_CD_DISABLE); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 2043); +} + +void func_80094C50(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 2056); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x3D]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 2058); +} + +void func_80094CBC(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 2086); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x38]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 2090); +} + +void func_80094D28(Gfx** gfxp) { + Gfx* gfx = *gfxp; + gSPDisplayList(gfx++, &sSetupDL[6 * 0x38]); + *gfxp = gfx; +} + +void func_80094D4C(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 2112); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x3B]); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 2116); +} + +#ifdef NON_MATCHING +// regalloc differences +void Gfx_BranchTexScroll(Gfx** gfxp, u32 x, u32 y, s32 width, s32 height) { + Gfx* displayList = func_800C6C3C(gfxp, 3 * sizeof(Gfx)); + + gDPTileSync(displayList); + gDPSetTileSize(displayList + 1, 0, x, y, (x + ((width - 1) << 2)), (y + ((height - 1) << 2))); + gSPEndDisplayList(displayList + 2); +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/Gfx_BranchTexScroll.s") +#endif + +void func_80094E54(Gfx** gfxp, u32 x, u32 y) { + Gfx_BranchTexScroll(gfxp, x, y, 0, 0); +} + +Gfx* func_80094E78(GraphicsContext* gfxCtx, u32 x, u32 y) { + return Gfx_TexScroll(gfxCtx, x, y, 0, 0); +} + +Gfx* Gfx_TexScroll(GraphicsContext* gfxCtx, u32 x, u32 y, s32 width, s32 height) { Gfx* displayList = Graph_Alloc(gfxCtx, 3 * sizeof(Gfx)); x %= 2048; @@ -150,8 +1437,8 @@ Gfx* Draw_TexScroll(GraphicsContext* gfxCtx, u32 x, u32 y, s32 width, s32 height return displayList; } -Gfx* Draw_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, u32 x2, - u32 y2, s32 width2, s32 height2) { +Gfx* Gfx_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, u32 x2, + u32 y2, s32 width2, s32 height2) { Gfx* displayList = Graph_Alloc(gfxCtx, 5 * sizeof(Gfx)); x1 %= 2048; @@ -168,8 +1455,8 @@ Gfx* Draw_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 w return displayList; } -Gfx* Draw_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, - u32 x2, u32 y2, s32 width2, s32 height2, s32 red, s32 green, s32 blue, s32 alpha) { +Gfx* Gfx_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, + u32 x2, u32 y2, s32 width2, s32 height2, s32 r, s32 g, s32 b, s32 a) { Gfx* displayList = Graph_Alloc(gfxCtx, 6 * sizeof(Gfx)); x1 %= 2048; @@ -181,14 +1468,128 @@ Gfx* Draw_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y gDPSetTileSize(displayList + 1, tile1, x1, y1, (x1 + ((width1 - 1) << 2)), (y1 + ((height1 - 1) << 2))); gDPTileSync(displayList + 2); gDPSetTileSize(displayList + 3, tile2, x2, y2, (x2 + ((width2 - 1) << 2)), (y2 + ((height2 - 1) << 2))); - gDPSetEnvColor(displayList + 4, red, green, blue, alpha); + gDPSetEnvColor(displayList + 4, r, g, b, a); gSPEndDisplayList(displayList + 5); return displayList; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800951D0.s") +Gfx* Gfx_EnvColor(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a) { + Gfx* displayList = Graph_Alloc(gfxCtx, 2 * sizeof(Gfx)); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80095248.s") + gDPSetEnvColor(displayList, r, g, b, a); + gSPEndDisplayList(displayList + 1); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80095974.s") + return displayList; +} + +void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { + Gfx* gfxArr[5]; + s32 ret; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 2386); + + gSPDisplayList(gfxCtx->polyOpa.p++, sFillSetupDL); + gSPDisplayList(gfxCtx->polyXlu.p++, sFillSetupDL); + gSPDisplayList(gfxCtx->overlay.p++, sFillSetupDL); + gDPSetScissorFrac(gfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, 0, 0, (s32)gScreenWidth * 4.0f, + (s32)gScreenHeight * 4.0f); + gDPSetScissorFrac(gfxCtx->polyXlu.p++, G_SC_NON_INTERLACE, 0, 0, (s32)gScreenWidth * 4.0f, + (s32)gScreenHeight * 4.0f); + gDPSetScissorFrac(gfxCtx->overlay.p++, G_SC_NON_INTERLACE, 0, 0, (s32)gScreenWidth * 4.0f, + (s32)gScreenHeight * 4.0f); + + gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->unk_2DC); + gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->unk_2DC); + gDPSetColorImage(gfxCtx->polyXlu.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->unk_2DC); + gDPSetColorImage(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->unk_2DC); + + gDPSetDepthImage(gfxCtx->polyOpa.p++, gZBuffer); + gDPSetDepthImage(gfxCtx->polyXlu.p++, gZBuffer); + gDPSetDepthImage(gfxCtx->overlay.p++, gZBuffer); + + if ((R_PAUSE_MENU_MODE < 2) && (D_80161490 < 2)) { + ret = func_800B38FC(); + + if (HREG(80) == 16) { + if (HREG(95) != 16) { + HREG(81) = 3; + HREG(82) = 3; + HREG(83) = 0; + HREG(84) = 0; + HREG(85) = 0; + HREG(86) = 0; + HREG(87) = 0; + HREG(88) = 0; + HREG(89) = 0; + HREG(90) = 0; + HREG(91) = 0; + HREG(92) = 0; + HREG(93) = 0; + HREG(94) = 0; + HREG(95) = 16; + } + + if (HREG(81) & 1) { + HREG(83) = ret; + } + + if (HREG(81) & 2) { + HREG(84) = r; + HREG(85) = g; + HREG(86) = b; + } + + if (HREG(82) & 1) { + ret = HREG(83); + } + + if (HREG(82) & 2) { + r = HREG(84); + g = HREG(85); + b = HREG(86); + } + } + + gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gZBuffer); + gDPSetCycleType(gfxCtx->polyOpa.p++, G_CYC_FILL); + gDPSetRenderMode(gfxCtx->polyOpa.p++, G_RM_NOOP, G_RM_NOOP2); + gDPSetFillColor(gfxCtx->polyOpa.p++, + (GPACK_RGBA5551(0xFF, 0xFF, 0xF0, 0) << 16) | GPACK_RGBA5551(0xFF, 0xFF, 0xF0, 0)); + gDPFillRectangle(gfxCtx->polyOpa.p++, 0, ret, gScreenWidth - 1, gScreenHeight - ret - 1); + gDPPipeSync(gfxCtx->polyOpa.p++); + + gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->unk_2DC); + gDPSetCycleType(gfxCtx->polyOpa.p++, G_CYC_FILL); + gDPSetRenderMode(gfxCtx->polyOpa.p++, G_RM_NOOP, G_RM_NOOP2); + gDPSetFillColor(gfxCtx->polyOpa.p++, (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1)); + gDPFillRectangle(gfxCtx->polyOpa.p++, 0, ret, gScreenWidth - 1, gScreenHeight - ret - 1); + gDPPipeSync(gfxCtx->polyOpa.p++); + + if (ret > 0) { + gDPPipeSync(gfxCtx->overlay.p++); + gDPSetCycleType(gfxCtx->overlay.p++, G_CYC_FILL); + gDPSetRenderMode(gfxCtx->overlay.p++, G_RM_NOOP, G_RM_NOOP2); + gDPSetFillColor(gfxCtx->overlay.p++, (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1)); + gDPFillRectangle(gfxCtx->overlay.p++, 0, 0, gScreenWidth - 1, ret - 1); + gDPFillRectangle(gfxCtx->overlay.p++, 0, gScreenHeight - ret, gScreenWidth - 1, gScreenHeight - 1); + gDPPipeSync(gfxCtx->overlay.p++); + } + } + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 2497); +} + +void func_80095974(GraphicsContext* gfxCtx) { + Gfx* gfxArr[5]; + + func_800C6AC4(gfxArr, gfxCtx, "../z_rcp.c", 2503); + + gSPDisplayList(gfxCtx->polyOpa.p++, sFillSetupDL); + gDPSetScissorFrac(gfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, 0, 0, (s32)gScreenWidth * 4.0f, + (s32)gScreenHeight * 4.0f); + gDPSetDepthImage(gfxCtx->polyOpa.p++, gZBuffer); + gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->unk_2DC); + + func_800C6B54(gfxArr, gfxCtx, "../z_rcp.c", 2513); +} diff --git a/src/code/z_room.c b/src/code/z_room.c index f74888438a..77eb175225 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -18,7 +18,7 @@ Gfx D_801270B0[] = { G_TD_CLAMP | G_TP_PERSP | G_CYC_FILL | G_PM_NPRIMITIVE, G_AC_NONE | G_ZS_PIXEL | G_RM_NOOP | G_RM_NOOP2), gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), - gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, 320, 240), + gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), gsSPClipRatio(FRUSTRATIO_1), gsSPEndDisplayList(), }; diff --git a/src/code/z_sample.c b/src/code/z_sample.c index 9b9fa95593..3a7ca5885f 100644 --- a/src/code/z_sample.c +++ b/src/code/z_sample.c @@ -32,7 +32,7 @@ void Sample_Draw(SampleContext* this) { func_80103D58(mtx, SREG(37), SREG(38), SREG(39), 1.0f, SREG(40), SREG(41), SREG(42)); gSPMatrix(gfxCtx->polyOpa.p++, mtx, G_MTX_LOAD); - gfxCtx->polyOpa.p = func_80093708(gfxCtx->polyOpa.p, 0xFF, 0xFF, 0xFF, 0, 0, 0); + gfxCtx->polyOpa.p = Gfx_SetFog2(gfxCtx->polyOpa.p, 0xFF, 0xFF, 0xFF, 0, 0, 0); func_80093D18(gfxCtx); gDPSetCycleType(gfxCtx->polyOpa.p++, G_CYC_1CYCLE); diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index c353df3676..4ecf34556f 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -646,12 +646,12 @@ Scene gSceneTable[] = { }; Gfx sDefaultDisplayList[] = { - gsSPSegment(0x08, D_80127098), - gsSPSegment(0x09, D_80127098), - gsSPSegment(0x0A, D_80127098), - gsSPSegment(0x0B, D_80127098), - gsSPSegment(0x0C, D_80127098), - gsSPSegment(0x0D, D_80127098), + gsSPSegment(0x08, gEmptyDL), + gsSPSegment(0x09, gEmptyDL), + gsSPSegment(0x0A, gEmptyDL), + gsSPSegment(0x0B, gEmptyDL), + gsSPSegment(0x0C, gEmptyDL), + gsSPSegment(0x0D, gEmptyDL), gsDPPipeSync(), gsDPSetPrimColor(0, 0, 0x80, 0x80, 0x80, 0x80), gsDPSetEnvColor(0x80, 0x80, 0x80, 0x80), @@ -706,8 +706,8 @@ void func_800995DC(GlobalContext* globalCtx) { func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4763); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, - 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, + 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); @@ -730,8 +730,8 @@ void func_80099760(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 256, 0, 64, 32, 1, 0, - (gameplayFrames * 2) % 128, 64, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 256, 0, 64, 32, 1, 0, + (gameplayFrames * 2) % 128, 64, 32)); gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); @@ -759,11 +759,11 @@ void func_80099878(GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A300[gSaveContext.night_flag])); gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(D_8012A308[(s32)(gameplayFrames & 14) >> 1])); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 256, 0, 64, 32, 1, 0, - (gameplayFrames * 1) % 128, 64, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 256, 0, 64, 32, 1, 0, + (gameplayFrames * 1) % 128, 64, 32)); gSPSegment(gfxCtx->polyOpa.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0, - (gameplayFrames * 2) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0, + (gameplayFrames * 2) % 128, 32, 32)); { s32 pad2[2]; } // Necessary to match stack usage @@ -863,20 +863,20 @@ void func_8009A45C(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, - 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, + 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment( gfxCtx->polyOpa.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyOpa.p++, 0x0B, - Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x0C, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 50) % 2048, 8, 512, 1, 0, - (gameplayFrames * 60) % 2048, 8, 512)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 50) % 2048, 8, 512, 1, 0, + (gameplayFrames * 60) % 2048, 8, 512)); gSPSegment(gfxCtx->polyOpa.p++, 0x0D, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); @@ -898,17 +898,17 @@ void func_8009A798(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 256, 64, 64)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 256, 64, 64)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); gSPSegment(gfxCtx->polyOpa.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames * 1) % 128, - (gameplayFrames * 1) % 256, 32, 64, 1, 0, 0, 32, 128)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames * 1) % 128, + (gameplayFrames * 1) % 256, 32, 64, 1, 0, 0, 32, 128)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -930,11 +930,11 @@ void func_8009A9DC(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 256, 32, - 64, 1, gameplayFrames % 128, (gameplayFrames * 3) % 256, 32, 64)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 256, 32, + 64, 1, gameplayFrames % 128, (gameplayFrames * 3) % 256, 32, 64)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -955,7 +955,7 @@ void func_8009AB98(GlobalContext* globalCtx) { func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5317); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(gfxCtx->polyXlu.p++, 0x08, Draw_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16)); + gSPSegment(gfxCtx->polyXlu.p++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16)); gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); @@ -977,9 +977,9 @@ void func_8009ACA8(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); - gSPSegment(gfxCtx->polyXlu.p++, 0x09, Draw_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); + gSPSegment(gfxCtx->polyXlu.p++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1003,12 +1003,12 @@ void func_8009AE30(GlobalContext* globalCtx) { if (globalCtx->sceneNum == SCENE_HAKADAN_BS) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 128, 0, 32, 32, 1, - (gameplayFrames * 2) % 128, 0, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 128, 0, 32, 32, 1, + (gameplayFrames * 2) % 128, 0, 32, 32)); } else { gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 128, 0, 32, 32, 1, - (gameplayFrames * 2) % 128, 0, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 128, 0, 32, 32, 1, + (gameplayFrames * 2) % 128, 0, 32, 32)); } gDPPipeSync(gfxCtx->polyOpa.p++); @@ -1033,7 +1033,7 @@ void func_8009AFE0(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32)); { s32 pad[2]; } // Necessary to match stack usage @@ -1065,54 +1065,54 @@ void func_8009B0FC(GlobalContext* globalCtx) { if (spB0 == 1) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, spAC)); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, + 0, 0, 0, spAC)); } else if (spB0 < 1) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, 0xFF)); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, + 0, 0, 0, 0xFF)); } else { gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, 0xA0)); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, + 0, 0, 0, 0xA0)); } if (spB0 == 2) { gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, spAC)); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, + 0, 0, 0, spAC)); } else if (spB0 < 2) { gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, 0xFF)); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, + 0, 0, 0, 0xFF)); } else { gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, 0xA0)); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, + 0, 0, 0, 0xA0)); } if (spB0 != 0) { gSPSegment(gfxCtx->polyOpa.p++, 0x0A, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, 0xA0)); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, + 0, 0, 0, 0xA0)); gSPSegment(gfxCtx->polyOpa.p++, 0x0B, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, 0xB4)); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32, + 0, 0, 0, 0xB4)); } else { gSPSegment(gfxCtx->polyOpa.p++, 0x0A, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 0, 32, 32, 1, 0, 0, - 32, 32, 0, 0, 0, 0xA0 + (s32)((spAC / 200.0f) * 95.0f))); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 0, 32, 32, 1, 0, 0, + 32, 32, 0, 0, 0, 0xA0 + (s32)((spAC / 200.0f) * 95.0f))); gSPSegment(gfxCtx->polyOpa.p++, 0x0B, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32, - 0, 0, 0, 0xB9 + (s32)((spAC / 200.0f) * 70.0f))); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32, + 0, 0, 0, 0xB9 + (s32)((spAC / 200.0f) * 70.0f))); } gSPSegment(gfxCtx->polyXlu.p++, 0x0C, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, gameplayFrames * 1, 32, 32, 1, - 0, 127 - (gameplayFrames * 1), 32, 32, 0, 0, 0, 0x80)); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, gameplayFrames * 1, 32, 32, 1, + 0, 127 - (gameplayFrames * 1), 32, 32, 0, 0, 0, 0x80)); gSPSegment(gfxCtx->polyXlu.p++, 0x0D, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 4, 0, 32, 32, 1, - gameplayFrames * 4, 0, 32, 32, 0, 0, 0, 0x80)); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 4, 0, 32, 32, 1, + gameplayFrames * 4, 0, 32, 32, 0, 0, 0, 0x80)); { s32 pad[2]; } // Necessary to match stack usage @@ -1130,7 +1130,7 @@ void func_8009B86C(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, globalCtx->unk_11D30[0]); @@ -1151,7 +1151,7 @@ void func_8009B9BC(GlobalContext* globalCtx) { func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5822); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(gfxCtx->polyOpa.p++, 0x08, Draw_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 4, 16)); + gSPSegment(gfxCtx->polyOpa.p++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 4, 16)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1170,12 +1170,12 @@ void func_8009BAA4(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); if (globalCtx->sceneNum == SCENE_HAIRAL_NIWA) { gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 10) % 256, 32, 64)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 10) % 256, 32, 64)); } gDPPipeSync(gfxCtx->polyOpa.p++); @@ -1205,16 +1205,16 @@ void func_8009BC44(GlobalContext* globalCtx) { if (globalCtx->sceneNum == SCENE_GANON_TOU) { gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 256, 64, 64)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 256, 64, 64)); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 1) % 256, 64, 64, 1, 0, - (gameplayFrames * 1) % 256, 64, 64)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 1) % 256, 64, 64, 1, 0, + (gameplayFrames * 1) % 256, 64, 64)); } gSPSegment(gfxCtx->polyOpa.p++, 0x0B, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 255 - (gameplayFrames * 1) % 128, - (gameplayFrames * 1) % 128, 32, 32, 1, (gameplayFrames * 1) % 128, - (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 255 - (gameplayFrames * 1) % 128, + (gameplayFrames * 1) % 128, 32, 32, 1, (gameplayFrames * 1) % 128, + (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1270,14 +1270,14 @@ void func_8009C0AC(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 512, 64, 128, 1, 0, - 511 - (gameplayFrames * 1) % 512, 64, 128)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 512, 64, 128, 1, 0, + 511 - (gameplayFrames * 1) % 512, 64, 128)); gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 256, 32, 64, 1, 0, - 255 - (gameplayFrames * 1) % 256, 32, 64)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 256, 32, 64, 1, 0, + 255 - (gameplayFrames * 1) % 256, 32, 64)); gSPSegment(gfxCtx->polyXlu.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 20) % 2048, 16, 512, 1, 0, - (gameplayFrames * 30) % 2048, 16, 512)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 20) % 2048, 16, 512, 1, 0, + (gameplayFrames * 30) % 2048, 16, 512)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1315,11 +1315,11 @@ void func_8009C3EC(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A338[gSaveContext.night_flag])); gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); { s32 pad[2]; } // Necessary to match stack usage @@ -1343,16 +1343,16 @@ void func_8009C608(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 60) % 2048, 8, 512, 1, 0, - (gameplayFrames * 50) % 2048, 8, 512)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 60) % 2048, 8, 512, 1, 0, + (gameplayFrames * 50) % 2048, 8, 512)); gSPSegment(gfxCtx->polyOpa.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames * 1) % 128, 0, 32, 32, 1, - (gameplayFrames * 1) % 128, 0, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames * 1) % 128, 0, 32, 32, 1, + (gameplayFrames * 1) % 128, 0, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x0B, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 1023 - (gameplayFrames * 6) % 1024, 16, 256, 1, 0, - 1023 - (gameplayFrames * 3) % 1024, 16, 256)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 1023 - (gameplayFrames * 6) % 1024, 16, 256, 1, 0, + 1023 - (gameplayFrames * 3) % 1024, 16, 256)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1374,12 +1374,12 @@ void func_8009C8B8(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TexScroll(globalCtx->state.gfxCtx, 0, 255 - (gameplayFrames * 10) % 256, 32, 64)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, 255 - (gameplayFrames * 10) % 256, 32, 64)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1401,8 +1401,8 @@ void func_8009CAC0(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1429,11 +1429,11 @@ void func_8009CC00(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A340[gSaveContext.night_flag])); gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); { s32 pad[2]; } // Necessary to match stack usage @@ -1446,8 +1446,8 @@ void func_8009CC00(GlobalContext* globalCtx) { func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6320); } -Gfx* Draw_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, - u32 x2, u32 y2, s32 width2, s32 height2, s32 red, s32 green, s32 blue, s32 alpha) { +Gfx* Gfx_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, + u32 x2, u32 y2, s32 width2, s32 height2, s32 r, s32 g, s32 b, s32 a) { Gfx* displayList = Graph_Alloc(gfxCtx, 10 * sizeof(Gfx)); x1 %= 2048; @@ -1459,7 +1459,7 @@ Gfx* Draw_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 gDPSetTileSize(displayList + 1, tile1, x1, y1, (x1 + ((width1 - 1) << 2)), (y1 + ((height1 - 1) << 2))); gDPTileSync(displayList + 2); gDPSetTileSize(displayList + 3, tile2, x2, y2, (x2 + ((width2 - 1) << 2)), (y2 + ((height2 - 1) << 2))); - gDPSetPrimColor(displayList + 4, 0, 0, red, green, blue, alpha); + gDPSetPrimColor(displayList + 4, 0, 0, r, g, b, a); gSPEndDisplayList(displayList + 5); return displayList; @@ -1476,10 +1476,10 @@ void func_8009CF84(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScrollPrimColor(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, - (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, - (gameplayFrames * 1) % 128, 32, 32, 0xFF, 0xFF, 0xFF, - globalCtx->unk_11D30[0] + 127)); + Gfx_TwoTexScrollPrimColor(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, + (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, + (gameplayFrames * 1) % 128, 32, 32, 0xFF, 0xFF, 0xFF, + globalCtx->unk_11D30[0] + 127)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1501,14 +1501,13 @@ void func_8009D0E8(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TexScroll(globalCtx->state.gfxCtx, 127 - (gameplayFrames * 4) % 128, 0, 32, 32)); - gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 5) % 64, 16, 16)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 127 - (gameplayFrames * 4) % 128, 0, 32, 32)); + gSPSegment(gfxCtx->polyOpa.p++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 5) % 64, 16, 16)); gSPSegment(gfxCtx->polyOpa.p++, 0x0A, - Draw_TexScroll(globalCtx->state.gfxCtx, 0, 63 - (gameplayFrames * 2) % 64, 16, 16)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, 63 - (gameplayFrames * 2) % 64, 16, 16)); gSPSegment( gfxCtx->polyXlu.p++, 0x0B, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - (gameplayFrames * 3) % 128, 32, 32, 1, 0, 0, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - (gameplayFrames * 3) % 128, 32, 32, 1, 0, 0, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1582,10 +1581,10 @@ void func_8009D5B4(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 1023 - (gameplayFrames * 3) % 1024, 16, 256, 1, 0, - 1023 - (gameplayFrames * 6) % 1024, 16, 256)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 1023 - (gameplayFrames * 3) % 1024, 16, 256, 1, 0, + 1023 - (gameplayFrames * 6) % 1024, 16, 256)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1612,11 +1611,11 @@ void func_8009D758(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A360[gSaveContext.night_flag])); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyOpa.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); { s32 pad[2]; } // Necessary to match stack usage @@ -1659,11 +1658,11 @@ void func_8009DA30(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, - 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1727,14 +1726,14 @@ void func_8009DE78(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 6) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 6) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 6) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 6) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1764,11 +1763,11 @@ void func_8009E0B8(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, - 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1796,8 +1795,8 @@ void func_8009E0B8(GlobalContext* globalCtx) { gSPEndDisplayList(displayListHead); gSPSegment(gfxCtx->polyOpa.p++, 0x0C, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (s16)(-globalCtx->unk_11D30[0] * 0.02f), 32, 16, 1, 0, - (s16)(-globalCtx->unk_11D30[0] * 0.02f), 32, 16)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (s16)(-globalCtx->unk_11D30[0] * 0.02f), 32, 16, 1, 0, + (s16)(-globalCtx->unk_11D30[0] * 0.02f), 32, 16)); func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7044); } @@ -1817,11 +1816,11 @@ void func_8009E54C(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames, gameplayFrames, 32, 32, 1, 0, 0, - 32, 32, 0, 0, 0, globalCtx->unk_11D30[0] + 0xA8)); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames, gameplayFrames, 32, 32, 1, 0, 0, 32, + 32, 0, 0, 0, globalCtx->unk_11D30[0] + 0xA8)); gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, -gameplayFrames, -gameplayFrames, 32, 32, 1, 0, 0, - 16, 64, 0, 0, 0, globalCtx->unk_11D30[0] + 0xA8)); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, -gameplayFrames, -gameplayFrames, 32, 32, 1, 0, 0, + 16, 64, 0, 0, 0, globalCtx->unk_11D30[0] + 0xA8)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0xFF, 0xFF, 0xFF, 0x80); @@ -1847,7 +1846,7 @@ void func_8009E730(GlobalContext* globalCtx) { var = 0; } gSPSegment(gfxCtx->polyOpa.p++, 0x0C, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 64, 32, 1, 0, var, 64, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 64, 32, 1, 0, var, 64, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1870,13 +1869,13 @@ void func_8009E8C0(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 0, 32, 32, 1, 0, 0, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 0, 32, 32, 1, 0, 0, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 2) % 256, 64, 64, 1, 0, - 255 - (gameplayFrames * 2) % 256, 64, 64)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 2) % 256, 64, 64, 1, 0, + 255 - (gameplayFrames * 2) % 256, 64, 64)); gSPSegment(gfxCtx->polyXlu.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0, - (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0, + (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1898,23 +1897,23 @@ void func_8009EAD8(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 3) % 1024, 32, 256, 1, 0, - (gameplayFrames * 3) % 1024, 32, 256)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 3) % 1024, 32, 256, 1, 0, + (gameplayFrames * 3) % 1024, 32, 256)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 256, 64, 64, 1, 0, - (gameplayFrames * 1) % 256, 64, 64)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 256, 64, 64, 1, 0, + (gameplayFrames * 1) % 256, 64, 64)); gSPSegment(gfxCtx->polyXlu.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 2) % 128, 32, 32, 1, 0, - (gameplayFrames * 2) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 2) % 128, 32, 32, 1, 0, + (gameplayFrames * 2) % 128, 32, 32)); gSPSegment( gfxCtx->polyOpa.p++, 0x0B, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - (gameplayFrames * 3) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - (gameplayFrames * 3) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x0C, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0, - (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0, + (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x0D, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 64, 16, 16, 1, 0, - (gameplayFrames * 1) % 64, 16, 16)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 64, 16, 16, 1, 0, + (gameplayFrames * 1) % 64, 16, 16)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1938,11 +1937,11 @@ void func_8009EE44(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 128, 0, 32, 16, 1, gameplayFrames % 128, - 0, 32, 16)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 128, 0, 32, 16, 1, gameplayFrames % 128, 0, + 32, 16)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, gameplayFrames % 128, 32, 32, - 1, gameplayFrames % 128, gameplayFrames % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, gameplayFrames % 128, 32, 32, 1, + gameplayFrames % 128, gameplayFrames % 128, 32, 32)); gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); @@ -1972,7 +1971,7 @@ void func_8009F074(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - gameplayFrames % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - gameplayFrames % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2010,11 +2009,11 @@ void func_8009F270(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, - gameplayFrames % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128, + 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, - gameplayFrames % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128, + 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2036,11 +2035,11 @@ void func_8009F40C(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, - 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2110,8 +2109,8 @@ void func_8009F7D4(GlobalContext* globalCtx) { sp6E = (sp6E >> 1) + 192; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, - gameplayFrames % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128, + 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, sp6F, sp6E, 0xFF, 0x80); @@ -2135,8 +2134,8 @@ void func_8009F9D0(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - gameplayFrames % 128, 32, 32, 1, - gameplayFrames % 128, 0, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - gameplayFrames % 128, 32, 32, 1, + gameplayFrames % 128, 0, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2184,12 +2183,12 @@ void func_8009FC90(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - gameplayFrames % 128, 32, 32, 1, - 127 - gameplayFrames % 128, 0, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - gameplayFrames % 128, 32, 32, 1, + 127 - gameplayFrames % 128, 0, 32, 32)); gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, - 127 - (gameplayFrames * 6) % 128, 32, 32, 1, (gameplayFrames * 6) % 128, - 127 - (gameplayFrames * 3) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, + 127 - (gameplayFrames * 6) % 128, 32, 32, 1, (gameplayFrames * 6) % 128, + 127 - (gameplayFrames * 3) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x40); @@ -2219,15 +2218,15 @@ void func_8009FE58(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; if (globalCtx->sceneNum == SCENE_BDAN) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 128, (gameplayFrames * 2) % 128, 32, - 32, 1, 127 - gameplayFrames % 128, (gameplayFrames * 2) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 128, (gameplayFrames * 2) % 128, 32, + 32, 1, 127 - gameplayFrames % 128, (gameplayFrames * 2) % 128, 32, 32)); gSPSegment(gfxCtx->polyOpa.p++, 0x0B, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 4) % 256, 32, 64, 1, 0, - 255 - (gameplayFrames * 4) % 256, 32, 64)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 4) % 256, 32, 64, 1, 0, + 255 - (gameplayFrames * 4) % 256, 32, 64)); } else { gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TexScroll(globalCtx->state.gfxCtx, (127 - (gameplayFrames * 1)) % 128, - (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TexScroll(globalCtx->state.gfxCtx, (127 - (gameplayFrames * 1)) % 128, + (gameplayFrames * 1) % 128, 32, 32)); } gDPPipeSync(gfxCtx->polyOpa.p++); @@ -2299,14 +2298,14 @@ void func_800A0334(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 512, 32, - 128, 1, gameplayFrames % 128, (gameplayFrames * 1) % 512, 32, 128)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 512, 32, + 128, 1, gameplayFrames % 128, (gameplayFrames * 1) % 512, 32, 128)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyOpa.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, - 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2338,9 +2337,9 @@ void func_800A059C(GlobalContext* globalCtx) { gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TexScroll(globalCtx->state.gfxCtx, 127 - (gameplayFrames * 2) % 128, 0, 32, 64)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 127 - (gameplayFrames * 2) % 128, 0, 32, 64)); gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 512, 128, 128)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 512, 128, 128)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index bd6bcb48b7..4c39fe657e 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -532,7 +532,7 @@ static void func_8086DF58(BgBdanSwitch* this, GlobalContext* globalCtx, UNK_TYPE func_800D1694(this->actor.posRot.pos.x, this->actor.posRot.pos.y + (this->actor.shape.unk_08 * this->unk_1D0), this->actor.posRot.pos.z, &this->actor.shape.rot); Matrix_Scale(this->unk_1D4, this->unk_1D0, this->unk_1D4, MTXMODE_APPLY); - Draw_DListOpa(globalCtx, arg2); + Gfx_DrawDListOpa(globalCtx, arg2); } static void BgBdanSwitch_Draw(BgBdanSwitch* this, GlobalContext* globalCtx) { diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index 109a489427..de85919322 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c @@ -108,12 +108,12 @@ void BgGjyoBridge_Draw(BgGjyoBridge* this, GlobalContext* globalCtx) { func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 8, - Draw_TexScroll(globalCtx->state.gfxCtx, globalCtx->gameplayFrames & 127, - globalCtx->gameplayFrames * -3 & 127, 32, 32)); + Gfx_TexScroll(globalCtx->state.gfxCtx, globalCtx->gameplayFrames & 127, + globalCtx->gameplayFrames * -3 & 127, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 9, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, -globalCtx->gameplayFrames & 127, 32, 32, 1, 0, - globalCtx->gameplayFrames & 127, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, -globalCtx->gameplayFrames & 127, 32, 32, 1, 0, + globalCtx->gameplayFrames & 127, 32, 32)); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 281), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); diff --git a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c index 2db03c4685..4d0fa15d03 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c @@ -55,8 +55,8 @@ static void Draw(ActorGndNisekabe* this, GlobalContext* globalCtx) { u32 index = this->actor.params & 0xFF; if ((this->actor.flags & 0x80) == 0x80) { - Draw_DListXlu(globalCtx, segmentAddr[index]); + Gfx_DrawDListXlu(globalCtx, segmentAddr[index]); } else { - Draw_DListOpa(globalCtx, segmentAddr[index]); + Gfx_DrawDListOpa(globalCtx, segmentAddr[index]); } } diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c index 3264890c58..c8b7862c4d 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c @@ -114,12 +114,12 @@ static void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; if ((thisx->flags & 0x80) == 0x80) { - Draw_DListXlu(globalCtx, dlists[thisx->params]); + Gfx_DrawDListXlu(globalCtx, dlists[thisx->params]); } else { - Draw_DListOpa(globalCtx, dlists[thisx->params]); + Gfx_DrawDListOpa(globalCtx, dlists[thisx->params]); } if (thisx->params == 0) { - Draw_DListXlu(globalCtx, &D_06001250); + Gfx_DrawDListXlu(globalCtx, &D_06001250); } } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c index d12f16076a..1178b38e29 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c @@ -146,5 +146,5 @@ static void BgHidanFslift_Update(BgHidanFslift* this, GlobalContext* globalCtx) } static void BgHidanFslift_Draw(BgHidanFslift* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_0600B630); + Gfx_DrawDListOpa(globalCtx, &D_0600B630); } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c index fa1fda2c1e..baca6cd799 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c @@ -136,5 +136,5 @@ static void Update(ActorHidanSyoku* this, GlobalContext* globalCtx) { } static void Draw(ActorHidanSyoku* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_0600A7E0); + Gfx_DrawDListOpa(globalCtx, &D_0600A7E0); } diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c index 8e5e1323d8..5c625673e3 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c @@ -131,5 +131,5 @@ static void BgJyaAmishutter_Update(BgJyaAmishutter* this, GlobalContext* globalC } static void BgJyaAmishutter_Draw(BgJyaAmishutter* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_0600C0A0); + Gfx_DrawDListOpa(globalCtx, &D_0600C0A0); } diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index 3e9034157d..7bf4de13eb 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -131,5 +131,5 @@ static void BgJyaKanaami_Update(BgJyaKanaami* this, GlobalContext* globalCtx) { } static void BgJyaKanaami_Draw(BgJyaKanaami* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_0600F000); + Gfx_DrawDListOpa(globalCtx, &D_0600F000); } diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c index 42bb7979c3..12fe63b800 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c @@ -63,5 +63,5 @@ static void Update(ActorMenkuriKaiten* this, GlobalContext* globalCtx) { } static void Draw(ActorMenkuriKaiten* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_060038D0); + Gfx_DrawDListOpa(globalCtx, &D_060038D0); } diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c index 475dbe9ff4..352621740f 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c @@ -53,8 +53,8 @@ static void Draw(BgMenkuriNisekabe* this, GlobalContext* globalCtx) { u32 index = this->actor.params & 0xFF; if ((this->actor.flags & 0x80) == 0x80) { - Draw_DListXlu(globalCtx, segmentAddr[index]); + Gfx_DrawDListXlu(globalCtx, segmentAddr[index]); } else { - Draw_DListOpa(globalCtx, segmentAddr[index]); + Gfx_DrawDListOpa(globalCtx, segmentAddr[index]); } } diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c index ccb41bd0ce..d23cc9a054 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c @@ -76,8 +76,8 @@ static void Update(ActorSpot00Break* this, GlobalContext* globalCtx) { static void Draw(ActorSpot00Break* this, GlobalContext* globalCtx) { if (this->actor.params == 1) { - Draw_DListOpa(globalCtx, &D_06000980); + Gfx_DrawDListOpa(globalCtx, &D_06000980); } else { - Draw_DListOpa(globalCtx, &D_06000440); + Gfx_DrawDListOpa(globalCtx, &D_06000440); } } diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index 9ac414e844..5d8800934d 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c @@ -169,7 +169,7 @@ static void BgSpot09Obj_Draw(BgSpot09Obj* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx; Gfx* gfxArr[3]; - Draw_DListOpa(globalCtx, dlists[thisx->params]); + Gfx_DrawDListOpa(globalCtx, dlists[thisx->params]); if (thisx->params == 3) { gfxCtx = globalCtx->state.gfxCtx; func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 388); diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index 9247305d8e..2e4db5f649 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -143,5 +143,5 @@ static void BgSpot12Gate_Update(BgSpot12Gate* this, GlobalContext* globalCtx) { } static void BgSpot12Gate_Draw(BgSpot12Gate* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_06001080); + Gfx_DrawDListOpa(globalCtx, &D_06001080); } diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c index 05cb5e107e..b82daf2d63 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c @@ -75,5 +75,5 @@ static void Update(ActorSpot18Futa* this, GlobalContext* globalCtx) { } static void Draw(ActorSpot18Futa* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &DL_SPOT18_FUTA2); + Gfx_DrawDListOpa(globalCtx, &DL_SPOT18_FUTA2); } diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index d87c2f1362..7a6e130946 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -288,7 +288,7 @@ static void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx) { func_8002EBCC(&this->actor, globalCtx, 0); gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TexScroll(globalCtx->state.gfxCtx, 0, -(globalCtx->gameplayFrames % 0x80), 32, 32)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, -(globalCtx->gameplayFrames % 0x80), 32, 32)); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 742), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyOpa.p++, &D_06001BD0); diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c index 1a6a7350a4..9e0118502b 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -68,5 +68,5 @@ static void Update(ActorBgUmajump* this, GlobalContext* globalCtx) { } static void Draw(ActorBgUmajump* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_06001220); + Gfx_DrawDListOpa(globalCtx, &D_06001220); } diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index 0fc7a20478..956f01ed51 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -469,8 +469,7 @@ static void EnDog_Draw(EnDog* this, GlobalContext* globalCtx) { s32 pad; Color_RGBA8 colors[] = { { 0xFF, 0xFF, 0xC8, 0x00 }, { 0x96, 0x64, 0x32, 0x00 } }; GraphicsContext* gfxCtx; - s32 pad2[2]; - Gfx* gfxArr[2]; + Gfx* gfxArr[4]; gfxCtx = globalCtx->state.gfxCtx; func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_dog.c", 972); diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c index 237a145155..e0e30d1932 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c @@ -109,5 +109,5 @@ static void EnLightbox_Update(EnLightbox* this, GlobalContext* globalCtx) { } static void EnLightbox_Draw(EnLightbox* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_06000B70); + Gfx_DrawDListOpa(globalCtx, &D_06000B70); } diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c index ba72f83411..f8da2fd8ec 100644 --- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c +++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c @@ -85,5 +85,5 @@ static void EnPubox_Update(EnPubox* this, GlobalContext* globalCtx) { } static void EnPubox_Draw(EnPubox* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_06000380); + Gfx_DrawDListOpa(globalCtx, &D_06000380); } diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 818b254344..341b42ec1c 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -135,7 +135,7 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { for (i = 0; i < ARRAY_COUNT(this->eff); i++) { if (eff->active != 0) { if (gfxSetup == 0) { - gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 0); + gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0); gSPDisplayList(gfxCtx->polyXlu.p++, D_0600BC90); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x64, 0x3C, 0x14, 0x00); gfxSetup = 1; diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index 7a782fd492..0d27f285e2 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -291,5 +291,5 @@ void EnTuboTrap_Update(EnTuboTrap* this, GlobalContext* globalCtx) { } void EnTuboTrap_Draw(EnTuboTrap* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, D_05017870); + Gfx_DrawDListOpa(globalCtx, D_05017870); } diff --git a/src/overlays/actors/ovl_En_Vase/z_en_vase.c b/src/overlays/actors/ovl_En_Vase/z_en_vase.c index b59658505b..1ba1683859 100644 --- a/src/overlays/actors/ovl_En_Vase/z_en_vase.c +++ b/src/overlays/actors/ovl_En_Vase/z_en_vase.c @@ -38,5 +38,5 @@ static void Destroy(ActorEnVase* this, GlobalContext* globalCtx) { } static void Draw(ActorEnVase* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &DL_VASE); + Gfx_DrawDListOpa(globalCtx, &DL_VASE); } diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index 54dfaf2bc5..b333a5bfa3 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -132,5 +132,5 @@ static void ObjBombiwa_Update(ObjBombiwa* this, GlobalContext* globalCtx) { } static void ObjBombiwa_Draw(ObjBombiwa* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_060009E0); + Gfx_DrawDListOpa(globalCtx, &D_060009E0); } diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index 32da650c2c..da113c4e32 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -121,5 +121,5 @@ static void ObjElevator_Update(ObjElevator* this, GlobalContext* globalCtx) { } static void ObjElevator_Draw(ObjElevator* this, GlobalContext* globalCtx) { - Draw_DListOpa(globalCtx, &D_06000180); + Gfx_DrawDListOpa(globalCtx, &D_06000180); } diff --git a/tools/overlayhelpers/batchdisasm/symbols.txt b/tools/overlayhelpers/batchdisasm/symbols.txt index 06a0679c79..bfcd2d721d 100644 --- a/tools/overlayhelpers/batchdisasm/symbols.txt +++ b/tools/overlayhelpers/batchdisasm/symbols.txt @@ -47,8 +47,8 @@ func_80033748 Actor_ChangeType func_80033940 Actor_SetTextWithPrefix func_80033EF8 Math_Rand_ZeroFloat func_80033F20 Math_Rand_CenteredFloat -func_80035260 Draw_DListOpa -func_80035324 Draw_DListXlu +func_80035260 Gfx_DrawDListOpa +func_80035324 Gfx_DrawDListXlu func_800353F4 Actor_FindNearby func_80035628 Actor_ApplyDamage func_80035B4C Flags_GetEventChkInf From f64174730c8a27e8b604d1219915ca2b07c7b08a Mon Sep 17 00:00:00 2001 From: Roman971 Date: Mon, 30 Mar 2020 22:29:51 +0200 Subject: [PATCH 2/2] Decompile z_elf_message.c (1 non matching left) --- ...8006BBC0.s => ElfMessage_CheckCondition.s} | 2 +- .../code/z_elf_message/func_8006BE88.s | 44 ----- .../code/z_elf_message/func_8006BF1C.s | 144 --------------- .../code/z_elf_message/func_8006C0FC.s | 145 --------------- .../code/z_elf_message/func_8006C2B0.s | 32 ---- .../code/z_elf_message/func_8006C318.s | 18 -- .../actors/ovl_En_Elf/func_80A05040.s | 2 +- .../actors/ovl_En_Elf/func_80A05188.s | 2 +- .../actors/ovl_En_Elf/func_80A05208.s | 2 +- .../actors/ovl_En_Elf/func_80A053F0.s | 4 +- data/z_elf_message.data.s | 14 -- include/functions.h | 6 +- include/variables.h | 2 - include/z64.h | 9 +- include/z64scene.h | 2 +- spec | 1 - src/code/z_elf_message.c | 170 +++++++++++++++++- src/code/z_play.c | 2 +- src/code/z_scene.c | 4 +- 19 files changed, 184 insertions(+), 421 deletions(-) rename asm/non_matchings/code/z_elf_message/{func_8006BBC0.s => ElfMessage_CheckCondition.s} (99%) delete mode 100644 asm/non_matchings/code/z_elf_message/func_8006BE88.s delete mode 100644 asm/non_matchings/code/z_elf_message/func_8006BF1C.s delete mode 100644 asm/non_matchings/code/z_elf_message/func_8006C0FC.s delete mode 100644 asm/non_matchings/code/z_elf_message/func_8006C2B0.s delete mode 100644 asm/non_matchings/code/z_elf_message/func_8006C318.s delete mode 100644 data/z_elf_message.data.s diff --git a/asm/non_matchings/code/z_elf_message/func_8006BBC0.s b/asm/non_matchings/code/z_elf_message/ElfMessage_CheckCondition.s similarity index 99% rename from asm/non_matchings/code/z_elf_message/func_8006BBC0.s rename to asm/non_matchings/code/z_elf_message/ElfMessage_CheckCondition.s index 56f71e7c88..abff1734ae 100644 --- a/asm/non_matchings/code/z_elf_message/func_8006BBC0.s +++ b/asm/non_matchings/code/z_elf_message/ElfMessage_CheckCondition.s @@ -91,7 +91,7 @@ glabel jtbl_8013B8C8 .word L8006BE10 .text -glabel func_8006BBC0 +glabel ElfMessage_CheckCondition /* AE2D60 8006BBC0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AE2D64 8006BBC4 AFBF0014 */ sw $ra, 0x14($sp) /* AE2D68 8006BBC8 90850000 */ lbu $a1, ($a0) diff --git a/asm/non_matchings/code/z_elf_message/func_8006BE88.s b/asm/non_matchings/code/z_elf_message/func_8006BE88.s deleted file mode 100644 index 0915b36fbe..0000000000 --- a/asm/non_matchings/code/z_elf_message/func_8006BE88.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_8006BE88 -/* AE3028 8006BE88 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AE302C 8006BE8C AFBF0024 */ sw $ra, 0x24($sp) -/* AE3030 8006BE90 AFB20020 */ sw $s2, 0x20($sp) -/* AE3034 8006BE94 AFB1001C */ sw $s1, 0x1c($sp) -/* AE3038 8006BE98 AFB00018 */ sw $s0, 0x18($sp) -/* AE303C 8006BE9C 8C850000 */ lw $a1, ($a0) -/* AE3040 8006BEA0 24120020 */ li $s2, 32 -/* AE3044 8006BEA4 00808025 */ move $s0, $a0 -/* AE3048 8006BEA8 90AE0000 */ lbu $t6, ($a1) -/* AE304C 8006BEAC 24110001 */ li $s1, 1 -/* AE3050 8006BEB0 31CF00E0 */ andi $t7, $t6, 0xe0 -/* AE3054 8006BEB4 164F000D */ bne $s2, $t7, .L8006BEEC -/* AE3058 8006BEB8 00000000 */ nop -.L8006BEBC: -/* AE305C 8006BEBC 0C01AEF0 */ jal func_8006BBC0 -/* AE3060 8006BEC0 00A02025 */ move $a0, $a1 -/* AE3064 8006BEC4 54400003 */ bnezl $v0, .L8006BED4 -/* AE3068 8006BEC8 8E180000 */ lw $t8, ($s0) -/* AE306C 8006BECC 00008825 */ move $s1, $zero -/* AE3070 8006BED0 8E180000 */ lw $t8, ($s0) -.L8006BED4: -/* AE3074 8006BED4 27050004 */ addiu $a1, $t8, 4 -/* AE3078 8006BED8 AE050000 */ sw $a1, ($s0) -/* AE307C 8006BEDC 90A80000 */ lbu $t0, ($a1) -/* AE3080 8006BEE0 310900E0 */ andi $t1, $t0, 0xe0 -/* AE3084 8006BEE4 1249FFF5 */ beq $s2, $t1, .L8006BEBC -/* AE3088 8006BEE8 00000000 */ nop -.L8006BEEC: -/* AE308C 8006BEEC 12200005 */ beqz $s1, .L8006BF04 -/* AE3090 8006BEF0 00001025 */ move $v0, $zero -/* AE3094 8006BEF4 0C01AEF0 */ jal func_8006BBC0 -/* AE3098 8006BEF8 00A02025 */ move $a0, $a1 -/* AE309C 8006BEFC 10000002 */ b .L8006BF08 -/* AE30A0 8006BF00 8FBF0024 */ lw $ra, 0x24($sp) -.L8006BF04: -/* AE30A4 8006BF04 8FBF0024 */ lw $ra, 0x24($sp) -.L8006BF08: -/* AE30A8 8006BF08 8FB00018 */ lw $s0, 0x18($sp) -/* AE30AC 8006BF0C 8FB1001C */ lw $s1, 0x1c($sp) -/* AE30B0 8006BF10 8FB20020 */ lw $s2, 0x20($sp) -/* AE30B4 8006BF14 03E00008 */ jr $ra -/* AE30B8 8006BF18 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/z_elf_message/func_8006BF1C.s b/asm/non_matchings/code/z_elf_message/func_8006BF1C.s deleted file mode 100644 index 3f686b48de..0000000000 --- a/asm/non_matchings/code/z_elf_message/func_8006BF1C.s +++ /dev/null @@ -1,144 +0,0 @@ -glabel func_8006BF1C -/* AE30BC 8006BF1C 27BDFF90 */ addiu $sp, $sp, -0x70 -/* AE30C0 8006BF20 AFB30020 */ sw $s3, 0x20($sp) -/* AE30C4 8006BF24 AFB2001C */ sw $s2, 0x1c($sp) -/* AE30C8 8006BF28 AFB10018 */ sw $s1, 0x18($sp) -/* AE30CC 8006BF2C AFBF0024 */ sw $ra, 0x24($sp) -/* AE30D0 8006BF30 AFB00014 */ sw $s0, 0x14($sp) -/* AE30D4 8006BF34 00808825 */ move $s1, $a0 -/* AE30D8 8006BF38 8C900000 */ lw $s0, ($a0) -/* AE30DC 8006BF3C 00009025 */ move $s2, $zero -/* AE30E0 8006BF40 00009825 */ move $s3, $zero -/* AE30E4 8006BF44 27A30044 */ addiu $v1, $sp, 0x44 -.L8006BF48: -/* AE30E8 8006BF48 02002025 */ move $a0, $s0 -/* AE30EC 8006BF4C 0C01AEF0 */ jal func_8006BBC0 -/* AE30F0 8006BF50 AFA30030 */ sw $v1, 0x30($sp) -/* AE30F4 8006BF54 8FA30030 */ lw $v1, 0x30($sp) -/* AE30F8 8006BF58 24010040 */ li $at, 64 -/* AE30FC 8006BF5C 02429021 */ addu $s2, $s2, $v0 -/* AE3100 8006BF60 AC620000 */ sw $v0, ($v1) -/* AE3104 8006BF64 920E0004 */ lbu $t6, 4($s0) -/* AE3108 8006BF68 26730001 */ addiu $s3, $s3, 1 -/* AE310C 8006BF6C 26100004 */ addiu $s0, $s0, 4 -/* AE3110 8006BF70 31CF00E0 */ andi $t7, $t6, 0xe0 -/* AE3114 8006BF74 11E1FFF4 */ beq $t7, $at, .L8006BF48 -/* AE3118 8006BF78 24630004 */ addiu $v1, $v1, 4 -/* AE311C 8006BF7C 56400004 */ bnezl $s2, .L8006BF90 -/* AE3120 8006BF80 44922000 */ mtc1 $s2, $f4 -/* AE3124 8006BF84 10000056 */ b .L8006C0E0 -/* AE3128 8006BF88 00001025 */ move $v0, $zero -/* AE312C 8006BF8C 44922000 */ mtc1 $s2, $f4 -.L8006BF90: -/* AE3130 8006BF90 0C00CFBE */ jal Math_Rand_ZeroFloat -/* AE3134 8006BF94 46802320 */ cvt.s.w $f12, $f4 -/* AE3138 8006BF98 4600018D */ trunc.w.s $f6, $f0 -/* AE313C 8006BF9C 00009025 */ move $s2, $zero -/* AE3140 8006BFA0 32650003 */ andi $a1, $s3, 3 -/* AE3144 8006BFA4 44023000 */ mfc1 $v0, $f6 -/* AE3148 8006BFA8 5A60004D */ blezl $s3, .L8006C0E0 -/* AE314C 8006BFAC 00001025 */ move $v0, $zero -/* AE3150 8006BFB0 10A00014 */ beqz $a1, .L8006C004 -/* AE3154 8006BFB4 00A02025 */ move $a0, $a1 -/* AE3158 8006BFB8 0000C880 */ sll $t9, $zero, 2 -/* AE315C 8006BFBC 27A80044 */ addiu $t0, $sp, 0x44 -/* AE3160 8006BFC0 03281821 */ addu $v1, $t9, $t0 -.L8006BFC4: -/* AE3164 8006BFC4 8C690000 */ lw $t1, ($v1) -/* AE3168 8006BFC8 51200008 */ beql $t1, $zero, .L8006BFEC -/* AE316C 8006BFCC 8E2A0000 */ lw $t2, ($s1) -/* AE3170 8006BFD0 18400003 */ blez $v0, .L8006BFE0 -/* AE3174 8006BFD4 00000000 */ nop -/* AE3178 8006BFD8 10000003 */ b .L8006BFE8 -/* AE317C 8006BFDC 2442FFFF */ addiu $v0, $v0, -1 -.L8006BFE0: -/* AE3180 8006BFE0 1000003F */ b .L8006C0E0 -/* AE3184 8006BFE4 24020001 */ li $v0, 1 -.L8006BFE8: -/* AE3188 8006BFE8 8E2A0000 */ lw $t2, ($s1) -.L8006BFEC: -/* AE318C 8006BFEC 26520001 */ addiu $s2, $s2, 1 -/* AE3190 8006BFF0 24630004 */ addiu $v1, $v1, 4 -/* AE3194 8006BFF4 254B0004 */ addiu $t3, $t2, 4 -/* AE3198 8006BFF8 1492FFF2 */ bne $a0, $s2, .L8006BFC4 -/* AE319C 8006BFFC AE2B0000 */ sw $t3, ($s1) -/* AE31A0 8006C000 12530036 */ beq $s2, $s3, .L8006C0DC -.L8006C004: -/* AE31A4 8006C004 00126080 */ sll $t4, $s2, 2 -/* AE31A8 8006C008 27AD0044 */ addiu $t5, $sp, 0x44 -/* AE31AC 8006C00C 018D1821 */ addu $v1, $t4, $t5 -.L8006C010: -/* AE31B0 8006C010 8C6E0000 */ lw $t6, ($v1) -/* AE31B4 8006C014 51C00008 */ beql $t6, $zero, .L8006C038 -/* AE31B8 8006C018 8E2F0000 */ lw $t7, ($s1) -/* AE31BC 8006C01C 18400003 */ blez $v0, .L8006C02C -/* AE31C0 8006C020 00000000 */ nop -/* AE31C4 8006C024 10000003 */ b .L8006C034 -/* AE31C8 8006C028 2442FFFF */ addiu $v0, $v0, -1 -.L8006C02C: -/* AE31CC 8006C02C 1000002C */ b .L8006C0E0 -/* AE31D0 8006C030 24020001 */ li $v0, 1 -.L8006C034: -/* AE31D4 8006C034 8E2F0000 */ lw $t7, ($s1) -.L8006C038: -/* AE31D8 8006C038 25F80004 */ addiu $t8, $t7, 4 -/* AE31DC 8006C03C AE380000 */ sw $t8, ($s1) -/* AE31E0 8006C040 8C790004 */ lw $t9, 4($v1) -/* AE31E4 8006C044 53200008 */ beql $t9, $zero, .L8006C068 -/* AE31E8 8006C048 8E280000 */ lw $t0, ($s1) -/* AE31EC 8006C04C 18400003 */ blez $v0, .L8006C05C -/* AE31F0 8006C050 00000000 */ nop -/* AE31F4 8006C054 10000003 */ b .L8006C064 -/* AE31F8 8006C058 2442FFFF */ addiu $v0, $v0, -1 -.L8006C05C: -/* AE31FC 8006C05C 10000020 */ b .L8006C0E0 -/* AE3200 8006C060 24020001 */ li $v0, 1 -.L8006C064: -/* AE3204 8006C064 8E280000 */ lw $t0, ($s1) -.L8006C068: -/* AE3208 8006C068 25090004 */ addiu $t1, $t0, 4 -/* AE320C 8006C06C AE290000 */ sw $t1, ($s1) -/* AE3210 8006C070 8C6A0008 */ lw $t2, 8($v1) -/* AE3214 8006C074 51400008 */ beql $t2, $zero, .L8006C098 -/* AE3218 8006C078 8E2B0000 */ lw $t3, ($s1) -/* AE321C 8006C07C 18400003 */ blez $v0, .L8006C08C -/* AE3220 8006C080 00000000 */ nop -/* AE3224 8006C084 10000003 */ b .L8006C094 -/* AE3228 8006C088 2442FFFF */ addiu $v0, $v0, -1 -.L8006C08C: -/* AE322C 8006C08C 10000014 */ b .L8006C0E0 -/* AE3230 8006C090 24020001 */ li $v0, 1 -.L8006C094: -/* AE3234 8006C094 8E2B0000 */ lw $t3, ($s1) -.L8006C098: -/* AE3238 8006C098 256C0004 */ addiu $t4, $t3, 4 -/* AE323C 8006C09C AE2C0000 */ sw $t4, ($s1) -/* AE3240 8006C0A0 8C6D000C */ lw $t5, 0xc($v1) -/* AE3244 8006C0A4 51A00008 */ beql $t5, $zero, .L8006C0C8 -/* AE3248 8006C0A8 8E2E0000 */ lw $t6, ($s1) -/* AE324C 8006C0AC 18400003 */ blez $v0, .L8006C0BC -/* AE3250 8006C0B0 00000000 */ nop -/* AE3254 8006C0B4 10000003 */ b .L8006C0C4 -/* AE3258 8006C0B8 2442FFFF */ addiu $v0, $v0, -1 -.L8006C0BC: -/* AE325C 8006C0BC 10000008 */ b .L8006C0E0 -/* AE3260 8006C0C0 24020001 */ li $v0, 1 -.L8006C0C4: -/* AE3264 8006C0C4 8E2E0000 */ lw $t6, ($s1) -.L8006C0C8: -/* AE3268 8006C0C8 26520004 */ addiu $s2, $s2, 4 -/* AE326C 8006C0CC 24630010 */ addiu $v1, $v1, 0x10 -/* AE3270 8006C0D0 25CF0004 */ addiu $t7, $t6, 4 -/* AE3274 8006C0D4 1653FFCE */ bne $s2, $s3, .L8006C010 -/* AE3278 8006C0D8 AE2F0000 */ sw $t7, ($s1) -.L8006C0DC: -/* AE327C 8006C0DC 00001025 */ move $v0, $zero -.L8006C0E0: -/* AE3280 8006C0E0 8FBF0024 */ lw $ra, 0x24($sp) -/* AE3284 8006C0E4 8FB00014 */ lw $s0, 0x14($sp) -/* AE3288 8006C0E8 8FB10018 */ lw $s1, 0x18($sp) -/* AE328C 8006C0EC 8FB2001C */ lw $s2, 0x1c($sp) -/* AE3290 8006C0F0 8FB30020 */ lw $s3, 0x20($sp) -/* AE3294 8006C0F4 03E00008 */ jr $ra -/* AE3298 8006C0F8 27BD0070 */ addiu $sp, $sp, 0x70 - diff --git a/asm/non_matchings/code/z_elf_message/func_8006C0FC.s b/asm/non_matchings/code/z_elf_message/func_8006C0FC.s deleted file mode 100644 index 8fb62237d1..0000000000 --- a/asm/non_matchings/code/z_elf_message/func_8006C0FC.s +++ /dev/null @@ -1,145 +0,0 @@ -.rdata -glabel D_8013B87C - .asciz "../z_elf_message.c" - .balign 4 - -glabel D_8013B890 - .asciz "\"企画外 条件\" = %s\n" - # EUC-JP: 企画外 条件 | Unplanned conditions - .balign 4 - -glabel D_8013B8A4 - .asciz "企画外 条件" - # EUC-JP: 企画外 条件 | Unplanned conditions - .balign 4 - -glabel D_8013B8B0 - .asciz "0" - .balign 4 - -glabel D_8013B8B4 - .asciz "../z_elf_message.c" - .balign 4 - -.text -glabel func_8006C0FC -/* AE329C 8006C0FC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* AE32A0 8006C100 AFBE0038 */ sw $fp, 0x38($sp) -/* AE32A4 8006C104 AFB70034 */ sw $s7, 0x34($sp) -/* AE32A8 8006C108 AFB60030 */ sw $s6, 0x30($sp) -/* AE32AC 8006C10C AFB5002C */ sw $s5, 0x2c($sp) -/* AE32B0 8006C110 AFB40028 */ sw $s4, 0x28($sp) -/* AE32B4 8006C114 AFB30024 */ sw $s3, 0x24($sp) -/* AE32B8 8006C118 AFB20020 */ sw $s2, 0x20($sp) -/* AE32BC 8006C11C AFB1001C */ sw $s1, 0x1c($sp) -/* AE32C0 8006C120 AFB00018 */ sw $s0, 0x18($sp) -/* AE32C4 8006C124 3C158014 */ lui $s5, %hi(D_8013B87C) # $s5, 0x8014 -/* AE32C8 8006C128 3C168014 */ lui $s6, %hi(D_8013B890) # $s6, 0x8014 -/* AE32CC 8006C12C 3C178014 */ lui $s7, %hi(D_8013B8A4) # $s7, 0x8014 -/* AE32D0 8006C130 3C1E8014 */ lui $fp, %hi(D_8013B8B0) # $fp, 0x8014 -/* AE32D4 8006C134 AFBF003C */ sw $ra, 0x3c($sp) -/* AE32D8 8006C138 AFA40040 */ sw $a0, 0x40($sp) -/* AE32DC 8006C13C 27DEB8B0 */ addiu $fp, %lo(D_8013B8B0) # addiu $fp, $fp, -0x4750 -/* AE32E0 8006C140 26F7B8A4 */ addiu $s7, %lo(D_8013B8A4) # addiu $s7, $s7, -0x475c -/* AE32E4 8006C144 26D6B890 */ addiu $s6, %lo(D_8013B890) # addiu $s6, $s6, -0x4770 -/* AE32E8 8006C148 26B5B87C */ addiu $s5, %lo(D_8013B87C) # addiu $s5, $s5, -0x4784 -/* AE32EC 8006C14C 27B00040 */ addiu $s0, $sp, 0x40 -/* AE32F0 8006C150 24110020 */ li $s1, 32 -/* AE32F4 8006C154 24120040 */ li $s2, 64 -/* AE32F8 8006C158 24130060 */ li $s3, 96 -/* AE32FC 8006C15C 241400E0 */ li $s4, 224 -.L8006C160: -/* AE3300 8006C160 8FAE0040 */ lw $t6, 0x40($sp) -/* AE3304 8006C164 91C20000 */ lbu $v0, ($t6) -/* AE3308 8006C168 304200E0 */ andi $v0, $v0, 0xe0 -/* AE330C 8006C16C 1040000B */ beqz $v0, .L8006C19C -/* AE3310 8006C170 00000000 */ nop -/* AE3314 8006C174 10510012 */ beq $v0, $s1, .L8006C1C0 -/* AE3318 8006C178 00000000 */ nop -/* AE331C 8006C17C 10520019 */ beq $v0, $s2, .L8006C1E4 -/* AE3320 8006C180 00000000 */ nop -/* AE3324 8006C184 10530020 */ beq $v0, $s3, .L8006C208 -/* AE3328 8006C188 02A02025 */ move $a0, $s5 -/* AE332C 8006C18C 5054002A */ beql $v0, $s4, .L8006C238 -/* AE3330 8006C190 8FAE0040 */ lw $t6, 0x40($sp) -/* AE3334 8006C194 1000002C */ b .L8006C248 -/* AE3338 8006C198 00000000 */ nop -.L8006C19C: -/* AE333C 8006C19C 0C01AEF0 */ jal func_8006BBC0 -/* AE3340 8006C1A0 8FA40040 */ lw $a0, 0x40($sp) -/* AE3344 8006C1A4 50400033 */ beql $v0, $zero, .L8006C274 -/* AE3348 8006C1A8 8FAF0040 */ lw $t7, 0x40($sp) -/* AE334C 8006C1AC 8FAF0040 */ lw $t7, 0x40($sp) -/* AE3350 8006C1B0 91E20002 */ lbu $v0, 2($t7) -/* AE3354 8006C1B4 34420100 */ ori $v0, $v0, 0x100 -/* AE3358 8006C1B8 10000031 */ b .L8006C280 -/* AE335C 8006C1BC 3042FFFF */ andi $v0, $v0, 0xffff -.L8006C1C0: -/* AE3360 8006C1C0 0C01AFA2 */ jal func_8006BE88 -/* AE3364 8006C1C4 02002025 */ move $a0, $s0 -/* AE3368 8006C1C8 5040002A */ beql $v0, $zero, .L8006C274 -/* AE336C 8006C1CC 8FAF0040 */ lw $t7, 0x40($sp) -/* AE3370 8006C1D0 8FB80040 */ lw $t8, 0x40($sp) -/* AE3374 8006C1D4 93020002 */ lbu $v0, 2($t8) -/* AE3378 8006C1D8 34420100 */ ori $v0, $v0, 0x100 -/* AE337C 8006C1DC 10000028 */ b .L8006C280 -/* AE3380 8006C1E0 3042FFFF */ andi $v0, $v0, 0xffff -.L8006C1E4: -/* AE3384 8006C1E4 0C01AFC7 */ jal func_8006BF1C -/* AE3388 8006C1E8 02002025 */ move $a0, $s0 -/* AE338C 8006C1EC 50400021 */ beql $v0, $zero, .L8006C274 -/* AE3390 8006C1F0 8FAF0040 */ lw $t7, 0x40($sp) -/* AE3394 8006C1F4 8FB90040 */ lw $t9, 0x40($sp) -/* AE3398 8006C1F8 93220002 */ lbu $v0, 2($t9) -/* AE339C 8006C1FC 34420100 */ ori $v0, $v0, 0x100 -/* AE33A0 8006C200 1000001F */ b .L8006C280 -/* AE33A4 8006C204 3042FFFF */ andi $v0, $v0, 0xffff -.L8006C208: -/* AE33A8 8006C208 0C01AEF0 */ jal func_8006BBC0 -/* AE33AC 8006C20C 8FA40040 */ lw $a0, 0x40($sp) -/* AE33B0 8006C210 10400017 */ beqz $v0, .L8006C270 -/* AE33B4 8006C214 8FA80040 */ lw $t0, 0x40($sp) -/* AE33B8 8006C218 910A0002 */ lbu $t2, 2($t0) -/* AE33BC 8006C21C 000A5880 */ sll $t3, $t2, 2 -/* AE33C0 8006C220 010B6021 */ addu $t4, $t0, $t3 -/* AE33C4 8006C224 AFAC0040 */ sw $t4, 0x40($sp) -/* AE33C8 8006C228 258DFFFC */ addiu $t5, $t4, -4 -/* AE33CC 8006C22C 10000010 */ b .L8006C270 -/* AE33D0 8006C230 AFAD0040 */ sw $t5, 0x40($sp) -/* AE33D4 8006C234 8FAE0040 */ lw $t6, 0x40($sp) -.L8006C238: -/* AE33D8 8006C238 91C20002 */ lbu $v0, 2($t6) -/* AE33DC 8006C23C 34420100 */ ori $v0, $v0, 0x100 -/* AE33E0 8006C240 1000000F */ b .L8006C280 -/* AE33E4 8006C244 3042FFFF */ andi $v0, $v0, 0xffff -.L8006C248: -/* AE33E8 8006C248 0C000B84 */ jal LogUtils_LogThreadId -/* AE33EC 8006C24C 24050119 */ li $a1, 281 -/* AE33F0 8006C250 02C02025 */ move $a0, $s6 -/* AE33F4 8006C254 0C00084C */ jal osSyncPrintf -/* AE33F8 8006C258 02E02825 */ move $a1, $s7 -/* AE33FC 8006C25C 3C058014 */ lui $a1, %hi(D_8013B8B4) # $a1, 0x8014 -/* AE3400 8006C260 24A5B8B4 */ addiu $a1, %lo(D_8013B8B4) # addiu $a1, $a1, -0x474c -/* AE3404 8006C264 03C02025 */ move $a0, $fp -/* AE3408 8006C268 0C0007FC */ jal __assert -/* AE340C 8006C26C 2406011A */ li $a2, 282 -.L8006C270: -/* AE3410 8006C270 8FAF0040 */ lw $t7, 0x40($sp) -.L8006C274: -/* AE3414 8006C274 25F80004 */ addiu $t8, $t7, 4 -/* AE3418 8006C278 1000FFB9 */ b .L8006C160 -/* AE341C 8006C27C AFB80040 */ sw $t8, 0x40($sp) -.L8006C280: -/* AE3420 8006C280 8FBF003C */ lw $ra, 0x3c($sp) -/* AE3424 8006C284 8FB00018 */ lw $s0, 0x18($sp) -/* AE3428 8006C288 8FB1001C */ lw $s1, 0x1c($sp) -/* AE342C 8006C28C 8FB20020 */ lw $s2, 0x20($sp) -/* AE3430 8006C290 8FB30024 */ lw $s3, 0x24($sp) -/* AE3434 8006C294 8FB40028 */ lw $s4, 0x28($sp) -/* AE3438 8006C298 8FB5002C */ lw $s5, 0x2c($sp) -/* AE343C 8006C29C 8FB60030 */ lw $s6, 0x30($sp) -/* AE3440 8006C2A0 8FB70034 */ lw $s7, 0x34($sp) -/* AE3444 8006C2A4 8FBE0038 */ lw $fp, 0x38($sp) -/* AE3448 8006C2A8 03E00008 */ jr $ra -/* AE344C 8006C2AC 27BD0040 */ addiu $sp, $sp, 0x40 - diff --git a/asm/non_matchings/code/z_elf_message/func_8006C2B0.s b/asm/non_matchings/code/z_elf_message/func_8006C2B0.s deleted file mode 100644 index 578fa29f27..0000000000 --- a/asm/non_matchings/code/z_elf_message/func_8006C2B0.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_8006C2B0 -/* AE3450 8006C2B0 3C0E8016 */ lui $t6, %hi(gSaveContext+4) # $t6, 0x8016 -/* AE3454 8006C2B4 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) -/* AE3458 8006C2B8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AE345C 8006C2BC AFBF001C */ sw $ra, 0x1c($sp) -/* AE3460 8006C2C0 11C0000D */ beqz $t6, .L8006C2F8 -/* AE3464 8006C2C4 8C851C44 */ lw $a1, 0x1c44($a0) -/* AE3468 8006C2C8 3C014448 */ li $at, 0x44480000 # 0.000000 -/* AE346C 8006C2CC 44812000 */ mtc1 $at, $f4 -/* AE3470 8006C2D0 24060146 */ li $a2, 326 -/* AE3474 8006C2D4 24070004 */ li $a3, 4 -/* AE3478 8006C2D8 0C00D4FD */ jal Actor_FindNearby -/* AE347C 8006C2DC E7A40010 */ swc1 $f4, 0x10($sp) -/* AE3480 8006C2E0 14400003 */ bnez $v0, .L8006C2F0 -/* AE3484 8006C2E4 3C048012 */ lui $a0, %hi(D_8011F3A0) # $a0, 0x8012 -/* AE3488 8006C2E8 10000005 */ b .L8006C300 -/* AE348C 8006C2EC 2484F3A0 */ addiu $a0, %lo(D_8011F3A0) # addiu $a0, $a0, -0xc60 -.L8006C2F0: -/* AE3490 8006C2F0 10000005 */ b .L8006C308 -/* AE3494 8006C2F4 24020160 */ li $v0, 352 -.L8006C2F8: -/* AE3498 8006C2F8 3C048012 */ lui $a0, %hi(D_8011F3D4) # $a0, 0x8012 -/* AE349C 8006C2FC 2484F3D4 */ addiu $a0, %lo(D_8011F3D4) # addiu $a0, $a0, -0xc2c -.L8006C300: -/* AE34A0 8006C300 0C01B03F */ jal func_8006C0FC -/* AE34A4 8006C304 00000000 */ nop -.L8006C308: -/* AE34A8 8006C308 8FBF001C */ lw $ra, 0x1c($sp) -/* AE34AC 8006C30C 27BD0020 */ addiu $sp, $sp, 0x20 -/* AE34B0 8006C310 03E00008 */ jr $ra -/* AE34B4 8006C314 00000000 */ nop - diff --git a/asm/non_matchings/code/z_elf_message/func_8006C318.s b/asm/non_matchings/code/z_elf_message/func_8006C318.s deleted file mode 100644 index 8b96baa558..0000000000 --- a/asm/non_matchings/code/z_elf_message/func_8006C318.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8006C318 -/* AE34B8 8006C318 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AE34BC 8006C31C 3C050001 */ lui $a1, 1 -/* AE34C0 8006C320 AFBF0014 */ sw $ra, 0x14($sp) -/* AE34C4 8006C324 00A42821 */ addu $a1, $a1, $a0 -/* AE34C8 8006C328 8CA51E0C */ lw $a1, 0x1e0c($a1) -/* AE34CC 8006C32C 14A00003 */ bnez $a1, .L8006C33C -/* AE34D0 8006C330 00000000 */ nop -/* AE34D4 8006C334 10000003 */ b .L8006C344 -/* AE34D8 8006C338 00001025 */ move $v0, $zero -.L8006C33C: -/* AE34DC 8006C33C 0C01B03F */ jal func_8006C0FC -/* AE34E0 8006C340 00A02025 */ move $a0, $a1 -.L8006C344: -/* AE34E4 8006C344 8FBF0014 */ lw $ra, 0x14($sp) -/* AE34E8 8006C348 27BD0018 */ addiu $sp, $sp, 0x18 -/* AE34EC 8006C34C 03E00008 */ jr $ra -/* AE34F0 8006C350 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s index 3ff5a00dfc..98cad4d3c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s @@ -25,7 +25,7 @@ glabel func_80A05040 /* 0346C 80A0509C 10000016 */ beq $zero, $zero, .L80A050F8 /* 03470 80A050A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80A050A4: -/* 03474 80A050A4 0C01B0AC */ jal func_8006C2B0 +/* 03474 80A050A4 0C01B0AC */ jal ElfMessage_GetSariaText /* 03478 80A050A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0347C 80A050AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03480 80A050B0 0C042DC8 */ jal func_8010B720 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s index 43fb335086..9be1706cce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s @@ -14,7 +14,7 @@ glabel func_80A05188 /* 03588 80A051B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0358C 80A051BC 5040000B */ beql $v0, $zero, .L80A051EC /* 03590 80A051C0 8FA40020 */ lw $a0, 0x0020($sp) -/* 03594 80A051C4 0C01B0AC */ jal func_8006C2B0 +/* 03594 80A051C4 0C01B0AC */ jal ElfMessage_GetSariaText /* 03598 80A051C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0359C 80A051CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 035A0 80A051D0 0C042DC8 */ jal func_8010B720 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s index 3591cf30b6..71cbb064cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s @@ -25,7 +25,7 @@ glabel func_80A05208 /* 03634 80A05264 1000001C */ beq $zero, $zero, .L80A052D8 /* 03638 80A05268 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80A0526C: -/* 0363C 80A0526C 0C01B0C6 */ jal func_8006C318 +/* 0363C 80A0526C 0C01B0C6 */ jal ElfMessage_GetCUpText /* 03640 80A05270 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03644 80A05274 10400006 */ beq $v0, $zero, .L80A05290 /* 03648 80A05278 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s index 79339d9553..35c9df9098 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s @@ -26,7 +26,7 @@ glabel func_80A053F0 /* 0381C 80A0544C 51000012 */ beql $t0, $zero, .L80A05498 /* 03820 80A05450 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A05454: -/* 03824 80A05454 0C01B0C6 */ jal func_8006C318 +/* 03824 80A05454 0C01B0C6 */ jal ElfMessage_GetCUpText /* 03828 80A05458 8FA4003C */ lw $a0, 0x003C($sp) /* 0382C 80A0545C 8FA3002C */ lw $v1, 0x002C($sp) /* 03830 80A05460 2401015F */ addiu $at, $zero, 0x015F ## $at = 0000015F @@ -60,7 +60,7 @@ glabel func_80A053F0 /* 03894 80A054C4 8E0D002C */ lw $t5, 0x002C($s0) ## 0000002C /* 03898 80A054C8 AE0C003C */ sw $t4, 0x003C($s0) ## 0000003C /* 0389C 80A054CC AE0D0040 */ sw $t5, 0x0040($s0) ## 00000040 -/* 038A0 80A054D0 0C01B0C6 */ jal func_8006C318 +/* 038A0 80A054D0 0C01B0C6 */ jal ElfMessage_GetCUpText /* 038A4 80A054D4 8FA4003C */ lw $a0, 0x003C($sp) /* 038A8 80A054D8 960E010E */ lhu $t6, 0x010E($s0) ## 0000010E /* 038AC 80A054DC 3C0C80A0 */ lui $t4, %hi(func_80A052F4) ## $t4 = 80A00000 diff --git a/data/z_elf_message.data.s b/data/z_elf_message.data.s deleted file mode 100644 index 6d6ef86d23..0000000000 --- a/data/z_elf_message.data.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macro.inc" - -# assembler directives -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches -.set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_8011F3A0 - .incbin "baserom.z64", 0xB96540, 0x34 - -glabel D_8011F3D4 - .incbin "baserom.z64", 0xB96574, 0x1C diff --git a/include/functions.h b/include/functions.h index b5262044f6..63231e6983 100644 --- a/include/functions.h +++ b/include/functions.h @@ -796,10 +796,8 @@ void func_800694A0(GlobalContext* globalCtx, s16 drawId); // ? func_8006BA00(?); // ? func_8006BA30(?); void Audio_PlaySoundAtPosition(GlobalContext* globalCtx, Vec3f* pos2, s32 radius, u16 sfxId); -// ? func_8006BBC0(?); -// ? func_8006BE88(?); -// ? func_8006BF1C(?); -// ? func_8006C0FC(?); +u16 ElfMessage_GetSariaText(GlobalContext* globalCtx); +u16 ElfMessage_GetCUpText(GlobalContext* globalCtx); u16 Text_GetFaceReaction(GlobalContext* globalCtx, u32 reactionSet); // ? func_8006C3A0(?); // ? func_8006C3D0(?); diff --git a/include/variables.h b/include/variables.h index e44e42f026..acfee0d086 100644 --- a/include/variables.h +++ b/include/variables.h @@ -263,8 +263,6 @@ extern s32 D_8011D3AC; extern s16 D_8011E0B0; extern Color_RGBA8 D_8011E0B4[]; //extern ? D_8011E0D4; -//extern ? D_8011F3A0; -//extern ? D_8011F3D4; //extern ? D_8011F830; //extern ? D_8011F860; //extern ? D_8011F890; diff --git a/include/z64.h b/include/z64.h index dfa5d3376f..4339f7fd86 100644 --- a/include/z64.h +++ b/include/z64.h @@ -801,6 +801,13 @@ typedef struct /* 0x00A8 */ View view; } SampleContext; +typedef struct { + /* 0x00 */ u8 byte0; + /* 0x01 */ u8 byte1; + /* 0x02 */ u8 byte2; + /* 0x03 */ u8 byte3; +} ElfMessage; // size = 0x4 + // Global Context (dbg ram start: 80212020) typedef struct GlobalContext { /* 0x00000 */ GameState state; @@ -902,7 +909,7 @@ typedef struct GlobalContext { /* 0x11E00 */ EntranceEntry* setupEntranceList; /* 0x11E04 */ UNK_PTR setupExitList; /* 0x11E08 */ Path* setupPathList; - /* 0x11E0C */ UNK_PTR naviMsgSegment; + /* 0x11E0C */ ElfMessage* cUpElfMsgs; /* 0x11E10 */ char unk_11E10[0x4]; /* 0x11E14 */ u8 skyboxId; /* 0x11E15 */ s8 sceneLoadFlag; // "fade_direction" diff --git a/include/z64scene.h b/include/z64scene.h index 28db2047e1..c808395878 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -66,7 +66,7 @@ typedef struct { typedef struct { /* 0x00 */ u8 code; - /* 0x01 */ u8 naviMsgNum; + /* 0x01 */ u8 cUpElfMsgNum; /* 0x04 */ u32 keepObjectId; } SCmdSpecialFiles; diff --git a/spec b/spec index da12c066a4..fae8d82790 100644 --- a/spec +++ b/spec @@ -314,7 +314,6 @@ beginseg include "build/src/code/z_draw.o" include "build/asm/code_8006BA00.o" include "build/src/code/z_elf_message.o" - include "build/data/z_elf_message.data.o" include "build/src/code/z_face_reaction.o" include "build/src/code/code_8006C3A0.o" include "build/src/code/code_8006C510.o" diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c index dabceae8c1..3828c6823c 100644 --- a/src/code/z_elf_message.c +++ b/src/code/z_elf_message.c @@ -1,14 +1,172 @@ #include #include -#pragma GLOBAL_ASM("asm/non_matchings/code/z_elf_message/func_8006BBC0.s") +// TODO: use macros to define elf messages once the format is fully documented +ElfMessage sChildSariaMsgs[] = { + { 0x66, 0x00, 0x03, 0x00 }, { 0x00, 0x37, 0x61, 0x00 }, { 0xE0, 0x00, 0x64, 0x00 }, { 0x00, 0x25, 0x62, 0x00 }, + { 0x00, 0x37, 0x63, 0x00 }, { 0x00, 0x43, 0x65, 0x00 }, { 0x06, 0x30, 0x66, 0x66 }, { 0x06, 0x30, 0x66, 0x67 }, + { 0x06, 0x30, 0x66, 0x68 }, { 0x06, 0x20, 0x67, 0x65 }, { 0x06, 0x30, 0x68, 0x69 }, { 0x06, 0x30, 0x68, 0x6A }, + { 0xE0, 0x00, 0x69, 0x00 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_elf_message/func_8006BE88.s") +ElfMessage sAdultSariaMsgs[] = { + { 0x06, 0x30, 0x6A, 0x66 }, { 0x06, 0x30, 0x6B, 0x67 }, { 0x06, 0x30, 0x6B, 0x68 }, + { 0x06, 0x30, 0x6C, 0x69 }, { 0x06, 0x30, 0x6C, 0x6A }, { 0xE0, 0x00, 0x6D, 0x00 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_elf_message/func_8006BF1C.s") +#ifdef NON_MATCHING +// minor ordering and regalloc differences +u32 ElfMessage_CheckCondition(ElfMessage* msg) { + u16 temp; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_elf_message/func_8006C0FC.s") + switch (msg->byte0 & 0x1E) { + case 0: + temp = 1 << (msg->byte1 & 0x0F); + return ((msg->byte0 & 1) == 1) == !!(gSaveContext.event_chk_inf[(msg->byte1 & 0xF0) >> 4] & temp); + case 2: + return ((msg->byte0 & 1) == 1) == + !!(gBitFlags[msg->byte1 - ITEM_KEY_BOSS] & gSaveContext.dungeon_items[gSaveContext.dungeon_index]); + case 4: + return ((msg->byte0 & 1) == 1) == (msg->byte3 == INV_CONTENT(msg->byte1)); + case 6: + switch (msg->byte1 & 0xF0) { + case 0x00: + return ((msg->byte0 & 1) == 1) == ((msg->byte1 & 0x0F) == CUR_UPG_VALUE(UPG_STRENGTH)); + case 0x10: + return ((msg->byte0 & 1) == 1) == + !!((gBitFlags[msg->byte3 - ITEM_BOOTS_KOKIRI] << gEquipShifts[EQUIP_BOOTS]) & + gSaveContext.equipment); + case 0x20: + return ((msg->byte0 & 1) == 1) == + !!(gBitFlags[msg->byte3 - ITEM_SONG_MINUET + 6] & gSaveContext.quest_items); + case 0x30: + return ((msg->byte0 & 1) == 1) == + !!(gBitFlags[msg->byte3 - ITEM_MEDALLION_FOREST] & gSaveContext.quest_items); + case 0x40: + return ((msg->byte0 & 1) == 1) == !!gSaveContext.magic_acquired; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_elf_message/func_8006C2B0.s") + LogUtils_LogThreadId("../z_elf_message.c", 156); + osSyncPrintf("\"企画外 条件\" = %s\n", "企画外 条件"); // "Unplanned conditions" + __assert("0", "../z_elf_message.c", 157); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_elf_message/func_8006C318.s") + return false; +} +#else +u32 ElfMessage_CheckCondition(ElfMessage* msg); +#pragma GLOBAL_ASM("asm/non_matchings/code/z_elf_message/ElfMessage_CheckCondition.s") +#endif + +u32 func_8006BE88(ElfMessage** msgp) { + u32 temp = true; + + while (((*msgp)->byte0 & 0xE0) == 0x20) { + if (!ElfMessage_CheckCondition(*msgp)) { + temp = false; + } + *msgp += 1; + } + + if (temp) { + return ElfMessage_CheckCondition(*msgp); + } else { + return false; + } +} + +u32 func_8006BF1C(ElfMessage** msgp) { + ElfMessage* msg; + u32 sp44[10]; + s32 temp1; + s32 temp2; + s32 temp3; + + msg = *msgp; + temp1 = 0; + temp2 = 0; + do { + sp44[temp2] = ElfMessage_CheckCondition(msg); + temp1 += sp44[temp2]; + temp2++; + msg++; + } while ((msg->byte0 & 0xE0) == 0x40); + + if (temp1 == 0) { + return false; + } + + temp3 = Math_Rand_ZeroFloat(temp1); + for (temp1 = 0; temp1 < temp2; temp1++) { + if (sp44[temp1]) { + if (temp3 > 0) { + temp3--; + } else { + return true; + } + } + *msgp += 1; + } + + return false; +} + +u16 ElfMessage_GetTextFromMsgs(ElfMessage* msg) { + while (true) { + switch (msg->byte0 & 0xE0) { + case 0x00: + if (ElfMessage_CheckCondition(msg)) { + return msg->byte2 | 0x100; + } + break; + case 0x20: + if (func_8006BE88(&msg)) { + return msg->byte2 | 0x100; + } + break; + case 0x40: + if (func_8006BF1C(&msg)) { + return msg->byte2 | 0x100; + } + break; + case 0x60: + if (ElfMessage_CheckCondition(msg)) { + msg += msg->byte2; + msg--; + } + break; + case 0xE0: + return msg->byte2 | 0x100; + default: + LogUtils_LogThreadId("../z_elf_message.c", 281); + osSyncPrintf("\"企画外 条件\" = %s\n", "企画外 条件"); // "Unplanned conditions" + __assert("0", "../z_elf_message.c", 282); + } + msg++; + } +} + +u16 ElfMessage_GetSariaText(GlobalContext* globalCtx) { + Player* player = PLAYER; + ElfMessage* msgs; + + if (LINK_IS_CHILD) { + if (Actor_FindNearby(globalCtx, &player->actor, ACTOR_EN_SA, 4, 800.0f) == NULL) { + msgs = sChildSariaMsgs; + } else { + return 0x0160; // Special text about Saria preferring to talk to you face-to-face + } + } else { + msgs = sAdultSariaMsgs; + } + + return ElfMessage_GetTextFromMsgs(msgs); +} + +u16 ElfMessage_GetCUpText(GlobalContext* globalCtx) { + if (globalCtx->cUpElfMsgs == NULL) { + return 0; + } else { + return ElfMessage_GetTextFromMsgs(globalCtx->cUpElfMsgs); + } +} diff --git a/src/code/z_play.c b/src/code/z_play.c index 8494f9b99b..a34ab16f7a 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -58,7 +58,7 @@ void func_800BFF0C(GlobalContext* globalCtx, s32 a1) { globalCtx->unk_11DFC = NULL; globalCtx->setupEntranceList = NULL; globalCtx->setupExitList = NULL; - globalCtx->naviMsgSegment = NULL; + globalCtx->cUpElfMsgs = NULL; globalCtx->setupPathList = NULL; globalCtx->nbSetupActors = 0; Object_InitBank(globalCtx, &globalCtx->objectCtx); diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 3a7121b040..6ad51d2ee3 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -260,8 +260,8 @@ void func_8009883C(GlobalContext* globalCtx, SceneCmd* cmd) { gSegments[5] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment); } - if (cmd->specialFiles.naviMsgNum != 0) { - globalCtx->naviMsgSegment = func_800BFE5C(globalCtx, &sNaviMsgFiles[cmd->specialFiles.naviMsgNum - 1]); + if (cmd->specialFiles.cUpElfMsgNum != 0) { + globalCtx->cUpElfMsgs = func_800BFE5C(globalCtx, &sNaviMsgFiles[cmd->specialFiles.cUpElfMsgNum - 1]); } }