From 53ddb5ad04abdfc6525a3886923365e0f82612e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Mon, 17 Oct 2022 09:46:26 +0100 Subject: [PATCH] merge libnw4r_ef --- ...ef_animcurve_800a6ef0.s => ef_animcurve.s} | 198 ++++++++++++++++++ asm/libnw4r_ef/ef_animcurve_80440108.s | 138 ------------ asm/libnw4r_ef/ef_animcurve_8055e9b8.s | 60 ------ ...ionqueue_800b4690.s => ef_creationqueue.s} | 0 .../{ef_cube_800b6dd0.s => ef_cube.s} | 74 +++++++ asm/libnw4r_ef/ef_cube_804403d8.s | 10 - asm/libnw4r_ef/ef_cube_8055ecb0.s | 64 ------ .../{ef_cylinder_800b5fe0.s => ef_cylinder.s} | 86 ++++++++ asm/libnw4r_ef/ef_cylinder_804403b8.s | 10 - asm/libnw4r_ef/ef_cylinder_8055ec20.s | 76 ------- .../{ef_disc_800b5240.s => ef_disc.s} | 82 ++++++++ asm/libnw4r_ef/ef_disc_80440398.s | 10 - asm/libnw4r_ef/ef_disc_8055eb88.s | 72 ------- ..._800bab50.s => ef_drawbillboardstrategy.s} | 74 +++++++ .../ef_drawbillboardstrategy_80440410.s | 14 -- .../ef_drawbillboardstrategy_80556980.s | 14 -- .../ef_drawbillboardstrategy_8055ed18.s | 46 ---- ...00bccc0.s => ef_drawdirectionalstrategy.s} | 106 ++++++++++ .../ef_drawdirectionalstrategy_80408260.s | 34 --- .../ef_drawdirectionalstrategy_80440430.s | 14 -- .../ef_drawdirectionalstrategy_805569a0.s | 14 -- .../ef_drawdirectionalstrategy_8055ed48.s | 44 ---- ...ategy_800bf0a0.s => ef_drawfreestrategy.s} | 94 +++++++++ asm/libnw4r_ef/ef_drawfreestrategy_804082c0.s | 34 --- asm/libnw4r_ef/ef_drawfreestrategy_80440450.s | 12 -- asm/libnw4r_ef/ef_drawfreestrategy_805569c0.s | 8 - asm/libnw4r_ef/ef_drawfreestrategy_8055ed70.s | 40 ---- ...ategy_800bf960.s => ef_drawlinestrategy.s} | 42 ++++ asm/libnw4r_ef/ef_drawlinestrategy_80440468.s | 12 -- asm/libnw4r_ef/ef_drawlinestrategy_805569c8.s | 8 - asm/libnw4r_ef/ef_drawlinestrategy_8055ed98.s | 22 -- ...ef_draworder_800a3950.s => ef_draworder.s} | 12 ++ asm/libnw4r_ef/ef_draworder_80440060.s | 12 -- ...tegy_800bff60.s => ef_drawpointstrategy.s} | 38 ++++ .../ef_drawpointstrategy_80440480.s | 12 -- .../ef_drawpointstrategy_805569d0.s | 8 - .../ef_drawpointstrategy_8055eda8.s | 18 -- ...0c3a90.s => ef_drawsmoothstripestrategy.s} | 112 ++++++++++ .../ef_drawsmoothstripestrategy_804404b8.s | 16 -- .../ef_drawsmoothstripestrategy_8050aa68.s | 18 -- .../ef_drawsmoothstripestrategy_8055cf60.s | 18 -- .../ef_drawsmoothstripestrategy_8055edf0.s | 60 ------ ...er_800b89b0.s => ef_drawstrategybuilder.s} | 70 +++++++ .../ef_drawstrategybuilder_804403e8.s | 10 - .../ef_drawstrategybuilder_8050a3e8.s | 30 --- .../ef_drawstrategybuilder_8055cf58.s | 30 --- ...yimpl_800b8b50.s => ef_drawstrategyimpl.s} | 80 +++++++ asm/libnw4r_ef/ef_drawstrategyimpl_80406278.s | 4 - asm/libnw4r_ef/ef_drawstrategyimpl_804403f8.s | 12 -- asm/libnw4r_ef/ef_drawstrategyimpl_8050aa08.s | 18 -- asm/libnw4r_ef/ef_drawstrategyimpl_8055ece8.s | 46 ---- ...egy_800c03d0.s => ef_drawstripestrategy.s} | 70 +++++++ .../ef_drawstripestrategy_80440498.s | 14 -- .../ef_drawstripestrategy_8055edb8.s | 56 ----- .../{ef_effect_800a3a70.s => ef_effect.s} | 22 ++ asm/libnw4r_ef/ef_effect_80440078.s | 14 -- asm/libnw4r_ef/ef_effect_8055e970.s | 8 - ...ectsystem_800a4670.s => ef_effectsystem.s} | 88 ++++++++ asm/libnw4r_ef/ef_effectsystem_80406268.s | 4 - asm/libnw4r_ef/ef_effectsystem_80440098.s | 24 --- asm/libnw4r_ef/ef_effectsystem_804fe280.s | 22 -- asm/libnw4r_ef/ef_effectsystem_80556958.s | 8 - asm/libnw4r_ef/ef_effectsystem_8055cf20.s | 18 -- asm/libnw4r_ef/ef_effectsystem_8055e978.s | 12 -- .../{ef_emform_800b4ad0.s => ef_emform.s} | 44 ++++ asm/libnw4r_ef/ef_emform_80406274.s | 4 - asm/libnw4r_ef/ef_emform_80440368.s | 10 - asm/libnw4r_ef/ef_emform_8055cf38.s | 30 --- .../{ef_emitter_800a4d50.s => ef_emitter.s} | 72 +++++++ asm/libnw4r_ef/ef_emitter_804400e0.s | 16 -- asm/libnw4r_ef/ef_emitter_8055e980.s | 56 ----- ...mitterform_800b40f0.s => ef_emitterform.s} | 50 +++++ asm/libnw4r_ef/ef_emitterform_8055eb00.s | 50 ----- .../{ef_handle_800b4030.s => ef_handle.s} | 0 .../{ef_line_800b4f00.s => ef_line.s} | 50 +++++ asm/libnw4r_ef/ef_line_80440388.s | 10 - asm/libnw4r_ef/ef_line_8055eb60.s | 40 ---- .../{ef_particle_800af490.s => ef_particle.s} | 98 +++++++++ asm/libnw4r_ef/ef_particle_80440308.s | 12 -- asm/libnw4r_ef/ef_particle_8055ea28.s | 86 -------- ...anager_800b0260.s => ef_particlemanager.s} | 120 +++++++++++ asm/libnw4r_ef/ef_particlemanager_8040626c.s | 4 - asm/libnw4r_ef/ef_particlemanager_80440320.s | 28 --- asm/libnw4r_ef/ef_particlemanager_8050a398.s | 6 - asm/libnw4r_ef/ef_particlemanager_8055cf30.s | 6 - asm/libnw4r_ef/ef_particlemanager_8055ea78.s | 76 ------- .../{ef_point_800b4bb0.s => ef_point.s} | 64 ++++++ asm/libnw4r_ef/ef_point_80440378.s | 10 - asm/libnw4r_ef/ef_point_8055eb30.s | 54 ----- ...ef_postfield_800abe00.s => ef_postfield.s} | 72 +++++++ asm/libnw4r_ef/ef_postfield_8055e9f0.s | 72 ------- .../{ef_resource_800b2540.s => ef_resource.s} | 10 + asm/libnw4r_ef/ef_resource_80406270.s | 4 - asm/libnw4r_ef/ef_resource_8050a3c8.s | 6 - .../{ef_sphere_800b5780.s => ef_sphere.s} | 92 ++++++++ asm/libnw4r_ef/ef_sphere_804403a8.s | 10 - asm/libnw4r_ef/ef_sphere_8055ebd0.s | 82 -------- .../{ef_torus_800b6790.s => ef_torus.s} | 86 ++++++++ asm/libnw4r_ef/ef_torus_804403c8.s | 10 - asm/libnw4r_ef/ef_torus_8055ec68.s | 76 ------- .../{ef_util_800b30b0.s => ef_util.s} | 88 ++++++++ asm/libnw4r_ef/ef_util_80556960.s | 14 -- asm/libnw4r_ef/ef_util_8055eac0.s | 74 ------- obj_files.mk | 134 +++--------- 104 files changed, 2125 insertions(+), 2197 deletions(-) rename asm/libnw4r_ef/{ef_animcurve_800a6ef0.s => ef_animcurve.s} (98%) delete mode 100644 asm/libnw4r_ef/ef_animcurve_80440108.s delete mode 100644 asm/libnw4r_ef/ef_animcurve_8055e9b8.s rename asm/libnw4r_ef/{ef_creationqueue_800b4690.s => ef_creationqueue.s} (100%) rename asm/libnw4r_ef/{ef_cube_800b6dd0.s => ef_cube.s} (99%) delete mode 100644 asm/libnw4r_ef/ef_cube_804403d8.s delete mode 100644 asm/libnw4r_ef/ef_cube_8055ecb0.s rename asm/libnw4r_ef/{ef_cylinder_800b5fe0.s => ef_cylinder.s} (95%) delete mode 100644 asm/libnw4r_ef/ef_cylinder_804403b8.s delete mode 100644 asm/libnw4r_ef/ef_cylinder_8055ec20.s rename asm/libnw4r_ef/{ef_disc_800b5240.s => ef_disc.s} (94%) delete mode 100644 asm/libnw4r_ef/ef_disc_80440398.s delete mode 100644 asm/libnw4r_ef/ef_disc_8055eb88.s rename asm/libnw4r_ef/{ef_drawbillboardstrategy_800bab50.s => ef_drawbillboardstrategy.s} (98%) delete mode 100644 asm/libnw4r_ef/ef_drawbillboardstrategy_80440410.s delete mode 100644 asm/libnw4r_ef/ef_drawbillboardstrategy_80556980.s delete mode 100644 asm/libnw4r_ef/ef_drawbillboardstrategy_8055ed18.s rename asm/libnw4r_ef/{ef_drawdirectionalstrategy_800bccc0.s => ef_drawdirectionalstrategy.s} (98%) delete mode 100644 asm/libnw4r_ef/ef_drawdirectionalstrategy_80408260.s delete mode 100644 asm/libnw4r_ef/ef_drawdirectionalstrategy_80440430.s delete mode 100644 asm/libnw4r_ef/ef_drawdirectionalstrategy_805569a0.s delete mode 100644 asm/libnw4r_ef/ef_drawdirectionalstrategy_8055ed48.s rename asm/libnw4r_ef/{ef_drawfreestrategy_800bf0a0.s => ef_drawfreestrategy.s} (94%) delete mode 100644 asm/libnw4r_ef/ef_drawfreestrategy_804082c0.s delete mode 100644 asm/libnw4r_ef/ef_drawfreestrategy_80440450.s delete mode 100644 asm/libnw4r_ef/ef_drawfreestrategy_805569c0.s delete mode 100644 asm/libnw4r_ef/ef_drawfreestrategy_8055ed70.s rename asm/libnw4r_ef/{ef_drawlinestrategy_800bf960.s => ef_drawlinestrategy.s} (96%) delete mode 100644 asm/libnw4r_ef/ef_drawlinestrategy_80440468.s delete mode 100644 asm/libnw4r_ef/ef_drawlinestrategy_805569c8.s delete mode 100644 asm/libnw4r_ef/ef_drawlinestrategy_8055ed98.s rename asm/libnw4r_ef/{ef_draworder_800a3950.s => ef_draworder.s} (91%) delete mode 100644 asm/libnw4r_ef/ef_draworder_80440060.s rename asm/libnw4r_ef/{ef_drawpointstrategy_800bff60.s => ef_drawpointstrategy.s} (95%) delete mode 100644 asm/libnw4r_ef/ef_drawpointstrategy_80440480.s delete mode 100644 asm/libnw4r_ef/ef_drawpointstrategy_805569d0.s delete mode 100644 asm/libnw4r_ef/ef_drawpointstrategy_8055eda8.s rename asm/libnw4r_ef/{ef_drawsmoothstripestrategy_800c3a90.s => ef_drawsmoothstripestrategy.s} (98%) delete mode 100644 asm/libnw4r_ef/ef_drawsmoothstripestrategy_804404b8.s delete mode 100644 asm/libnw4r_ef/ef_drawsmoothstripestrategy_8050aa68.s delete mode 100644 asm/libnw4r_ef/ef_drawsmoothstripestrategy_8055cf60.s delete mode 100644 asm/libnw4r_ef/ef_drawsmoothstripestrategy_8055edf0.s rename asm/libnw4r_ef/{ef_drawstrategybuilder_800b89b0.s => ef_drawstrategybuilder.s} (77%) delete mode 100644 asm/libnw4r_ef/ef_drawstrategybuilder_804403e8.s delete mode 100644 asm/libnw4r_ef/ef_drawstrategybuilder_8050a3e8.s delete mode 100644 asm/libnw4r_ef/ef_drawstrategybuilder_8055cf58.s rename asm/libnw4r_ef/{ef_drawstrategyimpl_800b8b50.s => ef_drawstrategyimpl.s} (98%) delete mode 100644 asm/libnw4r_ef/ef_drawstrategyimpl_80406278.s delete mode 100644 asm/libnw4r_ef/ef_drawstrategyimpl_804403f8.s delete mode 100644 asm/libnw4r_ef/ef_drawstrategyimpl_8050aa08.s delete mode 100644 asm/libnw4r_ef/ef_drawstrategyimpl_8055ece8.s rename asm/libnw4r_ef/{ef_drawstripestrategy_800c03d0.s => ef_drawstripestrategy.s} (99%) delete mode 100644 asm/libnw4r_ef/ef_drawstripestrategy_80440498.s delete mode 100644 asm/libnw4r_ef/ef_drawstripestrategy_8055edb8.s rename asm/libnw4r_ef/{ef_effect_800a3a70.s => ef_effect.s} (98%) delete mode 100644 asm/libnw4r_ef/ef_effect_80440078.s delete mode 100644 asm/libnw4r_ef/ef_effect_8055e970.s rename asm/libnw4r_ef/{ef_effectsystem_800a4670.s => ef_effectsystem.s} (93%) delete mode 100644 asm/libnw4r_ef/ef_effectsystem_80406268.s delete mode 100644 asm/libnw4r_ef/ef_effectsystem_80440098.s delete mode 100644 asm/libnw4r_ef/ef_effectsystem_804fe280.s delete mode 100644 asm/libnw4r_ef/ef_effectsystem_80556958.s delete mode 100644 asm/libnw4r_ef/ef_effectsystem_8055cf20.s delete mode 100644 asm/libnw4r_ef/ef_effectsystem_8055e978.s rename asm/libnw4r_ef/{ef_emform_800b4ad0.s => ef_emform.s} (80%) delete mode 100644 asm/libnw4r_ef/ef_emform_80406274.s delete mode 100644 asm/libnw4r_ef/ef_emform_80440368.s delete mode 100644 asm/libnw4r_ef/ef_emform_8055cf38.s rename asm/libnw4r_ef/{ef_emitter_800a4d50.s => ef_emitter.s} (99%) delete mode 100644 asm/libnw4r_ef/ef_emitter_804400e0.s delete mode 100644 asm/libnw4r_ef/ef_emitter_8055e980.s rename asm/libnw4r_ef/{ef_emitterform_800b40f0.s => ef_emitterform.s} (97%) delete mode 100644 asm/libnw4r_ef/ef_emitterform_8055eb00.s rename asm/libnw4r_ef/{ef_handle_800b4030.s => ef_handle.s} (100%) rename asm/libnw4r_ef/{ef_line_800b4f00.s => ef_line.s} (94%) delete mode 100644 asm/libnw4r_ef/ef_line_80440388.s delete mode 100644 asm/libnw4r_ef/ef_line_8055eb60.s rename asm/libnw4r_ef/{ef_particle_800af490.s => ef_particle.s} (97%) delete mode 100644 asm/libnw4r_ef/ef_particle_80440308.s delete mode 100644 asm/libnw4r_ef/ef_particle_8055ea28.s rename asm/libnw4r_ef/{ef_particlemanager_800b0260.s => ef_particlemanager.s} (98%) delete mode 100644 asm/libnw4r_ef/ef_particlemanager_8040626c.s delete mode 100644 asm/libnw4r_ef/ef_particlemanager_80440320.s delete mode 100644 asm/libnw4r_ef/ef_particlemanager_8050a398.s delete mode 100644 asm/libnw4r_ef/ef_particlemanager_8055cf30.s delete mode 100644 asm/libnw4r_ef/ef_particlemanager_8055ea78.s rename asm/libnw4r_ef/{ef_point_800b4bb0.s => ef_point.s} (93%) delete mode 100644 asm/libnw4r_ef/ef_point_80440378.s delete mode 100644 asm/libnw4r_ef/ef_point_8055eb30.s rename asm/libnw4r_ef/{ef_postfield_800abe00.s => ef_postfield.s} (99%) delete mode 100644 asm/libnw4r_ef/ef_postfield_8055e9f0.s rename asm/libnw4r_ef/{ef_resource_800b2540.s => ef_resource.s} (99%) delete mode 100644 asm/libnw4r_ef/ef_resource_80406270.s delete mode 100644 asm/libnw4r_ef/ef_resource_8050a3c8.s rename asm/libnw4r_ef/{ef_sphere_800b5780.s => ef_sphere.s} (96%) delete mode 100644 asm/libnw4r_ef/ef_sphere_804403a8.s delete mode 100644 asm/libnw4r_ef/ef_sphere_8055ebd0.s rename asm/libnw4r_ef/{ef_torus_800b6790.s => ef_torus.s} (95%) delete mode 100644 asm/libnw4r_ef/ef_torus_804403c8.s delete mode 100644 asm/libnw4r_ef/ef_torus_8055ec68.s rename asm/libnw4r_ef/{ef_util_800b30b0.s => ef_util.s} (98%) delete mode 100644 asm/libnw4r_ef/ef_util_80556960.s delete mode 100644 asm/libnw4r_ef/ef_util_8055eac0.s diff --git a/asm/libnw4r_ef/ef_animcurve_800a6ef0.s b/asm/libnw4r_ef/ef_animcurve.s similarity index 98% rename from asm/libnw4r_ef/ef_animcurve_800a6ef0.s rename to asm/libnw4r_ef/ef_animcurve.s index 1e85e58b..91f294fd 100644 --- a/asm/libnw4r_ef/ef_animcurve_800a6ef0.s +++ b/asm/libnw4r_ef/ef_animcurve.s @@ -6241,3 +6241,201 @@ lbl_800ABDDC: /* 800ABDF4 000A7C34 38 21 00 60 */ addi r1, r1, 0x60 /* 800ABDF8 000A7C38 4E 80 00 20 */ blr /* 800ABDFC 000A7C3C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global gCountStandBit__Q24nw4r2ef +gCountStandBit__Q24nw4r2ef: + + .4byte 0x00010102 + .4byte 0x01020203 + .4byte 0x01020203 + .4byte 0x02030304 + .4byte 0x01020203 + .4byte 0x02030304 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x01020203 + .4byte 0x02030304 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x01020203 + .4byte 0x02030304 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x04050506 + .4byte 0x05060607 + .4byte 0x01020203 + .4byte 0x02030304 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x04050506 + .4byte 0x05060607 + .4byte 0x02030304 + .4byte 0x03040405 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x04050506 + .4byte 0x05060607 + .4byte 0x03040405 + .4byte 0x04050506 + .4byte 0x04050506 + .4byte 0x05060607 + .4byte 0x04050506 + .4byte 0x05060607 + .4byte 0x05060607 + .4byte 0x06070708 + +.global gMSB__Q24nw4r2ef +gMSB__Q24nw4r2ef: + + .4byte 0x00010202 + .4byte 0x04040404 + .4byte 0x08080808 + .4byte 0x08080808 + .4byte 0x10101010 + .4byte 0x10101010 + .4byte 0x10101010 + .4byte 0x10101010 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x20202020 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x40404040 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 + .4byte 0x80808080 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@11024" +"@11024": + + .4byte 0 + .4byte 0 + +.global "@11031" +"@11031": + + .4byte 0x43300000 + .4byte 0 + +.global "@11032_8055E9C8" +"@11032_8055E9C8": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@11089" +"@11089": + + .4byte 0x3F800000 + +.global "@11364" +"@11364": + + .4byte 0x34000000 + +.global "@11365" +"@11365": + + .4byte 0x47800000 + +.global "@11366" +"@11366": + + .4byte 0x40400000 + +.global "@11367" +"@11367": + + .4byte 0x40000000 + +.global "@11368" +"@11368": + + .4byte 0x3FC00000 + +.global "@11369" +"@11369": + + .4byte 0xC0000000 + +.global "@11370" +"@11370": + + .4byte 0x437F0000 diff --git a/asm/libnw4r_ef/ef_animcurve_80440108.s b/asm/libnw4r_ef/ef_animcurve_80440108.s deleted file mode 100644 index 6fcaf8bc..00000000 --- a/asm/libnw4r_ef/ef_animcurve_80440108.s +++ /dev/null @@ -1,138 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global gCountStandBit__Q24nw4r2ef -gCountStandBit__Q24nw4r2ef: - - .4byte 0x00010102 - .4byte 0x01020203 - .4byte 0x01020203 - .4byte 0x02030304 - .4byte 0x01020203 - .4byte 0x02030304 - .4byte 0x02030304 - .4byte 0x03040405 - .4byte 0x01020203 - .4byte 0x02030304 - .4byte 0x02030304 - .4byte 0x03040405 - .4byte 0x02030304 - .4byte 0x03040405 - .4byte 0x03040405 - .4byte 0x04050506 - .4byte 0x01020203 - .4byte 0x02030304 - .4byte 0x02030304 - .4byte 0x03040405 - .4byte 0x02030304 - .4byte 0x03040405 - .4byte 0x03040405 - .4byte 0x04050506 - .4byte 0x02030304 - .4byte 0x03040405 - .4byte 0x03040405 - .4byte 0x04050506 - .4byte 0x03040405 - .4byte 0x04050506 - .4byte 0x04050506 - .4byte 0x05060607 - .4byte 0x01020203 - .4byte 0x02030304 - .4byte 0x02030304 - .4byte 0x03040405 - .4byte 0x02030304 - .4byte 0x03040405 - .4byte 0x03040405 - .4byte 0x04050506 - .4byte 0x02030304 - .4byte 0x03040405 - .4byte 0x03040405 - .4byte 0x04050506 - .4byte 0x03040405 - .4byte 0x04050506 - .4byte 0x04050506 - .4byte 0x05060607 - .4byte 0x02030304 - .4byte 0x03040405 - .4byte 0x03040405 - .4byte 0x04050506 - .4byte 0x03040405 - .4byte 0x04050506 - .4byte 0x04050506 - .4byte 0x05060607 - .4byte 0x03040405 - .4byte 0x04050506 - .4byte 0x04050506 - .4byte 0x05060607 - .4byte 0x04050506 - .4byte 0x05060607 - .4byte 0x05060607 - .4byte 0x06070708 - -.global gMSB__Q24nw4r2ef -gMSB__Q24nw4r2ef: - - .4byte 0x00010202 - .4byte 0x04040404 - .4byte 0x08080808 - .4byte 0x08080808 - .4byte 0x10101010 - .4byte 0x10101010 - .4byte 0x10101010 - .4byte 0x10101010 - .4byte 0x20202020 - .4byte 0x20202020 - .4byte 0x20202020 - .4byte 0x20202020 - .4byte 0x20202020 - .4byte 0x20202020 - .4byte 0x20202020 - .4byte 0x20202020 - .4byte 0x40404040 - .4byte 0x40404040 - .4byte 0x40404040 - .4byte 0x40404040 - .4byte 0x40404040 - .4byte 0x40404040 - .4byte 0x40404040 - .4byte 0x40404040 - .4byte 0x40404040 - .4byte 0x40404040 - .4byte 0x40404040 - .4byte 0x40404040 - .4byte 0x40404040 - .4byte 0x40404040 - .4byte 0x40404040 - .4byte 0x40404040 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 - .4byte 0x80808080 diff --git a/asm/libnw4r_ef/ef_animcurve_8055e9b8.s b/asm/libnw4r_ef/ef_animcurve_8055e9b8.s deleted file mode 100644 index 21c36e40..00000000 --- a/asm/libnw4r_ef/ef_animcurve_8055e9b8.s +++ /dev/null @@ -1,60 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@11024" -"@11024": - - .4byte 0 - .4byte 0 - -.global "@11031" -"@11031": - - .4byte 0x43300000 - .4byte 0 - -.global "@11032_8055E9C8" -"@11032_8055E9C8": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@11089" -"@11089": - - .4byte 0x3F800000 - -.global "@11364" -"@11364": - - .4byte 0x34000000 - -.global "@11365" -"@11365": - - .4byte 0x47800000 - -.global "@11366" -"@11366": - - .4byte 0x40400000 - -.global "@11367" -"@11367": - - .4byte 0x40000000 - -.global "@11368" -"@11368": - - .4byte 0x3FC00000 - -.global "@11369" -"@11369": - - .4byte 0xC0000000 - -.global "@11370" -"@11370": - - .4byte 0x437F0000 diff --git a/asm/libnw4r_ef/ef_creationqueue_800b4690.s b/asm/libnw4r_ef/ef_creationqueue.s similarity index 100% rename from asm/libnw4r_ef/ef_creationqueue_800b4690.s rename to asm/libnw4r_ef/ef_creationqueue.s diff --git a/asm/libnw4r_ef/ef_cube_800b6dd0.s b/asm/libnw4r_ef/ef_cube.s similarity index 99% rename from asm/libnw4r_ef/ef_cube_800b6dd0.s rename to asm/libnw4r_ef/ef_cube.s index 3935ac03..34259fbd 100644 --- a/asm/libnw4r_ef/ef_cube_800b6dd0.s +++ b/asm/libnw4r_ef/ef_cube.s @@ -2100,3 +2100,77 @@ lbl_800B8904: /* 800B89A4 000B47E4 38 21 02 30 */ addi r1, r1, 0x230 /* 800B89A8 000B47E8 4E 80 00 20 */ blr /* 800B89AC 000B47EC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef15EmitterFormCube +__vt__Q34nw4r2ef15EmitterFormCube: + + .4byte 0 + .4byte 0 + .4byte Emission__Q34nw4r2ef15EmitterFormCubeFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@8286" +"@8286": + + .4byte 0x00800000 + +.global "@8287" +"@8287": + + .4byte 0x47800000 + +.global "@8288" +"@8288": + + .4byte 0x40000000 + +.global "@8289" +"@8289": + + .4byte 0x3F800000 + +.global "@8290" +"@8290": + + .4byte 0 + +.global "@8291" +"@8291": + + .4byte 0x3C23D70A + +.global "@8300" +"@8300": + + .4byte 0x43300000 + .4byte 0 + +.global "@8301" +"@8301": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@9190" +"@9190": + + .4byte 0x3727C5AC + +.global "@9191" +"@9191": + + .4byte 0x40490FDB + +.global "@9192" +"@9192": + + .4byte 0x34C90FDB + +.global "@9193" +"@9193": + + .4byte 0xBF800000 diff --git a/asm/libnw4r_ef/ef_cube_804403d8.s b/asm/libnw4r_ef/ef_cube_804403d8.s deleted file mode 100644 index 731277f7..00000000 --- a/asm/libnw4r_ef/ef_cube_804403d8.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef15EmitterFormCube -__vt__Q34nw4r2ef15EmitterFormCube: - - .4byte 0 - .4byte 0 - .4byte Emission__Q34nw4r2ef15EmitterFormCubeFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_cube_8055ecb0.s b/asm/libnw4r_ef/ef_cube_8055ecb0.s deleted file mode 100644 index 2ff8c13f..00000000 --- a/asm/libnw4r_ef/ef_cube_8055ecb0.s +++ /dev/null @@ -1,64 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@8286" -"@8286": - - .4byte 0x00800000 - -.global "@8287" -"@8287": - - .4byte 0x47800000 - -.global "@8288" -"@8288": - - .4byte 0x40000000 - -.global "@8289" -"@8289": - - .4byte 0x3F800000 - -.global "@8290" -"@8290": - - .4byte 0 - -.global "@8291" -"@8291": - - .4byte 0x3C23D70A - -.global "@8300" -"@8300": - - .4byte 0x43300000 - .4byte 0 - -.global "@8301" -"@8301": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@9190" -"@9190": - - .4byte 0x3727C5AC - -.global "@9191" -"@9191": - - .4byte 0x40490FDB - -.global "@9192" -"@9192": - - .4byte 0x34C90FDB - -.global "@9193" -"@9193": - - .4byte 0xBF800000 diff --git a/asm/libnw4r_ef/ef_cylinder_800b5fe0.s b/asm/libnw4r_ef/ef_cylinder.s similarity index 95% rename from asm/libnw4r_ef/ef_cylinder_800b5fe0.s rename to asm/libnw4r_ef/ef_cylinder.s index b37192fa..5deb5c1b 100644 --- a/asm/libnw4r_ef/ef_cylinder_800b5fe0.s +++ b/asm/libnw4r_ef/ef_cylinder.s @@ -552,3 +552,89 @@ lbl_800B6728: /* 800B6784 000B25C4 7C 08 03 A6 */ mtlr r0 /* 800B6788 000B25C8 38 21 00 E0 */ addi r1, r1, 0xe0 /* 800B678C 000B25CC 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef19EmitterFormCylinder +__vt__Q34nw4r2ef19EmitterFormCylinder: + + .4byte 0 + .4byte 0 + .4byte Emission__Q34nw4r2ef19EmitterFormCylinderFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@7773_8055EC20" +"@7773_8055EC20": + + .4byte 0x47800000 + +.global "@7774_8055EC24" +"@7774_8055EC24": + + .4byte 0x42C80000 + +.global "@7775_8055EC28" +"@7775_8055EC28": + + .4byte 0 + +.global "@7776_8055EC2C" +"@7776_8055EC2C": + + .4byte 0x3F800000 + +.global "@7777" +"@7777": + + .4byte 0x40000000 + +.global "@7778" +"@7778": + + .4byte 0x3C23D70A + +.global "@7786" +"@7786": + + .4byte 0x43300000 + .4byte 0 + +.global "@7787" +"@7787": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@7845_8055EC48" +"@7845_8055EC48": + + .4byte 0x34000000 + +.global "@7846_8055EC4C" +"@7846_8055EC4C": + + .4byte 0x40490FDB + +.global "@7847_8055EC50" +"@7847_8055EC50": + + .4byte 0x401921FB + .4byte 0x60000000 + +.global "@7848_8055EC58" +"@7848_8055EC58": + + .4byte 0x39490FDB + +.global "@7849_8055EC5C" +"@7849_8055EC5C": + + .4byte 0x40C90E49 + +.global "@7850_8055EC60" +"@7850_8055EC60": + + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_cylinder_804403b8.s b/asm/libnw4r_ef/ef_cylinder_804403b8.s deleted file mode 100644 index 922a0b1f..00000000 --- a/asm/libnw4r_ef/ef_cylinder_804403b8.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef19EmitterFormCylinder -__vt__Q34nw4r2ef19EmitterFormCylinder: - - .4byte 0 - .4byte 0 - .4byte Emission__Q34nw4r2ef19EmitterFormCylinderFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_cylinder_8055ec20.s b/asm/libnw4r_ef/ef_cylinder_8055ec20.s deleted file mode 100644 index b6028a12..00000000 --- a/asm/libnw4r_ef/ef_cylinder_8055ec20.s +++ /dev/null @@ -1,76 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@7773_8055EC20" -"@7773_8055EC20": - - .4byte 0x47800000 - -.global "@7774_8055EC24" -"@7774_8055EC24": - - .4byte 0x42C80000 - -.global "@7775_8055EC28" -"@7775_8055EC28": - - .4byte 0 - -.global "@7776_8055EC2C" -"@7776_8055EC2C": - - .4byte 0x3F800000 - -.global "@7777" -"@7777": - - .4byte 0x40000000 - -.global "@7778" -"@7778": - - .4byte 0x3C23D70A - -.global "@7786" -"@7786": - - .4byte 0x43300000 - .4byte 0 - -.global "@7787" -"@7787": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@7845_8055EC48" -"@7845_8055EC48": - - .4byte 0x34000000 - -.global "@7846_8055EC4C" -"@7846_8055EC4C": - - .4byte 0x40490FDB - -.global "@7847_8055EC50" -"@7847_8055EC50": - - .4byte 0x401921FB - .4byte 0x60000000 - -.global "@7848_8055EC58" -"@7848_8055EC58": - - .4byte 0x39490FDB - -.global "@7849_8055EC5C" -"@7849_8055EC5C": - - .4byte 0x40C90E49 - -.global "@7850_8055EC60" -"@7850_8055EC60": - - .4byte 0x3F000000 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_disc_800b5240.s b/asm/libnw4r_ef/ef_disc.s similarity index 94% rename from asm/libnw4r_ef/ef_disc_800b5240.s rename to asm/libnw4r_ef/ef_disc.s index f8a8c627..92516db3 100644 --- a/asm/libnw4r_ef/ef_disc_800b5240.s +++ b/asm/libnw4r_ef/ef_disc.s @@ -379,3 +379,85 @@ lbl_800B56E4: /* 800B5774 000B15B4 00 00 00 00 */ .4byte 0x00000000 /* 800B5778 000B15B8 00 00 00 00 */ .4byte 0x00000000 /* 800B577C 000B15BC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef15EmitterFormDisc +__vt__Q34nw4r2ef15EmitterFormDisc: + + .4byte 0 + .4byte 0 + .4byte Emission__Q34nw4r2ef15EmitterFormDiscFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@7752_8055EB88" +"@7752_8055EB88": + + .4byte 0x34000000 + +.global "@7753_8055EB8C" +"@7753_8055EB8C": + + .4byte 0 + +.global "@7754_8055EB90" +"@7754_8055EB90": + + .4byte 0x47800000 + +.global "@7755" +"@7755": + + .4byte 0x40000000 + +.global "@7756" +"@7756": + + .4byte 0x40490FDB + .4byte 0 + +.global "@7757" +"@7757": + + .4byte 0x401921FB + .4byte 0x60000000 + +.global "@7758" +"@7758": + + .4byte 0x39490FDB + +.global "@7759" +"@7759": + + .4byte 0x40C90E49 + +.global "@7760" +"@7760": + + .4byte 0x42C80000 + +.global "@7761" +"@7761": + + .4byte 0x3F800000 + +.global "@7762" +"@7762": + + .4byte 0x3C23D70A + .4byte 0 + +.global "@7770_8055EBC0" +"@7770_8055EBC0": + + .4byte 0x43300000 + .4byte 0 + +.global "@7771_8055EBC8" +"@7771_8055EBC8": + + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_ef/ef_disc_80440398.s b/asm/libnw4r_ef/ef_disc_80440398.s deleted file mode 100644 index 7f93502a..00000000 --- a/asm/libnw4r_ef/ef_disc_80440398.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef15EmitterFormDisc -__vt__Q34nw4r2ef15EmitterFormDisc: - - .4byte 0 - .4byte 0 - .4byte Emission__Q34nw4r2ef15EmitterFormDiscFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_disc_8055eb88.s b/asm/libnw4r_ef/ef_disc_8055eb88.s deleted file mode 100644 index 6db533c6..00000000 --- a/asm/libnw4r_ef/ef_disc_8055eb88.s +++ /dev/null @@ -1,72 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@7752_8055EB88" -"@7752_8055EB88": - - .4byte 0x34000000 - -.global "@7753_8055EB8C" -"@7753_8055EB8C": - - .4byte 0 - -.global "@7754_8055EB90" -"@7754_8055EB90": - - .4byte 0x47800000 - -.global "@7755" -"@7755": - - .4byte 0x40000000 - -.global "@7756" -"@7756": - - .4byte 0x40490FDB - .4byte 0 - -.global "@7757" -"@7757": - - .4byte 0x401921FB - .4byte 0x60000000 - -.global "@7758" -"@7758": - - .4byte 0x39490FDB - -.global "@7759" -"@7759": - - .4byte 0x40C90E49 - -.global "@7760" -"@7760": - - .4byte 0x42C80000 - -.global "@7761" -"@7761": - - .4byte 0x3F800000 - -.global "@7762" -"@7762": - - .4byte 0x3C23D70A - .4byte 0 - -.global "@7770_8055EBC0" -"@7770_8055EBC0": - - .4byte 0x43300000 - .4byte 0 - -.global "@7771_8055EBC8" -"@7771_8055EBC8": - - .4byte 0x43300000 - .4byte 0x80000000 diff --git a/asm/libnw4r_ef/ef_drawbillboardstrategy_800bab50.s b/asm/libnw4r_ef/ef_drawbillboardstrategy.s similarity index 98% rename from asm/libnw4r_ef/ef_drawbillboardstrategy_800bab50.s rename to asm/libnw4r_ef/ef_drawbillboardstrategy.s index 9e93402a..11064702 100644 --- a/asm/libnw4r_ef/ef_drawbillboardstrategy_800bab50.s +++ b/asm/libnw4r_ef/ef_drawbillboardstrategy.s @@ -2394,3 +2394,77 @@ __dt__Q34nw4r2ef21DrawBillboardStrategyFv: /* 800BCCB4 000B8AF4 00 00 00 00 */ .4byte 0x00000000 /* 800BCCB8 000B8AF8 00 00 00 00 */ .4byte 0x00000000 /* 800BCCBC 000B8AFC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef21DrawBillboardStrategy +__vt__Q34nw4r2ef21DrawBillboardStrategy: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r2ef21DrawBillboardStrategyFv + .4byte Draw__Q34nw4r2ef21DrawBillboardStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetCalcAheadFunc__Q34nw4r2ef21DrawBillboardStrategyFPQ34nw4r2ef15ParticleManager + .4byte 0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global billboard_tex0_u8__Q24nw4r2ef +billboard_tex0_u8__Q24nw4r2ef: + + .4byte 0x00010000 + .4byte 0x01000101 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@13380" +"@13380": + + .4byte 0 + +.global "@13381" +"@13381": + + .4byte 0x42C80000 + +.global "@13382" +"@13382": + + .4byte 0x3F800000 + +.global "@13383" +"@13383": + + .4byte 0x34000000 + +.global "@13384" +"@13384": + + .4byte 0x3CC90FDB + .4byte 0 + +.global "@13391" +"@13391": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@13392" +"@13392": + + .4byte 0x43300000 + .4byte 0 + +.global "@13654" +"@13654": + + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawbillboardstrategy_80440410.s b/asm/libnw4r_ef/ef_drawbillboardstrategy_80440410.s deleted file mode 100644 index 07491021..00000000 --- a/asm/libnw4r_ef/ef_drawbillboardstrategy_80440410.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef21DrawBillboardStrategy -__vt__Q34nw4r2ef21DrawBillboardStrategy: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r2ef21DrawBillboardStrategyFv - .4byte Draw__Q34nw4r2ef21DrawBillboardStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager - .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .4byte GetCalcAheadFunc__Q34nw4r2ef21DrawBillboardStrategyFPQ34nw4r2ef15ParticleManager - .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawbillboardstrategy_80556980.s b/asm/libnw4r_ef/ef_drawbillboardstrategy_80556980.s deleted file mode 100644 index 1774508d..00000000 --- a/asm/libnw4r_ef/ef_drawbillboardstrategy_80556980.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global billboard_tex0_u8__Q24nw4r2ef -billboard_tex0_u8__Q24nw4r2ef: - - .4byte 0x00010000 - .4byte 0x01000101 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawbillboardstrategy_8055ed18.s b/asm/libnw4r_ef/ef_drawbillboardstrategy_8055ed18.s deleted file mode 100644 index fb9db217..00000000 --- a/asm/libnw4r_ef/ef_drawbillboardstrategy_8055ed18.s +++ /dev/null @@ -1,46 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@13380" -"@13380": - - .4byte 0 - -.global "@13381" -"@13381": - - .4byte 0x42C80000 - -.global "@13382" -"@13382": - - .4byte 0x3F800000 - -.global "@13383" -"@13383": - - .4byte 0x34000000 - -.global "@13384" -"@13384": - - .4byte 0x3CC90FDB - .4byte 0 - -.global "@13391" -"@13391": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@13392" -"@13392": - - .4byte 0x43300000 - .4byte 0 - -.global "@13654" -"@13654": - - .4byte 0x3F000000 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawdirectionalstrategy_800bccc0.s b/asm/libnw4r_ef/ef_drawdirectionalstrategy.s similarity index 98% rename from asm/libnw4r_ef/ef_drawdirectionalstrategy_800bccc0.s rename to asm/libnw4r_ef/ef_drawdirectionalstrategy.s index 82be6feb..d0b43d18 100644 --- a/asm/libnw4r_ef/ef_drawdirectionalstrategy_800bccc0.s +++ b/asm/libnw4r_ef/ef_drawdirectionalstrategy.s @@ -2566,3 +2566,109 @@ __dt__Q34nw4r2ef23DrawDirectionalStrategyFv: /* 800BF094 000BAED4 00 00 00 00 */ .4byte 0x00000000 /* 800BF098 000BAED8 00 00 00 00 */ .4byte 0x00000000 /* 800BF09C 000BAEDC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global "@LOCAL@DrawDirectional__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@p" +"@LOCAL@DrawDirectional__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@p": + + .4byte 0xBF800000 + .4byte 0xBF800000 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0xBF800000 + .4byte 0 + +.global "@LOCAL@DrawDirectional__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@px@0" +"@LOCAL@DrawDirectional__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@px@0": + + .4byte 0 + .4byte 0xBF800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0xBF800000 + .4byte 0 + .4byte 0xBF800000 + .4byte 0xBF800000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef23DrawDirectionalStrategy +__vt__Q34nw4r2ef23DrawDirectionalStrategy: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r2ef23DrawDirectionalStrategyFv + .4byte Draw__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetCalcAheadFunc__Q34nw4r2ef23DrawDirectionalStrategyFPQ34nw4r2ef15ParticleManager + .4byte 0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global directional_tex0_u8__Q24nw4r2ef +directional_tex0_u8__Q24nw4r2ef: + + .4byte 0x00010000 + .4byte 0x01000101 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@13563" +"@13563": + + .4byte 0 + +.global "@13564" +"@13564": + + .4byte 0x34000000 + +.global "@13565" +"@13565": + + .4byte 0x3F800000 + +.global "@13566" +"@13566": + + .4byte 0x42C80000 + +.global "@13567" +"@13567": + + .4byte 0x3F000000 + +.global "@13568" +"@13568": + + .4byte 0x3CC90FDB + +.global "@13575" +"@13575": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@13576" +"@13576": + + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawdirectionalstrategy_80408260.s b/asm/libnw4r_ef/ef_drawdirectionalstrategy_80408260.s deleted file mode 100644 index 5f9ad9e2..00000000 --- a/asm/libnw4r_ef/ef_drawdirectionalstrategy_80408260.s +++ /dev/null @@ -1,34 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global "@LOCAL@DrawDirectional__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@p" -"@LOCAL@DrawDirectional__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@p": - - .4byte 0xBF800000 - .4byte 0xBF800000 - .4byte 0 - .4byte 0xBF800000 - .4byte 0x3F800000 - .4byte 0 - .4byte 0x3F800000 - .4byte 0x3F800000 - .4byte 0 - .4byte 0x3F800000 - .4byte 0xBF800000 - .4byte 0 - -.global "@LOCAL@DrawDirectional__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@px@0" -"@LOCAL@DrawDirectional__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@px@0": - - .4byte 0 - .4byte 0xBF800000 - .4byte 0x3F800000 - .4byte 0 - .4byte 0x3F800000 - .4byte 0x3F800000 - .4byte 0 - .4byte 0x3F800000 - .4byte 0xBF800000 - .4byte 0 - .4byte 0xBF800000 - .4byte 0xBF800000 diff --git a/asm/libnw4r_ef/ef_drawdirectionalstrategy_80440430.s b/asm/libnw4r_ef/ef_drawdirectionalstrategy_80440430.s deleted file mode 100644 index f94427c7..00000000 --- a/asm/libnw4r_ef/ef_drawdirectionalstrategy_80440430.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef23DrawDirectionalStrategy -__vt__Q34nw4r2ef23DrawDirectionalStrategy: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r2ef23DrawDirectionalStrategyFv - .4byte Draw__Q34nw4r2ef23DrawDirectionalStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager - .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .4byte GetCalcAheadFunc__Q34nw4r2ef23DrawDirectionalStrategyFPQ34nw4r2ef15ParticleManager - .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawdirectionalstrategy_805569a0.s b/asm/libnw4r_ef/ef_drawdirectionalstrategy_805569a0.s deleted file mode 100644 index a2ddd8a9..00000000 --- a/asm/libnw4r_ef/ef_drawdirectionalstrategy_805569a0.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global directional_tex0_u8__Q24nw4r2ef -directional_tex0_u8__Q24nw4r2ef: - - .4byte 0x00010000 - .4byte 0x01000101 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawdirectionalstrategy_8055ed48.s b/asm/libnw4r_ef/ef_drawdirectionalstrategy_8055ed48.s deleted file mode 100644 index 3cb5d668..00000000 --- a/asm/libnw4r_ef/ef_drawdirectionalstrategy_8055ed48.s +++ /dev/null @@ -1,44 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@13563" -"@13563": - - .4byte 0 - -.global "@13564" -"@13564": - - .4byte 0x34000000 - -.global "@13565" -"@13565": - - .4byte 0x3F800000 - -.global "@13566" -"@13566": - - .4byte 0x42C80000 - -.global "@13567" -"@13567": - - .4byte 0x3F000000 - -.global "@13568" -"@13568": - - .4byte 0x3CC90FDB - -.global "@13575" -"@13575": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@13576" -"@13576": - - .4byte 0x43300000 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawfreestrategy_800bf0a0.s b/asm/libnw4r_ef/ef_drawfreestrategy.s similarity index 94% rename from asm/libnw4r_ef/ef_drawfreestrategy_800bf0a0.s rename to asm/libnw4r_ef/ef_drawfreestrategy.s index 61834117..fd5451c7 100644 --- a/asm/libnw4r_ef/ef_drawfreestrategy_800bf0a0.s +++ b/asm/libnw4r_ef/ef_drawfreestrategy.s @@ -617,3 +617,97 @@ __dt__Q34nw4r2ef16DrawFreeStrategyFv: /* 800BF954 000BB794 00 00 00 00 */ .4byte 0x00000000 /* 800BF958 000BB798 00 00 00 00 */ .4byte 0x00000000 /* 800BF95C 000BB79C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global "@LOCAL@Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@p" +"@LOCAL@Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@p": + + .4byte 0xBF800000 + .4byte 0xBF800000 + .4byte 0 + .4byte 0xBF800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0xBF800000 + .4byte 0 + +.global "@LOCAL@Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@px@0" +"@LOCAL@Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@px@0": + + .4byte 0 + .4byte 0xBF800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0x3F800000 + .4byte 0 + .4byte 0x3F800000 + .4byte 0xBF800000 + .4byte 0 + .4byte 0xBF800000 + .4byte 0xBF800000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef16DrawFreeStrategy +__vt__Q34nw4r2ef16DrawFreeStrategy: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r2ef16DrawFreeStrategyFv + .4byte Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global free_tex0_u8__Q24nw4r2ef +free_tex0_u8__Q24nw4r2ef: + + .4byte 0x00010000 + .4byte 0x01000101 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@9026" +"@9026": + + .4byte 0 + +.global "@9027" +"@9027": + + .4byte 0x42C80000 + +.global "@9028" +"@9028": + + .4byte 0x34000000 + +.global "@9029" +"@9029": + + .4byte 0x3CC90FDB + +.global "@9030" +"@9030": + + .4byte 0x3F800000 + .4byte 0 + +.global "@9037" +"@9037": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@9038" +"@9038": + + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawfreestrategy_804082c0.s b/asm/libnw4r_ef/ef_drawfreestrategy_804082c0.s deleted file mode 100644 index 1dbb78ae..00000000 --- a/asm/libnw4r_ef/ef_drawfreestrategy_804082c0.s +++ /dev/null @@ -1,34 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global "@LOCAL@Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@p" -"@LOCAL@Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@p": - - .4byte 0xBF800000 - .4byte 0xBF800000 - .4byte 0 - .4byte 0xBF800000 - .4byte 0x3F800000 - .4byte 0 - .4byte 0x3F800000 - .4byte 0x3F800000 - .4byte 0 - .4byte 0x3F800000 - .4byte 0xBF800000 - .4byte 0 - -.global "@LOCAL@Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@px@0" -"@LOCAL@Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@px@0": - - .4byte 0 - .4byte 0xBF800000 - .4byte 0x3F800000 - .4byte 0 - .4byte 0x3F800000 - .4byte 0x3F800000 - .4byte 0 - .4byte 0x3F800000 - .4byte 0xBF800000 - .4byte 0 - .4byte 0xBF800000 - .4byte 0xBF800000 diff --git a/asm/libnw4r_ef/ef_drawfreestrategy_80440450.s b/asm/libnw4r_ef/ef_drawfreestrategy_80440450.s deleted file mode 100644 index 27c540fb..00000000 --- a/asm/libnw4r_ef/ef_drawfreestrategy_80440450.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef16DrawFreeStrategy -__vt__Q34nw4r2ef16DrawFreeStrategy: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r2ef16DrawFreeStrategyFv - .4byte Draw__Q34nw4r2ef16DrawFreeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager - .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi diff --git a/asm/libnw4r_ef/ef_drawfreestrategy_805569c0.s b/asm/libnw4r_ef/ef_drawfreestrategy_805569c0.s deleted file mode 100644 index 0ed0a44e..00000000 --- a/asm/libnw4r_ef/ef_drawfreestrategy_805569c0.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global free_tex0_u8__Q24nw4r2ef -free_tex0_u8__Q24nw4r2ef: - - .4byte 0x00010000 - .4byte 0x01000101 diff --git a/asm/libnw4r_ef/ef_drawfreestrategy_8055ed70.s b/asm/libnw4r_ef/ef_drawfreestrategy_8055ed70.s deleted file mode 100644 index c997dae5..00000000 --- a/asm/libnw4r_ef/ef_drawfreestrategy_8055ed70.s +++ /dev/null @@ -1,40 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@9026" -"@9026": - - .4byte 0 - -.global "@9027" -"@9027": - - .4byte 0x42C80000 - -.global "@9028" -"@9028": - - .4byte 0x34000000 - -.global "@9029" -"@9029": - - .4byte 0x3CC90FDB - -.global "@9030" -"@9030": - - .4byte 0x3F800000 - .4byte 0 - -.global "@9037" -"@9037": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@9038" -"@9038": - - .4byte 0x43300000 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawlinestrategy_800bf960.s b/asm/libnw4r_ef/ef_drawlinestrategy.s similarity index 96% rename from asm/libnw4r_ef/ef_drawlinestrategy_800bf960.s rename to asm/libnw4r_ef/ef_drawlinestrategy.s index 3b631a22..c09d4449 100644 --- a/asm/libnw4r_ef/ef_drawlinestrategy_800bf960.s +++ b/asm/libnw4r_ef/ef_drawlinestrategy.s @@ -435,3 +435,45 @@ __dt__Q34nw4r2ef16DrawLineStrategyFv: /* 800BFF54 000BBD94 00 00 00 00 */ .4byte 0x00000000 /* 800BFF58 000BBD98 00 00 00 00 */ .4byte 0x00000000 /* 800BFF5C 000BBD9C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef16DrawLineStrategy +__vt__Q34nw4r2ef16DrawLineStrategy: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r2ef16DrawLineStrategyFv + .4byte Draw__Q34nw4r2ef16DrawLineStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@11461" +"@11461": + + .4byte 0x422A0000 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@11851" +"@11851": + + .4byte 0 + +.global "@11852" +"@11852": + + .4byte 0x34000000 + +.global "@11853" +"@11853": + + .4byte 0x40C00000 + +.global "@11854" +"@11854": + + .4byte 0x3F800000 diff --git a/asm/libnw4r_ef/ef_drawlinestrategy_80440468.s b/asm/libnw4r_ef/ef_drawlinestrategy_80440468.s deleted file mode 100644 index bcd90b66..00000000 --- a/asm/libnw4r_ef/ef_drawlinestrategy_80440468.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef16DrawLineStrategy -__vt__Q34nw4r2ef16DrawLineStrategy: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r2ef16DrawLineStrategyFv - .4byte Draw__Q34nw4r2ef16DrawLineStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager - .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi diff --git a/asm/libnw4r_ef/ef_drawlinestrategy_805569c8.s b/asm/libnw4r_ef/ef_drawlinestrategy_805569c8.s deleted file mode 100644 index bd82f73e..00000000 --- a/asm/libnw4r_ef/ef_drawlinestrategy_805569c8.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@11461" -"@11461": - - .4byte 0x422A0000 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawlinestrategy_8055ed98.s b/asm/libnw4r_ef/ef_drawlinestrategy_8055ed98.s deleted file mode 100644 index c2c2c296..00000000 --- a/asm/libnw4r_ef/ef_drawlinestrategy_8055ed98.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@11851" -"@11851": - - .4byte 0 - -.global "@11852" -"@11852": - - .4byte 0x34000000 - -.global "@11853" -"@11853": - - .4byte 0x40C00000 - -.global "@11854" -"@11854": - - .4byte 0x3F800000 diff --git a/asm/libnw4r_ef/ef_draworder_800a3950.s b/asm/libnw4r_ef/ef_draworder.s similarity index 91% rename from asm/libnw4r_ef/ef_draworder_800a3950.s rename to asm/libnw4r_ef/ef_draworder.s index 2b7d1af8..259b3b0d 100644 --- a/asm/libnw4r_ef/ef_draworder_800a3950.s +++ b/asm/libnw4r_ef/ef_draworder.s @@ -91,3 +91,15 @@ Remove__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectPQ34nw4r2ef15ParticleManager: /* 800A3A64 0009F8A4 7C A4 2B 78 */ mr r4, r5 /* 800A3A68 0009F8A8 38 63 00 90 */ addi r3, r3, 0x90 /* 800A3A6C 0009F8AC 4B FF FE 54 */ b MEMRemoveListObject +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef9DrawOrder +__vt__Q34nw4r2ef9DrawOrder: + + .4byte 0 + .4byte 0 + .4byte Add__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectPQ34nw4r2ef15ParticleManager + .4byte Remove__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectPQ34nw4r2ef15ParticleManager + .4byte Draw__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectRCQ34nw4r2ef8DrawInfo + .4byte 0 diff --git a/asm/libnw4r_ef/ef_draworder_80440060.s b/asm/libnw4r_ef/ef_draworder_80440060.s deleted file mode 100644 index b4b210a4..00000000 --- a/asm/libnw4r_ef/ef_draworder_80440060.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef9DrawOrder -__vt__Q34nw4r2ef9DrawOrder: - - .4byte 0 - .4byte 0 - .4byte Add__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectPQ34nw4r2ef15ParticleManager - .4byte Remove__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectPQ34nw4r2ef15ParticleManager - .4byte Draw__Q34nw4r2ef9DrawOrderFPQ34nw4r2ef6EffectRCQ34nw4r2ef8DrawInfo - .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawpointstrategy_800bff60.s b/asm/libnw4r_ef/ef_drawpointstrategy.s similarity index 95% rename from asm/libnw4r_ef/ef_drawpointstrategy_800bff60.s rename to asm/libnw4r_ef/ef_drawpointstrategy.s index 9370f648..7a09f90d 100644 --- a/asm/libnw4r_ef/ef_drawpointstrategy_800bff60.s +++ b/asm/libnw4r_ef/ef_drawpointstrategy.s @@ -319,3 +319,41 @@ __dt__Q34nw4r2ef17DrawPointStrategyFv: /* 800C03C4 000BC204 00 00 00 00 */ .4byte 0x00000000 /* 800C03C8 000BC208 00 00 00 00 */ .4byte 0x00000000 /* 800C03CC 000BC20C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef17DrawPointStrategy +__vt__Q34nw4r2ef17DrawPointStrategy: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r2ef17DrawPointStrategyFv + .4byte Draw__Q34nw4r2ef17DrawPointStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@11451" +"@11451": + + .4byte 0x422A0000 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@11644" +"@11644": + + .4byte 0 + +.global "@11645" +"@11645": + + .4byte 0x34000000 + +.global "@11646" +"@11646": + + .4byte 0x40C00000 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawpointstrategy_80440480.s b/asm/libnw4r_ef/ef_drawpointstrategy_80440480.s deleted file mode 100644 index df8f6cdf..00000000 --- a/asm/libnw4r_ef/ef_drawpointstrategy_80440480.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef17DrawPointStrategy -__vt__Q34nw4r2ef17DrawPointStrategy: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r2ef17DrawPointStrategyFv - .4byte Draw__Q34nw4r2ef17DrawPointStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager - .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi diff --git a/asm/libnw4r_ef/ef_drawpointstrategy_805569d0.s b/asm/libnw4r_ef/ef_drawpointstrategy_805569d0.s deleted file mode 100644 index 9a1d7e1c..00000000 --- a/asm/libnw4r_ef/ef_drawpointstrategy_805569d0.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@11451" -"@11451": - - .4byte 0x422A0000 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawpointstrategy_8055eda8.s b/asm/libnw4r_ef/ef_drawpointstrategy_8055eda8.s deleted file mode 100644 index 34dd35f7..00000000 --- a/asm/libnw4r_ef/ef_drawpointstrategy_8055eda8.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@11644" -"@11644": - - .4byte 0 - -.global "@11645" -"@11645": - - .4byte 0x34000000 - -.global "@11646" -"@11646": - - .4byte 0x40C00000 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawsmoothstripestrategy_800c3a90.s b/asm/libnw4r_ef/ef_drawsmoothstripestrategy.s similarity index 98% rename from asm/libnw4r_ef/ef_drawsmoothstripestrategy_800c3a90.s rename to asm/libnw4r_ef/ef_drawsmoothstripestrategy.s index 67297f2d..d1eaaa0f 100644 --- a/asm/libnw4r_ef/ef_drawsmoothstripestrategy_800c3a90.s +++ b/asm/libnw4r_ef/ef_drawsmoothstripestrategy.s @@ -5696,3 +5696,115 @@ __dt__Q34nw4r2ef24DrawSmoothStripeStrategyFv: /* 800C8AD4 000C4914 00 00 00 00 */ .4byte 0x00000000 /* 800C8AD8 000C4918 00 00 00 00 */ .4byte 0x00000000 /* 800C8ADC 000C491C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef24DrawSmoothStripeStrategy +__vt__Q34nw4r2ef24DrawSmoothStripeStrategy: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r2ef24DrawSmoothStripeStrategyFv + .4byte Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetCalcAheadFunc__Q34nw4r2ef24DrawSmoothStripeStrategyFPQ34nw4r2ef15ParticleManager + .4byte 0 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global "@LOCAL@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v0" +"@LOCAL@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v0": + .skip 0xC + +.global "@LOCAL@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v1@0" +"@LOCAL@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v1@0": + .skip 0xC + +.global "@LOCAL@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v2@1" +"@LOCAL@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v2@1": + .skip 0xC + +.global "@LOCAL@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v3@2" +"@LOCAL@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v3@2": + .skip 0xC +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global "@GUARD@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v0" +"@GUARD@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v0": + .skip 0x1 + +.global "@GUARD@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v1@0" +"@GUARD@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v1@0": + .skip 0x1 + +.global "@GUARD@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v2@1" +"@GUARD@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v2@1": + .skip 0x1 + +.global "@GUARD@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v3@2" +"@GUARD@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v3@2": + .skip 0x5 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@15287" +"@15287": + + .4byte 0x34000000 + +.global "@15288" +"@15288": + + .4byte 0x3CC90FDB + +.global "@15289" +"@15289": + + .4byte 0 + +.global "@15290" +"@15290": + + .4byte 0x3F800000 + +.global "@15299" +"@15299": + + .4byte 0x43300000 + .4byte 0 + +.global "@15425" +"@15425": + + .4byte 0x3F000000 + +.global "@15426" +"@15426": + + .4byte 0xBF800000 + +.global "@15501" +"@15501": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@15880" +"@15880": + + .4byte 0x3C23D70A + +.global "@16421" +"@16421": + + .4byte 0x43B40000 + +.global "@16422" +"@16422": + + .4byte 0x3F360B61 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawsmoothstripestrategy_804404b8.s b/asm/libnw4r_ef/ef_drawsmoothstripestrategy_804404b8.s deleted file mode 100644 index 8e827527..00000000 --- a/asm/libnw4r_ef/ef_drawsmoothstripestrategy_804404b8.s +++ /dev/null @@ -1,16 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef24DrawSmoothStripeStrategy -__vt__Q34nw4r2ef24DrawSmoothStripeStrategy: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r2ef24DrawSmoothStripeStrategyFv - .4byte Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager - .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .4byte GetCalcAheadFunc__Q34nw4r2ef24DrawSmoothStripeStrategyFPQ34nw4r2ef15ParticleManager - .4byte 0 - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawsmoothstripestrategy_8050aa68.s b/asm/libnw4r_ef/ef_drawsmoothstripestrategy_8050aa68.s deleted file mode 100644 index ab8faf64..00000000 --- a/asm/libnw4r_ef/ef_drawsmoothstripestrategy_8050aa68.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global "@LOCAL@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v0" -"@LOCAL@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v0": - .skip 0xC - -.global "@LOCAL@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v1@0" -"@LOCAL@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v1@0": - .skip 0xC - -.global "@LOCAL@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v2@1" -"@LOCAL@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v2@1": - .skip 0xC - -.global "@LOCAL@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v3@2" -"@LOCAL@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v3@2": - .skip 0xC diff --git a/asm/libnw4r_ef/ef_drawsmoothstripestrategy_8055cf60.s b/asm/libnw4r_ef/ef_drawsmoothstripestrategy_8055cf60.s deleted file mode 100644 index f995a9e1..00000000 --- a/asm/libnw4r_ef/ef_drawsmoothstripestrategy_8055cf60.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global "@GUARD@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v0" -"@GUARD@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v0": - .skip 0x1 - -.global "@GUARD@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v1@0" -"@GUARD@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v1@0": - .skip 0x1 - -.global "@GUARD@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v2@1" -"@GUARD@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v2@1": - .skip 0x1 - -.global "@GUARD@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v3@2" -"@GUARD@Draw__Q34nw4r2ef24DrawSmoothStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager@v3@2": - .skip 0x5 diff --git a/asm/libnw4r_ef/ef_drawsmoothstripestrategy_8055edf0.s b/asm/libnw4r_ef/ef_drawsmoothstripestrategy_8055edf0.s deleted file mode 100644 index a5908c92..00000000 --- a/asm/libnw4r_ef/ef_drawsmoothstripestrategy_8055edf0.s +++ /dev/null @@ -1,60 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@15287" -"@15287": - - .4byte 0x34000000 - -.global "@15288" -"@15288": - - .4byte 0x3CC90FDB - -.global "@15289" -"@15289": - - .4byte 0 - -.global "@15290" -"@15290": - - .4byte 0x3F800000 - -.global "@15299" -"@15299": - - .4byte 0x43300000 - .4byte 0 - -.global "@15425" -"@15425": - - .4byte 0x3F000000 - -.global "@15426" -"@15426": - - .4byte 0xBF800000 - -.global "@15501" -"@15501": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@15880" -"@15880": - - .4byte 0x3C23D70A - -.global "@16421" -"@16421": - - .4byte 0x43B40000 - -.global "@16422" -"@16422": - - .4byte 0x3F360B61 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawstrategybuilder_800b89b0.s b/asm/libnw4r_ef/ef_drawstrategybuilder.s similarity index 77% rename from asm/libnw4r_ef/ef_drawstrategybuilder_800b89b0.s rename to asm/libnw4r_ef/ef_drawstrategybuilder.s index a33c0daa..75a6589d 100644 --- a/asm/libnw4r_ef/ef_drawstrategybuilder_800b89b0.s +++ b/asm/libnw4r_ef/ef_drawstrategybuilder.s @@ -139,3 +139,73 @@ lbl_800B8B3C: /* 800B8B44 000B4984 7C 08 03 A6 */ mtlr r0 /* 800B8B48 000B4988 38 21 00 10 */ addi r1, r1, 0x10 /* 800B8B4C 000B498C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef19DrawStrategyBuilder +__vt__Q34nw4r2ef19DrawStrategyBuilder: + + .4byte 0 + .4byte 0 + .4byte Create__Q34nw4r2ef19DrawStrategyBuilderFUl + .4byte 0 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global "@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@billboardStrategy" +"@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@billboardStrategy": + .skip 0xE0 + +.global "@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@directionalStrategy@0" +"@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@directionalStrategy@0": + .skip 0xE0 + +.global "@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@freeStrategy@1" +"@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@freeStrategy@1": + .skip 0xE0 + +.global "@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@lineStrategy@2" +"@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@lineStrategy@2": + .skip 0xE0 + +.global "@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@pointStrategy@3" +"@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@pointStrategy@3": + .skip 0xE0 + +.global "@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@stripeStrategy@4" +"@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@stripeStrategy@4": + .skip 0xE0 + +.global "@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@smoothStripeStrategy@5" +"@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@smoothStripeStrategy@5": + .skip 0xE0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global "@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@billboardStrategy" +"@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@billboardStrategy": + .skip 0x1 + +.global "@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@directionalStrategy@0" +"@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@directionalStrategy@0": + .skip 0x1 + +.global "@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@freeStrategy@1" +"@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@freeStrategy@1": + .skip 0x1 + +.global "@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@lineStrategy@2" +"@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@lineStrategy@2": + .skip 0x1 + +.global "@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@pointStrategy@3" +"@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@pointStrategy@3": + .skip 0x1 + +.global "@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@stripeStrategy@4" +"@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@stripeStrategy@4": + .skip 0x1 + +.global "@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@smoothStripeStrategy@5" +"@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@smoothStripeStrategy@5": + .skip 0x2 diff --git a/asm/libnw4r_ef/ef_drawstrategybuilder_804403e8.s b/asm/libnw4r_ef/ef_drawstrategybuilder_804403e8.s deleted file mode 100644 index 66037743..00000000 --- a/asm/libnw4r_ef/ef_drawstrategybuilder_804403e8.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef19DrawStrategyBuilder -__vt__Q34nw4r2ef19DrawStrategyBuilder: - - .4byte 0 - .4byte 0 - .4byte Create__Q34nw4r2ef19DrawStrategyBuilderFUl - .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawstrategybuilder_8050a3e8.s b/asm/libnw4r_ef/ef_drawstrategybuilder_8050a3e8.s deleted file mode 100644 index 27a2519c..00000000 --- a/asm/libnw4r_ef/ef_drawstrategybuilder_8050a3e8.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global "@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@billboardStrategy" -"@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@billboardStrategy": - .skip 0xE0 - -.global "@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@directionalStrategy@0" -"@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@directionalStrategy@0": - .skip 0xE0 - -.global "@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@freeStrategy@1" -"@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@freeStrategy@1": - .skip 0xE0 - -.global "@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@lineStrategy@2" -"@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@lineStrategy@2": - .skip 0xE0 - -.global "@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@pointStrategy@3" -"@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@pointStrategy@3": - .skip 0xE0 - -.global "@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@stripeStrategy@4" -"@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@stripeStrategy@4": - .skip 0xE0 - -.global "@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@smoothStripeStrategy@5" -"@LOCAL@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@smoothStripeStrategy@5": - .skip 0xE0 diff --git a/asm/libnw4r_ef/ef_drawstrategybuilder_8055cf58.s b/asm/libnw4r_ef/ef_drawstrategybuilder_8055cf58.s deleted file mode 100644 index 96076069..00000000 --- a/asm/libnw4r_ef/ef_drawstrategybuilder_8055cf58.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global "@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@billboardStrategy" -"@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@billboardStrategy": - .skip 0x1 - -.global "@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@directionalStrategy@0" -"@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@directionalStrategy@0": - .skip 0x1 - -.global "@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@freeStrategy@1" -"@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@freeStrategy@1": - .skip 0x1 - -.global "@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@lineStrategy@2" -"@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@lineStrategy@2": - .skip 0x1 - -.global "@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@pointStrategy@3" -"@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@pointStrategy@3": - .skip 0x1 - -.global "@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@stripeStrategy@4" -"@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@stripeStrategy@4": - .skip 0x1 - -.global "@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@smoothStripeStrategy@5" -"@GUARD@Create__Q34nw4r2ef19DrawStrategyBuilderFUl@smoothStripeStrategy@5": - .skip 0x2 diff --git a/asm/libnw4r_ef/ef_drawstrategyimpl_800b8b50.s b/asm/libnw4r_ef/ef_drawstrategyimpl.s similarity index 98% rename from asm/libnw4r_ef/ef_drawstrategyimpl_800b8b50.s rename to asm/libnw4r_ef/ef_drawstrategyimpl.s index 7eaf9a4e..0752067a 100644 --- a/asm/libnw4r_ef/ef_drawstrategyimpl_800b8b50.s +++ b/asm/libnw4r_ef/ef_drawstrategyimpl.s @@ -2505,3 +2505,83 @@ __dt__Q34nw4r2ef16DrawStrategyImplFv: /* 800BAB44 000B6984 4E 80 00 20 */ blr /* 800BAB48 000B6988 00 00 00 00 */ .4byte 0x00000000 /* 800BAB4C 000B698C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1ef_drawstrategyimpl_cpp" +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef16DrawStrategyImpl +__vt__Q34nw4r2ef16DrawStrategyImpl: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r2ef16DrawStrategyImplFv + .4byte 0 + .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global mXUnitVec__Q34nw4r2ef16DrawStrategyImpl +mXUnitVec__Q34nw4r2ef16DrawStrategyImpl: + .skip 0x18 + +.global mZUnitVec__Q34nw4r2ef16DrawStrategyImpl +mZUnitVec__Q34nw4r2ef16DrawStrategyImpl: + .skip 0xC + +.global mZeroVec__Q34nw4r2ef16DrawStrategyImpl +mZeroVec__Q34nw4r2ef16DrawStrategyImpl: + .skip 0xC + +.global mIdentityMtx__Q34nw4r2ef16DrawStrategyImpl +mIdentityMtx__Q34nw4r2ef16DrawStrategyImpl: + .skip 0x30 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@9915" +"@9915": + + .4byte 0x3F800000 + +.global "@9916" +"@9916": + + .4byte 0 + +.global "@9989" +"@9989": + + .4byte 0x42C80000 + +.global "@10502" +"@10502": + + .4byte 0xBF800000 + +.global "@10503" +"@10503": + + .4byte 0x3F000000 + .4byte 0 + +.global "@10510" +"@10510": + + .4byte 0x43300000 + .4byte 0 + +.global "@10511" +"@10511": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@10650" +"@10650": + + .4byte 0x34000000 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawstrategyimpl_80406278.s b/asm/libnw4r_ef/ef_drawstrategyimpl_80406278.s deleted file mode 100644 index 410ea9dc..00000000 --- a/asm/libnw4r_ef/ef_drawstrategyimpl_80406278.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1ef_drawstrategyimpl_cpp" diff --git a/asm/libnw4r_ef/ef_drawstrategyimpl_804403f8.s b/asm/libnw4r_ef/ef_drawstrategyimpl_804403f8.s deleted file mode 100644 index 90a455f6..00000000 --- a/asm/libnw4r_ef/ef_drawstrategyimpl_804403f8.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef16DrawStrategyImpl -__vt__Q34nw4r2ef16DrawStrategyImpl: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r2ef16DrawStrategyImplFv - .4byte 0 - .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi diff --git a/asm/libnw4r_ef/ef_drawstrategyimpl_8050aa08.s b/asm/libnw4r_ef/ef_drawstrategyimpl_8050aa08.s deleted file mode 100644 index 4307a89b..00000000 --- a/asm/libnw4r_ef/ef_drawstrategyimpl_8050aa08.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global mXUnitVec__Q34nw4r2ef16DrawStrategyImpl -mXUnitVec__Q34nw4r2ef16DrawStrategyImpl: - .skip 0x18 - -.global mZUnitVec__Q34nw4r2ef16DrawStrategyImpl -mZUnitVec__Q34nw4r2ef16DrawStrategyImpl: - .skip 0xC - -.global mZeroVec__Q34nw4r2ef16DrawStrategyImpl -mZeroVec__Q34nw4r2ef16DrawStrategyImpl: - .skip 0xC - -.global mIdentityMtx__Q34nw4r2ef16DrawStrategyImpl -mIdentityMtx__Q34nw4r2ef16DrawStrategyImpl: - .skip 0x30 diff --git a/asm/libnw4r_ef/ef_drawstrategyimpl_8055ece8.s b/asm/libnw4r_ef/ef_drawstrategyimpl_8055ece8.s deleted file mode 100644 index 3b8e015a..00000000 --- a/asm/libnw4r_ef/ef_drawstrategyimpl_8055ece8.s +++ /dev/null @@ -1,46 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@9915" -"@9915": - - .4byte 0x3F800000 - -.global "@9916" -"@9916": - - .4byte 0 - -.global "@9989" -"@9989": - - .4byte 0x42C80000 - -.global "@10502" -"@10502": - - .4byte 0xBF800000 - -.global "@10503" -"@10503": - - .4byte 0x3F000000 - .4byte 0 - -.global "@10510" -"@10510": - - .4byte 0x43300000 - .4byte 0 - -.global "@10511" -"@10511": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@10650" -"@10650": - - .4byte 0x34000000 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawstripestrategy_800c03d0.s b/asm/libnw4r_ef/ef_drawstripestrategy.s similarity index 99% rename from asm/libnw4r_ef/ef_drawstripestrategy_800c03d0.s rename to asm/libnw4r_ef/ef_drawstripestrategy.s index e4f87d62..a1a65df5 100644 --- a/asm/libnw4r_ef/ef_drawstripestrategy_800c03d0.s +++ b/asm/libnw4r_ef/ef_drawstripestrategy.s @@ -3996,3 +3996,73 @@ __dt__Q34nw4r2ef18DrawStripeStrategyFv: /* 800C3A84 000BF8C4 00 00 00 00 */ .4byte 0x00000000 /* 800C3A88 000BF8C8 00 00 00 00 */ .4byte 0x00000000 /* 800C3A8C 000BF8CC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef18DrawStripeStrategy +__vt__Q34nw4r2ef18DrawStripeStrategy: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r2ef18DrawStripeStrategyFv + .4byte Draw__Q34nw4r2ef18DrawStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager + .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi + .4byte GetCalcAheadFunc__Q34nw4r2ef18DrawStripeStrategyFPQ34nw4r2ef15ParticleManager + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@11761" +"@11761": + + .4byte 0x3C23D70A + +.global "@11762" +"@11762": + + .4byte 0x3F800000 + +.global "@11769" +"@11769": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@11929" +"@11929": + + .4byte 0x34000000 + +.global "@11930" +"@11930": + + .4byte 0x3CC90FDB + +.global "@11931" +"@11931": + + .4byte 0 + .4byte 0 + +.global "@11940" +"@11940": + + .4byte 0x43300000 + .4byte 0 + +.global "@12421" +"@12421": + + .4byte 0x43B40000 + +.global "@12422" +"@12422": + + .4byte 0x3F360B61 + +.global "@12628" +"@12628": + + .4byte 0xBF800000 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawstripestrategy_80440498.s b/asm/libnw4r_ef/ef_drawstripestrategy_80440498.s deleted file mode 100644 index b65df6e3..00000000 --- a/asm/libnw4r_ef/ef_drawstripestrategy_80440498.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef18DrawStripeStrategy -__vt__Q34nw4r2ef18DrawStripeStrategy: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r2ef18DrawStripeStrategyFv - .4byte Draw__Q34nw4r2ef18DrawStripeStrategyFRCQ34nw4r2ef8DrawInfoPQ34nw4r2ef15ParticleManager - .4byte GetGetFirstDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .4byte GetGetNextDrawParticleFunc__Q34nw4r2ef16DrawStrategyImplFi - .4byte GetCalcAheadFunc__Q34nw4r2ef18DrawStripeStrategyFPQ34nw4r2ef15ParticleManager - .4byte 0 diff --git a/asm/libnw4r_ef/ef_drawstripestrategy_8055edb8.s b/asm/libnw4r_ef/ef_drawstripestrategy_8055edb8.s deleted file mode 100644 index 4e9b0ec5..00000000 --- a/asm/libnw4r_ef/ef_drawstripestrategy_8055edb8.s +++ /dev/null @@ -1,56 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@11761" -"@11761": - - .4byte 0x3C23D70A - -.global "@11762" -"@11762": - - .4byte 0x3F800000 - -.global "@11769" -"@11769": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@11929" -"@11929": - - .4byte 0x34000000 - -.global "@11930" -"@11930": - - .4byte 0x3CC90FDB - -.global "@11931" -"@11931": - - .4byte 0 - .4byte 0 - -.global "@11940" -"@11940": - - .4byte 0x43300000 - .4byte 0 - -.global "@12421" -"@12421": - - .4byte 0x43B40000 - -.global "@12422" -"@12422": - - .4byte 0x3F360B61 - -.global "@12628" -"@12628": - - .4byte 0xBF800000 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_effect_800a3a70.s b/asm/libnw4r_ef/ef_effect.s similarity index 98% rename from asm/libnw4r_ef/ef_effect_800a3a70.s rename to asm/libnw4r_ef/ef_effect.s index cc0af677..2e74af77 100644 --- a/asm/libnw4r_ef/ef_effect_800a3a70.s +++ b/asm/libnw4r_ef/ef_effect.s @@ -933,3 +933,25 @@ lbl_800A4648: /* 800A4664 000A04A4 00 00 00 00 */ .4byte 0x00000000 /* 800A4668 000A04A8 00 00 00 00 */ .4byte 0x00000000 /* 800A466C 000A04AC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef6Effect +__vt__Q34nw4r2ef6Effect: + + .4byte 0 + .4byte 0 + .4byte SendClosing__Q34nw4r2ef6EffectFv + .4byte DestroyFunc__Q34nw4r2ef6EffectFv + .4byte Initialize__Q34nw4r2ef6EffectFPQ34nw4r2ef12EffectSystemPQ34nw4r2ef15EmitterResourceUs + .4byte CreateEmitter__Q34nw4r2ef6EffectFQ34nw4r2ef10ResEmitterUcUs + .4byte Calc__Q34nw4r2ef6EffectFQ34nw4r2ef10CalcOption + .4byte Draw__Q34nw4r2ef6EffectFRCQ34nw4r2ef8DrawInfo +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@8467" +"@8467": + + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_effect_80440078.s b/asm/libnw4r_ef/ef_effect_80440078.s deleted file mode 100644 index c8e40568..00000000 --- a/asm/libnw4r_ef/ef_effect_80440078.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef6Effect -__vt__Q34nw4r2ef6Effect: - - .4byte 0 - .4byte 0 - .4byte SendClosing__Q34nw4r2ef6EffectFv - .4byte DestroyFunc__Q34nw4r2ef6EffectFv - .4byte Initialize__Q34nw4r2ef6EffectFPQ34nw4r2ef12EffectSystemPQ34nw4r2ef15EmitterResourceUs - .4byte CreateEmitter__Q34nw4r2ef6EffectFQ34nw4r2ef10ResEmitterUcUs - .4byte Calc__Q34nw4r2ef6EffectFQ34nw4r2ef10CalcOption - .4byte Draw__Q34nw4r2ef6EffectFRCQ34nw4r2ef8DrawInfo diff --git a/asm/libnw4r_ef/ef_effect_8055e970.s b/asm/libnw4r_ef/ef_effect_8055e970.s deleted file mode 100644 index 2ad0cf5c..00000000 --- a/asm/libnw4r_ef/ef_effect_8055e970.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@8467" -"@8467": - - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_effectsystem_800a4670.s b/asm/libnw4r_ef/ef_effectsystem.s similarity index 93% rename from asm/libnw4r_ef/ef_effectsystem_800a4670.s rename to asm/libnw4r_ef/ef_effectsystem.s index 1f9e9ac1..14bd0d8e 100644 --- a/asm/libnw4r_ef/ef_effectsystem_800a4670.s +++ b/asm/libnw4r_ef/ef_effectsystem.s @@ -496,3 +496,91 @@ lbl_800A4D04: /* 800A4D44 000A0B84 38 21 00 20 */ addi r1, r1, 0x20 /* 800A4D48 000A0B88 4E 80 00 20 */ blr /* 800A4D4C 000A0B8C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1ef_effectsystem_cpp" +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@7903" +"@7903": + + .4byte 0x3C3C204E + .4byte 0x57345220 + .4byte 0x2020202D + .4byte 0x20454620 + .4byte 0x0966696E + .4byte 0x616C2020 + .4byte 0x20627569 + .4byte 0x6C643A20 + .4byte 0x4D617220 + .4byte 0x20312032 + .4byte 0x30313120 + .4byte 0x31333A33 + .4byte 0x313A3337 + .4byte 0x20283078 + .4byte 0x34333032 + .4byte 0x5F313838 + .4byte 0x29203E3E + .4byte 0 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global mSortEffectOperatorZDrawInfo__Q34nw4r2ef12EffectSystem +mSortEffectOperatorZDrawInfo__Q34nw4r2ef12EffectSystem: + .skip 0xAC + +.global instance__Q34nw4r2ef12EffectSystem +instance__Q34nw4r2ef12EffectSystem: + .skip 0x1CD8 + +.global lbl_80500004 +lbl_80500004: + .skip 0x10 + +.global lbl_80500014 +lbl_80500014: + .skip 0x1C + +.global lbl_80500030 +lbl_80500030: + .skip 0xA368 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "NW4R_EF_Version___29@unnamed@ef_effectsystem_cpp@" +"NW4R_EF_Version___29@unnamed@ef_effectsystem_cpp@": + + .4byte "@7903" + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global gBasicDrawOrder__Q24nw4r2ef +gBasicDrawOrder__Q24nw4r2ef: + .skip 0x4 + +.global gBasicDrawStrategyBuilder__Q24nw4r2ef +gBasicDrawStrategyBuilder__Q24nw4r2ef: + .skip 0x4 + +.global gBasicEmitFormBuilder__Q24nw4r2ef +gBasicEmitFormBuilder__Q24nw4r2ef: + .skip 0x4 + +.global mDisplayVersion__Q34nw4r2ef12EffectSystem +mDisplayVersion__Q34nw4r2ef12EffectSystem: + .skip 0x4 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@8588" +"@8588": + + .4byte 0 + +.global "@8613_8055E97C" +"@8613_8055E97C": + + .4byte 0x3F800000 diff --git a/asm/libnw4r_ef/ef_effectsystem_80406268.s b/asm/libnw4r_ef/ef_effectsystem_80406268.s deleted file mode 100644 index faa20397..00000000 --- a/asm/libnw4r_ef/ef_effectsystem_80406268.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1ef_effectsystem_cpp" diff --git a/asm/libnw4r_ef/ef_effectsystem_80440098.s b/asm/libnw4r_ef/ef_effectsystem_80440098.s deleted file mode 100644 index 94c18d0a..00000000 --- a/asm/libnw4r_ef/ef_effectsystem_80440098.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@7903" -"@7903": - - .4byte 0x3C3C204E - .4byte 0x57345220 - .4byte 0x2020202D - .4byte 0x20454620 - .4byte 0x0966696E - .4byte 0x616C2020 - .4byte 0x20627569 - .4byte 0x6C643A20 - .4byte 0x4D617220 - .4byte 0x20312032 - .4byte 0x30313120 - .4byte 0x31333A33 - .4byte 0x313A3337 - .4byte 0x20283078 - .4byte 0x34333032 - .4byte 0x5F313838 - .4byte 0x29203E3E - .4byte 0 diff --git a/asm/libnw4r_ef/ef_effectsystem_804fe280.s b/asm/libnw4r_ef/ef_effectsystem_804fe280.s deleted file mode 100644 index 776a721c..00000000 --- a/asm/libnw4r_ef/ef_effectsystem_804fe280.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global mSortEffectOperatorZDrawInfo__Q34nw4r2ef12EffectSystem -mSortEffectOperatorZDrawInfo__Q34nw4r2ef12EffectSystem: - .skip 0xAC - -.global instance__Q34nw4r2ef12EffectSystem -instance__Q34nw4r2ef12EffectSystem: - .skip 0x1CD8 - -.global lbl_80500004 -lbl_80500004: - .skip 0x10 - -.global lbl_80500014 -lbl_80500014: - .skip 0x1C - -.global lbl_80500030 -lbl_80500030: - .skip 0xA368 diff --git a/asm/libnw4r_ef/ef_effectsystem_80556958.s b/asm/libnw4r_ef/ef_effectsystem_80556958.s deleted file mode 100644 index 94ec7599..00000000 --- a/asm/libnw4r_ef/ef_effectsystem_80556958.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "NW4R_EF_Version___29@unnamed@ef_effectsystem_cpp@" -"NW4R_EF_Version___29@unnamed@ef_effectsystem_cpp@": - - .4byte "@7903" - .4byte 0 diff --git a/asm/libnw4r_ef/ef_effectsystem_8055cf20.s b/asm/libnw4r_ef/ef_effectsystem_8055cf20.s deleted file mode 100644 index 62501814..00000000 --- a/asm/libnw4r_ef/ef_effectsystem_8055cf20.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global gBasicDrawOrder__Q24nw4r2ef -gBasicDrawOrder__Q24nw4r2ef: - .skip 0x4 - -.global gBasicDrawStrategyBuilder__Q24nw4r2ef -gBasicDrawStrategyBuilder__Q24nw4r2ef: - .skip 0x4 - -.global gBasicEmitFormBuilder__Q24nw4r2ef -gBasicEmitFormBuilder__Q24nw4r2ef: - .skip 0x4 - -.global mDisplayVersion__Q34nw4r2ef12EffectSystem -mDisplayVersion__Q34nw4r2ef12EffectSystem: - .skip 0x4 diff --git a/asm/libnw4r_ef/ef_effectsystem_8055e978.s b/asm/libnw4r_ef/ef_effectsystem_8055e978.s deleted file mode 100644 index 23d56b4d..00000000 --- a/asm/libnw4r_ef/ef_effectsystem_8055e978.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@8588" -"@8588": - - .4byte 0 - -.global "@8613_8055E97C" -"@8613_8055E97C": - - .4byte 0x3F800000 diff --git a/asm/libnw4r_ef/ef_emform_800b4ad0.s b/asm/libnw4r_ef/ef_emform.s similarity index 80% rename from asm/libnw4r_ef/ef_emform_800b4ad0.s rename to asm/libnw4r_ef/ef_emform.s index 6dff3905..bca5af66 100644 --- a/asm/libnw4r_ef/ef_emform_800b4ad0.s +++ b/asm/libnw4r_ef/ef_emform.s @@ -78,3 +78,47 @@ lbl_800B4B44: /* 800B4BA4 000B09E4 4E 80 00 20 */ blr /* 800B4BA8 000B09E8 00 00 00 00 */ .4byte 0x00000000 /* 800B4BAC 000B09EC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1ef_emform_cpp" +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef15EmitFormBuilder +__vt__Q34nw4r2ef15EmitFormBuilder: + + .4byte 0 + .4byte 0 + .4byte Create__Q34nw4r2ef15EmitFormBuilderFQ34nw4r2ef12EmitFormType + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global gEmitterFormDisc__Q24nw4r2ef +gEmitterFormDisc__Q24nw4r2ef: + .skip 0x4 + +.global gEmitterFormLine__Q24nw4r2ef +gEmitterFormLine__Q24nw4r2ef: + .skip 0x4 + +.global gEmitterFormCylinder__Q24nw4r2ef +gEmitterFormCylinder__Q24nw4r2ef: + .skip 0x4 + +.global gEmitterFormSphere__Q24nw4r2ef +gEmitterFormSphere__Q24nw4r2ef: + .skip 0x4 + +.global gEmitterFormTorus__Q24nw4r2ef +gEmitterFormTorus__Q24nw4r2ef: + .skip 0x4 + +.global gEmitterFormCube__Q24nw4r2ef +gEmitterFormCube__Q24nw4r2ef: + .skip 0x4 + +.global gEmitterFormPoint__Q24nw4r2ef +gEmitterFormPoint__Q24nw4r2ef: + .skip 0x8 diff --git a/asm/libnw4r_ef/ef_emform_80406274.s b/asm/libnw4r_ef/ef_emform_80406274.s deleted file mode 100644 index f8e8e86a..00000000 --- a/asm/libnw4r_ef/ef_emform_80406274.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1ef_emform_cpp" diff --git a/asm/libnw4r_ef/ef_emform_80440368.s b/asm/libnw4r_ef/ef_emform_80440368.s deleted file mode 100644 index 60208aaf..00000000 --- a/asm/libnw4r_ef/ef_emform_80440368.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef15EmitFormBuilder -__vt__Q34nw4r2ef15EmitFormBuilder: - - .4byte 0 - .4byte 0 - .4byte Create__Q34nw4r2ef15EmitFormBuilderFQ34nw4r2ef12EmitFormType - .4byte 0 diff --git a/asm/libnw4r_ef/ef_emform_8055cf38.s b/asm/libnw4r_ef/ef_emform_8055cf38.s deleted file mode 100644 index 5f95e939..00000000 --- a/asm/libnw4r_ef/ef_emform_8055cf38.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global gEmitterFormDisc__Q24nw4r2ef -gEmitterFormDisc__Q24nw4r2ef: - .skip 0x4 - -.global gEmitterFormLine__Q24nw4r2ef -gEmitterFormLine__Q24nw4r2ef: - .skip 0x4 - -.global gEmitterFormCylinder__Q24nw4r2ef -gEmitterFormCylinder__Q24nw4r2ef: - .skip 0x4 - -.global gEmitterFormSphere__Q24nw4r2ef -gEmitterFormSphere__Q24nw4r2ef: - .skip 0x4 - -.global gEmitterFormTorus__Q24nw4r2ef -gEmitterFormTorus__Q24nw4r2ef: - .skip 0x4 - -.global gEmitterFormCube__Q24nw4r2ef -gEmitterFormCube__Q24nw4r2ef: - .skip 0x4 - -.global gEmitterFormPoint__Q24nw4r2ef -gEmitterFormPoint__Q24nw4r2ef: - .skip 0x8 diff --git a/asm/libnw4r_ef/ef_emitter_800a4d50.s b/asm/libnw4r_ef/ef_emitter.s similarity index 99% rename from asm/libnw4r_ef/ef_emitter_800a4d50.s rename to asm/libnw4r_ef/ef_emitter.s index 5fe2b25a..e1cf9396 100644 --- a/asm/libnw4r_ef/ef_emitter_800a4d50.s +++ b/asm/libnw4r_ef/ef_emitter.s @@ -2471,3 +2471,75 @@ lbl_800A6ED8: /* 800A6EE4 000A2D24 7C 08 03 A6 */ mtlr r0 /* 800A6EE8 000A2D28 38 21 00 20 */ addi r1, r1, 0x20 /* 800A6EEC 000A2D2C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef7Emitter +__vt__Q34nw4r2ef7Emitter: + + .4byte 0 + .4byte 0 + .4byte SendClosing__Q34nw4r2ef7EmitterFv + .4byte DestroyFunc__Q34nw4r2ef7EmitterFv + .4byte Initialize__Q34nw4r2ef7EmitterFPQ34nw4r2ef6EffectPQ34nw4r2ef15EmitterResourceUc + .4byte CreateEmitter__Q34nw4r2ef7EmitterFPQ34nw4r2ef15EmitterResourcePQ34nw4r2ef21EmitterInheritSettingPQ34nw4r2ef8ParticleUsPQ34nw4r4math4VEC3 + .4byte CalcEmitter__Q34nw4r2ef7EmitterFv + .4byte CalcParticle__Q34nw4r2ef7EmitterFv + .4byte CalcEmission__Q34nw4r2ef7EmitterFv + .4byte CalcBillboard__Q34nw4r2ef7EmitterFv +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@9108" +"@9108": + + .4byte 0x42C80000 + +.global "@9109" +"@9109": + + .4byte 0 + +.global "@9110" +"@9110": + + .4byte 0x7FC00000 + .4byte 0 + +.global "@9116" +"@9116": + + .4byte 0x43300000 + .4byte 0 + +.global "@9117" +"@9117": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@9451" +"@9451": + + .4byte 0xBF800000 + +.global "@9488" +"@9488": + + .4byte 0x3F800000 + +.global "@9546_8055E9A8" +"@9546_8055E9A8": + + .4byte 0x47800000 + +.global "@9547_8055E9AC" +"@9547_8055E9AC": + + .4byte 0x40000000 + +.global "@9717" +"@9717": + + .4byte 0x3FC90FDB + .4byte 0 diff --git a/asm/libnw4r_ef/ef_emitter_804400e0.s b/asm/libnw4r_ef/ef_emitter_804400e0.s deleted file mode 100644 index 1984d618..00000000 --- a/asm/libnw4r_ef/ef_emitter_804400e0.s +++ /dev/null @@ -1,16 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef7Emitter -__vt__Q34nw4r2ef7Emitter: - - .4byte 0 - .4byte 0 - .4byte SendClosing__Q34nw4r2ef7EmitterFv - .4byte DestroyFunc__Q34nw4r2ef7EmitterFv - .4byte Initialize__Q34nw4r2ef7EmitterFPQ34nw4r2ef6EffectPQ34nw4r2ef15EmitterResourceUc - .4byte CreateEmitter__Q34nw4r2ef7EmitterFPQ34nw4r2ef15EmitterResourcePQ34nw4r2ef21EmitterInheritSettingPQ34nw4r2ef8ParticleUsPQ34nw4r4math4VEC3 - .4byte CalcEmitter__Q34nw4r2ef7EmitterFv - .4byte CalcParticle__Q34nw4r2ef7EmitterFv - .4byte CalcEmission__Q34nw4r2ef7EmitterFv - .4byte CalcBillboard__Q34nw4r2ef7EmitterFv diff --git a/asm/libnw4r_ef/ef_emitter_8055e980.s b/asm/libnw4r_ef/ef_emitter_8055e980.s deleted file mode 100644 index 3cd81a85..00000000 --- a/asm/libnw4r_ef/ef_emitter_8055e980.s +++ /dev/null @@ -1,56 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@9108" -"@9108": - - .4byte 0x42C80000 - -.global "@9109" -"@9109": - - .4byte 0 - -.global "@9110" -"@9110": - - .4byte 0x7FC00000 - .4byte 0 - -.global "@9116" -"@9116": - - .4byte 0x43300000 - .4byte 0 - -.global "@9117" -"@9117": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@9451" -"@9451": - - .4byte 0xBF800000 - -.global "@9488" -"@9488": - - .4byte 0x3F800000 - -.global "@9546_8055E9A8" -"@9546_8055E9A8": - - .4byte 0x47800000 - -.global "@9547_8055E9AC" -"@9547_8055E9AC": - - .4byte 0x40000000 - -.global "@9717" -"@9717": - - .4byte 0x3FC90FDB - .4byte 0 diff --git a/asm/libnw4r_ef/ef_emitterform_800b40f0.s b/asm/libnw4r_ef/ef_emitterform.s similarity index 97% rename from asm/libnw4r_ef/ef_emitterform_800b40f0.s rename to asm/libnw4r_ef/ef_emitterform.s index 272fafee..2f90fbf4 100644 --- a/asm/libnw4r_ef/ef_emitterform_800b40f0.s +++ b/asm/libnw4r_ef/ef_emitterform.s @@ -387,3 +387,53 @@ lbl_800B4678: /* 800B4684 000B04C4 00 00 00 00 */ .4byte 0x00000000 /* 800B4688 000B04C8 00 00 00 00 */ .4byte 0x00000000 /* 800B468C 000B04CC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@7729" +"@7729": + + .4byte 0 + +.global "@7730" +"@7730": + + .4byte 0x47800000 + +.global "@7731" +"@7731": + + .4byte 0x40000000 + +.global "@7732" +"@7732": + + .4byte 0x40490FDB + +.global "@7733" +"@7733": + + .4byte 0x3F800000 + +.global "@7734" +"@7734": + + .4byte 0x3C23D70A + +.global "@7742" +"@7742": + + .4byte 0x43300000 + .4byte 0 + +.global "@7743" +"@7743": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@7754_8055EB28" +"@7754_8055EB28": + + .4byte 0x477FFF00 + .4byte 0 diff --git a/asm/libnw4r_ef/ef_emitterform_8055eb00.s b/asm/libnw4r_ef/ef_emitterform_8055eb00.s deleted file mode 100644 index ee3c3f3f..00000000 --- a/asm/libnw4r_ef/ef_emitterform_8055eb00.s +++ /dev/null @@ -1,50 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@7729" -"@7729": - - .4byte 0 - -.global "@7730" -"@7730": - - .4byte 0x47800000 - -.global "@7731" -"@7731": - - .4byte 0x40000000 - -.global "@7732" -"@7732": - - .4byte 0x40490FDB - -.global "@7733" -"@7733": - - .4byte 0x3F800000 - -.global "@7734" -"@7734": - - .4byte 0x3C23D70A - -.global "@7742" -"@7742": - - .4byte 0x43300000 - .4byte 0 - -.global "@7743" -"@7743": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@7754_8055EB28" -"@7754_8055EB28": - - .4byte 0x477FFF00 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_handle_800b4030.s b/asm/libnw4r_ef/ef_handle.s similarity index 100% rename from asm/libnw4r_ef/ef_handle_800b4030.s rename to asm/libnw4r_ef/ef_handle.s diff --git a/asm/libnw4r_ef/ef_line_800b4f00.s b/asm/libnw4r_ef/ef_line.s similarity index 94% rename from asm/libnw4r_ef/ef_line_800b4f00.s rename to asm/libnw4r_ef/ef_line.s index c478b0d4..b7b196ff 100644 --- a/asm/libnw4r_ef/ef_line_800b4f00.s +++ b/asm/libnw4r_ef/ef_line.s @@ -225,3 +225,53 @@ lbl_800B51D8: /* 800B5234 000B1074 4E 80 00 20 */ blr /* 800B5238 000B1078 00 00 00 00 */ .4byte 0x00000000 /* 800B523C 000B107C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef15EmitterFormLine +__vt__Q34nw4r2ef15EmitterFormLine: + + .4byte 0 + .4byte 0 + .4byte Emission__Q34nw4r2ef15EmitterFormLineFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@7653" +"@7653": + + .4byte 0x47800000 + +.global "@7654" +"@7654": + + .4byte 0 + +.global "@7655" +"@7655": + + .4byte 0x3F000000 + +.global "@7656" +"@7656": + + .4byte 0x3F800000 + +.global "@7657_8055EB70" +"@7657_8055EB70": + + .4byte 0x3C23D70A + .4byte 0 + +.global "@7665" +"@7665": + + .4byte 0x43300000 + .4byte 0 + +.global "@7666" +"@7666": + + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_ef/ef_line_80440388.s b/asm/libnw4r_ef/ef_line_80440388.s deleted file mode 100644 index 8a05e45e..00000000 --- a/asm/libnw4r_ef/ef_line_80440388.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef15EmitterFormLine -__vt__Q34nw4r2ef15EmitterFormLine: - - .4byte 0 - .4byte 0 - .4byte Emission__Q34nw4r2ef15EmitterFormLineFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_line_8055eb60.s b/asm/libnw4r_ef/ef_line_8055eb60.s deleted file mode 100644 index 0f3e5883..00000000 --- a/asm/libnw4r_ef/ef_line_8055eb60.s +++ /dev/null @@ -1,40 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@7653" -"@7653": - - .4byte 0x47800000 - -.global "@7654" -"@7654": - - .4byte 0 - -.global "@7655" -"@7655": - - .4byte 0x3F000000 - -.global "@7656" -"@7656": - - .4byte 0x3F800000 - -.global "@7657_8055EB70" -"@7657_8055EB70": - - .4byte 0x3C23D70A - .4byte 0 - -.global "@7665" -"@7665": - - .4byte 0x43300000 - .4byte 0 - -.global "@7666" -"@7666": - - .4byte 0x43300000 - .4byte 0x80000000 diff --git a/asm/libnw4r_ef/ef_particle_800af490.s b/asm/libnw4r_ef/ef_particle.s similarity index 97% rename from asm/libnw4r_ef/ef_particle_800af490.s rename to asm/libnw4r_ef/ef_particle.s index 7f021878..38762dac 100644 --- a/asm/libnw4r_ef/ef_particle_800af490.s +++ b/asm/libnw4r_ef/ef_particle.s @@ -980,3 +980,101 @@ lbl_800B023C: /* 800B0254 000AC094 00 00 00 00 */ .4byte 0x00000000 /* 800B0258 000AC098 00 00 00 00 */ .4byte 0x00000000 /* 800B025C 000AC09C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef8Particle +__vt__Q34nw4r2ef8Particle: + + .4byte 0 + .4byte 0 + .4byte SendClosing__Q34nw4r2ef8ParticleFv + .4byte DestroyFunc__Q34nw4r2ef8ParticleFv + .4byte Initialize__Q34nw4r2ef8ParticleFUsQ34nw4r4math4VEC3Q34nw4r4math4VEC3PQ34nw4r2ef15ParticleManagerPCQ34nw4r4math5MTX34fPCQ34nw4r2ef21EmitterInheritSettingPQ34nw4r2ef8Particle + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@8602" +"@8602": + + .4byte 0x47800000 + +.global "@8603" +"@8603": + + .4byte 0x40000000 + +.global "@8604" +"@8604": + + .4byte 0x3F800000 + +.global "@8605" +"@8605": + + .4byte 0x42C80000 + +.global "@8606" +"@8606": + + .4byte 0x43000000 + +.global "@8607" +"@8607": + + .4byte 0x40490FDB + +.global "@8608" +"@8608": + + .4byte 0x3F000000 + .4byte 0 + +.global "@8613_8055EA48" +"@8613_8055EA48": + + .4byte 0x43300000 + .4byte 0 + +.global "@8192" +"@8192": + + .4byte 0xFFFFFFFF + +.global "@8194" +"@8194": + + .4byte 0xFFFFFFFF + +.global "@8839" +"@8839": + + .4byte 0 + +.global "@8840" +"@8840": + + .4byte 0x3C23D70A + +.global "@8841" +"@8841": + + .4byte 0x3CC90FDB + .4byte 0 + +.global "@8851" +"@8851": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@8888_8055EA70" +"@8888_8055EA70": + + .4byte 0x4222F983 + +.global "@8889" +"@8889": + + .4byte 0x40C90FDB diff --git a/asm/libnw4r_ef/ef_particle_80440308.s b/asm/libnw4r_ef/ef_particle_80440308.s deleted file mode 100644 index 6d4bdff2..00000000 --- a/asm/libnw4r_ef/ef_particle_80440308.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef8Particle -__vt__Q34nw4r2ef8Particle: - - .4byte 0 - .4byte 0 - .4byte SendClosing__Q34nw4r2ef8ParticleFv - .4byte DestroyFunc__Q34nw4r2ef8ParticleFv - .4byte Initialize__Q34nw4r2ef8ParticleFUsQ34nw4r4math4VEC3Q34nw4r4math4VEC3PQ34nw4r2ef15ParticleManagerPCQ34nw4r4math5MTX34fPCQ34nw4r2ef21EmitterInheritSettingPQ34nw4r2ef8Particle - .4byte 0 diff --git a/asm/libnw4r_ef/ef_particle_8055ea28.s b/asm/libnw4r_ef/ef_particle_8055ea28.s deleted file mode 100644 index 1a0fecaa..00000000 --- a/asm/libnw4r_ef/ef_particle_8055ea28.s +++ /dev/null @@ -1,86 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@8602" -"@8602": - - .4byte 0x47800000 - -.global "@8603" -"@8603": - - .4byte 0x40000000 - -.global "@8604" -"@8604": - - .4byte 0x3F800000 - -.global "@8605" -"@8605": - - .4byte 0x42C80000 - -.global "@8606" -"@8606": - - .4byte 0x43000000 - -.global "@8607" -"@8607": - - .4byte 0x40490FDB - -.global "@8608" -"@8608": - - .4byte 0x3F000000 - .4byte 0 - -.global "@8613_8055EA48" -"@8613_8055EA48": - - .4byte 0x43300000 - .4byte 0 - -.global "@8192" -"@8192": - - .4byte 0xFFFFFFFF - -.global "@8194" -"@8194": - - .4byte 0xFFFFFFFF - -.global "@8839" -"@8839": - - .4byte 0 - -.global "@8840" -"@8840": - - .4byte 0x3C23D70A - -.global "@8841" -"@8841": - - .4byte 0x3CC90FDB - .4byte 0 - -.global "@8851" -"@8851": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@8888_8055EA70" -"@8888_8055EA70": - - .4byte 0x4222F983 - -.global "@8889" -"@8889": - - .4byte 0x40C90FDB diff --git a/asm/libnw4r_ef/ef_particlemanager_800b0260.s b/asm/libnw4r_ef/ef_particlemanager.s similarity index 98% rename from asm/libnw4r_ef/ef_particlemanager_800b0260.s rename to asm/libnw4r_ef/ef_particlemanager.s index 08c970b5..00d3531f 100644 --- a/asm/libnw4r_ef/ef_particlemanager_800b0260.s +++ b/asm/libnw4r_ef/ef_particlemanager.s @@ -2493,3 +2493,123 @@ lbl_800B2514: /* 800B2534 000AE374 00 00 00 00 */ .4byte 0x00000000 /* 800B2538 000AE378 00 00 00 00 */ .4byte 0x00000000 /* 800B253C 000AE37C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1ef_particlemanager_cpp" +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@11043" +"@11043": + + .4byte lbl_800B0E90 + .4byte lbl_800B0E68 + .4byte lbl_800B1394 + .4byte lbl_800B13E8 + .4byte lbl_800B1478 + .4byte lbl_800B15E8 + .4byte lbl_800B1328 + .4byte lbl_800B0ED4 + .4byte lbl_800B1578 + .4byte 0 + +.global __vt__Q34nw4r2ef15ParticleManager +__vt__Q34nw4r2ef15ParticleManager: + + .4byte 0 + .4byte 0 + .4byte SendClosing__Q34nw4r2ef15ParticleManagerFv + .4byte DestroyFunc__Q34nw4r2ef15ParticleManagerFv + .4byte Initialize__Q34nw4r2ef15ParticleManagerFPQ34nw4r2ef7EmitterPQ34nw4r2ef15EmitterResource + .4byte CreateParticle__Q34nw4r2ef15ParticleManagerFUsQ34nw4r4math4VEC3Q34nw4r4math4VEC3PCQ34nw4r4math5MTX34fPCQ34nw4r2ef21EmitterInheritSettingPQ34nw4r2ef8ParticleUs + .4byte Calc__Q34nw4r2ef15ParticleManagerFv + .4byte Draw__Q34nw4r2ef15ParticleManagerFRCQ34nw4r2ef8DrawInfo +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global smDrawMtxPMtoEM__Q34nw4r2ef15ParticleManager +smDrawMtxPMtoEM__Q34nw4r2ef15ParticleManager: + .skip 0x30 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global smMtxInvId__Q34nw4r2ef15ParticleManager +smMtxInvId__Q34nw4r2ef15ParticleManager: + .skip 0x8 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@10377" +"@10377": + + .4byte 0x3F800000 + +.global "@10378" +"@10378": + + .4byte 0 + +.global "@11032_8055EA80" +"@11032_8055EA80": + + .4byte 0x3F13CD3A + +.global "@11033" +"@11033": + + .4byte 0x47000000 + +.global "@11034" +"@11034": + + .4byte 0x477FFF00 + +.global "@11035" +"@11035": + + .4byte 0x40000000 + +.global "@11036" +"@11036": + + .4byte 0x40490FDB + +.global "@11037" +"@11037": + + .4byte 0x4222F983 + +.global "@11038" +"@11038": + + .4byte 0x40000000 + .4byte 0 + +.global "@11039" +"@11039": + + .4byte 0xBF800000 + .4byte 0 + +.global "@11044" +"@11044": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@11045" +"@11045": + + .4byte 0x43300000 + .4byte 0 + +.global "@11202" +"@11202": + + .4byte 0x34000000 + +.global "@11203_8055EABC" +"@11203_8055EABC": + + .4byte 0x43800000 diff --git a/asm/libnw4r_ef/ef_particlemanager_8040626c.s b/asm/libnw4r_ef/ef_particlemanager_8040626c.s deleted file mode 100644 index 6c76a28f..00000000 --- a/asm/libnw4r_ef/ef_particlemanager_8040626c.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1ef_particlemanager_cpp" diff --git a/asm/libnw4r_ef/ef_particlemanager_80440320.s b/asm/libnw4r_ef/ef_particlemanager_80440320.s deleted file mode 100644 index 125fca38..00000000 --- a/asm/libnw4r_ef/ef_particlemanager_80440320.s +++ /dev/null @@ -1,28 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@11043" -"@11043": - - .4byte lbl_800B0E90 - .4byte lbl_800B0E68 - .4byte lbl_800B1394 - .4byte lbl_800B13E8 - .4byte lbl_800B1478 - .4byte lbl_800B15E8 - .4byte lbl_800B1328 - .4byte lbl_800B0ED4 - .4byte lbl_800B1578 - .4byte 0 - -.global __vt__Q34nw4r2ef15ParticleManager -__vt__Q34nw4r2ef15ParticleManager: - - .4byte 0 - .4byte 0 - .4byte SendClosing__Q34nw4r2ef15ParticleManagerFv - .4byte DestroyFunc__Q34nw4r2ef15ParticleManagerFv - .4byte Initialize__Q34nw4r2ef15ParticleManagerFPQ34nw4r2ef7EmitterPQ34nw4r2ef15EmitterResource - .4byte CreateParticle__Q34nw4r2ef15ParticleManagerFUsQ34nw4r4math4VEC3Q34nw4r4math4VEC3PCQ34nw4r4math5MTX34fPCQ34nw4r2ef21EmitterInheritSettingPQ34nw4r2ef8ParticleUs - .4byte Calc__Q34nw4r2ef15ParticleManagerFv - .4byte Draw__Q34nw4r2ef15ParticleManagerFRCQ34nw4r2ef8DrawInfo diff --git a/asm/libnw4r_ef/ef_particlemanager_8050a398.s b/asm/libnw4r_ef/ef_particlemanager_8050a398.s deleted file mode 100644 index 1c7b7a87..00000000 --- a/asm/libnw4r_ef/ef_particlemanager_8050a398.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global smDrawMtxPMtoEM__Q34nw4r2ef15ParticleManager -smDrawMtxPMtoEM__Q34nw4r2ef15ParticleManager: - .skip 0x30 diff --git a/asm/libnw4r_ef/ef_particlemanager_8055cf30.s b/asm/libnw4r_ef/ef_particlemanager_8055cf30.s deleted file mode 100644 index b31d8300..00000000 --- a/asm/libnw4r_ef/ef_particlemanager_8055cf30.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global smMtxInvId__Q34nw4r2ef15ParticleManager -smMtxInvId__Q34nw4r2ef15ParticleManager: - .skip 0x8 diff --git a/asm/libnw4r_ef/ef_particlemanager_8055ea78.s b/asm/libnw4r_ef/ef_particlemanager_8055ea78.s deleted file mode 100644 index c21a02a8..00000000 --- a/asm/libnw4r_ef/ef_particlemanager_8055ea78.s +++ /dev/null @@ -1,76 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@10377" -"@10377": - - .4byte 0x3F800000 - -.global "@10378" -"@10378": - - .4byte 0 - -.global "@11032_8055EA80" -"@11032_8055EA80": - - .4byte 0x3F13CD3A - -.global "@11033" -"@11033": - - .4byte 0x47000000 - -.global "@11034" -"@11034": - - .4byte 0x477FFF00 - -.global "@11035" -"@11035": - - .4byte 0x40000000 - -.global "@11036" -"@11036": - - .4byte 0x40490FDB - -.global "@11037" -"@11037": - - .4byte 0x4222F983 - -.global "@11038" -"@11038": - - .4byte 0x40000000 - .4byte 0 - -.global "@11039" -"@11039": - - .4byte 0xBF800000 - .4byte 0 - -.global "@11044" -"@11044": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@11045" -"@11045": - - .4byte 0x43300000 - .4byte 0 - -.global "@11202" -"@11202": - - .4byte 0x34000000 - -.global "@11203_8055EABC" -"@11203_8055EABC": - - .4byte 0x43800000 diff --git a/asm/libnw4r_ef/ef_point_800b4bb0.s b/asm/libnw4r_ef/ef_point.s similarity index 93% rename from asm/libnw4r_ef/ef_point_800b4bb0.s rename to asm/libnw4r_ef/ef_point.s index c9cfa518..deb58c11 100644 --- a/asm/libnw4r_ef/ef_point_800b4bb0.s +++ b/asm/libnw4r_ef/ef_point.s @@ -229,3 +229,67 @@ lbl_800B4E80: /* 800B4EF4 000B0D34 4E 80 00 20 */ blr /* 800B4EF8 000B0D38 00 00 00 00 */ .4byte 0x00000000 /* 800B4EFC 000B0D3C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef16EmitterFormPoint +__vt__Q34nw4r2ef16EmitterFormPoint: + + .4byte 0 + .4byte 0 + .4byte Emission__Q34nw4r2ef16EmitterFormPointFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@7645" +"@7645": + + .4byte 0 + +.global "@7646" +"@7646": + + .4byte 0x47800000 + +.global "@7647" +"@7647": + + .4byte 0x40000000 + +.global "@7648" +"@7648": + + .4byte 0x3F800000 + +.global "@7649" +"@7649": + + .4byte 0x3F28F5C3 + +.global "@7650_8055EB44" +"@7650_8055EB44": + + .4byte 0x3EAE147B + +.global "@7651" +"@7651": + + .4byte 0x40490FDB + +.global "@7652" +"@7652": + + .4byte 0x3C23D70A + +.global "@7659" +"@7659": + + .4byte 0x43300000 + .4byte 0 + +.global "@7660_8055EB58" +"@7660_8055EB58": + + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_ef/ef_point_80440378.s b/asm/libnw4r_ef/ef_point_80440378.s deleted file mode 100644 index a93aa22f..00000000 --- a/asm/libnw4r_ef/ef_point_80440378.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef16EmitterFormPoint -__vt__Q34nw4r2ef16EmitterFormPoint: - - .4byte 0 - .4byte 0 - .4byte Emission__Q34nw4r2ef16EmitterFormPointFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_point_8055eb30.s b/asm/libnw4r_ef/ef_point_8055eb30.s deleted file mode 100644 index afe67ac3..00000000 --- a/asm/libnw4r_ef/ef_point_8055eb30.s +++ /dev/null @@ -1,54 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@7645" -"@7645": - - .4byte 0 - -.global "@7646" -"@7646": - - .4byte 0x47800000 - -.global "@7647" -"@7647": - - .4byte 0x40000000 - -.global "@7648" -"@7648": - - .4byte 0x3F800000 - -.global "@7649" -"@7649": - - .4byte 0x3F28F5C3 - -.global "@7650_8055EB44" -"@7650_8055EB44": - - .4byte 0x3EAE147B - -.global "@7651" -"@7651": - - .4byte 0x40490FDB - -.global "@7652" -"@7652": - - .4byte 0x3C23D70A - -.global "@7659" -"@7659": - - .4byte 0x43300000 - .4byte 0 - -.global "@7660_8055EB58" -"@7660_8055EB58": - - .4byte 0x43300000 - .4byte 0x80000000 diff --git a/asm/libnw4r_ef/ef_postfield_800abe00.s b/asm/libnw4r_ef/ef_postfield.s similarity index 99% rename from asm/libnw4r_ef/ef_postfield_800abe00.s rename to asm/libnw4r_ef/ef_postfield.s index dbadfb8b..23af6d58 100644 --- a/asm/libnw4r_ef/ef_postfield_800abe00.s +++ b/asm/libnw4r_ef/ef_postfield.s @@ -4053,3 +4053,75 @@ lbl_800AF468: /* 800AF484 000AB2C4 7C 08 03 A6 */ mtlr r0 /* 800AF488 000AB2C8 38 21 01 D0 */ addi r1, r1, 0x1d0 /* 800AF48C 000AB2CC 4E 80 00 20 */ blr +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@10295_8055E9F0" +"@10295_8055E9F0": + + .4byte 0xBF800000 + +.global "@10296" +"@10296": + + .4byte 0x3F800000 + +.global "@10297" +"@10297": + + .4byte 0 + +.global "@10450" +"@10450": + + .4byte 0x40000000 + +.global "@10451" +"@10451": + + .4byte 0x34000000 + +.global "@10548" +"@10548": + + .4byte 0x3F800001 + +.global "@10645" +"@10645": + + .4byte 0x3F800002 + +.global "@10769" +"@10769": + + .4byte 0x40800000 + +.global "@10770" +"@10770": + + .4byte 0xC0000000 + +.global "@10771" +"@10771": + + .4byte 0xB4000000 + +.global "@10772" +"@10772": + + .4byte 0x3F800054 + +.global "@10773" +"@10773": + + .4byte 0x3F7FFF58 + +.global "@11049" +"@11049": + + .4byte 0x3FC00000 + +.global "@11203_8055EA24" +"@11203_8055EA24": + + .4byte 0x28800000 diff --git a/asm/libnw4r_ef/ef_postfield_8055e9f0.s b/asm/libnw4r_ef/ef_postfield_8055e9f0.s deleted file mode 100644 index 9ec9366a..00000000 --- a/asm/libnw4r_ef/ef_postfield_8055e9f0.s +++ /dev/null @@ -1,72 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@10295_8055E9F0" -"@10295_8055E9F0": - - .4byte 0xBF800000 - -.global "@10296" -"@10296": - - .4byte 0x3F800000 - -.global "@10297" -"@10297": - - .4byte 0 - -.global "@10450" -"@10450": - - .4byte 0x40000000 - -.global "@10451" -"@10451": - - .4byte 0x34000000 - -.global "@10548" -"@10548": - - .4byte 0x3F800001 - -.global "@10645" -"@10645": - - .4byte 0x3F800002 - -.global "@10769" -"@10769": - - .4byte 0x40800000 - -.global "@10770" -"@10770": - - .4byte 0xC0000000 - -.global "@10771" -"@10771": - - .4byte 0xB4000000 - -.global "@10772" -"@10772": - - .4byte 0x3F800054 - -.global "@10773" -"@10773": - - .4byte 0x3F7FFF58 - -.global "@11049" -"@11049": - - .4byte 0x3FC00000 - -.global "@11203_8055EA24" -"@11203_8055EA24": - - .4byte 0x28800000 diff --git a/asm/libnw4r_ef/ef_resource_800b2540.s b/asm/libnw4r_ef/ef_resource.s similarity index 99% rename from asm/libnw4r_ef/ef_resource_800b2540.s rename to asm/libnw4r_ef/ef_resource.s index 964c2b3e..fa47ae5e 100644 --- a/asm/libnw4r_ef/ef_resource_800b2540.s +++ b/asm/libnw4r_ef/ef_resource.s @@ -910,3 +910,13 @@ lbl_800B3048: /* 800B30A4 000AEEE4 7C 08 03 A6 */ mtlr r0 /* 800B30A8 000AEEE8 38 21 00 10 */ addi r1, r1, 0x10 /* 800B30AC 000AEEEC 4E 80 00 20 */ blr +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1ef_resource_cpp" +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global mResource__Q34nw4r2ef8Resource +mResource__Q34nw4r2ef8Resource: + .skip 0x20 diff --git a/asm/libnw4r_ef/ef_resource_80406270.s b/asm/libnw4r_ef/ef_resource_80406270.s deleted file mode 100644 index 9d45fab2..00000000 --- a/asm/libnw4r_ef/ef_resource_80406270.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1ef_resource_cpp" diff --git a/asm/libnw4r_ef/ef_resource_8050a3c8.s b/asm/libnw4r_ef/ef_resource_8050a3c8.s deleted file mode 100644 index e031478b..00000000 --- a/asm/libnw4r_ef/ef_resource_8050a3c8.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global mResource__Q34nw4r2ef8Resource -mResource__Q34nw4r2ef8Resource: - .skip 0x20 diff --git a/asm/libnw4r_ef/ef_sphere_800b5780.s b/asm/libnw4r_ef/ef_sphere.s similarity index 96% rename from asm/libnw4r_ef/ef_sphere_800b5780.s rename to asm/libnw4r_ef/ef_sphere.s index 128cbc84..6483fdca 100644 --- a/asm/libnw4r_ef/ef_sphere_800b5780.s +++ b/asm/libnw4r_ef/ef_sphere.s @@ -593,3 +593,95 @@ lbl_800B5F2C: /* 800B5FD4 000B1E14 00 00 00 00 */ .4byte 0x00000000 /* 800B5FD8 000B1E18 00 00 00 00 */ .4byte 0x00000000 /* 800B5FDC 000B1E1C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef17EmitterFormSphere +__vt__Q34nw4r2ef17EmitterFormSphere: + + .4byte 0 + .4byte 0 + .4byte Emission__Q34nw4r2ef17EmitterFormSphereFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@7843" +"@7843": + + .4byte 0x42C80000 + +.global "@7844" +"@7844": + + .4byte 0x34000000 + +.global "@7845_8055EBD8" +"@7845_8055EBD8": + + .4byte 0x47800000 + +.global "@7846_8055EBDC" +"@7846_8055EBDC": + + .4byte 0x40000000 + +.global "@7847_8055EBE0" +"@7847_8055EBE0": + + .4byte 0x40490FDB + .4byte 0 + +.global "@7848_8055EBE8" +"@7848_8055EBE8": + + .4byte 0x401921FB + .4byte 0x60000000 + +.global "@7849_8055EBF0" +"@7849_8055EBF0": + + .4byte 0x39490FDB + +.global "@7850_8055EBF4" +"@7850_8055EBF4": + + .4byte 0x40C90E49 + +.global "@7851" +"@7851": + + .4byte 0x3FC90FDB + +.global "@7852" +"@7852": + + .4byte 0x3F800000 + +.global "@7853" +"@7853": + + .4byte 0 + +.global "@7854" +"@7854": + + .4byte 0xBF800000 + +.global "@7855" +"@7855": + + .4byte 0x3C23D70A + .4byte 0 + +.global "@7863" +"@7863": + + .4byte 0x43300000 + .4byte 0 + +.global "@7864" +"@7864": + + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_ef/ef_sphere_804403a8.s b/asm/libnw4r_ef/ef_sphere_804403a8.s deleted file mode 100644 index b8869aa3..00000000 --- a/asm/libnw4r_ef/ef_sphere_804403a8.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef17EmitterFormSphere -__vt__Q34nw4r2ef17EmitterFormSphere: - - .4byte 0 - .4byte 0 - .4byte Emission__Q34nw4r2ef17EmitterFormSphereFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_sphere_8055ebd0.s b/asm/libnw4r_ef/ef_sphere_8055ebd0.s deleted file mode 100644 index aab92d44..00000000 --- a/asm/libnw4r_ef/ef_sphere_8055ebd0.s +++ /dev/null @@ -1,82 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@7843" -"@7843": - - .4byte 0x42C80000 - -.global "@7844" -"@7844": - - .4byte 0x34000000 - -.global "@7845_8055EBD8" -"@7845_8055EBD8": - - .4byte 0x47800000 - -.global "@7846_8055EBDC" -"@7846_8055EBDC": - - .4byte 0x40000000 - -.global "@7847_8055EBE0" -"@7847_8055EBE0": - - .4byte 0x40490FDB - .4byte 0 - -.global "@7848_8055EBE8" -"@7848_8055EBE8": - - .4byte 0x401921FB - .4byte 0x60000000 - -.global "@7849_8055EBF0" -"@7849_8055EBF0": - - .4byte 0x39490FDB - -.global "@7850_8055EBF4" -"@7850_8055EBF4": - - .4byte 0x40C90E49 - -.global "@7851" -"@7851": - - .4byte 0x3FC90FDB - -.global "@7852" -"@7852": - - .4byte 0x3F800000 - -.global "@7853" -"@7853": - - .4byte 0 - -.global "@7854" -"@7854": - - .4byte 0xBF800000 - -.global "@7855" -"@7855": - - .4byte 0x3C23D70A - .4byte 0 - -.global "@7863" -"@7863": - - .4byte 0x43300000 - .4byte 0 - -.global "@7864" -"@7864": - - .4byte 0x43300000 - .4byte 0x80000000 diff --git a/asm/libnw4r_ef/ef_torus_800b6790.s b/asm/libnw4r_ef/ef_torus.s similarity index 95% rename from asm/libnw4r_ef/ef_torus_800b6790.s rename to asm/libnw4r_ef/ef_torus.s index 5eb5f134..09d06ac3 100644 --- a/asm/libnw4r_ef/ef_torus_800b6790.s +++ b/asm/libnw4r_ef/ef_torus.s @@ -445,3 +445,89 @@ lbl_800B6D24: /* 800B6DC4 000B2C04 38 21 01 E0 */ addi r1, r1, 0x1e0 /* 800B6DC8 000B2C08 4E 80 00 20 */ blr /* 800B6DCC 000B2C0C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ef16EmitterFormTorus +__vt__Q34nw4r2ef16EmitterFormTorus: + + .4byte 0 + .4byte 0 + .4byte Emission__Q34nw4r2ef16EmitterFormTorusFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@7765" +"@7765": + + .4byte 0x34000000 + +.global "@7766" +"@7766": + + .4byte 0 + +.global "@7767" +"@7767": + + .4byte 0x47800000 + +.global "@7768" +"@7768": + + .4byte 0x40000000 + +.global "@7769" +"@7769": + + .4byte 0x40490FDB + .4byte 0 + +.global "@7770_8055EC80" +"@7770_8055EC80": + + .4byte 0x401921FB + .4byte 0x60000000 + +.global "@7771_8055EC88" +"@7771_8055EC88": + + .4byte 0x39490FDB + +.global "@7772" +"@7772": + + .4byte 0x40C90E49 + +.global "@7773_8055EC90" +"@7773_8055EC90": + + .4byte 0x42C80000 + +.global "@7774_8055EC94" +"@7774_8055EC94": + + .4byte 0x3F800000 + +.global "@7775_8055EC98" +"@7775_8055EC98": + + .4byte 0x3C23D70A + +.global "@7776_8055EC9C" +"@7776_8055EC9C": + + .4byte 0x40C90FDB + +.global "@7784" +"@7784": + + .4byte 0x43300000 + .4byte 0 + +.global "@7785" +"@7785": + + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_ef/ef_torus_804403c8.s b/asm/libnw4r_ef/ef_torus_804403c8.s deleted file mode 100644 index 2f351ba2..00000000 --- a/asm/libnw4r_ef/ef_torus_804403c8.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ef16EmitterFormTorus -__vt__Q34nw4r2ef16EmitterFormTorus: - - .4byte 0 - .4byte 0 - .4byte Emission__Q34nw4r2ef16EmitterFormTorusFPQ34nw4r2ef7EmitterPQ34nw4r2ef15ParticleManageriUlPfUsfPCQ34nw4r4math5MTX34 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_torus_8055ec68.s b/asm/libnw4r_ef/ef_torus_8055ec68.s deleted file mode 100644 index 5efcf2bd..00000000 --- a/asm/libnw4r_ef/ef_torus_8055ec68.s +++ /dev/null @@ -1,76 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@7765" -"@7765": - - .4byte 0x34000000 - -.global "@7766" -"@7766": - - .4byte 0 - -.global "@7767" -"@7767": - - .4byte 0x47800000 - -.global "@7768" -"@7768": - - .4byte 0x40000000 - -.global "@7769" -"@7769": - - .4byte 0x40490FDB - .4byte 0 - -.global "@7770_8055EC80" -"@7770_8055EC80": - - .4byte 0x401921FB - .4byte 0x60000000 - -.global "@7771_8055EC88" -"@7771_8055EC88": - - .4byte 0x39490FDB - -.global "@7772" -"@7772": - - .4byte 0x40C90E49 - -.global "@7773_8055EC90" -"@7773_8055EC90": - - .4byte 0x42C80000 - -.global "@7774_8055EC94" -"@7774_8055EC94": - - .4byte 0x3F800000 - -.global "@7775_8055EC98" -"@7775_8055EC98": - - .4byte 0x3C23D70A - -.global "@7776_8055EC9C" -"@7776_8055EC9C": - - .4byte 0x40C90FDB - -.global "@7784" -"@7784": - - .4byte 0x43300000 - .4byte 0 - -.global "@7785" -"@7785": - - .4byte 0x43300000 - .4byte 0x80000000 diff --git a/asm/libnw4r_ef/ef_util_800b30b0.s b/asm/libnw4r_ef/ef_util.s similarity index 98% rename from asm/libnw4r_ef/ef_util_800b30b0.s rename to asm/libnw4r_ef/ef_util.s index e6a7c946..3625e56e 100644 --- a/asm/libnw4r_ef/ef_util_800b30b0.s +++ b/asm/libnw4r_ef/ef_util.s @@ -1145,3 +1145,91 @@ MTXColLen__Q24nw4r2efFPCQ34nw4r4math5MTX34i: /* 800B4024 000AFE64 4E 80 00 20 */ blr /* 800B4028 000AFE68 00 00 00 00 */ .4byte 0x00000000 /* 800B402C 000AFE6C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global sPS_Three_Half__Q24nw4r2ef +sPS_Three_Half__Q24nw4r2ef: + + .4byte 0x40400000 + .4byte 0x3F000000 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@6727" +"@6727": + + .4byte 0x47800000 + .4byte 0x47800000 + +.global "@6728" +"@6728": + + .4byte 0x4222F983 + +.global "@6743" +"@6743": + + .4byte 0x3F800000 + +.global "@6744" +"@6744": + + .4byte 0x34000000 + +.global "@6745" +"@6745": + + .4byte 0 + +.global "@6793_8055EAD8" +"@6793_8055EAD8": + + .4byte 0x00800000 + +.global "@6794_8055EADC" +"@6794_8055EADC": + + .4byte 0xBF800000 + +.global "@6866" +"@6866": + + .4byte 0xBFF00000 + .4byte 0 + +.global "@6871" +"@6871": + + .4byte 0x3F000000 + +.global "@6872" +"@6872": + + .4byte 0x40400000 + +.global "@6879" +"@6879": + + .4byte 0x47800000 + +.global "@6916" +"@6916": + + .4byte 0x3727C5AC + +.global "@6934" +"@6934": + + .4byte 0x47C35000 + +.global EMITTER_ZERO_SCALE__Q24nw4r2ef +EMITTER_ZERO_SCALE__Q24nw4r2ef: + + .4byte 0x3727C5AC diff --git a/asm/libnw4r_ef/ef_util_80556960.s b/asm/libnw4r_ef/ef_util_80556960.s deleted file mode 100644 index 7efea6ff..00000000 --- a/asm/libnw4r_ef/ef_util_80556960.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global sPS_Three_Half__Q24nw4r2ef -sPS_Three_Half__Q24nw4r2ef: - - .4byte 0x40400000 - .4byte 0x3F000000 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_ef/ef_util_8055eac0.s b/asm/libnw4r_ef/ef_util_8055eac0.s deleted file mode 100644 index 05d7c4ee..00000000 --- a/asm/libnw4r_ef/ef_util_8055eac0.s +++ /dev/null @@ -1,74 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@6727" -"@6727": - - .4byte 0x47800000 - .4byte 0x47800000 - -.global "@6728" -"@6728": - - .4byte 0x4222F983 - -.global "@6743" -"@6743": - - .4byte 0x3F800000 - -.global "@6744" -"@6744": - - .4byte 0x34000000 - -.global "@6745" -"@6745": - - .4byte 0 - -.global "@6793_8055EAD8" -"@6793_8055EAD8": - - .4byte 0x00800000 - -.global "@6794_8055EADC" -"@6794_8055EADC": - - .4byte 0xBF800000 - -.global "@6866" -"@6866": - - .4byte 0xBFF00000 - .4byte 0 - -.global "@6871" -"@6871": - - .4byte 0x3F000000 - -.global "@6872" -"@6872": - - .4byte 0x40400000 - -.global "@6879" -"@6879": - - .4byte 0x47800000 - -.global "@6916" -"@6916": - - .4byte 0x3727C5AC - -.global "@6934" -"@6934": - - .4byte 0x47C35000 - -.global EMITTER_ZERO_SCALE__Q24nw4r2ef -EMITTER_ZERO_SCALE__Q24nw4r2ef: - - .4byte 0x3727C5AC diff --git a/obj_files.mk b/obj_files.mk index d4c02839..1d70cf67 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -337,38 +337,39 @@ $(BUILD_DIR)/asm/mem/mem_unitHeap.o \ $(BUILD_DIR)/asm/mem/mem_allocator.o \ $(BUILD_DIR)/asm/mem/mem_list.o \ \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_draworder.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_effect.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_emitter.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_animcurve.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_postfield.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_particle.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_particlemanager.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_resource.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_util.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_handle.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_emitterform.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_creationqueue.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_emform.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_point.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_line.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_disc.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_sphere.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_cylinder.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_torus.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_cube.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_drawstrategybuilder.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_drawstrategyimpl.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_drawbillboardstrategy.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_drawdirectionalstrategy.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_drawfreestrategy.o \ +$(BUILD_DIR)/asm/libnw4r_ef/ef_drawlinestrategy.o \ +$(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/Linker/Generated/Symbol/File_80006684.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_draworder_800a3950.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_effect_800a3a70.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_800a4670.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_emitter_800a4d50.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_animcurve_800a6ef0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_postfield_800abe00.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_particle_800af490.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_particlemanager_800b0260.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_resource_800b2540.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_util_800b30b0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_handle_800b4030.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_emitterform_800b40f0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_creationqueue_800b4690.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_emform_800b4ad0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_point_800b4bb0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_line_800b4f00.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_disc_800b5240.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_sphere_800b5780.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_cylinder_800b5fe0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_torus_800b6790.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_cube_800b6dd0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawstrategybuilder_800b89b0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawstrategyimpl_800b8b50.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawbillboardstrategy_800bab50.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawdirectionalstrategy_800bccc0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawfreestrategy_800bf0a0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawlinestrategy_800bf960.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawpointstrategy_800bff60.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawstripestrategy_800c03d0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawsmoothstripestrategy_800c3a90.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 \ @@ -2912,11 +2913,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_ef/ef_effectsystem_80406268.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_particlemanager_8040626c.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_resource_80406270.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_emform_80406274.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawstrategyimpl_80406278.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 \ @@ -3018,8 +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_ef/ef_drawdirectionalstrategy_80408260.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawfreestrategy_804082c0.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 \ @@ -3229,30 +3223,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_ef/ef_draworder_80440060.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_effect_80440078.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_80440098.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_emitter_804400e0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_animcurve_80440108.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_particle_80440308.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_particlemanager_80440320.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_emform_80440368.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_point_80440378.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_line_80440388.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_disc_80440398.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_sphere_804403a8.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_cylinder_804403b8.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_torus_804403c8.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_cube_804403d8.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawstrategybuilder_804403e8.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawstrategyimpl_804403f8.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawbillboardstrategy_80440410.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawdirectionalstrategy_80440430.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawfreestrategy_80440450.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawlinestrategy_80440468.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawpointstrategy_80440480.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawstripestrategy_80440498.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawsmoothstripestrategy_804404b8.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 \ @@ -4962,12 +4932,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_ef/ef_effectsystem_804fe280.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_particlemanager_8050a398.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_resource_8050a3c8.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawstrategybuilder_8050a3e8.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawstrategyimpl_8050aa08.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawsmoothstripestrategy_8050aa68.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 \ @@ -5063,13 +5027,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_ef/ef_effectsystem_80556958.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_util_80556960.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawbillboardstrategy_80556980.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawdirectionalstrategy_805569a0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawfreestrategy_805569c0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawlinestrategy_805569c8.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawpointstrategy_805569d0.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 \ @@ -5470,11 +5427,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_ef/ef_effectsystem_8055cf20.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_particlemanager_8055cf30.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_emform_8055cf38.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawstrategybuilder_8055cf58.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawsmoothstripestrategy_8055cf60.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 \ @@ -5654,30 +5606,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_ef/ef_effect_8055e970.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_8055e978.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_emitter_8055e980.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_animcurve_8055e9b8.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_postfield_8055e9f0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_particle_8055ea28.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_particlemanager_8055ea78.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_util_8055eac0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_emitterform_8055eb00.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_point_8055eb30.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_line_8055eb60.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_disc_8055eb88.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_sphere_8055ebd0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_cylinder_8055ec20.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_torus_8055ec68.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_cube_8055ecb0.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawstrategyimpl_8055ece8.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawbillboardstrategy_8055ed18.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawdirectionalstrategy_8055ed48.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawfreestrategy_8055ed70.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawlinestrategy_8055ed98.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawpointstrategy_8055eda8.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawstripestrategy_8055edb8.o \ -$(BUILD_DIR)/asm/libnw4r_ef/ef_drawsmoothstripestrategy_8055edf0.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 \