From db7692d05726fa8349e9b38ccba9adcb78fe1921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Mon, 17 Oct 2022 09:49:08 +0100 Subject: [PATCH] merge libnw4r_g3d --- .../{g3d_3dsmax_800e8610.s => g3d_3dsmax.s} | 52 ++ asm/libnw4r_g3d/g3d_3dsmax_80408e58.s | 24 - asm/libnw4r_g3d/g3d_3dsmax_8055f0a8.s | 28 - .../{g3d_anmchr_800d7e20.s => g3d_anmchr.s} | 168 ++++++ asm/libnw4r_g3d/g3d_anmchr_80408528.s | 38 -- asm/libnw4r_g3d/g3d_anmchr_80440b70.s | 106 ---- asm/libnw4r_g3d/g3d_anmchr_8055ef60.s | 24 - .../{g3d_anmclr_800d4a90.s => g3d_anmclr.s} | 152 +++++ asm/libnw4r_g3d/g3d_anmclr_804083f0.s | 44 -- asm/libnw4r_g3d/g3d_anmclr_80440810.s | 90 --- asm/libnw4r_g3d/g3d_anmclr_8055ef20.s | 18 - .../{g3d_anmobj_800dbe80.s => g3d_anmobj.s} | 26 + asm/libnw4r_g3d/g3d_anmobj_804085f8.s | 10 - asm/libnw4r_g3d/g3d_anmobj_805569f0.s | 8 - asm/libnw4r_g3d/g3d_anmobj_8055efa8.s | 8 - .../{g3d_anmscn_800da7f0.s => g3d_anmscn.s} | 130 +++++ asm/libnw4r_g3d/g3d_anmscn_804085c8.s | 18 - asm/libnw4r_g3d/g3d_anmscn_80440e10.s | 82 --- asm/libnw4r_g3d/g3d_anmscn_8055ef88.s | 30 - .../{g3d_anmshp_800d9740.s => g3d_anmshp.s} | 154 ++++++ asm/libnw4r_g3d/g3d_anmshp_80408578.s | 38 -- asm/libnw4r_g3d/g3d_anmshp_80440cd0.s | 98 ---- asm/libnw4r_g3d/g3d_anmshp_8055ef78.s | 18 - ...d_anmtexpat_800d6140.s => g3d_anmtexpat.s} | 152 +++++ asm/libnw4r_g3d/g3d_anmtexpat_80408458.s | 44 -- asm/libnw4r_g3d/g3d_anmtexpat_80440930.s | 90 --- asm/libnw4r_g3d/g3d_anmtexpat_8055ef30.s | 18 - ...d_anmtexsrt_800d7000.s => g3d_anmtexsrt.s} | 164 ++++++ asm/libnw4r_g3d/g3d_anmtexsrt_804084c0.s | 44 -- asm/libnw4r_g3d/g3d_anmtexsrt_80440a50.s | 90 --- asm/libnw4r_g3d/g3d_anmtexsrt_8055ef40.s | 30 - .../{g3d_anmvis_800d3880.s => g3d_anmvis.s} | 150 +++++ asm/libnw4r_g3d/g3d_anmvis_804083a0.s | 38 -- asm/libnw4r_g3d/g3d_anmvis_80440700.s | 86 --- asm/libnw4r_g3d/g3d_anmvis_805569e8.s | 8 - asm/libnw4r_g3d/g3d_anmvis_8055ef10.s | 18 - .../{g3d_basic_800e6a10.s => g3d_basic.s} | 18 + asm/libnw4r_g3d/g3d_basic_8055f070.s | 18 - ...material_800f1470.s => g3d_calcmaterial.s} | 0 ...g3d_calcview_800e0dc0.s => g3d_calcview.s} | 32 ++ asm/libnw4r_g3d/g3d_calcview_80408dc8.s | 14 - asm/libnw4r_g3d/g3d_calcview_8055f018.s | 18 - .../{g3d_calcvtx_800f2410.s => g3d_calcvtx.s} | 8 + asm/libnw4r_g3d/g3d_calcvtx_8055f110.s | 8 - ...d_calcworld_800e3170.s => g3d_calcworld.s} | 30 + asm/libnw4r_g3d/g3d_calcworld_80440f68.s | 10 - asm/libnw4r_g3d/g3d_calcworld_80556a00.s | 8 - asm/libnw4r_g3d/g3d_calcworld_8055f028.s | 12 - .../{g3d_camera_800e5af0.s => g3d_camera.s} | 58 ++ asm/libnw4r_g3d/g3d_camera_8055f040.s | 58 -- .../{g3d_cpu_800dc7d0.s => g3d_cpu.s} | 8 + asm/libnw4r_g3d/g3d_cpu_8055efc8.s | 8 - .../{g3d_dcc_800e3060.s => g3d_dcc.s} | 0 .../{g3d_draw_800e3c50.s => g3d_draw.s} | 30 + ...1mat1shp_800e0070.s => g3d_draw1mat1shp.s} | 36 ++ asm/libnw4r_g3d/g3d_draw1mat1shp_80408db8.s | 10 - asm/libnw4r_g3d/g3d_draw1mat1shp_8055eff8.s | 26 - asm/libnw4r_g3d/g3d_draw_80556a08.s | 12 - asm/libnw4r_g3d/g3d_draw_8055f030.s | 18 - .../{g3d_fog_800f17a0.s => g3d_fog.s} | 8 + asm/libnw4r_g3d/g3d_fog_8055f0d8.s | 8 - .../{g3d_gpu_800dbf50.s => g3d_gpu.s} | 32 ++ asm/libnw4r_g3d/g3d_gpu_8055efb0.s | 32 -- .../{g3d_init_800f16b0.s => g3d_init.s} | 32 ++ asm/libnw4r_g3d/g3d_init_80441190.s | 24 - asm/libnw4r_g3d/g3d_init_80556a40.s | 8 - .../{g3d_light_800f1900.s => g3d_light.s} | 58 ++ asm/libnw4r_g3d/g3d_light_8055f0e0.s | 58 -- .../{g3d_maya_800e6ce0.s => g3d_maya.s} | 52 ++ asm/libnw4r_g3d/g3d_maya_80408de8.s | 24 - asm/libnw4r_g3d/g3d_maya_8055f080.s | 28 - .../{g3d_obj_800dbd10.s => g3d_obj.s} | 24 + asm/libnw4r_g3d/g3d_obj_804085e8.s | 10 - asm/libnw4r_g3d/g3d_obj_80440f30.s | 14 - .../{g3d_resanm_800cf440.s => g3d_resanm.s} | 28 + asm/libnw4r_g3d/g3d_resanm_8055ee70.s | 28 - ...blight_800d20b0.s => g3d_resanmamblight.s} | 14 + asm/libnw4r_g3d/g3d_resanmamblight_8055eed0.s | 14 - ...nmcamera_800d26d0.s => g3d_resanmcamera.s} | 0 ...d_resanmchr_800d02d0.s => g3d_resanmchr.s} | 48 ++ asm/libnw4r_g3d/g3d_resanmchr_80408380.s | 14 - asm/libnw4r_g3d/g3d_resanmchr_8055eeb0.s | 34 -- ...d_resanmclr_800cf7d0.s => g3d_resanmclr.s} | 14 + asm/libnw4r_g3d/g3d_resanmclr_8055ee98.s | 14 - ...d_resanmfog_800d2570.s => g3d_resanmfog.s} | 14 + asm/libnw4r_g3d/g3d_resanmfog_8055eef0.s | 14 - ...sanmlight_800d2180.s => g3d_resanmlight.s} | 14 + asm/libnw4r_g3d/g3d_resanmlight_8055eee0.s | 14 - ...d_resanmscn_800d29e0.s => g3d_resanmscn.s} | 62 +++ asm/libnw4r_g3d/g3d_resanmscn_80440660.s | 62 --- ...d_resanmshp_800d3400.s => g3d_resanmshp.s} | 8 + asm/libnw4r_g3d/g3d_resanmshp_8055ef00.s | 8 - ...nmtexpat_800cf940.s => g3d_resanmtexpat.s} | 0 ...nmtexsrt_800cfeb0.s => g3d_resanmtexsrt.s} | 12 + asm/libnw4r_g3d/g3d_resanmtexsrt_8055eea8.s | 12 - ...d_resanmvis_800cf6b0.s => g3d_resanmvis.s} | 14 + asm/libnw4r_g3d/g3d_resanmvis_8055ee88.s | 14 - ...d_rescommon_800c8ae0.s => g3d_rescommon.s} | 0 .../{g3d_resdict_800c8c50.s => g3d_resdict.s} | 0 .../{g3d_resfile_800c8f70.s => g3d_resfile.s} | 134 +++++ asm/libnw4r_g3d/g3d_resfile_804404e0.s | 134 ----- ...slightset_800d1f40.s => g3d_reslightset.s} | 0 .../{g3d_resmat_800ccd10.s => g3d_resmat.s} | 52 ++ asm/libnw4r_g3d/g3d_resmat_8055ee28.s | 52 -- .../{g3d_resmdl_800ca6f0.s => g3d_resmdl.s} | 14 + asm/libnw4r_g3d/g3d_resmdl_805569d8.s | 14 - .../{g3d_resnode_800ce7f0.s => g3d_resnode.s} | 18 + asm/libnw4r_g3d/g3d_resnode_8055ee60.s | 18 - .../{g3d_resshp_800cb800.s => g3d_resshp.s} | 0 .../{g3d_restev_800cc0d0.s => g3d_restev.s} | 48 ++ asm/libnw4r_g3d/g3d_restev_80408320.s | 34 -- asm/libnw4r_g3d/g3d_restev_80440640.s | 14 - .../{g3d_restex_800ce610.s => g3d_restex.s} | 0 .../{g3d_resvtx_800ce3f0.s => g3d_resvtx.s} | 0 .../{g3d_scnmdl_800ee240.s => g3d_scnmdl.s} | 34 ++ asm/libnw4r_g3d/g3d_scnmdl_80408ee8.s | 10 - asm/libnw4r_g3d/g3d_scnmdl_80441108.s | 24 - ...dlexpand_800f0ab0.s => g3d_scnmdlexpand.s} | 42 ++ asm/libnw4r_g3d/g3d_scnmdlexpand_80408ef8.s | 12 - asm/libnw4r_g3d/g3d_scnmdlexpand_80441150.s | 22 - asm/libnw4r_g3d/g3d_scnmdlexpand_80556a38.s | 8 - ...scnmdlsmpl_800ec3a0.s => g3d_scnmdlsmpl.s} | 72 +++ asm/libnw4r_g3d/g3d_scnmdlsmpl_80408ed0.s | 12 - asm/libnw4r_g3d/g3d_scnmdlsmpl_804410b0.s | 32 -- asm/libnw4r_g3d/g3d_scnmdlsmpl_80556a20.s | 20 - asm/libnw4r_g3d/g3d_scnmdlsmpl_8055f0d0.s | 8 - .../{g3d_scnobj_800e9110.s => g3d_scnobj.s} | 112 ++++ asm/libnw4r_g3d/g3d_scnobj_80408e90.s | 26 - asm/libnw4r_g3d/g3d_scnobj_80440f78.s | 68 --- asm/libnw4r_g3d/g3d_scnobj_8055cf98.s | 6 - asm/libnw4r_g3d/g3d_scnobj_8055f0c0.s | 12 - .../{g3d_scnroot_800ea930.s => g3d_scnroot.s} | 78 +++ asm/libnw4r_g3d/g3d_scnroot_80408ec0.s | 10 - asm/libnw4r_g3d/g3d_scnroot_80441040.s | 38 -- asm/libnw4r_g3d/g3d_scnroot_80556a10.s | 22 - asm/libnw4r_g3d/g3d_scnroot_8055f0c8.s | 8 - .../{g3d_state_800dca10.s => g3d_state.s} | 178 ++++++ asm/libnw4r_g3d/g3d_state_8040627c.s | 4 - asm/libnw4r_g3d/g3d_state_80408d88.s | 18 - asm/libnw4r_g3d/g3d_state_80440f50.s | 12 - asm/libnw4r_g3d/g3d_state_8050aee0.s | 58 -- asm/libnw4r_g3d/g3d_state_805569f8.s | 12 - asm/libnw4r_g3d/g3d_state_8055cf78.s | 30 - asm/libnw4r_g3d/g3d_state_8055efd0.s | 44 -- .../{g3d_tmem_800dc470.s => g3d_tmem.s} | 518 ++++++++++++++++++ asm/libnw4r_g3d/g3d_tmem_80408608.s | 490 ----------------- asm/libnw4r_g3d/g3d_tmem_8050aa98.s | 10 - asm/libnw4r_g3d/g3d_tmem_8055cf68.s | 18 - ...d_transform_800d3570.s => g3d_transform.s} | 8 + asm/libnw4r_g3d/g3d_transform_8055ef08.s | 8 - .../{g3d_workmem_800e3150.s => g3d_workmem.s} | 6 + asm/libnw4r_g3d/g3d_workmem_80510500.s | 6 - .../{g3d_xsi_800e79f0.s => g3d_xsi.s} | 42 ++ asm/libnw4r_g3d/g3d_xsi_80408e20.s | 24 - asm/libnw4r_g3d/g3d_xsi_8055f098.s | 18 - obj_files.mk | 214 ++------ 156 files changed, 3217 insertions(+), 3313 deletions(-) rename asm/libnw4r_g3d/{g3d_3dsmax_800e8610.s => g3d_3dsmax.s} (94%) delete mode 100644 asm/libnw4r_g3d/g3d_3dsmax_80408e58.s delete mode 100644 asm/libnw4r_g3d/g3d_3dsmax_8055f0a8.s rename asm/libnw4r_g3d/{g3d_anmchr_800d7e20.s => g3d_anmchr.s} (94%) delete mode 100644 asm/libnw4r_g3d/g3d_anmchr_80408528.s delete mode 100644 asm/libnw4r_g3d/g3d_anmchr_80440b70.s delete mode 100644 asm/libnw4r_g3d/g3d_anmchr_8055ef60.s rename asm/libnw4r_g3d/{g3d_anmclr_800d4a90.s => g3d_anmclr.s} (94%) delete mode 100644 asm/libnw4r_g3d/g3d_anmclr_804083f0.s delete mode 100644 asm/libnw4r_g3d/g3d_anmclr_80440810.s delete mode 100644 asm/libnw4r_g3d/g3d_anmclr_8055ef20.s rename asm/libnw4r_g3d/{g3d_anmobj_800dbe80.s => g3d_anmobj.s} (85%) delete mode 100644 asm/libnw4r_g3d/g3d_anmobj_804085f8.s delete mode 100644 asm/libnw4r_g3d/g3d_anmobj_805569f0.s delete mode 100644 asm/libnw4r_g3d/g3d_anmobj_8055efa8.s rename asm/libnw4r_g3d/{g3d_anmscn_800da7f0.s => g3d_anmscn.s} (96%) delete mode 100644 asm/libnw4r_g3d/g3d_anmscn_804085c8.s delete mode 100644 asm/libnw4r_g3d/g3d_anmscn_80440e10.s delete mode 100644 asm/libnw4r_g3d/g3d_anmscn_8055ef88.s rename asm/libnw4r_g3d/{g3d_anmshp_800d9740.s => g3d_anmshp.s} (93%) delete mode 100644 asm/libnw4r_g3d/g3d_anmshp_80408578.s delete mode 100644 asm/libnw4r_g3d/g3d_anmshp_80440cd0.s delete mode 100644 asm/libnw4r_g3d/g3d_anmshp_8055ef78.s rename asm/libnw4r_g3d/{g3d_anmtexpat_800d6140.s => g3d_anmtexpat.s} (92%) delete mode 100644 asm/libnw4r_g3d/g3d_anmtexpat_80408458.s delete mode 100644 asm/libnw4r_g3d/g3d_anmtexpat_80440930.s delete mode 100644 asm/libnw4r_g3d/g3d_anmtexpat_8055ef30.s rename asm/libnw4r_g3d/{g3d_anmtexsrt_800d7000.s => g3d_anmtexsrt.s} (92%) delete mode 100644 asm/libnw4r_g3d/g3d_anmtexsrt_804084c0.s delete mode 100644 asm/libnw4r_g3d/g3d_anmtexsrt_80440a50.s delete mode 100644 asm/libnw4r_g3d/g3d_anmtexsrt_8055ef40.s rename asm/libnw4r_g3d/{g3d_anmvis_800d3880.s => g3d_anmvis.s} (93%) delete mode 100644 asm/libnw4r_g3d/g3d_anmvis_804083a0.s delete mode 100644 asm/libnw4r_g3d/g3d_anmvis_80440700.s delete mode 100644 asm/libnw4r_g3d/g3d_anmvis_805569e8.s delete mode 100644 asm/libnw4r_g3d/g3d_anmvis_8055ef10.s rename asm/libnw4r_g3d/{g3d_basic_800e6a10.s => g3d_basic.s} (98%) delete mode 100644 asm/libnw4r_g3d/g3d_basic_8055f070.s rename asm/libnw4r_g3d/{g3d_calcmaterial_800f1470.s => g3d_calcmaterial.s} (100%) rename asm/libnw4r_g3d/{g3d_calcview_800e0dc0.s => g3d_calcview.s} (98%) delete mode 100644 asm/libnw4r_g3d/g3d_calcview_80408dc8.s delete mode 100644 asm/libnw4r_g3d/g3d_calcview_8055f018.s rename asm/libnw4r_g3d/{g3d_calcvtx_800f2410.s => g3d_calcvtx.s} (99%) delete mode 100644 asm/libnw4r_g3d/g3d_calcvtx_8055f110.s rename asm/libnw4r_g3d/{g3d_calcworld_800e3170.s => g3d_calcworld.s} (98%) delete mode 100644 asm/libnw4r_g3d/g3d_calcworld_80440f68.s delete mode 100644 asm/libnw4r_g3d/g3d_calcworld_80556a00.s delete mode 100644 asm/libnw4r_g3d/g3d_calcworld_8055f028.s rename asm/libnw4r_g3d/{g3d_camera_800e5af0.s => g3d_camera.s} (98%) delete mode 100644 asm/libnw4r_g3d/g3d_camera_8055f040.s rename asm/libnw4r_g3d/{g3d_cpu_800dc7d0.s => g3d_cpu.s} (98%) delete mode 100644 asm/libnw4r_g3d/g3d_cpu_8055efc8.s rename asm/libnw4r_g3d/{g3d_dcc_800e3060.s => g3d_dcc.s} (100%) rename asm/libnw4r_g3d/{g3d_draw_800e3c50.s => g3d_draw.s} (98%) rename asm/libnw4r_g3d/{g3d_draw1mat1shp_800e0070.s => g3d_draw1mat1shp.s} (99%) delete mode 100644 asm/libnw4r_g3d/g3d_draw1mat1shp_80408db8.s delete mode 100644 asm/libnw4r_g3d/g3d_draw1mat1shp_8055eff8.s delete mode 100644 asm/libnw4r_g3d/g3d_draw_80556a08.s delete mode 100644 asm/libnw4r_g3d/g3d_draw_8055f030.s rename asm/libnw4r_g3d/{g3d_fog_800f17a0.s => g3d_fog.s} (97%) delete mode 100644 asm/libnw4r_g3d/g3d_fog_8055f0d8.s rename asm/libnw4r_g3d/{g3d_gpu_800dbf50.s => g3d_gpu.s} (97%) delete mode 100644 asm/libnw4r_g3d/g3d_gpu_8055efb0.s rename asm/libnw4r_g3d/{g3d_init_800f16b0.s => g3d_init.s} (85%) delete mode 100644 asm/libnw4r_g3d/g3d_init_80441190.s delete mode 100644 asm/libnw4r_g3d/g3d_init_80556a40.s rename asm/libnw4r_g3d/{g3d_light_800f1900.s => g3d_light.s} (98%) delete mode 100644 asm/libnw4r_g3d/g3d_light_8055f0e0.s rename asm/libnw4r_g3d/{g3d_maya_800e6ce0.s => g3d_maya.s} (95%) delete mode 100644 asm/libnw4r_g3d/g3d_maya_80408de8.s delete mode 100644 asm/libnw4r_g3d/g3d_maya_8055f080.s rename asm/libnw4r_g3d/{g3d_obj_800dbd10.s => g3d_obj.s} (90%) delete mode 100644 asm/libnw4r_g3d/g3d_obj_804085e8.s delete mode 100644 asm/libnw4r_g3d/g3d_obj_80440f30.s rename asm/libnw4r_g3d/{g3d_resanm_800cf440.s => g3d_resanm.s} (96%) delete mode 100644 asm/libnw4r_g3d/g3d_resanm_8055ee70.s rename asm/libnw4r_g3d/{g3d_resanmamblight_800d20b0.s => g3d_resanmamblight.s} (94%) delete mode 100644 asm/libnw4r_g3d/g3d_resanmamblight_8055eed0.s rename asm/libnw4r_g3d/{g3d_resanmcamera_800d26d0.s => g3d_resanmcamera.s} (100%) rename asm/libnw4r_g3d/{g3d_resanmchr_800d02d0.s => g3d_resanmchr.s} (98%) delete mode 100644 asm/libnw4r_g3d/g3d_resanmchr_80408380.s delete mode 100644 asm/libnw4r_g3d/g3d_resanmchr_8055eeb0.s rename asm/libnw4r_g3d/{g3d_resanmclr_800cf7d0.s => g3d_resanmclr.s} (96%) delete mode 100644 asm/libnw4r_g3d/g3d_resanmclr_8055ee98.s rename asm/libnw4r_g3d/{g3d_resanmfog_800d2570.s => g3d_resanmfog.s} (96%) delete mode 100644 asm/libnw4r_g3d/g3d_resanmfog_8055eef0.s rename asm/libnw4r_g3d/{g3d_resanmlight_800d2180.s => g3d_resanmlight.s} (98%) delete mode 100644 asm/libnw4r_g3d/g3d_resanmlight_8055eee0.s rename asm/libnw4r_g3d/{g3d_resanmscn_800d29e0.s => g3d_resanmscn.s} (96%) delete mode 100644 asm/libnw4r_g3d/g3d_resanmscn_80440660.s rename asm/libnw4r_g3d/{g3d_resanmshp_800d3400.s => g3d_resanmshp.s} (97%) delete mode 100644 asm/libnw4r_g3d/g3d_resanmshp_8055ef00.s rename asm/libnw4r_g3d/{g3d_resanmtexpat_800cf940.s => g3d_resanmtexpat.s} (100%) rename asm/libnw4r_g3d/{g3d_resanmtexsrt_800cfeb0.s => g3d_resanmtexsrt.s} (99%) delete mode 100644 asm/libnw4r_g3d/g3d_resanmtexsrt_8055eea8.s rename asm/libnw4r_g3d/{g3d_resanmvis_800cf6b0.s => g3d_resanmvis.s} (95%) delete mode 100644 asm/libnw4r_g3d/g3d_resanmvis_8055ee88.s rename asm/libnw4r_g3d/{g3d_rescommon_800c8ae0.s => g3d_rescommon.s} (100%) rename asm/libnw4r_g3d/{g3d_resdict_800c8c50.s => g3d_resdict.s} (100%) rename asm/libnw4r_g3d/{g3d_resfile_800c8f70.s => g3d_resfile.s} (97%) delete mode 100644 asm/libnw4r_g3d/g3d_resfile_804404e0.s rename asm/libnw4r_g3d/{g3d_reslightset_800d1f40.s => g3d_reslightset.s} (100%) rename asm/libnw4r_g3d/{g3d_resmat_800ccd10.s => g3d_resmat.s} (99%) delete mode 100644 asm/libnw4r_g3d/g3d_resmat_8055ee28.s rename asm/libnw4r_g3d/{g3d_resmdl_800ca6f0.s => g3d_resmdl.s} (99%) delete mode 100644 asm/libnw4r_g3d/g3d_resmdl_805569d8.s rename asm/libnw4r_g3d/{g3d_resnode_800ce7f0.s => g3d_resnode.s} (99%) delete mode 100644 asm/libnw4r_g3d/g3d_resnode_8055ee60.s rename asm/libnw4r_g3d/{g3d_resshp_800cb800.s => g3d_resshp.s} (100%) rename asm/libnw4r_g3d/{g3d_restev_800cc0d0.s => g3d_restev.s} (97%) delete mode 100644 asm/libnw4r_g3d/g3d_restev_80408320.s delete mode 100644 asm/libnw4r_g3d/g3d_restev_80440640.s rename asm/libnw4r_g3d/{g3d_restex_800ce610.s => g3d_restex.s} (100%) rename asm/libnw4r_g3d/{g3d_resvtx_800ce3f0.s => g3d_resvtx.s} (100%) rename asm/libnw4r_g3d/{g3d_scnmdl_800ee240.s => g3d_scnmdl.s} (99%) delete mode 100644 asm/libnw4r_g3d/g3d_scnmdl_80408ee8.s delete mode 100644 asm/libnw4r_g3d/g3d_scnmdl_80441108.s rename asm/libnw4r_g3d/{g3d_scnmdlexpand_800f0ab0.s => g3d_scnmdlexpand.s} (96%) delete mode 100644 asm/libnw4r_g3d/g3d_scnmdlexpand_80408ef8.s delete mode 100644 asm/libnw4r_g3d/g3d_scnmdlexpand_80441150.s delete mode 100644 asm/libnw4r_g3d/g3d_scnmdlexpand_80556a38.s rename asm/libnw4r_g3d/{g3d_scnmdlsmpl_800ec3a0.s => g3d_scnmdlsmpl.s} (98%) delete mode 100644 asm/libnw4r_g3d/g3d_scnmdlsmpl_80408ed0.s delete mode 100644 asm/libnw4r_g3d/g3d_scnmdlsmpl_804410b0.s delete mode 100644 asm/libnw4r_g3d/g3d_scnmdlsmpl_80556a20.s delete mode 100644 asm/libnw4r_g3d/g3d_scnmdlsmpl_8055f0d0.s rename asm/libnw4r_g3d/{g3d_scnobj_800e9110.s => g3d_scnobj.s} (97%) delete mode 100644 asm/libnw4r_g3d/g3d_scnobj_80408e90.s delete mode 100644 asm/libnw4r_g3d/g3d_scnobj_80440f78.s delete mode 100644 asm/libnw4r_g3d/g3d_scnobj_8055cf98.s delete mode 100644 asm/libnw4r_g3d/g3d_scnobj_8055f0c0.s rename asm/libnw4r_g3d/{g3d_scnroot_800ea930.s => g3d_scnroot.s} (97%) delete mode 100644 asm/libnw4r_g3d/g3d_scnroot_80408ec0.s delete mode 100644 asm/libnw4r_g3d/g3d_scnroot_80441040.s delete mode 100644 asm/libnw4r_g3d/g3d_scnroot_80556a10.s delete mode 100644 asm/libnw4r_g3d/g3d_scnroot_8055f0c8.s rename asm/libnw4r_g3d/{g3d_state_800dca10.s => g3d_state.s} (97%) delete mode 100644 asm/libnw4r_g3d/g3d_state_8040627c.s delete mode 100644 asm/libnw4r_g3d/g3d_state_80408d88.s delete mode 100644 asm/libnw4r_g3d/g3d_state_80440f50.s delete mode 100644 asm/libnw4r_g3d/g3d_state_8050aee0.s delete mode 100644 asm/libnw4r_g3d/g3d_state_805569f8.s delete mode 100644 asm/libnw4r_g3d/g3d_state_8055cf78.s delete mode 100644 asm/libnw4r_g3d/g3d_state_8055efd0.s rename asm/libnw4r_g3d/{g3d_tmem_800dc470.s => g3d_tmem.s} (62%) delete mode 100644 asm/libnw4r_g3d/g3d_tmem_80408608.s delete mode 100644 asm/libnw4r_g3d/g3d_tmem_8050aa98.s delete mode 100644 asm/libnw4r_g3d/g3d_tmem_8055cf68.s rename asm/libnw4r_g3d/{g3d_transform_800d3570.s => g3d_transform.s} (98%) delete mode 100644 asm/libnw4r_g3d/g3d_transform_8055ef08.s rename asm/libnw4r_g3d/{g3d_workmem_800e3150.s => g3d_workmem.s} (84%) delete mode 100644 asm/libnw4r_g3d/g3d_workmem_80510500.s rename asm/libnw4r_g3d/{g3d_xsi_800e79f0.s => g3d_xsi.s} (95%) delete mode 100644 asm/libnw4r_g3d/g3d_xsi_80408e20.s delete mode 100644 asm/libnw4r_g3d/g3d_xsi_8055f098.s diff --git a/asm/libnw4r_g3d/g3d_3dsmax_800e8610.s b/asm/libnw4r_g3d/g3d_3dsmax.s similarity index 94% rename from asm/libnw4r_g3d/g3d_3dsmax_800e8610.s rename to asm/libnw4r_g3d/g3d_3dsmax.s index 3acdacb2..489aa486 100644 --- a/asm/libnw4r_g3d/g3d_3dsmax_800e8610.s +++ b/asm/libnw4r_g3d/g3d_3dsmax.s @@ -756,3 +756,55 @@ lbl_800E90F8: /* 800E9104 000E4F44 38 21 00 10 */ addi r1, r1, 0x10 /* 800E9108 000E4F48 4E 80 00 20 */ blr /* 800E910C 000E4F4C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global "@LOCAL@CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable" +"@LOCAL@CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable": + + .4byte "MakeTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_T__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_R__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + +.global "@LOCAL@CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable@0" +"@LOCAL@CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable@0": + + .4byte "ProductTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_T__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_R__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_S__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@6188" +"@6188": + + .4byte 0 + +.global "@6189" +"@6189": + + .4byte 0x3F000000 + +.global "@6190" +"@6190": + + .4byte 0x3F800000 + +.global "@6194" +"@6194": + + .4byte 0x3F360B61 + +.global "@6195" +"@6195": + + .4byte 0xBF000000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_3dsmax_80408e58.s b/asm/libnw4r_g3d/g3d_3dsmax_80408e58.s deleted file mode 100644 index 56a58c0e..00000000 --- a/asm/libnw4r_g3d/g3d_3dsmax_80408e58.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global "@LOCAL@CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable" -"@LOCAL@CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable": - - .4byte "MakeTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_T__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_R__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - -.global "@LOCAL@CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable@0" -"@LOCAL@CalcTexMtx_3dsmax__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable@0": - - .4byte "ProductTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_T__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_R__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_S__Q54nw4r3g3d6detail3dcc24@unnamed@g3d_3dsmax_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" diff --git a/asm/libnw4r_g3d/g3d_3dsmax_8055f0a8.s b/asm/libnw4r_g3d/g3d_3dsmax_8055f0a8.s deleted file mode 100644 index 2acf328d..00000000 --- a/asm/libnw4r_g3d/g3d_3dsmax_8055f0a8.s +++ /dev/null @@ -1,28 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@6188" -"@6188": - - .4byte 0 - -.global "@6189" -"@6189": - - .4byte 0x3F000000 - -.global "@6190" -"@6190": - - .4byte 0x3F800000 - -.global "@6194" -"@6194": - - .4byte 0x3F360B61 - -.global "@6195" -"@6195": - - .4byte 0xBF000000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmchr_800d7e20.s b/asm/libnw4r_g3d/g3d_anmchr.s similarity index 94% rename from asm/libnw4r_g3d/g3d_anmchr_800d7e20.s rename to asm/libnw4r_g3d/g3d_anmchr.s index 1d733a76..d7efcecb 100644 --- a/asm/libnw4r_g3d/g3d_anmchr_800d7e20.s +++ b/asm/libnw4r_g3d/g3d_anmchr.s @@ -2063,3 +2063,171 @@ GetTypeObj__Q34nw4r3g3d9AnmObjChrCFv: /* 800D9734 000D5574 38 63 85 28 */ addi r3, r3, TYPE_NAME__Q34nw4r3g3d9AnmObjChr@l /* 800D9738 000D5578 4E 80 00 20 */ blr /* 800D973C 000D557C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global TYPE_NAME__Q34nw4r3g3d9AnmObjChr +TYPE_NAME__Q34nw4r3g3d9AnmObjChr: + + .4byte 0x0000000A + .4byte 0x416E6D4F + .4byte 0x626A4368 + .4byte 0x72000000 + +.global TYPE_NAME__Q34nw4r3g3d13AnmObjChrNode +TYPE_NAME__Q34nw4r3g3d13AnmObjChrNode: + + .4byte 0x0000000E + .4byte 0x416E6D4F + .4byte 0x626A4368 + .4byte 0x724E6F64 + .4byte 0x65000000 + +.global TYPE_NAME__Q34nw4r3g3d14AnmObjChrBlend +TYPE_NAME__Q34nw4r3g3d14AnmObjChrBlend: + + .4byte 0x0000000F + .4byte 0x416E6D4F + .4byte 0x626A4368 + .4byte 0x72426C65 + .4byte 0x6E640000 + +.global TYPE_NAME__Q34nw4r3g3d12AnmObjChrRes +TYPE_NAME__Q34nw4r3g3d12AnmObjChrRes: + + .4byte 0x0000000D + .4byte 0x416E6D4F + .4byte 0x626A4368 + .4byte 0x72526573 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3g3d12AnmObjChrRes +__vt__Q34nw4r3g3d12AnmObjChrRes: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjChrResCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d12AnmObjChrResFUlUlPv + .4byte __dt__Q34nw4r3g3d12AnmObjChrResFv + .4byte GetTypeObj__Q34nw4r3g3d12AnmObjChrResCFv + .4byte GetTypeName__Q34nw4r3g3d12AnmObjChrResCFv + .4byte SetFrame__Q34nw4r3g3d12AnmObjChrResFf + .4byte GetFrame__Q34nw4r3g3d12AnmObjChrResCFv + .4byte UpdateFrame__Q34nw4r3g3d12AnmObjChrResFv + .4byte SetUpdateRate__Q34nw4r3g3d12AnmObjChrResFf + .4byte GetUpdateRate__Q34nw4r3g3d12AnmObjChrResCFv + .4byte Bind__Q34nw4r3g3d12AnmObjChrResFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d9AnmObjChrFv + .4byte GetResult__Q34nw4r3g3d12AnmObjChrResFPQ34nw4r3g3d12ChrAnmResultUl + .4byte Attach__Q34nw4r3g3d9AnmObjChrFiPQ34nw4r3g3d12AnmObjChrRes + .4byte Detach__Q34nw4r3g3d9AnmObjChrFi + .4byte DetachAll__Q34nw4r3g3d9AnmObjChrFv + .4byte SetWeight__Q34nw4r3g3d9AnmObjChrFif + .4byte GetWeight__Q34nw4r3g3d9AnmObjChrCFi + .4byte Bind__Q34nw4r3g3d12AnmObjChrResFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption + .4byte Release__Q34nw4r3g3d12AnmObjChrResFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption + +.global __vt__Q34nw4r3g3d14AnmObjChrBlend +__vt__Q34nw4r3g3d14AnmObjChrBlend: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d14AnmObjChrBlendCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d13AnmObjChrNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d14AnmObjChrBlendFv + .4byte GetTypeObj__Q34nw4r3g3d14AnmObjChrBlendCFv + .4byte GetTypeName__Q34nw4r3g3d14AnmObjChrBlendCFv + .4byte SetFrame__Q34nw4r3g3d13AnmObjChrNodeFf + .4byte GetFrame__Q34nw4r3g3d13AnmObjChrNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d13AnmObjChrNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeCFv + .4byte Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d13AnmObjChrNodeFv + .4byte GetResult__Q34nw4r3g3d14AnmObjChrBlendFPQ34nw4r3g3d12ChrAnmResultUl + .4byte Attach__Q34nw4r3g3d13AnmObjChrNodeFiPQ34nw4r3g3d12AnmObjChrRes + .4byte Detach__Q34nw4r3g3d13AnmObjChrNodeFi + .4byte DetachAll__Q34nw4r3g3d13AnmObjChrNodeFv + .4byte SetWeight__Q34nw4r3g3d14AnmObjChrBlendFif + .4byte GetWeight__Q34nw4r3g3d14AnmObjChrBlendCFi + .4byte Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption + .4byte Release__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption + +.global __vt__Q34nw4r3g3d13AnmObjChrNode +__vt__Q34nw4r3g3d13AnmObjChrNode: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d13AnmObjChrNodeCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d13AnmObjChrNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d13AnmObjChrNodeFv + .4byte GetTypeObj__Q34nw4r3g3d13AnmObjChrNodeCFv + .4byte GetTypeName__Q34nw4r3g3d13AnmObjChrNodeCFv + .4byte SetFrame__Q34nw4r3g3d13AnmObjChrNodeFf + .4byte GetFrame__Q34nw4r3g3d13AnmObjChrNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d13AnmObjChrNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeCFv + .4byte Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d13AnmObjChrNodeFv + .4byte 0 + .4byte Attach__Q34nw4r3g3d13AnmObjChrNodeFiPQ34nw4r3g3d12AnmObjChrRes + .4byte Detach__Q34nw4r3g3d13AnmObjChrNodeFi + .4byte DetachAll__Q34nw4r3g3d13AnmObjChrNodeFv + .4byte SetWeight__Q34nw4r3g3d9AnmObjChrFif + .4byte GetWeight__Q34nw4r3g3d9AnmObjChrCFi + .4byte Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption + .4byte Release__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption + +.global __vt__Q34nw4r3g3d9AnmObjChr +__vt__Q34nw4r3g3d9AnmObjChr: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d9AnmObjChrCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte 0 + .4byte __dt__Q34nw4r3g3d9AnmObjChrFv + .4byte GetTypeObj__Q34nw4r3g3d9AnmObjChrCFv + .4byte GetTypeName__Q34nw4r3g3d9AnmObjChrCFv + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte Release__Q34nw4r3g3d9AnmObjChrFv + .4byte 0 + .4byte Attach__Q34nw4r3g3d9AnmObjChrFiPQ34nw4r3g3d12AnmObjChrRes + .4byte Detach__Q34nw4r3g3d9AnmObjChrFi + .4byte DetachAll__Q34nw4r3g3d9AnmObjChrFv + .4byte SetWeight__Q34nw4r3g3d9AnmObjChrFif + .4byte GetWeight__Q34nw4r3g3d9AnmObjChrCFi + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@8469" +"@8469": + + .4byte 0 + +.global "@8582" +"@8582": + + .4byte 0x3F800000 + +.global "@8854" +"@8854": + + .4byte 0x7FC00000 + .4byte 0 + +.global "@8928" +"@8928": + + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_g3d/g3d_anmchr_80408528.s b/asm/libnw4r_g3d/g3d_anmchr_80408528.s deleted file mode 100644 index 30fb1be9..00000000 --- a/asm/libnw4r_g3d/g3d_anmchr_80408528.s +++ /dev/null @@ -1,38 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global TYPE_NAME__Q34nw4r3g3d9AnmObjChr -TYPE_NAME__Q34nw4r3g3d9AnmObjChr: - - .4byte 0x0000000A - .4byte 0x416E6D4F - .4byte 0x626A4368 - .4byte 0x72000000 - -.global TYPE_NAME__Q34nw4r3g3d13AnmObjChrNode -TYPE_NAME__Q34nw4r3g3d13AnmObjChrNode: - - .4byte 0x0000000E - .4byte 0x416E6D4F - .4byte 0x626A4368 - .4byte 0x724E6F64 - .4byte 0x65000000 - -.global TYPE_NAME__Q34nw4r3g3d14AnmObjChrBlend -TYPE_NAME__Q34nw4r3g3d14AnmObjChrBlend: - - .4byte 0x0000000F - .4byte 0x416E6D4F - .4byte 0x626A4368 - .4byte 0x72426C65 - .4byte 0x6E640000 - -.global TYPE_NAME__Q34nw4r3g3d12AnmObjChrRes -TYPE_NAME__Q34nw4r3g3d12AnmObjChrRes: - - .4byte 0x0000000D - .4byte 0x416E6D4F - .4byte 0x626A4368 - .4byte 0x72526573 - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmchr_80440b70.s b/asm/libnw4r_g3d/g3d_anmchr_80440b70.s deleted file mode 100644 index 2a90b57f..00000000 --- a/asm/libnw4r_g3d/g3d_anmchr_80440b70.s +++ /dev/null @@ -1,106 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3g3d12AnmObjChrRes -__vt__Q34nw4r3g3d12AnmObjChrRes: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjChrResCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d12AnmObjChrResFUlUlPv - .4byte __dt__Q34nw4r3g3d12AnmObjChrResFv - .4byte GetTypeObj__Q34nw4r3g3d12AnmObjChrResCFv - .4byte GetTypeName__Q34nw4r3g3d12AnmObjChrResCFv - .4byte SetFrame__Q34nw4r3g3d12AnmObjChrResFf - .4byte GetFrame__Q34nw4r3g3d12AnmObjChrResCFv - .4byte UpdateFrame__Q34nw4r3g3d12AnmObjChrResFv - .4byte SetUpdateRate__Q34nw4r3g3d12AnmObjChrResFf - .4byte GetUpdateRate__Q34nw4r3g3d12AnmObjChrResCFv - .4byte Bind__Q34nw4r3g3d12AnmObjChrResFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d9AnmObjChrFv - .4byte GetResult__Q34nw4r3g3d12AnmObjChrResFPQ34nw4r3g3d12ChrAnmResultUl - .4byte Attach__Q34nw4r3g3d9AnmObjChrFiPQ34nw4r3g3d12AnmObjChrRes - .4byte Detach__Q34nw4r3g3d9AnmObjChrFi - .4byte DetachAll__Q34nw4r3g3d9AnmObjChrFv - .4byte SetWeight__Q34nw4r3g3d9AnmObjChrFif - .4byte GetWeight__Q34nw4r3g3d9AnmObjChrCFi - .4byte Bind__Q34nw4r3g3d12AnmObjChrResFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption - .4byte Release__Q34nw4r3g3d12AnmObjChrResFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption - -.global __vt__Q34nw4r3g3d14AnmObjChrBlend -__vt__Q34nw4r3g3d14AnmObjChrBlend: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d14AnmObjChrBlendCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d13AnmObjChrNodeFUlUlPv - .4byte __dt__Q34nw4r3g3d14AnmObjChrBlendFv - .4byte GetTypeObj__Q34nw4r3g3d14AnmObjChrBlendCFv - .4byte GetTypeName__Q34nw4r3g3d14AnmObjChrBlendCFv - .4byte SetFrame__Q34nw4r3g3d13AnmObjChrNodeFf - .4byte GetFrame__Q34nw4r3g3d13AnmObjChrNodeCFv - .4byte UpdateFrame__Q34nw4r3g3d13AnmObjChrNodeFv - .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeFf - .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeCFv - .4byte Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d13AnmObjChrNodeFv - .4byte GetResult__Q34nw4r3g3d14AnmObjChrBlendFPQ34nw4r3g3d12ChrAnmResultUl - .4byte Attach__Q34nw4r3g3d13AnmObjChrNodeFiPQ34nw4r3g3d12AnmObjChrRes - .4byte Detach__Q34nw4r3g3d13AnmObjChrNodeFi - .4byte DetachAll__Q34nw4r3g3d13AnmObjChrNodeFv - .4byte SetWeight__Q34nw4r3g3d14AnmObjChrBlendFif - .4byte GetWeight__Q34nw4r3g3d14AnmObjChrBlendCFi - .4byte Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption - .4byte Release__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption - -.global __vt__Q34nw4r3g3d13AnmObjChrNode -__vt__Q34nw4r3g3d13AnmObjChrNode: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d13AnmObjChrNodeCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d13AnmObjChrNodeFUlUlPv - .4byte __dt__Q34nw4r3g3d13AnmObjChrNodeFv - .4byte GetTypeObj__Q34nw4r3g3d13AnmObjChrNodeCFv - .4byte GetTypeName__Q34nw4r3g3d13AnmObjChrNodeCFv - .4byte SetFrame__Q34nw4r3g3d13AnmObjChrNodeFf - .4byte GetFrame__Q34nw4r3g3d13AnmObjChrNodeCFv - .4byte UpdateFrame__Q34nw4r3g3d13AnmObjChrNodeFv - .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeFf - .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjChrNodeCFv - .4byte Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d13AnmObjChrNodeFv - .4byte 0 - .4byte Attach__Q34nw4r3g3d13AnmObjChrNodeFiPQ34nw4r3g3d12AnmObjChrRes - .4byte Detach__Q34nw4r3g3d13AnmObjChrNodeFi - .4byte DetachAll__Q34nw4r3g3d13AnmObjChrNodeFv - .4byte SetWeight__Q34nw4r3g3d9AnmObjChrFif - .4byte GetWeight__Q34nw4r3g3d9AnmObjChrCFi - .4byte Bind__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption - .4byte Release__Q34nw4r3g3d13AnmObjChrNodeFQ34nw4r3g3d6ResMdlUlQ44nw4r3g3d9AnmObjChr10BindOption - -.global __vt__Q34nw4r3g3d9AnmObjChr -__vt__Q34nw4r3g3d9AnmObjChr: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d9AnmObjChrCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte 0 - .4byte __dt__Q34nw4r3g3d9AnmObjChrFv - .4byte GetTypeObj__Q34nw4r3g3d9AnmObjChrCFv - .4byte GetTypeName__Q34nw4r3g3d9AnmObjChrCFv - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte Release__Q34nw4r3g3d9AnmObjChrFv - .4byte 0 - .4byte Attach__Q34nw4r3g3d9AnmObjChrFiPQ34nw4r3g3d12AnmObjChrRes - .4byte Detach__Q34nw4r3g3d9AnmObjChrFi - .4byte DetachAll__Q34nw4r3g3d9AnmObjChrFv - .4byte SetWeight__Q34nw4r3g3d9AnmObjChrFif - .4byte GetWeight__Q34nw4r3g3d9AnmObjChrCFi - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmchr_8055ef60.s b/asm/libnw4r_g3d/g3d_anmchr_8055ef60.s deleted file mode 100644 index 26933340..00000000 --- a/asm/libnw4r_g3d/g3d_anmchr_8055ef60.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@8469" -"@8469": - - .4byte 0 - -.global "@8582" -"@8582": - - .4byte 0x3F800000 - -.global "@8854" -"@8854": - - .4byte 0x7FC00000 - .4byte 0 - -.global "@8928" -"@8928": - - .4byte 0x43300000 - .4byte 0x80000000 diff --git a/asm/libnw4r_g3d/g3d_anmclr_800d4a90.s b/asm/libnw4r_g3d/g3d_anmclr.s similarity index 94% rename from asm/libnw4r_g3d/g3d_anmclr_800d4a90.s rename to asm/libnw4r_g3d/g3d_anmclr.s index 5570dd13..5b315f0b 100644 --- a/asm/libnw4r_g3d/g3d_anmclr_800d4a90.s +++ b/asm/libnw4r_g3d/g3d_anmclr.s @@ -1839,3 +1839,155 @@ GetTypeObj__Q34nw4r3g3d12AnmObjMatClrCFv: /* 800D6134 000D1F74 38 63 83 F0 */ addi r3, r3, TYPE_NAME__Q34nw4r3g3d12AnmObjMatClr@l /* 800D6138 000D1F78 4E 80 00 20 */ blr /* 800D613C 000D1F7C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global TYPE_NAME__Q34nw4r3g3d12AnmObjMatClr +TYPE_NAME__Q34nw4r3g3d12AnmObjMatClr: + + .4byte 0x0000000D + .4byte 0x416E6D4F + .4byte 0x626A4D61 + .4byte 0x74436C72 + .4byte 0 + .4byte 0 + +.global TYPE_NAME__Q34nw4r3g3d16AnmObjMatClrNode +TYPE_NAME__Q34nw4r3g3d16AnmObjMatClrNode: + + .4byte 0x00000011 + .4byte 0x416E6D4F + .4byte 0x626A4D61 + .4byte 0x74436C72 + .4byte 0x4E6F6465 + .4byte 0 + +.global TYPE_NAME__Q34nw4r3g3d20AnmObjMatClrOverride +TYPE_NAME__Q34nw4r3g3d20AnmObjMatClrOverride: + + .4byte 0x00000015 + .4byte 0x416E6D4F + .4byte 0x626A4D61 + .4byte 0x74436C72 + .4byte 0x4F766572 + .4byte 0x72696465 + .4byte 0 + .4byte 0 + +.global TYPE_NAME__Q34nw4r3g3d15AnmObjMatClrRes +TYPE_NAME__Q34nw4r3g3d15AnmObjMatClrRes: + + .4byte 0x00000010 + .4byte 0x416E6D4F + .4byte 0x626A4D61 + .4byte 0x74436C72 + .4byte 0x52657300 + .4byte 0 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3g3d15AnmObjMatClrRes +__vt__Q34nw4r3g3d15AnmObjMatClrRes: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d15AnmObjMatClrResCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d15AnmObjMatClrResFUlUlPv + .4byte __dt__Q34nw4r3g3d15AnmObjMatClrResFv + .4byte GetTypeObj__Q34nw4r3g3d15AnmObjMatClrResCFv + .4byte GetTypeName__Q34nw4r3g3d15AnmObjMatClrResCFv + .4byte SetFrame__Q34nw4r3g3d15AnmObjMatClrResFf + .4byte GetFrame__Q34nw4r3g3d15AnmObjMatClrResCFv + .4byte UpdateFrame__Q34nw4r3g3d15AnmObjMatClrResFv + .4byte SetUpdateRate__Q34nw4r3g3d15AnmObjMatClrResFf + .4byte GetUpdateRate__Q34nw4r3g3d15AnmObjMatClrResCFv + .4byte Bind__Q34nw4r3g3d15AnmObjMatClrResFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d12AnmObjMatClrFv + .4byte GetResult__Q34nw4r3g3d15AnmObjMatClrResFPQ34nw4r3g3d12ClrAnmResultUl + .4byte Attach__Q34nw4r3g3d12AnmObjMatClrFiPQ34nw4r3g3d15AnmObjMatClrRes + .4byte Detach__Q34nw4r3g3d12AnmObjMatClrFi + .4byte DetachAll__Q34nw4r3g3d12AnmObjMatClrFv + +.global __vt__Q34nw4r3g3d20AnmObjMatClrOverride +__vt__Q34nw4r3g3d20AnmObjMatClrOverride: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d20AnmObjMatClrOverrideCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d16AnmObjMatClrNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d20AnmObjMatClrOverrideFv + .4byte GetTypeObj__Q34nw4r3g3d20AnmObjMatClrOverrideCFv + .4byte GetTypeName__Q34nw4r3g3d20AnmObjMatClrOverrideCFv + .4byte SetFrame__Q34nw4r3g3d16AnmObjMatClrNodeFf + .4byte GetFrame__Q34nw4r3g3d16AnmObjMatClrNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d16AnmObjMatClrNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjMatClrNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjMatClrNodeCFv + .4byte Bind__Q34nw4r3g3d16AnmObjMatClrNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d16AnmObjMatClrNodeFv + .4byte GetResult__Q34nw4r3g3d20AnmObjMatClrOverrideFPQ34nw4r3g3d12ClrAnmResultUl + .4byte Attach__Q34nw4r3g3d16AnmObjMatClrNodeFiPQ34nw4r3g3d15AnmObjMatClrRes + .4byte Detach__Q34nw4r3g3d16AnmObjMatClrNodeFi + .4byte DetachAll__Q34nw4r3g3d16AnmObjMatClrNodeFv + +.global __vt__Q34nw4r3g3d16AnmObjMatClrNode +__vt__Q34nw4r3g3d16AnmObjMatClrNode: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d16AnmObjMatClrNodeCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d16AnmObjMatClrNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d16AnmObjMatClrNodeFv + .4byte GetTypeObj__Q34nw4r3g3d16AnmObjMatClrNodeCFv + .4byte GetTypeName__Q34nw4r3g3d16AnmObjMatClrNodeCFv + .4byte SetFrame__Q34nw4r3g3d16AnmObjMatClrNodeFf + .4byte GetFrame__Q34nw4r3g3d16AnmObjMatClrNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d16AnmObjMatClrNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjMatClrNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjMatClrNodeCFv + .4byte Bind__Q34nw4r3g3d16AnmObjMatClrNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d16AnmObjMatClrNodeFv + .4byte 0 + .4byte Attach__Q34nw4r3g3d16AnmObjMatClrNodeFiPQ34nw4r3g3d15AnmObjMatClrRes + .4byte Detach__Q34nw4r3g3d16AnmObjMatClrNodeFi + .4byte DetachAll__Q34nw4r3g3d16AnmObjMatClrNodeFv + +.global __vt__Q34nw4r3g3d12AnmObjMatClr +__vt__Q34nw4r3g3d12AnmObjMatClr: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjMatClrCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte 0 + .4byte __dt__Q34nw4r3g3d12AnmObjMatClrFv + .4byte GetTypeObj__Q34nw4r3g3d12AnmObjMatClrCFv + .4byte GetTypeName__Q34nw4r3g3d12AnmObjMatClrCFv + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte Release__Q34nw4r3g3d12AnmObjMatClrFv + .4byte 0 + .4byte Attach__Q34nw4r3g3d12AnmObjMatClrFiPQ34nw4r3g3d15AnmObjMatClrRes + .4byte Detach__Q34nw4r3g3d12AnmObjMatClrFi + .4byte DetachAll__Q34nw4r3g3d12AnmObjMatClrFv +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@8993" +"@8993": + + .4byte 0 + +.global "@9016_8055EF24" +"@9016_8055EF24": + + .4byte 0x3F800000 + +.global "@9168" +"@9168": + + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_g3d/g3d_anmclr_804083f0.s b/asm/libnw4r_g3d/g3d_anmclr_804083f0.s deleted file mode 100644 index 72a3149b..00000000 --- a/asm/libnw4r_g3d/g3d_anmclr_804083f0.s +++ /dev/null @@ -1,44 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global TYPE_NAME__Q34nw4r3g3d12AnmObjMatClr -TYPE_NAME__Q34nw4r3g3d12AnmObjMatClr: - - .4byte 0x0000000D - .4byte 0x416E6D4F - .4byte 0x626A4D61 - .4byte 0x74436C72 - .4byte 0 - .4byte 0 - -.global TYPE_NAME__Q34nw4r3g3d16AnmObjMatClrNode -TYPE_NAME__Q34nw4r3g3d16AnmObjMatClrNode: - - .4byte 0x00000011 - .4byte 0x416E6D4F - .4byte 0x626A4D61 - .4byte 0x74436C72 - .4byte 0x4E6F6465 - .4byte 0 - -.global TYPE_NAME__Q34nw4r3g3d20AnmObjMatClrOverride -TYPE_NAME__Q34nw4r3g3d20AnmObjMatClrOverride: - - .4byte 0x00000015 - .4byte 0x416E6D4F - .4byte 0x626A4D61 - .4byte 0x74436C72 - .4byte 0x4F766572 - .4byte 0x72696465 - .4byte 0 - .4byte 0 - -.global TYPE_NAME__Q34nw4r3g3d15AnmObjMatClrRes -TYPE_NAME__Q34nw4r3g3d15AnmObjMatClrRes: - - .4byte 0x00000010 - .4byte 0x416E6D4F - .4byte 0x626A4D61 - .4byte 0x74436C72 - .4byte 0x52657300 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmclr_80440810.s b/asm/libnw4r_g3d/g3d_anmclr_80440810.s deleted file mode 100644 index 47ada0f7..00000000 --- a/asm/libnw4r_g3d/g3d_anmclr_80440810.s +++ /dev/null @@ -1,90 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3g3d15AnmObjMatClrRes -__vt__Q34nw4r3g3d15AnmObjMatClrRes: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d15AnmObjMatClrResCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d15AnmObjMatClrResFUlUlPv - .4byte __dt__Q34nw4r3g3d15AnmObjMatClrResFv - .4byte GetTypeObj__Q34nw4r3g3d15AnmObjMatClrResCFv - .4byte GetTypeName__Q34nw4r3g3d15AnmObjMatClrResCFv - .4byte SetFrame__Q34nw4r3g3d15AnmObjMatClrResFf - .4byte GetFrame__Q34nw4r3g3d15AnmObjMatClrResCFv - .4byte UpdateFrame__Q34nw4r3g3d15AnmObjMatClrResFv - .4byte SetUpdateRate__Q34nw4r3g3d15AnmObjMatClrResFf - .4byte GetUpdateRate__Q34nw4r3g3d15AnmObjMatClrResCFv - .4byte Bind__Q34nw4r3g3d15AnmObjMatClrResFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d12AnmObjMatClrFv - .4byte GetResult__Q34nw4r3g3d15AnmObjMatClrResFPQ34nw4r3g3d12ClrAnmResultUl - .4byte Attach__Q34nw4r3g3d12AnmObjMatClrFiPQ34nw4r3g3d15AnmObjMatClrRes - .4byte Detach__Q34nw4r3g3d12AnmObjMatClrFi - .4byte DetachAll__Q34nw4r3g3d12AnmObjMatClrFv - -.global __vt__Q34nw4r3g3d20AnmObjMatClrOverride -__vt__Q34nw4r3g3d20AnmObjMatClrOverride: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d20AnmObjMatClrOverrideCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d16AnmObjMatClrNodeFUlUlPv - .4byte __dt__Q34nw4r3g3d20AnmObjMatClrOverrideFv - .4byte GetTypeObj__Q34nw4r3g3d20AnmObjMatClrOverrideCFv - .4byte GetTypeName__Q34nw4r3g3d20AnmObjMatClrOverrideCFv - .4byte SetFrame__Q34nw4r3g3d16AnmObjMatClrNodeFf - .4byte GetFrame__Q34nw4r3g3d16AnmObjMatClrNodeCFv - .4byte UpdateFrame__Q34nw4r3g3d16AnmObjMatClrNodeFv - .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjMatClrNodeFf - .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjMatClrNodeCFv - .4byte Bind__Q34nw4r3g3d16AnmObjMatClrNodeFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d16AnmObjMatClrNodeFv - .4byte GetResult__Q34nw4r3g3d20AnmObjMatClrOverrideFPQ34nw4r3g3d12ClrAnmResultUl - .4byte Attach__Q34nw4r3g3d16AnmObjMatClrNodeFiPQ34nw4r3g3d15AnmObjMatClrRes - .4byte Detach__Q34nw4r3g3d16AnmObjMatClrNodeFi - .4byte DetachAll__Q34nw4r3g3d16AnmObjMatClrNodeFv - -.global __vt__Q34nw4r3g3d16AnmObjMatClrNode -__vt__Q34nw4r3g3d16AnmObjMatClrNode: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d16AnmObjMatClrNodeCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d16AnmObjMatClrNodeFUlUlPv - .4byte __dt__Q34nw4r3g3d16AnmObjMatClrNodeFv - .4byte GetTypeObj__Q34nw4r3g3d16AnmObjMatClrNodeCFv - .4byte GetTypeName__Q34nw4r3g3d16AnmObjMatClrNodeCFv - .4byte SetFrame__Q34nw4r3g3d16AnmObjMatClrNodeFf - .4byte GetFrame__Q34nw4r3g3d16AnmObjMatClrNodeCFv - .4byte UpdateFrame__Q34nw4r3g3d16AnmObjMatClrNodeFv - .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjMatClrNodeFf - .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjMatClrNodeCFv - .4byte Bind__Q34nw4r3g3d16AnmObjMatClrNodeFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d16AnmObjMatClrNodeFv - .4byte 0 - .4byte Attach__Q34nw4r3g3d16AnmObjMatClrNodeFiPQ34nw4r3g3d15AnmObjMatClrRes - .4byte Detach__Q34nw4r3g3d16AnmObjMatClrNodeFi - .4byte DetachAll__Q34nw4r3g3d16AnmObjMatClrNodeFv - -.global __vt__Q34nw4r3g3d12AnmObjMatClr -__vt__Q34nw4r3g3d12AnmObjMatClr: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjMatClrCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte 0 - .4byte __dt__Q34nw4r3g3d12AnmObjMatClrFv - .4byte GetTypeObj__Q34nw4r3g3d12AnmObjMatClrCFv - .4byte GetTypeName__Q34nw4r3g3d12AnmObjMatClrCFv - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte Release__Q34nw4r3g3d12AnmObjMatClrFv - .4byte 0 - .4byte Attach__Q34nw4r3g3d12AnmObjMatClrFiPQ34nw4r3g3d15AnmObjMatClrRes - .4byte Detach__Q34nw4r3g3d12AnmObjMatClrFi - .4byte DetachAll__Q34nw4r3g3d12AnmObjMatClrFv diff --git a/asm/libnw4r_g3d/g3d_anmclr_8055ef20.s b/asm/libnw4r_g3d/g3d_anmclr_8055ef20.s deleted file mode 100644 index 59685fbc..00000000 --- a/asm/libnw4r_g3d/g3d_anmclr_8055ef20.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@8993" -"@8993": - - .4byte 0 - -.global "@9016_8055EF24" -"@9016_8055EF24": - - .4byte 0x3F800000 - -.global "@9168" -"@9168": - - .4byte 0x43300000 - .4byte 0x80000000 diff --git a/asm/libnw4r_g3d/g3d_anmobj_800dbe80.s b/asm/libnw4r_g3d/g3d_anmobj.s similarity index 85% rename from asm/libnw4r_g3d/g3d_anmobj_800dbe80.s rename to asm/libnw4r_g3d/g3d_anmobj.s index 0e5a494d..f6beccc8 100644 --- a/asm/libnw4r_g3d/g3d_anmobj_800dbe80.s +++ b/asm/libnw4r_g3d/g3d_anmobj.s @@ -68,3 +68,29 @@ TestAnmFlag__Q34nw4r3g3d6AnmObjCFQ44nw4r3g3d6AnmObj7AnmFlag: /* 800DBF44 000D7D84 4E 80 00 20 */ blr /* 800DBF48 000D7D88 00 00 00 00 */ .4byte 0x00000000 /* 800DBF4C 000D7D8C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global TYPE_NAME__Q34nw4r3g3d6AnmObj +TYPE_NAME__Q34nw4r3g3d6AnmObj: + + .4byte 0x00000007 + .4byte 0x416E6D4F + .4byte 0x626A0000 + .4byte 0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global smBaseUpdateRate__Q34nw4r3g3d9FrameCtrl +smBaseUpdateRate__Q34nw4r3g3d9FrameCtrl: + + .4byte 0x3F800000 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@5234" +"@5234": + + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmobj_804085f8.s b/asm/libnw4r_g3d/g3d_anmobj_804085f8.s deleted file mode 100644 index 7c1a809e..00000000 --- a/asm/libnw4r_g3d/g3d_anmobj_804085f8.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global TYPE_NAME__Q34nw4r3g3d6AnmObj -TYPE_NAME__Q34nw4r3g3d6AnmObj: - - .4byte 0x00000007 - .4byte 0x416E6D4F - .4byte 0x626A0000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmobj_805569f0.s b/asm/libnw4r_g3d/g3d_anmobj_805569f0.s deleted file mode 100644 index 3f4774af..00000000 --- a/asm/libnw4r_g3d/g3d_anmobj_805569f0.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global smBaseUpdateRate__Q34nw4r3g3d9FrameCtrl -smBaseUpdateRate__Q34nw4r3g3d9FrameCtrl: - - .4byte 0x3F800000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmobj_8055efa8.s b/asm/libnw4r_g3d/g3d_anmobj_8055efa8.s deleted file mode 100644 index c38f2839..00000000 --- a/asm/libnw4r_g3d/g3d_anmobj_8055efa8.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@5234" -"@5234": - - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmscn_800da7f0.s b/asm/libnw4r_g3d/g3d_anmscn.s similarity index 96% rename from asm/libnw4r_g3d/g3d_anmscn_800da7f0.s rename to asm/libnw4r_g3d/g3d_anmscn.s index 43a6c314..82e398a2 100644 --- a/asm/libnw4r_g3d/g3d_anmscn_800da7f0.s +++ b/asm/libnw4r_g3d/g3d_anmscn.s @@ -1703,3 +1703,133 @@ GetTypeObj__Q34nw4r3g3d6AnmScnCFv: /* 800DBD04 000D7B44 38 63 85 C8 */ addi r3, r3, TYPE_NAME__Q34nw4r3g3d6AnmScn@l /* 800DBD08 000D7B48 4E 80 00 20 */ blr /* 800DBD0C 000D7B4C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global TYPE_NAME__Q34nw4r3g3d6AnmScn +TYPE_NAME__Q34nw4r3g3d6AnmScn: + + .4byte 0x00000007 + .4byte 0x416E6D53 + .4byte 0x636E0000 + .4byte 0 + +.global TYPE_NAME__Q34nw4r3g3d9AnmScnRes +TYPE_NAME__Q34nw4r3g3d9AnmScnRes: + + .4byte 0x0000000A + .4byte 0x416E6D53 + .4byte 0x636E5265 + .4byte 0x73000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3g3d9AnmScnRes +__vt__Q34nw4r3g3d9AnmScnRes: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d9AnmScnResCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d9AnmScnResFUlUlPv + .4byte __dt__Q34nw4r3g3d9AnmScnResFv + .4byte GetTypeObj__Q34nw4r3g3d9AnmScnResCFv + .4byte GetTypeName__Q34nw4r3g3d9AnmScnResCFv + .4byte SetFrame__Q34nw4r3g3d9AnmScnResFf + .4byte GetFrame__Q34nw4r3g3d9AnmScnResCFv + .4byte SetUpdateRate__Q34nw4r3g3d9AnmScnResFf + .4byte GetUpdateRate__Q34nw4r3g3d9AnmScnResCFv + .4byte UpdateFrame__Q34nw4r3g3d9AnmScnResFv + .4byte Attach__Q34nw4r3g3d6AnmScnFiPQ34nw4r3g3d9AnmScnRes + .4byte Detach__Q34nw4r3g3d6AnmScnFi + .4byte GetNumLightSet__Q34nw4r3g3d9AnmScnResCFv + .4byte GetNumAmbLight__Q34nw4r3g3d9AnmScnResCFv + .4byte GetNumDiffuseLight__Q34nw4r3g3d9AnmScnResCFv + .4byte GetNumSpecularLight__Q34nw4r3g3d9AnmScnResCFv + .4byte GetNumFog__Q34nw4r3g3d9AnmScnResCFv + .4byte GetNumCamera__Q34nw4r3g3d9AnmScnResCFv + .4byte GetLightSetMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv + .4byte GetAmbLightMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv + .4byte GetDiffuseLightMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv + .4byte GetFogMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv + .4byte GetCameraMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv + .4byte GetLightSet__Q34nw4r3g3d9AnmScnResFQ34nw4r3g3d8LightSetUl + .4byte GetAmbLightColor__Q34nw4r3g3d9AnmScnResFUl + .4byte GetLight__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d8LightObjPQ34nw4r3g3d8LightObjUl + .4byte GetFog__Q34nw4r3g3d9AnmScnResFQ34nw4r3g3d3FogUl + .4byte GetCamera__Q34nw4r3g3d9AnmScnResFQ34nw4r3g3d6CameraUl + .4byte GetSpecularLightID__Q34nw4r3g3d9AnmScnResCFUl + .4byte HasSpecularLight__Q34nw4r3g3d9AnmScnResCFUl + .4byte GetAmbLightResult__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d17AmbLightAnmResultUl + .4byte GetLightResult__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d14LightAnmResultUl + .4byte GetFogResult__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d12FogAnmResultUl + .4byte GetCameraResult__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d15CameraAnmResultUl + +.global __vt__Q34nw4r3g3d6AnmScn +__vt__Q34nw4r3g3d6AnmScn: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d6AnmScnCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte 0 + .4byte __dt__Q34nw4r3g3d6AnmScnFv + .4byte GetTypeObj__Q34nw4r3g3d6AnmScnCFv + .4byte GetTypeName__Q34nw4r3g3d6AnmScnCFv + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte Attach__Q34nw4r3g3d6AnmScnFiPQ34nw4r3g3d9AnmScnRes + .4byte Detach__Q34nw4r3g3d6AnmScnFi + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@13876" +"@13876": + + .4byte 0 + +.global "@13877" +"@13877": + + .4byte 0xD01502F9 + +.global "@13878" +"@13878": + + .4byte 0x3F800000 + .4byte 0 + +.global "@14573" +"@14573": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@14811" +"@14811": + + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmscn_804085c8.s b/asm/libnw4r_g3d/g3d_anmscn_804085c8.s deleted file mode 100644 index 270c26ea..00000000 --- a/asm/libnw4r_g3d/g3d_anmscn_804085c8.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global TYPE_NAME__Q34nw4r3g3d6AnmScn -TYPE_NAME__Q34nw4r3g3d6AnmScn: - - .4byte 0x00000007 - .4byte 0x416E6D53 - .4byte 0x636E0000 - .4byte 0 - -.global TYPE_NAME__Q34nw4r3g3d9AnmScnRes -TYPE_NAME__Q34nw4r3g3d9AnmScnRes: - - .4byte 0x0000000A - .4byte 0x416E6D53 - .4byte 0x636E5265 - .4byte 0x73000000 diff --git a/asm/libnw4r_g3d/g3d_anmscn_80440e10.s b/asm/libnw4r_g3d/g3d_anmscn_80440e10.s deleted file mode 100644 index 1d51fe07..00000000 --- a/asm/libnw4r_g3d/g3d_anmscn_80440e10.s +++ /dev/null @@ -1,82 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3g3d9AnmScnRes -__vt__Q34nw4r3g3d9AnmScnRes: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d9AnmScnResCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d9AnmScnResFUlUlPv - .4byte __dt__Q34nw4r3g3d9AnmScnResFv - .4byte GetTypeObj__Q34nw4r3g3d9AnmScnResCFv - .4byte GetTypeName__Q34nw4r3g3d9AnmScnResCFv - .4byte SetFrame__Q34nw4r3g3d9AnmScnResFf - .4byte GetFrame__Q34nw4r3g3d9AnmScnResCFv - .4byte SetUpdateRate__Q34nw4r3g3d9AnmScnResFf - .4byte GetUpdateRate__Q34nw4r3g3d9AnmScnResCFv - .4byte UpdateFrame__Q34nw4r3g3d9AnmScnResFv - .4byte Attach__Q34nw4r3g3d6AnmScnFiPQ34nw4r3g3d9AnmScnRes - .4byte Detach__Q34nw4r3g3d6AnmScnFi - .4byte GetNumLightSet__Q34nw4r3g3d9AnmScnResCFv - .4byte GetNumAmbLight__Q34nw4r3g3d9AnmScnResCFv - .4byte GetNumDiffuseLight__Q34nw4r3g3d9AnmScnResCFv - .4byte GetNumSpecularLight__Q34nw4r3g3d9AnmScnResCFv - .4byte GetNumFog__Q34nw4r3g3d9AnmScnResCFv - .4byte GetNumCamera__Q34nw4r3g3d9AnmScnResCFv - .4byte GetLightSetMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv - .4byte GetAmbLightMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv - .4byte GetDiffuseLightMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv - .4byte GetFogMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv - .4byte GetCameraMaxRefNumber__Q34nw4r3g3d9AnmScnResCFv - .4byte GetLightSet__Q34nw4r3g3d9AnmScnResFQ34nw4r3g3d8LightSetUl - .4byte GetAmbLightColor__Q34nw4r3g3d9AnmScnResFUl - .4byte GetLight__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d8LightObjPQ34nw4r3g3d8LightObjUl - .4byte GetFog__Q34nw4r3g3d9AnmScnResFQ34nw4r3g3d3FogUl - .4byte GetCamera__Q34nw4r3g3d9AnmScnResFQ34nw4r3g3d6CameraUl - .4byte GetSpecularLightID__Q34nw4r3g3d9AnmScnResCFUl - .4byte HasSpecularLight__Q34nw4r3g3d9AnmScnResCFUl - .4byte GetAmbLightResult__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d17AmbLightAnmResultUl - .4byte GetLightResult__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d14LightAnmResultUl - .4byte GetFogResult__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d12FogAnmResultUl - .4byte GetCameraResult__Q34nw4r3g3d9AnmScnResFPQ34nw4r3g3d15CameraAnmResultUl - -.global __vt__Q34nw4r3g3d6AnmScn -__vt__Q34nw4r3g3d6AnmScn: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d6AnmScnCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte 0 - .4byte __dt__Q34nw4r3g3d6AnmScnFv - .4byte GetTypeObj__Q34nw4r3g3d6AnmScnCFv - .4byte GetTypeName__Q34nw4r3g3d6AnmScnCFv - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte Attach__Q34nw4r3g3d6AnmScnFiPQ34nw4r3g3d9AnmScnRes - .4byte Detach__Q34nw4r3g3d6AnmScnFi - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmscn_8055ef88.s b/asm/libnw4r_g3d/g3d_anmscn_8055ef88.s deleted file mode 100644 index c11734c8..00000000 --- a/asm/libnw4r_g3d/g3d_anmscn_8055ef88.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@13876" -"@13876": - - .4byte 0 - -.global "@13877" -"@13877": - - .4byte 0xD01502F9 - -.global "@13878" -"@13878": - - .4byte 0x3F800000 - .4byte 0 - -.global "@14573" -"@14573": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@14811" -"@14811": - - .4byte 0x3F000000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmshp_800d9740.s b/asm/libnw4r_g3d/g3d_anmshp.s similarity index 93% rename from asm/libnw4r_g3d/g3d_anmshp_800d9740.s rename to asm/libnw4r_g3d/g3d_anmshp.s index 096fd259..68986603 100644 --- a/asm/libnw4r_g3d/g3d_anmshp_800d9740.s +++ b/asm/libnw4r_g3d/g3d_anmshp.s @@ -1390,3 +1390,157 @@ GetTypeObj__Q34nw4r3g3d9AnmObjShpCFv: /* 800DA7E4 000D6624 38 63 85 78 */ addi r3, r3, TYPE_NAME__Q34nw4r3g3d9AnmObjShp@l /* 800DA7E8 000D6628 4E 80 00 20 */ blr /* 800DA7EC 000D662C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global TYPE_NAME__Q34nw4r3g3d9AnmObjShp +TYPE_NAME__Q34nw4r3g3d9AnmObjShp: + + .4byte 0x0000000A + .4byte 0x416E6D4F + .4byte 0x626A5368 + .4byte 0x70000000 + +.global TYPE_NAME__Q34nw4r3g3d13AnmObjShpNode +TYPE_NAME__Q34nw4r3g3d13AnmObjShpNode: + + .4byte 0x0000000E + .4byte 0x416E6D4F + .4byte 0x626A5368 + .4byte 0x704E6F64 + .4byte 0x65000000 + +.global TYPE_NAME__Q34nw4r3g3d14AnmObjShpBlend +TYPE_NAME__Q34nw4r3g3d14AnmObjShpBlend: + + .4byte 0x0000000F + .4byte 0x416E6D4F + .4byte 0x626A5368 + .4byte 0x70426C65 + .4byte 0x6E640000 + +.global TYPE_NAME__Q34nw4r3g3d12AnmObjShpRes +TYPE_NAME__Q34nw4r3g3d12AnmObjShpRes: + + .4byte 0x0000000D + .4byte 0x416E6D4F + .4byte 0x626A5368 + .4byte 0x70526573 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3g3d12AnmObjShpRes +__vt__Q34nw4r3g3d12AnmObjShpRes: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjShpResCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d12AnmObjShpResFUlUlPv + .4byte __dt__Q34nw4r3g3d12AnmObjShpResFv + .4byte GetTypeObj__Q34nw4r3g3d12AnmObjShpResCFv + .4byte GetTypeName__Q34nw4r3g3d12AnmObjShpResCFv + .4byte SetFrame__Q34nw4r3g3d12AnmObjShpResFf + .4byte GetFrame__Q34nw4r3g3d12AnmObjShpResCFv + .4byte UpdateFrame__Q34nw4r3g3d12AnmObjShpResFv + .4byte SetUpdateRate__Q34nw4r3g3d12AnmObjShpResFf + .4byte GetUpdateRate__Q34nw4r3g3d12AnmObjShpResCFv + .4byte Bind__Q34nw4r3g3d12AnmObjShpResFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d9AnmObjShpFv + .4byte GetResult__Q34nw4r3g3d12AnmObjShpResFPQ34nw4r3g3d12ShpAnmResultUl + .4byte Attach__Q34nw4r3g3d9AnmObjShpFiPQ34nw4r3g3d12AnmObjShpRes + .4byte Detach__Q34nw4r3g3d9AnmObjShpFi + .4byte DetachAll__Q34nw4r3g3d9AnmObjShpFv + .4byte SetWeight__Q34nw4r3g3d9AnmObjShpFif + .4byte GetWeight__Q34nw4r3g3d9AnmObjShpCFi + +.global __vt__Q34nw4r3g3d14AnmObjShpBlend +__vt__Q34nw4r3g3d14AnmObjShpBlend: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d14AnmObjShpBlendCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d13AnmObjShpNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d14AnmObjShpBlendFv + .4byte GetTypeObj__Q34nw4r3g3d14AnmObjShpBlendCFv + .4byte GetTypeName__Q34nw4r3g3d14AnmObjShpBlendCFv + .4byte SetFrame__Q34nw4r3g3d13AnmObjShpNodeFf + .4byte GetFrame__Q34nw4r3g3d13AnmObjShpNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d13AnmObjShpNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjShpNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjShpNodeCFv + .4byte Bind__Q34nw4r3g3d13AnmObjShpNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d13AnmObjShpNodeFv + .4byte GetResult__Q34nw4r3g3d14AnmObjShpBlendFPQ34nw4r3g3d12ShpAnmResultUl + .4byte Attach__Q34nw4r3g3d13AnmObjShpNodeFiPQ34nw4r3g3d12AnmObjShpRes + .4byte Detach__Q34nw4r3g3d13AnmObjShpNodeFi + .4byte DetachAll__Q34nw4r3g3d13AnmObjShpNodeFv + .4byte SetWeight__Q34nw4r3g3d14AnmObjShpBlendFif + .4byte GetWeight__Q34nw4r3g3d14AnmObjShpBlendCFi + +.global __vt__Q34nw4r3g3d13AnmObjShpNode +__vt__Q34nw4r3g3d13AnmObjShpNode: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d13AnmObjShpNodeCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d13AnmObjShpNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d13AnmObjShpNodeFv + .4byte GetTypeObj__Q34nw4r3g3d13AnmObjShpNodeCFv + .4byte GetTypeName__Q34nw4r3g3d13AnmObjShpNodeCFv + .4byte SetFrame__Q34nw4r3g3d13AnmObjShpNodeFf + .4byte GetFrame__Q34nw4r3g3d13AnmObjShpNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d13AnmObjShpNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjShpNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjShpNodeCFv + .4byte Bind__Q34nw4r3g3d13AnmObjShpNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d13AnmObjShpNodeFv + .4byte 0 + .4byte Attach__Q34nw4r3g3d13AnmObjShpNodeFiPQ34nw4r3g3d12AnmObjShpRes + .4byte Detach__Q34nw4r3g3d13AnmObjShpNodeFi + .4byte DetachAll__Q34nw4r3g3d13AnmObjShpNodeFv + .4byte SetWeight__Q34nw4r3g3d9AnmObjShpFif + .4byte GetWeight__Q34nw4r3g3d9AnmObjShpCFi + +.global __vt__Q34nw4r3g3d9AnmObjShp +__vt__Q34nw4r3g3d9AnmObjShp: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d9AnmObjShpCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte 0 + .4byte __dt__Q34nw4r3g3d9AnmObjShpFv + .4byte GetTypeObj__Q34nw4r3g3d9AnmObjShpCFv + .4byte GetTypeName__Q34nw4r3g3d9AnmObjShpCFv + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte Release__Q34nw4r3g3d9AnmObjShpFv + .4byte 0 + .4byte Attach__Q34nw4r3g3d9AnmObjShpFiPQ34nw4r3g3d12AnmObjShpRes + .4byte Detach__Q34nw4r3g3d9AnmObjShpFi + .4byte DetachAll__Q34nw4r3g3d9AnmObjShpFv + .4byte SetWeight__Q34nw4r3g3d9AnmObjShpFif + .4byte GetWeight__Q34nw4r3g3d9AnmObjShpCFi +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@8380" +"@8380": + + .4byte 0 + +.global "@8493" +"@8493": + + .4byte 0x3F800000 + +.global "@8769" +"@8769": + + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_g3d/g3d_anmshp_80408578.s b/asm/libnw4r_g3d/g3d_anmshp_80408578.s deleted file mode 100644 index b944a436..00000000 --- a/asm/libnw4r_g3d/g3d_anmshp_80408578.s +++ /dev/null @@ -1,38 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global TYPE_NAME__Q34nw4r3g3d9AnmObjShp -TYPE_NAME__Q34nw4r3g3d9AnmObjShp: - - .4byte 0x0000000A - .4byte 0x416E6D4F - .4byte 0x626A5368 - .4byte 0x70000000 - -.global TYPE_NAME__Q34nw4r3g3d13AnmObjShpNode -TYPE_NAME__Q34nw4r3g3d13AnmObjShpNode: - - .4byte 0x0000000E - .4byte 0x416E6D4F - .4byte 0x626A5368 - .4byte 0x704E6F64 - .4byte 0x65000000 - -.global TYPE_NAME__Q34nw4r3g3d14AnmObjShpBlend -TYPE_NAME__Q34nw4r3g3d14AnmObjShpBlend: - - .4byte 0x0000000F - .4byte 0x416E6D4F - .4byte 0x626A5368 - .4byte 0x70426C65 - .4byte 0x6E640000 - -.global TYPE_NAME__Q34nw4r3g3d12AnmObjShpRes -TYPE_NAME__Q34nw4r3g3d12AnmObjShpRes: - - .4byte 0x0000000D - .4byte 0x416E6D4F - .4byte 0x626A5368 - .4byte 0x70526573 - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmshp_80440cd0.s b/asm/libnw4r_g3d/g3d_anmshp_80440cd0.s deleted file mode 100644 index b79d0a12..00000000 --- a/asm/libnw4r_g3d/g3d_anmshp_80440cd0.s +++ /dev/null @@ -1,98 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3g3d12AnmObjShpRes -__vt__Q34nw4r3g3d12AnmObjShpRes: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjShpResCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d12AnmObjShpResFUlUlPv - .4byte __dt__Q34nw4r3g3d12AnmObjShpResFv - .4byte GetTypeObj__Q34nw4r3g3d12AnmObjShpResCFv - .4byte GetTypeName__Q34nw4r3g3d12AnmObjShpResCFv - .4byte SetFrame__Q34nw4r3g3d12AnmObjShpResFf - .4byte GetFrame__Q34nw4r3g3d12AnmObjShpResCFv - .4byte UpdateFrame__Q34nw4r3g3d12AnmObjShpResFv - .4byte SetUpdateRate__Q34nw4r3g3d12AnmObjShpResFf - .4byte GetUpdateRate__Q34nw4r3g3d12AnmObjShpResCFv - .4byte Bind__Q34nw4r3g3d12AnmObjShpResFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d9AnmObjShpFv - .4byte GetResult__Q34nw4r3g3d12AnmObjShpResFPQ34nw4r3g3d12ShpAnmResultUl - .4byte Attach__Q34nw4r3g3d9AnmObjShpFiPQ34nw4r3g3d12AnmObjShpRes - .4byte Detach__Q34nw4r3g3d9AnmObjShpFi - .4byte DetachAll__Q34nw4r3g3d9AnmObjShpFv - .4byte SetWeight__Q34nw4r3g3d9AnmObjShpFif - .4byte GetWeight__Q34nw4r3g3d9AnmObjShpCFi - -.global __vt__Q34nw4r3g3d14AnmObjShpBlend -__vt__Q34nw4r3g3d14AnmObjShpBlend: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d14AnmObjShpBlendCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d13AnmObjShpNodeFUlUlPv - .4byte __dt__Q34nw4r3g3d14AnmObjShpBlendFv - .4byte GetTypeObj__Q34nw4r3g3d14AnmObjShpBlendCFv - .4byte GetTypeName__Q34nw4r3g3d14AnmObjShpBlendCFv - .4byte SetFrame__Q34nw4r3g3d13AnmObjShpNodeFf - .4byte GetFrame__Q34nw4r3g3d13AnmObjShpNodeCFv - .4byte UpdateFrame__Q34nw4r3g3d13AnmObjShpNodeFv - .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjShpNodeFf - .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjShpNodeCFv - .4byte Bind__Q34nw4r3g3d13AnmObjShpNodeFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d13AnmObjShpNodeFv - .4byte GetResult__Q34nw4r3g3d14AnmObjShpBlendFPQ34nw4r3g3d12ShpAnmResultUl - .4byte Attach__Q34nw4r3g3d13AnmObjShpNodeFiPQ34nw4r3g3d12AnmObjShpRes - .4byte Detach__Q34nw4r3g3d13AnmObjShpNodeFi - .4byte DetachAll__Q34nw4r3g3d13AnmObjShpNodeFv - .4byte SetWeight__Q34nw4r3g3d14AnmObjShpBlendFif - .4byte GetWeight__Q34nw4r3g3d14AnmObjShpBlendCFi - -.global __vt__Q34nw4r3g3d13AnmObjShpNode -__vt__Q34nw4r3g3d13AnmObjShpNode: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d13AnmObjShpNodeCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d13AnmObjShpNodeFUlUlPv - .4byte __dt__Q34nw4r3g3d13AnmObjShpNodeFv - .4byte GetTypeObj__Q34nw4r3g3d13AnmObjShpNodeCFv - .4byte GetTypeName__Q34nw4r3g3d13AnmObjShpNodeCFv - .4byte SetFrame__Q34nw4r3g3d13AnmObjShpNodeFf - .4byte GetFrame__Q34nw4r3g3d13AnmObjShpNodeCFv - .4byte UpdateFrame__Q34nw4r3g3d13AnmObjShpNodeFv - .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjShpNodeFf - .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjShpNodeCFv - .4byte Bind__Q34nw4r3g3d13AnmObjShpNodeFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d13AnmObjShpNodeFv - .4byte 0 - .4byte Attach__Q34nw4r3g3d13AnmObjShpNodeFiPQ34nw4r3g3d12AnmObjShpRes - .4byte Detach__Q34nw4r3g3d13AnmObjShpNodeFi - .4byte DetachAll__Q34nw4r3g3d13AnmObjShpNodeFv - .4byte SetWeight__Q34nw4r3g3d9AnmObjShpFif - .4byte GetWeight__Q34nw4r3g3d9AnmObjShpCFi - -.global __vt__Q34nw4r3g3d9AnmObjShp -__vt__Q34nw4r3g3d9AnmObjShp: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d9AnmObjShpCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte 0 - .4byte __dt__Q34nw4r3g3d9AnmObjShpFv - .4byte GetTypeObj__Q34nw4r3g3d9AnmObjShpCFv - .4byte GetTypeName__Q34nw4r3g3d9AnmObjShpCFv - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte Release__Q34nw4r3g3d9AnmObjShpFv - .4byte 0 - .4byte Attach__Q34nw4r3g3d9AnmObjShpFiPQ34nw4r3g3d12AnmObjShpRes - .4byte Detach__Q34nw4r3g3d9AnmObjShpFi - .4byte DetachAll__Q34nw4r3g3d9AnmObjShpFv - .4byte SetWeight__Q34nw4r3g3d9AnmObjShpFif - .4byte GetWeight__Q34nw4r3g3d9AnmObjShpCFi diff --git a/asm/libnw4r_g3d/g3d_anmshp_8055ef78.s b/asm/libnw4r_g3d/g3d_anmshp_8055ef78.s deleted file mode 100644 index 85d3d4a4..00000000 --- a/asm/libnw4r_g3d/g3d_anmshp_8055ef78.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@8380" -"@8380": - - .4byte 0 - -.global "@8493" -"@8493": - - .4byte 0x3F800000 - -.global "@8769" -"@8769": - - .4byte 0x43300000 - .4byte 0x80000000 diff --git a/asm/libnw4r_g3d/g3d_anmtexpat_800d6140.s b/asm/libnw4r_g3d/g3d_anmtexpat.s similarity index 92% rename from asm/libnw4r_g3d/g3d_anmtexpat_800d6140.s rename to asm/libnw4r_g3d/g3d_anmtexpat.s index a92ef646..c30d5f66 100644 --- a/asm/libnw4r_g3d/g3d_anmtexpat_800d6140.s +++ b/asm/libnw4r_g3d/g3d_anmtexpat.s @@ -1226,3 +1226,155 @@ GetTypeObj__Q34nw4r3g3d12AnmObjTexPatCFv: /* 800D6FF4 000D2E34 38 63 84 58 */ addi r3, r3, TYPE_NAME__Q34nw4r3g3d12AnmObjTexPat@l /* 800D6FF8 000D2E38 4E 80 00 20 */ blr /* 800D6FFC 000D2E3C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global TYPE_NAME__Q34nw4r3g3d12AnmObjTexPat +TYPE_NAME__Q34nw4r3g3d12AnmObjTexPat: + + .4byte 0x0000000D + .4byte 0x416E6D4F + .4byte 0x626A5465 + .4byte 0x78506174 + .4byte 0 + .4byte 0 + +.global TYPE_NAME__Q34nw4r3g3d16AnmObjTexPatNode +TYPE_NAME__Q34nw4r3g3d16AnmObjTexPatNode: + + .4byte 0x00000011 + .4byte 0x416E6D4F + .4byte 0x626A5465 + .4byte 0x78506174 + .4byte 0x4E6F6465 + .4byte 0 + +.global TYPE_NAME__Q34nw4r3g3d20AnmObjTexPatOverride +TYPE_NAME__Q34nw4r3g3d20AnmObjTexPatOverride: + + .4byte 0x00000015 + .4byte 0x416E6D4F + .4byte 0x626A5465 + .4byte 0x78506174 + .4byte 0x4F766572 + .4byte 0x72696465 + .4byte 0 + .4byte 0 + +.global TYPE_NAME__Q34nw4r3g3d15AnmObjTexPatRes +TYPE_NAME__Q34nw4r3g3d15AnmObjTexPatRes: + + .4byte 0x00000010 + .4byte 0x416E6D4F + .4byte 0x626A5465 + .4byte 0x78506174 + .4byte 0x52657300 + .4byte 0 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3g3d15AnmObjTexPatRes +__vt__Q34nw4r3g3d15AnmObjTexPatRes: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d15AnmObjTexPatResCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d15AnmObjTexPatResFUlUlPv + .4byte __dt__Q34nw4r3g3d15AnmObjTexPatResFv + .4byte GetTypeObj__Q34nw4r3g3d15AnmObjTexPatResCFv + .4byte GetTypeName__Q34nw4r3g3d15AnmObjTexPatResCFv + .4byte SetFrame__Q34nw4r3g3d15AnmObjTexPatResFf + .4byte GetFrame__Q34nw4r3g3d15AnmObjTexPatResCFv + .4byte UpdateFrame__Q34nw4r3g3d15AnmObjTexPatResFv + .4byte SetUpdateRate__Q34nw4r3g3d15AnmObjTexPatResFf + .4byte GetUpdateRate__Q34nw4r3g3d15AnmObjTexPatResCFv + .4byte Bind__Q34nw4r3g3d15AnmObjTexPatResFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d12AnmObjTexPatFv + .4byte GetResult__Q34nw4r3g3d15AnmObjTexPatResFPQ34nw4r3g3d15TexPatAnmResultUl + .4byte Attach__Q34nw4r3g3d12AnmObjTexPatFiPQ34nw4r3g3d15AnmObjTexPatRes + .4byte Detach__Q34nw4r3g3d12AnmObjTexPatFi + .4byte DetachAll__Q34nw4r3g3d12AnmObjTexPatFv + +.global __vt__Q34nw4r3g3d20AnmObjTexPatOverride +__vt__Q34nw4r3g3d20AnmObjTexPatOverride: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d20AnmObjTexPatOverrideCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d16AnmObjTexPatNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d20AnmObjTexPatOverrideFv + .4byte GetTypeObj__Q34nw4r3g3d20AnmObjTexPatOverrideCFv + .4byte GetTypeName__Q34nw4r3g3d20AnmObjTexPatOverrideCFv + .4byte SetFrame__Q34nw4r3g3d16AnmObjTexPatNodeFf + .4byte GetFrame__Q34nw4r3g3d16AnmObjTexPatNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d16AnmObjTexPatNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjTexPatNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjTexPatNodeCFv + .4byte Bind__Q34nw4r3g3d16AnmObjTexPatNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d16AnmObjTexPatNodeFv + .4byte GetResult__Q34nw4r3g3d20AnmObjTexPatOverrideFPQ34nw4r3g3d15TexPatAnmResultUl + .4byte Attach__Q34nw4r3g3d16AnmObjTexPatNodeFiPQ34nw4r3g3d15AnmObjTexPatRes + .4byte Detach__Q34nw4r3g3d16AnmObjTexPatNodeFi + .4byte DetachAll__Q34nw4r3g3d16AnmObjTexPatNodeFv + +.global __vt__Q34nw4r3g3d16AnmObjTexPatNode +__vt__Q34nw4r3g3d16AnmObjTexPatNode: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d16AnmObjTexPatNodeCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d16AnmObjTexPatNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d16AnmObjTexPatNodeFv + .4byte GetTypeObj__Q34nw4r3g3d16AnmObjTexPatNodeCFv + .4byte GetTypeName__Q34nw4r3g3d16AnmObjTexPatNodeCFv + .4byte SetFrame__Q34nw4r3g3d16AnmObjTexPatNodeFf + .4byte GetFrame__Q34nw4r3g3d16AnmObjTexPatNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d16AnmObjTexPatNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjTexPatNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjTexPatNodeCFv + .4byte Bind__Q34nw4r3g3d16AnmObjTexPatNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d16AnmObjTexPatNodeFv + .4byte 0 + .4byte Attach__Q34nw4r3g3d16AnmObjTexPatNodeFiPQ34nw4r3g3d15AnmObjTexPatRes + .4byte Detach__Q34nw4r3g3d16AnmObjTexPatNodeFi + .4byte DetachAll__Q34nw4r3g3d16AnmObjTexPatNodeFv + +.global __vt__Q34nw4r3g3d12AnmObjTexPat +__vt__Q34nw4r3g3d12AnmObjTexPat: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjTexPatCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte 0 + .4byte __dt__Q34nw4r3g3d12AnmObjTexPatFv + .4byte GetTypeObj__Q34nw4r3g3d12AnmObjTexPatCFv + .4byte GetTypeName__Q34nw4r3g3d12AnmObjTexPatCFv + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte Release__Q34nw4r3g3d12AnmObjTexPatFv + .4byte 0 + .4byte Attach__Q34nw4r3g3d12AnmObjTexPatFiPQ34nw4r3g3d15AnmObjTexPatRes + .4byte Detach__Q34nw4r3g3d12AnmObjTexPatFi + .4byte DetachAll__Q34nw4r3g3d12AnmObjTexPatFv +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@10745" +"@10745": + + .4byte 0 + +.global "@10768" +"@10768": + + .4byte 0x3F800000 + +.global "@10921" +"@10921": + + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_g3d/g3d_anmtexpat_80408458.s b/asm/libnw4r_g3d/g3d_anmtexpat_80408458.s deleted file mode 100644 index 33ff5388..00000000 --- a/asm/libnw4r_g3d/g3d_anmtexpat_80408458.s +++ /dev/null @@ -1,44 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global TYPE_NAME__Q34nw4r3g3d12AnmObjTexPat -TYPE_NAME__Q34nw4r3g3d12AnmObjTexPat: - - .4byte 0x0000000D - .4byte 0x416E6D4F - .4byte 0x626A5465 - .4byte 0x78506174 - .4byte 0 - .4byte 0 - -.global TYPE_NAME__Q34nw4r3g3d16AnmObjTexPatNode -TYPE_NAME__Q34nw4r3g3d16AnmObjTexPatNode: - - .4byte 0x00000011 - .4byte 0x416E6D4F - .4byte 0x626A5465 - .4byte 0x78506174 - .4byte 0x4E6F6465 - .4byte 0 - -.global TYPE_NAME__Q34nw4r3g3d20AnmObjTexPatOverride -TYPE_NAME__Q34nw4r3g3d20AnmObjTexPatOverride: - - .4byte 0x00000015 - .4byte 0x416E6D4F - .4byte 0x626A5465 - .4byte 0x78506174 - .4byte 0x4F766572 - .4byte 0x72696465 - .4byte 0 - .4byte 0 - -.global TYPE_NAME__Q34nw4r3g3d15AnmObjTexPatRes -TYPE_NAME__Q34nw4r3g3d15AnmObjTexPatRes: - - .4byte 0x00000010 - .4byte 0x416E6D4F - .4byte 0x626A5465 - .4byte 0x78506174 - .4byte 0x52657300 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmtexpat_80440930.s b/asm/libnw4r_g3d/g3d_anmtexpat_80440930.s deleted file mode 100644 index f4053f4d..00000000 --- a/asm/libnw4r_g3d/g3d_anmtexpat_80440930.s +++ /dev/null @@ -1,90 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3g3d15AnmObjTexPatRes -__vt__Q34nw4r3g3d15AnmObjTexPatRes: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d15AnmObjTexPatResCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d15AnmObjTexPatResFUlUlPv - .4byte __dt__Q34nw4r3g3d15AnmObjTexPatResFv - .4byte GetTypeObj__Q34nw4r3g3d15AnmObjTexPatResCFv - .4byte GetTypeName__Q34nw4r3g3d15AnmObjTexPatResCFv - .4byte SetFrame__Q34nw4r3g3d15AnmObjTexPatResFf - .4byte GetFrame__Q34nw4r3g3d15AnmObjTexPatResCFv - .4byte UpdateFrame__Q34nw4r3g3d15AnmObjTexPatResFv - .4byte SetUpdateRate__Q34nw4r3g3d15AnmObjTexPatResFf - .4byte GetUpdateRate__Q34nw4r3g3d15AnmObjTexPatResCFv - .4byte Bind__Q34nw4r3g3d15AnmObjTexPatResFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d12AnmObjTexPatFv - .4byte GetResult__Q34nw4r3g3d15AnmObjTexPatResFPQ34nw4r3g3d15TexPatAnmResultUl - .4byte Attach__Q34nw4r3g3d12AnmObjTexPatFiPQ34nw4r3g3d15AnmObjTexPatRes - .4byte Detach__Q34nw4r3g3d12AnmObjTexPatFi - .4byte DetachAll__Q34nw4r3g3d12AnmObjTexPatFv - -.global __vt__Q34nw4r3g3d20AnmObjTexPatOverride -__vt__Q34nw4r3g3d20AnmObjTexPatOverride: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d20AnmObjTexPatOverrideCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d16AnmObjTexPatNodeFUlUlPv - .4byte __dt__Q34nw4r3g3d20AnmObjTexPatOverrideFv - .4byte GetTypeObj__Q34nw4r3g3d20AnmObjTexPatOverrideCFv - .4byte GetTypeName__Q34nw4r3g3d20AnmObjTexPatOverrideCFv - .4byte SetFrame__Q34nw4r3g3d16AnmObjTexPatNodeFf - .4byte GetFrame__Q34nw4r3g3d16AnmObjTexPatNodeCFv - .4byte UpdateFrame__Q34nw4r3g3d16AnmObjTexPatNodeFv - .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjTexPatNodeFf - .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjTexPatNodeCFv - .4byte Bind__Q34nw4r3g3d16AnmObjTexPatNodeFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d16AnmObjTexPatNodeFv - .4byte GetResult__Q34nw4r3g3d20AnmObjTexPatOverrideFPQ34nw4r3g3d15TexPatAnmResultUl - .4byte Attach__Q34nw4r3g3d16AnmObjTexPatNodeFiPQ34nw4r3g3d15AnmObjTexPatRes - .4byte Detach__Q34nw4r3g3d16AnmObjTexPatNodeFi - .4byte DetachAll__Q34nw4r3g3d16AnmObjTexPatNodeFv - -.global __vt__Q34nw4r3g3d16AnmObjTexPatNode -__vt__Q34nw4r3g3d16AnmObjTexPatNode: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d16AnmObjTexPatNodeCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d16AnmObjTexPatNodeFUlUlPv - .4byte __dt__Q34nw4r3g3d16AnmObjTexPatNodeFv - .4byte GetTypeObj__Q34nw4r3g3d16AnmObjTexPatNodeCFv - .4byte GetTypeName__Q34nw4r3g3d16AnmObjTexPatNodeCFv - .4byte SetFrame__Q34nw4r3g3d16AnmObjTexPatNodeFf - .4byte GetFrame__Q34nw4r3g3d16AnmObjTexPatNodeCFv - .4byte UpdateFrame__Q34nw4r3g3d16AnmObjTexPatNodeFv - .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjTexPatNodeFf - .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjTexPatNodeCFv - .4byte Bind__Q34nw4r3g3d16AnmObjTexPatNodeFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d16AnmObjTexPatNodeFv - .4byte 0 - .4byte Attach__Q34nw4r3g3d16AnmObjTexPatNodeFiPQ34nw4r3g3d15AnmObjTexPatRes - .4byte Detach__Q34nw4r3g3d16AnmObjTexPatNodeFi - .4byte DetachAll__Q34nw4r3g3d16AnmObjTexPatNodeFv - -.global __vt__Q34nw4r3g3d12AnmObjTexPat -__vt__Q34nw4r3g3d12AnmObjTexPat: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjTexPatCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte 0 - .4byte __dt__Q34nw4r3g3d12AnmObjTexPatFv - .4byte GetTypeObj__Q34nw4r3g3d12AnmObjTexPatCFv - .4byte GetTypeName__Q34nw4r3g3d12AnmObjTexPatCFv - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte Release__Q34nw4r3g3d12AnmObjTexPatFv - .4byte 0 - .4byte Attach__Q34nw4r3g3d12AnmObjTexPatFiPQ34nw4r3g3d15AnmObjTexPatRes - .4byte Detach__Q34nw4r3g3d12AnmObjTexPatFi - .4byte DetachAll__Q34nw4r3g3d12AnmObjTexPatFv diff --git a/asm/libnw4r_g3d/g3d_anmtexpat_8055ef30.s b/asm/libnw4r_g3d/g3d_anmtexpat_8055ef30.s deleted file mode 100644 index fc5489fb..00000000 --- a/asm/libnw4r_g3d/g3d_anmtexpat_8055ef30.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@10745" -"@10745": - - .4byte 0 - -.global "@10768" -"@10768": - - .4byte 0x3F800000 - -.global "@10921" -"@10921": - - .4byte 0x43300000 - .4byte 0x80000000 diff --git a/asm/libnw4r_g3d/g3d_anmtexsrt_800d7000.s b/asm/libnw4r_g3d/g3d_anmtexsrt.s similarity index 92% rename from asm/libnw4r_g3d/g3d_anmtexsrt_800d7000.s rename to asm/libnw4r_g3d/g3d_anmtexsrt.s index 8fb3479e..8ad8106c 100644 --- a/asm/libnw4r_g3d/g3d_anmtexsrt_800d7000.s +++ b/asm/libnw4r_g3d/g3d_anmtexsrt.s @@ -1186,3 +1186,167 @@ GetTypeObj__Q34nw4r3g3d12AnmObjTexSrtCFv: /* 800D7E14 000D3C54 38 63 84 C0 */ addi r3, r3, TYPE_NAME__Q34nw4r3g3d12AnmObjTexSrt@l /* 800D7E18 000D3C58 4E 80 00 20 */ blr /* 800D7E1C 000D3C5C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global TYPE_NAME__Q34nw4r3g3d12AnmObjTexSrt +TYPE_NAME__Q34nw4r3g3d12AnmObjTexSrt: + + .4byte 0x0000000D + .4byte 0x416E6D4F + .4byte 0x626A5465 + .4byte 0x78537274 + .4byte 0 + .4byte 0 + +.global TYPE_NAME__Q34nw4r3g3d16AnmObjTexSrtNode +TYPE_NAME__Q34nw4r3g3d16AnmObjTexSrtNode: + + .4byte 0x00000011 + .4byte 0x416E6D4F + .4byte 0x626A5465 + .4byte 0x78537274 + .4byte 0x4E6F6465 + .4byte 0 + +.global TYPE_NAME__Q34nw4r3g3d20AnmObjTexSrtOverride +TYPE_NAME__Q34nw4r3g3d20AnmObjTexSrtOverride: + + .4byte 0x00000015 + .4byte 0x416E6D4F + .4byte 0x626A5465 + .4byte 0x78537274 + .4byte 0x4F766572 + .4byte 0x72696465 + .4byte 0 + .4byte 0 + +.global TYPE_NAME__Q34nw4r3g3d15AnmObjTexSrtRes +TYPE_NAME__Q34nw4r3g3d15AnmObjTexSrtRes: + + .4byte 0x00000010 + .4byte 0x416E6D4F + .4byte 0x626A5465 + .4byte 0x78537274 + .4byte 0x52657300 + .4byte 0 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3g3d15AnmObjTexSrtRes +__vt__Q34nw4r3g3d15AnmObjTexSrtRes: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d15AnmObjTexSrtResCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d15AnmObjTexSrtResFUlUlPv + .4byte __dt__Q34nw4r3g3d15AnmObjTexSrtResFv + .4byte GetTypeObj__Q34nw4r3g3d15AnmObjTexSrtResCFv + .4byte GetTypeName__Q34nw4r3g3d15AnmObjTexSrtResCFv + .4byte SetFrame__Q34nw4r3g3d15AnmObjTexSrtResFf + .4byte GetFrame__Q34nw4r3g3d15AnmObjTexSrtResCFv + .4byte UpdateFrame__Q34nw4r3g3d15AnmObjTexSrtResFv + .4byte SetUpdateRate__Q34nw4r3g3d15AnmObjTexSrtResFf + .4byte GetUpdateRate__Q34nw4r3g3d15AnmObjTexSrtResCFv + .4byte Bind__Q34nw4r3g3d15AnmObjTexSrtResFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d12AnmObjTexSrtFv + .4byte GetResult__Q34nw4r3g3d15AnmObjTexSrtResFPQ34nw4r3g3d15TexSrtAnmResultUl + .4byte Attach__Q34nw4r3g3d12AnmObjTexSrtFiPQ34nw4r3g3d15AnmObjTexSrtRes + .4byte Detach__Q34nw4r3g3d12AnmObjTexSrtFi + .4byte DetachAll__Q34nw4r3g3d12AnmObjTexSrtFv + +.global __vt__Q34nw4r3g3d20AnmObjTexSrtOverride +__vt__Q34nw4r3g3d20AnmObjTexSrtOverride: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d20AnmObjTexSrtOverrideCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d16AnmObjTexSrtNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d20AnmObjTexSrtOverrideFv + .4byte GetTypeObj__Q34nw4r3g3d20AnmObjTexSrtOverrideCFv + .4byte GetTypeName__Q34nw4r3g3d20AnmObjTexSrtOverrideCFv + .4byte SetFrame__Q34nw4r3g3d16AnmObjTexSrtNodeFf + .4byte GetFrame__Q34nw4r3g3d16AnmObjTexSrtNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d16AnmObjTexSrtNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjTexSrtNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjTexSrtNodeCFv + .4byte Bind__Q34nw4r3g3d16AnmObjTexSrtNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d16AnmObjTexSrtNodeFv + .4byte GetResult__Q34nw4r3g3d20AnmObjTexSrtOverrideFPQ34nw4r3g3d15TexSrtAnmResultUl + .4byte Attach__Q34nw4r3g3d16AnmObjTexSrtNodeFiPQ34nw4r3g3d15AnmObjTexSrtRes + .4byte Detach__Q34nw4r3g3d16AnmObjTexSrtNodeFi + .4byte DetachAll__Q34nw4r3g3d16AnmObjTexSrtNodeFv + +.global __vt__Q34nw4r3g3d16AnmObjTexSrtNode +__vt__Q34nw4r3g3d16AnmObjTexSrtNode: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d16AnmObjTexSrtNodeCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d16AnmObjTexSrtNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d16AnmObjTexSrtNodeFv + .4byte GetTypeObj__Q34nw4r3g3d16AnmObjTexSrtNodeCFv + .4byte GetTypeName__Q34nw4r3g3d16AnmObjTexSrtNodeCFv + .4byte SetFrame__Q34nw4r3g3d16AnmObjTexSrtNodeFf + .4byte GetFrame__Q34nw4r3g3d16AnmObjTexSrtNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d16AnmObjTexSrtNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjTexSrtNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjTexSrtNodeCFv + .4byte Bind__Q34nw4r3g3d16AnmObjTexSrtNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d16AnmObjTexSrtNodeFv + .4byte 0 + .4byte Attach__Q34nw4r3g3d16AnmObjTexSrtNodeFiPQ34nw4r3g3d15AnmObjTexSrtRes + .4byte Detach__Q34nw4r3g3d16AnmObjTexSrtNodeFi + .4byte DetachAll__Q34nw4r3g3d16AnmObjTexSrtNodeFv + +.global __vt__Q34nw4r3g3d12AnmObjTexSrt +__vt__Q34nw4r3g3d12AnmObjTexSrt: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjTexSrtCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte 0 + .4byte __dt__Q34nw4r3g3d12AnmObjTexSrtFv + .4byte GetTypeObj__Q34nw4r3g3d12AnmObjTexSrtCFv + .4byte GetTypeName__Q34nw4r3g3d12AnmObjTexSrtCFv + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte Release__Q34nw4r3g3d12AnmObjTexSrtFv + .4byte 0 + .4byte Attach__Q34nw4r3g3d12AnmObjTexSrtFiPQ34nw4r3g3d15AnmObjTexSrtRes + .4byte Detach__Q34nw4r3g3d12AnmObjTexSrtFi + .4byte DetachAll__Q34nw4r3g3d12AnmObjTexSrtFv +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@9106" +"@9106": + + .4byte 0 + +.global "@9129" +"@9129": + + .4byte 0x3F800000 + +.global "@9282" +"@9282": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@9563_8055EF50" +"@9563_8055EF50": + + .4byte 0x219392EF + .4byte 0 + +.global "@9564_8055EF58" +"@9564_8055EF58": + + .4byte 0x3FF00000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmtexsrt_804084c0.s b/asm/libnw4r_g3d/g3d_anmtexsrt_804084c0.s deleted file mode 100644 index b18f24ab..00000000 --- a/asm/libnw4r_g3d/g3d_anmtexsrt_804084c0.s +++ /dev/null @@ -1,44 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global TYPE_NAME__Q34nw4r3g3d12AnmObjTexSrt -TYPE_NAME__Q34nw4r3g3d12AnmObjTexSrt: - - .4byte 0x0000000D - .4byte 0x416E6D4F - .4byte 0x626A5465 - .4byte 0x78537274 - .4byte 0 - .4byte 0 - -.global TYPE_NAME__Q34nw4r3g3d16AnmObjTexSrtNode -TYPE_NAME__Q34nw4r3g3d16AnmObjTexSrtNode: - - .4byte 0x00000011 - .4byte 0x416E6D4F - .4byte 0x626A5465 - .4byte 0x78537274 - .4byte 0x4E6F6465 - .4byte 0 - -.global TYPE_NAME__Q34nw4r3g3d20AnmObjTexSrtOverride -TYPE_NAME__Q34nw4r3g3d20AnmObjTexSrtOverride: - - .4byte 0x00000015 - .4byte 0x416E6D4F - .4byte 0x626A5465 - .4byte 0x78537274 - .4byte 0x4F766572 - .4byte 0x72696465 - .4byte 0 - .4byte 0 - -.global TYPE_NAME__Q34nw4r3g3d15AnmObjTexSrtRes -TYPE_NAME__Q34nw4r3g3d15AnmObjTexSrtRes: - - .4byte 0x00000010 - .4byte 0x416E6D4F - .4byte 0x626A5465 - .4byte 0x78537274 - .4byte 0x52657300 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmtexsrt_80440a50.s b/asm/libnw4r_g3d/g3d_anmtexsrt_80440a50.s deleted file mode 100644 index aa8dc455..00000000 --- a/asm/libnw4r_g3d/g3d_anmtexsrt_80440a50.s +++ /dev/null @@ -1,90 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3g3d15AnmObjTexSrtRes -__vt__Q34nw4r3g3d15AnmObjTexSrtRes: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d15AnmObjTexSrtResCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d15AnmObjTexSrtResFUlUlPv - .4byte __dt__Q34nw4r3g3d15AnmObjTexSrtResFv - .4byte GetTypeObj__Q34nw4r3g3d15AnmObjTexSrtResCFv - .4byte GetTypeName__Q34nw4r3g3d15AnmObjTexSrtResCFv - .4byte SetFrame__Q34nw4r3g3d15AnmObjTexSrtResFf - .4byte GetFrame__Q34nw4r3g3d15AnmObjTexSrtResCFv - .4byte UpdateFrame__Q34nw4r3g3d15AnmObjTexSrtResFv - .4byte SetUpdateRate__Q34nw4r3g3d15AnmObjTexSrtResFf - .4byte GetUpdateRate__Q34nw4r3g3d15AnmObjTexSrtResCFv - .4byte Bind__Q34nw4r3g3d15AnmObjTexSrtResFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d12AnmObjTexSrtFv - .4byte GetResult__Q34nw4r3g3d15AnmObjTexSrtResFPQ34nw4r3g3d15TexSrtAnmResultUl - .4byte Attach__Q34nw4r3g3d12AnmObjTexSrtFiPQ34nw4r3g3d15AnmObjTexSrtRes - .4byte Detach__Q34nw4r3g3d12AnmObjTexSrtFi - .4byte DetachAll__Q34nw4r3g3d12AnmObjTexSrtFv - -.global __vt__Q34nw4r3g3d20AnmObjTexSrtOverride -__vt__Q34nw4r3g3d20AnmObjTexSrtOverride: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d20AnmObjTexSrtOverrideCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d16AnmObjTexSrtNodeFUlUlPv - .4byte __dt__Q34nw4r3g3d20AnmObjTexSrtOverrideFv - .4byte GetTypeObj__Q34nw4r3g3d20AnmObjTexSrtOverrideCFv - .4byte GetTypeName__Q34nw4r3g3d20AnmObjTexSrtOverrideCFv - .4byte SetFrame__Q34nw4r3g3d16AnmObjTexSrtNodeFf - .4byte GetFrame__Q34nw4r3g3d16AnmObjTexSrtNodeCFv - .4byte UpdateFrame__Q34nw4r3g3d16AnmObjTexSrtNodeFv - .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjTexSrtNodeFf - .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjTexSrtNodeCFv - .4byte Bind__Q34nw4r3g3d16AnmObjTexSrtNodeFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d16AnmObjTexSrtNodeFv - .4byte GetResult__Q34nw4r3g3d20AnmObjTexSrtOverrideFPQ34nw4r3g3d15TexSrtAnmResultUl - .4byte Attach__Q34nw4r3g3d16AnmObjTexSrtNodeFiPQ34nw4r3g3d15AnmObjTexSrtRes - .4byte Detach__Q34nw4r3g3d16AnmObjTexSrtNodeFi - .4byte DetachAll__Q34nw4r3g3d16AnmObjTexSrtNodeFv - -.global __vt__Q34nw4r3g3d16AnmObjTexSrtNode -__vt__Q34nw4r3g3d16AnmObjTexSrtNode: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d16AnmObjTexSrtNodeCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d16AnmObjTexSrtNodeFUlUlPv - .4byte __dt__Q34nw4r3g3d16AnmObjTexSrtNodeFv - .4byte GetTypeObj__Q34nw4r3g3d16AnmObjTexSrtNodeCFv - .4byte GetTypeName__Q34nw4r3g3d16AnmObjTexSrtNodeCFv - .4byte SetFrame__Q34nw4r3g3d16AnmObjTexSrtNodeFf - .4byte GetFrame__Q34nw4r3g3d16AnmObjTexSrtNodeCFv - .4byte UpdateFrame__Q34nw4r3g3d16AnmObjTexSrtNodeFv - .4byte SetUpdateRate__Q34nw4r3g3d16AnmObjTexSrtNodeFf - .4byte GetUpdateRate__Q34nw4r3g3d16AnmObjTexSrtNodeCFv - .4byte Bind__Q34nw4r3g3d16AnmObjTexSrtNodeFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d16AnmObjTexSrtNodeFv - .4byte 0 - .4byte Attach__Q34nw4r3g3d16AnmObjTexSrtNodeFiPQ34nw4r3g3d15AnmObjTexSrtRes - .4byte Detach__Q34nw4r3g3d16AnmObjTexSrtNodeFi - .4byte DetachAll__Q34nw4r3g3d16AnmObjTexSrtNodeFv - -.global __vt__Q34nw4r3g3d12AnmObjTexSrt -__vt__Q34nw4r3g3d12AnmObjTexSrt: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjTexSrtCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte 0 - .4byte __dt__Q34nw4r3g3d12AnmObjTexSrtFv - .4byte GetTypeObj__Q34nw4r3g3d12AnmObjTexSrtCFv - .4byte GetTypeName__Q34nw4r3g3d12AnmObjTexSrtCFv - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte Release__Q34nw4r3g3d12AnmObjTexSrtFv - .4byte 0 - .4byte Attach__Q34nw4r3g3d12AnmObjTexSrtFiPQ34nw4r3g3d15AnmObjTexSrtRes - .4byte Detach__Q34nw4r3g3d12AnmObjTexSrtFi - .4byte DetachAll__Q34nw4r3g3d12AnmObjTexSrtFv diff --git a/asm/libnw4r_g3d/g3d_anmtexsrt_8055ef40.s b/asm/libnw4r_g3d/g3d_anmtexsrt_8055ef40.s deleted file mode 100644 index 5b52cceb..00000000 --- a/asm/libnw4r_g3d/g3d_anmtexsrt_8055ef40.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@9106" -"@9106": - - .4byte 0 - -.global "@9129" -"@9129": - - .4byte 0x3F800000 - -.global "@9282" -"@9282": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@9563_8055EF50" -"@9563_8055EF50": - - .4byte 0x219392EF - .4byte 0 - -.global "@9564_8055EF58" -"@9564_8055EF58": - - .4byte 0x3FF00000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmvis_800d3880.s b/asm/libnw4r_g3d/g3d_anmvis.s similarity index 93% rename from asm/libnw4r_g3d/g3d_anmvis_800d3880.s rename to asm/libnw4r_g3d/g3d_anmvis.s index 1a52bc7c..494692f5 100644 --- a/asm/libnw4r_g3d/g3d_anmvis_800d3880.s +++ b/asm/libnw4r_g3d/g3d_anmvis.s @@ -1476,3 +1476,153 @@ GetTypeObj__Q34nw4r3g3d9AnmObjVisCFv: /* 800D4A84 000D08C4 38 63 83 A0 */ addi r3, r3, TYPE_NAME__Q34nw4r3g3d9AnmObjVis@l /* 800D4A88 000D08C8 4E 80 00 20 */ blr /* 800D4A8C 000D08CC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global TYPE_NAME__Q34nw4r3g3d9AnmObjVis +TYPE_NAME__Q34nw4r3g3d9AnmObjVis: + + .4byte 0x0000000A + .4byte 0x416E6D4F + .4byte 0x626A5669 + .4byte 0x73000000 + +.global TYPE_NAME__Q34nw4r3g3d13AnmObjVisNode +TYPE_NAME__Q34nw4r3g3d13AnmObjVisNode: + + .4byte 0x0000000E + .4byte 0x416E6D4F + .4byte 0x626A5669 + .4byte 0x734E6F64 + .4byte 0x65000000 + +.global TYPE_NAME__Q34nw4r3g3d11AnmObjVisOR +TYPE_NAME__Q34nw4r3g3d11AnmObjVisOR: + + .4byte 0x0000000C + .4byte 0x416E6D4F + .4byte 0x626A5669 + .4byte 0x734F5200 + .4byte 0 + +.global TYPE_NAME__Q34nw4r3g3d12AnmObjVisRes +TYPE_NAME__Q34nw4r3g3d12AnmObjVisRes: + + .4byte 0x0000000D + .4byte 0x416E6D4F + .4byte 0x626A5669 + .4byte 0x73526573 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3g3d12AnmObjVisRes +__vt__Q34nw4r3g3d12AnmObjVisRes: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjVisResCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d9AnmObjVisFUlUlPv + .4byte __dt__Q34nw4r3g3d12AnmObjVisResFv + .4byte GetTypeObj__Q34nw4r3g3d12AnmObjVisResCFv + .4byte GetTypeName__Q34nw4r3g3d12AnmObjVisResCFv + .4byte SetFrame__Q34nw4r3g3d12AnmObjVisResFf + .4byte GetFrame__Q34nw4r3g3d12AnmObjVisResCFv + .4byte UpdateFrame__Q34nw4r3g3d12AnmObjVisResFv + .4byte SetUpdateRate__Q34nw4r3g3d12AnmObjVisResFf + .4byte GetUpdateRate__Q34nw4r3g3d12AnmObjVisResCFv + .4byte Bind__Q34nw4r3g3d12AnmObjVisResFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d9AnmObjVisFv + .4byte GetResult__Q34nw4r3g3d12AnmObjVisResFUl + .4byte Attach__Q34nw4r3g3d9AnmObjVisFiPQ34nw4r3g3d12AnmObjVisRes + .4byte Detach__Q34nw4r3g3d9AnmObjVisFi + +.global __vt__Q34nw4r3g3d11AnmObjVisOR +__vt__Q34nw4r3g3d11AnmObjVisOR: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d11AnmObjVisORCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d13AnmObjVisNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d11AnmObjVisORFv + .4byte GetTypeObj__Q34nw4r3g3d11AnmObjVisORCFv + .4byte GetTypeName__Q34nw4r3g3d11AnmObjVisORCFv + .4byte SetFrame__Q34nw4r3g3d13AnmObjVisNodeFf + .4byte GetFrame__Q34nw4r3g3d13AnmObjVisNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d13AnmObjVisNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjVisNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjVisNodeCFv + .4byte Bind__Q34nw4r3g3d13AnmObjVisNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d13AnmObjVisNodeFv + .4byte GetResult__Q34nw4r3g3d11AnmObjVisORFUl + .4byte Attach__Q34nw4r3g3d13AnmObjVisNodeFiPQ34nw4r3g3d12AnmObjVisRes + .4byte Detach__Q34nw4r3g3d13AnmObjVisNodeFi + +.global __vt__Q34nw4r3g3d13AnmObjVisNode +__vt__Q34nw4r3g3d13AnmObjVisNode: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d13AnmObjVisNodeCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d13AnmObjVisNodeFUlUlPv + .4byte __dt__Q34nw4r3g3d13AnmObjVisNodeFv + .4byte GetTypeObj__Q34nw4r3g3d13AnmObjVisNodeCFv + .4byte GetTypeName__Q34nw4r3g3d13AnmObjVisNodeCFv + .4byte SetFrame__Q34nw4r3g3d13AnmObjVisNodeFf + .4byte GetFrame__Q34nw4r3g3d13AnmObjVisNodeCFv + .4byte UpdateFrame__Q34nw4r3g3d13AnmObjVisNodeFv + .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjVisNodeFf + .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjVisNodeCFv + .4byte Bind__Q34nw4r3g3d13AnmObjVisNodeFQ34nw4r3g3d6ResMdl + .4byte Release__Q34nw4r3g3d13AnmObjVisNodeFv + .4byte 0 + .4byte Attach__Q34nw4r3g3d13AnmObjVisNodeFiPQ34nw4r3g3d12AnmObjVisRes + .4byte Detach__Q34nw4r3g3d13AnmObjVisNodeFi + +.global __vt__Q34nw4r3g3d9AnmObjVis +__vt__Q34nw4r3g3d9AnmObjVis: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d9AnmObjVisCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d9AnmObjVisFUlUlPv + .4byte __dt__Q34nw4r3g3d9AnmObjVisFv + .4byte GetTypeObj__Q34nw4r3g3d9AnmObjVisCFv + .4byte GetTypeName__Q34nw4r3g3d9AnmObjVisCFv + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte Release__Q34nw4r3g3d9AnmObjVisFv + .4byte 0 + .4byte Attach__Q34nw4r3g3d9AnmObjVisFiPQ34nw4r3g3d12AnmObjVisRes + .4byte Detach__Q34nw4r3g3d9AnmObjVisFi +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@LOCAL@GetAnmPlayPolicy__Q24nw4r3g3dFQ34nw4r3g3d9AnmPolicy@policyTable" +"@LOCAL@GetAnmPlayPolicy__Q24nw4r3g3dFQ34nw4r3g3d9AnmPolicy@policyTable": + + .4byte PlayPolicy_Onetime__Q24nw4r3g3dFfff + .4byte PlayPolicy_Loop__Q24nw4r3g3dFfff +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@7650_8055EF10" +"@7650_8055EF10": + + .4byte 0 + +.global "@7667" +"@7667": + + .4byte 0x3F800000 + +.global "@7797_8055EF18" +"@7797_8055EF18": + + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_g3d/g3d_anmvis_804083a0.s b/asm/libnw4r_g3d/g3d_anmvis_804083a0.s deleted file mode 100644 index e62aec6f..00000000 --- a/asm/libnw4r_g3d/g3d_anmvis_804083a0.s +++ /dev/null @@ -1,38 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global TYPE_NAME__Q34nw4r3g3d9AnmObjVis -TYPE_NAME__Q34nw4r3g3d9AnmObjVis: - - .4byte 0x0000000A - .4byte 0x416E6D4F - .4byte 0x626A5669 - .4byte 0x73000000 - -.global TYPE_NAME__Q34nw4r3g3d13AnmObjVisNode -TYPE_NAME__Q34nw4r3g3d13AnmObjVisNode: - - .4byte 0x0000000E - .4byte 0x416E6D4F - .4byte 0x626A5669 - .4byte 0x734E6F64 - .4byte 0x65000000 - -.global TYPE_NAME__Q34nw4r3g3d11AnmObjVisOR -TYPE_NAME__Q34nw4r3g3d11AnmObjVisOR: - - .4byte 0x0000000C - .4byte 0x416E6D4F - .4byte 0x626A5669 - .4byte 0x734F5200 - .4byte 0 - -.global TYPE_NAME__Q34nw4r3g3d12AnmObjVisRes -TYPE_NAME__Q34nw4r3g3d12AnmObjVisRes: - - .4byte 0x0000000D - .4byte 0x416E6D4F - .4byte 0x626A5669 - .4byte 0x73526573 - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_anmvis_80440700.s b/asm/libnw4r_g3d/g3d_anmvis_80440700.s deleted file mode 100644 index c259b268..00000000 --- a/asm/libnw4r_g3d/g3d_anmvis_80440700.s +++ /dev/null @@ -1,86 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3g3d12AnmObjVisRes -__vt__Q34nw4r3g3d12AnmObjVisRes: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d12AnmObjVisResCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d9AnmObjVisFUlUlPv - .4byte __dt__Q34nw4r3g3d12AnmObjVisResFv - .4byte GetTypeObj__Q34nw4r3g3d12AnmObjVisResCFv - .4byte GetTypeName__Q34nw4r3g3d12AnmObjVisResCFv - .4byte SetFrame__Q34nw4r3g3d12AnmObjVisResFf - .4byte GetFrame__Q34nw4r3g3d12AnmObjVisResCFv - .4byte UpdateFrame__Q34nw4r3g3d12AnmObjVisResFv - .4byte SetUpdateRate__Q34nw4r3g3d12AnmObjVisResFf - .4byte GetUpdateRate__Q34nw4r3g3d12AnmObjVisResCFv - .4byte Bind__Q34nw4r3g3d12AnmObjVisResFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d9AnmObjVisFv - .4byte GetResult__Q34nw4r3g3d12AnmObjVisResFUl - .4byte Attach__Q34nw4r3g3d9AnmObjVisFiPQ34nw4r3g3d12AnmObjVisRes - .4byte Detach__Q34nw4r3g3d9AnmObjVisFi - -.global __vt__Q34nw4r3g3d11AnmObjVisOR -__vt__Q34nw4r3g3d11AnmObjVisOR: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d11AnmObjVisORCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d13AnmObjVisNodeFUlUlPv - .4byte __dt__Q34nw4r3g3d11AnmObjVisORFv - .4byte GetTypeObj__Q34nw4r3g3d11AnmObjVisORCFv - .4byte GetTypeName__Q34nw4r3g3d11AnmObjVisORCFv - .4byte SetFrame__Q34nw4r3g3d13AnmObjVisNodeFf - .4byte GetFrame__Q34nw4r3g3d13AnmObjVisNodeCFv - .4byte UpdateFrame__Q34nw4r3g3d13AnmObjVisNodeFv - .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjVisNodeFf - .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjVisNodeCFv - .4byte Bind__Q34nw4r3g3d13AnmObjVisNodeFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d13AnmObjVisNodeFv - .4byte GetResult__Q34nw4r3g3d11AnmObjVisORFUl - .4byte Attach__Q34nw4r3g3d13AnmObjVisNodeFiPQ34nw4r3g3d12AnmObjVisRes - .4byte Detach__Q34nw4r3g3d13AnmObjVisNodeFi - -.global __vt__Q34nw4r3g3d13AnmObjVisNode -__vt__Q34nw4r3g3d13AnmObjVisNode: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d13AnmObjVisNodeCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d13AnmObjVisNodeFUlUlPv - .4byte __dt__Q34nw4r3g3d13AnmObjVisNodeFv - .4byte GetTypeObj__Q34nw4r3g3d13AnmObjVisNodeCFv - .4byte GetTypeName__Q34nw4r3g3d13AnmObjVisNodeCFv - .4byte SetFrame__Q34nw4r3g3d13AnmObjVisNodeFf - .4byte GetFrame__Q34nw4r3g3d13AnmObjVisNodeCFv - .4byte UpdateFrame__Q34nw4r3g3d13AnmObjVisNodeFv - .4byte SetUpdateRate__Q34nw4r3g3d13AnmObjVisNodeFf - .4byte GetUpdateRate__Q34nw4r3g3d13AnmObjVisNodeCFv - .4byte Bind__Q34nw4r3g3d13AnmObjVisNodeFQ34nw4r3g3d6ResMdl - .4byte Release__Q34nw4r3g3d13AnmObjVisNodeFv - .4byte 0 - .4byte Attach__Q34nw4r3g3d13AnmObjVisNodeFiPQ34nw4r3g3d12AnmObjVisRes - .4byte Detach__Q34nw4r3g3d13AnmObjVisNodeFi - -.global __vt__Q34nw4r3g3d9AnmObjVis -__vt__Q34nw4r3g3d9AnmObjVis: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d9AnmObjVisCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d9AnmObjVisFUlUlPv - .4byte __dt__Q34nw4r3g3d9AnmObjVisFv - .4byte GetTypeObj__Q34nw4r3g3d9AnmObjVisCFv - .4byte GetTypeName__Q34nw4r3g3d9AnmObjVisCFv - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte Release__Q34nw4r3g3d9AnmObjVisFv - .4byte 0 - .4byte Attach__Q34nw4r3g3d9AnmObjVisFiPQ34nw4r3g3d12AnmObjVisRes - .4byte Detach__Q34nw4r3g3d9AnmObjVisFi diff --git a/asm/libnw4r_g3d/g3d_anmvis_805569e8.s b/asm/libnw4r_g3d/g3d_anmvis_805569e8.s deleted file mode 100644 index dae6325d..00000000 --- a/asm/libnw4r_g3d/g3d_anmvis_805569e8.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@LOCAL@GetAnmPlayPolicy__Q24nw4r3g3dFQ34nw4r3g3d9AnmPolicy@policyTable" -"@LOCAL@GetAnmPlayPolicy__Q24nw4r3g3dFQ34nw4r3g3d9AnmPolicy@policyTable": - - .4byte PlayPolicy_Onetime__Q24nw4r3g3dFfff - .4byte PlayPolicy_Loop__Q24nw4r3g3dFfff diff --git a/asm/libnw4r_g3d/g3d_anmvis_8055ef10.s b/asm/libnw4r_g3d/g3d_anmvis_8055ef10.s deleted file mode 100644 index d4f3c4f0..00000000 --- a/asm/libnw4r_g3d/g3d_anmvis_8055ef10.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@7650_8055EF10" -"@7650_8055EF10": - - .4byte 0 - -.global "@7667" -"@7667": - - .4byte 0x3F800000 - -.global "@7797_8055EF18" -"@7797_8055EF18": - - .4byte 0x43300000 - .4byte 0x80000000 diff --git a/asm/libnw4r_g3d/g3d_basic_800e6a10.s b/asm/libnw4r_g3d/g3d_basic.s similarity index 98% rename from asm/libnw4r_g3d/g3d_basic_800e6a10.s rename to asm/libnw4r_g3d/g3d_basic.s index 5dc25d7e..46be6632 100644 --- a/asm/libnw4r_g3d/g3d_basic_800e6a10.s +++ b/asm/libnw4r_g3d/g3d_basic.s @@ -213,3 +213,21 @@ lbl_800E6CC0: /* 800E6CD4 000E2B14 4E 80 00 20 */ blr /* 800E6CD8 000E2B18 00 00 00 00 */ .4byte 0x00000000 /* 800E6CDC 000E2B1C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@7058" +"@7058": + + .4byte 0x3F360B61 + +.global "@7059" +"@7059": + + .4byte 0 + +.global "@7060" +"@7060": + + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_basic_8055f070.s b/asm/libnw4r_g3d/g3d_basic_8055f070.s deleted file mode 100644 index 745c2c05..00000000 --- a/asm/libnw4r_g3d/g3d_basic_8055f070.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@7058" -"@7058": - - .4byte 0x3F360B61 - -.global "@7059" -"@7059": - - .4byte 0 - -.global "@7060" -"@7060": - - .4byte 0x3F800000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_calcmaterial_800f1470.s b/asm/libnw4r_g3d/g3d_calcmaterial.s similarity index 100% rename from asm/libnw4r_g3d/g3d_calcmaterial_800f1470.s rename to asm/libnw4r_g3d/g3d_calcmaterial.s diff --git a/asm/libnw4r_g3d/g3d_calcview_800e0dc0.s b/asm/libnw4r_g3d/g3d_calcview.s similarity index 98% rename from asm/libnw4r_g3d/g3d_calcview_800e0dc0.s rename to asm/libnw4r_g3d/g3d_calcview.s index e2d0b5e3..b924111e 100644 --- a/asm/libnw4r_g3d/g3d_calcview_800e0dc0.s +++ b/asm/libnw4r_g3d/g3d_calcview.s @@ -2581,3 +2581,35 @@ lbl_800E303C: /* 800E3054 000DEE94 38 21 00 E0 */ addi r1, r1, 0xe0 /* 800E3058 000DEE98 4E 80 00 20 */ blr /* 800E305C 000DEE9C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global "bbFunc__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@" +"bbFunc__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@": + + .4byte 0 + .4byte "Calc_BILLBOARD_STD__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl" + .4byte "Calc_BILLBOARD_PERSP_STD__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl" + .4byte "Calc_BILLBOARD_ROT__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl" + .4byte "Calc_BILLBOARD_PERSP_ROT__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl" + .4byte "Calc_BILLBOARD_Y__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl" + .4byte "Calc_BILLBOARD_PERSP_Y__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl" + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@12856" +"@12856": + + .4byte 0 + +.global "@12857" +"@12857": + + .4byte 0x219392EF + +.global "norm_epsilon__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@" +"norm_epsilon__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@": + + .4byte 0x219392EF + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_calcview_80408dc8.s b/asm/libnw4r_g3d/g3d_calcview_80408dc8.s deleted file mode 100644 index 5c312af2..00000000 --- a/asm/libnw4r_g3d/g3d_calcview_80408dc8.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global "bbFunc__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@" -"bbFunc__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@": - - .4byte 0 - .4byte "Calc_BILLBOARD_STD__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl" - .4byte "Calc_BILLBOARD_PERSP_STD__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl" - .4byte "Calc_BILLBOARD_ROT__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl" - .4byte "Calc_BILLBOARD_PERSP_ROT__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl" - .4byte "Calc_BILLBOARD_Y__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl" - .4byte "Calc_BILLBOARD_PERSP_Y__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@FPQ34nw4r4math5MTX34PCQ34nw4r4math5MTX34bPCQ34nw4r4math5MTX34Q34nw4r3g3d6ResMdlUl" - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_calcview_8055f018.s b/asm/libnw4r_g3d/g3d_calcview_8055f018.s deleted file mode 100644 index 515328af..00000000 --- a/asm/libnw4r_g3d/g3d_calcview_8055f018.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@12856" -"@12856": - - .4byte 0 - -.global "@12857" -"@12857": - - .4byte 0x219392EF - -.global "norm_epsilon__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@" -"norm_epsilon__Q34nw4r3g3d26@unnamed@g3d_calcview_cpp@": - - .4byte 0x219392EF - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_calcvtx_800f2410.s b/asm/libnw4r_g3d/g3d_calcvtx.s similarity index 99% rename from asm/libnw4r_g3d/g3d_calcvtx_800f2410.s rename to asm/libnw4r_g3d/g3d_calcvtx.s index 8e8d1079..c6fa4e8a 100644 --- a/asm/libnw4r_g3d/g3d_calcvtx_800f2410.s +++ b/asm/libnw4r_g3d/g3d_calcvtx.s @@ -583,3 +583,11 @@ lbl_800F2B70: /* 800F2B94 000EE9D4 4E 80 00 20 */ blr /* 800F2B98 000EE9D8 00 00 00 00 */ .4byte 0x00000000 /* 800F2B9C 000EE9DC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@7801" +"@7801": + + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_calcvtx_8055f110.s b/asm/libnw4r_g3d/g3d_calcvtx_8055f110.s deleted file mode 100644 index 59de5e5d..00000000 --- a/asm/libnw4r_g3d/g3d_calcvtx_8055f110.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@7801" -"@7801": - - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_calcworld_800e3170.s b/asm/libnw4r_g3d/g3d_calcworld.s similarity index 98% rename from asm/libnw4r_g3d/g3d_calcworld_800e3170.s rename to asm/libnw4r_g3d/g3d_calcworld.s index 486eb19f..abb62a43 100644 --- a/asm/libnw4r_g3d/g3d_calcworld_800e3170.s +++ b/asm/libnw4r_g3d/g3d_calcworld.s @@ -793,3 +793,33 @@ lbl_800E3C34: /* 800E3C44 000DFA84 38 21 00 30 */ addi r1, r1, 0x30 /* 800E3C48 000DFA88 4E 80 00 20 */ blr /* 800E3C4C 000DFA8C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@9581_80440F68" +"@9581_80440F68": + + .4byte 0x4E6F6465 + .4byte 0x54726565 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@9736" +"@9736": + + .4byte 0x4E6F6465 + .4byte 0x4D697800 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@9400" +"@9400": + + .4byte 0x3F800000 + +.global "@9737" +"@9737": + + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_calcworld_80440f68.s b/asm/libnw4r_g3d/g3d_calcworld_80440f68.s deleted file mode 100644 index ab31892f..00000000 --- a/asm/libnw4r_g3d/g3d_calcworld_80440f68.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@9581_80440F68" -"@9581_80440F68": - - .4byte 0x4E6F6465 - .4byte 0x54726565 - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_calcworld_80556a00.s b/asm/libnw4r_g3d/g3d_calcworld_80556a00.s deleted file mode 100644 index af1ebd67..00000000 --- a/asm/libnw4r_g3d/g3d_calcworld_80556a00.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@9736" -"@9736": - - .4byte 0x4E6F6465 - .4byte 0x4D697800 diff --git a/asm/libnw4r_g3d/g3d_calcworld_8055f028.s b/asm/libnw4r_g3d/g3d_calcworld_8055f028.s deleted file mode 100644 index 261e3caa..00000000 --- a/asm/libnw4r_g3d/g3d_calcworld_8055f028.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@9400" -"@9400": - - .4byte 0x3F800000 - -.global "@9737" -"@9737": - - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_camera_800e5af0.s b/asm/libnw4r_g3d/g3d_camera.s similarity index 98% rename from asm/libnw4r_g3d/g3d_camera_800e5af0.s rename to asm/libnw4r_g3d/g3d_camera.s index 6e5430de..c041f1a7 100644 --- a/asm/libnw4r_g3d/g3d_camera_800e5af0.s +++ b/asm/libnw4r_g3d/g3d_camera.s @@ -1107,3 +1107,61 @@ lbl_800E69E4: /* 800E6A04 000E2844 38 21 00 A0 */ addi r1, r1, 0xa0 /* 800E6A08 000E2848 4E 80 00 20 */ blr /* 800E6A0C 000E284C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@8736" +"@8736": + + .4byte 0 + +.global "@8737" +"@8737": + + .4byte 0x41700000 + +.global "@8738" +"@8738": + + .4byte 0x3F800000 + +.global "@8739" +"@8739": + + .4byte 0x42700000 + +.global "@8740" +"@8740": + + .4byte 0x3FAAAAAB + +.global "@8741" +"@8741": + + .4byte 0x3DCCCCCD + +.global "@8742" +"@8742": + + .4byte 0x447A0000 + +.global "@8743" +"@8743": + + .4byte 0x3F000000 + +.global "@8747" +"@8747": + + .4byte 0x43300000 + .4byte 0 + +.global "@9341_8055F068" +"@9341_8055F068": + + .4byte 0xBF800000 + +.global "@9342_8055F06C" +"@9342_8055F06C": + + .4byte 0x3F360B61 diff --git a/asm/libnw4r_g3d/g3d_camera_8055f040.s b/asm/libnw4r_g3d/g3d_camera_8055f040.s deleted file mode 100644 index 1a24c29f..00000000 --- a/asm/libnw4r_g3d/g3d_camera_8055f040.s +++ /dev/null @@ -1,58 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@8736" -"@8736": - - .4byte 0 - -.global "@8737" -"@8737": - - .4byte 0x41700000 - -.global "@8738" -"@8738": - - .4byte 0x3F800000 - -.global "@8739" -"@8739": - - .4byte 0x42700000 - -.global "@8740" -"@8740": - - .4byte 0x3FAAAAAB - -.global "@8741" -"@8741": - - .4byte 0x3DCCCCCD - -.global "@8742" -"@8742": - - .4byte 0x447A0000 - -.global "@8743" -"@8743": - - .4byte 0x3F000000 - -.global "@8747" -"@8747": - - .4byte 0x43300000 - .4byte 0 - -.global "@9341_8055F068" -"@9341_8055F068": - - .4byte 0xBF800000 - -.global "@9342_8055F06C" -"@9342_8055F06C": - - .4byte 0x3F360B61 diff --git a/asm/libnw4r_g3d/g3d_cpu_800dc7d0.s b/asm/libnw4r_g3d/g3d_cpu.s similarity index 98% rename from asm/libnw4r_g3d/g3d_cpu_800dc7d0.s rename to asm/libnw4r_g3d/g3d_cpu.s index dc66c5cd..11bf7f20 100644 --- a/asm/libnw4r_g3d/g3d_cpu_800dc7d0.s +++ b/asm/libnw4r_g3d/g3d_cpu.s @@ -169,3 +169,11 @@ lbl_800DC9F0: /* 800DCA04 000D8844 00 00 00 00 */ .4byte 0x00000000 /* 800DCA08 000D8848 00 00 00 00 */ .4byte 0x00000000 /* 800DCA0C 000D884C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@1129" +"@1129": + + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_cpu_8055efc8.s b/asm/libnw4r_g3d/g3d_cpu_8055efc8.s deleted file mode 100644 index afad2b76..00000000 --- a/asm/libnw4r_g3d/g3d_cpu_8055efc8.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@1129" -"@1129": - - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_dcc_800e3060.s b/asm/libnw4r_g3d/g3d_dcc.s similarity index 100% rename from asm/libnw4r_g3d/g3d_dcc_800e3060.s rename to asm/libnw4r_g3d/g3d_dcc.s diff --git a/asm/libnw4r_g3d/g3d_draw_800e3c50.s b/asm/libnw4r_g3d/g3d_draw.s similarity index 98% rename from asm/libnw4r_g3d/g3d_draw_800e3c50.s rename to asm/libnw4r_g3d/g3d_draw.s index b9ffb873..40623170 100644 --- a/asm/libnw4r_g3d/g3d_draw_800e3c50.s +++ b/asm/libnw4r_g3d/g3d_draw.s @@ -2315,3 +2315,33 @@ lbl_800E5AD8: /* 800E5AE4 000E1924 7C 08 03 A6 */ mtlr r0 /* 800E5AE8 000E1928 38 21 00 50 */ addi r1, r1, 0x50 /* 800E5AEC 000E192C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@LOCAL@sort__3stdFPQ54nw4r3g3d6detail7workmem4MdlZPQ54nw4r3g3d6detail7workmem4MdlZPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b_v@shuffle@0" +"@LOCAL@sort__3stdFPQ54nw4r3g3d6detail7workmem4MdlZPQ54nw4r3g3d6detail7workmem4MdlZPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b_v@shuffle@0": + + .4byte 0xFFFFFFFC + +.global "@LOCAL@sort__3stdFPQ54nw4r3g3d6detail7workmem4MdlZPQ54nw4r3g3d6detail7workmem4MdlZRPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b_v@shuffle@0" +"@LOCAL@sort__3stdFPQ54nw4r3g3d6detail7workmem4MdlZPQ54nw4r3g3d6detail7workmem4MdlZRPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b_v@shuffle@0": + + .4byte 0xFFFFFFFC +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@14861" +"@14861": + + .4byte 0 + +.global "@14862" +"@14862": + + .4byte 0xC0000000 + +.global "@14863" +"@14863": + + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_draw1mat1shp_800e0070.s b/asm/libnw4r_g3d/g3d_draw1mat1shp.s similarity index 99% rename from asm/libnw4r_g3d/g3d_draw1mat1shp_800e0070.s rename to asm/libnw4r_g3d/g3d_draw1mat1shp.s index 8fcd9fb4..c29f66f1 100644 --- a/asm/libnw4r_g3d/g3d_draw1mat1shp_800e0070.s +++ b/asm/libnw4r_g3d/g3d_draw1mat1shp.s @@ -1043,3 +1043,39 @@ lbl_800E0D54: /* 800E0DB4 000DCBF4 00 00 00 00 */ .4byte 0x00000000 /* 800E0DB8 000DCBF8 00 00 00 00 */ .4byte 0x00000000 /* 800E0DBC 000DCBFC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global "@10241" +"@10241": + + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000003 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@11256" +"@11256": + + .4byte 0x3F800000 + .4byte 0 + +.global "@11257" +"@11257": + + .4byte 0x40100000 + .4byte 0 + +.global "@11258" +"@11258": + + .4byte 0x437F0000 + .4byte 0 + +.global "@11268" +"@11268": + + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_draw1mat1shp_80408db8.s b/asm/libnw4r_g3d/g3d_draw1mat1shp_80408db8.s deleted file mode 100644 index 95e9dfac..00000000 --- a/asm/libnw4r_g3d/g3d_draw1mat1shp_80408db8.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global "@10241" -"@10241": - - .4byte 0 - .4byte 0x00000002 - .4byte 0x00000001 - .4byte 0x00000003 diff --git a/asm/libnw4r_g3d/g3d_draw1mat1shp_8055eff8.s b/asm/libnw4r_g3d/g3d_draw1mat1shp_8055eff8.s deleted file mode 100644 index e3d8574d..00000000 --- a/asm/libnw4r_g3d/g3d_draw1mat1shp_8055eff8.s +++ /dev/null @@ -1,26 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@11256" -"@11256": - - .4byte 0x3F800000 - .4byte 0 - -.global "@11257" -"@11257": - - .4byte 0x40100000 - .4byte 0 - -.global "@11258" -"@11258": - - .4byte 0x437F0000 - .4byte 0 - -.global "@11268" -"@11268": - - .4byte 0x43300000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_draw_80556a08.s b/asm/libnw4r_g3d/g3d_draw_80556a08.s deleted file mode 100644 index e46c5f13..00000000 --- a/asm/libnw4r_g3d/g3d_draw_80556a08.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@LOCAL@sort__3stdFPQ54nw4r3g3d6detail7workmem4MdlZPQ54nw4r3g3d6detail7workmem4MdlZPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b_v@shuffle@0" -"@LOCAL@sort__3stdFPQ54nw4r3g3d6detail7workmem4MdlZPQ54nw4r3g3d6detail7workmem4MdlZPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b_v@shuffle@0": - - .4byte 0xFFFFFFFC - -.global "@LOCAL@sort__3stdFPQ54nw4r3g3d6detail7workmem4MdlZPQ54nw4r3g3d6detail7workmem4MdlZRPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b_v@shuffle@0" -"@LOCAL@sort__3stdFPQ54nw4r3g3d6detail7workmem4MdlZPQ54nw4r3g3d6detail7workmem4MdlZRPFRCQ54nw4r3g3d6detail7workmem4MdlZRCQ54nw4r3g3d6detail7workmem4MdlZ_b_v@shuffle@0": - - .4byte 0xFFFFFFFC diff --git a/asm/libnw4r_g3d/g3d_draw_8055f030.s b/asm/libnw4r_g3d/g3d_draw_8055f030.s deleted file mode 100644 index e33ca54d..00000000 --- a/asm/libnw4r_g3d/g3d_draw_8055f030.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@14861" -"@14861": - - .4byte 0 - -.global "@14862" -"@14862": - - .4byte 0xC0000000 - -.global "@14863" -"@14863": - - .4byte 0x3F800000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_fog_800f17a0.s b/asm/libnw4r_g3d/g3d_fog.s similarity index 97% rename from asm/libnw4r_g3d/g3d_fog_800f17a0.s rename to asm/libnw4r_g3d/g3d_fog.s index e3377580..03737ce9 100644 --- a/asm/libnw4r_g3d/g3d_fog_800f17a0.s +++ b/asm/libnw4r_g3d/g3d_fog.s @@ -103,3 +103,11 @@ lbl_800F18EC: /* 800F18F4 000ED734 7C 08 03 A6 */ mtlr r0 /* 800F18F8 000ED738 38 21 00 20 */ addi r1, r1, 0x20 /* 800F18FC 000ED73C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@6809" +"@6809": + + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_fog_8055f0d8.s b/asm/libnw4r_g3d/g3d_fog_8055f0d8.s deleted file mode 100644 index 45797f65..00000000 --- a/asm/libnw4r_g3d/g3d_fog_8055f0d8.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@6809" -"@6809": - - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_gpu_800dbf50.s b/asm/libnw4r_g3d/g3d_gpu.s similarity index 97% rename from asm/libnw4r_g3d/g3d_gpu_800dbf50.s rename to asm/libnw4r_g3d/g3d_gpu.s index 378cec81..96a472ee 100644 --- a/asm/libnw4r_g3d/g3d_gpu_800dbf50.s +++ b/asm/libnw4r_g3d/g3d_gpu.s @@ -353,3 +353,35 @@ GDLoadTexMtxImm3x3__Q34nw4r3g3d4fifoFRCQ34nw4r4math5MTX33Ul: /* 800DC464 000D82A4 7C 08 03 A6 */ mtlr r0 /* 800DC468 000D82A8 38 21 00 40 */ addi r1, r1, 0x40 /* 800DC46C 000D82AC 4E 80 00 20 */ blr +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global cm2hw__Q34nw4r3g3d4fifo_8055EFB0 +cm2hw__Q34nw4r3g3d4fifo_8055EFB0: + + .4byte 0x00020103 + +.global "@6418" +"@6418": + + .4byte 0x3F800000 + +.global "@6419" +"@6419": + + .4byte 0x3F000000 + +.global "@6420" +"@6420": + + .4byte 0x40000000 + +.global "@6421" +"@6421": + + .4byte 0x44800000 + +.global "@6433" +"@6433": + + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_gpu_8055efb0.s b/asm/libnw4r_g3d/g3d_gpu_8055efb0.s deleted file mode 100644 index 747e3ddb..00000000 --- a/asm/libnw4r_g3d/g3d_gpu_8055efb0.s +++ /dev/null @@ -1,32 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global cm2hw__Q34nw4r3g3d4fifo_8055EFB0 -cm2hw__Q34nw4r3g3d4fifo_8055EFB0: - - .4byte 0x00020103 - -.global "@6418" -"@6418": - - .4byte 0x3F800000 - -.global "@6419" -"@6419": - - .4byte 0x3F000000 - -.global "@6420" -"@6420": - - .4byte 0x40000000 - -.global "@6421" -"@6421": - - .4byte 0x44800000 - -.global "@6433" -"@6433": - - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_init_800f16b0.s b/asm/libnw4r_g3d/g3d_init.s similarity index 85% rename from asm/libnw4r_g3d/g3d_init_800f16b0.s rename to asm/libnw4r_g3d/g3d_init.s index 6e69e9ba..062fe025 100644 --- a/asm/libnw4r_g3d/g3d_init_800f16b0.s +++ b/asm/libnw4r_g3d/g3d_init.s @@ -79,3 +79,35 @@ lbl_800F1788: /* 800F1794 000ED5D4 7C 08 03 A6 */ mtlr r0 /* 800F1798 000ED5D8 38 21 00 10 */ addi r1, r1, 0x10 /* 800F179C 000ED5DC 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@8056" +"@8056": + + .4byte 0x3C3C204E + .4byte 0x57345220 + .4byte 0x2020202D + .4byte 0x20473344 + .4byte 0x20096669 + .4byte 0x6E616C20 + .4byte 0x20206275 + .4byte 0x696C643A + .4byte 0x20417072 + .4byte 0x20323820 + .4byte 0x32303131 + .4byte 0x2031313A + .4byte 0x30353A35 + .4byte 0x38202830 + .4byte 0x78343330 + .4byte 0x325F3138 + .4byte 0x3829203E + .4byte 0x3E000000 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "NW4R_G3D_Version___22@unnamed@g3d_init_cpp@" +"NW4R_G3D_Version___22@unnamed@g3d_init_cpp@": + + .4byte "@8056" + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_init_80441190.s b/asm/libnw4r_g3d/g3d_init_80441190.s deleted file mode 100644 index 10954c18..00000000 --- a/asm/libnw4r_g3d/g3d_init_80441190.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@8056" -"@8056": - - .4byte 0x3C3C204E - .4byte 0x57345220 - .4byte 0x2020202D - .4byte 0x20473344 - .4byte 0x20096669 - .4byte 0x6E616C20 - .4byte 0x20206275 - .4byte 0x696C643A - .4byte 0x20417072 - .4byte 0x20323820 - .4byte 0x32303131 - .4byte 0x2031313A - .4byte 0x30353A35 - .4byte 0x38202830 - .4byte 0x78343330 - .4byte 0x325F3138 - .4byte 0x3829203E - .4byte 0x3E000000 diff --git a/asm/libnw4r_g3d/g3d_init_80556a40.s b/asm/libnw4r_g3d/g3d_init_80556a40.s deleted file mode 100644 index 460328c3..00000000 --- a/asm/libnw4r_g3d/g3d_init_80556a40.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "NW4R_G3D_Version___22@unnamed@g3d_init_cpp@" -"NW4R_G3D_Version___22@unnamed@g3d_init_cpp@": - - .4byte "@8056" - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_light_800f1900.s b/asm/libnw4r_g3d/g3d_light.s similarity index 98% rename from asm/libnw4r_g3d/g3d_light_800f1900.s rename to asm/libnw4r_g3d/g3d_light.s index 2e7870b0..bade8b0c 100644 --- a/asm/libnw4r_g3d/g3d_light_800f1900.s +++ b/asm/libnw4r_g3d/g3d_light.s @@ -821,3 +821,61 @@ lbl_800F2400: /* 800F2404 000EE244 4E 80 00 20 */ blr /* 800F2408 000EE248 00 00 00 00 */ .4byte 0x00000000 /* 800F240C 000EE24C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@12220" +"@12220": + + .4byte 0 + +.global "@12221" +"@12221": + + .4byte 0x3F800000 + +.global "@12222" +"@12222": + + .4byte 0x3F000000 + +.global "@11839" +"@11839": + + .4byte 0xFFFFFFFF + +.global "@11841" +"@11841": + + .4byte 0xFFFFFFFF + +.global "@12371" +"@12371": + + .4byte 0x4A742400 + +.global "@12372" +"@12372": + + .4byte 0xBF800000 + +.global "@12373" +"@12373": + + .4byte 0x42B40000 + +.global "@12374" +"@12374": + + .4byte 0x41200000 + +.global "@12375" +"@12375": + + .4byte 0x41000000 + +.global "@12376_8055F108" +"@12376_8055F108": + + .4byte 0xC0E00000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_light_8055f0e0.s b/asm/libnw4r_g3d/g3d_light_8055f0e0.s deleted file mode 100644 index b27d0d52..00000000 --- a/asm/libnw4r_g3d/g3d_light_8055f0e0.s +++ /dev/null @@ -1,58 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@12220" -"@12220": - - .4byte 0 - -.global "@12221" -"@12221": - - .4byte 0x3F800000 - -.global "@12222" -"@12222": - - .4byte 0x3F000000 - -.global "@11839" -"@11839": - - .4byte 0xFFFFFFFF - -.global "@11841" -"@11841": - - .4byte 0xFFFFFFFF - -.global "@12371" -"@12371": - - .4byte 0x4A742400 - -.global "@12372" -"@12372": - - .4byte 0xBF800000 - -.global "@12373" -"@12373": - - .4byte 0x42B40000 - -.global "@12374" -"@12374": - - .4byte 0x41200000 - -.global "@12375" -"@12375": - - .4byte 0x41000000 - -.global "@12376_8055F108" -"@12376_8055F108": - - .4byte 0xC0E00000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_maya_800e6ce0.s b/asm/libnw4r_g3d/g3d_maya.s similarity index 95% rename from asm/libnw4r_g3d/g3d_maya_800e6ce0.s rename to asm/libnw4r_g3d/g3d_maya.s index 0e959149..4869f865 100644 --- a/asm/libnw4r_g3d/g3d_maya_800e6ce0.s +++ b/asm/libnw4r_g3d/g3d_maya.s @@ -908,3 +908,55 @@ lbl_800E79CC: /* 800E79E4 000E3824 00 00 00 00 */ .4byte 0x00000000 /* 800E79E8 000E3828 00 00 00 00 */ .4byte 0x00000000 /* 800E79EC 000E382C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global "@LOCAL@CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable" +"@LOCAL@CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable": + + .4byte "MakeTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_T__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_R__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + +.global "@LOCAL@CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable@0" +"@LOCAL@CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable@0": + + .4byte "ProductTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_T__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_R__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_S__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@7167" +"@7167": + + .4byte 0 + +.global "@7168" +"@7168": + + .4byte 0x3F800000 + +.global "@7172" +"@7172": + + .4byte 0x3F360B61 + +.global "@7173" +"@7173": + + .4byte 0x3F000000 + +.global "@7180" +"@7180": + + .4byte 0xBF000000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_maya_80408de8.s b/asm/libnw4r_g3d/g3d_maya_80408de8.s deleted file mode 100644 index 727d4f64..00000000 --- a/asm/libnw4r_g3d/g3d_maya_80408de8.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global "@LOCAL@CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable" -"@LOCAL@CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable": - - .4byte "MakeTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_T__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_R__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - -.global "@LOCAL@CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable@0" -"@LOCAL@CalcTexMtx_Maya__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable@0": - - .4byte "ProductTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_T__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_R__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_S__Q54nw4r3g3d6detail3dcc22@unnamed@g3d_maya_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" diff --git a/asm/libnw4r_g3d/g3d_maya_8055f080.s b/asm/libnw4r_g3d/g3d_maya_8055f080.s deleted file mode 100644 index 1fb16f3e..00000000 --- a/asm/libnw4r_g3d/g3d_maya_8055f080.s +++ /dev/null @@ -1,28 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@7167" -"@7167": - - .4byte 0 - -.global "@7168" -"@7168": - - .4byte 0x3F800000 - -.global "@7172" -"@7172": - - .4byte 0x3F360B61 - -.global "@7173" -"@7173": - - .4byte 0x3F000000 - -.global "@7180" -"@7180": - - .4byte 0xBF000000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_obj_800dbd10.s b/asm/libnw4r_g3d/g3d_obj.s similarity index 90% rename from asm/libnw4r_g3d/g3d_obj_800dbd10.s rename to asm/libnw4r_g3d/g3d_obj.s index c7dc1cc6..6d5da229 100644 --- a/asm/libnw4r_g3d/g3d_obj_800dbd10.s +++ b/asm/libnw4r_g3d/g3d_obj.s @@ -116,3 +116,27 @@ GetTypeObj__Q34nw4r3g3d6G3dObjCFv: /* 800DBE74 000D7CB4 38 63 85 E8 */ addi r3, r3, TYPE_NAME__Q34nw4r3g3d6G3dObj@l /* 800DBE78 000D7CB8 4E 80 00 20 */ blr /* 800DBE7C 000D7CBC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global TYPE_NAME__Q34nw4r3g3d6G3dObj +TYPE_NAME__Q34nw4r3g3d6G3dObj: + + .4byte 0x00000007 + .4byte 0x4733644F + .4byte 0x626A0000 + .4byte 0 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3g3d6G3dObj +__vt__Q34nw4r3g3d6G3dObj: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d6G3dObjCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte 0 + .4byte __dt__Q34nw4r3g3d6G3dObjFv + .4byte GetTypeObj__Q34nw4r3g3d6G3dObjCFv + .4byte GetTypeName__Q34nw4r3g3d6G3dObjCFv + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_obj_804085e8.s b/asm/libnw4r_g3d/g3d_obj_804085e8.s deleted file mode 100644 index de170ad0..00000000 --- a/asm/libnw4r_g3d/g3d_obj_804085e8.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global TYPE_NAME__Q34nw4r3g3d6G3dObj -TYPE_NAME__Q34nw4r3g3d6G3dObj: - - .4byte 0x00000007 - .4byte 0x4733644F - .4byte 0x626A0000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_obj_80440f30.s b/asm/libnw4r_g3d/g3d_obj_80440f30.s deleted file mode 100644 index 39c2077d..00000000 --- a/asm/libnw4r_g3d/g3d_obj_80440f30.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3g3d6G3dObj -__vt__Q34nw4r3g3d6G3dObj: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d6G3dObjCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte 0 - .4byte __dt__Q34nw4r3g3d6G3dObjFv - .4byte GetTypeObj__Q34nw4r3g3d6G3dObjCFv - .4byte GetTypeName__Q34nw4r3g3d6G3dObjCFv - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanm_800cf440.s b/asm/libnw4r_g3d/g3d_resanm.s similarity index 96% rename from asm/libnw4r_g3d/g3d_resanm_800cf440.s rename to asm/libnw4r_g3d/g3d_resanm.s index 556743c1..e371900e 100644 --- a/asm/libnw4r_g3d/g3d_resanm_800cf440.s +++ b/asm/libnw4r_g3d/g3d_resanm.s @@ -181,3 +181,31 @@ lbl_800CF694: /* 800CF6A4 000CB4E4 4E 80 00 20 */ blr /* 800CF6A8 000CB4E8 00 00 00 00 */ .4byte 0x00000000 /* 800CF6AC 000CB4EC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@5115" +"@5115": + + .4byte 0x3F800000 + +.global "@5116" +"@5116": + + .4byte 0x40000000 + +.global "@5117" +"@5117": + + .4byte 0x40400000 + +.global "@5180" +"@5180": + + .4byte 0 + +.global "@5181" +"@5181": + + .4byte 0x47000000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanm_8055ee70.s b/asm/libnw4r_g3d/g3d_resanm_8055ee70.s deleted file mode 100644 index 1459a4a5..00000000 --- a/asm/libnw4r_g3d/g3d_resanm_8055ee70.s +++ /dev/null @@ -1,28 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@5115" -"@5115": - - .4byte 0x3F800000 - -.global "@5116" -"@5116": - - .4byte 0x40000000 - -.global "@5117" -"@5117": - - .4byte 0x40400000 - -.global "@5180" -"@5180": - - .4byte 0 - -.global "@5181" -"@5181": - - .4byte 0x47000000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmamblight_800d20b0.s b/asm/libnw4r_g3d/g3d_resanmamblight.s similarity index 94% rename from asm/libnw4r_g3d/g3d_resanmamblight_800d20b0.s rename to asm/libnw4r_g3d/g3d_resanmamblight.s index 6e3c193c..8bf5f307 100644 --- a/asm/libnw4r_g3d/g3d_resanmamblight_800d20b0.s +++ b/asm/libnw4r_g3d/g3d_resanmamblight.s @@ -69,3 +69,17 @@ lbl_800D2168: /* 800D2174 000CDFB4 7C 08 03 A6 */ mtlr r0 /* 800D2178 000CDFB8 38 21 00 20 */ addi r1, r1, 0x20 /* 800D217C 000CDFBC 4E 80 00 20 */ blr +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@10893" +"@10893": + + .4byte 0 + .4byte 0 + +.global "@10897" +"@10897": + + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmamblight_8055eed0.s b/asm/libnw4r_g3d/g3d_resanmamblight_8055eed0.s deleted file mode 100644 index 72b75b2a..00000000 --- a/asm/libnw4r_g3d/g3d_resanmamblight_8055eed0.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@10893" -"@10893": - - .4byte 0 - .4byte 0 - -.global "@10897" -"@10897": - - .4byte 0x43300000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmcamera_800d26d0.s b/asm/libnw4r_g3d/g3d_resanmcamera.s similarity index 100% rename from asm/libnw4r_g3d/g3d_resanmcamera_800d26d0.s rename to asm/libnw4r_g3d/g3d_resanmcamera.s diff --git a/asm/libnw4r_g3d/g3d_resanmchr_800d02d0.s b/asm/libnw4r_g3d/g3d_resanmchr.s similarity index 98% rename from asm/libnw4r_g3d/g3d_resanmchr_800d02d0.s rename to asm/libnw4r_g3d/g3d_resanmchr.s index 59d8ce61..335ba278 100644 --- a/asm/libnw4r_g3d/g3d_resanmchr_800d02d0.s +++ b/asm/libnw4r_g3d/g3d_resanmchr.s @@ -2179,3 +2179,51 @@ lbl_800D1F10: /* 800D1F34 000CDD74 38 21 00 10 */ addi r1, r1, 0x10 /* 800D1F38 000CDD78 4E 80 00 20 */ blr /* 800D1F3C 000CDD7C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global "gGetAnmResultTable__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@" +"gGetAnmResultTable__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@": + + .4byte "GetAnmResult___Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf" + .4byte "GetAnmResult_S__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf" + .4byte "GetAnmResult_R__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf" + .4byte "GetAnmResult_SR__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf" + .4byte "GetAnmResult_T__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf" + .4byte "GetAnmResult_ST__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf" + .4byte "GetAnmResult_RT__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf" + .4byte "GetAnmResult_SRT__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf" +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@8848" +"@8848": + + .4byte 0 + +.global "@8950" +"@8950": + + .4byte 0x3F800000 + +.global "@8951" +"@8951": + + .4byte 0x40000000 + +.global "@8952" +"@8952": + + .4byte 0x40400000 + +.global "@9482" +"@9482": + + .4byte 0x3F360B61 + .4byte 0 + +.global "@9490" +"@9490": + + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmchr_80408380.s b/asm/libnw4r_g3d/g3d_resanmchr_80408380.s deleted file mode 100644 index 5a775430..00000000 --- a/asm/libnw4r_g3d/g3d_resanmchr_80408380.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global "gGetAnmResultTable__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@" -"gGetAnmResultTable__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@": - - .4byte "GetAnmResult___Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf" - .4byte "GetAnmResult_S__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf" - .4byte "GetAnmResult_R__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf" - .4byte "GetAnmResult_SR__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf" - .4byte "GetAnmResult_T__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf" - .4byte "GetAnmResult_ST__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf" - .4byte "GetAnmResult_RT__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf" - .4byte "GetAnmResult_SRT__Q34nw4r3g3d27@unnamed@g3d_resanmchr_cpp@FPQ34nw4r3g3d12ChrAnmResultRCQ34nw4r3g3d17ResAnmChrInfoDataPCQ34nw4r3g3d17ResAnmChrNodeDataf" diff --git a/asm/libnw4r_g3d/g3d_resanmchr_8055eeb0.s b/asm/libnw4r_g3d/g3d_resanmchr_8055eeb0.s deleted file mode 100644 index 90184094..00000000 --- a/asm/libnw4r_g3d/g3d_resanmchr_8055eeb0.s +++ /dev/null @@ -1,34 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@8848" -"@8848": - - .4byte 0 - -.global "@8950" -"@8950": - - .4byte 0x3F800000 - -.global "@8951" -"@8951": - - .4byte 0x40000000 - -.global "@8952" -"@8952": - - .4byte 0x40400000 - -.global "@9482" -"@9482": - - .4byte 0x3F360B61 - .4byte 0 - -.global "@9490" -"@9490": - - .4byte 0x43300000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmclr_800cf7d0.s b/asm/libnw4r_g3d/g3d_resanmclr.s similarity index 96% rename from asm/libnw4r_g3d/g3d_resanmclr_800cf7d0.s rename to asm/libnw4r_g3d/g3d_resanmclr.s index a78a1748..c04e0087 100644 --- a/asm/libnw4r_g3d/g3d_resanmclr_800cf7d0.s +++ b/asm/libnw4r_g3d/g3d_resanmclr.s @@ -121,3 +121,17 @@ lbl_800CF91C: /* 800CF934 000CB774 38 21 00 40 */ addi r1, r1, 0x40 /* 800CF938 000CB778 4E 80 00 20 */ blr /* 800CF93C 000CB77C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@5911" +"@5911": + + .4byte 0 + .4byte 0 + +.global "@5915" +"@5915": + + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmclr_8055ee98.s b/asm/libnw4r_g3d/g3d_resanmclr_8055ee98.s deleted file mode 100644 index 74a4cd73..00000000 --- a/asm/libnw4r_g3d/g3d_resanmclr_8055ee98.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@5911" -"@5911": - - .4byte 0 - .4byte 0 - -.global "@5915" -"@5915": - - .4byte 0x43300000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmfog_800d2570.s b/asm/libnw4r_g3d/g3d_resanmfog.s similarity index 96% rename from asm/libnw4r_g3d/g3d_resanmfog_800d2570.s rename to asm/libnw4r_g3d/g3d_resanmfog.s index cbe60d47..78498209 100644 --- a/asm/libnw4r_g3d/g3d_resanmfog_800d2570.s +++ b/asm/libnw4r_g3d/g3d_resanmfog.s @@ -113,3 +113,17 @@ lbl_800D269C: /* 800D26C4 000CE504 7C 08 03 A6 */ mtlr r0 /* 800D26C8 000CE508 38 21 00 50 */ addi r1, r1, 0x50 /* 800D26CC 000CE50C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@10922" +"@10922": + + .4byte 0 + .4byte 0 + +.global "@10926" +"@10926": + + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmfog_8055eef0.s b/asm/libnw4r_g3d/g3d_resanmfog_8055eef0.s deleted file mode 100644 index 9ab7ebdc..00000000 --- a/asm/libnw4r_g3d/g3d_resanmfog_8055eef0.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@10922" -"@10922": - - .4byte 0 - .4byte 0 - -.global "@10926" -"@10926": - - .4byte 0x43300000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmlight_800d2180.s b/asm/libnw4r_g3d/g3d_resanmlight.s similarity index 98% rename from asm/libnw4r_g3d/g3d_resanmlight_800d2180.s rename to asm/libnw4r_g3d/g3d_resanmlight.s index c3b49fe0..0bba22a0 100644 --- a/asm/libnw4r_g3d/g3d_resanmlight_800d2180.s +++ b/asm/libnw4r_g3d/g3d_resanmlight.s @@ -335,3 +335,17 @@ lbl_800D2540: /* 800D2564 000CE3A4 4E 80 00 20 */ blr /* 800D2568 000CE3A8 00 00 00 00 */ .4byte 0x00000000 /* 800D256C 000CE3AC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@11230" +"@11230": + + .4byte 0 + .4byte 0 + +.global "@11234" +"@11234": + + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmlight_8055eee0.s b/asm/libnw4r_g3d/g3d_resanmlight_8055eee0.s deleted file mode 100644 index 8e04b701..00000000 --- a/asm/libnw4r_g3d/g3d_resanmlight_8055eee0.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@11230" -"@11230": - - .4byte 0 - .4byte 0 - -.global "@11234" -"@11234": - - .4byte 0x43300000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmscn_800d29e0.s b/asm/libnw4r_g3d/g3d_resanmscn.s similarity index 96% rename from asm/libnw4r_g3d/g3d_resanmscn_800d29e0.s rename to asm/libnw4r_g3d/g3d_resanmscn.s index eae5b2d7..98b4be0b 100644 --- a/asm/libnw4r_g3d/g3d_resanmscn_800d29e0.s +++ b/asm/libnw4r_g3d/g3d_resanmscn.s @@ -867,3 +867,65 @@ lbl_800D33D8: /* 800D33F4 000CF234 38 21 00 40 */ addi r1, r1, 0x40 /* 800D33F8 000CF238 4E 80 00 20 */ blr /* 800D33FC 000CF23C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "ResNameData_LightSet__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@" +"ResNameData_LightSet__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@": + + .4byte 0x0000000E + .4byte 0x4C696768 + .4byte 0x74536574 + .4byte 0x284E5734 + .4byte 0x52290000 + .4byte 0 + .4byte 0 + .4byte 0 + +.global "ResNameData_AmbLights__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@" +"ResNameData_AmbLights__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@": + + .4byte 0x0000000F + .4byte 0x416D624C + .4byte 0x69676874 + .4byte 0x73284E57 + .4byte 0x34522900 + .4byte 0 + .4byte 0 + .4byte 0 + +.global "ResNameData_Lights__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@" +"ResNameData_Lights__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@": + + .4byte 0x0000000C + .4byte 0x4C696768 + .4byte 0x7473284E + .4byte 0x57345229 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + +.global "ResNameData_Fogs__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@" +"ResNameData_Fogs__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@": + + .4byte 0x0000000A + .4byte 0x466F6773 + .4byte 0x284E5734 + .4byte 0x52290000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + +.global "ResNameData_Cameras__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@" +"ResNameData_Cameras__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@": + + .4byte 0x0000000D + .4byte 0x43616D65 + .4byte 0x72617328 + .4byte 0x4E573452 + .4byte 0x29000000 + .4byte 0 + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmscn_80440660.s b/asm/libnw4r_g3d/g3d_resanmscn_80440660.s deleted file mode 100644 index d9e16f7c..00000000 --- a/asm/libnw4r_g3d/g3d_resanmscn_80440660.s +++ /dev/null @@ -1,62 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "ResNameData_LightSet__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@" -"ResNameData_LightSet__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@": - - .4byte 0x0000000E - .4byte 0x4C696768 - .4byte 0x74536574 - .4byte 0x284E5734 - .4byte 0x52290000 - .4byte 0 - .4byte 0 - .4byte 0 - -.global "ResNameData_AmbLights__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@" -"ResNameData_AmbLights__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@": - - .4byte 0x0000000F - .4byte 0x416D624C - .4byte 0x69676874 - .4byte 0x73284E57 - .4byte 0x34522900 - .4byte 0 - .4byte 0 - .4byte 0 - -.global "ResNameData_Lights__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@" -"ResNameData_Lights__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@": - - .4byte 0x0000000C - .4byte 0x4C696768 - .4byte 0x7473284E - .4byte 0x57345229 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - -.global "ResNameData_Fogs__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@" -"ResNameData_Fogs__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@": - - .4byte 0x0000000A - .4byte 0x466F6773 - .4byte 0x284E5734 - .4byte 0x52290000 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - -.global "ResNameData_Cameras__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@" -"ResNameData_Cameras__Q34nw4r3g3d27@unnamed@g3d_resanmscn_cpp@": - - .4byte 0x0000000D - .4byte 0x43616D65 - .4byte 0x72617328 - .4byte 0x4E573452 - .4byte 0x29000000 - .4byte 0 - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmshp_800d3400.s b/asm/libnw4r_g3d/g3d_resanmshp.s similarity index 97% rename from asm/libnw4r_g3d/g3d_resanmshp_800d3400.s rename to asm/libnw4r_g3d/g3d_resanmshp.s index ec41f1a2..3e9a70a8 100644 --- a/asm/libnw4r_g3d/g3d_resanmshp_800d3400.s +++ b/asm/libnw4r_g3d/g3d_resanmshp.s @@ -113,3 +113,11 @@ lbl_800D353C: /* 800D3564 000CF3A4 4E 80 00 20 */ blr /* 800D3568 000CF3A8 00 00 00 00 */ .4byte 0x00000000 /* 800D356C 000CF3AC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@7163" +"@7163": + + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmshp_8055ef00.s b/asm/libnw4r_g3d/g3d_resanmshp_8055ef00.s deleted file mode 100644 index 8ad43114..00000000 --- a/asm/libnw4r_g3d/g3d_resanmshp_8055ef00.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@7163" -"@7163": - - .4byte 0x3F800000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmtexpat_800cf940.s b/asm/libnw4r_g3d/g3d_resanmtexpat.s similarity index 100% rename from asm/libnw4r_g3d/g3d_resanmtexpat_800cf940.s rename to asm/libnw4r_g3d/g3d_resanmtexpat.s diff --git a/asm/libnw4r_g3d/g3d_resanmtexsrt_800cfeb0.s b/asm/libnw4r_g3d/g3d_resanmtexsrt.s similarity index 99% rename from asm/libnw4r_g3d/g3d_resanmtexsrt_800cfeb0.s rename to asm/libnw4r_g3d/g3d_resanmtexsrt.s index 4bcd6828..905d8107 100644 --- a/asm/libnw4r_g3d/g3d_resanmtexsrt_800cfeb0.s +++ b/asm/libnw4r_g3d/g3d_resanmtexsrt.s @@ -357,3 +357,15 @@ lbl_800D028C: /* 800D02C4 000CC104 00 00 00 00 */ .4byte 0x00000000 /* 800D02C8 000CC108 00 00 00 00 */ .4byte 0x00000000 /* 800D02CC 000CC10C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@6218" +"@6218": + + .4byte 0x3F800000 + +.global "@6219" +"@6219": + + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmtexsrt_8055eea8.s b/asm/libnw4r_g3d/g3d_resanmtexsrt_8055eea8.s deleted file mode 100644 index 24f23d4c..00000000 --- a/asm/libnw4r_g3d/g3d_resanmtexsrt_8055eea8.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@6218" -"@6218": - - .4byte 0x3F800000 - -.global "@6219" -"@6219": - - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmvis_800cf6b0.s b/asm/libnw4r_g3d/g3d_resanmvis.s similarity index 95% rename from asm/libnw4r_g3d/g3d_resanmvis_800cf6b0.s rename to asm/libnw4r_g3d/g3d_resanmvis.s index b47dfbad..add9115f 100644 --- a/asm/libnw4r_g3d/g3d_resanmvis_800cf6b0.s +++ b/asm/libnw4r_g3d/g3d_resanmvis.s @@ -95,3 +95,17 @@ lbl_800CF7BC: /* 800CF7C4 000CB604 7C 08 03 A6 */ mtlr r0 /* 800CF7C8 000CB608 38 21 00 20 */ addi r1, r1, 0x20 /* 800CF7CC 000CB60C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@5876" +"@5876": + + .4byte 0 + .4byte 0 + +.global "@5879" +"@5879": + + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resanmvis_8055ee88.s b/asm/libnw4r_g3d/g3d_resanmvis_8055ee88.s deleted file mode 100644 index 6c7a4993..00000000 --- a/asm/libnw4r_g3d/g3d_resanmvis_8055ee88.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@5876" -"@5876": - - .4byte 0 - .4byte 0 - -.global "@5879" -"@5879": - - .4byte 0x43300000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_rescommon_800c8ae0.s b/asm/libnw4r_g3d/g3d_rescommon.s similarity index 100% rename from asm/libnw4r_g3d/g3d_rescommon_800c8ae0.s rename to asm/libnw4r_g3d/g3d_rescommon.s diff --git a/asm/libnw4r_g3d/g3d_resdict_800c8c50.s b/asm/libnw4r_g3d/g3d_resdict.s similarity index 100% rename from asm/libnw4r_g3d/g3d_resdict_800c8c50.s rename to asm/libnw4r_g3d/g3d_resdict.s diff --git a/asm/libnw4r_g3d/g3d_resfile_800c8f70.s b/asm/libnw4r_g3d/g3d_resfile.s similarity index 97% rename from asm/libnw4r_g3d/g3d_resfile_800c8f70.s rename to asm/libnw4r_g3d/g3d_resfile.s index b5371b00..ad4a95c9 100644 --- a/asm/libnw4r_g3d/g3d_resfile_800c8f70.s +++ b/asm/libnw4r_g3d/g3d_resfile.s @@ -1947,3 +1947,137 @@ lbl_800CA6D4: /* 800CA6E4 000C6524 38 21 00 D0 */ addi r1, r1, 0xd0 /* 800CA6E8 000C6528 4E 80 00 20 */ blr /* 800CA6EC 000C652C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "ResNameData_Models__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" +"ResNameData_Models__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": + + .4byte 0x0000000E + .4byte 0x33444D6F + .4byte 0x64656C73 + .4byte 0x284E5734 + .4byte 0x52290000 + .4byte 0 + .4byte 0 + .4byte 0 + +.global "ResNameData_Pltts__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" +"ResNameData_Pltts__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": + + .4byte 0x0000000E + .4byte 0x50616C65 + .4byte 0x74746573 + .4byte 0x284E5734 + .4byte 0x52290000 + .4byte 0 + .4byte 0 + .4byte 0 + +.global "ResNameData_Textures__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" +"ResNameData_Textures__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": + + .4byte 0x0000000E + .4byte 0x54657874 + .4byte 0x75726573 + .4byte 0x284E5734 + .4byte 0x52290000 + .4byte 0 + .4byte 0 + .4byte 0 + +.global "ResNameData_AnmChr__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" +"ResNameData_AnmChr__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": + + .4byte 0x0000000C + .4byte 0x416E6D43 + .4byte 0x6872284E + .4byte 0x57345229 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + +.global "ResNameData_AnmVis__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" +"ResNameData_AnmVis__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": + + .4byte 0x0000000C + .4byte 0x416E6D56 + .4byte 0x6973284E + .4byte 0x57345229 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + +.global "ResNameData_AnmClr__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" +"ResNameData_AnmClr__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": + + .4byte 0x0000000C + .4byte 0x416E6D43 + .4byte 0x6C72284E + .4byte 0x57345229 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + +.global "ResNameData_AnmTexPat__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" +"ResNameData_AnmTexPat__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": + + .4byte 0x0000000F + .4byte 0x416E6D54 + .4byte 0x65785061 + .4byte 0x74284E57 + .4byte 0x34522900 + .4byte 0 + .4byte 0 + .4byte 0 + +.global "ResNameData_AnmTexSrt__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" +"ResNameData_AnmTexSrt__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": + + .4byte 0x0000000F + .4byte 0x416E6D54 + .4byte 0x65785372 + .4byte 0x74284E57 + .4byte 0x34522900 + .4byte 0 + .4byte 0 + .4byte 0 + +.global "ResNameData_AnmShp__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" +"ResNameData_AnmShp__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": + + .4byte 0x0000000C + .4byte 0x416E6D53 + .4byte 0x6870284E + .4byte 0x57345229 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + +.global "ResNameData_AnmScn__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" +"ResNameData_AnmScn__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": + + .4byte 0x0000000C + .4byte 0x416E6D53 + .4byte 0x636E284E + .4byte 0x57345229 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + +.global "ResNameData_Ext__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" +"ResNameData_Ext__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": + + .4byte 0x00000008 + .4byte 0x45787465 + .4byte 0x726E616C + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resfile_804404e0.s b/asm/libnw4r_g3d/g3d_resfile_804404e0.s deleted file mode 100644 index a92b4b4d..00000000 --- a/asm/libnw4r_g3d/g3d_resfile_804404e0.s +++ /dev/null @@ -1,134 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "ResNameData_Models__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" -"ResNameData_Models__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": - - .4byte 0x0000000E - .4byte 0x33444D6F - .4byte 0x64656C73 - .4byte 0x284E5734 - .4byte 0x52290000 - .4byte 0 - .4byte 0 - .4byte 0 - -.global "ResNameData_Pltts__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" -"ResNameData_Pltts__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": - - .4byte 0x0000000E - .4byte 0x50616C65 - .4byte 0x74746573 - .4byte 0x284E5734 - .4byte 0x52290000 - .4byte 0 - .4byte 0 - .4byte 0 - -.global "ResNameData_Textures__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" -"ResNameData_Textures__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": - - .4byte 0x0000000E - .4byte 0x54657874 - .4byte 0x75726573 - .4byte 0x284E5734 - .4byte 0x52290000 - .4byte 0 - .4byte 0 - .4byte 0 - -.global "ResNameData_AnmChr__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" -"ResNameData_AnmChr__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": - - .4byte 0x0000000C - .4byte 0x416E6D43 - .4byte 0x6872284E - .4byte 0x57345229 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - -.global "ResNameData_AnmVis__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" -"ResNameData_AnmVis__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": - - .4byte 0x0000000C - .4byte 0x416E6D56 - .4byte 0x6973284E - .4byte 0x57345229 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - -.global "ResNameData_AnmClr__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" -"ResNameData_AnmClr__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": - - .4byte 0x0000000C - .4byte 0x416E6D43 - .4byte 0x6C72284E - .4byte 0x57345229 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - -.global "ResNameData_AnmTexPat__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" -"ResNameData_AnmTexPat__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": - - .4byte 0x0000000F - .4byte 0x416E6D54 - .4byte 0x65785061 - .4byte 0x74284E57 - .4byte 0x34522900 - .4byte 0 - .4byte 0 - .4byte 0 - -.global "ResNameData_AnmTexSrt__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" -"ResNameData_AnmTexSrt__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": - - .4byte 0x0000000F - .4byte 0x416E6D54 - .4byte 0x65785372 - .4byte 0x74284E57 - .4byte 0x34522900 - .4byte 0 - .4byte 0 - .4byte 0 - -.global "ResNameData_AnmShp__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" -"ResNameData_AnmShp__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": - - .4byte 0x0000000C - .4byte 0x416E6D53 - .4byte 0x6870284E - .4byte 0x57345229 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - -.global "ResNameData_AnmScn__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" -"ResNameData_AnmScn__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": - - .4byte 0x0000000C - .4byte 0x416E6D53 - .4byte 0x636E284E - .4byte 0x57345229 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - -.global "ResNameData_Ext__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@" -"ResNameData_Ext__Q34nw4r3g3d25@unnamed@g3d_resfile_cpp@": - - .4byte 0x00000008 - .4byte 0x45787465 - .4byte 0x726E616C - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_reslightset_800d1f40.s b/asm/libnw4r_g3d/g3d_reslightset.s similarity index 100% rename from asm/libnw4r_g3d/g3d_reslightset_800d1f40.s rename to asm/libnw4r_g3d/g3d_reslightset.s diff --git a/asm/libnw4r_g3d/g3d_resmat_800ccd10.s b/asm/libnw4r_g3d/g3d_resmat.s similarity index 99% rename from asm/libnw4r_g3d/g3d_resmat_800ccd10.s rename to asm/libnw4r_g3d/g3d_resmat.s index efc40db1..8596c15f 100644 --- a/asm/libnw4r_g3d/g3d_resmat_800ccd10.s +++ b/asm/libnw4r_g3d/g3d_resmat.s @@ -1781,3 +1781,55 @@ lbl_800CE3D0: /* 800CE3E4 000CA224 38 21 00 60 */ addi r1, r1, 0x60 /* 800CE3E8 000CA228 4E 80 00 20 */ blr /* 800CE3EC 000CA22C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@13919" +"@13919": + + .4byte 0 + +.global "@13982" +"@13982": + + .4byte 0x3F800000 + +.global "@14090" +"@14090": + + .4byte 0x3FE33333 + .4byte 0x40000000 + +.global "@14094" +"@14094": + + .4byte 0x43300000 + .4byte 0 + +.global "@14587" +"@14587": + + .4byte 0x40000000 + +.global "@14588" +"@14588": + + .4byte 0x3F000000 + +.global "@14589" +"@14589": + + .4byte 0x3A800000 + .4byte 0 + +.global "@14594" +"@14594": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@14686" +"@14686": + + .4byte 0x44800000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resmat_8055ee28.s b/asm/libnw4r_g3d/g3d_resmat_8055ee28.s deleted file mode 100644 index 9ba9a457..00000000 --- a/asm/libnw4r_g3d/g3d_resmat_8055ee28.s +++ /dev/null @@ -1,52 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@13919" -"@13919": - - .4byte 0 - -.global "@13982" -"@13982": - - .4byte 0x3F800000 - -.global "@14090" -"@14090": - - .4byte 0x3FE33333 - .4byte 0x40000000 - -.global "@14094" -"@14094": - - .4byte 0x43300000 - .4byte 0 - -.global "@14587" -"@14587": - - .4byte 0x40000000 - -.global "@14588" -"@14588": - - .4byte 0x3F000000 - -.global "@14589" -"@14589": - - .4byte 0x3A800000 - .4byte 0 - -.global "@14594" -"@14594": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@14686" -"@14686": - - .4byte 0x44800000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resmdl_800ca6f0.s b/asm/libnw4r_g3d/g3d_resmdl.s similarity index 99% rename from asm/libnw4r_g3d/g3d_resmdl_800ca6f0.s rename to asm/libnw4r_g3d/g3d_resmdl.s index 0a831c9c..36959222 100644 --- a/asm/libnw4r_g3d/g3d_resmdl_800ca6f0.s +++ b/asm/libnw4r_g3d/g3d_resmdl.s @@ -1565,3 +1565,17 @@ lbl_800CB7E0: /* 800CB7F4 000C7634 00 00 00 00 */ .4byte 0x00000000 /* 800CB7F8 000C7638 00 00 00 00 */ .4byte 0x00000000 /* 800CB7FC 000C763C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@STRING@GetDrawEnumerator__Q34nw4r3g3d6ResMdlCFv@0" +"@STRING@GetDrawEnumerator__Q34nw4r3g3d6ResMdlCFv@0": + + .4byte 0x44726177 + .4byte 0x586C7500 + +.global "@STRING@GetDrawEnumerator__Q34nw4r3g3d6ResMdlCFv" +"@STRING@GetDrawEnumerator__Q34nw4r3g3d6ResMdlCFv": + + .4byte 0x44726177 + .4byte 0x4F706100 diff --git a/asm/libnw4r_g3d/g3d_resmdl_805569d8.s b/asm/libnw4r_g3d/g3d_resmdl_805569d8.s deleted file mode 100644 index 48010a47..00000000 --- a/asm/libnw4r_g3d/g3d_resmdl_805569d8.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@STRING@GetDrawEnumerator__Q34nw4r3g3d6ResMdlCFv@0" -"@STRING@GetDrawEnumerator__Q34nw4r3g3d6ResMdlCFv@0": - - .4byte 0x44726177 - .4byte 0x586C7500 - -.global "@STRING@GetDrawEnumerator__Q34nw4r3g3d6ResMdlCFv" -"@STRING@GetDrawEnumerator__Q34nw4r3g3d6ResMdlCFv": - - .4byte 0x44726177 - .4byte 0x4F706100 diff --git a/asm/libnw4r_g3d/g3d_resnode_800ce7f0.s b/asm/libnw4r_g3d/g3d_resnode.s similarity index 99% rename from asm/libnw4r_g3d/g3d_resnode_800ce7f0.s rename to asm/libnw4r_g3d/g3d_resnode.s index 2ff359be..0fdd8f05 100644 --- a/asm/libnw4r_g3d/g3d_resnode_800ce7f0.s +++ b/asm/libnw4r_g3d/g3d_resnode.s @@ -1081,3 +1081,21 @@ lbl_800CF41C: /* 800CF434 000CB274 4E 80 00 20 */ blr /* 800CF438 000CB278 00 00 00 00 */ .4byte 0x00000000 /* 800CF43C 000CB27C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@7550" +"@7550": + + .4byte 0x3F800000 + +.global "@7551" +"@7551": + + .4byte 0x3F360B61 + +.global "@7552" +"@7552": + + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resnode_8055ee60.s b/asm/libnw4r_g3d/g3d_resnode_8055ee60.s deleted file mode 100644 index ebc80742..00000000 --- a/asm/libnw4r_g3d/g3d_resnode_8055ee60.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@7550" -"@7550": - - .4byte 0x3F800000 - -.global "@7551" -"@7551": - - .4byte 0x3F360B61 - -.global "@7552" -"@7552": - - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_resshp_800cb800.s b/asm/libnw4r_g3d/g3d_resshp.s similarity index 100% rename from asm/libnw4r_g3d/g3d_resshp_800cb800.s rename to asm/libnw4r_g3d/g3d_resshp.s diff --git a/asm/libnw4r_g3d/g3d_restev_800cc0d0.s b/asm/libnw4r_g3d/g3d_restev.s similarity index 97% rename from asm/libnw4r_g3d/g3d_restev_800cc0d0.s rename to asm/libnw4r_g3d/g3d_restev.s index 80424536..6f4345a6 100644 --- a/asm/libnw4r_g3d/g3d_restev_800cc0d0.s +++ b/asm/libnw4r_g3d/g3d_restev.s @@ -929,3 +929,51 @@ lbl_800CCD04: /* 800CCD04 000C8B44 4B F4 FD 0C */ b DCStoreRangeNoSync /* 800CCD08 000C8B48 00 00 00 00 */ .4byte 0x00000000 /* 800CCD0C 000C8B4C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global "@LOCAL@GXGetTevOrder__Q34nw4r3g3d6ResTevCF13_GXTevStageIDP13_GXTexCoordIDP11_GXTexMapIDP12_GXChannelID@r2c" +"@LOCAL@GXGetTevOrder__Q34nw4r3g3d6ResTevCF13_GXTevStageIDP13_GXTexCoordIDP11_GXTexMapIDP12_GXChannelID@r2c": + + .4byte 0x00000004 + .4byte 0x00000005 + .4byte 0x000000FF + .4byte 0x000000FF + .4byte 0x000000FF + .4byte 0x00000007 + .4byte 0x00000008 + .4byte 0x00000006 + +.global "@LOCAL@CallDisplayList__Q34nw4r3g3d6ResTevCFb@dlsize" +"@LOCAL@CallDisplayList__Q34nw4r3g3d6ResTevCFb@dlsize": + + .4byte 0x000000A0 + .4byte 0x000000A0 + .4byte 0x000000C0 + .4byte 0x000000C0 + .4byte 0x00000100 + .4byte 0x00000100 + .4byte 0x00000120 + .4byte 0x00000120 + .4byte 0x00000160 + .4byte 0x00000160 + .4byte 0x00000180 + .4byte 0x00000180 + .4byte 0x000001C0 + .4byte 0x000001C0 + .4byte 0x000001E0 + .4byte 0x000001E0 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@LOCAL@GXSetTevOrder__Q34nw4r3g3d6ResTevF13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID@c2r" +"@LOCAL@GXSetTevOrder__Q34nw4r3g3d6ResTevF13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID@c2r": + + .4byte 0x00010001 + .4byte 0x00010705 + .4byte 0x06000000 + .4byte 0x00000007 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_restev_80408320.s b/asm/libnw4r_g3d/g3d_restev_80408320.s deleted file mode 100644 index 320c452e..00000000 --- a/asm/libnw4r_g3d/g3d_restev_80408320.s +++ /dev/null @@ -1,34 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global "@LOCAL@GXGetTevOrder__Q34nw4r3g3d6ResTevCF13_GXTevStageIDP13_GXTexCoordIDP11_GXTexMapIDP12_GXChannelID@r2c" -"@LOCAL@GXGetTevOrder__Q34nw4r3g3d6ResTevCF13_GXTevStageIDP13_GXTexCoordIDP11_GXTexMapIDP12_GXChannelID@r2c": - - .4byte 0x00000004 - .4byte 0x00000005 - .4byte 0x000000FF - .4byte 0x000000FF - .4byte 0x000000FF - .4byte 0x00000007 - .4byte 0x00000008 - .4byte 0x00000006 - -.global "@LOCAL@CallDisplayList__Q34nw4r3g3d6ResTevCFb@dlsize" -"@LOCAL@CallDisplayList__Q34nw4r3g3d6ResTevCFb@dlsize": - - .4byte 0x000000A0 - .4byte 0x000000A0 - .4byte 0x000000C0 - .4byte 0x000000C0 - .4byte 0x00000100 - .4byte 0x00000100 - .4byte 0x00000120 - .4byte 0x00000120 - .4byte 0x00000160 - .4byte 0x00000160 - .4byte 0x00000180 - .4byte 0x00000180 - .4byte 0x000001C0 - .4byte 0x000001C0 - .4byte 0x000001E0 - .4byte 0x000001E0 diff --git a/asm/libnw4r_g3d/g3d_restev_80440640.s b/asm/libnw4r_g3d/g3d_restev_80440640.s deleted file mode 100644 index b8199e1f..00000000 --- a/asm/libnw4r_g3d/g3d_restev_80440640.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@LOCAL@GXSetTevOrder__Q34nw4r3g3d6ResTevF13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID@c2r" -"@LOCAL@GXSetTevOrder__Q34nw4r3g3d6ResTevF13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID@c2r": - - .4byte 0x00010001 - .4byte 0x00010705 - .4byte 0x06000000 - .4byte 0x00000007 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_restex_800ce610.s b/asm/libnw4r_g3d/g3d_restex.s similarity index 100% rename from asm/libnw4r_g3d/g3d_restex_800ce610.s rename to asm/libnw4r_g3d/g3d_restex.s diff --git a/asm/libnw4r_g3d/g3d_resvtx_800ce3f0.s b/asm/libnw4r_g3d/g3d_resvtx.s similarity index 100% rename from asm/libnw4r_g3d/g3d_resvtx_800ce3f0.s rename to asm/libnw4r_g3d/g3d_resvtx.s diff --git a/asm/libnw4r_g3d/g3d_scnmdl_800ee240.s b/asm/libnw4r_g3d/g3d_scnmdl.s similarity index 99% rename from asm/libnw4r_g3d/g3d_scnmdl_800ee240.s rename to asm/libnw4r_g3d/g3d_scnmdl.s index b9e308ca..32e734ce 100644 --- a/asm/libnw4r_g3d/g3d_scnmdl_800ee240.s +++ b/asm/libnw4r_g3d/g3d_scnmdl.s @@ -3275,3 +3275,37 @@ GetTypeObj__Q34nw4r3g3d6ScnMdlCFv: /* 800F0AA4 000EC8E4 38 63 8E E8 */ addi r3, r3, TYPE_NAME__Q34nw4r3g3d6ScnMdl@l /* 800F0AA8 000EC8E8 4E 80 00 20 */ blr /* 800F0AAC 000EC8EC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global TYPE_NAME__Q34nw4r3g3d6ScnMdl +TYPE_NAME__Q34nw4r3g3d6ScnMdl: + + .4byte 0x00000007 + .4byte 0x53636E4D + .4byte 0x646C0000 + .4byte 0 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3g3d6ScnMdl +__vt__Q34nw4r3g3d6ScnMdl: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d6ScnMdlCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d6ScnMdlFUlUlPv + .4byte __dt__Q34nw4r3g3d6ScnMdlFv + .4byte GetTypeObj__Q34nw4r3g3d6ScnMdlCFv + .4byte GetTypeName__Q34nw4r3g3d6ScnMdlCFv + .4byte ForEach__Q34nw4r3g3d7ScnLeafFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb + .4byte SetScnObjOption__Q34nw4r3g3d6ScnMdlFUlUl + .4byte GetScnObjOption__Q34nw4r3g3d6ScnMdlCFUlPUl + .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv + .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv + .4byte CalcWorldMtx__Q34nw4r3g3d7ScnLeafFPCQ34nw4r4math5MTX34PUl + .4byte SetAnmObj__Q34nw4r3g3d6ScnMdlFPQ34nw4r3g3d6AnmObjQ44nw4r3g3d12ScnMdlSimple10AnmObjType + .4byte RemoveAnmObj__Q34nw4r3g3d6ScnMdlFPQ34nw4r3g3d6AnmObj + .4byte RemoveAnmObj__Q34nw4r3g3d6ScnMdlFQ44nw4r3g3d12ScnMdlSimple10AnmObjType + .4byte GetAnmObj__Q34nw4r3g3d6ScnMdlFQ44nw4r3g3d12ScnMdlSimple10AnmObjType + .4byte GetAnmObj__Q34nw4r3g3d6ScnMdlCFQ44nw4r3g3d12ScnMdlSimple10AnmObjType diff --git a/asm/libnw4r_g3d/g3d_scnmdl_80408ee8.s b/asm/libnw4r_g3d/g3d_scnmdl_80408ee8.s deleted file mode 100644 index 7ccf8273..00000000 --- a/asm/libnw4r_g3d/g3d_scnmdl_80408ee8.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global TYPE_NAME__Q34nw4r3g3d6ScnMdl -TYPE_NAME__Q34nw4r3g3d6ScnMdl: - - .4byte 0x00000007 - .4byte 0x53636E4D - .4byte 0x646C0000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_scnmdl_80441108.s b/asm/libnw4r_g3d/g3d_scnmdl_80441108.s deleted file mode 100644 index 2d7b3527..00000000 --- a/asm/libnw4r_g3d/g3d_scnmdl_80441108.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3g3d6ScnMdl -__vt__Q34nw4r3g3d6ScnMdl: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d6ScnMdlCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d6ScnMdlFUlUlPv - .4byte __dt__Q34nw4r3g3d6ScnMdlFv - .4byte GetTypeObj__Q34nw4r3g3d6ScnMdlCFv - .4byte GetTypeName__Q34nw4r3g3d6ScnMdlCFv - .4byte ForEach__Q34nw4r3g3d7ScnLeafFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb - .4byte SetScnObjOption__Q34nw4r3g3d6ScnMdlFUlUl - .4byte GetScnObjOption__Q34nw4r3g3d6ScnMdlCFUlPUl - .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv - .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv - .4byte CalcWorldMtx__Q34nw4r3g3d7ScnLeafFPCQ34nw4r4math5MTX34PUl - .4byte SetAnmObj__Q34nw4r3g3d6ScnMdlFPQ34nw4r3g3d6AnmObjQ44nw4r3g3d12ScnMdlSimple10AnmObjType - .4byte RemoveAnmObj__Q34nw4r3g3d6ScnMdlFPQ34nw4r3g3d6AnmObj - .4byte RemoveAnmObj__Q34nw4r3g3d6ScnMdlFQ44nw4r3g3d12ScnMdlSimple10AnmObjType - .4byte GetAnmObj__Q34nw4r3g3d6ScnMdlFQ44nw4r3g3d12ScnMdlSimple10AnmObjType - .4byte GetAnmObj__Q34nw4r3g3d6ScnMdlCFQ44nw4r3g3d12ScnMdlSimple10AnmObjType diff --git a/asm/libnw4r_g3d/g3d_scnmdlexpand_800f0ab0.s b/asm/libnw4r_g3d/g3d_scnmdlexpand.s similarity index 96% rename from asm/libnw4r_g3d/g3d_scnmdlexpand_800f0ab0.s rename to asm/libnw4r_g3d/g3d_scnmdlexpand.s index 4af3a5d3..99a23dc0 100644 --- a/asm/libnw4r_g3d/g3d_scnmdlexpand_800f0ab0.s +++ b/asm/libnw4r_g3d/g3d_scnmdlexpand.s @@ -753,3 +753,45 @@ GetTypeObj__Q34nw4r3g3d12ScnMdlExpandCFv: /* 800F1464 000ED2A4 38 63 8E F8 */ addi r3, r3, TYPE_NAME__Q34nw4r3g3d12ScnMdlExpand@l /* 800F1468 000ED2A8 4E 80 00 20 */ blr /* 800F146C 000ED2AC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global TYPE_NAME__Q34nw4r3g3d12ScnMdlExpand +TYPE_NAME__Q34nw4r3g3d12ScnMdlExpand: + + .4byte 0x0000000D + .4byte 0x53636E4D + .4byte 0x646C4578 + .4byte 0x70616E64 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3g3d12ScnMdlExpand +__vt__Q34nw4r3g3d12ScnMdlExpand: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d12ScnMdlExpandCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d12ScnMdlExpandFUlUlPv + .4byte __dt__Q34nw4r3g3d12ScnMdlExpandFv + .4byte GetTypeObj__Q34nw4r3g3d12ScnMdlExpandCFv + .4byte GetTypeName__Q34nw4r3g3d12ScnMdlExpandCFv + .4byte ForEach__Q34nw4r3g3d8ScnGroupFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb + .4byte SetScnObjOption__Q34nw4r3g3d6ScnObjFUlUl + .4byte GetScnObjOption__Q34nw4r3g3d6ScnObjCFUlPUl + .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv + .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv + .4byte CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl + .4byte Insert__Q34nw4r3g3d12ScnMdlExpandFUlPQ34nw4r3g3d6ScnObj + .4byte Remove__Q34nw4r3g3d12ScnMdlExpandFUl + .4byte Remove__Q34nw4r3g3d12ScnMdlExpandFPQ34nw4r3g3d6ScnObj +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "INVALID_NODE_ID__Q34nw4r3g3d30@unnamed@g3d_scnmdlexpand_cpp@" +"INVALID_NODE_ID__Q34nw4r3g3d30@unnamed@g3d_scnmdlexpand_cpp@": + + .4byte 0xFFFFFFFF + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_scnmdlexpand_80408ef8.s b/asm/libnw4r_g3d/g3d_scnmdlexpand_80408ef8.s deleted file mode 100644 index 914298b1..00000000 --- a/asm/libnw4r_g3d/g3d_scnmdlexpand_80408ef8.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global TYPE_NAME__Q34nw4r3g3d12ScnMdlExpand -TYPE_NAME__Q34nw4r3g3d12ScnMdlExpand: - - .4byte 0x0000000D - .4byte 0x53636E4D - .4byte 0x646C4578 - .4byte 0x70616E64 - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_scnmdlexpand_80441150.s b/asm/libnw4r_g3d/g3d_scnmdlexpand_80441150.s deleted file mode 100644 index 9312512f..00000000 --- a/asm/libnw4r_g3d/g3d_scnmdlexpand_80441150.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3g3d12ScnMdlExpand -__vt__Q34nw4r3g3d12ScnMdlExpand: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d12ScnMdlExpandCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d12ScnMdlExpandFUlUlPv - .4byte __dt__Q34nw4r3g3d12ScnMdlExpandFv - .4byte GetTypeObj__Q34nw4r3g3d12ScnMdlExpandCFv - .4byte GetTypeName__Q34nw4r3g3d12ScnMdlExpandCFv - .4byte ForEach__Q34nw4r3g3d8ScnGroupFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb - .4byte SetScnObjOption__Q34nw4r3g3d6ScnObjFUlUl - .4byte GetScnObjOption__Q34nw4r3g3d6ScnObjCFUlPUl - .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv - .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv - .4byte CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl - .4byte Insert__Q34nw4r3g3d12ScnMdlExpandFUlPQ34nw4r3g3d6ScnObj - .4byte Remove__Q34nw4r3g3d12ScnMdlExpandFUl - .4byte Remove__Q34nw4r3g3d12ScnMdlExpandFPQ34nw4r3g3d6ScnObj diff --git a/asm/libnw4r_g3d/g3d_scnmdlexpand_80556a38.s b/asm/libnw4r_g3d/g3d_scnmdlexpand_80556a38.s deleted file mode 100644 index b3ba0162..00000000 --- a/asm/libnw4r_g3d/g3d_scnmdlexpand_80556a38.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "INVALID_NODE_ID__Q34nw4r3g3d30@unnamed@g3d_scnmdlexpand_cpp@" -"INVALID_NODE_ID__Q34nw4r3g3d30@unnamed@g3d_scnmdlexpand_cpp@": - - .4byte 0xFFFFFFFF - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_scnmdlsmpl_800ec3a0.s b/asm/libnw4r_g3d/g3d_scnmdlsmpl.s similarity index 98% rename from asm/libnw4r_g3d/g3d_scnmdlsmpl_800ec3a0.s rename to asm/libnw4r_g3d/g3d_scnmdlsmpl.s index 0eb18e8b..d053289e 100644 --- a/asm/libnw4r_g3d/g3d_scnmdlsmpl_800ec3a0.s +++ b/asm/libnw4r_g3d/g3d_scnmdlsmpl.s @@ -2423,3 +2423,75 @@ GetTypeObj__Q34nw4r3g3d12ScnMdlSimpleCFv: /* 800EE234 000EA074 38 63 8E D0 */ addi r3, r3, TYPE_NAME__Q34nw4r3g3d12ScnMdlSimple@l /* 800EE238 000EA078 4E 80 00 20 */ blr /* 800EE23C 000EA07C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global TYPE_NAME__Q34nw4r3g3d12ScnMdlSimple +TYPE_NAME__Q34nw4r3g3d12ScnMdlSimple: + + .4byte 0x0000000D + .4byte 0x53636E4D + .4byte 0x646C5369 + .4byte 0x6D706C65 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@14160" +"@14160": + + .4byte 0x4E6F6465 + .4byte 0x54726565 + .4byte 0 + .4byte 0 + +.global __vt__Q34nw4r3g3d12ScnMdlSimple +__vt__Q34nw4r3g3d12ScnMdlSimple: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d12ScnMdlSimpleCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d12ScnMdlSimpleFUlUlPv + .4byte __dt__Q34nw4r3g3d12ScnMdlSimpleFv + .4byte GetTypeObj__Q34nw4r3g3d12ScnMdlSimpleCFv + .4byte GetTypeName__Q34nw4r3g3d12ScnMdlSimpleCFv + .4byte ForEach__Q34nw4r3g3d7ScnLeafFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb + .4byte SetScnObjOption__Q34nw4r3g3d12ScnMdlSimpleFUlUl + .4byte GetScnObjOption__Q34nw4r3g3d12ScnMdlSimpleCFUlPUl + .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv + .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv + .4byte CalcWorldMtx__Q34nw4r3g3d7ScnLeafFPCQ34nw4r4math5MTX34PUl + .4byte SetAnmObj__Q34nw4r3g3d12ScnMdlSimpleFPQ34nw4r3g3d6AnmObjQ44nw4r3g3d12ScnMdlSimple10AnmObjType + .4byte RemoveAnmObj__Q34nw4r3g3d12ScnMdlSimpleFPQ34nw4r3g3d6AnmObj + .4byte RemoveAnmObj__Q34nw4r3g3d12ScnMdlSimpleFQ44nw4r3g3d12ScnMdlSimple10AnmObjType + .4byte GetAnmObj__Q34nw4r3g3d12ScnMdlSimpleFQ44nw4r3g3d12ScnMdlSimple10AnmObjType + .4byte GetAnmObj__Q34nw4r3g3d12ScnMdlSimpleCFQ44nw4r3g3d12ScnMdlSimple10AnmObjType +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@14161" +"@14161": + + .4byte 0x4E6F6465 + .4byte 0x4D697800 + +.global "@14162" +"@14162": + + .4byte 0x44726177 + .4byte 0x4F706100 + +.global "@14163" +"@14163": + + .4byte 0x44726177 + .4byte 0x586C7500 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@14252" +"@14252": + + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_scnmdlsmpl_80408ed0.s b/asm/libnw4r_g3d/g3d_scnmdlsmpl_80408ed0.s deleted file mode 100644 index 11e42b72..00000000 --- a/asm/libnw4r_g3d/g3d_scnmdlsmpl_80408ed0.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global TYPE_NAME__Q34nw4r3g3d12ScnMdlSimple -TYPE_NAME__Q34nw4r3g3d12ScnMdlSimple: - - .4byte 0x0000000D - .4byte 0x53636E4D - .4byte 0x646C5369 - .4byte 0x6D706C65 - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_scnmdlsmpl_804410b0.s b/asm/libnw4r_g3d/g3d_scnmdlsmpl_804410b0.s deleted file mode 100644 index 8926564b..00000000 --- a/asm/libnw4r_g3d/g3d_scnmdlsmpl_804410b0.s +++ /dev/null @@ -1,32 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@14160" -"@14160": - - .4byte 0x4E6F6465 - .4byte 0x54726565 - .4byte 0 - .4byte 0 - -.global __vt__Q34nw4r3g3d12ScnMdlSimple -__vt__Q34nw4r3g3d12ScnMdlSimple: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d12ScnMdlSimpleCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d12ScnMdlSimpleFUlUlPv - .4byte __dt__Q34nw4r3g3d12ScnMdlSimpleFv - .4byte GetTypeObj__Q34nw4r3g3d12ScnMdlSimpleCFv - .4byte GetTypeName__Q34nw4r3g3d12ScnMdlSimpleCFv - .4byte ForEach__Q34nw4r3g3d7ScnLeafFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb - .4byte SetScnObjOption__Q34nw4r3g3d12ScnMdlSimpleFUlUl - .4byte GetScnObjOption__Q34nw4r3g3d12ScnMdlSimpleCFUlPUl - .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv - .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv - .4byte CalcWorldMtx__Q34nw4r3g3d7ScnLeafFPCQ34nw4r4math5MTX34PUl - .4byte SetAnmObj__Q34nw4r3g3d12ScnMdlSimpleFPQ34nw4r3g3d6AnmObjQ44nw4r3g3d12ScnMdlSimple10AnmObjType - .4byte RemoveAnmObj__Q34nw4r3g3d12ScnMdlSimpleFPQ34nw4r3g3d6AnmObj - .4byte RemoveAnmObj__Q34nw4r3g3d12ScnMdlSimpleFQ44nw4r3g3d12ScnMdlSimple10AnmObjType - .4byte GetAnmObj__Q34nw4r3g3d12ScnMdlSimpleFQ44nw4r3g3d12ScnMdlSimple10AnmObjType - .4byte GetAnmObj__Q34nw4r3g3d12ScnMdlSimpleCFQ44nw4r3g3d12ScnMdlSimple10AnmObjType diff --git a/asm/libnw4r_g3d/g3d_scnmdlsmpl_80556a20.s b/asm/libnw4r_g3d/g3d_scnmdlsmpl_80556a20.s deleted file mode 100644 index 392d4541..00000000 --- a/asm/libnw4r_g3d/g3d_scnmdlsmpl_80556a20.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@14161" -"@14161": - - .4byte 0x4E6F6465 - .4byte 0x4D697800 - -.global "@14162" -"@14162": - - .4byte 0x44726177 - .4byte 0x4F706100 - -.global "@14163" -"@14163": - - .4byte 0x44726177 - .4byte 0x586C7500 diff --git a/asm/libnw4r_g3d/g3d_scnmdlsmpl_8055f0d0.s b/asm/libnw4r_g3d/g3d_scnmdlsmpl_8055f0d0.s deleted file mode 100644 index 2173258f..00000000 --- a/asm/libnw4r_g3d/g3d_scnmdlsmpl_8055f0d0.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@14252" -"@14252": - - .4byte 0x3F800000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_scnobj_800e9110.s b/asm/libnw4r_g3d/g3d_scnobj.s similarity index 97% rename from asm/libnw4r_g3d/g3d_scnobj_800e9110.s rename to asm/libnw4r_g3d/g3d_scnobj.s index 87aaa4b6..4dac2f7f 100644 --- a/asm/libnw4r_g3d/g3d_scnobj_800e9110.s +++ b/asm/libnw4r_g3d/g3d_scnobj.s @@ -1948,3 +1948,115 @@ GetTypeObj__Q34nw4r3g3d6ScnObjCFv: /* 800EA924 000E6764 38 63 8E 90 */ addi r3, r3, TYPE_NAME__Q34nw4r3g3d6ScnObj@l /* 800EA928 000E6768 4E 80 00 20 */ blr /* 800EA92C 000E676C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global TYPE_NAME__Q34nw4r3g3d6ScnObj +TYPE_NAME__Q34nw4r3g3d6ScnObj: + + .4byte 0x00000007 + .4byte 0x53636E4F + .4byte 0x626A0000 + .4byte 0 + +.global TYPE_NAME__Q34nw4r3g3d7ScnLeaf +TYPE_NAME__Q34nw4r3g3d7ScnLeaf: + + .4byte 0x00000008 + .4byte 0x53636E4C + .4byte 0x65616600 + .4byte 0 + +.global TYPE_NAME__Q34nw4r3g3d8ScnGroup +TYPE_NAME__Q34nw4r3g3d8ScnGroup: + + .4byte 0x00000009 + .4byte 0x53636E47 + .4byte 0x726F7570 + .4byte 0 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@11622" +"@11622": + + .4byte lbl_800E94D8 + .4byte lbl_800E9370 + .4byte lbl_800E9398 + .4byte lbl_800E93C0 + .4byte lbl_800E93E8 + .4byte lbl_800E9410 + .4byte lbl_800E9438 + .4byte lbl_800E9460 + .4byte lbl_800E9488 + .4byte lbl_800E94B0 + +.global "@11656" +"@11656": + + .4byte lbl_800E95B0 + .4byte lbl_800E9520 + .4byte lbl_800E9530 + .4byte lbl_800E9540 + .4byte lbl_800E9550 + .4byte lbl_800E9560 + .4byte lbl_800E9570 + .4byte lbl_800E9580 + .4byte lbl_800E9590 + .4byte lbl_800E95A0 + +.global __vt__Q34nw4r3g3d8ScnGroup +__vt__Q34nw4r3g3d8ScnGroup: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d8ScnGroupCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d8ScnGroupFUlUlPv + .4byte __dt__Q34nw4r3g3d8ScnGroupFv + .4byte GetTypeObj__Q34nw4r3g3d8ScnGroupCFv + .4byte GetTypeName__Q34nw4r3g3d8ScnGroupCFv + .4byte ForEach__Q34nw4r3g3d8ScnGroupFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb + .4byte SetScnObjOption__Q34nw4r3g3d6ScnObjFUlUl + .4byte GetScnObjOption__Q34nw4r3g3d6ScnObjCFUlPUl + .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv + .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv + .4byte CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl + .4byte Insert__Q34nw4r3g3d8ScnGroupFUlPQ34nw4r3g3d6ScnObj + .4byte Remove__Q34nw4r3g3d8ScnGroupFUl + .4byte Remove__Q34nw4r3g3d8ScnGroupFPQ34nw4r3g3d6ScnObj + +.global __vt__Q34nw4r3g3d6ScnObj +__vt__Q34nw4r3g3d6ScnObj: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d6ScnObjCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte 0 + .4byte __dt__Q34nw4r3g3d6ScnObjFv + .4byte GetTypeObj__Q34nw4r3g3d6ScnObjCFv + .4byte GetTypeName__Q34nw4r3g3d6ScnObjCFv + .4byte 0 + .4byte SetScnObjOption__Q34nw4r3g3d6ScnObjFUlUl + .4byte GetScnObjOption__Q34nw4r3g3d6ScnObjCFUlPUl + .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv + .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv + .4byte CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global gpCullingFrustum__Q24nw4r3g3d +gpCullingFrustum__Q24nw4r3g3d: + .skip 0x8 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@11583" +"@11583": + + .4byte 0 + +.global "@11803" +"@11803": + + .4byte 0x3F800000 diff --git a/asm/libnw4r_g3d/g3d_scnobj_80408e90.s b/asm/libnw4r_g3d/g3d_scnobj_80408e90.s deleted file mode 100644 index caee70bf..00000000 --- a/asm/libnw4r_g3d/g3d_scnobj_80408e90.s +++ /dev/null @@ -1,26 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global TYPE_NAME__Q34nw4r3g3d6ScnObj -TYPE_NAME__Q34nw4r3g3d6ScnObj: - - .4byte 0x00000007 - .4byte 0x53636E4F - .4byte 0x626A0000 - .4byte 0 - -.global TYPE_NAME__Q34nw4r3g3d7ScnLeaf -TYPE_NAME__Q34nw4r3g3d7ScnLeaf: - - .4byte 0x00000008 - .4byte 0x53636E4C - .4byte 0x65616600 - .4byte 0 - -.global TYPE_NAME__Q34nw4r3g3d8ScnGroup -TYPE_NAME__Q34nw4r3g3d8ScnGroup: - - .4byte 0x00000009 - .4byte 0x53636E47 - .4byte 0x726F7570 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_scnobj_80440f78.s b/asm/libnw4r_g3d/g3d_scnobj_80440f78.s deleted file mode 100644 index 63848413..00000000 --- a/asm/libnw4r_g3d/g3d_scnobj_80440f78.s +++ /dev/null @@ -1,68 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@11622" -"@11622": - - .4byte lbl_800E94D8 - .4byte lbl_800E9370 - .4byte lbl_800E9398 - .4byte lbl_800E93C0 - .4byte lbl_800E93E8 - .4byte lbl_800E9410 - .4byte lbl_800E9438 - .4byte lbl_800E9460 - .4byte lbl_800E9488 - .4byte lbl_800E94B0 - -.global "@11656" -"@11656": - - .4byte lbl_800E95B0 - .4byte lbl_800E9520 - .4byte lbl_800E9530 - .4byte lbl_800E9540 - .4byte lbl_800E9550 - .4byte lbl_800E9560 - .4byte lbl_800E9570 - .4byte lbl_800E9580 - .4byte lbl_800E9590 - .4byte lbl_800E95A0 - -.global __vt__Q34nw4r3g3d8ScnGroup -__vt__Q34nw4r3g3d8ScnGroup: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d8ScnGroupCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d8ScnGroupFUlUlPv - .4byte __dt__Q34nw4r3g3d8ScnGroupFv - .4byte GetTypeObj__Q34nw4r3g3d8ScnGroupCFv - .4byte GetTypeName__Q34nw4r3g3d8ScnGroupCFv - .4byte ForEach__Q34nw4r3g3d8ScnGroupFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb - .4byte SetScnObjOption__Q34nw4r3g3d6ScnObjFUlUl - .4byte GetScnObjOption__Q34nw4r3g3d6ScnObjCFUlPUl - .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv - .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv - .4byte CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl - .4byte Insert__Q34nw4r3g3d8ScnGroupFUlPQ34nw4r3g3d6ScnObj - .4byte Remove__Q34nw4r3g3d8ScnGroupFUl - .4byte Remove__Q34nw4r3g3d8ScnGroupFPQ34nw4r3g3d6ScnObj - -.global __vt__Q34nw4r3g3d6ScnObj -__vt__Q34nw4r3g3d6ScnObj: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d6ScnObjCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte 0 - .4byte __dt__Q34nw4r3g3d6ScnObjFv - .4byte GetTypeObj__Q34nw4r3g3d6ScnObjCFv - .4byte GetTypeName__Q34nw4r3g3d6ScnObjCFv - .4byte 0 - .4byte SetScnObjOption__Q34nw4r3g3d6ScnObjFUlUl - .4byte GetScnObjOption__Q34nw4r3g3d6ScnObjCFUlPUl - .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv - .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv - .4byte CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_scnobj_8055cf98.s b/asm/libnw4r_g3d/g3d_scnobj_8055cf98.s deleted file mode 100644 index f98d845f..00000000 --- a/asm/libnw4r_g3d/g3d_scnobj_8055cf98.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global gpCullingFrustum__Q24nw4r3g3d -gpCullingFrustum__Q24nw4r3g3d: - .skip 0x8 diff --git a/asm/libnw4r_g3d/g3d_scnobj_8055f0c0.s b/asm/libnw4r_g3d/g3d_scnobj_8055f0c0.s deleted file mode 100644 index 25c9fdbd..00000000 --- a/asm/libnw4r_g3d/g3d_scnobj_8055f0c0.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@11583" -"@11583": - - .4byte 0 - -.global "@11803" -"@11803": - - .4byte 0x3F800000 diff --git a/asm/libnw4r_g3d/g3d_scnroot_800ea930.s b/asm/libnw4r_g3d/g3d_scnroot.s similarity index 97% rename from asm/libnw4r_g3d/g3d_scnroot_800ea930.s rename to asm/libnw4r_g3d/g3d_scnroot.s index 75e2d98a..a8b506fe 100644 --- a/asm/libnw4r_g3d/g3d_scnroot_800ea930.s +++ b/asm/libnw4r_g3d/g3d_scnroot.s @@ -2033,3 +2033,81 @@ GetTypeObj__Q34nw4r3g3d7ScnRootCFv: /* 800EC394 000E81D4 38 63 8E C0 */ addi r3, r3, TYPE_NAME__Q34nw4r3g3d7ScnRoot@l /* 800EC398 000E81D8 4E 80 00 20 */ blr /* 800EC39C 000E81DC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global TYPE_NAME__Q34nw4r3g3d7ScnRoot +TYPE_NAME__Q34nw4r3g3d7ScnRoot: + + .4byte 0x00000008 + .4byte 0x53636E52 + .4byte 0x6F6F7400 + .4byte 0 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3g3d12ScnObjGather +__vt__Q34nw4r3g3d12ScnObjGather: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r3g3d12ScnObjGatherFv + .4byte Add__Q34nw4r3g3d12ScnObjGatherFPQ34nw4r3g3d6ScnObjbb + .4byte Clear__Q34nw4r3g3d12ScnObjGatherFv + .4byte ZSort__Q34nw4r3g3d12ScnObjGatherFv + .4byte Sort__Q34nw4r3g3d12ScnObjGatherFv + .4byte Sort__Q34nw4r3g3d12ScnObjGatherFPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_bPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b + .4byte DrawOpa__Q34nw4r3g3d12ScnObjGatherFPQ34nw4r3g3d14ResMdlDrawMode + .4byte DrawXlu__Q34nw4r3g3d12ScnObjGatherFPQ34nw4r3g3d14ResMdlDrawMode + .4byte CheckScnObj__Q34nw4r3g3d12ScnObjGatherFPQ34nw4r3g3d6ScnObj + .4byte 0 + +.global __vt__Q34nw4r3g3d7ScnRoot +__vt__Q34nw4r3g3d7ScnRoot: + + .4byte 0 + .4byte 0 + .4byte IsDerivedFrom__Q34nw4r3g3d7ScnRootCFQ44nw4r3g3d6G3dObj7TypeObj + .4byte G3dProc__Q34nw4r3g3d7ScnRootFUlUlPv + .4byte __dt__Q34nw4r3g3d7ScnRootFv + .4byte GetTypeObj__Q34nw4r3g3d7ScnRootCFv + .4byte GetTypeName__Q34nw4r3g3d7ScnRootCFv + .4byte ForEach__Q34nw4r3g3d8ScnGroupFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb + .4byte SetScnObjOption__Q34nw4r3g3d6ScnObjFUlUl + .4byte GetScnObjOption__Q34nw4r3g3d6ScnObjCFUlPUl + .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv + .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv + .4byte CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl + .4byte Insert__Q34nw4r3g3d8ScnGroupFUlPQ34nw4r3g3d6ScnObj + .4byte Remove__Q34nw4r3g3d8ScnGroupFUl + .4byte Remove__Q34nw4r3g3d8ScnGroupFPQ34nw4r3g3d6ScnObj +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@13447" +"@13447": + + .4byte 0x00000020 + +.global "@13459" +"@13459": + + .4byte 0x00000020 + +.global "@LOCAL@sort__3stdFPPQ34nw4r3g3d6ScnObjPPQ34nw4r3g3d6ScnObjPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b_v@shuffle@0" +"@LOCAL@sort__3stdFPPQ34nw4r3g3d6ScnObjPPQ34nw4r3g3d6ScnObjPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b_v@shuffle@0": + + .4byte 0xFFFFFFFC + +.global "@LOCAL@sort__3stdFPPQ34nw4r3g3d6ScnObjPPQ34nw4r3g3d6ScnObjRPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b_v@shuffle@0" +"@LOCAL@sort__3stdFPPQ34nw4r3g3d6ScnObjPPQ34nw4r3g3d6ScnObjRPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b_v@shuffle@0": + + .4byte 0xFFFFFFFC +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@14739" +"@14739": + + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_scnroot_80408ec0.s b/asm/libnw4r_g3d/g3d_scnroot_80408ec0.s deleted file mode 100644 index 89e981d8..00000000 --- a/asm/libnw4r_g3d/g3d_scnroot_80408ec0.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global TYPE_NAME__Q34nw4r3g3d7ScnRoot -TYPE_NAME__Q34nw4r3g3d7ScnRoot: - - .4byte 0x00000008 - .4byte 0x53636E52 - .4byte 0x6F6F7400 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_scnroot_80441040.s b/asm/libnw4r_g3d/g3d_scnroot_80441040.s deleted file mode 100644 index fbca16c9..00000000 --- a/asm/libnw4r_g3d/g3d_scnroot_80441040.s +++ /dev/null @@ -1,38 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3g3d12ScnObjGather -__vt__Q34nw4r3g3d12ScnObjGather: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r3g3d12ScnObjGatherFv - .4byte Add__Q34nw4r3g3d12ScnObjGatherFPQ34nw4r3g3d6ScnObjbb - .4byte Clear__Q34nw4r3g3d12ScnObjGatherFv - .4byte ZSort__Q34nw4r3g3d12ScnObjGatherFv - .4byte Sort__Q34nw4r3g3d12ScnObjGatherFv - .4byte Sort__Q34nw4r3g3d12ScnObjGatherFPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_bPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b - .4byte DrawOpa__Q34nw4r3g3d12ScnObjGatherFPQ34nw4r3g3d14ResMdlDrawMode - .4byte DrawXlu__Q34nw4r3g3d12ScnObjGatherFPQ34nw4r3g3d14ResMdlDrawMode - .4byte CheckScnObj__Q34nw4r3g3d12ScnObjGatherFPQ34nw4r3g3d6ScnObj - .4byte 0 - -.global __vt__Q34nw4r3g3d7ScnRoot -__vt__Q34nw4r3g3d7ScnRoot: - - .4byte 0 - .4byte 0 - .4byte IsDerivedFrom__Q34nw4r3g3d7ScnRootCFQ44nw4r3g3d6G3dObj7TypeObj - .4byte G3dProc__Q34nw4r3g3d7ScnRootFUlUlPv - .4byte __dt__Q34nw4r3g3d7ScnRootFv - .4byte GetTypeObj__Q34nw4r3g3d7ScnRootCFv - .4byte GetTypeName__Q34nw4r3g3d7ScnRootCFv - .4byte ForEach__Q34nw4r3g3d8ScnGroupFPFPQ34nw4r3g3d6ScnObjPv_Q44nw4r3g3d6ScnObj13ForEachResultPvb - .4byte SetScnObjOption__Q34nw4r3g3d6ScnObjFUlUl - .4byte GetScnObjOption__Q34nw4r3g3d6ScnObjCFUlPUl - .4byte GetValueForSortOpa__Q34nw4r3g3d6ScnObjCFv - .4byte GetValueForSortXlu__Q34nw4r3g3d6ScnObjCFv - .4byte CalcWorldMtx__Q34nw4r3g3d6ScnObjFPCQ34nw4r4math5MTX34PUl - .4byte Insert__Q34nw4r3g3d8ScnGroupFUlPQ34nw4r3g3d6ScnObj - .4byte Remove__Q34nw4r3g3d8ScnGroupFUl - .4byte Remove__Q34nw4r3g3d8ScnGroupFPQ34nw4r3g3d6ScnObj diff --git a/asm/libnw4r_g3d/g3d_scnroot_80556a10.s b/asm/libnw4r_g3d/g3d_scnroot_80556a10.s deleted file mode 100644 index 3613f6c1..00000000 --- a/asm/libnw4r_g3d/g3d_scnroot_80556a10.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@13447" -"@13447": - - .4byte 0x00000020 - -.global "@13459" -"@13459": - - .4byte 0x00000020 - -.global "@LOCAL@sort__3stdFPPQ34nw4r3g3d6ScnObjPPQ34nw4r3g3d6ScnObjPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b_v@shuffle@0" -"@LOCAL@sort__3stdFPPQ34nw4r3g3d6ScnObjPPQ34nw4r3g3d6ScnObjPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b_v@shuffle@0": - - .4byte 0xFFFFFFFC - -.global "@LOCAL@sort__3stdFPPQ34nw4r3g3d6ScnObjPPQ34nw4r3g3d6ScnObjRPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b_v@shuffle@0" -"@LOCAL@sort__3stdFPPQ34nw4r3g3d6ScnObjPPQ34nw4r3g3d6ScnObjRPFPCQ34nw4r3g3d6ScnObjPCQ34nw4r3g3d6ScnObj_b_v@shuffle@0": - - .4byte 0xFFFFFFFC diff --git a/asm/libnw4r_g3d/g3d_scnroot_8055f0c8.s b/asm/libnw4r_g3d/g3d_scnroot_8055f0c8.s deleted file mode 100644 index 96b9bcfd..00000000 --- a/asm/libnw4r_g3d/g3d_scnroot_8055f0c8.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@14739" -"@14739": - - .4byte 0x3F000000 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_state_800dca10.s b/asm/libnw4r_g3d/g3d_state.s similarity index 97% rename from asm/libnw4r_g3d/g3d_state_800dca10.s rename to asm/libnw4r_g3d/g3d_state.s index 18db8cc5..c624294e 100644 --- a/asm/libnw4r_g3d/g3d_state_800dca10.s +++ b/asm/libnw4r_g3d/g3d_state.s @@ -4110,3 +4110,181 @@ lbl_800E0018: /* 800E0064 000DBEA4 7C 08 03 A6 */ mtlr r0 /* 800E0068 000DBEA8 38 21 00 20 */ addi r1, r1, 0x20 /* 800E006C 000DBEAC 4E 80 00 20 */ blr +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1g3d_state_cpp" +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global "@LOCAL@EnvironmentMapping__Q44nw4r3g3d6detail19ScnDependentMtxFuncFPQ34nw4r4math5MTX34ScSc@envMtx" +"@LOCAL@EnvironmentMapping__Q44nw4r3g3d6detail19ScnDependentMtxFuncFPQ34nw4r4math5MTX34ScSc@envMtx": + + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0x3F000000 + .4byte 0 + .4byte 0xBF000000 + .4byte 0 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x3F800000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q44nw4r3g3d8G3DState11IndMtxOpStd +__vt__Q44nw4r3g3d8G3DState11IndMtxOpStd: + + .4byte 0 + .4byte 0 + .4byte __cl__Q44nw4r3g3d8G3DState11IndMtxOpStdFPQ44nw4r3g3d8G3DState13IndTexMtxInfo + .4byte __dt__Q44nw4r3g3d8G3DState11IndMtxOpStdFv + .4byte Reset__Q44nw4r3g3d8G3DState11IndMtxOpStdFv + .4byte SetNrmMapMtx__Q44nw4r3g3d8G3DState11IndMtxOpStdF14_GXIndTexMtxIDPCQ34nw4r4math4VEC3PCQ34nw4r4math5MTX34Q44nw4r3g3d14ResMatMiscData14IndirectMethod +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global "sGenMode2__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"sGenMode2__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0xC + +.global "sTexCoordScale__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"sTexCoordScale__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0x74 + +.global "sTex__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"sTex__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0x120 + +.global "sTlut__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"sTlut__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0x70 + +.global "sPreTexMtxState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"sPreTexMtxState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0x20 + +.global "sPosNrmArrayState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"sPosNrmArrayState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0x10 + +.global "sScnDependentTexMtxFuncTable__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"sScnDependentTexMtxFuncTable__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0x800 + +.global "sFogState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"sFogState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0x608 + +.global "sLightState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"sLightState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0x2A2C + +.global "sCameraMtxState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"sCameraMtxState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0x16AC + +.global lbl_80510000 +lbl_80510000: + .skip 0x388 + +.global "sRenderMode__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"sRenderMode__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0x40 + +.global "IndMtxOpDefault__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"IndMtxOpDefault__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0x98 + +.global "@LOCAL@GetViewNrmMtxPtr__Q54nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@19PosNrmMtxArrayStateCFUl@m" +"@LOCAL@GetViewNrmMtxPtr__Q54nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@19PosNrmMtxArrayStateCFUl@m": + .skip 0xA0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@13345" +"@13345": + + .4byte 0xFFFFFFFF + +.global "pG3DStateIndMtxOp__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"pG3DStateIndMtxOp__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + + .4byte "IndMtxOpDefault__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global "sIsGXCullModeInversed__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"sIsGXCullModeInversed__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0x4 + +.global "sSyncGX__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"sSyncGX__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0x4 + +.global "sCurrMtx__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"sCurrMtx__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0x4 + +.global "sPostTexMtx__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"sPostTexMtx__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0x4 + +.global "sTev__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"sTev__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0x4 + +.global "@GUARD@GetViewNrmMtxPtr__Q54nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@19PosNrmMtxArrayStateCFUl@m" +"@GUARD@GetViewNrmMtxPtr__Q54nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@19PosNrmMtxArrayStateCFUl@m": + .skip 0x4 + +.global "sMisc__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" +"sMisc__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": + .skip 0x8 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global cm2hw__Q34nw4r3g3d4fifo_8055EFD0 +cm2hw__Q34nw4r3g3d4fifo_8055EFD0: + + .4byte 0x00020103 + +.global "@15665" +"@15665": + + .4byte 0 + +.global "@15666" +"@15666": + + .4byte 0xBF800000 + +.global "@15667" +"@15667": + + .4byte 0x358637BD + +.global "@15668" +"@15668": + + .4byte 0x3F800000 + +.global "@16488" +"@16488": + + .4byte 0x3F000000 + +.global "@16489" +"@16489": + + .4byte 0x3B808081 + .4byte 0 + +.global "@16494" +"@16494": + + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_g3d/g3d_state_8040627c.s b/asm/libnw4r_g3d/g3d_state_8040627c.s deleted file mode 100644 index ad7cd275..00000000 --- a/asm/libnw4r_g3d/g3d_state_8040627c.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1g3d_state_cpp" diff --git a/asm/libnw4r_g3d/g3d_state_80408d88.s b/asm/libnw4r_g3d/g3d_state_80408d88.s deleted file mode 100644 index abcde796..00000000 --- a/asm/libnw4r_g3d/g3d_state_80408d88.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global "@LOCAL@EnvironmentMapping__Q44nw4r3g3d6detail19ScnDependentMtxFuncFPQ34nw4r4math5MTX34ScSc@envMtx" -"@LOCAL@EnvironmentMapping__Q44nw4r3g3d6detail19ScnDependentMtxFuncFPQ34nw4r4math5MTX34ScSc@envMtx": - - .4byte 0x3F000000 - .4byte 0 - .4byte 0 - .4byte 0x3F000000 - .4byte 0 - .4byte 0xBF000000 - .4byte 0 - .4byte 0x3F000000 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x3F800000 diff --git a/asm/libnw4r_g3d/g3d_state_80440f50.s b/asm/libnw4r_g3d/g3d_state_80440f50.s deleted file mode 100644 index b72e2741..00000000 --- a/asm/libnw4r_g3d/g3d_state_80440f50.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q44nw4r3g3d8G3DState11IndMtxOpStd -__vt__Q44nw4r3g3d8G3DState11IndMtxOpStd: - - .4byte 0 - .4byte 0 - .4byte __cl__Q44nw4r3g3d8G3DState11IndMtxOpStdFPQ44nw4r3g3d8G3DState13IndTexMtxInfo - .4byte __dt__Q44nw4r3g3d8G3DState11IndMtxOpStdFv - .4byte Reset__Q44nw4r3g3d8G3DState11IndMtxOpStdFv - .4byte SetNrmMapMtx__Q44nw4r3g3d8G3DState11IndMtxOpStdF14_GXIndTexMtxIDPCQ34nw4r4math4VEC3PCQ34nw4r4math5MTX34Q44nw4r3g3d14ResMatMiscData14IndirectMethod diff --git a/asm/libnw4r_g3d/g3d_state_8050aee0.s b/asm/libnw4r_g3d/g3d_state_8050aee0.s deleted file mode 100644 index 48060ac2..00000000 --- a/asm/libnw4r_g3d/g3d_state_8050aee0.s +++ /dev/null @@ -1,58 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global "sGenMode2__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"sGenMode2__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0xC - -.global "sTexCoordScale__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"sTexCoordScale__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0x74 - -.global "sTex__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"sTex__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0x120 - -.global "sTlut__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"sTlut__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0x70 - -.global "sPreTexMtxState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"sPreTexMtxState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0x20 - -.global "sPosNrmArrayState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"sPosNrmArrayState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0x10 - -.global "sScnDependentTexMtxFuncTable__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"sScnDependentTexMtxFuncTable__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0x800 - -.global "sFogState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"sFogState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0x608 - -.global "sLightState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"sLightState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0x2A2C - -.global "sCameraMtxState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"sCameraMtxState__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0x16AC - -.global lbl_80510000 -lbl_80510000: - .skip 0x388 - -.global "sRenderMode__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"sRenderMode__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0x40 - -.global "IndMtxOpDefault__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"IndMtxOpDefault__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0x98 - -.global "@LOCAL@GetViewNrmMtxPtr__Q54nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@19PosNrmMtxArrayStateCFUl@m" -"@LOCAL@GetViewNrmMtxPtr__Q54nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@19PosNrmMtxArrayStateCFUl@m": - .skip 0xA0 diff --git a/asm/libnw4r_g3d/g3d_state_805569f8.s b/asm/libnw4r_g3d/g3d_state_805569f8.s deleted file mode 100644 index 0675c6fe..00000000 --- a/asm/libnw4r_g3d/g3d_state_805569f8.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@13345" -"@13345": - - .4byte 0xFFFFFFFF - -.global "pG3DStateIndMtxOp__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"pG3DStateIndMtxOp__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - - .4byte "IndMtxOpDefault__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" diff --git a/asm/libnw4r_g3d/g3d_state_8055cf78.s b/asm/libnw4r_g3d/g3d_state_8055cf78.s deleted file mode 100644 index 83e1cf42..00000000 --- a/asm/libnw4r_g3d/g3d_state_8055cf78.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global "sIsGXCullModeInversed__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"sIsGXCullModeInversed__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0x4 - -.global "sSyncGX__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"sSyncGX__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0x4 - -.global "sCurrMtx__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"sCurrMtx__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0x4 - -.global "sPostTexMtx__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"sPostTexMtx__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0x4 - -.global "sTev__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"sTev__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0x4 - -.global "@GUARD@GetViewNrmMtxPtr__Q54nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@19PosNrmMtxArrayStateCFUl@m" -"@GUARD@GetViewNrmMtxPtr__Q54nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@19PosNrmMtxArrayStateCFUl@m": - .skip 0x4 - -.global "sMisc__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@" -"sMisc__Q44nw4r3g3d8G3DState23@unnamed@g3d_state_cpp@": - .skip 0x8 diff --git a/asm/libnw4r_g3d/g3d_state_8055efd0.s b/asm/libnw4r_g3d/g3d_state_8055efd0.s deleted file mode 100644 index db1203f0..00000000 --- a/asm/libnw4r_g3d/g3d_state_8055efd0.s +++ /dev/null @@ -1,44 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global cm2hw__Q34nw4r3g3d4fifo_8055EFD0 -cm2hw__Q34nw4r3g3d4fifo_8055EFD0: - - .4byte 0x00020103 - -.global "@15665" -"@15665": - - .4byte 0 - -.global "@15666" -"@15666": - - .4byte 0xBF800000 - -.global "@15667" -"@15667": - - .4byte 0x358637BD - -.global "@15668" -"@15668": - - .4byte 0x3F800000 - -.global "@16488" -"@16488": - - .4byte 0x3F000000 - -.global "@16489" -"@16489": - - .4byte 0x3B808081 - .4byte 0 - -.global "@16494" -"@16494": - - .4byte 0x43300000 - .4byte 0x80000000 diff --git a/asm/libnw4r_g3d/g3d_tmem_800dc470.s b/asm/libnw4r_g3d/g3d_tmem.s similarity index 62% rename from asm/libnw4r_g3d/g3d_tmem_800dc470.s rename to asm/libnw4r_g3d/g3d_tmem.s index 096a7fb1..6a7358ec 100644 --- a/asm/libnw4r_g3d/g3d_tmem_800dc470.s +++ b/asm/libnw4r_g3d/g3d_tmem.s @@ -249,3 +249,521 @@ lbl_800DC7B8: /* 800DC7C4 000D8604 7C 08 03 A6 */ mtlr r0 /* 800DC7C8 000D8608 38 21 00 30 */ addi r1, r1, 0x30 /* 800DC7CC 000D860C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global scaaaTexRegionAddr +scaaaTexRegionAddr: + + .4byte 0 + .4byte 0x00040000 + .4byte 0x00050000 + .4byte 0x00060000 + .4byte 0x00070000 + .4byte 0x00030000 + .4byte 0x00020000 + .4byte 0x00010000 + .4byte 0 + .4byte 0x000B0000 + .4byte 0x00050000 + .4byte 0x00090000 + .4byte 0x00070000 + .4byte 0x000B0000 + .4byte 0x00020000 + .4byte 0x00090000 + .4byte 0x00080000 + .4byte 0x00040000 + .4byte 0x000A0000 + .4byte 0x00060000 + .4byte 0x00080000 + .4byte 0x00030000 + .4byte 0x000A0000 + .4byte 0x00010000 + .4byte 0 + .4byte 0x00040000 + .4byte 0x00050000 + .4byte 0x00060000 + .4byte 0x00070000 + .4byte 0x00030000 + .4byte 0x00020000 + .4byte 0x00010000 + .4byte 0 + .4byte 0x00040000 + .4byte 0x00050000 + .4byte 0x00060000 + .4byte 0x00070000 + .4byte 0x00030000 + .4byte 0x00020000 + .4byte 0x00010000 + .4byte 0x00020000 + .4byte 0x00048000 + .4byte 0x00058000 + .4byte 0x00068000 + .4byte 0x00078000 + .4byte 0x00038000 + .4byte 0x00028000 + .4byte 0x00018000 + .4byte 0 + .4byte 0x000B0000 + .4byte 0x00050000 + .4byte 0x00090000 + .4byte 0x00070000 + .4byte 0x000B0000 + .4byte 0x00020000 + .4byte 0x00090000 + .4byte 0x00080000 + .4byte 0x00040000 + .4byte 0x000A0000 + .4byte 0x00060000 + .4byte 0x00080000 + .4byte 0x00030000 + .4byte 0x000A0000 + .4byte 0x00010000 + .4byte 0 + .4byte 0x000B0000 + .4byte 0x00050000 + .4byte 0x00090000 + .4byte 0x00070000 + .4byte 0x000B0000 + .4byte 0x00020000 + .4byte 0x00090000 + .4byte 0x00080000 + .4byte 0x00040000 + .4byte 0x000A0000 + .4byte 0x00060000 + .4byte 0x00080000 + .4byte 0x00030000 + .4byte 0x000A0000 + .4byte 0x00010000 + .4byte 0 + .4byte 0x00040000 + .4byte 0x00050000 + .4byte 0x00060000 + .4byte 0x00070000 + .4byte 0x00078000 + .4byte 0x00068000 + .4byte 0x00058000 + .4byte 0 + .4byte 0x000C0000 + .4byte 0x00050000 + .4byte 0x000E0000 + .4byte 0x00070000 + .4byte 0x000D8000 + .4byte 0x00068000 + .4byte 0x000B8000 + .4byte 0x00080000 + .4byte 0x00040000 + .4byte 0x000A0000 + .4byte 0x00060000 + .4byte 0x00080000 + .4byte 0x00030000 + .4byte 0x000A0000 + .4byte 0x00010000 + .4byte 0 + .4byte 0x00040000 + .4byte 0x00050000 + .4byte 0x00060000 + .4byte 0x00070000 + .4byte 0x00078000 + .4byte 0x00068000 + .4byte 0x00058000 + .4byte 0 + .4byte 0x00040000 + .4byte 0x00050000 + .4byte 0x00060000 + .4byte 0x00070000 + .4byte 0x00070000 + .4byte 0x00060000 + .4byte 0x00050000 + .4byte 0x00020000 + .4byte 0x00048000 + .4byte 0x00058000 + .4byte 0x00068000 + .4byte 0x00078000 + .4byte 0x00078000 + .4byte 0x00068000 + .4byte 0x00058000 + .4byte 0 + .4byte 0x000C0000 + .4byte 0x00050000 + .4byte 0x000E0000 + .4byte 0x00070000 + .4byte 0x000D8000 + .4byte 0x00068000 + .4byte 0x000B8000 + .4byte 0x00080000 + .4byte 0x00040000 + .4byte 0x000D0000 + .4byte 0x00060000 + .4byte 0x000E8000 + .4byte 0x00078000 + .4byte 0x000C8000 + .4byte 0x00058000 + .4byte 0 + .4byte 0x000C0000 + .4byte 0x00050000 + .4byte 0x000E0000 + .4byte 0x00070000 + .4byte 0x000D0000 + .4byte 0x00060000 + .4byte 0x000B0000 + .4byte 0x00080000 + .4byte 0x00040000 + .4byte 0x000D0000 + .4byte 0x00060000 + .4byte 0x000E0000 + .4byte 0x00070000 + .4byte 0x000C0000 + .4byte 0x00050000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00080000 + .4byte 0x000C0000 + .4byte 0x000C8000 + .4byte 0x000D0000 + .4byte 0x000D0000 + .4byte 0x000C8000 + .4byte 0x000C0000 + .4byte 0x000B0000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00080000 + .4byte 0x000C0000 + .4byte 0x000C8000 + .4byte 0x000D0000 + .4byte 0x000D0000 + .4byte 0x000C8000 + .4byte 0x000C0000 + .4byte 0x000B0000 + .4byte 0 + .4byte 0x00040000 + .4byte 0x00040000 + .4byte 0x00040000 + .4byte 0x00040000 + .4byte 0x00040000 + .4byte 0x00040000 + .4byte 0 + .4byte 0x00080000 + .4byte 0x000C0000 + .4byte 0x000D0000 + .4byte 0x000E0000 + .4byte 0x000E0000 + .4byte 0x000D0000 + .4byte 0x000C0000 + .4byte 0x000B0000 + +.global scaaaTexRegionSize +scaaaTexRegionSize: + + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000002 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0x00000001 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global saaTexRegion +saaTexRegion: + .skip 0x300 + +.global saaTlutRegion +saaTlutRegion: + .skip 0x148 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global sTMemCachePlan +sTMemCachePlan: + .skip 0x4 + +.global sTlutRegionNum +sTlutRegionNum: + .skip 0x4 + +.global sfpDefaultTexRegionCallback +sfpDefaultTexRegionCallback: + .skip 0x4 + +.global sfpDefaultTlutRegionCallback +sfpDefaultTlutRegionCallback: + .skip 0x4 diff --git a/asm/libnw4r_g3d/g3d_tmem_80408608.s b/asm/libnw4r_g3d/g3d_tmem_80408608.s deleted file mode 100644 index 88e84097..00000000 --- a/asm/libnw4r_g3d/g3d_tmem_80408608.s +++ /dev/null @@ -1,490 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global scaaaTexRegionAddr -scaaaTexRegionAddr: - - .4byte 0 - .4byte 0x00040000 - .4byte 0x00050000 - .4byte 0x00060000 - .4byte 0x00070000 - .4byte 0x00030000 - .4byte 0x00020000 - .4byte 0x00010000 - .4byte 0 - .4byte 0x000B0000 - .4byte 0x00050000 - .4byte 0x00090000 - .4byte 0x00070000 - .4byte 0x000B0000 - .4byte 0x00020000 - .4byte 0x00090000 - .4byte 0x00080000 - .4byte 0x00040000 - .4byte 0x000A0000 - .4byte 0x00060000 - .4byte 0x00080000 - .4byte 0x00030000 - .4byte 0x000A0000 - .4byte 0x00010000 - .4byte 0 - .4byte 0x00040000 - .4byte 0x00050000 - .4byte 0x00060000 - .4byte 0x00070000 - .4byte 0x00030000 - .4byte 0x00020000 - .4byte 0x00010000 - .4byte 0 - .4byte 0x00040000 - .4byte 0x00050000 - .4byte 0x00060000 - .4byte 0x00070000 - .4byte 0x00030000 - .4byte 0x00020000 - .4byte 0x00010000 - .4byte 0x00020000 - .4byte 0x00048000 - .4byte 0x00058000 - .4byte 0x00068000 - .4byte 0x00078000 - .4byte 0x00038000 - .4byte 0x00028000 - .4byte 0x00018000 - .4byte 0 - .4byte 0x000B0000 - .4byte 0x00050000 - .4byte 0x00090000 - .4byte 0x00070000 - .4byte 0x000B0000 - .4byte 0x00020000 - .4byte 0x00090000 - .4byte 0x00080000 - .4byte 0x00040000 - .4byte 0x000A0000 - .4byte 0x00060000 - .4byte 0x00080000 - .4byte 0x00030000 - .4byte 0x000A0000 - .4byte 0x00010000 - .4byte 0 - .4byte 0x000B0000 - .4byte 0x00050000 - .4byte 0x00090000 - .4byte 0x00070000 - .4byte 0x000B0000 - .4byte 0x00020000 - .4byte 0x00090000 - .4byte 0x00080000 - .4byte 0x00040000 - .4byte 0x000A0000 - .4byte 0x00060000 - .4byte 0x00080000 - .4byte 0x00030000 - .4byte 0x000A0000 - .4byte 0x00010000 - .4byte 0 - .4byte 0x00040000 - .4byte 0x00050000 - .4byte 0x00060000 - .4byte 0x00070000 - .4byte 0x00078000 - .4byte 0x00068000 - .4byte 0x00058000 - .4byte 0 - .4byte 0x000C0000 - .4byte 0x00050000 - .4byte 0x000E0000 - .4byte 0x00070000 - .4byte 0x000D8000 - .4byte 0x00068000 - .4byte 0x000B8000 - .4byte 0x00080000 - .4byte 0x00040000 - .4byte 0x000A0000 - .4byte 0x00060000 - .4byte 0x00080000 - .4byte 0x00030000 - .4byte 0x000A0000 - .4byte 0x00010000 - .4byte 0 - .4byte 0x00040000 - .4byte 0x00050000 - .4byte 0x00060000 - .4byte 0x00070000 - .4byte 0x00078000 - .4byte 0x00068000 - .4byte 0x00058000 - .4byte 0 - .4byte 0x00040000 - .4byte 0x00050000 - .4byte 0x00060000 - .4byte 0x00070000 - .4byte 0x00070000 - .4byte 0x00060000 - .4byte 0x00050000 - .4byte 0x00020000 - .4byte 0x00048000 - .4byte 0x00058000 - .4byte 0x00068000 - .4byte 0x00078000 - .4byte 0x00078000 - .4byte 0x00068000 - .4byte 0x00058000 - .4byte 0 - .4byte 0x000C0000 - .4byte 0x00050000 - .4byte 0x000E0000 - .4byte 0x00070000 - .4byte 0x000D8000 - .4byte 0x00068000 - .4byte 0x000B8000 - .4byte 0x00080000 - .4byte 0x00040000 - .4byte 0x000D0000 - .4byte 0x00060000 - .4byte 0x000E8000 - .4byte 0x00078000 - .4byte 0x000C8000 - .4byte 0x00058000 - .4byte 0 - .4byte 0x000C0000 - .4byte 0x00050000 - .4byte 0x000E0000 - .4byte 0x00070000 - .4byte 0x000D0000 - .4byte 0x00060000 - .4byte 0x000B0000 - .4byte 0x00080000 - .4byte 0x00040000 - .4byte 0x000D0000 - .4byte 0x00060000 - .4byte 0x000E0000 - .4byte 0x00070000 - .4byte 0x000C0000 - .4byte 0x00050000 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00080000 - .4byte 0x000C0000 - .4byte 0x000C8000 - .4byte 0x000D0000 - .4byte 0x000D0000 - .4byte 0x000C8000 - .4byte 0x000C0000 - .4byte 0x000B0000 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00080000 - .4byte 0x000C0000 - .4byte 0x000C8000 - .4byte 0x000D0000 - .4byte 0x000D0000 - .4byte 0x000C8000 - .4byte 0x000C0000 - .4byte 0x000B0000 - .4byte 0 - .4byte 0x00040000 - .4byte 0x00040000 - .4byte 0x00040000 - .4byte 0x00040000 - .4byte 0x00040000 - .4byte 0x00040000 - .4byte 0 - .4byte 0x00080000 - .4byte 0x000C0000 - .4byte 0x000D0000 - .4byte 0x000E0000 - .4byte 0x000E0000 - .4byte 0x000D0000 - .4byte 0x000C0000 - .4byte 0x000B0000 - -.global scaaaTexRegionSize -scaaaTexRegionSize: - - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000002 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0x00000001 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_tmem_8050aa98.s b/asm/libnw4r_g3d/g3d_tmem_8050aa98.s deleted file mode 100644 index a6d87af7..00000000 --- a/asm/libnw4r_g3d/g3d_tmem_8050aa98.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global saaTexRegion -saaTexRegion: - .skip 0x300 - -.global saaTlutRegion -saaTlutRegion: - .skip 0x148 diff --git a/asm/libnw4r_g3d/g3d_tmem_8055cf68.s b/asm/libnw4r_g3d/g3d_tmem_8055cf68.s deleted file mode 100644 index 502f28ce..00000000 --- a/asm/libnw4r_g3d/g3d_tmem_8055cf68.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global sTMemCachePlan -sTMemCachePlan: - .skip 0x4 - -.global sTlutRegionNum -sTlutRegionNum: - .skip 0x4 - -.global sfpDefaultTexRegionCallback -sfpDefaultTexRegionCallback: - .skip 0x4 - -.global sfpDefaultTlutRegionCallback -sfpDefaultTlutRegionCallback: - .skip 0x4 diff --git a/asm/libnw4r_g3d/g3d_transform_800d3570.s b/asm/libnw4r_g3d/g3d_transform.s similarity index 98% rename from asm/libnw4r_g3d/g3d_transform_800d3570.s rename to asm/libnw4r_g3d/g3d_transform.s index aed9dc42..d086cf39 100644 --- a/asm/libnw4r_g3d/g3d_transform_800d3570.s +++ b/asm/libnw4r_g3d/g3d_transform.s @@ -211,3 +211,11 @@ lbl_800D37E8: /* 800D3874 000CF6B4 00 00 00 00 */ .4byte 0x00000000 /* 800D3878 000CF6B8 00 00 00 00 */ .4byte 0x00000000 /* 800D387C 000CF6BC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global det_epsilon__Q34nw4r3g3d6detail +det_epsilon__Q34nw4r3g3d6detail: + + .4byte 0x03AA2425 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_transform_8055ef08.s b/asm/libnw4r_g3d/g3d_transform_8055ef08.s deleted file mode 100644 index 6c8e9b99..00000000 --- a/asm/libnw4r_g3d/g3d_transform_8055ef08.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global det_epsilon__Q34nw4r3g3d6detail -det_epsilon__Q34nw4r3g3d6detail: - - .4byte 0x03AA2425 - .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_workmem_800e3150.s b/asm/libnw4r_g3d/g3d_workmem.s similarity index 84% rename from asm/libnw4r_g3d/g3d_workmem_800e3150.s rename to asm/libnw4r_g3d/g3d_workmem.s index eb1ae1cf..d810eebd 100644 --- a/asm/libnw4r_g3d/g3d_workmem_800e3150.s +++ b/asm/libnw4r_g3d/g3d_workmem.s @@ -13,3 +13,9 @@ GetMtxIDTemporary__Q44nw4r3g3d6detail7workmemFv: /* 800E3164 000DEFA4 38 63 05 00 */ addi r3, r3, lbl_80510500@l /* 800E3168 000DEFA8 38 63 60 00 */ addi r3, r3, 0x6000 /* 800E316C 000DEFAC 4E 80 00 20 */ blr +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global lbl_80510500 +lbl_80510500: + .skip 0x18000 diff --git a/asm/libnw4r_g3d/g3d_workmem_80510500.s b/asm/libnw4r_g3d/g3d_workmem_80510500.s deleted file mode 100644 index d7a3e965..00000000 --- a/asm/libnw4r_g3d/g3d_workmem_80510500.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global lbl_80510500 -lbl_80510500: - .skip 0x18000 diff --git a/asm/libnw4r_g3d/g3d_xsi_800e79f0.s b/asm/libnw4r_g3d/g3d_xsi.s similarity index 95% rename from asm/libnw4r_g3d/g3d_xsi_800e79f0.s rename to asm/libnw4r_g3d/g3d_xsi.s index 9e0da7e4..2ddea489 100644 --- a/asm/libnw4r_g3d/g3d_xsi_800e79f0.s +++ b/asm/libnw4r_g3d/g3d_xsi.s @@ -848,3 +848,45 @@ lbl_800E85EC: /* 800E8604 000E4444 00 00 00 00 */ .4byte 0x00000000 /* 800E8608 000E4448 00 00 00 00 */ .4byte 0x00000000 /* 800E860C 000E444C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global "@LOCAL@CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable" +"@LOCAL@CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable": + + .4byte "MakeTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_T__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_R__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + +.global "@LOCAL@CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable@0" +"@LOCAL@CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable@0": + + .4byte "ProductTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_T__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_R__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" + .4byte "ProductTexSrtMtx_S__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@7161" +"@7161": + + .4byte 0 + +.global "@7162" +"@7162": + + .4byte 0x3F800000 + +.global "@7166" +"@7166": + + .4byte 0x3F360B61 + .4byte 0 diff --git a/asm/libnw4r_g3d/g3d_xsi_80408e20.s b/asm/libnw4r_g3d/g3d_xsi_80408e20.s deleted file mode 100644 index 4ce5a7a9..00000000 --- a/asm/libnw4r_g3d/g3d_xsi_80408e20.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global "@LOCAL@CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable" -"@LOCAL@CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable": - - .4byte "MakeTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_T__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_R__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "MakeTexSrtMtx_S__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - -.global "@LOCAL@CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable@0" -"@LOCAL@CalcTexMtx_Xsi__Q44nw4r3g3d6detail3dccFPQ34nw4r4math5MTX34bRCQ34nw4r3g3d6TexSrtQ44nw4r3g3d6TexSrt4Flag@funcTable@0": - - .4byte "ProductTexSrtMtx_SRT__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_RT__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_ST__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_T__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_SR__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_R__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" - .4byte "ProductTexSrtMtx_S__Q54nw4r3g3d6detail3dcc21@unnamed@g3d_xsi_cpp@FPQ34nw4r4math5MTX34RCQ34nw4r3g3d6TexSrt" diff --git a/asm/libnw4r_g3d/g3d_xsi_8055f098.s b/asm/libnw4r_g3d/g3d_xsi_8055f098.s deleted file mode 100644 index c18c7bd2..00000000 --- a/asm/libnw4r_g3d/g3d_xsi_8055f098.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@7161" -"@7161": - - .4byte 0 - -.global "@7162" -"@7162": - - .4byte 0x3F800000 - -.global "@7166" -"@7166": - - .4byte 0x3F360B61 - .4byte 0 diff --git a/obj_files.mk b/obj_files.mk index 1d70cf67..435af51a 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -368,66 +368,67 @@ $(BUILD_DIR)/asm/libnw4r_ef/ef_drawpointstrategy.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_drawstripestrategy.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_drawsmoothstripestrategy.o \ \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_rescommon.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resdict.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resfile.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resmdl.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resshp.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_restev.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resmat.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resvtx.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_restex.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resnode.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanm.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmvis.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmclr.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmtexpat.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmtexsrt.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmchr.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_reslightset.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmamblight.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmlight.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmfog.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmcamera.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmscn.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmshp.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_transform.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmvis.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmclr.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmtexpat.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmtexsrt.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmchr.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmshp.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmscn.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_obj.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmobj.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_gpu.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_tmem.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_cpu.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_state.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_draw1mat1shp.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_calcview.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_dcc.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_workmem.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_calcworld.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_draw.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_camera.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_basic.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_maya.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_xsi.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_3dsmax.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnobj.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnroot.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnmdlsmpl.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnmdl.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnmdlexpand.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_calcmaterial.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_init.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_fog.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_light.o \ +$(BUILD_DIR)/asm/libnw4r_g3d/g3d_calcvtx.o \ +\ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_rescommon_800c8ae0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resdict_800c8c50.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resfile_800c8f70.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resmdl_800ca6f0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resshp_800cb800.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_restev_800cc0d0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resmat_800ccd10.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resvtx_800ce3f0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_restex_800ce610.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resnode_800ce7f0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanm_800cf440.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmvis_800cf6b0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmclr_800cf7d0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmtexpat_800cf940.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmtexsrt_800cfeb0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmchr_800d02d0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_reslightset_800d1f40.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmamblight_800d20b0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmlight_800d2180.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmfog_800d2570.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmcamera_800d26d0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmscn_800d29e0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmshp_800d3400.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_transform_800d3570.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmvis_800d3880.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmclr_800d4a90.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmtexpat_800d6140.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmtexsrt_800d7000.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmchr_800d7e20.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmshp_800d9740.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmscn_800da7f0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_obj_800dbd10.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmobj_800dbe80.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_gpu_800dbf50.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_tmem_800dc470.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_cpu_800dc7d0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_state_800dca10.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_draw1mat1shp_800e0070.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_calcview_800e0dc0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_dcc_800e3060.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_workmem_800e3150.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_calcworld_800e3170.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_draw_800e3c50.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_camera_800e5af0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_basic_800e6a10.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_maya_800e6ce0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_xsi_800e79f0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_3dsmax_800e8610.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnobj_800e9110.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnroot_800ea930.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnmdlsmpl_800ec3a0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnmdl_800ee240.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnmdlexpand_800f0ab0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_calcmaterial_800f1470.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_init_800f16b0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_fog_800f17a0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_light_800f1900.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_calcvtx_800f2410.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_pane_800f2ba0.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_group_800f3af0.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_layout_800f3e50.o \ @@ -2913,7 +2914,6 @@ $(BUILD_DIR)/asm/src/SIntAABBox_80405b68.o \ $(BUILD_DIR)/asm/src/StateChanger_80405cd0.o \ $(BUILD_DIR)/asm/src/Thread_80405f14.o \ $(BUILD_DIR)/asm/src/UIntAABBox_8040603c.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_state_8040627c.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_pane_80406280.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_picture_80406284.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_textBox_80406288.o \ @@ -3014,29 +3014,6 @@ $(BUILD_DIR)/asm/src/MintSERequestor_80406524.o \ $(BUILD_DIR)/asm/src/Alarm_80406528.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_8040652c.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80406548.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_restev_80408320.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmchr_80408380.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmvis_804083a0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmclr_804083f0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmtexpat_80408458.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmtexsrt_804084c0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmchr_80408528.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmshp_80408578.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmscn_804085c8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_obj_804085e8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmobj_804085f8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_tmem_80408608.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_state_80408d88.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_draw1mat1shp_80408db8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_calcview_80408dc8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_maya_80408de8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_xsi_80408e20.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_3dsmax_80408e58.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnobj_80408e90.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnroot_80408ec0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnmdlsmpl_80408ed0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnmdl_80408ee8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnmdlexpand_80408ef8.o \ $(BUILD_DIR)/asm/libnw4r_math/math_triangular_80408f10.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_BiquadFilterPreset_80409f20.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_EnvGenerator_8040b358.o \ @@ -3223,25 +3200,6 @@ $(BUILD_DIR)/asm/src/BgManager_80420bf0.o \ $(BUILD_DIR)/asm/src/StaffRoll_80420d08.o \ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \ $(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resfile_804404e0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_restev_80440640.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmscn_80440660.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmvis_80440700.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmclr_80440810.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmtexpat_80440930.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmtexsrt_80440a50.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmchr_80440b70.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmshp_80440cd0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmscn_80440e10.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_obj_80440f30.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_state_80440f50.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_calcworld_80440f68.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnobj_80440f78.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnroot_80441040.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnmdlsmpl_804410b0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnmdl_80441108.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnmdlexpand_80441150.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_init_80441190.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_pane_804411d8.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_group_80441258.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_layout_80441268.o \ @@ -4932,9 +4890,6 @@ $(BUILD_DIR)/asm/src/WaveHandle_804966b8.o \ $(BUILD_DIR)/asm/src/StorageUtil_804966d0.o \ $(BUILD_DIR)/asm/src/Alarm_804966e0.o \ $(BUILD_DIR)/asm/src/StateChanger_804966f0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_tmem_8050aa98.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_state_8050aee0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_workmem_80510500.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_common_80528500.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_AxManager_80528520.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_AxVoiceManager_80528930.o \ @@ -5027,16 +4982,6 @@ $(BUILD_DIR)/asm/src/ScoreCoin_80554888.o \ $(BUILD_DIR)/asm/src/EffectLocatorModelDesc_805549b8.o \ $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \ $(BUILD_DIR)/asm/src/Table_80556398.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resmdl_805569d8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmvis_805569e8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmobj_805569f0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_state_805569f8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_calcworld_80556a00.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_draw_80556a08.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnroot_80556a10.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnmdlsmpl_80556a20.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnmdlexpand_80556a38.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_init_80556a40.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_textBox_80556a48.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_arcResourceAccessor_80556a50.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_MmlParser_80556a58.o \ @@ -5427,9 +5372,6 @@ $(BUILD_DIR)/asm/src/StepMain_8055c688.o \ $(BUILD_DIR)/asm/src/CinemaScopeModel_8055c6a0.o \ $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \ $(BUILD_DIR)/asm/src/Wipe_8055c6c0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_tmem_8055cf68.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_state_8055cf78.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnobj_8055cf98.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_pane_8055cfa0.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_layout_8055cfa8.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_picture_8055cfb0.o \ @@ -5606,44 +5548,6 @@ $(BUILD_DIR)/asm/src/SequenceProductRoot_8055df48.o \ $(BUILD_DIR)/asm/src/MintSERequestor_8055df58.o \ $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \ $(BUILD_DIR)/asm/src/Alarm_8055df68.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resmat_8055ee28.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resnode_8055ee60.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanm_8055ee70.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmvis_8055ee88.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmclr_8055ee98.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmtexsrt_8055eea8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmchr_8055eeb0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmamblight_8055eed0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmlight_8055eee0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmfog_8055eef0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_resanmshp_8055ef00.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_transform_8055ef08.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmvis_8055ef10.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmclr_8055ef20.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmtexpat_8055ef30.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmtexsrt_8055ef40.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmchr_8055ef60.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmshp_8055ef78.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmscn_8055ef88.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_anmobj_8055efa8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_gpu_8055efb0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_cpu_8055efc8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_state_8055efd0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_draw1mat1shp_8055eff8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_calcview_8055f018.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_calcworld_8055f028.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_draw_8055f030.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_camera_8055f040.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_basic_8055f070.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_maya_8055f080.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_xsi_8055f098.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_3dsmax_8055f0a8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnobj_8055f0c0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnroot_8055f0c8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_scnmdlsmpl_8055f0d0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_fog_8055f0d8.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_light_8055f0e0.o \ -$(BUILD_DIR)/asm/libnw4r_g3d/g3d_calcvtx_8055f110.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_pane_8055f118.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_layout_8055f138.o \ $(BUILD_DIR)/asm/libnw4r_lyt/lyt_picture_8055f140.o \